Skip to content

Commit d73797c

Browse files
AntoineGautierAntoineGautier
authored
Merge pull request #4195 from karthikeyad-pnnl/issue2180_BoilerPlant_Nov23
Model fixes for staging process issues, and functioning example model
2 parents a24f5f6 + e612f6f commit d73797c

6 files changed

Lines changed: 256 additions & 260 deletions

File tree

‎Buildings/Controls/OBC/ASHRAE/G36/Plants/Boilers/Staging/Processes/Subsequences/HWIsoVal.mo‎

Lines changed: 74 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -50,44 +50,40 @@ protected
5050

5151
Buildings.Controls.OBC.CDL.Logical.And and6[nBoi] if reqAct
5252
"Change current index signal to true when change process is triggered"
53-
annotation (Placement(transformation(extent={{20,-50},{40,-30}})));
53+
annotation (Placement(transformation(extent={{-10,-50},{10,-30}})));
5454

5555
Buildings.Controls.OBC.CDL.Routing.BooleanScalarReplicator booScaRep1(
5656
final nout=nBoi) "Replicate signal for array logic processing"
57-
annotation (Placement(transformation(extent={{-40,-180},{-20,-160}})));
58-
59-
Buildings.Controls.OBC.CDL.Logical.And and7[nBoi] if not reqAct
60-
"Modify only current index signal on input valve status array "
61-
annotation (Placement(transformation(extent={{120,30},{140,50}})));
57+
annotation (Placement(transformation(extent={{-60,-180},{-40,-160}})));
6258

6359
Buildings.Controls.OBC.CDL.Logical.Not not1[nBoi] if not reqAct
6460
"Generate true array with false value only for current index"
65-
annotation (Placement(transformation(extent={{20,30},{40,50}})));
61+
annotation (Placement(transformation(extent={{-10,30},{10,50}})));
6662

6763
Buildings.Controls.OBC.CDL.Logical.Not not2[nBoi] if not reqAct
6864
"Not block "
69-
annotation (Placement(transformation(extent={{20,0},{40,20}})));
65+
annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
7066

7167
Buildings.Controls.OBC.CDL.Logical.Or or3[nBoi] if not reqAct
7268
"Change current index signal to false when change process is triggered"
73-
annotation (Placement(transformation(extent={{80,30},{100,50}})));
69+
annotation (Placement(transformation(extent={{30,30},{50,50}})));
7470

7571
Buildings.Controls.OBC.CDL.Logical.And and2
7672
"Check if upstream changes have been completed and current process is triggered"
77-
annotation (Placement(transformation(extent={{-80,-180},{-60,-160}})));
73+
annotation (Placement(transformation(extent={{-100,-180},{-80,-160}})));
7874

7975
Buildings.Controls.OBC.CDL.Logical.Or or1[nBoi] if reqAct
8076
"Modify only current index signal on input valve status array"
8177
annotation (Placement(transformation(extent={{120,-50},{140,-30}})));
8278

8379
Buildings.Controls.OBC.CDL.Integers.Equal intEqu[nBoi]
8480
"Check next enabling isolation valve"
85-
annotation (Placement(transformation(extent={{-40,0},{-20,20}})));
81+
annotation (Placement(transformation(extent={{-60,0},{-40,20}})));
8682

8783
Buildings.Controls.OBC.CDL.Routing.IntegerScalarReplicator intRep(
8884
final nout=nBoi)
8985
"Replicate integer input"
90-
annotation (Placement(transformation(extent={{-80,0},{-60,20}})));
86+
annotation (Placement(transformation(extent={{-100,0},{-80,20}})));
9187

9288
Buildings.Controls.OBC.CDL.Logical.Not not3[nBoi]
9389
"Logical not"
@@ -109,30 +105,36 @@ protected
109105
"Logical or"
110106
annotation (Placement(transformation(extent={{40,210},{60,230}})));
111107

112-
Buildings.Controls.OBC.CDL.Logical.MultiAnd mulAnd1(
113-
final nin=nBoi)
108+
Buildings.Controls.OBC.CDL.Logical.MultiAnd mulAnd1(nin=(nBoi+1))
114109
"Logical and"
115110
annotation (Placement(transformation(extent={{80,210},{100,230}})));
116111

117-
Buildings.Controls.OBC.CDL.Logical.And and5
118-
"Check if the isolation valve has been fully open"
119-
annotation (Placement(transformation(extent={{140,130},{160,150}})));
120-
121112
Buildings.Controls.OBC.CDL.Integers.Sources.Constant conInt[nBoi](
122113
final k=boiInd)
123114
"Boiler index array"
124-
annotation (Placement(transformation(extent={{-80,-30},{-60,-10}})));
125-
115+
annotation (Placement(transformation(extent={{-100,-30},{-80,-10}})));
116+
117+
CDL.Logical.Latch lat
118+
annotation (Placement(transformation(extent={{144,130},{164,150}})));
119+
CDL.Logical.Edge edg
120+
annotation (Placement(transformation(extent={{100,124},{120,144}})));
121+
CDL.Logical.Edge edg2 annotation (Placement(transformation(
122+
extent={{-10,-10},{10,10}},
123+
rotation=270,
124+
origin={132,200})));
125+
CDL.Logical.And and1[nBoi] if not reqAct
126+
"Change current index signal to true when change process is triggered"
127+
annotation (Placement(transformation(extent={{72,30},{92,50}})));
126128
equation
127129

128130
connect(chaPro, and2.u2)
129-
annotation (Line(points={{-180,-178},{-82,-178}}, color={255,0,255}));
131+
annotation (Line(points={{-180,-178},{-102,-178}},color={255,0,255}));
130132

131133
connect(nexChaBoi, intRep.u)
132-
annotation (Line(points={{-180,10},{-82,10}}, color={255,127,0}));
134+
annotation (Line(points={{-180,10},{-102,10}},color={255,127,0}));
133135

134136
connect(intRep.y, intEqu.u1)
135-
annotation (Line(points={{-58,10},{-42,10}}, color={255,127,0}));
137+
annotation (Line(points={{-78,10},{-62,10}}, color={255,127,0}));
136138

137139
connect(not4.y, and4.u2)
138140
annotation (Line(points={{-18,160},{-12,160},{-12,182},{-2,182}},
@@ -148,58 +150,66 @@ equation
148150
annotation (Line(points={{22,190},{30,190},{30,212},{38,212}},
149151
color={255,0,255}));
150152

151-
connect(and5.y,yEnaHotWatIsoVal)
152-
annotation (Line(points={{162,140},{200,140}}, color={255,0,255}));
153-
154-
connect(or2.y, mulAnd1.u)
155-
annotation (Line(points={{62,220},{78,220}}, color={255,0,255}));
156-
157153
connect(conInt.y, intEqu.u2)
158-
annotation (Line(points={{-58,-20},{-50,-20},{-50,2},{-42,2}},
154+
annotation (Line(points={{-78,-20},{-62,-20},{-62,2}},
159155
color={255,127,0}));
160156

161157

162-
connect(uUpsDevSta, and2.u1) annotation (Line(points={{-180,-140},{-100,-140},
163-
{-100,-170},{-82,-170}},color={255,0,255}));
158+
connect(uUpsDevSta, and2.u1) annotation (Line(points={{-180,-140},{-120,-140},
159+
{-120,-170},{-102,-170}},
160+
color={255,0,255}));
164161

165-
connect(yHotWatIsoVal, and3.u1) annotation (Line(points={{200,0},{160,0},{160,
162+
connect(yHotWatIsoVal, and3.u1) annotation (Line(points={{200,0},{168,0},{168,
166163
110},{-80,110},{-80,220},{-2,220}}, color={255,0,255}));
167-
connect(yHotWatIsoVal, not3.u) annotation (Line(points={{200,0},{160,0},{160,110},
164+
connect(yHotWatIsoVal, not3.u) annotation (Line(points={{200,0},{168,0},{168,110},
168165
{-80,110},{-80,190},{-42,190}}, color={255,0,255}));
169-
connect(uHotWatIsoVal, and3.u2) annotation (Line(points={{-180,-100},{-134,-100},
170-
{-134,212},{-2,212}}, color={255,0,255}));
171-
connect(uHotWatIsoVal, not4.u) annotation (Line(points={{-180,-100},{-134,-100},
172-
{-134,160},{-42,160}}, color={255,0,255}));
173-
connect(mulAnd1.y, and5.u1) annotation (Line(points={{102,220},{128,220},{128,
174-
140},{138,140}}, color={255,0,255}));
175-
connect(uUpsDevSta, and5.u2) annotation (Line(points={{-180,-140},{-100,-140},
176-
{-100,132},{138,132}}, color={255,0,255}));
177-
connect(uHotWatIsoVal, or1.u2) annotation (Line(points={{-180,-100},{110,-100},
178-
{110,-48},{118,-48}}, color={255,0,255}));
166+
connect(uHotWatIsoVal, and3.u2) annotation (Line(points={{-180,-100},{-140,-100},
167+
{-140,212},{-2,212}}, color={255,0,255}));
168+
connect(uHotWatIsoVal, not4.u) annotation (Line(points={{-180,-100},{-140,-100},
169+
{-140,160},{-42,160}}, color={255,0,255}));
179170
connect(and6.y, or1.u1)
180-
annotation (Line(points={{42,-40},{118,-40}}, color={255,0,255}));
171+
annotation (Line(points={{12,-40},{118,-40}}, color={255,0,255}));
181172
connect(booScaRep1.u, and2.y)
182-
annotation (Line(points={{-42,-170},{-58,-170}}, color={255,0,255}));
183-
connect(booScaRep1.y, and6.u2) annotation (Line(points={{-18,-170},{0,-170},{0,
184-
-48},{18,-48}}, color={255,0,255}));
185-
connect(or1.y, yHotWatIsoVal) annotation (Line(points={{142,-40},{160,-40},{160,
186-
0},{200,0}}, color={255,0,255}));
187-
connect(and7.y, yHotWatIsoVal) annotation (Line(points={{142,40},{160,40},{160,
188-
0},{200,0}}, color={255,0,255}));
189-
connect(uHotWatIsoVal, and7.u2) annotation (Line(points={{-180,-100},{110,-100},
190-
{110,32},{118,32}}, color={255,0,255}));
191-
connect(intEqu.y, not1.u) annotation (Line(points={{-18,10},{-10,10},{-10,40},
192-
{18,40}}, color={255,0,255}));
193-
connect(booScaRep1.y, not2.u) annotation (Line(points={{-18,-170},{0,-170},{0,
194-
10},{18,10}}, color={255,0,255}));
195-
connect(not2.y, or3.u2) annotation (Line(points={{42,10},{60,10},{60,32},{78,32}},
173+
annotation (Line(points={{-62,-170},{-78,-170}}, color={255,0,255}));
174+
connect(booScaRep1.y, and6.u2) annotation (Line(points={{-38,-170},{-20,-170},
175+
{-20,-48},{-12,-48}},
176+
color={255,0,255}));
177+
connect(intEqu.y, not1.u) annotation (Line(points={{-38,10},{-30,10},{-30,40},
178+
{-12,40}},color={255,0,255}));
179+
connect(booScaRep1.y, not2.u) annotation (Line(points={{-38,-170},{-20,-170},{
180+
-20,0},{-12,0}},
181+
color={255,0,255}));
182+
connect(not2.y, or3.u2) annotation (Line(points={{12,0},{20,0},{20,32},{28,32}},
196183
color={255,0,255}));
197184
connect(not1.y, or3.u1)
198-
annotation (Line(points={{42,40},{78,40}}, color={255,0,255}));
199-
connect(intEqu.y, and6.u1) annotation (Line(points={{-18,10},{-10,10},{-10,-40},
200-
{18,-40}}, color={255,0,255}));
201-
connect(or3.y, and7.u1)
202-
annotation (Line(points={{102,40},{118,40}}, color={255,0,255}));
185+
annotation (Line(points={{12,40},{28,40}}, color={255,0,255}));
186+
connect(intEqu.y, and6.u1) annotation (Line(points={{-38,10},{-30,10},{-30,-40},
187+
{-12,-40}},color={255,0,255}));
188+
connect(lat.y, yEnaHotWatIsoVal)
189+
annotation (Line(points={{166,140},{200,140}}, color={255,0,255}));
190+
connect(uUpsDevSta, edg.u) annotation (Line(points={{-180,-140},{-120,-140},{-120,
191+
134},{98,134}}, color={255,0,255}));
192+
connect(edg.y, lat.clr)
193+
annotation (Line(points={{122,134},{142,134}}, color={255,0,255}));
194+
connect(mulAnd1.y, edg2.u) annotation (Line(points={{102,220},{132,220},{132,212}},
195+
color={255,0,255}));
196+
connect(edg2.y, lat.u) annotation (Line(points={{132,188},{132,140},{142,140}},
197+
color={255,0,255}));
198+
connect(uUpsDevSta, mulAnd1.u[1]) annotation (Line(points={{-180,-140},{-120,-140},
199+
{-120,134},{68,134},{68,212},{70,212},{70,220},{78,220}}, color
200+
={255,0,255}));
201+
connect(or2.y, mulAnd1.u[2:nBoi+1]) annotation (Line(points={{62,220},{70,220},{70,
202+
220},{78,220}}, color={255,0,255}));
203+
connect(uHotWatIsoVal, or1.u2) annotation (Line(points={{-180,-100},{110,-100},
204+
{110,-48},{118,-48}}, color={255,0,255}));
205+
connect(or1.y, yHotWatIsoVal) annotation (Line(points={{142,-40},{170,-40},{170,
206+
0},{200,0}}, color={255,0,255}));
207+
connect(or3.y, and1.u1)
208+
annotation (Line(points={{52,40},{70,40}}, color={255,0,255}));
209+
connect(uHotWatIsoVal, and1.u2) annotation (Line(points={{-180,-100},{60,-100},
210+
{60,32},{70,32}}, color={255,0,255}));
211+
connect(and1.y, yHotWatIsoVal) annotation (Line(points={{94,40},{168,40},{168,
212+
0},{200,0}}, color={255,0,255}));
203213
annotation (
204214
defaultComponentName="hotWatIsoVal",
205215
Diagram(

‎Buildings/Controls/OBC/ASHRAE/G36/Plants/Boilers/Staging/Processes/Up.mo‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ protected
355355
annotation (Placement(transformation(extent={{250,-50},{270,-30}})));
356356
CDL.Logical.Or or5
357357
"Pass signal when plant is enabled or when stage-up process is initiated"
358-
annotation (Placement(transformation(extent={{-200,-90},{-180,-70}})));
358+
annotation (Placement(transformation(extent={{-132,8},{-112,28}})));
359359
equation
360360
connect(nexBoi.yNexEnaBoi, enaHotWatIsoVal.nexChaBoi) annotation (Line(points={{-148,
361361
-51},{-90,-51},{-90,8},{-72,8}}, color={255,127,0}));
@@ -578,18 +578,19 @@ equation
578578
annotation (Line(points={{222,-40},{248,-40}}, color={255,0,255}));
579579
connect(or4.y, yHotWatIsoVal) annotation (Line(points={{272,-40},{274,-40},{
580580
274,-70},{300,-70}}, color={255,0,255}));
581-
connect(lat2.y, or5.u2) annotation (Line(points={{-158,-120},{-152,-120},{-152,
582-
-104},{-216,-104},{-216,-88},{-202,-88}}, color={255,0,255}));
583-
connect(lat.y, or5.u1) annotation (Line(points={{-200,0},{-196,0},{-196,-64},{
584-
-216,-64},{-216,-80},{-202,-80}}, color={255,0,255}));
585-
connect(or5.y, enaHotWatIsoVal.chaPro) annotation (Line(points={{-178,-80},{-120,
586-
-80},{-120,-8},{-72,-8}}, color={255,0,255}));
587-
connect(or5.y, enaBoi.uStaUp) annotation (Line(points={{-178,-80},{-120,-80},{
588-
-120,-8},{-84,-8},{-84,20},{52,20},{52,6},{58,6}}, color={255,0,255}));
589581
connect(uStaChaPro, nexBoi.uStachaPro) annotation (Line(points={{-260,-150},{-228,
590582
-150},{-228,-68},{-172,-68},{-172,-67}}, color={255,0,255}));
591583
connect(uBoi, enaBoi.uBoi) annotation (Line(points={{-260,80},{48,80},{48,-2},
592584
{58,-2}}, color={255,0,255}));
585+
connect(or5.y, enaHotWatIsoVal.chaPro) annotation (Line(points={{-110,18},{-88,
586+
18},{-88,-8},{-72,-8}}, color={255,0,255}));
587+
connect(or5.y, enaBoi.uStaUp) annotation (Line(points={{-110,18},{52,18},{52,6},
588+
{58,6}}, color={255,0,255}));
589+
connect(lat.y, or5.u1) annotation (Line(points={{-200,0},{-196,0},{-196,24},{-184,
590+
24},{-184,40},{-134,40},{-134,18}}, color={255,0,255}));
591+
connect(lat2.y, or5.u2) annotation (Line(points={{-158,-120},{-152,-120},{-152,
592+
-80},{-180,-80},{-180,-40},{-144,-40},{-144,-24},{-140,-24},{-140,4},{
593+
-144,4},{-144,10},{-134,10}}, color={255,0,255}));
593594
annotation (
594595
defaultComponentName="upProCon",
595596
Diagram(coordinateSystem(preserveAspectRatio=false,

‎Buildings/Controls/OBC/ASHRAE/G36/Plants/Boilers/Staging/Processes/Validation/Up.mo‎

Lines changed: 46 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,16 @@ model Up
338338
annotation (Placement(transformation(extent={{270,-150},{290,-130}})));
339339
CDL.Logical.Or or15
340340
annotation (Placement(transformation(extent={{240,-150},{260,-130}})));
341+
CDL.Integers.Equal intEqu15
342+
annotation (Placement(transformation(extent={{-268,10},{-248,30}})));
343+
CDL.Routing.BooleanScalarReplicator booScaRep15(nout=nBoi)
344+
annotation (Placement(transformation(extent={{-240,10},{-220,30}})));
345+
CDL.Logical.And and16
346+
[nBoi]
347+
annotation (Placement(transformation(extent={{-212,10},{-192,30}})));
348+
CDL.Logical.Or or16
349+
[nBoi]
350+
annotation (Placement(transformation(extent={{-160,30},{-140,50}})));
341351
protected
342352
CDL.Logical.Pre pre20[nBoi] "Logical pre block"
343353
annotation (Placement(transformation(extent={{-60,180},{-40,200}})));
@@ -358,7 +368,7 @@ protected
358368

359369
Buildings.Controls.OBC.CDL.Integers.Sources.Constant conInt2[nSta](
360370
final k={1,2,2}) "Stage type vector"
361-
annotation (Placement(transformation(extent={{-240,200},{-220,220}})));
371+
annotation (Placement(transformation(extent={{-240,190},{-220,210}})));
362372

363373
Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul(
364374
final width=0.1/3600,
@@ -687,6 +697,13 @@ protected
687697
protected
688698
CDL.Logical.Pre pre19[nBoi] "Logical pre block"
689699
annotation (Placement(transformation(extent={{430,-120},{410,-100}})));
700+
CDL.Logical.Sources.Constant con27
701+
[nBoi](final k={false,false})
702+
"Boiler setpoints for stage 3"
703+
annotation (Placement(transformation(extent={{-370,10},{-350,30}})));
704+
CDL.Integers.Sources.Constant conInt21(final k=0)
705+
"Stage 3 setpoint"
706+
annotation (Placement(transformation(extent={{-340,20},{-320,40}})));
690707
equation
691708

692709
connect(upProCon.yPumChaPro, yPumChaPro.u) annotation (Line(points={{-138,178},
@@ -695,9 +712,8 @@ equation
695712
connect(yPumChaPro.y, falEdg.u)
696713
annotation (Line(points={{-98,160},{-92,160}}, color={255,0,255}));
697714

698-
connect(conInt2.y, upProCon.uStaTyp) annotation (Line(points={{-218,210},{
699-
-210,210},{-210,184},{-162,184}},
700-
color={255,127,0}));
715+
connect(conInt2.y, upProCon.uStaTyp) annotation (Line(points={{-218,200},{-210,
716+
200},{-210,184},{-162,184}}, color={255,127,0}));
701717

702718
connect(con3.y, upProCon.THotWatSupSet) annotation (Line(points={{-198,250},{
703719
-172,250},{-172,204},{-162,204}}, color={0,0,
@@ -818,8 +834,8 @@ equation
818834
{610,290},{610,268},{590,268},{590,206},{598,206}}, color={0,0,
819835
127}));
820836

821-
connect(pre2.y, upProCon.uStaChaPro) annotation (Line(points={{-38,220},{0,
822-
220},{0,132},{-172,132},{-172,172},{-162,172}},
837+
connect(pre2.y, upProCon.uStaChaPro) annotation (Line(points={{-38,220},{-20,220},
838+
{-20,132},{-172,132},{-172,172},{-162,172}},
823839
color={255,0,255}));
824840
connect(pre6.y, upProCon1.uStaChaPro) annotation (Line(points={{332,220},{370,
825841
220},{370,100},{186,100},{186,172},{208,172}}, color={255,0,255}));
@@ -887,8 +903,6 @@ equation
887903
100},{-160,100}}, color={255,0,255}));
888904
connect(and1.y, or2.u2) annotation (Line(points={{-186,90},{-186,92},{-160,92}},
889905
color={255,0,255}));
890-
connect(and3.y, or7.u2) annotation (Line(points={{-186,60},{-132,60},{-132,82},
891-
{-120,82}}, color={255,0,255}));
892906
connect(or2.y, or7.u1) annotation (Line(points={{-136,100},{-132,100},{-132,
893907
90},{-120,90}}, color={255,0,255}));
894908
connect(or7.y, upProCon.uBoiSet) annotation (Line(points={{-96,90},{-92,90},{
@@ -899,14 +913,11 @@ equation
899913
-340,180},{-332,180}}, color={255,0,255}));
900914
connect(booPul.y, upProCon.uPlaEna) annotation (Line(points={{-348,230},{-200,
901915
230},{-200,176},{-162,176}}, color={255,0,255}));
902-
connect(pre2.y, pre14.u) annotation (Line(points={{-38,220},{0,220},{0,132},{
903-
-172,132},{-172,162},{-374,162},{-374,176},{-372,176}}, color={255,0,
916+
connect(pre2.y, pre14.u) annotation (Line(points={{-38,220},{-20,220},{-20,132},
917+
{-172,132},{-172,162},{-374,162},{-374,176},{-372,176}},color={255,0,
904918
255}));
905919
connect(pre14.y, or6.u2) annotation (Line(points={{-348,176},{-348,172},{-332,
906920
172}}, color={255,0,255}));
907-
connect(pre14.y, upProCon.uStaUpPro) annotation (Line(points={{-348,176},{
908-
-344,176},{-344,194},{-240,194},{-240,188},{-162,188}}, color={255,0,
909-
255}));
910921
connect(or8.u2, pre3.y)
911922
annotation (Line(points={{38,202},{40,200},{32,200}}, color={255,0,255}));
912923
connect(booPul1.y, or8.u1) annotation (Line(points={{22,236},{32,236},{32,228},
@@ -1176,11 +1187,31 @@ equation
11761187
annotation (Line(points={{432,-140},{432,-110}}, color={255,0,255}));
11771188
connect(pre19.y, upProCon3.uBoi)
11781189
annotation (Line(points={{408,-110},{408,-146}}, color={255,0,255}));
1190+
connect(pre14.y, upProCon.uStaUpPro) annotation (Line(points={{-348,176},{-344,
1191+
176},{-344,200},{-248,200},{-248,220},{-184,220},{-184,188},{-162,188}},
1192+
color={255,0,255}));
1193+
connect(and3.y, or16.u1) annotation (Line(points={{-186,60},{-172,60},{-172,
1194+
40},{-162,40}}, color={255,0,255}));
1195+
connect(and16.y, or16.u2) annotation (Line(points={{-190,20},{-162,20},{-162,
1196+
32}}, color={255,0,255}));
1197+
connect(booScaRep15.y, and16.u1)
1198+
annotation (Line(points={{-218,20},{-214,20}}, color={255,0,255}));
1199+
connect(intEqu15.y, booScaRep15.u)
1200+
annotation (Line(points={{-246,20},{-242,20}}, color={255,0,255}));
1201+
connect(conInt21.y, intEqu15.u2) annotation (Line(points={{-318,30},{-280,30},
1202+
{-280,12},{-270,12}}, color={255,127,0}));
1203+
connect(onCouInt.y, intEqu15.u1) annotation (Line(points={{-276,180},{-276,20},
1204+
{-270,20}}, color={255,127,0}));
1205+
connect(con27.y, and16.u2) annotation (Line(points={{-348,20},{-348,4},{-214,
1206+
4},{-214,12}}, color={255,0,255}));
1207+
connect(or16.y, or7.u2) annotation (Line(points={{-138,40},{-132,40},{-132,82},
1208+
{-120,82}}, color={255,0,255}));
11791209
annotation (
11801210
experiment(
1181-
StopTime=900,
1211+
StopTime=1800,
11821212
Interval=1,
1183-
Tolerance=1e-06),
1213+
Tolerance=1e-06,
1214+
__Dymola_Algorithm="Dassl"),
11841215
__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36/Plants/Boilers/Staging/Processes/Validation/Up.mos"
11851216
"Simulate and plot"),
11861217
Documentation(info="<html>

0 commit comments

Comments
 (0)