Skip to content

Commit

Permalink
Run ttws --clean
Browse files Browse the repository at this point in the history
  • Loading branch information
mwetter committed Nov 16, 2017
1 parent 1ae8784 commit bcd4b98
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,7 @@ annotation (
Text(
extent={{-124,146},{96,108}},
lineColor={0,0,255},
textString="%name")}), Diagram(coordinateSystem(preserveAspectRatio=false)),
Documentation(info="<html>
textString="%name")}),Documentation(info="<html>
<p>
Block that outputs the coil valve postions for VAV system with multiple zones,
implemented according to the ASHRAE Guideline G36, PART5.N.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,5 @@ October 30, 2017, by Jianjun Hu:<br/>
First implementation.
</li>
</ul>
</html>"),
Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
coordinateSystem(preserveAspectRatio=false)));
</html>"));
end Controller;
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ First implementation.
</li>
</ul>
</html>"),
Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
Diagram(
coordinateSystem(preserveAspectRatio=false), graphics={Text(
extent={{50,86},{126,76}},
lineColor={85,0,255},
Expand Down
3 changes: 0 additions & 3 deletions Buildings/Controls/OBC/CDL/Continuous/Sources/Sine.mo
Original file line number Diff line number Diff line change
Expand Up @@ -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="<html>
<p>
Block that outputs a <code>sine</code>.
Expand Down
2 changes: 0 additions & 2 deletions Buildings/Controls/OBC/CDL/Utilities/Assert.mo
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ annotation (
pattern=LinePattern.None,
fillColor={0,0,0},
fillPattern=FillPattern.Solid)}),
Diagram(
coordinateSystem(preserveAspectRatio=false)),
Documentation(info="<html>
<p>
Block that writes a warning if the input becomes <code>false</code>.
Expand Down

0 comments on commit bcd4b98

Please sign in to comment.