Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue2180 boiler plant main controller oct 2021 #3168

Merged
merged 18 commits into from
Mar 10, 2023
Merged

Issue2180 boiler plant main controller oct 2021 #3168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
e500080
Remove unnecessary experiment statement
terrancelu92 Nov 14, 2022
61a8b84
Fixed lineColor error in Text annotation
terrancelu92 Nov 14, 2022
f1eb6a7
removed the dymola algorithm in the mos script
terrancelu92 Nov 15, 2022
74c0b57
Add required documentation for three models
terrancelu92 Nov 15, 2022
65e65f6
Switch back some unintentional changes
terrancelu92 Nov 15, 2022
1b17944
Remove unnecessary zeros
terrancelu92 Nov 15, 2022
3d846f3
Correct the documentation html for these two types
terrancelu92 Nov 16, 2022
04b80a3
Merge pull request #53 from lbl-srg/issue2180_BoilerPlant_MainControl…
karthikeyad-pnnl Nov 21, 2022
6163230
Merge pull request #54 from terrancelu92/issue2180_BoilerPlant_MainCo…
karthikeyad-pnnl Nov 21, 2022
89b78df
Updated unit test results
karthikeyad-pnnl Nov 23, 2022
264fe21
Fixed issues in example models
karthikeyad-pnnl Nov 23, 2022
ec0e3bf
Updated boiler plant controller in line with updates made during join…
karthikeyad-pnnl Nov 26, 2022
7544ba7
Upadted boiler plant 3example model in line with updates made during …
karthikeyad-pnnl Nov 26, 2022
a0486e3
Updated connect statements in validation model after updating connect…
karthikeyad-pnnl Nov 26, 2022
f23978e
Removed unused validation script for non-existent model
karthikeyad-pnnl Nov 26, 2022
97562fb
Updated unit test results
karthikeyad-pnnl Nov 26, 2022
d7e52b3
Updated icon layer formatting
karthikeyad-pnnl Nov 26, 2022
110e5cc
Removed redundant zeros
karthikeyad-pnnl Nov 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/BypassValve/BypassValvePosition.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,13 @@ annotation (defaultComponentName="bypValPos",
fillPattern=FillPattern.Solid),
Text(
extent={{-70,20},{70,-20}},
lineColor={0,0,0},
textColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.None,
textString="bypValPos"),
Text(
extent={{-100,146},{100,108}},
lineColor={0,0,255},
textColor={0,0,255},
textString="%name")}),
Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}})),
Documentation(info="<html>
Expand Down Expand Up @@ -190,11 +190,5 @@ annotation (defaultComponentName="bypValPos",
First implementation.
</li>
</ul>
</html>"),
experiment(
StartTime=-1814400,
StopTime=1814400,
Interval=1,
Tolerance=1e-06,
__Dymola_Algorithm="Dassl"));
</html>"));
end BypassValvePosition;
3 changes: 1 addition & 2 deletions ...ntrols/OBC/ASHRAE/PrimarySystem/BoilerPlant/BypassValve/Validation/BypassValvePosition.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,5 @@ First implementation.
StartTime=0,
StopTime=300,
Interval=1,
Tolerance=1e-06,
__Dymola_Algorithm="Cvode"));
Tolerance=1e-06));
end BypassValvePosition;
9 changes: 8 additions & 1 deletion Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/BypassValve/Validation/package.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,12 @@ package Validation "Validation models for BypassValve sequences"
fillColor={78,138,73},
pattern=LinePattern.None,
fillPattern=FillPattern.Solid,
points={{-58.0,46.0},{42.0,-14.0},{-58.0,-74.0},{-58.0,46.0}})}));
points={{-58.0,46.0},{42.0,-14.0},{-58.0,-74.0},{-58.0,46.0}})}),
Documentation(info="<html>
<p>
This package contains validation models for the classes in
<a href=\"modelica://Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.BypassValve\">
Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.BypassValve</a>.
</p>
</html>"));
end Validation;
201 changes: 129 additions & 72 deletions Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Controller.mo
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .../Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/ControllerTwo.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ annotation(Diagram(coordinateSystem(extent={{-160,-100},{160,100}})),
fillPattern=FillPattern.Solid),
Text(
extent={{-120,146},{100,108}},
lineColor={0,0,255},
textColor={0,0,255},
textString="%name"),
Ellipse(
origin={-26.6667,38.6207},
Expand Down
2 changes: 1 addition & 1 deletion ...PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/ContinuousLeadSwapTwo.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ equation
lineColor=DynamicSelect({235,235,235}, if u1 then {0,255,0} else {235,235,235}),
fillColor=DynamicSelect({235,235,235}, if u1 then {0,255,0} else {235,235,235}),
fillPattern=FillPattern.Solid), Text( extent={{-120,146},{100,108}},
lineColor={0,0,255}, textString="%name")}),
textColor={0,0,255}, textString="%name")}),
Documentation(info="<html>
<p>
This block ensures that the new lead device is started and proven on before the old
Expand Down
4 changes: 2 additions & 2 deletions ...C/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/LeastRuntime.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ equation
connect(not3.y, and3.u2) annotation (Line(points={{28,-40},{90,-40},{90,20},{98,
20}}, color={255,0,255}));
connect(uDevStaSet, mulOr1.u[1:2]) annotation (Line(points={{-180,40},{-130,40},
{-130,-20},{-102,-20}}, color={255,0,255}));
{-130,-23.5},{-102,-23.5}}, color={255,0,255}));
connect(mulOr1.y, edg1.u)
annotation (Line(points={{-78,-20},{-72,-20}}, color={255,0,255}));
connect(edg1.y, booRep.u)
Expand All @@ -155,7 +155,7 @@ equation
fillPattern=FillPattern.Solid),
Text(
extent={{-120,146},{100,108}},
lineColor={0,0,255},
textColor={0,0,255},
textString="%name"),
Line(points={{-66,-70},{82,-70}},
color={192,192,192}),
Expand Down
2 changes: 1 addition & 1 deletion ...AE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/MinimumLeadRuntime.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ equation
fillPattern=FillPattern.Solid),
Text(
extent={{-120,146},{100,108}},
lineColor={0,0,255},
textColor={0,0,255},
textString="%name"),
Line(points={{-66,-70},{82,-70}},
color={192,192,192}),
Expand Down
2 changes: 1 addition & 1 deletion .../OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/Scheduler.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ equation
fillPattern=FillPattern.Solid),
Text(
extent={{-120,146},{100,108}},
lineColor={0,0,255},
textColor={0,0,255},
textString="%name"),
Ellipse(
extent={{-52,56},{58,-54}},
Expand Down
2 changes: 1 addition & 1 deletion ...ntrols/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/Two.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ equation
fillPattern=FillPattern.Solid),
Text(
extent={{-120,146},{100,108}},
lineColor={0,0,255},
textColor={0,0,255},
textString="%name"),
Line(points={{-40,60},{0,60},{0,-60},{40,-60}}, color={128,128,128}),
Ellipse(
Expand Down
2 changes: 1 addition & 1 deletion ...tem/BoilerPlant/Generic/EquipmentRotation/Subsequences/Validation/LeastRuntime_uDevRol.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ Icon(graphics={
coordinateSystem(preserveAspectRatio=false, extent={{-120,-120},{120,120}}),
graphics={Text(
extent={{-52,-104},{46,-114}},
lineColor={0,0,127},
textColor={0,0,127},
textString="For simplicity this test assumes
the device ON/OFF status equals its setpoint
(there is no delay in starting or stopping devices).")}));
Expand Down
2 changes: 1 addition & 1 deletion ...ilerPlant/Generic/EquipmentRotation/Subsequences/Validation/MinimumLeadRuntime_uDevRol.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ Icon(graphics={
coordinateSystem(preserveAspectRatio=false, extent={{-120,-120},{120,120}}),
graphics={Text(
extent={{-52,-104},{46,-114}},
lineColor={0,0,127},
textColor={0,0,127},
textString="For simplicity this test assumes
the device ON/OFF status equals its setpoint
(there is no delay in starting or stopping devices).")}));
Expand Down
6 changes: 3 additions & 3 deletions Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/PlantDisable.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ equation
borderPattern=BorderPattern.Raised),
Text(
extent={{-120,146},{100,108}},
lineColor={0,0,255},
textColor={0,0,255},
textString="%name"),
Ellipse(
extent={{-80,80},{80,-80}},
Expand All @@ -264,11 +264,11 @@ equation
fillPattern=FillPattern.Solid),
Text(
extent={{-66,46},{76,10}},
lineColor={28,108,200},
textColor={28,108,200},
textString="START"),
Text(
extent={{-66,-8},{76,-44}},
lineColor={28,108,200},
textColor={28,108,200},
textString="STOP")},
coordinateSystem(
preserveAspectRatio=false,
Expand Down
6 changes: 3 additions & 3 deletions Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/PlantEnable.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ equation
borderPattern=BorderPattern.Raised),
Text(
extent={{-120,146},{100,108}},
lineColor={0,0,255},
textColor={0,0,255},
textString="%name"),
Ellipse(extent={{-80,80},{80,-80}}, lineColor={28,108,200},fillColor={170,255,213},
fillPattern=FillPattern.Solid),
Expand All @@ -224,11 +224,11 @@ equation
fillPattern=FillPattern.Solid),
Text(
extent={{-66,46},{76,10}},
lineColor={28,108,200},
textColor={28,108,200},
textString="START"),
Text(
extent={{-66,-8},{76,-44}},
lineColor={28,108,200},
textColor={28,108,200},
textString="STOP")},
coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}})),
Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-160,-140},{160,140}})),
Expand Down
4 changes: 2 additions & 2 deletions Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/RotationController.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ equation
connect(equRot.yDevStaSet, yDevStaSet) annotation (Line(points={{-48,46},{-30,
46},{-30,50},{120,50}}, color={255,0,255}));
connect(booToInt.y, mulSumInt.u[1:2])
annotation (Line(points={{2,0},{8,0},{8,0}}, color={255,127,0}));
annotation (Line(points={{2,0},{8,0},{8,-3.5}}, color={255,127,0}));
connect(mulSumInt.y, intGreThr.u) annotation (Line(points={{32,0},{40,0},{40,30},
{48,30}}, color={255,127,0}));
connect(mulSumInt.y, intGreThr1.u)
Expand Down Expand Up @@ -204,7 +204,7 @@ equation
Icon(graphics={
Text(
extent={{-120,146},{100,108}},
lineColor={0,0,255},
textColor={0,0,255},
textString="%name"),
Rectangle(
extent={{-100,-100},{100,100}},
Expand Down
16 changes: 8 additions & 8 deletions Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/Subsequences/HWIsoVal.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ equation
connect(and2.y, swi.u2) annotation (Line(points={{-58,-170},{-50,-170},{-50,-40},
{138,-40}}, color={255,0,255}));
connect(and2.y, triSam.trigger) annotation (Line(points={{-58,-170},{-50,-170},
{-50,20},{-60,20},{-60,38.2}}, color={255,0,255}));
{-50,20},{-60,20},{-60,38}}, color={255,0,255}));
connect(addPar.u, gai.y)
annotation (Line(points={{18,20},{2,20}}, color={0,0,127}));
connect(gai.u, triSam.y) annotation (Line(points={{-22,20},{-40,20},{-40,50},{
Expand All @@ -232,7 +232,7 @@ annotation (
pattern=LinePattern.None,
fillColor={210,210,210},
fillPattern=FillPattern.Solid,
lineColor={0,0,127},
textColor={0,0,127},
horizontalAlignment=TextAlignment.Right,
textString="Check if all enabled HW isolation valves
have been fully open")}),
Expand All @@ -244,26 +244,26 @@ annotation (
fillPattern=FillPattern.Solid),
Text(
extent={{-120,146},{100,108}},
lineColor={0,0,255},
textColor={0,0,255},
textString="%name"),
Text(
extent={{-96,-54},{-60,-66}},
lineColor={255,0,255},
textColor={255,0,255},
pattern=LinePattern.Dash,
textString="chaPro"),
Text(
extent={{-96,8},{-66,-6}},
lineColor={255,0,255},
textColor={255,0,255},
pattern=LinePattern.Dash,
textString="uUpsDevSta"),
Text(
extent={{-96,68},{-42,56}},
lineColor={0,0,127},
textColor={0,0,127},
pattern=LinePattern.Dash,
textString="uHotWatIsoVal"),
Text(
extent={{32,70},{96,54}},
lineColor={255,0,255},
textColor={255,0,255},
pattern=LinePattern.Dash,
textString="yEnaHotWatIsoVal"),
Polygon(
Expand All @@ -278,7 +278,7 @@ annotation (
fillPattern=FillPattern.Solid),
Text(
extent={{44,-54},{98,-66}},
lineColor={0,0,127},
textColor={0,0,127},
pattern=LinePattern.Dash,
textString="yHotWatIsoVal")}),
Documentation(info="<html>
Expand Down
24 changes: 12 additions & 12 deletions Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/Validation/PlantEnable.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,28 +114,28 @@ equation
annotation (Line(points={{38,-20},{32,-20}},
color={0,0,127}));
connect(plaEna1.supResReq, reaToInt1.y)
annotation (Line(points={{-22,-35},{-30,-35},{-30,-20},{-38,-20}},
annotation (Line(points={{-22,-36},{-30,-36},{-30,-20},{-38,-20}},
color={255,127,0}));
connect(plaEna2.supResReq, reaToInt2.y)
annotation (Line(points={{78,65},{70,65},{70,80},{62,80}},
annotation (Line(points={{78,64},{70,64},{70,80},{62,80}},
color={255,127,0}));
connect(plaEna2.TOut, sin5.y)
annotation (Line(points={{78,55},{70,55},{70,40},{32,40}},
annotation (Line(points={{78,56},{70,56},{70,40},{32,40}},
color={0,0,127}));
connect(plaEna3.supResReq, reaToInt3.y)
annotation (Line(points={{78,-35},{70,-35},{70,-20},{62,-20}},
annotation (Line(points={{78,-36},{70,-36},{70,-20},{62,-20}},
color={255,127,0}));
connect(plaEna3.TOut, con3.y)
annotation (Line(points={{78,-45},{70,-45},{70,-60},{32,-60}},
annotation (Line(points={{78,-44},{70,-44},{70,-60},{32,-60}},
color={0,0,127}));
connect(reaToInt.y, plaEna.supResReq)
annotation (Line(points={{-38,80},{-30,80},{-30,65},{-22,65}},
annotation (Line(points={{-38,80},{-30,80},{-30,64},{-22,64}},
color={255,127,0}));
connect(sin1.y, plaEna.TOut)
annotation (Line(points={{-68,40},{-30,40},{-30,55},{-22,55}},
annotation (Line(points={{-68,40},{-30,40},{-30,56},{-22,56}},
color={0,0,127}));
connect(con1.y, plaEna1.TOut)
annotation (Line(points={{-68,-60},{-30,-60},{-30,-45},{-22,-45}},
annotation (Line(points={{-68,-60},{-30,-60},{-30,-44},{-22,-44}},
color={0,0,127}));
annotation (
Icon(coordinateSystem(preserveAspectRatio=false),
Expand All @@ -154,19 +154,19 @@ equation
preserveAspectRatio=false),
graphics={Text(
extent={{-72,26},{-24,18}},
lineColor={28,108,200},
textColor={28,108,200},
textString="Combination of all inputs"),
Text(
extent={{32,26},{80,18}},
lineColor={28,108,200},
textColor={28,108,200},
textString="Changing outdoor temperature"),
Text(
extent={{-80,-74},{-16,-82}},
lineColor={28,108,200},
textColor={28,108,200},
textString="Changing number of hot-water requests"),
Text(
extent={{26,-74},{74,-82}},
lineColor={28,108,200},
textColor={28,108,200},
textString="Changing boiler-enable schedule")}),
experiment(
StopTime=7200,
Expand Down
3 changes: 1 addition & 2 deletions ...gs/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/Validation/RotationController.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,7 @@ equation
experiment(
StopTime=600,
Interval=1,
Tolerance=1e-06,
__Dymola_Algorithm="Dassl"),
Tolerance=1e-06),
__Dymola_Commands(file="./Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/Validation/RotationController.mos"
"Simulate and plot"),
Documentation(info="<html>
Expand Down
2 changes: 1 addition & 1 deletion Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/Generic/ChangeStatus.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ annotation (
fillPattern=FillPattern.Solid),
Text(
extent={{-100,150},{100,110}},
lineColor={0,0,255},
textColor={0,0,255},
textString="%name")}),
Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}})),
Documentation(info="<html>
Expand Down
2 changes: 1 addition & 1 deletion Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/Generic/EnableLag_flowrate.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ annotation (
fillPattern=FillPattern.Solid),
Text(
extent={{-100,150},{100,110}},
lineColor={0,0,255},
textColor={0,0,255},
textString="%name")}),
Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-140,-160},{140,160}})),
Documentation(info="<html>
Expand Down
12 changes: 6 additions & 6 deletions Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/Generic/Speed_localDp.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,31 +242,31 @@ annotation (
fillPattern=FillPattern.Solid),
Text(
extent={{-100,150},{100,110}},
lineColor={0,0,255},
textColor={0,0,255},
textString="%name"),
Text(
extent={{-98,52},{-44,30}},
lineColor={255,0,255},
textColor={255,0,255},
pattern=LinePattern.Dash,
textString="uHotWatPum"),
Text(
extent={{-98,-30},{-30,-52}},
lineColor={0,0,127},
textColor={0,0,127},
pattern=LinePattern.Dash,
textString="dpHotWat_remote"),
Text(
extent={{22,12},{98,-10}},
lineColor={0,0,127},
textColor={0,0,127},
pattern=LinePattern.Dash,
textString="yHotWatPumSpe"),
Text(
extent={{-98,-68},{-34,-90}},
lineColor={0,0,127},
textColor={0,0,127},
pattern=LinePattern.Dash,
textString="dpHotWatSet"),
Text(
extent={{-98,92},{-30,70}},
lineColor={0,0,127},
textColor={0,0,127},
pattern=LinePattern.Dash,
textString="dpHotWat_local")}),
Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-140,-140},{140,140}})),
Expand Down
Loading