diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/SetPoints/VAVSupplySignals.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/SetPoints/VAVSupplySignals.mo index 49694def791..0e970abe062 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/SetPoints/VAVSupplySignals.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/SetPoints/VAVSupplySignals.mo @@ -200,8 +200,7 @@ annotation ( Text( extent={{-124,146},{96,108}}, lineColor={0,0,255}, - textString="%name")}), Diagram(coordinateSystem(preserveAspectRatio=false)), -Documentation(info=" + textString="%name")}),Documentation(info="

Block that outputs the coil valve postions for VAV system with multiple zones, implemented according to the ASHRAE Guideline G36, PART5.N.2 diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/ModeAndSetPoints.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/ModeAndSetPoints.mo index e6d52b69213..c8ebc8931bd 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/ModeAndSetPoints.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/ModeAndSetPoints.mo @@ -94,30 +94,28 @@ block ModeAndSetPoints "Output zone setpoint with operation mode selection" each final unit="K", each quantity="ThermodynamicTemperature") "Measured zone temperatures" - annotation (Placement(transformation(rotation=0, extent={{-180,60},{-140,100.5}}), + annotation (Placement(transformation(extent={{-180,60},{-140,100.5}}), iconTransformation(extent={{-120,40},{-100,60}}))); Buildings.Controls.OBC.CDL.Interfaces.RealInput tNexOcc( final unit="s", quantity="Time") "Time to next occupied period" - annotation (Placement(transformation(rotation=0, extent={{-180,120},{-140,160}}), + annotation (Placement(transformation(extent={{-180,120},{-140,160}}), iconTransformation(extent={{-120,70},{-100,90}}))); Buildings.Controls.OBC.CDL.Interfaces.RealInput setAdj[numZon]( each final unit="K", each quantity="ThermodynamicTemperature") if (cooAdj or sinAdj) "Setpoint adjustment value" - annotation (Placement(transformation(extent={{-20,-20},{20,20}},rotation=0, - origin={-160,-40}), + annotation (Placement(transformation(extent={{-20,-20},{20,20}},origin={-160,-40}), iconTransformation(extent={{-120,10},{-100,30}}))); Buildings.Controls.OBC.CDL.Interfaces.RealInput heaSetAdj[numZon]( each final unit="K", each quantity="ThermodynamicTemperature") if heaAdj "Heating setpoint adjustment value" - annotation (Placement(transformation(extent={{-20,-20},{20,20}},rotation=0, - origin={-160,-70}), iconTransformation(extent={{-120,-20},{-100,0}}))); + annotation (Placement(transformation(extent={{-20,-20},{20,20}},origin={-160,-70}), iconTransformation(extent={{-120,-20},{-100,0}}))); Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uOcc "Current occupancy period, true if it is in occupant period" - annotation (Placement(transformation(rotation=0, extent={{-180,0},{-140,40.5}}), + annotation (Placement(transformation(extent={{-180,0},{-140,40.5}}), iconTransformation(extent={{-120,-50},{-100,-29.5}}))); Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uOccSen[numZon] if have_occSen "Occupancy sensor (occupied=true, unoccupied=false)" diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/Controller.mo index 20fe8688029..a6a35b75d23 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/Controller.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/Controller.mo @@ -136,7 +136,5 @@ October 30, 2017, by Jianjun Hu:
First implementation. -"), -Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( - coordinateSystem(preserveAspectRatio=false))); +")); end Controller; diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/ModeAndSetPoints.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/ModeAndSetPoints.mo index a88fa2e789c..3c7e8a30f57 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/ModeAndSetPoints.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/ModeAndSetPoints.mo @@ -113,7 +113,7 @@ First implementation. "), -Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( + Diagram( coordinateSystem(preserveAspectRatio=false), graphics={Text( extent={{50,86},{126,76}}, lineColor={85,0,255}, diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/Sine.mo b/Buildings/Controls/OBC/CDL/Continuous/Sources/Sine.mo index 37922e9a884..5e13fbc8d4f 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sources/Sine.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Sources/Sine.mo @@ -43,9 +43,6 @@ equation {57.5,-61.9},{63.9,-47.2},{72,-24.8},{80,0}}, smooth = Smooth.Bezier), Text(extent={{-147,-152},{153,-112}},lineColor={0,0,0}, textString="freqHz=%freqHz")}), - Diagram(coordinateSystem( - preserveAspectRatio=true, - extent={{-100,-100},{100,100}})), Documentation(info="

Block that outputs a sine. diff --git a/Buildings/Controls/OBC/CDL/Utilities/Assert.mo b/Buildings/Controls/OBC/CDL/Utilities/Assert.mo index c7226424133..5869d1d14cf 100644 --- a/Buildings/Controls/OBC/CDL/Utilities/Assert.mo +++ b/Buildings/Controls/OBC/CDL/Utilities/Assert.mo @@ -44,8 +44,6 @@ annotation ( pattern=LinePattern.None, fillColor={0,0,0}, fillPattern=FillPattern.Solid)}), - Diagram( - coordinateSystem(preserveAspectRatio=false)), Documentation(info="

Block that writes a warning if the input becomes false.