@@ -767,21 +767,19 @@ block Controller "Chiller plant controller"
767767 Buildings.Controls.OBC.CDL.Interfaces.RealInput VChiWat_flow(
768768 final quantity= "VolumeFlowRate" ,
769769 final unit= "m3/s" )
770- "Measured chilled water volume flow rate"
770+ "Measured chilled water volume flow rate for primary-only plant "
771771 annotation(Placement(transformation(extent={{-940,420},{-900,460}}),
772772 iconTransformation(extent={{-140,200},{-100,240}})));
773773
774774 Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uChi[nChi]
775- "Vector of chiller proven on status: true=ON "
775+ "Vector of chiller status"
776776 annotation(Placement(transformation(extent={{-940,380},{-900,420}}),
777777 iconTransformation(extent={{-140,180},{-100,220}})));
778778
779- Buildings.Controls.OBC.CDL.Interfaces.RealInput TOutWet(
780- final unit= "K" ,
781- displayUnit= "degC" ,
782- final quantity= "ThermodynamicTemperature" ) if have_WSE
783- "Outdoor air wet bulb temperature"
784- annotation(Placement(transformation(extent={{-940,340},{-900,380}}),
779+ Buildings.Controls.OBC.CDL.Interfaces.RealInput phi(
780+ final unit= "1" )
781+ if have_WSE "Outdoor relative humidity"
782+ annotation (Placement(transformation(extent={{-940,340},{-900,380}}),
785783 iconTransformation(extent={{-140,140},{-100,180}})));
786784
787785 Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatRetDow(
@@ -1585,6 +1583,10 @@ block Controller "Chiller plant controller"
15851583 "Replicate boolean input"
15861584 annotation (Placement(transformation(extent={{780,-590},{800,-570}})));
15871585
1586+ Buildings.Controls.OBC.CDL.Psychrometrics.WetBulb_TDryBulPhi wetBul if have_WSE
1587+ "Wet bulb temperature"
1588+ annotation (Placement(transformation(extent={{-860,360},{-840,380}})));
1589+
15881590protected
15891591
15901592 final parameter Boolean anyVsdCen = sum ({
@@ -1629,8 +1631,8 @@ equation
16291631 -630,-580},{-268,-580}}, color={255,0,255}));
16301632 connect (plaEna.yPla, towCon.uPla) annotation(Line(points={{-658,-520},{-580,-520},
16311633 {-580,-636},{-268,-636}}, color={255,0,255}));
1632- connect (TOutWet , staSetCon.TOutWet) annotation(Line(points={{-920,360},{-870,360 },
1633- {-870 ,-20},{-268,-20}}, color={0,0,127}));
1634+ connect (wetBul.TWetBul , staSetCon.TOutWet) annotation(Line(points={{-838,370 },
1635+ {-756,370},{-756 ,-20},{-268,-20}}, color={0,0,127}));
16341636 connect (mulMax.y, staSetCon.uTowFanSpeMax) annotation(Line(points={{-38,-580},
16351637 {0,-580},{0,-360},{-780,-360},{-780,-36},{-268,-36}},
16361638 color={0,0,127}));
@@ -1681,10 +1683,9 @@ equation
16811683 connect (chiWatSupSet.TChiWatSupSet, towCon.TChiWatSupSet) annotation(Line(
16821684 points={{-476,428},{-380,428},{-380,-604},{-268,-604}},color={0,0,127}));
16831685 connect (dowProCon.uChiLoa, uChiLoa) annotation(Line(points={{172,-176},{-830,
1684- -176},{-830,140},{-920,140}},
1685- color={0,0,127}));
1686+ -176},{-830,140},{-920,140}}, color={0,0,127}));
16861687 connect (dowProCon.uChiWatIsoVal, uChiWatIsoVal) annotation(Line(points={{172,-228},
1687- {-920,-228}}, color={0,0,127}));
1688+ {-920,-228}}, color={0,0,127}));
16881689 connect (uChiWatIsoVal, upProCon.uChiWatIsoVal) annotation(Line(points={{-920,-228},
16891690 {110,-228},{110,292},{172,292}}, color={0,0,127}));
16901691 connect (chiWatSupSet.dpChiWatPumSet, chiWatPumCon.dpChiWatSet_remote)
@@ -1728,11 +1729,9 @@ equation
17281729 connect (towCon.uFanSpe, uFanSpe)
17291730 annotation (Line(points={{-268,-588},{-920,-588}}, color={0,0,127}));
17301731 connect (upProCon.uConWatReq, uConWatReq) annotation (Line(points={{172,352},{
1731- 80,352},{80,610},{-920,610}},
1732- color={255,0,255}));
1732+ 80,352},{80,610},{-920,610}}, color={255,0,255}));
17331733 connect (upProCon.uChiWatReq, uChiWatReq) annotation (Line(points={{172,284},{
1734- 90,284},{90,640},{-920,640}},
1735- color={255,0,255}));
1734+ 90,284},{90,640},{-920,640}}, color={255,0,255}));
17361735 connect (uChiWatReq, dowProCon.uChiWatReq) annotation (Line(points={{-920,640},
17371736 {90,640},{90,-240},{172,-240}}, color={255,0,255}));
17381737 connect (uConWatReq, dowProCon.uConWatReq) annotation (Line(points={{-920,610},
@@ -1742,8 +1741,7 @@ equation
17421741 connect (wseSta.y, booRep.u) annotation (Line(points={{-656,326},{-630,326},{-630,
17431742 250},{-622,250}}, color={255,0,255}));
17441743 connect (booRep.y, heaPreCon.uWSE) annotation (Line(points={{-598,250},{-560,
1745- 250},{-560,188},{-524,188}},
1746- color={255,0,255}));
1744+ 250},{-560,188},{-524,188}}, color={255,0,255}));
17471745 connect (TConWatRet, conWatRetTem.u) annotation (Line(points={{-920,240},{-682,
17481746 240}}, color={0,0,127}));
17491747 connect (conWatRetTem.y, heaPreCon.TConWatRet) annotation (Line(points={{-658,240},
@@ -1770,7 +1768,7 @@ equation
17701768 connect (mulMax1.y, upProCon.uConWatPumSpeSet) annotation (Line(points={{-438,160},
17711769 {-400,160},{-400,336},{172,336}}, color={0,0,127}));
17721770 connect (upProCon.yChiWatMinFloSet, chiMinFloSet.u1) annotation (Line(points={{268,404},
1773- {350,404},{350,128},{478,128}}, color={0,0,127}));
1771+ {350,404},{350,128},{478,128}}, color={0,0,127}));
17741772 connect (dowProCon.yChiWatMinFloSet, chiMinFloSet.u3) annotation (Line(points={{268,
17751773 -284},{350,-284},{350,112},{478,112}}, color={0,0,127}));
17761774 connect (chiMinFloSet.y, minBypValCon.VChiWatSet_flow) annotation (Line(points={{502,120},
@@ -1783,8 +1781,7 @@ equation
17831781 connect (dowProCon.yChi, uChiStaPro.u3) annotation (Line(points={{268,-172},{620,
17841782 -172},{620,342},{638,342}}, color={255,0,255}));
17851783 connect (staSetCon.yCapReq, towCon.reqPlaCap) annotation (Line(points={{-172,-64},
1786- {-160,-64},{-160,-500},{-370,-500},{-370,-612},{-268,-612}}, color=
1787- {0,0,127}));
1784+ {-160,-64},{-160,-500},{-370,-500},{-370,-612},{-268,-612}}, color={0,0,127}));
17881785 connect (equRot.yDevRol, intSwi.u2) annotation (Line(points={{282,574},{310,574},
17891786 {310,580},{378,580}}, color={255,0,255}));
17901787 connect (conInt1.y, intSwi.u1) annotation (Line(points={{342,610},{360,610},{360,
@@ -1803,8 +1800,6 @@ equation
18031800 340,-144},{340,314},{378,314}}, color={255,0,255}));
18041801 connect (VChiWat_flow, wseSta.VChiWat_flow) annotation (Line(points={{-920,440},
18051802 {-880,440},{-880,328},{-704,328}}, color={0,0,127}));
1806- connect (TOutWet, wseSta.TOutWet) annotation (Line(points={{-920,360},{-870,360},
1807- {-870,340},{-704,340}}, color={0,0,127}));
18081803 connect (pre2.y, towCon.uTowStaCha) annotation (Line(points={{122,-440},{180,
18091804 -440},{180,-512},{-320,-512},{-320,-692},{-268,-692}}, color={255,0,255}));
18101805 connect (staCooTow.y, pre2.u) annotation (Line(points={{502,-120},{590,-120},{
@@ -2075,6 +2070,12 @@ equation
20752070 {-140,-564},{-140,-454},{-310,-454},{-310,28},{-268,28}}, color={0,0,127}));
20762071 connect (towCon.yLifMin, staSetCon.uLifMin) annotation (Line(points={{-172,-572},
20772072 {-130,-572},{-130,-446},{-300,-446},{-300,20},{-268,20}}, color={0,0,127}));
2073+ connect (wetBul.TWetBul, wseSta.TOutWet) annotation (Line(points={{-838,370},{-756,
2074+ 370},{-756,340},{-704,340}}, color={0,0,127}));
2075+ connect (TOut, wetBul.TDryBul) annotation (Line(points={{-920,-520},{-888,-520},
2076+ {-888,376},{-862,376}}, color={0,0,127}));
2077+ connect (phi, wetBul.phi) annotation (Line(points={{-920,360},{-872,360},{-872,
2078+ 364},{-862,364}}, color={0,0,127}));
20782079annotation (
20792080 defaultComponentName="chiPlaCon" ,
20802081 Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-400},{100,400}}),
@@ -2127,7 +2128,7 @@ annotation (
21272128 Text(
21282129 extent={{-100,166},{-68,156}},
21292130 textColor={0,0,127},
2130- textString="TOutWet " ,
2131+ textString="phi " ,
21312132 visible=have_WSE),
21322133 Text(
21332134 extent={{-98,148},{-50,134}},
0 commit comments