diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/BypassValve/BypassValvePosition.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/BypassValve/BypassValvePosition.mo index 2551a538e68..39eae7fa0f0 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/BypassValve/BypassValvePosition.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/BypassValve/BypassValvePosition.mo @@ -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=" @@ -190,11 +190,5 @@ annotation (defaultComponentName="bypValPos", First implementation. - "), - experiment( - StartTime=-1814400, - StopTime=1814400, - Interval=1, - Tolerance=1e-06, - __Dymola_Algorithm="Dassl")); + ")); end BypassValvePosition; diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/BypassValve/Validation/BypassValvePosition.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/BypassValve/Validation/BypassValvePosition.mo index 685d80feb23..2cbf2ebfdc3 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/BypassValve/Validation/BypassValvePosition.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/BypassValve/Validation/BypassValvePosition.mo @@ -101,6 +101,5 @@ First implementation. StartTime=0, StopTime=300, Interval=1, - Tolerance=1e-06, - __Dymola_Algorithm="Cvode")); + Tolerance=1e-06)); end BypassValvePosition; diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/BypassValve/Validation/package.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/BypassValve/Validation/package.mo index 39482e417ba..e9aa405304f 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/BypassValve/Validation/package.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/BypassValve/Validation/package.mo @@ -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=" +

+This package contains validation models for the classes in + +Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.BypassValve. +

+")); end Validation; diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Controller.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Controller.mo index 6379c32391a..1385924af7b 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Controller.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Controller.mo @@ -57,7 +57,7 @@ model Controller "Number of rows to be created for plant schedule table" annotation(dialog(tab="Plant enable/disable parameters")); - parameter Integer nBoi = 2 + parameter Integer nBoi "Number of boilers" annotation(Dialog(tab="General", group="Boiler plant configuration parameters")); @@ -67,7 +67,7 @@ model Controller "Boiler type" annotation(Dialog(tab="General", group="Boiler plant configuration parameters")); - parameter Integer nSta = 3 + parameter Integer nSta "Number of boiler plant stages" annotation(Dialog(tab="General", group="Boiler plant configuration parameters")); @@ -75,7 +75,7 @@ model Controller "Staging matrix with stage as row index and boiler as column index" annotation(Dialog(tab="General", group="Boiler plant configuration parameters")); - parameter Integer nPumPri = 2 + parameter Integer nPumPri "Number of primary pumps in the boiler plant loop" annotation(Dialog(tab="General", group="Boiler plant configuration parameters")); @@ -83,7 +83,7 @@ model Controller "Number of hot-water supply temperature reset requests to be ignored" annotation(Dialog(tab="Supply temperature reset parameters", group="Trim-and-Respond Logic parameters")); - parameter Integer nSenPri = 1 + parameter Integer nSenPri "Total number of remote differential pressure sensors in primary loop" annotation(Dialog(tab="General", group="Boiler plant configuration parameters", @@ -101,11 +101,11 @@ model Controller "Total number of pumps that operate at design conditions" annotation (Dialog(group="Boiler plant configuration parameters")); - parameter Integer nPumSec = 2 + parameter Integer nPumSec "Total number of secondary hot water pumps" annotation (Dialog(group="Boiler plant configuration parameters")); - parameter Integer nSenSec = 1 + parameter Integer nSenSec "Total number of remote differential pressure sensors in secondary loop" annotation (Dialog(group="Boiler plant configuration parameters")); @@ -521,7 +521,7 @@ model Controller final min=1e-6, final unit="m3/s", displayUnit="m3/s", - final quantity="VolumeFlowRate") = 0.5 + final quantity="VolumeFlowRate") "Plant design hot water flow rate thorugh primary loop" annotation (Dialog(group="Boiler plant configuration parameters")); @@ -529,7 +529,7 @@ model Controller final min=1e-6, final unit="m3/s", displayUnit="m3/s", - final quantity="VolumeFlowRate") = {0.5,0.5} + final quantity="VolumeFlowRate") "Vector of design flowrates for all boilers in plant" annotation (Dialog(group="Boiler plant configuration parameters")); @@ -899,8 +899,8 @@ model Controller annotation (Placement(transformation(extent={{-440,-460},{-400,-420}}), iconTransformation(extent={{-140,-250},{-100,-210}}))); - Buildings.Controls.OBC.CDL.Interfaces.IntegerInput supResReq - "Hot water supply reset requests" + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput plaReq + "Plant requests" annotation (Placement(transformation(extent={{-440,330},{-400,370}}), iconTransformation(extent={{-140,270},{-100,310}}))); @@ -1042,45 +1042,58 @@ model Controller Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput yBoi[nBoi] "Boiler status vector" annotation (Placement(transformation(extent={{400,180},{440,220}}), - iconTransformation(extent={{100,120},{140,160}}))); + iconTransformation(extent={{100,80},{140,120}}))); Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput yPriPum[nPumPri] "Primary pump enable status vector" annotation (Placement(transformation(extent={{400,-150},{440,-110}}), - iconTransformation(extent={{100,-40},{140,0}}))); + iconTransformation(extent={{100,-80},{140,-40}}))); Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput ySecPum[nPumSec] if not have_priOnl "Secondary pump enable status vector" annotation (Placement(transformation(extent={{400,-360},{440,-320}}), - iconTransformation(extent={{100,-120},{140,-80}}))); + iconTransformation(extent={{100,-160},{140,-120}}))); + + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput yPla + "Plant enable signal" + annotation (Placement(transformation(extent={{400,280},{440,320}}), + iconTransformation(extent={{100,160},{140,200}}))); + + Buildings.Controls.OBC.CDL.Interfaces.RealOutput TPlaHotWatSupSet( + final unit="K", + displayUnit="K", + final quantity="ThermodynamicTemperature") + "Plant hot water supply temperature setpoint" + annotation (Placement(transformation(extent={{400,220},{440,260}}), + iconTransformation(extent={{100,120},{140,160}}))); Buildings.Controls.OBC.CDL.Interfaces.RealOutput yHotWatIsoVal[nBoi]( final unit=fill("1",nBoi), displayUnit=fill("1",nBoi)) if have_heaPriPum "Boiler hot water isolation valve position vector" annotation (Placement(transformation(extent={{400,100},{440,140}}), - iconTransformation(extent={{100,40},{140,80}}))); + iconTransformation(extent={{100,0},{140,40}}))); Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPriPumSpe( final unit="1", displayUnit="1") if have_varPriPum "Primary pump speed" annotation (Placement(transformation(extent={{400,-190},{440,-150}}), - iconTransformation(extent={{100,-80},{140,-40}}))); + iconTransformation(extent={{100,-120},{140,-80}}))); Buildings.Controls.OBC.CDL.Interfaces.RealOutput yBypValPos( final unit="1", displayUnit="1") if have_priOnl "Bypass valve position" annotation (Placement(transformation(extent={{400,-50},{440,-10}}), - iconTransformation(extent={{100,0},{140,40}}))); + iconTransformation(extent={{100,-40},{140,0}}))); Buildings.Controls.OBC.CDL.Interfaces.RealOutput ySecPumSpe( final unit="1", displayUnit="1") if not have_priOnl and have_varSecPum "Secondary pump speed vector" annotation (Placement(transformation(extent={{400,-410},{440,-370}}), - iconTransformation(extent={{100,-160},{140,-120}}))); + iconTransformation(extent={{100,-200},{140,-160}}))); Buildings.Controls.OBC.CDL.Interfaces.RealOutput TBoiHotWatSupSet[nBoi]( final unit=fill("K", nBoi), @@ -1088,7 +1101,7 @@ model Controller final quantity=fill("ThermodynamicTemperature", nBoi)) "Boiler hot water supply temperature setpoint vector" annotation (Placement(transformation(extent={{400,150},{440,190}}), - iconTransformation(extent={{100,80},{140,120}}))); + iconTransformation(extent={{100,40},{140,80}}))); Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.Generic.PlantEnable plaEna( final nIgnReq=nIgnReq, @@ -1168,6 +1181,27 @@ protected parameter Integer secPumInd[nPumSec]={i for i in 1:nPumSec} "Vector of secondary pump indices up to total number of secondary pumps"; + Buildings.Controls.OBC.CDL.Continuous.IntegratorWithReset intWitRes + "Used to break algebraic loop and sample staging setpoint signal" + annotation (Placement(transformation(extent={{-210,360},{-190,380}}))); + + Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con1( + final k=0) + "Constant zero signal source for integrator input" + annotation (Placement(transformation(extent={{-130,360},{-110,380}}))); + + Buildings.Controls.OBC.CDL.Continuous.IntegratorWithReset intWitRes1 + "Used to break algebraic loop and sample next boiler index to be enabled/disabled" + annotation (Placement(transformation(extent={{90,370},{110,390}}))); + + Buildings.Controls.OBC.CDL.Integers.Change cha1 + "Detect changes in staging setpoint signal" + annotation (Placement(transformation(extent={{-220,320},{-200,340}}))); + + Buildings.Controls.OBC.CDL.Integers.Change cha2 + "Detect changes to boiler index that is next enabled/disabled" + annotation (Placement(transformation(extent={{76,344},{96,364}}))); + Buildings.Controls.OBC.CDL.Continuous.MultiMax mulMax( final nin=nPumPri) if not have_priOnl "Identify maximum measured pump speed" @@ -1179,7 +1213,7 @@ protected Buildings.Controls.OBC.CDL.Logical.MultiOr mulOr( final nin=nPumPri) - "Multi Or" + "Pass true signal when any of the pump statuses change" annotation (Placement(transformation(extent={{200,-430},{220,-410}}))); Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.Staging.Processes.Up upProCon( @@ -1204,7 +1238,7 @@ protected final have_heaPriPum=have_heaPriPum, final nBoi=nBoi, final nSta=nSta, - delEnaMinFloSet=delEnaMinFloSet, + final delEnaMinFloSet=delEnaMinFloSet, final chaIsoValTim=chaIsoValTim, final delPreBoiEna=delPreBoiEna, final boiChaProOnTim=boiChaProOnTim, @@ -1282,7 +1316,7 @@ protected annotation (Placement(transformation(extent={{-140,170},{-120,190}}))); Buildings.Controls.OBC.CDL.Logical.Or or2 - "Logical Or" + "Pass true signal at completion of stage up or stage down process" annotation (Placement(transformation(extent={{180,60},{200,80}}))); Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.SetPoints.CondensationControl conSet( @@ -1301,11 +1335,11 @@ protected annotation (Placement(transformation(extent={{-50,350},{-30,370}}))); Buildings.Controls.OBC.CDL.Logical.Switch logSwi - "Logical switch" + "Switch input signal between stage-up and stage-down processes" annotation (Placement(transformation(extent={{22,320},{42,340}}))); Buildings.Controls.OBC.CDL.Integers.Switch intSwi - "Integer switch" + "Switch input signal between stage-up and stage-down processes" annotation (Placement(transformation(extent={{20,370},{40,390}}))); Buildings.Controls.OBC.CDL.Logical.Latch lat1 @@ -1360,7 +1394,7 @@ protected annotation (Placement(transformation(extent={{60,-180},{80,-160}}))); Buildings.Controls.OBC.CDL.Logical.Switch logSwi1[nBoi] - "Logical switch" + "Switch input signal between stage-up and stage-down processes" annotation (Placement(transformation(extent={{180,260},{200,280}}))); Buildings.Controls.OBC.CDL.Routing.BooleanScalarReplicator booRep( @@ -1369,7 +1403,7 @@ protected annotation (Placement(transformation(extent={{120,260},{140,280}}))); Buildings.Controls.OBC.CDL.Continuous.Switch swi[nBoi] if have_heaPriPum - "Real switch" + "Switch input signal between stage-up and stage-down processes" annotation (Placement(transformation(extent={{180,220},{200,240}}))); Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt1 @@ -1385,7 +1419,7 @@ protected annotation (Placement(transformation(extent={{-216,170},{-196,190}}))); Buildings.Controls.OBC.CDL.Logical.Pre pre6 if have_priOnl - "Logical pre block" + "Logical pre block to break algebraic loop" annotation (Placement(transformation(extent={{60,320},{80,340}}))); Buildings.Controls.OBC.CDL.Conversions.IntegerToReal intToRea2 @@ -1400,16 +1434,6 @@ protected "Logical pre block" annotation (Placement(transformation(extent={{300,-20},{320,0}}))); - Buildings.Controls.OBC.CDL.Discrete.UnitDelay uniDel( - final samplePeriod=60) - "Unit delay" - annotation (Placement(transformation(extent={{-210,360},{-190,380}}))); - - Buildings.Controls.OBC.CDL.Discrete.UnitDelay uniDel1( - final samplePeriod=60) - "Unit delay" - annotation (Placement(transformation(extent={{90,370},{110,390}}))); - Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.Generic.PlantDisable plaDis( final have_priOnl=have_priOnl, final have_heaPriPum=have_heaPriPum, @@ -1451,7 +1475,7 @@ protected annotation (Placement(transformation(extent={{120,-380},{140,-340}}))); Buildings.Controls.OBC.CDL.Integers.Switch intSwi1 if not have_priOnl - "Integer switch" + "Switch input signal between stage-up and stage-down processes" annotation (Placement(transformation(extent={{64,280},{84,300}}))); Buildings.Controls.OBC.CDL.Integers.Sources.Constant conInt3[nPumSec]( @@ -1527,8 +1551,8 @@ equation connect(conInt2.y, priPumCon.uPumLeaLag) annotation (Line(points={{82,-128},{ 86,-128},{86,-152.933},{118,-152.933}}, color={255,127,0})); - connect(supResReq, plaEna.supResReq) annotation (Line(points={{-420,350},{-360, - 350},{-360,334},{-342,334}}, color={255,127,0})); + connect(plaReq, plaEna.supResReq) annotation (Line(points={{-420,350},{-360,350}, + {-360,334},{-342,334}}, color={255,127,0})); connect(reaToInt.u, triSam.y) annotation (Line(points={{-130,-40},{-138,-40}}, color={0,0,127})); @@ -1577,13 +1601,16 @@ equation connect(booRep.y, logSwi1.u2) annotation (Line(points={{142,270},{178,270}}, color={255,0,255})); connect(upProCon.yHotWatIsoVal, swi.u1) annotation (Line(points={{142,100},{172, - 100},{172,238},{178,238}}, color={0,0,127})); + 100},{172,238},{178,238}}, + color={0,0,127})); connect(dowProCon.yHotWatIsoVal, swi.u3) annotation (Line(points={{142,44},{164, - 44},{164,222},{178,222}}, color={0,0,127})); + 44},{164,222},{178,222}}, + color={0,0,127})); connect(booRep.y, swi.u2) annotation (Line(points={{142,270},{160,270},{160,230}, {178,230}}, color={255,0,255})); connect(priPumCon.yPumSpe, yPriPumSpe) annotation (Line(points={{142,-183.733}, - {264,-183.733},{264,-170},{420,-170}}, color={0,0,127})); + {264,-183.733},{264,-170},{420,-170}}, + color={0,0,127})); connect(bypValPos.yBypValPos, yBypValPos) annotation (Line(points={{142,-40},{ 148,-40},{148,-30},{420,-30}}, color={0,0,127})); connect(staSetCon.ySta, intToRea1.u) annotation (Line(points={{-188,6},{20,6}, @@ -1595,15 +1622,19 @@ equation connect(plaEna.yPla, staSetCon.uPla) annotation (Line(points={{-318,330},{-230, 330},{-230,-10},{-212,-10}}, color={255,0,255})); connect(staSetCon.yChaEdg, pre4.u) annotation (Line(points={{-188,-2},{-180,-2}, - {-180,150},{-220,150},{-220,180},{-218,180}}, color={255,0,255})); - connect(pre4.y, lat1.u) annotation (Line(points={{-194,180},{-190,180}}, color={255,0,255})); + {-180,150},{-220,150},{-220,180},{-218,180}}, + color={255,0,255})); + connect(pre4.y, lat1.u) annotation (Line(points={{-194,180},{-190,180}}, + color={255,0,255})); connect(hotWatSupTemRes.TPlaHotWatSupSet, staSetCon.THotWatSupSet) annotation (Line(points={{-118,184},{-100,184},{-100,90},{-226,90},{-226,17}, - {-212,17}}, color={0,0,127})); + {-212,17}}, + color={0,0,127})); connect(reaToInt.y, conSet.uCurSta) annotation (Line(points={{-106,-40},{-80,-40}, {-80,-102},{-62,-102}}, color={255,127,0})); connect(reaToInt1.y, intToRea.u) annotation (Line(points={{-158,370},{-148,370}, - {-148,-22},{-196,-22},{-196,-40},{-192,-40}}, color={255,127,0})); + {-148,-22},{-196,-22},{-196,-40},{-192,-40}}, + color={255,127,0})); connect(reaToInt1.y, hotWatSupTemRes.uCurStaSet) annotation (Line(points={{-158, 370},{-148,370},{-148,172},{-142,172}}, color={255,127,0})); connect(minBoiFloSet.VHotWatMinSet_flow, upProCon.VMinHotWatSet_flow) @@ -1624,32 +1655,31 @@ equation connect(reaToInt2.y, minBoiFloSet.uLasDisBoi) annotation (Line(points={{142,380}, {150,380},{150,326},{248,326}}, color={255,127,0})); connect(upProCon.yStaChaPro, or2.u1) annotation (Line(points={{142,104},{168,104}, - {168,70},{178,70}}, color={255,0,255})); + {168,70},{178,70}}, color={255,0, + 255})); connect(dowProCon.yStaChaPro, or2.u2) annotation (Line(points={{142,48},{158,48}, {158,62},{178,62}}, color={255,0,255})); - connect(pre1.y, triSam.trigger) annotation (Line(points={{322,-10},{372,-10},{ - 372,-64},{-150,-64},{-150,-51.8}}, color={255,0,255})); + connect(pre1.y, triSam.trigger) annotation (Line(points={{322,-10},{372,-10}, + {372,-64},{-150,-64},{-150,-52}}, + color={255,0,255})); connect(pre1.y, staSetCon.uStaChaProEnd) annotation (Line(points={{322,-10},{372, - -10},{372,-64},{-209,-64},{-209,-20}}, color={255,0,255})); + -10},{372,-64},{-209,-64},{-209,-20}}, + color={255,0,255})); connect(pre1.y, minBoiFloSet.uStaChaPro) annotation (Line(points={{322,-10},{372, - -10},{372,300},{140,300},{140,318},{248,318}}, color={255,0,255})); + -10},{372,300},{140,300},{140,318},{248,318}}, + color={255,0,255})); connect(pre1.y, lat1.clr) annotation (Line(points={{322,-10},{372,-10},{372,164}, - {-192,164},{-192,174},{-190,174}}, color={255,0,255})); + {-192,164},{-192,174},{-190,174}}, + color={255,0,255})); connect(priPumCon.yHotWatPum, yPriPum) annotation (Line(points={{142,-176.267},{260,-176.267},{260,-130},{420,-130}}, color={255,0,255})); - connect(reaToInt1.u, uniDel.y) - annotation (Line(points={{-182,370},{-188,370}}, color={0,0,127})); - connect(intToRea1.y, uniDel.u) - annotation (Line(points={{-218,370},{-212,370}}, color={0,0,127})); - connect(reaToInt2.u, uniDel1.y) - annotation (Line(points={{118,380},{112,380}}, color={0,0,127})); - connect(intToRea2.y, uniDel1.u) - annotation (Line(points={{82,380},{88,380}}, color={0,0,127})); + connect(uBoiAva, staSetCon.uBoiAva) annotation (Line(points={{-420,70},{-300,70}, {-300,-16},{-212,-16}}, color={255,0,255})); connect(plaEna.yPla, upProCon.uPlaEna) annotation (Line(points={{-318,330},{ - -230,330},{-230,83},{118,83}}, color={255,0,255})); + -230,330},{-230,83},{118,83}}, color={255, + 0,255})); connect(plaDis.yHotWatIsoVal, yHotWatIsoVal) annotation (Line(points={{262,68}, {300,68},{300,120},{420,120}}, color={0,0,127})); connect(plaDis.yBoi, yBoi) annotation (Line(points={{262,76},{274,76},{274,200}, @@ -1668,8 +1698,8 @@ equation connect(plaEna.yPla, priPumCon.uPlaEna) annotation (Line(points={{-318,330},{ -230,330},{-230,-78},{90,-78},{90,-158.533},{118,-158.533}}, color={255,0,255})); - connect(hotWatSupTemRes.TPlaHotWatSupSet, upProCon.THotWatSup) annotation ( - Line(points={{-118,184},{-100,184},{-100,107},{118,107}}, color={0,0,127})); + connect(hotWatSupTemRes.TPlaHotWatSupSet, upProCon.THotWatSupSet) annotation + (Line(points={{-118,184},{-100,184},{-100,107},{118,107}}, color={0,0,127})); connect(TRetPri, staSetCon.THotWatRetPri) annotation (Line(points={{-420,230}, {-260,230},{-260,-1},{-212,-1}}, color={0,0,127})); connect(TRetSec, staSetCon.THotWatRetSec) annotation (Line(points={{-420,150}, @@ -1684,14 +1714,16 @@ equation 96,290},{96,-178.133},{118,-178.133}}, color={255,127,0})); connect(staSetCon.yChaUpEdg, priPumCon.uStaUp) annotation (Line(points={{-188,2}, - {58,2},{58,-74},{92,-74},{92,-169.733},{118,-169.733}}, color={255,0,255})); + {58,2},{58,-74},{92,-74},{92,-169.733},{118,-169.733}}, + color={255,0,255})); connect(logSwi.y, priPumCon.uOnOff) annotation (Line(points={{44,330},{50,330}, {50,-76},{98,-76},{98,-172.533},{118,-172.533}}, color={255,0,255})); connect(plaDis.yBoi, priPumCon.uBoiSta) annotation (Line(points={{262,76},{ 274,76},{274,-88},{112,-88},{112,-166.933},{118,-166.933}}, color={255,0,255})); connect(conSet.yMinPriPumSpe, priPumCon.uMinPriPumSpeCon) annotation (Line( - points={{-38,-102},{88,-102},{88,-193.067},{118,-193.067}}, color={0,0,127})); + points={{-38,-102},{88,-102},{88,-193.067},{118,-193.067}}, + color={0,0,127})); connect(conInt3.y, secPumCon.uPumLeaLag) annotation (Line(points={{82,-280},{90, -280},{90,-341.8},{118,-341.8}}, color={255,127,0})); connect(VHotWatSec_flow, priPumCon.VHotWatSec_flow) annotation (Line(points={{-420, @@ -1703,8 +1735,7 @@ equation color={0,0,127})); connect(TSupPri, priPumCon.THotWatPri) annotation (Line(points={{-420,270},{ -240,270},{-240,-84},{0,-84},{0,-186},{112,-186},{112,-201.467},{118, - -201.467}}, - color={0,0,127})); + -201.467}}, color={0,0,127})); connect(TSupSec, priPumCon.THotWatSec) annotation (Line(points={{-420,-150},{ -186,-150},{-186,-214},{2,-214},{2,-230},{108,-230},{108,-204.267},{ 118,-204.267}}, @@ -1714,8 +1745,9 @@ equation 118,-207.067}}, color={0,0,127})); connect(secPumCon.yHotWatPum, ySecPum) - annotation (Line(points={{142,-360},{220,-360},{220,-340},{420,-340}}, color={255,0,255})); - connect(supResReq, secPumCon.supResReq) annotation (Line(points={{-420,350},{-154, + annotation (Line(points={{142,-360},{220,-360},{220,-340},{420,-340}}, + color={255,0,255})); + connect(plaReq, secPumCon.supResReq) annotation (Line(points={{-420,350},{-154, 350},{-154,20},{14,20},{14,-354},{118,-354}}, color={255,127,0})); connect(plaEna.yPla, secPumCon.uPlaEna) annotation (Line(points={{-318,330},{-230, 330},{-230,-78},{12,-78},{12,-350},{118,-350}}, color={255,0,255})); @@ -1802,6 +1834,31 @@ equation 260,-370},{260,-390},{420,-390}}, color={0,0,127})); connect(hotWatSupTemRes.TBoiHotWatSupSet, TBoiHotWatSupSet) annotation (Line( points={{-118,176},{360,176},{360,170},{420,170}}, color={0,0,127})); + connect(intWitRes.y, reaToInt1.u) + annotation (Line(points={{-188,370},{-182,370}}, color={0,0,127})); + connect(intToRea1.y, intWitRes.y_reset_in) annotation (Line(points={{-218,370}, + {-216,370},{-216,362},{-212,362}}, color={0,0,127})); + connect(reaToInt2.u, intWitRes1.y) + annotation (Line(points={{118,380},{112,380}}, color={0,0,127})); + connect(intToRea2.y, intWitRes1.y_reset_in) annotation (Line(points={{82,380}, + {84,380},{84,372},{88,372}}, color={0,0,127})); + connect(con1.y, intWitRes.u) annotation (Line(points={{-108,370},{-100,370},{ + -100,392},{-214,392},{-214,370},{-212,370}}, color={0,0,127})); + connect(con1.y, intWitRes1.u) annotation (Line(points={{-108,370},{-100,370}, + {-100,398},{88,398},{88,380}}, color={0,0,127})); + connect(cha1.y, intWitRes.trigger) annotation (Line(points={{-198,330},{-190, + 330},{-190,352},{-200,352},{-200,358}}, color={255,0,255})); + connect(staSetCon.ySta, cha1.u) annotation (Line(points={{-188,6},{20,6},{20, + 300},{-226,300},{-226,330},{-222,330}}, color={255,127,0})); + connect(intSwi.y, cha2.u) annotation (Line(points={{42,380},{54,380},{54,354}, + {74,354}}, color={255,127,0})); + connect(cha2.y, intWitRes1.trigger) annotation (Line(points={{98,354},{100, + 354},{100,368}}, color={255,0,255})); + connect(hotWatSupTemRes.TPlaHotWatSupSet, TPlaHotWatSupSet) annotation (Line( + points={{-118,184},{320,184},{320,240},{420,240}}, color={0,0,127})); + connect(plaEna.yPla, yPla) annotation (Line(points={{-318,330},{-230,330},{-230, + 252},{-80,252},{-80,192},{380,192},{380,300},{420,300}}, color={255,0, + 255})); annotation (defaultComponentName="boiPlaCon", Icon(coordinateSystem(extent={{-100,-340},{100,340}}), graphics={ @@ -1812,7 +1869,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-120,378},{100,338}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Rectangle( extent={{-80,60},{82,-60}}, @@ -1824,8 +1881,8 @@ equation points={{-80,60},{-14,4},{-80,-60},{-80,60}}, lineColor={175,175,175}, fillColor={175,175,175}, - fillPattern=FillPattern.Solid)}), - Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-400,-620},{400,400}}), + fillPattern=FillPattern.Solid)}), Diagram( + coordinateSystem(preserveAspectRatio=false, extent={{-400,-620},{400,400}}), graphics={ Rectangle( extent={{-394,392},{-266,290}}, diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/ControllerTwo.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/ControllerTwo.mo index d2b15d94cd3..435721c6d50 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/ControllerTwo.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/ControllerTwo.mo @@ -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}, diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/ContinuousLeadSwapTwo.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/ContinuousLeadSwapTwo.mo index 4627e16acdf..27f30ef2de1 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/ContinuousLeadSwapTwo.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/ContinuousLeadSwapTwo.mo @@ -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="

This block ensures that the new lead device is started and proven on before the old diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/LeastRuntime.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/LeastRuntime.mo index fcb1f2b251f..87cbda05ac8 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/LeastRuntime.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/LeastRuntime.mo @@ -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) @@ -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}), diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/MinimumLeadRuntime.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/MinimumLeadRuntime.mo index e637e77c8e6..c2de9d8cb6b 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/MinimumLeadRuntime.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/MinimumLeadRuntime.mo @@ -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}), diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/Scheduler.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/Scheduler.mo index 3dcc18323e2..0d2cbda85b3 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/Scheduler.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/Scheduler.mo @@ -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}}, diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/Two.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/Two.mo index cc56b054605..24df5aa6b91 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/Two.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/Two.mo @@ -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( diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/Validation/LeastRuntime_uDevRol.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/Validation/LeastRuntime_uDevRol.mo index e78189fb57e..762c67b92cb 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/Validation/LeastRuntime_uDevRol.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/Validation/LeastRuntime_uDevRol.mo @@ -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).")})); diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/Validation/MinimumLeadRuntime_uDevRol.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/Validation/MinimumLeadRuntime_uDevRol.mo index 34beead0624..b20f295bba6 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/Validation/MinimumLeadRuntime_uDevRol.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/EquipmentRotation/Subsequences/Validation/MinimumLeadRuntime_uDevRol.mo @@ -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).")})); diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/PlantDisable.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/PlantDisable.mo index 9b81acd4029..e48efb69b1d 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/PlantDisable.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/PlantDisable.mo @@ -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}}, @@ -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, diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/PlantEnable.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/PlantEnable.mo index fbc4b3c034e..fee4e54e247 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/PlantEnable.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/PlantEnable.mo @@ -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), @@ -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}})), diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/RotationController.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/RotationController.mo index 5221e14a304..23d991f52e3 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/RotationController.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/RotationController.mo @@ -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) @@ -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}}, diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/Subsequences/HWIsoVal.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/Subsequences/HWIsoVal.mo index e3409a8e3cb..bd575cb02be 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/Subsequences/HWIsoVal.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/Subsequences/HWIsoVal.mo @@ -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},{ @@ -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")}), @@ -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( @@ -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=" diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/Validation/PlantEnable.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/Validation/PlantEnable.mo index 342031e6cf6..3f64d5b9f4b 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/Validation/PlantEnable.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/Validation/PlantEnable.mo @@ -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), @@ -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, diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/Validation/RotationController.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/Validation/RotationController.mo index 07fad97caa2..a4047c4cdda 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/Validation/RotationController.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/Validation/RotationController.mo @@ -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=" diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/Generic/ChangeStatus.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/Generic/ChangeStatus.mo index d7c55350e21..6b39b6f0096 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/Generic/ChangeStatus.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/Generic/ChangeStatus.mo @@ -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=" diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/Generic/EnableLag_flowrate.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/Generic/EnableLag_flowrate.mo index efa9749a5f4..5b71e3d685e 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/Generic/EnableLag_flowrate.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/Generic/EnableLag_flowrate.mo @@ -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=" diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/Generic/Speed_localDp.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/Generic/Speed_localDp.mo index 5d5a9accc31..0f06ef75f57 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/Generic/Speed_localDp.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/Generic/Speed_localDp.mo @@ -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}})), diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/Generic/Speed_remoteDp.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/Generic/Speed_remoteDp.mo index aa078b6b4bb..4eb29d22341 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/Generic/Speed_remoteDp.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/Generic/Speed_remoteDp.mo @@ -208,26 +208,26 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-100,150},{100,110}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Text( extent={{-98,92},{-44,70}}, - lineColor={255,0,255}, + textColor={255,0,255}, pattern=LinePattern.Dash, textString="uHotWatPum"), Text( extent={{-98,10},{-44,-12}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="dpHotWat"), 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")}), Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-120,-120},{120,120}})), diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Controller.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Controller.mo index a09747d3445..e58ecf17cde 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Controller.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Controller.mo @@ -1123,7 +1123,7 @@ annotation (defaultComponentName="priPumCon", pattern=LinePattern.None, fillColor={210,210,210}, fillPattern=FillPattern.Solid, - lineColor={0,0,127}, + textColor={0,0,127}, horizontalAlignment=TextAlignment.Right, textString="Enable lead pump"), Rectangle( @@ -1136,7 +1136,7 @@ annotation (defaultComponentName="priPumCon", pattern=LinePattern.None, fillColor={210,210,210}, fillPattern=FillPattern.Solid, - lineColor={0,0,127}, + textColor={0,0,127}, horizontalAlignment=TextAlignment.Right, textString="Enable next lag pump"), Text( @@ -1144,7 +1144,7 @@ annotation (defaultComponentName="priPumCon", pattern=LinePattern.None, fillColor={210,210,210}, fillPattern=FillPattern.Solid, - lineColor={0,0,127}, + textColor={0,0,127}, horizontalAlignment=TextAlignment.Right, textString="Disable last lag pump"), Rectangle( @@ -1157,7 +1157,7 @@ annotation (defaultComponentName="priPumCon", pattern=LinePattern.None, fillColor={210,210,210}, fillPattern=FillPattern.Solid, - lineColor={0,0,127}, + textColor={0,0,127}, horizontalAlignment=TextAlignment.Right, textString="Pump speed"), Rectangle( @@ -1170,7 +1170,7 @@ annotation (defaultComponentName="priPumCon", pattern=LinePattern.None, fillColor={210,210,210}, fillPattern=FillPattern.Solid, - lineColor={0,0,127}, + textColor={0,0,127}, horizontalAlignment=TextAlignment.Right, textString="Enable/Disable lag pumps for dedicated primary pumps"), Rectangle( @@ -1183,7 +1183,7 @@ annotation (defaultComponentName="priPumCon", pattern=LinePattern.None, fillColor={210,210,210}, fillPattern=FillPattern.Solid, - lineColor={0,0,127}, + textColor={0,0,127}, horizontalAlignment=TextAlignment.Left, textString="Enable/Disable lag pumps for headered pumps in @@ -1198,7 +1198,7 @@ primary-only")}), fillPattern=FillPattern.Solid), Text( extent={{-100,350},{100,310}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Rectangle( extent={{-80,60},{82,-60}}, diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Subsequences/EnableLead_dedicated.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Subsequences/EnableLead_dedicated.mo index decbddebe97..55a7b9fa0b7 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Subsequences/EnableLead_dedicated.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Subsequences/EnableLead_dedicated.mo @@ -83,7 +83,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)), Documentation(info=" diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Subsequences/EnableLead_headered.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Subsequences/EnableLead_headered.mo index 2cfea45398b..0b2aca9a262 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Subsequences/EnableLead_headered.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Subsequences/EnableLead_headered.mo @@ -72,16 +72,16 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-100,150},{100,110}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Text( extent={{-94,12},{-40,-10}}, - lineColor={255,0,255}, + textColor={255,0,255}, pattern=LinePattern.Dash, textString="uHotIsoVal"), Text( extent={{42,12},{96,-10}}, - lineColor={255,0,255}, + textColor={255,0,255}, pattern=LinePattern.Dash, textString="yLeaPum")}), Diagram(coordinateSystem(preserveAspectRatio=false)), diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Subsequences/Speed_flow.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Subsequences/Speed_flow.mo index 5c22068c5cb..e68d3c4f1fa 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Subsequences/Speed_flow.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Subsequences/Speed_flow.mo @@ -225,7 +225,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={{-120,-120},{120,120}})), Documentation(info=" diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Subsequences/Speed_temperature.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Subsequences/Speed_temperature.mo index a92aebc6afb..0a414a33bd8 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Subsequences/Speed_temperature.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Subsequences/Speed_temperature.mo @@ -352,7 +352,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={{-120,-120},{120,120}})), Documentation(info=" diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Validation/Controller.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Validation/Controller.mo index 6ed3fd993c7..cd99be3d9b0 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Validation/Controller.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Validation/Controller.mo @@ -2216,8 +2216,7 @@ annotation ( experiment( StopTime=3600, Interval=0.5, - Tolerance=1e-06, - __Dymola_Algorithm="Cvode"), + Tolerance=1e-06), __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Validation/Controller.mos" "Simulate and plot"), Documentation(info=" diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/SecondaryPumps/Controller.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/SecondaryPumps/Controller.mo index 1a65d26ebe9..5261b8728dc 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/SecondaryPumps/Controller.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/SecondaryPumps/Controller.mo @@ -736,7 +736,7 @@ equation connect(logSwi.y, pumSpeRemDp.uHotWatPum) annotation (Line(points={{214,0},{274, 0},{274,-264},{-74,-264},{-74,-362},{-62,-362}}, color={255,0,255})); connect(booToInt1.y, mulSumInt1.u[1:2]) annotation (Line(points={{-228,-156},{ - -216,-156},{-216,-156},{-202,-156}}, color={255,127,0})); + -216,-156},{-216,-159.5},{-202,-159.5}}, color={255,127,0})); connect(min.y, yPumSpe) annotation (Line(points={{182,-400},{300,-400}}, color={0,0,127})); annotation (defaultComponentName="secPumCon", @@ -753,7 +753,7 @@ annotation (defaultComponentName="secPumCon", pattern=LinePattern.None, fillColor={210,210,210}, fillPattern=FillPattern.Solid, - lineColor={0,0,127}, + textColor={0,0,127}, horizontalAlignment=TextAlignment.Right, textString="Enable lead pump"), Rectangle( @@ -766,7 +766,7 @@ annotation (defaultComponentName="secPumCon", pattern=LinePattern.None, fillColor={210,210,210}, fillPattern=FillPattern.Solid, - lineColor={0,0,127}, + textColor={0,0,127}, horizontalAlignment=TextAlignment.Right, textString="Enable next lag pump"), Text( @@ -774,7 +774,7 @@ annotation (defaultComponentName="secPumCon", pattern=LinePattern.None, fillColor={210,210,210}, fillPattern=FillPattern.Solid, - lineColor={0,0,127}, + textColor={0,0,127}, horizontalAlignment=TextAlignment.Right, textString="Disable last lag pump"), Rectangle( @@ -787,7 +787,7 @@ annotation (defaultComponentName="secPumCon", pattern=LinePattern.None, fillColor={210,210,210}, fillPattern=FillPattern.Solid, - lineColor={0,0,127}, + textColor={0,0,127}, horizontalAlignment=TextAlignment.Right, textString="Pump speed"), Rectangle( @@ -800,7 +800,7 @@ annotation (defaultComponentName="secPumCon", pattern=LinePattern.None, fillColor={210,210,210}, fillPattern=FillPattern.Solid, - lineColor={0,0,127}, + textColor={0,0,127}, horizontalAlignment=TextAlignment.Right, textString="Enable/Disable lag pumps for fixed-speed secondary pumps")}), Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-200},{100,200}}), @@ -812,7 +812,7 @@ annotation (defaultComponentName="secPumCon", fillPattern=FillPattern.Solid), Text( extent={{-100,250},{100,210}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Rectangle( extent={{-80,60},{82,-60}}, diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/SecondaryPumps/Subsequences/EnableLag_pumpSpeed.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/SecondaryPumps/Subsequences/EnableLag_pumpSpeed.mo index 68da8ec563d..3878a70d423 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/SecondaryPumps/Subsequences/EnableLag_pumpSpeed.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/SecondaryPumps/Subsequences/EnableLag_pumpSpeed.mo @@ -236,7 +236,7 @@ Icon(coordinateSystem(preserveAspectRatio=false,extent={{-100,-100},{100,100}}), 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=" diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/SecondaryPumps/Subsequences/EnableLead.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/SecondaryPumps/Subsequences/EnableLead.mo index 163ec9b029c..267f360948b 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/SecondaryPumps/Subsequences/EnableLead.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/SecondaryPumps/Subsequences/EnableLead.mo @@ -49,7 +49,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)), Documentation(info=" diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/SecondaryPumps/Validation/Controller.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/SecondaryPumps/Validation/Controller.mo index 048aecc38dd..8bc06539057 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/SecondaryPumps/Validation/Controller.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/SecondaryPumps/Validation/Controller.mo @@ -574,8 +574,7 @@ annotation ( experiment( StopTime=3600, Interval=0.5, - Tolerance=1e-06, - __Dymola_Algorithm="Cvode"), + Tolerance=1e-06), __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/SecondaryPumps/Validation/Controller.mos" "Simulate and plot"), Documentation(info=" diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/CondensationControl.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/CondensationControl.mo index cf79187e9cc..9dfbae29516 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/CondensationControl.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/CondensationControl.mo @@ -179,7 +179,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}}, diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/HotWaterSupplyTemperatureReset.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/HotWaterSupplyTemperatureReset.mo index 46f4d2171c6..90bad5f9170 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/HotWaterSupplyTemperatureReset.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/HotWaterSupplyTemperatureReset.mo @@ -281,7 +281,7 @@ equation color={255,0,255})); connect(edg.u, uStaCha) annotation (Line(points={{-42,0},{-160,0}}, color={255,0,255})); - connect(edg.y, triSam.trigger) annotation (Line(points={{-18,0},{60,0},{60,38.2}}, + connect(edg.y, triSam.trigger) annotation (Line(points={{-18,0},{60,0},{60,38}}, color={255,0,255})); connect(triSam.y, swi.u1) annotation (Line(points={{72,50},{80,50},{80,8},{98,8}}, color={0,0,127})); @@ -365,13 +365,13 @@ annotation(defaultComponentName="hotWatSupTemRes", fillPattern=FillPattern.Solid), Text( extent={{-50,20},{50,-20}}, - lineColor={28,108,200}, + textColor={28,108,200}, fillColor={255,255,255}, fillPattern=FillPattern.None, textString="hotWatSupTemRes"), Text( extent={{-100,150},{100,110}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}), Documentation(info="

diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/MinimumFlowSetPoint.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/MinimumFlowSetPoint.mo index 26c058d75f5..b316050cbad 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/MinimumFlowSetPoint.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/MinimumFlowSetPoint.mo @@ -574,7 +574,7 @@ annotation ( borderPattern=BorderPattern.Raised), Text( extent={{-120,146},{100,108}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Rectangle(extent={{-36,42},{0,28}}, lineColor={28,108,200}), Rectangle(extent={{-36,28},{0,14}}, lineColor={28,108,200}), @@ -583,28 +583,28 @@ annotation ( Rectangle(extent={{-36,-14},{0,-28}}, lineColor={28,108,200}), Text( extent={{-32,38},{-12,32}}, - lineColor={28,108,200}, + textColor={28,108,200}, textString="Stage #"), Text( extent={{-30,24},{-10,18}}, - lineColor={28,108,200}, + textColor={28,108,200}, textString="0"), Text( extent={{-30,10},{-10,4}}, - lineColor={28,108,200}, + textColor={28,108,200}, textString="1"), Text( extent={{-30,-4},{-10,-10}}, - lineColor={28,108,200}, + textColor={28,108,200}, textString="2"), Rectangle(extent={{-36,-28},{0,-42}}, lineColor={28,108,200}), Text( extent={{-30,-18},{-10,-24}}, - lineColor={28,108,200}, + textColor={28,108,200}, textString="..."), Text( extent={{-30,-32},{-10,-38}}, - lineColor={28,108,200}, + textColor={28,108,200}, textString="n"), Rectangle(extent={{2,42},{38,28}}, lineColor={28,108,200}), Rectangle(extent={{2,28},{38,14}}, lineColor={28,108,200}), @@ -613,28 +613,28 @@ annotation ( Rectangle(extent={{2,-14},{38,-28}}, lineColor={28,108,200}), Text( extent={{8,38},{34,32}}, - lineColor={28,108,200}, + textColor={28,108,200}, textString="Min flow"), Text( extent={{6,24},{34,18}}, - lineColor={28,108,200}, + textColor={28,108,200}, textString="minFloSet[1]"), Rectangle(extent={{2,-28},{38,-42}}, lineColor={28,108,200}), Text( extent={{8,-18},{28,-24}}, - lineColor={28,108,200}, + textColor={28,108,200}, textString="..."), Text( extent={{6,10},{34,4}}, - lineColor={28,108,200}, + textColor={28,108,200}, textString="minFloSet[2]"), Text( extent={{6,-32},{34,-38}}, - lineColor={28,108,200}, + textColor={28,108,200}, textString="minFloSet[n]"), Text( extent={{6,-4},{34,-10}}, - lineColor={28,108,200}, + textColor={28,108,200}, textString="minFloSet[3]")}), Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-140,-340},{320,140}})), diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/Subsequences/ProportionalRegulator.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/Subsequences/ProportionalRegulator.mo index 5a2e67381e3..f30484653ce 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/Subsequences/ProportionalRegulator.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/Subsequences/ProportionalRegulator.mo @@ -84,7 +84,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}}, diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/Subsequences/PumpSpeedLimits.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/Subsequences/PumpSpeedLimits.mo index 5c3ec1b41fb..29fdfd0731a 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/Subsequences/PumpSpeedLimits.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/Subsequences/PumpSpeedLimits.mo @@ -212,7 +212,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}}, diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/Validation/HotWaterSupplyTemperatureReset.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/Validation/HotWaterSupplyTemperatureReset.mo index 480065707a0..d5051f013f6 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/Validation/HotWaterSupplyTemperatureReset.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/Validation/HotWaterSupplyTemperatureReset.mo @@ -382,8 +382,7 @@ equation StopTime=7200, Interval=1, Tolerance=1e-06), - __Dymola_Commands(file= - "Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/Validation/HotWaterSupplyTemperatureReset.mos" + __Dymola_Commands(file="./Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/Validation/HotWaterSupplyTemperatureReset.mos" "Simulate and plot"), Documentation(info="

diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/package.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/package.mo index 4fc528bbfc1..7ddc91c50c0 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/package.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/package.mo @@ -14,7 +14,7 @@ annotation (Icon(graphics={ radius=25.0), Text( extent={{-100,100},{100,-100}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="S")}), Documentation(info="

diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Down.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Down.mo index f17aaf9b023..7c2f9d43136 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Down.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Down.mo @@ -538,7 +538,7 @@ annotation ( borderPattern=BorderPattern.Raised), Text( extent={{-120,260},{120,200}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Rectangle( extent={{-10,120},{10,-140}}, diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Subsequences/DisableBoiler.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Subsequences/DisableBoiler.mo index 11f80152db9..eb4ef4a5a27 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Subsequences/DisableBoiler.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Subsequences/DisableBoiler.mo @@ -266,7 +266,7 @@ equation annotation (Line(points={{-78,70},{-62,70}}, color={255,0,255})); connect(booRep1.y,triSam. trigger) - annotation (Line(points={{-38,70},{-10,70},{-10,88.2}}, color={255,0,255})); + annotation (Line(points={{-38,70},{-10,70},{-10,88}}, color={255,0,255})); connect(triSam.y,greEquThr. u) annotation (Line(points={{2,100},{18,100}}, color={0,0,127})); @@ -388,7 +388,7 @@ equation color={255,0,255})); connect(booRep5.y, triSam1.trigger) - annotation (Line(points={{-98,-240},{-70,-240},{-70,-221.8}}, color={255,0,255})); + annotation (Line(points={{-98,-240},{-70,-240},{-70,-222}}, color={255,0,255})); connect(booRep4.y, logSwi6.u2) annotation (Line(points={{-58,-160},{0,-160},{0,-240},{98,-240}}, color={255,0,255})); @@ -434,7 +434,7 @@ annotation ( fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text(extent={{-120,146},{100,108}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Rectangle( extent={{-60,0},{60,-80}}, @@ -458,35 +458,35 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-98,98},{-44,82}}, - lineColor={255,127,0}, + textColor={255,127,0}, textString="nexEnaBoi"), Text( extent={{-98,70},{-52,56}}, - lineColor={255,0,255}, + textColor={255,0,255}, textString="uStaDow"), Text( extent={{-96,30},{-24,10}}, - lineColor={255,0,255}, + textColor={255,0,255}, textString="uUpsDevSta"), Text( extent={{-100,-14},{-78,-24}}, - lineColor={255,0,255}, + textColor={255,0,255}, textString="uBoi"), Text( extent={{-98,-82},{-70,-94}}, - lineColor={255,0,255}, + textColor={255,0,255}, textString="uOnOff"), Text( extent={{-98,-40},{-44,-56}}, - lineColor={255,127,0}, + textColor={255,127,0}, textString="nexDisBoi"), Text( extent={{74,6},{98,-6}}, - lineColor={255,0,255}, + textColor={255,0,255}, textString="yBoi"), Text( extent={{44,-72},{96,-84}}, - lineColor={255,0,255}, + textColor={255,0,255}, textString="yBoiDis")}), Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-200,-260},{200,260}}), graphics={ diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Subsequences/EnableBoiler.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Subsequences/EnableBoiler.mo index a666db7cc17..821941f13e4 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Subsequences/EnableBoiler.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Subsequences/EnableBoiler.mo @@ -238,7 +238,7 @@ equation annotation (Line(points={{-78,-20},{-62,-20}}, color={255,0,255})); connect(booRep1.y,triSam. trigger) - annotation (Line(points={{-38,-20},{-10,-20},{-10,-11.8}}, color={255,0,255})); + annotation (Line(points={{-38,-20},{-10,-20},{-10,-12}}, color={255,0,255})); connect(triSam.y,greEquThr. u) annotation (Line(points={{2,0},{18,0}}, color={0,0,127})); @@ -368,7 +368,7 @@ annotation ( fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text(extent={{-120,146},{100,108}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Rectangle( extent={{-60,60},{60,20}}, @@ -392,42 +392,42 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-98,96},{-50,84}}, - lineColor={255,127,0}, + textColor={255,127,0}, pattern=LinePattern.Dash, textString="nexEnaBoi"), Text( extent={{-98,-84},{-50,-96}}, - lineColor={255,127,0}, + textColor={255,127,0}, pattern=LinePattern.Dash, textString="nexDisBoi"), Text( extent={{-100,66},{-68,56}}, - lineColor={255,0,255}, + textColor={255,0,255}, pattern=LinePattern.Dash, textString="uStaUp"), Text( extent={{-98,26},{-34,14}}, - lineColor={255,0,255}, + textColor={255,0,255}, pattern=LinePattern.Dash, textString="uUpsDevSta"), Text( extent={{-100,-14},{-78,-24}}, - lineColor={255,0,255}, + textColor={255,0,255}, pattern=LinePattern.Dash, textString="uBoi"), Text( extent={{-98,-54},{-72,-66}}, - lineColor={255,0,255}, + textColor={255,0,255}, pattern=LinePattern.Dash, textString="uOnOff"), Text( extent={{74,86},{100,76}}, - lineColor={255,0,255}, + textColor={255,0,255}, pattern=LinePattern.Dash, textString="yBoi"), Text( extent={{60,-72},{98,-84}}, - lineColor={255,0,255}, + textColor={255,0,255}, pattern=LinePattern.Dash, textString="yNewBoiEna")}), Diagram( diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Subsequences/HWIsoVal.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Subsequences/HWIsoVal.mo index f5c4bf7f190..e583a39096d 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Subsequences/HWIsoVal.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Subsequences/HWIsoVal.mo @@ -217,8 +217,8 @@ equation annotation (Line(points={{142,-40},{200,-40}}, color={0,0,127})); connect(booRep.y, triSam.trigger) - annotation (Line(points={{42,-140},{60,-140},{60,-120},{-70,-120}, - {-70,-111.8}}, color={255,0,255})); + annotation (Line(points={{42,-140},{60,-140},{60,-120},{-70,-120},{-70,-112}}, + color={255,0,255})); connect(booRep1.y, not2.u) annotation (Line(points={{82,-170},{100,-170},{100,-110},{-40,-110}, @@ -352,7 +352,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")}), @@ -364,31 +364,31 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-120,146},{100,108}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Text( extent={{-96,-74},{-60,-86}}, - lineColor={255,0,255}, + textColor={255,0,255}, pattern=LinePattern.Dash, textString="chaPro"), Text( extent={{-96,-42},{-46,-56}}, - lineColor={255,0,255}, + textColor={255,0,255}, pattern=LinePattern.Dash, textString="uUpsDevSta"), Text( extent={{-96,86},{-48,74}}, - lineColor={255,127,0}, + textColor={255,127,0}, pattern=LinePattern.Dash, textString="nexChaBoi"), Text( extent={{-96,58},{-42,46}}, - 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( @@ -403,7 +403,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=" diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Subsequences/NextBoiler.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Subsequences/NextBoiler.mo index eff00a3faf0..d27b4bf2bcf 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Subsequences/NextBoiler.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Subsequences/NextBoiler.mo @@ -310,51 +310,51 @@ annotation ( fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text(extent={{-120,146},{100,108}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Text( extent={{-100,76},{-64,66}}, - lineColor={255,127,0}, + textColor={255,127,0}, pattern=LinePattern.Dash, textString="uStaSet"), Text( extent={{-100,8},{-58,-4}}, - lineColor={255,0,255}, + textColor={255,0,255}, pattern=LinePattern.Dash, textString="uBoiSet"), Text( extent={{50,100},{98,80}}, - lineColor={255,127,0}, + textColor={255,127,0}, pattern=LinePattern.Dash, textString="yNexEnaBoi"), Text( extent={{-98,-62},{-64,-74}}, - lineColor={255,0,255}, + textColor={255,0,255}, pattern=LinePattern.Dash, textString="chaPro"), Text( extent={{50,52},{98,32}}, - lineColor={255,127,0}, + textColor={255,127,0}, pattern=LinePattern.Dash, textString="yDisSmaBoi"), Text( extent={{50,-28},{98,-48}}, - lineColor={255,127,0}, + textColor={255,127,0}, pattern=LinePattern.Dash, textString="yDisLasBoi"), Text( extent={{44,-78},{98,-100}}, - lineColor={255,127,0}, + textColor={255,127,0}, pattern=LinePattern.Dash, textString="yEnaSmaBoi"), Text( extent={{54,8},{96,-4}}, - lineColor={255,0,255}, + textColor={255,0,255}, pattern=LinePattern.Dash, textString="yOnOff"), Text( extent={{-100,100},{100,-100}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="?")}), Documentation(info="

diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Subsequences/ResetHotWaterSupplyTemperature.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Subsequences/ResetHotWaterSupplyTemperature.mo index 0cdbd38317b..c84131d7044 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Subsequences/ResetHotWaterSupplyTemperature.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Subsequences/ResetHotWaterSupplyTemperature.mo @@ -226,11 +226,11 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-120,146},{100,108}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Text( extent={{-100,100},{100,-100}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="S")}), Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-160,-100},{160,100}})), diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Subsequences/ResetMinBypass.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Subsequences/ResetMinBypass.mo index b7407842108..b6c12c2a620 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Subsequences/ResetMinBypass.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Subsequences/ResetMinBypass.mo @@ -176,35 +176,35 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-120,146},{100,108}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Text( extent={{50,8},{98,-8}}, - lineColor={255,0,255}, + textColor={255,0,255}, pattern=LinePattern.Dash, textString="yMinBypRes"), Text( extent={{-98,-32},{-50,-46}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="VHotWat_flow"), Text( extent={{-98,-72},{-30,-88}}, - lineColor={0,0,127}, + textColor={0,0,127}, pattern=LinePattern.Dash, textString="VMinHotWat_setpoint"), Text( extent={{-98,46},{-66,36}}, - lineColor={255,0,255}, + textColor={255,0,255}, pattern=LinePattern.Dash, textString="chaPro"), Text( extent={{-100,100},{100,-100}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="S"), Text( extent={{-98,88},{-52,76}}, - lineColor={255,0,255}, + textColor={255,0,255}, pattern=LinePattern.Dash, textString="uUpsDevSta")}), Diagram(coordinateSystem(preserveAspectRatio=false, diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Subsequences/Validation/NextBoiler.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Subsequences/Validation/NextBoiler.mo index 6caa4caee09..ead5542a069 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Subsequences/Validation/NextBoiler.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Subsequences/Validation/NextBoiler.mo @@ -427,7 +427,7 @@ equation {-80,187},{-62,187}}, color={255,127,0})); connect(boiSet.y, nexBoi.uBoiSet) annotation (Line(points={{-118,100},{-100,100}, - {-100,177},{-62,177}}, color={255,0,255})); + {-100,180},{-62,180}}, color={255,0,255})); connect(inPro.y, nexBoi.chaPro) annotation (Line(points={{-118,40},{-80,40},{-80, 173},{-62,173}}, color={255,0,255})); @@ -436,7 +436,7 @@ equation {220,187},{238,187}}, color={255,127,0})); connect(boiSet1.y, nexBoi1.uBoiSet) annotation (Line(points={{182,100},{200,100}, - {200,177},{238,177}}, color={255,0,255})); + {200,180},{238,180}}, color={255,0,255})); connect(inPro1.y, nexBoi1.chaPro) annotation (Line(points={{182,40},{220,40},{ 220,173},{238,173}}, color={255,0,255})); @@ -445,7 +445,7 @@ equation -100},{-80,-133},{-62,-133}}, color={255,127,0})); connect(boiSet2.y, nexBoi2.uBoiSet) annotation (Line(points={{-118,-220},{-100, - -220},{-100,-143},{-62,-143}}, color={255,0,255})); + -220},{-100,-140},{-62,-140}}, color={255,0,255})); connect(inPro2.y, nexBoi2.chaPro) annotation (Line(points={{-118,-280},{-80,-280}, {-80,-147},{-62,-147}}, color={255,0,255})); @@ -457,7 +457,7 @@ equation {220,-147},{238,-147}}, color={255,0,255})); connect(boiSet3.y, nexBoi3.uBoiSet) annotation (Line(points={{182,-220},{200,-220}, - {200,-143},{238,-143}}, color={255,0,255})); + {200,-140},{238,-140}}, color={255,0,255})); annotation ( experiment(StopTime=120, Tolerance=1e-06), @@ -492,34 +492,34 @@ Icon(coordinateSystem(extent={{-100,-100},{100,100}}), graphics={ Text( extent={{-258,292},{-146,280}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="In stage up process (stage 1 to 2),"), Text( extent={{-254,278},{-94,266}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="requires small boiler (1) off and large boiler (2) on."), Text( extent={{64,278},{228,268}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="add one more boiler (1) on top of current boiler (2)."), Text( extent={{62,292},{174,280}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="In stage up process (stage 2 to 3),"), Text( extent={{-256,-40},{-96,-52}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="requires large boiler (2) off and small boiler (1) on."), Text( extent={{-260,-26},{-140,-36}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="In stage down process (stage 2 to 1),"), Text( extent={{58,-42},{130,-52}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="disable boiler (2)."), Text( extent={{62,-28},{182,-38}}, - lineColor={0,0,127}, + textColor={0,0,127}, textString="In stage down process (stage 2 to 1),")})); end NextBoiler; diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Up.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Up.mo index d18e385e820..fd773844b74 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Up.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Up.mo @@ -147,7 +147,7 @@ block Up annotation (Placement(transformation(extent={{-280,220},{-240,260}}), iconTransformation(extent={{-140,170},{-100,210}}))); - Buildings.Controls.OBC.CDL.Interfaces.RealInput THotWatSup( + Buildings.Controls.OBC.CDL.Interfaces.RealInput THotWatSupSet( final unit="K", displayUnit="K", final quantity="ThermodynamicTemperature") if not have_priOnl @@ -403,8 +403,8 @@ equation connect(VMinHotWatSet_flow, minBypRes.VMinHotWatSet_flow) annotation (Line( points={{-260,200},{-180,200},{-180,12},{-172,12}}, color={0,0,127})); - connect(THotWatSup, hotWatSupTemRes.THotWatSup) annotation (Line(points={{ - -260,160},{-186,160},{-186,-17},{-172,-17}}, color={0,0,127})); + connect(THotWatSupSet, hotWatSupTemRes.THotWatSup) annotation (Line(points={{-260, + 160},{-186,160},{-186,-17},{-172,-17}}, color={0,0,127})); connect(uHotWatIsoVal, enaHotWatIsoVal.uHotWatIsoVal) annotation (Line(points={{-260, 120},{-80,120},{-80,5},{-72,5}}, color={0,0,127})); @@ -588,7 +588,7 @@ annotation ( borderPattern=BorderPattern.Raised), Text( extent={{-120,260},{120,200}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Rectangle( extent={{-10,120},{10,-140}}, diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Validation/Up.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Validation/Up.mo index c265b0ee4c3..71e9b0a10f3 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Validation/Up.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Validation/Up.mo @@ -773,9 +773,9 @@ equation connect(conInt2.y, upProCon.uStaTyp) annotation (Line(points={{-198,150},{-190, 150},{-190,183},{-162,183}}, color={255,127,0})); - connect(con3.y, upProCon.THotWatSup) annotation (Line(points={{-158,290},{-150, - 290},{-150,270},{-170,270},{-170,201},{-162,201}}, - color={0,0,127})); + connect(con3.y, upProCon.THotWatSupSet) annotation (Line(points={{-158,290},{ + -150,290},{-150,270},{-170,270},{-170,201},{-162,201}}, color={0,0, + 127})); connect(falEdg.y, pre1.u) annotation (Line(points={{-68,160},{-32,160}}, color={255,0,255})); @@ -861,8 +861,8 @@ equation connect(or1.y, upProCon1.uStaUpPro) annotation (Line(points={{292,120},{310,120}, {310,104},{194,104},{194,186},{208,186}}, color={255,0,255})); - connect(con8.y, upProCon1.THotWatSup) annotation (Line(points={{212,290},{220, - 290},{220,270},{200,270},{200,201},{208,201}}, color={0,0,127})); + connect(con8.y, upProCon1.THotWatSupSet) annotation (Line(points={{212,290},{ + 220,290},{220,270},{200,270},{200,201},{208,201}}, color={0,0,127})); connect(falEdg3.y, pre5.u) annotation (Line(points={{302,160},{338,160}}, color={255,0,255})); @@ -952,8 +952,8 @@ equation connect(or3.y, upProCon2.uStaUpPro) annotation (Line(points={{-78,-210},{-70,-210}, {-70,-226},{-186,-226},{-186,-154},{-172,-154}}, color={255,0,255})); - connect(con13.y, upProCon2.THotWatSup) annotation (Line(points={{-318,-50},{-180, - -50},{-180,-139},{-172,-139}}, color={0,0,127})); + connect(con13.y, upProCon2.THotWatSupSet) annotation (Line(points={{-318,-50}, + {-180,-50},{-180,-139},{-172,-139}}, color={0,0,127})); connect(falEdg6.y, pre8.u) annotation (Line(points={{-78,-170},{-56,-170},{-56, -190},{-52,-190}}, color={255,0,255})); @@ -1048,8 +1048,8 @@ equation connect(or4.y, upProCon3.uStaUpPro) annotation (Line(points={{492,-210},{500,-210}, {500,-226},{394,-226},{394,-156},{408,-156}}, color={255,0,255})); - connect(con18.y, upProCon3.THotWatSup) annotation (Line(points={{262,-50},{400, - -50},{400,-141},{408,-141}}, color={0,0,127})); + connect(con18.y, upProCon3.THotWatSupSet) annotation (Line(points={{262,-50}, + {400,-50},{400,-141},{408,-141}}, color={0,0,127})); connect(falEdg9.y, pre11.u) annotation (Line(points={{502,-170},{524,-170},{524, -190},{528,-190}}, color={255,0,255})); diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/SetpointController.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/SetpointController.mo index 8b7276f65cb..1ca758de4f4 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/SetpointController.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/SetpointController.mo @@ -526,7 +526,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-110,210},{110,172}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}), Diagram( coordinateSystem(preserveAspectRatio=false, extent={{-400,-300},{120,320}})), diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/BoilerIndices.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/BoilerIndices.mo index e6d2f8e45a2..1636ffe00e8 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/BoilerIndices.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/BoilerIndices.mo @@ -118,7 +118,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-120,146},{100,108}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}), Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-200,-60},{200,60}})), diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Capacities.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Capacities.mo index eb56e47ad04..66f827e8642 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Capacities.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Capacities.mo @@ -208,7 +208,7 @@ annotation (defaultComponentName = "cap", fillPattern=FillPattern.Solid), Text( extent={{-120,146},{100,108}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}), Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-200,-200},{200,200}})), diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/CapacityRequirement.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/CapacityRequirement.mo index 6e921e2efb5..d0fde9fb7ce 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/CapacityRequirement.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/CapacityRequirement.mo @@ -139,11 +139,11 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-120,146},{100,108}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Text( extent={{-62,88},{60,-76}}, - lineColor={0,0,0}, + textColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid, textString="Load")}), diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Change.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Change.mo index 9672bb9fae7..d45a910c913 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Change.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Change.mo @@ -271,8 +271,8 @@ equation color={255,0,255})); connect(uPla, booToRea.u) annotation (Line(points={{-460,160},{-388,160},{-388, 130},{-160,130},{-160,10},{198,10}}, color={255,0,255})); - connect(or3.y, triSam1.trigger) annotation (Line(points={{242,-50},{250,-50}, - {250,-1.8}}, color={255,0,255})); + connect(or3.y, triSam1.trigger) annotation (Line(points={{242,-50},{250,-50},{ + 250,-2}}, color={255,0,255})); connect(uPla, falEdg.u) annotation (Line(points={{-460,160},{-388,160},{-388,130}, {-160,130},{-160,-30},{-62,-30}}, color={255,0,255})); @@ -311,7 +311,7 @@ equation connect(reaToInt.y, cha.u) annotation (Line(points={{382,150},{400,150},{400,130}, {330,130},{330,0},{338,0}}, color={255,127,0})); connect(or1.y, triSam.trigger) annotation (Line(points={{122,110},{140,110},{140, - 138.2}}, color={255,0,255})); + 138}}, color={255,0,255})); connect(or2.y, and5.u1) annotation (Line(points={{-358,-80},{-322,-80}}, color={255,0,255})); connect(and5.y, mulAnd.u[4]) annotation (Line(points={{-298,-80},{-230,-80},{ @@ -375,7 +375,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-112,150},{108,112}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}), Diagram( coordinateSystem(preserveAspectRatio=false, diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Configurator.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Configurator.mo index f6b6ad3f75f..ad152f238af 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Configurator.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Configurator.mo @@ -310,7 +310,7 @@ equation fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text(extent={{-120,146},{100,108}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}), Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-220,-200},{220,200}})), diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Down.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Down.mo index 47be4900c69..4e02a279727 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Down.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Down.mo @@ -538,7 +538,7 @@ annotation(defaultComponentName = "staDow", fillPattern=FillPattern.Solid), Text( extent={{-120,244},{100,206}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Rectangle( extent={{-80,-10},{-20,-22}}, diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/EfficiencyCondition.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/EfficiencyCondition.mo index e6a481d834b..e697a0c036e 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/EfficiencyCondition.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/EfficiencyCondition.mo @@ -279,7 +279,7 @@ annotation ( fillPattern=FillPattern.Solid), Text( extent={{-120,146},{100,108}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}), Diagram( coordinateSystem( diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/FailsafeCondition.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/FailsafeCondition.mo index b7bac97c7b7..b0707b9b356 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/FailsafeCondition.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/FailsafeCondition.mo @@ -104,7 +104,7 @@ annotation (defaultComponentName = "faiSafCon", fillPattern=FillPattern.Solid), Text( extent={{-120,146},{100,108}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}), Diagram(coordinateSystem( preserveAspectRatio=false, diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Status.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Status.mo index 2bc2a71dee5..073e644bf1c 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Status.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Status.mo @@ -319,7 +319,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-120,146},{100,108}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name")}), Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-420,-280},{440,280}})), diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Up.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Up.mo index 36da3191301..1d706498f8f 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Up.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Up.mo @@ -214,7 +214,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-120,206},{100,168}}, - lineColor={0,0,255}, + textColor={0,0,255}, textString="%name"), Rectangle(extent={{-80,-10},{-20,-22}}, lineColor={0,0,127}), Rectangle(extent={{-80,-28},{-20,-40}}, lineColor={0,0,127}), diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/package.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/package.mo index 6022d8db301..c4c2eab088f 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/package.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/package.mo @@ -14,7 +14,7 @@ package SetPoints "Package for boiler plant staging setpoint control sequences" radius=25.0), Text( extent={{-100,100},{100,-100}}, - lineColor={0,0,0}, + textColor={0,0,0}, textString="S")}), Documentation(info="

diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Types/PrimaryPumpSpeedControlTypes.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Types/PrimaryPumpSpeedControlTypes.mo index 0880e474f1f..7442e243c5a 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Types/PrimaryPumpSpeedControlTypes.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Types/PrimaryPumpSpeedControlTypes.mo @@ -5,4 +5,16 @@ type PrimaryPumpSpeedControlTypes = enumeration( flowrate "Pump speed regulated to maintain flowrate through decoupler", temperature "Pump speed regulated to maintain temperature difference between primary and secondary loops") - "Definitions for primary pump speed control types"; + "Definitions for primary pump speed control types" annotation (Documentation( + info=" +

+Enumeration to define the choice of primary pump speed control types: +

+ + + + + + +
EnumerationDescription
localDPPump speed regulated to maintain local differential pressure setpoint.
remoteDPPump speed regulated to maintain remote differential pressure setpoint.
flowratePump speed regulated to maintain flowrate through decoupler.
temperaturePump speed regulated to maintain temperature difference between primary and secondary loops.
+")); diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Types/SecondaryPumpSpeedControlTypes.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Types/SecondaryPumpSpeedControlTypes.mo index 8794f79a843..78102e38577 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Types/SecondaryPumpSpeedControlTypes.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Types/SecondaryPumpSpeedControlTypes.mo @@ -2,4 +2,14 @@ within Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.Types; type SecondaryPumpSpeedControlTypes = enumeration( localDP "Pump speed regulated to maintain local differential pressure setpoint", remoteDP "Pump speed regulated to maintain remote differential pressure setpoint") - "Definitions for secondary pump speed control types"; + "Definitions for secondary pump speed control types" annotation ( + Documentation(info=" +

+Enumeration to define the choice of secondary pump speed control types: +

+ + + + +
EnumerationDescription
localDPPump speed regulated to maintain local differential pressure setpoint.
remoteDPPump speed regulated to maintain remote differential pressure setpoint.
+")); diff --git a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Validation/Controller.mo b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Validation/Controller.mo index 32895989926..c70da3b199e 100644 --- a/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Validation/Controller.mo +++ b/Buildings/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Validation/Controller.mo @@ -369,9 +369,6 @@ equation connect(sin.y, reaToInt.u) annotation (Line(points={{-318,130},{-302,130}}, color={0,0,127})); - connect(reaToInt.y, controller.supResReq) annotation (Line(points={{-278,130}, - {-270,130},{-270,103},{-262,103}}, color={255,127,0})); - connect(TOut1.y, controller1.TOut) annotation (Line(points={{-58,100},{-2,100}}, color={0,0,127})); @@ -390,10 +387,6 @@ equation connect(sin1.y, reaToInt1.u) annotation (Line(points={{-58,130},{-42,130}}, color={0,0,127})); - connect(reaToInt1.y, controller1.supResReq) annotation (Line(points={{-18,130}, - {-10,130},{-10,103},{-2,103}}, - color={255,127,0})); - connect(VHotWatSec_flow.y, controller1.VHotWatSec_flow) annotation (Line( points={{-58,-90},{-30,-90},{-30,79},{-2,79}}, color={0,0,127})); @@ -422,10 +415,6 @@ equation connect(sin2.y,reaToInt2. u) annotation (Line(points={{162,130},{178,130}}, color={0,0,127})); - connect(reaToInt2.y,controller2. supResReq) annotation (Line(points={{202,130}, - {210,130},{210,103},{218,103}}, - color={255,127,0})); - connect(VHotWatSec_flow1.y, controller2.VHotWatSec_flow) annotation (Line( points={{162,-90},{196,-90},{196,79},{218,79}}, color={0,0,127})); @@ -435,46 +424,55 @@ equation connect(TRet2.y,controller2. TRetSec) annotation (Line(points={{162,40},{180,40}, {180,88},{218,88}}, color={0,0,127})); - connect(controller.yBoi, truDel.u) annotation (Line(points={{-238,88},{-230,88}, - {-230,140},{-222,140}}, color={255,0,255})); - connect(controller.yPriPum, truDel1.u) annotation (Line(points={{-238,72},{-230, - 72},{-230,50},{-222,50}}, color={255,0,255})); - connect(controller.yBypValPos, uniDel.u) annotation (Line(points={{-238,76},{-224, - 76},{-224,80},{-222,80}}, color={0,0,127})); + connect(controller.yBoi, truDel.u) annotation (Line(points={{-238,84},{-230, + 84},{-230,140},{-222,140}}, + color={255,0,255})); + connect(controller.yPriPum, truDel1.u) annotation (Line(points={{-238,68},{ + -230,68},{-230,50},{-222,50}}, + color={255,0,255})); + connect(controller.yBypValPos, uniDel.u) annotation (Line(points={{-238,72},{ + -224,72},{-224,80},{-222,80}}, + color={0,0,127})); connect(uniDel.y, controller.uBypValPos) annotation (Line(points={{-198,80},{-150, 80},{-150,20},{-272,20},{-272,45},{-262,45}}, color={0,0,127})); - connect(controller.yHotWatIsoVal, uniDel1.u) annotation (Line(points={{-238,80}, - {-226,80},{-226,110},{-222,110}}, color={0,0,127})); + connect(controller.yHotWatIsoVal, uniDel1.u) annotation (Line(points={{-238,76}, + {-226,76},{-226,110},{-222,110}}, color={0,0,127})); connect(uniDel1.y, controller.uHotWatIsoVal) annotation (Line(points={{-198,110}, {-144,110},{-144,-16},{-278,-16},{-278,48},{-262,48}}, color={0,0,127})); - connect(controller1.yBoi, truDel2.u) annotation (Line(points={{22,88},{26,88}, + connect(controller1.yBoi, truDel2.u) annotation (Line(points={{22,84},{26,84}, {26,140},{38,140}}, color={255,0,255})); - connect(controller1.yHotWatIsoVal, uniDel2.u) annotation (Line(points={{22,80}, - {28,80},{28,110},{38,110}}, color={0,0,127})); - connect(controller1.yPriPum, truDel3.u) annotation (Line(points={{22,72},{34,72}, - {34,70},{38,70}}, color={255,0,255})); + connect(controller1.yHotWatIsoVal, uniDel2.u) annotation (Line(points={{22,76}, + {28,76},{28,110},{38,110}}, color={0,0,127})); + connect(controller1.yPriPum, truDel3.u) annotation (Line(points={{22,68},{34, + 68},{34,70},{38,70}}, + color={255,0,255})); connect(uniDel2.y, controller1.uHotWatIsoVal) annotation (Line(points={{62,110}, {106,110},{106,-16},{-18,-16},{-18,48},{-2,48}}, color={0,0,127})); - connect(controller1.ySecPum, truDel4.u) annotation (Line(points={{22,64},{30,64}, - {30,10},{38,10}}, color={255,0,255})); + connect(controller1.ySecPum, truDel4.u) annotation (Line(points={{22,60},{30, + 60},{30,10},{38,10}}, + color={255,0,255})); connect(reaRep.y, uniDel4.u) annotation (Line(points={{62,40},{68,40}}, color={0,0,127})); - connect(controller1.yPriPumSpe, reaRep.u) annotation (Line(points={{22,68},{32, - 68},{32,40},{38,40}}, color={0,0,127})); + connect(controller1.yPriPumSpe, reaRep.u) annotation (Line(points={{22,64},{ + 32,64},{32,40},{38,40}}, + color={0,0,127})); connect(uniDel4.y, controller1.uPriPumSpe) annotation (Line(points={{92,40},{96, 40},{96,-10},{-6,-10},{-6,42},{-2,42}}, color={0,0,127})); - connect(controller2.yBoi, truDel5.u) annotation (Line(points={{242,88},{250,88}, - {250,130},{258,130}}, color={255,0,255})); - connect(truDel6.u, controller2.yPriPum) annotation (Line(points={{258,100},{254, - 100},{254,72},{242,72}}, color={255,0,255})); + connect(controller2.yBoi, truDel5.u) annotation (Line(points={{242,84},{250, + 84},{250,130},{258,130}}, + color={255,0,255})); + connect(truDel6.u, controller2.yPriPum) annotation (Line(points={{258,100},{ + 254,100},{254,68},{242,68}}, + color={255,0,255})); connect(reaRep1.y, uniDel3.u) annotation (Line(points={{282,70},{288,70}}, color={0,0,127})); - connect(controller2.yPriPumSpe, reaRep1.u) annotation (Line(points={{242,68},{ - 254,68},{254,70},{258,70}}, color={0,0,127})); + connect(controller2.yPriPumSpe, reaRep1.u) annotation (Line(points={{242,64}, + {254,64},{254,70},{258,70}},color={0,0,127})); connect(uniDel3.y, controller2.uPriPumSpe) annotation (Line(points={{312,70},{ 320,70},{320,10},{216,10},{216,42},{218,42}}, color={0,0,127})); - connect(controller2.ySecPum, truDel7.u) annotation (Line(points={{242,64},{252, - 64},{252,40},{258,40}}, color={255,0,255})); + connect(controller2.ySecPum, truDel7.u) annotation (Line(points={{242,60},{ + 252,60},{252,40},{258,40}}, + color={255,0,255})); connect(conInt.y, controller.TSupResReq) annotation (Line(points={{-318,160},{ -266,160},{-266,106},{-262,106}}, color={255,127,0})); connect(conInt.y, controller1.TSupResReq) annotation (Line(points={{-318,160}, @@ -513,6 +511,12 @@ equation annotation (Line(points={{282,40},{288,40}}, color={255,0,255})); connect(pre8.y, controller2.uSecPum) annotation (Line(points={{312,40},{336,40}, {336,4},{206,4},{206,51},{218,51}}, color={255,0,255})); + connect(reaToInt.y, controller.plaReq) annotation (Line(points={{-278,130},{ + -272,130},{-272,103},{-262,103}}, color={255,127,0})); + connect(reaToInt1.y, controller1.plaReq) annotation (Line(points={{-18,130},{ + -12,130},{-12,103},{-2,103}}, color={255,127,0})); + connect(reaToInt2.y, controller2.plaReq) annotation (Line(points={{202,130},{ + 208,130},{208,103},{218,103}}, color={255,127,0})); annotation ( Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={Ellipse( @@ -530,8 +534,7 @@ equation preserveAspectRatio=false, extent={{-360,-240},{360,240}})), experiment( StopTime=7500, - Tolerance=1e-06, - __Dymola_Algorithm="Cvode"), + Tolerance=1e-06), __Dymola_Commands(file="./Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Validation/Controller.mos" "Simulate and plot"), Documentation(info=" diff --git a/Buildings/Examples/BoilerPlant/Baseclasses/BoilerPlant.mo b/Buildings/Examples/BoilerPlant/Baseclasses/BoilerPlant.mo new file mode 100644 index 00000000000..936ed42d343 --- /dev/null +++ b/Buildings/Examples/BoilerPlant/Baseclasses/BoilerPlant.mo @@ -0,0 +1,914 @@ +within Buildings.Examples.BoilerPlant.Baseclasses; +model BoilerPlant "Boiler plant model for closed loop testing" + replaceable package MediumA = + Buildings.Media.Air; + + replaceable package MediumW = + Buildings.Media.Water + "Medium model"; + + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = boiEff1[1]*boiCap1 + boiEff2[1]*boiCap2 + "Nominal heat flow rate of radiator" + annotation(dialog(group="Plant parameters")); + + parameter Real TPlaHotWatSetMax( + final unit="K", + displayUnit="K", + final quantity="ThermodynamicTemperature") = 353.15 + "The maximum allowed hot-water setpoint temperature for the plant" + annotation(Dialog(group="Boiler parameters")); + + parameter Real THotWatSetMinConBoi( + final unit="K", + displayUnit="K", + final quantity="ThermodynamicTemperature") = 305.37 + "The minimum allowed hot-water setpoint temperature for condensing boilers" + annotation(Dialog(group="Boiler parameters")); + + parameter Modelica.Units.SI.HeatFlowRate boiCap1= 2200000 + "Boiler capacity for boiler-1" + annotation(dialog(group="Boiler parameters")); + + parameter Modelica.Units.SI.HeatFlowRate boiCap2= 2200000 + "Boiler capacity for boiler-2" + annotation(dialog(group="Boiler parameters")); + + parameter Real boiEff1[6]( + final unit="1", + displayUnit="1") = {0.6246, 0.7711, -1.2077*10e-15, 0.008576, -0.005933, 0.003156} + "Efficiency for boiler-1" + annotation(dialog(group="Boiler parameters")); + + parameter Real boiEff2[6]( + final unit="1", + displayUnit="1") = {0.6246, 0.7711, -1.2077*10e-15, 0.008576, -0.005933, 0.003156} + "Efficiency for boiler-2" + annotation(dialog(group="Boiler parameters")); + + parameter Modelica.Units.SI.MassFlowRate mSec_flow_nominal=0.113*1000 + "Secondary load nominal mass flow rate" + annotation(dialog(group="Plant parameters")); + + parameter Modelica.Units.SI.Temperature TBoiSup_nominal = 273.15+70 + "Boiler nominal supply water temperature" + annotation(dialog(group="Boiler parameters")); + + parameter Modelica.Units.SI.Temperature TBoiRet_min = 273.15+60 + "Boiler minimum return water temperature" + annotation(dialog(group="Boiler parameters")); + + parameter Modelica.Units.SI.MassFlowRate mBoi_flow_nominal1=mSec_flow_nominal + "Boiler-1 nominal mass flow rate" + annotation(dialog(group="Boiler parameters")); + + parameter Modelica.Units.SI.MassFlowRate mBoi_flow_nominal2=mSec_flow_nominal + "Boiler-2 nominal mass flow rate" + annotation(dialog(group="Boiler parameters")); + + constant Buildings.Fluid.Boilers.Data.Lochinvar.Crest.FBdash2501 perBoiOri + "Original record for boiler performance data is scaled below"; + + parameter Buildings.Fluid.Boilers.Data.Lochinvar.Crest.FBdash2501 perBoi1( + final Q_flow_nominal = boiCap1, + final VWat = boiCap1/perBoiOri.Q_flow_nominal*perBoiOri.VWat, + final mDry = boiCap1/perBoiOri.Q_flow_nominal*perBoiOri.mDry, + final m_flow_nominal = boiCap1/perBoiOri.Q_flow_nominal*perBoiOri.m_flow_nominal) + "Boiler performance data, scaled to while keeping dp_nominal constant" + annotation (Placement(transformation(extent={{260,162},{280,182}}))); + + parameter Buildings.Fluid.Boilers.Data.Lochinvar.Crest.FBdash2501 perBoi2( + final Q_flow_nominal = boiCap2, + final VWat = boiCap2/perBoiOri.Q_flow_nominal*perBoiOri.VWat, + final mDry = boiCap2/perBoiOri.Q_flow_nominal*perBoiOri.mDry, + final m_flow_nominal = boiCap2/perBoiOri.Q_flow_nominal*perBoiOri.m_flow_nominal) + "Boiler performance data, scaled to while keeping dp_nominal constant" + annotation (Placement(transformation(extent={{260,192},{280,212}}))); + + parameter Modelica.Units.SI.PressureDifference dpValve_nominal_value=6000 + "Nominal pressure drop of fully open valve, used if CvData=Buildings.Fluid.Types.CvTypes.OpPoint"; + + parameter Modelica.Units.SI.PressureDifference dpFixed_nominal_value=1000 + "Pressure drop of pipe and other resistances that are in series"; + + parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerTypePla= + Buildings.Controls.OBC.CDL.Types.SimpleController.PI + "Type of controller" + annotation(Dialog(tab="PI parameters", group="Plant supply water temperature controller")); + + parameter Real kPla( + final unit="1", + displayUnit="1", + final min=0)=10e-3 + "Gain of controller" + annotation(Dialog(tab="PI parameters", group="Plant supply water temperature controller")); + + parameter Real TiPla( + final unit="s", + displayUnit="s", + final quantity="time", + final min=0)=90 + "Time constant of integrator block" + annotation(Dialog(tab="PI parameters", group="Plant supply water temperature controller", + enable = (controllerTypePla == Buildings.Controls.OBC.CDL.Types.SimpleController.PI + or controllerTypePla == Buildings.Controls.OBC.CDL.Types.SimpleController.PID))); + + parameter Real TdPla( + final unit="s", + displayUnit="s", + final quantity="time", + final min=0)=0.1 + "Time constant of derivative block" + annotation(Dialog(tab="PI parameters", group="Plant supply water temperature controller", + enable = (controllerTypePla == Buildings.Controls.OBC.CDL.Types.SimpleController.PD + or controllerTypePla == Buildings.Controls.OBC.CDL.Types.SimpleController.PID))); + + parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerTypeBoi1= + Buildings.Controls.OBC.CDL.Types.SimpleController.PI + "Type of controller" + annotation(Dialog(tab="PI parameters", group="Boiler-1 supply water temperature controller")); + + parameter Real kBoi1( + final unit="1", + displayUnit="1", + final min=0)=10e-3 + "Gain of controller" + annotation(Dialog(tab="PI parameters", group="Boiler-1 supply water temperature controller")); + + parameter Real TiBoi1( + final unit="s", + displayUnit="s", + final quantity="time", + final min=0)=90 + "Time constant of integrator block" + annotation(Dialog(tab="PI parameters", group="Boiler-1 supply water temperature controller", + enable = (controllerTypeBoi1 == Buildings.Controls.OBC.CDL.Types.SimpleController.PI + or controllerTypeBoi1 == Buildings.Controls.OBC.CDL.Types.SimpleController.PID))); + + parameter Real TdBoi1( + final unit="s", + displayUnit="s", + final quantity="time", + final min=0)=0.1 + "Time constant of derivative block" + annotation(Dialog(tab="PI parameters", group="Boiler-1 supply water temperature controller", + enable = (controllerTypeBoi1 == Buildings.Controls.OBC.CDL.Types.SimpleController.PD + or controllerTypeBoi1 == Buildings.Controls.OBC.CDL.Types.SimpleController.PID))); + + parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerTypeBoi2= + Buildings.Controls.OBC.CDL.Types.SimpleController.PI + "Type of controller" + annotation(Dialog(tab="PI parameters", group="Boiler-2 supply water temperature controller")); + + parameter Real kBoi2( + final unit="1", + displayUnit="1", + final min=0)=10e-3 + "Gain of controller" + annotation(Dialog(tab="PI parameters", group="Boiler-2 supply water temperature controller")); + + parameter Real TiBoi2( + final unit="s", + displayUnit="s", + final quantity="time", + final min=0)=90 + "Time constant of integrator block" + annotation(Dialog(tab="PI parameters", group="Boiler-2 supply water temperature controller", + enable = (controllerTypeBoi2 == Buildings.Controls.OBC.CDL.Types.SimpleController.PI + or controllerTypeBoi2 == Buildings.Controls.OBC.CDL.Types.SimpleController.PID))); + + parameter Real TdBoi2( + final unit="s", + displayUnit="s", + final quantity="time", + final min=0)=0.1 + "Time constant of derivative block" + annotation(Dialog(tab="PI parameters", group="Boiler-2 supply water temperature controller", + enable = (controllerTypeBoi2 == Buildings.Controls.OBC.CDL.Types.SimpleController.PD + or controllerTypeBoi2 == Buildings.Controls.OBC.CDL.Types.SimpleController.PID))); + + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uBoiSta[2] + "Boiler status signal" + annotation (Placement(transformation(extent={{-360,140},{-320,180}}), + iconTransformation(extent={{-140,70},{-100,110}}))); + + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uPumSta[1] + "Pump status signal" + annotation (Placement(transformation(extent={{-360,20},{-320,60}}), + iconTransformation(extent={{-140,10},{-100,50}}))); + + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uPla + "Plant enable signal" + annotation (Placement(transformation(extent={{-360,180},{-320,220}}), + iconTransformation(extent={{-140,100},{-100,140}}))); + + Buildings.Controls.OBC.CDL.Interfaces.RealInput uHotIsoVal[2]( + final unit="1", + displayUnit="1") + "Hot water isolation valve signal" + annotation (Placement(transformation(extent={{-360,60},{-320,100}}), + iconTransformation(extent={{-140,40},{-100,80}}))); + + Buildings.Controls.OBC.CDL.Interfaces.RealInput uPumSpe( + final unit="1", + displayUnit="1") + "Pump speed signal" + annotation (Placement(transformation(extent={{-360,-20},{-320,20}}), + iconTransformation(extent={{-140,-20},{-100,20}}))); + + Buildings.Controls.OBC.CDL.Interfaces.RealInput uBypValSig( + final unit="1", + displayUnit="1") + "Bypass valve signal" + annotation (Placement(transformation(extent={{-360,-60},{-320,-20}}), + iconTransformation(extent={{-140,-50},{-100,-10}}))); + + Buildings.Controls.OBC.CDL.Interfaces.RealInput TBoiHotWatSupSet[2]( + final unit=fill("K", 2), + displayUnit=fill("degC", 2), + final quantity=fill("ThermodynamicTemperature", 2)) + "Boiler hot water supply temperature setpoint vector" + annotation (Placement(transformation(extent={{-360,-130},{-320,-90}}), + iconTransformation(extent={{-140,-110},{-100,-70}}))); + + Buildings.Controls.OBC.CDL.Interfaces.RealInput TZon( + final unit="K", + displayUnit="degC", + final quantity="ThermodynamicTemperature") + "Measured zone air temperature" + annotation (Placement(transformation(extent={{-360,-90},{-320,-50}}), + iconTransformation(extent={{-140,-80},{-100,-40}}))); + + Buildings.Controls.OBC.CDL.Interfaces.RealInput TPlaHotWatSupSet( + final unit=fill("K", 2), + displayUnit=fill("degC", 2), + final quantity=fill("ThermodynamicTemperature", 2)) + "Plant hot water supply temperature setpoint" + annotation (Placement(transformation(extent={{-360,-180},{-320,-140}}), + iconTransformation(extent={{-140,-140},{-100,-100}}))); + + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput yBoiSta[2] + "Boiler status signal" + annotation (Placement(transformation(extent={{320,-90},{360,-50}}), + iconTransformation(extent={{100,-70},{140,-30}}))); + + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput yPumSta[1] + "Pump status signal" + annotation (Placement(transformation(extent={{320,-130},{360,-90}}), + iconTransformation(extent={{100,-100},{140,-60}}))); + + Buildings.Controls.OBC.CDL.Interfaces.RealOutput ySupTem( + final unit="K", + displayUnit="degC", + final quantity="ThermodynamicTemperature") + "Measured supply temperature" + annotation (Placement(transformation(extent={{320,80},{360,120}}), + iconTransformation(extent={{100,60},{140,100}}))); + + Buildings.Controls.OBC.CDL.Interfaces.RealOutput yRetTem( + final unit="K", + displayUnit="degC", + final quantity="ThermodynamicTemperature") + "Measured return temperature" + annotation (Placement(transformation(extent={{320,40},{360,80}}), + iconTransformation(extent={{100,30},{140,70}}))); + + Buildings.Controls.OBC.CDL.Interfaces.RealOutput yHotWatDp[1]( + final unit="Pa", + displayUnit="Pa") + "Hot water differential pressure between supply and return" + annotation (Placement(transformation(extent={{320,-10},{360,30}}), + iconTransformation(extent={{100,0},{140,40}}))); + + Buildings.Controls.OBC.CDL.Interfaces.RealOutput VHotWat_flow( + final unit="m3/s", + displayUnit="m3/s", + final quantity="VolumeFlowRate") + "Measured flowrate in primary circuit" + annotation (Placement(transformation(extent={{320,-50},{360,-10}}), + iconTransformation(extent={{100,-40},{140,0}}))); + + Buildings.Controls.OBC.CDL.Interfaces.RealOutput yHotWatIsoVal[2]( + final unit="1", + displayUnit="1") + "Measured boiler hot water isolation valve position" + annotation (Placement(transformation(extent={{320,-170},{360,-130}}), + iconTransformation(extent={{100,-130},{140,-90}}))); + + Buildings.Controls.OBC.CDL.Interfaces.RealOutput yBypValPos( + final unit="1", + displayUnit="1") + "Measured bypass valve position" + annotation (Placement(transformation(extent={{320,130},{360,170}}), + iconTransformation(extent={{100,90},{140,130}}))); + + Modelica.Fluid.Interfaces.FluidPort_a port_a( + redeclare package Medium = MediumW) + "HW inlet port" + annotation (Placement(transformation(extent={{30,230},{50,250}}), + iconTransformation(extent={{60,130},{80,150}}))); + + Modelica.Fluid.Interfaces.FluidPort_b port_b( + redeclare package Medium = MediumW) + "HW outlet port" + annotation (Placement(transformation(extent={{-50,230},{-30,250}}), + iconTransformation(extent={{-80,130},{-60,150}}))); + + Buildings.Fluid.Sources.Boundary_pT preSou( + redeclare package Medium = MediumW, + p=100000, + nPorts=1) + "Source for pressure and to account for thermal expansion of water" + annotation (Placement(transformation(extent={{18,-78},{-2,-58}}))); + + Buildings.Fluid.Boilers.BoilerTable boi2( + redeclare package Medium = MediumW, + allowFlowReversal=false, + final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, + per=perBoi2) "Boiler-2" + annotation (Placement(transformation(extent={{110,-220},{90,-200}}))); + + Buildings.Fluid.Boilers.BoilerTable boi1( + redeclare package Medium = MediumW, + allowFlowReversal=false, + final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, + final per=perBoi1) "Boiler-1" + annotation (Placement(transformation(extent={{110,-160},{90,-140}}))); + + Buildings.Fluid.Movers.SpeedControlled_y pum( + redeclare package Medium = MediumW, + final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, + final allowFlowReversal=false, + redeclare Buildings.Fluid.Movers.Data.Generic per( + final pressure(V_flow={0,2*mSec_flow_nominal/1000}, + final dp={2*75000,0})), + final inputType=Buildings.Fluid.Types.InputType.Continuous, + final addPowerToMedium=false, + final riseTime=60) + "Hot water primary pump-1" + annotation (Placement(transformation(extent={{-10,-10},{10,10}}, + rotation=90, + origin={-30,-50}))); + + Buildings.Fluid.FixedResistances.Junction spl1( + redeclare package Medium = MediumW, + final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, + final m_flow_nominal={mBoi_flow_nominal2,-mSec_flow_nominal,mBoi_flow_nominal1}, + final dp_nominal={0,0,0}) + "Splitter" + annotation (Placement(transformation(extent={{-10,-10},{10,10}}, + rotation=90, + origin={-30,-150}))); + + Buildings.Fluid.FixedResistances.Junction spl4( + redeclare package Medium = MediumW, + final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, + final m_flow_nominal={mSec_flow_nominal,-mSec_flow_nominal,-mSec_flow_nominal}, + final dp_nominal={0,0,0}) + "Splitter" + annotation (Placement(transformation(extent={{-10,-10},{10,10}}, + rotation=90, + origin={-30,40}))); + + Buildings.Fluid.Actuators.Valves.TwoWayLinear val( + redeclare package Medium = MediumW, + final m_flow_nominal=mSec_flow_nominal, + final dpValve_nominal=dpValve_nominal_value, + final dpFixed_nominal=dpFixed_nominal_value) + "Minimum flow bypass valve" + annotation (Placement(transformation(extent={{80,30},{100,50}}))); + + Buildings.Fluid.FixedResistances.Junction spl5( + redeclare package Medium = MediumW, + final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, + final m_flow_nominal={mSec_flow_nominal,mSec_flow_nominal,-mSec_flow_nominal}, + final dp_nominal={0,0,0}) + "Splitter" + annotation (Placement(transformation(extent={{-10,-10},{10,10}}, + rotation=270, + origin={210,40}))); + + Buildings.Fluid.Actuators.Valves.TwoWayLinear val2( + redeclare package Medium = MediumW, + final m_flow_nominal=mBoi_flow_nominal2, + final dpValve_nominal=dpValve_nominal_value, + final use_inputFilter=true, + final init=Modelica.Blocks.Types.Init.InitialState, + final y_start=0, + final dpFixed_nominal=dpFixed_nominal_value) + "Isolation valve for boiler-2" + annotation (Placement(transformation(extent={{0,-220},{20,-200}}))); + + Buildings.Fluid.Actuators.Valves.TwoWayLinear val1( + redeclare package Medium = MediumW, + final m_flow_nominal=mBoi_flow_nominal1, + final dpValve_nominal=dpValve_nominal_value, + final init=Modelica.Blocks.Types.Init.InitialState, + final y_start=0, + final dpFixed_nominal=dpFixed_nominal_value) + "Isolation valve for boiler-1" + annotation (Placement(transformation(extent={{0,-160},{20,-140}}))); + + Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea1[2] + "Boolean to Real conversion" + annotation (Placement(transformation(extent={{-160,150},{-140,170}}))); + + Buildings.Fluid.Sensors.RelativePressure senRelPre( + redeclare package Medium = MediumW) + "Differential pressure sensor between hot water supply and return" + annotation (Placement(transformation(extent={{80,70},{100,90}}))); + + Buildings.Fluid.Sensors.VolumeFlowRate senVolFlo( + redeclare package Medium = MediumW, + final m_flow_nominal=mSec_flow_nominal/1000) + "Volume flow-rate through primary circuit" + annotation (Placement(transformation(extent={{-10,-10},{10,10}}, + rotation=90, + origin={-30,-10}))); + + Buildings.Fluid.Sensors.TemperatureTwoPort senTem( + redeclare package Medium = MediumW, + final m_flow_nominal=mSec_flow_nominal) + "HW supply temperature sensor" + annotation (Placement(transformation(extent={{-20,110},{0,130}}))); + + Buildings.Fluid.Sensors.TemperatureTwoPort senTem1( + redeclare package Medium = MediumW, + final m_flow_nominal=mSec_flow_nominal) + "HW return temperature sensor before water enters return plumbing" + annotation (Placement(transformation(extent={{60,110},{80,130}}))); + + Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator reaRep( + final nout=1) + "Real replicator" + annotation (Placement(transformation(extent={{280,0},{300,20}}))); + + Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys2( + final uLow=0.05, + final uHigh=0.09) + "Check if pumps are on" + annotation (Placement(transformation(extent={{100,-40},{120,-20}}))); + + Buildings.Controls.OBC.CDL.Logical.Timer timPumSta(final t=120) + "Output pump proven on signal when pump status is enabled for two minutes" + annotation (Placement(transformation(extent={{140,-40},{160,-20}}))); + + Buildings.Controls.OBC.CDL.Logical.Latch lat + "Hold pump enable status until change process is completed" + annotation (Placement(transformation(extent={{-300,30},{-280,50}}))); + + Buildings.Controls.OBC.CDL.Logical.Switch logSwi + "Switch to signal from controller once enabling process has been completed" + annotation (Placement(transformation(extent={{-260,30},{-240,50}}))); + + Buildings.Controls.OBC.CDL.Logical.Switch logSwi1[2] + "Switch to signal from controller once enabling process has been completed" + annotation (Placement(transformation(extent={{-210,150},{-190,170}}))); + + Buildings.Controls.OBC.CDL.Logical.Latch lat1[2] + "Hold boiler enable status until boiler is proven on" + annotation (Placement(transformation(extent={{-260,150},{-240,170}}))); + + Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conPIDBoi[2]( + final controllerType={controllerTypeBoi1,controllerTypeBoi2}, + final k={kBoi1,kBoi2}, + final Ti={TiBoi1,TiBoi2}, + final Td={TdBoi1,TdBoi2}, + final yMax=fill(1, 2), + final yMin=fill(0, 2), + final xi_start=fill(0.2, 2)) + "PI controller for operating boilers to regulating hot water supply temperature" + annotation (Placement(transformation(extent={{40,-130},{60,-110}}))); + + Buildings.Controls.OBC.CDL.Continuous.Multiply pro1[2] + "Product of boiler power and current status" + annotation (Placement(transformation(extent={{-120,-130},{-100,-110}}))); + + Buildings.Fluid.FixedResistances.Junction spl6( + redeclare package Medium = MediumW, + final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, + final m_flow_nominal={-mBoi_flow_nominal1,mSec_flow_nominal,-mBoi_flow_nominal2}, + final dp_nominal={0,0,0}) + "Splitter" + annotation (Placement(transformation(extent={{-10,-10},{10,10}}, + rotation=0, + origin={150,-150}))); + + Buildings.Fluid.Sensors.RelativePressure senRelPre1( + redeclare package Medium = MediumW) + "Differential pressure sensor between hot water supply and return" + annotation (Placement(transformation(extent={{-10,-10},{10,10}}, + rotation=90, + origin={-70,-10}))); + + Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr[2]( + final t=fill(0.02, 2), + final h=fill(0.02/10, 2)) + "Determine if boilers are disabled" + annotation (Placement(transformation(extent={{180,-130},{200,-110}}))); + + Buildings.Controls.OBC.CDL.Logical.Pre pre2[2] + "Logical pre block" + annotation (Placement(transformation(extent={{240,-86},{260,-66}}))); + + Buildings.Controls.OBC.CDL.Logical.Latch lat2[2] + "Determine boiler enable status based on PLR and hold it till the boiler disable limit is passed" + annotation (Placement(transformation(extent={{280,-80},{300,-60}}))); + + Buildings.Fluid.FixedResistances.PlugFlowPipe pipe( + redeclare package Medium = MediumW, + final allowFlowReversal=false, + final m_flow_nominal=mSec_flow_nominal, + final have_pipCap=false, + final length=2000, + final dIns=0.0508, + final kIns=0.0389) + "Dynamic pipe element to represent duct loss" + annotation (Placement(transformation(extent={{130,110},{150,130}}))); + + Modelica.Thermal.HeatTransfer.Sources.PrescribedTemperature TRoo + "Room temperature of boiler room" + annotation (Placement(transformation(extent={{-280,-80},{-260,-60}}))); + + Buildings.Controls.OBC.CDL.Routing.BooleanScalarReplicator booRep1( + final nout=1) + "Boolean replicator" + annotation (Placement(transformation(extent={{280,-120},{300,-100}}))); + + Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr3[2]( + final t=fill(0.02,2), + final h=fill(0.02/10, 2)) + "Check if boiler is enabled" + annotation (Placement(transformation(extent={{180,-210},{200,-190}}))); + + Buildings.Controls.OBC.CDL.Logical.Pre pre3[2] + "Logical pre block" + annotation (Placement(transformation(extent={{240,-210},{260,-190}}))); + + Buildings.Controls.OBC.CDL.Continuous.Switch swiPum + "Switch for pump" + annotation (Placement(transformation(extent={{-220,-20},{-200,0}}))); + + Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zer( + final k=0) + "Zero output signal" + annotation (Placement(transformation(extent={{-300,-30},{-280,-10}}))); + + Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conPIDPla( + final controllerType=controllerTypePla, + final k=kPla, + final Ti=TiPla, + final Td=TdPla, + final yMax=1, + final yMin=0) + "PI controller for setting boiler supply temperature setpoint" + annotation (Placement(transformation(extent={{-10,170},{10,190}}))); + + Buildings.Controls.OBC.CDL.Logical.Edge edg[2] + "Detect changes to boiler status setpoints" + annotation (Placement(transformation(extent={{-170,110},{-150,130}}))); + + Buildings.Controls.OBC.CDL.Continuous.Line lin[2] + "Intrapolate plant supply temperature PI signal to boiler supply temperature setpoint" + annotation (Placement(transformation(extent={{-180,-190},{-160,-170}}))); + + Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator reaScaRep( + final nout=2) + "Replicate plant PI signal to each boiler PI controller" + annotation (Placement(transformation(extent={{140,170},{160,190}}))); + + Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con[2]( + final k=fill(0, 2)) + "Support point for boiler setpoint" + annotation (Placement(transformation(extent={{-240,-150},{-220,-130}}))); + + Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con1[2]( + final k=fill(1, 2)) + "Support point for boiler setpoint" + annotation (Placement(transformation(extent={{-240,-210},{-220,-190}}))); + + Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con2[2]( + final k=fill(TPlaHotWatSetMax, 2)) + "Max boiler plant supply temperature" + annotation (Placement(transformation(extent={{-280,-190},{-260,-170}}))); + + Buildings.Controls.OBC.CDL.Logical.Edge edg1 + "Detect plant enable signal becoming true" + annotation (Placement(transformation(extent={{-130,170},{-110,190}}))); + + Buildings.Controls.OBC.CDL.Continuous.Multiply mul + "Send zero signal when the plant is disabled" + annotation (Placement(transformation(extent={{100,170},{120,190}}))); + + Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea + "Convert plant enable Boolean signal to Real signal" + annotation (Placement(transformation(extent={{60,190},{80,210}}))); + + Buildings.Fluid.Sensors.TemperatureTwoPort senTem2( + redeclare package Medium = MediumW, + final m_flow_nominal=mSec_flow_nominal) + "HW return temperature sensor in primary circuit" + annotation (Placement(transformation(extent={{-10,-10},{10,10}}, + rotation=-90, + origin={210,-10}))); + + Buildings.Fluid.Sensors.VolumeFlowRate senVolFlo1( + redeclare package Medium = MediumW, + final m_flow_nominal=mSec_flow_nominal) + "Volume flow-rate through minimum flow bypass branch" + annotation (Placement(transformation(extent={{20,30},{40,50}}))); + + Buildings.Fluid.Sensors.TemperatureTwoPort senTem3( + redeclare package Medium = MediumW, + final m_flow_nominal=mSec_flow_nominal) + "HW return temperature sensor" + annotation (Placement(transformation(extent={{120,30},{140,50}}))); + + Buildings.Fluid.Sensors.VolumeFlowRate senVolFlo2( + redeclare package Medium = MediumW, + final m_flow_nominal=mSec_flow_nominal) + "Volume flow-rate through secondary circuit" + annotation (Placement(transformation(extent={{-10,-10},{10,10}}, + rotation=90, + origin={-30,104}))); + + Buildings.Fluid.Sensors.TemperatureTwoPort senTem4( + redeclare package Medium = MediumW, + final m_flow_nominal=mSec_flow_nominal) + "HW return temperature sensor after water exits return plumbing" + annotation (Placement(transformation(extent={{180,110},{200,130}}))); + +equation + connect(val1.port_a, spl1.port_3) + annotation (Line(points={{0,-150},{-20,-150}}, color={0,127,255})); + connect(val2.port_a, spl1.port_1) annotation (Line(points={{0,-210},{-30,-210}, + {-30,-160}}, color={0,127,255})); + + connect(spl4.port_2, senRelPre.port_a) annotation (Line(points={{-30,50},{-30, + 80},{80,80}}, color={0,127,255})); + + connect(senRelPre.port_b, spl5.port_1) annotation (Line(points={{100,80},{210, + 80},{210,50}}, color={0,127,255})); + + connect(senVolFlo.port_b, spl4.port_1) annotation (Line(points={{-30,0},{-30,30}}, + color={0,127,255})); + + connect(senVolFlo.V_flow, VHotWat_flow) annotation (Line(points={{-41,-10},{ + -41,16},{180,16},{180,-30},{340,-30}}, color={0,0,127})); + + connect(senTem.T, ySupTem) annotation (Line(points={{-10,131},{-10,140},{270, + 140},{270,100},{340,100}}, color={0,0,127})); + + connect(reaRep.y, yHotWatDp) + annotation (Line(points={{302,10},{340,10}}, color={0,0,127})); + + connect(senRelPre.p_rel, reaRep.u) annotation (Line(points={{90,71},{90,66},{240, + 66},{240,10},{278,10}}, color={0,0,127})); + + connect(hys2.y, timPumSta.u) + annotation (Line(points={{122,-30},{138,-30}}, color={255,0,255})); + connect(lat.y, logSwi.u2) + annotation (Line(points={{-278,40},{-262,40}}, color={255,0,255})); + connect(lat.y, logSwi.u1) annotation (Line(points={{-278,40},{-270,40},{-270, + 48},{-262,48}}, color={255,0,255})); + connect(uBoiSta, lat1.u) + annotation (Line(points={{-340,160},{-262,160}}, color={255,0,255})); + connect(lat1.y, logSwi1.u2) + annotation (Line(points={{-238,160},{-212,160}}, color={255,0,255})); + connect(logSwi1.y, booToRea1.u) + annotation (Line(points={{-188,160},{-162,160}}, color={255,0,255})); + connect(uBoiSta, logSwi1.u3) annotation (Line(points={{-340,160},{-310,160},{ + -310,140},{-220,140},{-220,152},{-212,152}}, color={255,0,255})); + connect(lat1.y, logSwi1.u1) annotation (Line(points={{-238,160},{-220,160},{ + -220,168},{-212,168}}, color={255,0,255})); + connect(booToRea1.y, pro1.u1) annotation (Line(points={{-138,160},{-130,160},{ + -130,-114},{-122,-114}}, color={0,0,127})); + connect(boi1.port_a, spl6.port_1) + annotation (Line(points={{110,-150},{140,-150}}, color={0,127,255})); + connect(boi2.port_a, spl6.port_3) annotation (Line(points={{110,-210},{150,-210}, + {150,-160}}, color={0,127,255})); + connect(senTem1.port_a, port_a) + annotation (Line(points={{60,120},{40,120},{40,240}}, color={0,127,255})); + connect(val.y_actual, yBypValPos) annotation (Line(points={{95,47},{120,47},{120, + 150},{340,150}}, color={0,0,127})); + connect(pre2.y, lat2.clr) annotation (Line(points={{262,-76},{278,-76}}, + color={255,0,255})); + connect(lat2.y, yBoiSta) + annotation (Line(points={{302,-70},{340,-70}}, color={255,0,255})); + connect(lesThr.y, pre2.u) annotation (Line(points={{202,-120},{220,-120},{220, + -76},{238,-76}}, color={255,0,255})); + connect(TZon, TRoo.T) + annotation (Line(points={{-340,-70},{-282,-70}}, color={0,0,127})); + connect(pum.port_b, senVolFlo.port_a) + annotation (Line(points={{-30,-40},{-30,-20}}, color={0,127,255})); + connect(senRelPre1.port_a, spl1.port_2) annotation (Line(points={{-70,-20},{-70, + -140},{-30,-140}}, color={0,127,255})); + connect(senRelPre1.port_b, spl4.port_1) + annotation (Line(points={{-70,0},{-70,30},{-30,30}}, color={0,127,255})); + connect(booRep1.y, yPumSta) + annotation (Line(points={{302,-110},{340,-110}}, color={255,0,255})); + connect(timPumSta.passed, booRep1.u) annotation (Line(points={{162,-38},{230,-38}, + {230,-110},{278,-110}}, color={255,0,255})); + connect(uPumSta[1], logSwi.u3) annotation (Line(points={{-340,40},{-308,40},{-308, + 20},{-270,20},{-270,32},{-262,32}}, color={255,0,255})); + connect(uPumSta[1], lat.u) + annotation (Line(points={{-340,40},{-302,40}}, color={255,0,255})); + connect(uBypValSig, val.y) annotation (Line(points={{-340,-40},{-120,-40},{-120, + 60},{90,60},{90,52}}, color={0,0,127})); + connect(spl1.port_2, pum.port_a) + annotation (Line(points={{-30,-140},{-30,-60}}, color={0,127,255})); + connect(senTem.port_b, port_b) annotation (Line(points={{0,120},{10,120},{10, + 160},{-40,160},{-40,240}}, color={0,127,255})); + connect(preSou.ports[1], pum.port_a) annotation (Line(points={{-2,-68},{-30,-68}, + {-30,-60}}, color={0,127,255})); + connect(greThr3.y, pre3.u) + annotation (Line(points={{202,-200},{238,-200}}, color={255,0,255})); + connect(pre3.y, lat2.u) annotation (Line(points={{262,-200},{266,-200},{266,-70}, + {278,-70}}, color={255,0,255})); + connect(TRoo.port, pipe.heatPort) annotation (Line(points={{-260,-70},{-140, + -70},{-140,100},{100,100},{100,130},{140,130}}, + color={191,0,0})); + connect(boi1.heatPort, TRoo.port) annotation (Line(points={{100,-142.8},{100, + -86},{-120,-86},{-120,-70},{-260,-70}}, color={191,0,0})); + connect(boi2.heatPort, TRoo.port) annotation (Line(points={{100,-202.8},{100,-180}, + {84,-180},{84,-86},{-120,-86},{-120,-70},{-260,-70}}, color={191,0,0})); + connect(timPumSta.passed, lat.clr) annotation (Line(points={{162,-38},{230,-38}, + {230,-232},{-314,-232},{-314,34},{-302,34}}, color={255,0,255})); + connect(lat2.y, lat1.clr) annotation (Line(points={{302,-70},{306,-70},{306, + 220},{-300,220},{-300,154},{-262,154}}, color={255,0,255})); + connect(val1.port_b,boi1. port_b) + annotation (Line(points={{20,-150},{90,-150}}, color={0,127,255})); + connect(val2.port_b, boi2.port_b) + annotation (Line(points={{20,-210},{90,-210}}, color={0,127,255})); + connect(boi1.T, conPIDBoi[1].u_m) + annotation (Line(points={{89,-142},{50,-142},{50,-132}}, color={0,0,127})); + connect(boi2.T, conPIDBoi[2].u_m) + annotation (Line(points={{89,-202},{50,-202},{50,-132}}, color={0,0,127})); + connect(hys2.u, pum.y_actual) + annotation (Line(points={{98,-30},{-37,-30},{-37,-39}}, color={0,0,127})); + connect(uPumSpe, swiPum.u1) annotation (Line(points={{-340,0},{-300,0},{-300,-2}, + {-222,-2}}, color={0,0,127})); + connect(zer.y, swiPum.u3) annotation (Line(points={{-278,-20},{-270,-20},{-270, + -18},{-222,-18}}, color={0,0,127})); + connect(logSwi.y, swiPum.u2) annotation (Line(points={{-238,40},{-228,40},{-228, + -10},{-222,-10}}, color={255,0,255})); + connect(swiPum.y, pum.y) annotation (Line(points={{-198,-10},{-100,-10},{-100, + -50},{-42,-50}}, color={0,0,127})); + connect(senTem.T, conPIDPla.u_m) annotation (Line(points={{-10,131},{-10,140}, + {0,140},{0,168}}, color={0,0,127})); + connect(TPlaHotWatSupSet, conPIDPla.u_s) annotation (Line(points={{-340,-160}, + {-90,-160},{-90,180},{-12,180}}, color={0,0,127})); + connect(uBoiSta, edg.u) annotation (Line(points={{-340,160},{-310,160},{-310,120}, + {-172,120}}, color={255,0,255})); + connect(reaScaRep.y, lin.u) annotation (Line(points={{162,180},{172,180},{172, + 20},{-190,20},{-190,-180},{-182,-180}}, color={0,0,127})); + connect(con.y, lin.x1) annotation (Line(points={{-218,-140},{-186,-140},{-186, + -172},{-182,-172}}, color={0,0,127})); + connect(con1.y, lin.x2) annotation (Line(points={{-218,-200},{-186,-200},{-186, + -184},{-182,-184}}, color={0,0,127})); + connect(con2.y, lin.f2) annotation (Line(points={{-258,-180},{-200,-180},{-200, + -188},{-182,-188}}, color={0,0,127})); + connect(pro1.y, conPIDBoi.u_s) + annotation (Line(points={{-98,-120},{38,-120}}, color={0,0,127})); + connect(TBoiHotWatSupSet, lin.f1) annotation (Line(points={{-340,-110},{-200,-110}, + {-200,-176},{-182,-176}}, color={0,0,127})); + connect(lin.y, pro1.u2) annotation (Line(points={{-158,-180},{-130,-180},{-130, + -126},{-122,-126}}, color={0,0,127})); + connect(conPIDBoi[1].y, boi1.y) annotation (Line(points={{62,-120},{128,-120}, + {128,-142},{112,-142}}, color={0,0,127})); + connect(conPIDBoi[2].y, boi2.y) annotation (Line(points={{62,-120},{128,-120}, + {128,-202},{112,-202}}, color={0,0,127})); + connect(conPIDBoi.y, lesThr.u) + annotation (Line(points={{62,-120},{178,-120}}, color={0,0,127})); + connect(conPIDBoi.y, greThr3.u) annotation (Line(points={{62,-120},{128,-120}, + {128,-200},{178,-200}}, color={0,0,127})); + connect(edg.y, conPIDBoi.trigger) annotation (Line(points={{-148,120},{-80,120}, + {-80,-190},{44,-190},{44,-132}}, color={255,0,255})); + connect(uPla, edg1.u) annotation (Line(points={{-340,200},{-140,200},{-140,180}, + {-132,180}}, color={255,0,255})); + connect(edg1.y, conPIDPla.trigger) annotation (Line(points={{-108,180},{-100, + 180},{-100,150},{-6,150},{-6,168}}, color={255,0,255})); + connect(mul.y, reaScaRep.u) + annotation (Line(points={{122,180},{138,180}}, color={0,0,127})); + connect(conPIDPla.y, mul.u2) annotation (Line(points={{12,180},{20,180},{20, + 174},{98,174}}, color={0,0,127})); + connect(booToRea.y, mul.u1) annotation (Line(points={{82,200},{90,200},{90,186}, + {98,186}}, color={0,0,127})); + connect(uPla, booToRea.u) + annotation (Line(points={{-340,200},{58,200}}, color={255,0,255})); + connect(uHotIsoVal[1], val1.y) annotation (Line(points={{-340,70},{-50,70},{-50, + -100},{10,-100},{10,-138}}, color={0,0,127})); + connect(uHotIsoVal[2], val2.y) annotation (Line(points={{-340,90},{-50,90},{-50, + -180},{10,-180},{10,-198}}, color={0,0,127})); + connect(val1.y_actual, yHotWatIsoVal[1]) annotation (Line(points={{15,-143},{32, + -143},{32,-170},{290,-170},{290,-160},{340,-160}}, color={0,0,127})); + connect(val2.y_actual, yHotWatIsoVal[2]) annotation (Line(points={{15,-203},{32, + -203},{32,-170},{290,-170},{290,-140},{340,-140}}, color={0,0,127})); + connect(senTem2.port_b, spl6.port_2) annotation (Line(points={{210,-20},{210, + -150},{160,-150}}, + color={0,127,255})); + connect(spl4.port_3, senVolFlo1.port_a) + annotation (Line(points={{-20,40},{20,40}}, color={0,127,255})); + connect(senVolFlo1.port_b, val.port_a) + annotation (Line(points={{40,40},{80,40}}, color={0,127,255})); + connect(val.port_b, senTem3.port_a) + annotation (Line(points={{100,40},{120,40}}, color={0,127,255})); + connect(senTem3.port_b, spl5.port_3) + annotation (Line(points={{140,40},{200,40}}, color={0,127,255})); + connect(spl4.port_2, senVolFlo2.port_a) + annotation (Line(points={{-30,50},{-30,94}}, color={0,127,255})); + connect(senVolFlo2.port_b, senTem.port_a) annotation (Line(points={{-30,114}, + {-30,120},{-20,120}}, color={0,127,255})); + connect(senTem1.port_b, pipe.port_a) + annotation (Line(points={{80,120},{130,120}}, color={0,127,255})); + connect(spl5.port_2, senTem2.port_a) + annotation (Line(points={{210,30},{210,0}}, color={0,127,255})); + connect(pipe.port_b, senTem4.port_a) + annotation (Line(points={{150,120},{180,120}}, color={0,127,255})); + connect(senTem4.port_b, spl5.port_1) annotation (Line(points={{200,120},{210, + 120},{210,50}}, color={0,127,255})); + connect(senTem2.T, yRetTem) annotation (Line(points={{221,-10},{250,-10},{250, + 60},{340,60}}, color={0,0,127})); + annotation (defaultComponentName="boiPla", + Documentation(info=" +

+ This model implements a primary-only, condensing boiler plant with a headered, + variable-speed primary pump, as defined in ASHRAE RP-1711, March 2020 draft. +

+ ", revisions=" + + "), + Diagram(coordinateSystem(preserveAspectRatio=false, + extent={{-320,-240},{320,240}})), + Icon(coordinateSystem(extent={{-100,-140},{100,140}}), + graphics={ + Rectangle( + extent={{-100,140},{100,-140}}, + lineColor={28,108,200}, + fillColor={255,255,255}, + fillPattern=FillPattern.Solid), + Text( + extent={{-100,-140},{100,-180}}, + textColor={0,0,255}, + textString="%name"), + Rectangle( + extent={{-40,-18},{40,-98}}, + lineColor={0,0,255}, + pattern=LinePattern.None, + fillColor={95,95,95}, + fillPattern=FillPattern.Solid), + Rectangle( + extent={{-60,-54},{60,-60}}, + lineColor={0,0,255}, + pattern=LinePattern.None, + fillColor={0,0,255}, + fillPattern=FillPattern.Solid), + Rectangle( + extent={{0,-60},{60,-54}}, + lineColor={0,0,255}, + pattern=LinePattern.None, + fillColor={255,0,0}, + fillPattern=FillPattern.Solid), + Polygon( + points={{0,-80},{-12,-98},{14,-98},{0,-80}}, + pattern=LinePattern.None, + smooth=Smooth.None, + fillColor={255,255,0}, + fillPattern=FillPattern.Solid, + lineColor={0,0,0}), + Ellipse(extent={{-80,58},{-50,26}}, lineColor={28,108,200}), + Polygon( + points={{-80,40},{-50,40},{-66,58},{-80,40}}, + lineColor={28,108,200}, + fillColor={28,108,200}, + fillPattern=FillPattern.Solid), + Line(points={{-66,-40},{-66,-12}}, color={28,108,200}), + Line(points={{-66,58},{-66,134}},color={28,108,200}), + Line(points={{70,132},{70,-44},{70,-50}},color={28,108,200}), + Polygon(points={{-80,26},{-80,26}}, lineColor={28,108,200}), + Polygon( + points={{-76,-12},{-54,-12},{-66,0},{-76,-12}}, + lineColor={28,108,200}, + fillColor={28,108,200}, + fillPattern=FillPattern.Solid), + Polygon( + points={{-76,12},{-54,12},{-66,0},{-76,12}}, + lineColor={28,108,200}, + fillColor={28,108,200}, + fillPattern=FillPattern.Solid), + Line(points={{-66,12},{-66,26}}, color={28,108,200}), + Ellipse( + extent={{-82,-40},{-52,-72}}, + lineColor={28,108,200}, + lineThickness=0.5), + Ellipse( + extent={{56,-38},{86,-70}}, + lineColor={28,108,200}, + lineThickness=0.5, + fillColor={28,108,200}, + fillPattern=FillPattern.Solid)})); +end BoilerPlant; diff --git a/Buildings/Examples/BoilerPlant/Baseclasses/SimplifiedZoneWithRadiator.mo b/Buildings/Examples/BoilerPlant/Baseclasses/SimplifiedZoneWithRadiator.mo new file mode 100644 index 00000000000..0d311f75a47 --- /dev/null +++ b/Buildings/Examples/BoilerPlant/Baseclasses/SimplifiedZoneWithRadiator.mo @@ -0,0 +1,147 @@ +within Buildings.Examples.BoilerPlant.Baseclasses; +model SimplifiedZoneWithRadiator "Zone model" + + replaceable package MediumW =Buildings.Media.Water + "Water medium model"; + + parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 4359751.36 + "Nominal heat flow rate of radiator" + annotation(Dialog(group="Radiator")); + + parameter Modelica.Units.SI.Temperature TRadSup_nominal = 273.15+70 + "Radiator nominal supply water temperature" + annotation(Dialog(group="Radiator")); + + parameter Modelica.Units.SI.Temperature TRadRet_nominal = 273.15+50 + "Radiator nominal return water temperature" + annotation(Dialog(group="Radiator")); + + parameter Modelica.Units.SI.MassFlowRate mRad_flow_nominal=0.000604*1000 + "Radiator nominal mass flow rate" + annotation(Dialog(group="Radiator")); + + parameter Modelica.Units.SI.PressureDifference dpRad_nominal = 0 + "Nominal pressure drop across radiator" + annotation(Dialog(group="Radiator")); + + parameter Modelica.Units.SI.Volume V=1200 + "Room volume" + annotation(Dialog(group="Zone")); + + parameter Real zonTheCap( + final unit="J/K", + displayUnit="J/K", + final quantity="HeatCapacity") = 2*V*1.2*1500+V*1.2*1006 + "Zone thermal capacitance" + annotation(Dialog(group="Zone")); + + parameter Modelica.Units.SI.Temperature TAir_nominal=273.15 + 23.9 + "Air temperature at nominal condition" + annotation(Dialog(group="Zone")); + + parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal = V*1.2*6/3600 + "Nominal mass flow rate" + annotation(Dialog(group="Zone")); + + Buildings.Controls.OBC.CDL.Interfaces.RealInput QFlo + "Power added to zone" + annotation (Placement(transformation(extent={{-138,-20},{-98,20}}), + iconTransformation(extent={{-140,-20},{-100,20}}))); + + Buildings.Controls.OBC.CDL.Interfaces.RealOutput TZon( + final unit="K", + displayUnit="degC", + final quantity="ThermodynamicTemperature") + "Measured zone temperature" + annotation (Placement(transformation(extent={{100,-20},{140,20}}), + iconTransformation(extent={{100,-20},{140,20}}))); + + Modelica.Fluid.Interfaces.FluidPort_a port_a( + redeclare package Medium = MediumW) + "HHW inlet port" + annotation (Placement(transformation(extent={{-50,-110},{-30,-90}}), + iconTransformation(extent={{-50,-110},{-30,-90}}))); + + Modelica.Fluid.Interfaces.FluidPort_b port_b( + redeclare package Medium = MediumW) + "HHW outlet port" + annotation (Placement(transformation(extent={{30,-110},{50,-90}}), + iconTransformation(extent={{30,-110},{50,-90}}))); + + Buildings.Fluid.HeatExchangers.Radiators.RadiatorEN442_2 rad( + redeclare package Medium = MediumW, + final m_flow_nominal=mRad_flow_nominal, + final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, + final Q_flow_nominal=Q_flow_nominal, + final T_a_nominal=TRadSup_nominal, + final T_b_nominal=TRadRet_nominal, + final TAir_nominal=TAir_nominal, + final dp_nominal=dpRad_nominal) + "Radiator for zone heating loads" + annotation (Placement(transformation(extent={{-10,-60},{10,-40}}))); + + Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor zonTem + "Zone temperature sensor" + annotation (Placement(transformation(extent={{60,-10},{80,10}}))); + + Modelica.Thermal.HeatTransfer.Components.HeatCapacitor heaCap( + final C=zonTheCap, + final T(fixed=true)) + "Heat capacity for furniture and walls" + annotation (Placement(transformation(extent={{-10,0},{10,20}}))); + + Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow preHea + "Apply heating load on the zone" + annotation (Placement(transformation(extent={{-58,-10},{-38,10}}))); + +equation + connect(zonTem.T, TZon) + annotation (Line(points={{81,0},{120,0}}, color={0,0,127})); + connect(QFlo, preHea.Q_flow) + annotation (Line(points={{-118,0},{-58,0}}, color={0,0,127})); + connect(port_a, rad.port_a) annotation (Line(points={{-40,-100},{-40,-50},{-10, + -50}}, color={0,127,255})); + connect(port_b, rad.port_b) annotation (Line(points={{40,-100},{40,-50},{10,-50}}, + color={0,127,255})); + connect(zonTem.port, heaCap.port) annotation (Line(points={{60,0},{0,0}}, + color={191,0,0})); + connect(preHea.port, heaCap.port) + annotation (Line(points={{-38,0},{0,0}}, color={191,0,0})); + connect(rad.heatPortCon, heaCap.port) + annotation (Line(points={{-2,-42.8},{-2,0},{0,0}}, color={191,0,0})); + connect(rad.heatPortRad, heaCap.port) + annotation (Line(points={{2,-42.8},{2,0},{0,0}}, color={191,0,0})); + annotation (defaultComponentName="zon", + Icon( + coordinateSystem( + preserveAspectRatio=false, + extent={{-100,-100},{100,100}}), + graphics={Rectangle( + extent={{-100,100},{100,-100}}, + lineColor={0,0,0}, + fillColor={255,255,255}, + fillPattern=FillPattern.Solid), + Text( + extent={{-100,140},{100,100}}, + textColor={0,0,255}, + textString="%name")}), + Diagram( + coordinateSystem( + preserveAspectRatio=false, + extent={{-100,-100},{100,100}})), + Documentation(info=" +

+ This is a simplified zone model consisting of a thermal capacitor zonTheCap + to represent the termal capacity of the zone. The heating load on the zone is + applied by the ideal source QFlo and is met by the radiator + rad. +

+ ", revisions=" + + ")); +end SimplifiedZoneWithRadiator; diff --git a/Buildings/Examples/BoilerPlant/Baseclasses/package.mo b/Buildings/Examples/BoilerPlant/Baseclasses/package.mo new file mode 100644 index 00000000000..4c31fd83920 --- /dev/null +++ b/Buildings/Examples/BoilerPlant/Baseclasses/package.mo @@ -0,0 +1,18 @@ +within Buildings.Examples.BoilerPlant; +package Baseclasses "Package containing baseclasses for example model" + extends Modelica.Icons.BasesPackage; + + annotation(Documentation(info=" +

+ This package contains the baseclasses for the boiler plant model + + Buildings.Examples.BoilerPlant.Baseclasses.BoilerPlant and the simplified + thermal zone model + + Buildings.Examples.BoilerPlant.Baseclasses.SimplifiedZoneWithRadiator + used to demonstrate the use of the implemented boiler plant controller + + Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.Controller. +

+ ")); +end Baseclasses; diff --git a/Buildings/Examples/BoilerPlant/Baseclasses/package.order b/Buildings/Examples/BoilerPlant/Baseclasses/package.order new file mode 100644 index 00000000000..33c8ea16744 --- /dev/null +++ b/Buildings/Examples/BoilerPlant/Baseclasses/package.order @@ -0,0 +1,2 @@ +BoilerPlant +SimplifiedZoneWithRadiator diff --git a/Buildings/Examples/BoilerPlant/ClosedLoopTest.mo b/Buildings/Examples/BoilerPlant/ClosedLoopTest.mo index 0b00886cdb1..047c1d69c28 100644 --- a/Buildings/Examples/BoilerPlant/ClosedLoopTest.mo +++ b/Buildings/Examples/BoilerPlant/ClosedLoopTest.mo @@ -1,14 +1,14 @@ within Buildings.Examples.BoilerPlant; model ClosedLoopTest "Closed loop testing model" extends Modelica.Icons.Example; + replaceable package MediumA = Buildings.Media.Air "Medium model"; replaceable package MediumW = Buildings.Media.Water "Medium model"; - - parameter Modelica.SIunits.MassFlowRate mRad_flow_nominal=113.45 + parameter Modelica.Units.SI.MassFlowRate mRad_flow_nominal=113.45 "Radiator nominal mass flow rate"; parameter Real boiDesCap( @@ -22,19 +22,21 @@ model ClosedLoopTest "Closed loop testing model" displayUnit="1") = 0.4 "Ratio of boiler-1 capacity to total capacity"; - Buildings.Examples.BoilerPlant.PlantModel.BoilerPlant boilerPlant( + Buildings.Examples.BoilerPlant.Baseclasses.BoilerPlant boiPla( final Q_flow_nominal=boiDesCap, final boiCap1=(1 - boiCapRat)*boiDesCap, final boiCap2=boiCapRat*boiDesCap, - final mRad_flow_nominal=mRad_flow_nominal, - final V=126016.35, - final zonTheCap=6987976290, + final mSec_flow_nominal=mRad_flow_nominal, + final TBoiSup_nominal=333.15, + final TBoiRet_min=323.15, final dpValve_nominal_value=20000, - final dpFixed_nominal_value=1000) + final dpFixed_nominal_value=1000, + final controllerTypeBoi1=Buildings.Controls.OBC.CDL.Types.SimpleController.PI, + final controllerTypeBoi2=Buildings.Controls.OBC.CDL.Types.SimpleController.PI) "Boiler plant model" - annotation (Placement(transformation(extent={{40,-10},{60,10}}))); + annotation (Placement(transformation(extent={{40,-14},{60,14}}))); - Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.Controller controller( + Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.Controller boiPlaCon( final controllerType_priPum=Buildings.Controls.OBC.CDL.Types.SimpleController.PI, final controllerType_bypVal=Buildings.Controls.OBC.CDL.Types.SimpleController.PI, final have_priOnl=true, @@ -46,30 +48,30 @@ model ClosedLoopTest "Closed loop testing model" final nPumSec=0, final nSenSec=0, final nPumSec_nominal=0, - final TPlaHotWatSetMax=273.15 + 70, - final VHotWatPri_flow_nominal=mRad_flow_nominal/1000, - final maxLocDpPri=5000, - final minLocDpPri=5000, + final TPlaHotWatSetMax=273.15 + 50, + final triAmoVal=-1.111, + final resAmoVal=1.667, + final maxResVal=3.889, + final VHotWatPri_flow_nominal=0.02, + final maxLocDpPri=50000, + final minLocDpPri=50000, final VHotWatSec_flow_nominal=1e-6, final nBoi=2, final boiTyp={Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.Types.BoilerTypes.condensingBoiler, - Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.Types.BoilerTypes.condensingBoiler}, + Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.Types.BoilerTypes.condensingBoiler}, final nSta=3, - final staMat=[1,0;0,1;1,1], + final staMat=[1,0; 0,1; 1,1], final boiDesCap={boiCapRat*boiDesCap*0.8,(1 - boiCapRat)*boiDesCap*0.8}, final boiFirMin={0.2,0.3}, - final minFloSet={0.2*boiCapRat*mRad_flow_nominal/1000, - 0.3*(1 - boiCapRat)*mRad_flow_nominal/1000}, - final maxFloSet={boiCapRat*mRad_flow_nominal/1000, - (1 - boiCapRat)*mRad_flow_nominal/1000}, + final minFloSet={0.2*boiCapRat*mRad_flow_nominal/2000,0.3*(1 - boiCapRat)*mRad_flow_nominal/2000}, + final maxFloSet={boiCapRat*mRad_flow_nominal/2000,(1 - boiCapRat)*mRad_flow_nominal/2000}, final bypSetRat=0.000005, final nPumPri=1, final TMinSupNonConBoi=333.2, final k_bypVal=1, final Ti_bypVal=90, final Td_bypVal=10e-9, - final boiDesFlo={boiCapRat*mRad_flow_nominal/1000, - (1 - boiCapRat)*mRad_flow_nominal/1000}, + final boiDesFlo=boiPlaCon.maxFloSet, final k_priPum=0.1, final Ti_priPum=75, final Td_priPum=10e-9, @@ -81,8 +83,30 @@ model ClosedLoopTest "Closed loop testing model" Buildings.Controls.OBC.CDL.Continuous.PID conPID( final controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI, final k=10e-2, - final Ti=300) "Radiator valve controller" - annotation (Placement(transformation(extent={{50,50},{70,70}}))); + final Ti=300) + "Radiator valve controller" + annotation (Placement(transformation(extent={{50,100},{70,120}}))); + + Buildings.Examples.BoilerPlant.Baseclasses.SimplifiedZoneWithRadiator zon( + final Q_flow_nominal=4359751.36, + final TRadSup_nominal=333.15, + final TRadRet_nominal=323.15, + final mRad_flow_nominal=96.323, + dpRad_nominal(displayUnit="Pa") = 40000, + final V=126016.35, + final zonTheCap=6987976290) + "Zone thermal model with radiator" + annotation (Placement(transformation(extent={{40,60},{60,80}}))); + + Buildings.Fluid.Actuators.Valves.TwoWayLinear val( + redeclare package Medium = Media.Water, + final m_flow_nominal=mRad_flow_nominal, + final dpValve_nominal(displayUnit="bar") = 20000, + final dpFixed_nominal(displayUnit="bar") = 1000) + "Minimum flow bypass valve" + annotation (Placement(transformation(extent={{-10,-10},{10,10}}, + rotation=90, + origin={44,38}))); protected Buildings.Controls.OBC.CDL.Logical.Sources.Constant con3[2]( @@ -93,11 +117,12 @@ protected Buildings.BoundaryConditions.WeatherData.ReaderTMY3 weaDat( final filNam=Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos")) "Weather data reader" - annotation (Placement(transformation(extent={{-90,50},{-70,70}}))); + annotation (Placement(transformation(extent={{-120,50},{-100,70}}))); Buildings.BoundaryConditions.WeatherData.Bus weaBus "Weather bus" - annotation (Placement(transformation(extent={{-60,50},{-40,70}}))); + annotation (Placement(transformation(extent={{-90,50},{-70,70}}), + iconTransformation(extent={{-60,50},{-40,70}}))); Modelica.Blocks.Sources.CombiTimeTable timTab( final tableOnFile=true, @@ -133,39 +158,23 @@ protected "Boolean to Integer conversion" annotation (Placement(transformation(extent={{150,20},{170,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Gain gai( + Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai( final k=-1) "Convert to heating load" annotation (Placement(transformation(extent={{-60,90},{-40,110}}))); Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar( - final p=273.15, - final k=1) + final p=273.15) "Convert temperature to Kelvin" annotation (Placement(transformation(extent={{-40,110},{-20,130}}))); equation - connect(controller.yBoi, boilerPlant.uBoiSta) - annotation (Line(points={{-18,14},{16,14},{16,9},{38,9}}, - color={255,0,255})); - - connect(controller.yHotWatIsoVal, boilerPlant.uHotIsoVal) - annotation (Line(points={{-18,6},{38,6}}, color={0,0,127})); - - connect(controller.yBypValPos, boilerPlant.uBypValSig) - annotation (Line(points={{-18,2},{0,2},{0,-3},{38,-3}}, color={0,0,127})); - connect(conPID.y,boilerPlant.uRadConVal) annotation (Line(points={{72,60},{76, - 60},{76,30},{30,30},{30,-6},{38,-6}}, color={0,0,127})); - - connect(boilerPlant.yZonTem, conPID.u_m) annotation (Line(points={{62,9},{80,9}, - {80,28},{60,28},{60,48}}, color={0,0,127})); - - connect(con3.y, controller.uBoiAva) annotation (Line(points={{-88,0},{-60,0}, - {-60,8},{-42,8}}, color={255,0,255})); + connect(con3.y, boiPlaCon.uBoiAva) annotation (Line(points={{-88,0},{-60,0},{-60, + 8},{-42,8}}, color={255,0,255})); connect(weaDat.weaBus,weaBus) annotation (Line( - points={{-70,60},{-50,60}}, + points={{-100,60},{-80,60}}, color={255,204,51}, thickness=0.5, smooth=Smooth.None), Text( @@ -173,8 +182,8 @@ equation index=1, extent={{6,3},{6,3}})); - connect(weaBus.TDryBul, controller.TOut) annotation (Line( - points={{-50,60},{-28,60},{-28,40},{-72,40},{-72,26},{-42,26}}, + connect(weaBus.TDryBul, boiPlaCon.TOut) annotation (Line( + points={{-80,60},{-72,60},{-72,26},{-42,26}}, color={255,204,51}, thickness=0.5), Text( string="%first", @@ -182,69 +191,39 @@ equation extent={{-6,3},{-6,3}}, horizontalAlignment=TextAlignment.Right)); - connect(weaBus.TDryBul, boilerPlant.TOutAir) annotation (Line( - points={{-50,60},{-28,60},{-28,40},{8,40},{8,-9},{38,-9}}, - color={255,204,51}, - thickness=0.5), Text( - string="%first", - index=-1, - extent={{-3,-6},{-3,-6}}, - horizontalAlignment=TextAlignment.Right)); - connect(controller.yPriPum, boilerPlant.uPumSta) - annotation (Line(points={{-18,-2},{2,-2},{2,3},{38,3}}, - color={255,0,255})); + connect(boiPla.ySupTem, boiPlaCon.TSupPri) annotation (Line(points={{62,8},{100, + 8},{100,-68},{-68,-68},{-68,23},{-42,23}}, color={0,0,127})); - connect(controller.yPriPumSpe, boilerPlant.uPumSpe) annotation (Line(points={{-18,-6}, - {4,-6},{4,0},{38,0}}, color={0,0,127})); + connect(boiPla.yRetTem, boiPlaCon.TRetPri) annotation (Line(points={{62,5},{104, + 5},{104,-72},{-72,-72},{-72,20},{-42,20}}, color={0,0,127})); - connect(boilerPlant.ySupTem, controller.TSupPri) annotation (Line(points={{62,6},{ - 100,6},{100,-68},{-68,-68},{-68,23},{-42,23}}, color={0, - 0,127})); + connect(boiPla.yHotWatDp, boiPlaCon.dpHotWatPri_rem) annotation (Line(points={ + {62,2},{108,2},{108,-76},{-76,-76},{-76,11},{-42,11}}, color={0,0,127})); - connect(boilerPlant.yRetTem, controller.TRetPri) annotation (Line(points={{62,3},{ - 104,3},{104,-72},{-72,-72},{-72,20},{-42,20}}, color={0, - 0,127})); + connect(boiPla.VHotWat_flow, boiPlaCon.VHotWatPri_flow) annotation (Line( + points={{62,-2},{112,-2},{112,-80},{-80,-80},{-80,17},{-42,17}}, color={ + 0,0,127})); - connect(boilerPlant.yHotWatDp, controller.dpHotWatPri_rem) annotation (Line( - points={{62,0},{108,0},{108,-76},{-76,-76},{-76,11},{-42,11}}, - color={0,0,127})); - connect(boilerPlant.VHotWat_flow, controller.VHotWatPri_flow) annotation ( - Line(points={{62,-3},{112,-3},{112,-80},{-80,-80},{-80,17},{-42,17}}, - color={0,0,127})); + connect(boiPla.yBoiSta, boiPlaCon.uBoi) annotation (Line(points={{62,-5},{120, + -5},{120,-88},{-88,-88},{-88,-17},{-42,-17}}, color={255,0,255})); + connect(boiPla.yPumSta, boiPlaCon.uPriPum) annotation (Line(points={{62,-8},{124, + -8},{124,-92},{-92,-92},{-92,-20},{-42,-20}}, color={255,0,255})); - connect(boilerPlant.yBypValSig, controller.uBypValPos) annotation (Line( - points={{62,12},{116,12},{116,-84},{-84,-84},{-84,-29},{-42,-29}}, + connect(boiPla.yHotWatIsoVal, boiPlaCon.uHotWatIsoVal) annotation (Line( + points={{62,-11},{128,-11},{128,-96},{-96,-96},{-96,-26},{-42,-26}}, color={0,0,127})); - connect(boilerPlant.yBoiSta, controller.uBoi) annotation (Line(points={{62,-6}, - {120,-6},{120,-88},{-88,-88},{-88,-17},{-42,-17}}, color={255,0,255})); - - connect(boilerPlant.yPumSta, controller.uPriPum) annotation (Line(points={{62,-9}, - {124,-9},{124,-92},{-92,-92},{-92,-20},{-42,-20}}, color={255,0, - 255})); - - connect(boilerPlant.yHotWatIsoVal, controller.uHotWatIsoVal) annotation (Line( - points={{62,-12},{128,-12},{128,-96},{-96,-96},{-96,-26},{-42,-26}}, - color={0,0,127})); + connect(conPID.y, hys.u) annotation (Line(points={{72,110},{78,110}}, + color={0,0,127})); - connect(conPID.y, hys.u) annotation (Line(points={{72,60},{76,60},{76,110},{78, - 110}}, color={0,0,127})); + connect(conPID.y, hys1.u) annotation (Line(points={{72,110},{76,110},{76,30},{ + 88,30}}, + color={0,0,127})); - connect(booToInt.y, controller.supResReq) annotation (Line(points={{182,110},{ - 196,110},{196,-100},{-50,-100},{-50,29},{-42,29}}, - color={255,127,0})); - - connect(conPID.y, hys1.u) annotation (Line(points={{72,60},{76,60},{76,30},{88, - 30}}, color={0,0,127})); - - connect(booToInt1.y, controller.TSupResReq) annotation (Line(points={{172,30}, - {184,30},{184,-104},{-54,-104},{-54,32},{-42,32}}, color={255,127,0})); - - connect(controller.TBoiHotWatSupSet, boilerPlant.TBoiHotWatSupSet) - annotation (Line(points={{-18,10},{-2,10},{-2,-12},{38,-12}}, color={0,0, - 127})); + connect(booToInt1.y, boiPlaCon.TSupResReq) annotation (Line(points={{172,30},{ + 184,30},{184,-104},{-54,-104},{-54,32},{-42,32}}, color={255,127,0})); connect(hys.y, booToInt.u) annotation (Line(points={{102,110},{158,110}}, color={255,0,255})); @@ -255,15 +234,47 @@ equation connect(timTab.y[1], gai.u) annotation (Line(points={{-79,100},{-62,100}}, color={0,0,127})); - connect(gai.y, boilerPlant.QRooInt_flowrate) annotation (Line(points={{-38, - 100},{0,100},{0,12},{38,12}}, color={0,0,127})); - connect(timTab.y[2], addPar.u) annotation (Line(points={{-79,100},{-70,100},{ -70,120},{-42,120}}, color={0,0,127})); connect(addPar.y, conPID.u_s) annotation (Line(points={{-18,120},{40,120},{40, - 60},{48,60}}, color={0,0,127})); - + 110},{48,110}}, + color={0,0,127})); + + connect(booToInt.y, boiPlaCon.plaReq) annotation (Line(points={{182,110},{190, + 110},{190,-100},{-48,-100},{-48,29},{-42,29}}, color={255,127,0})); + connect(boiPla.port_a, zon.port_b) annotation (Line(points={{57,14},{56,14},{56, + 60},{54,60}}, color={0,127,255})); + connect(zon.TZon, conPID.u_m) annotation (Line(points={{62,70},{68,70},{68,90}, + {60,90},{60,98}}, color={0,0,127})); + connect(gai.y, zon.QFlo) annotation (Line(points={{-38,100},{30,100},{30,70},{ + 38,70}}, color={0,0,127})); + connect(boiPla.yBypValPos, boiPlaCon.uBypValPos) annotation (Line(points={{62, + 11},{116,11},{116,-84},{-84,-84},{-84,-29},{-42,-29}}, color={0,0,127})); + connect(boiPlaCon.yPla, boiPla.uPla) annotation (Line(points={{-18,18},{20,18}, + {20,12},{38,12}}, color={255,0,255})); + connect(boiPlaCon.yPriPum, boiPla.uPumSta) annotation (Line(points={{-18,-6},{ + 20,-6},{20,3},{38,3}}, color={255,0,255})); + connect(boiPlaCon.yBoi, boiPla.uBoiSta) + annotation (Line(points={{-18,10},{38,10},{38,9}}, color={255,0,255})); + connect(boiPlaCon.TPlaHotWatSupSet, boiPla.TPlaHotWatSupSet) annotation (Line( + points={{-18,14},{18,14},{18,-12},{38,-12}}, color={0,0,127})); + connect(boiPlaCon.TBoiHotWatSupSet, boiPla.TBoiHotWatSupSet) annotation (Line( + points={{-18,6},{10,6},{10,-9},{38,-9}}, color={0,0,127})); + connect(boiPlaCon.yHotWatIsoVal, boiPla.uHotIsoVal) + annotation (Line(points={{-18,2},{16,2},{16,6},{38,6}}, color={0,0,127})); + connect(boiPlaCon.yPriPumSpe, boiPla.uPumSpe) annotation (Line(points={{-18,-10}, + {14,-10},{14,0},{38,0}}, color={0,0,127})); + connect(boiPlaCon.yBypValPos, boiPla.uBypValSig) annotation (Line(points={{-18, + -2},{6,-2},{6,-3},{38,-3}}, color={0,0,127})); + connect(zon.TZon, boiPla.TZon) annotation (Line(points={{62,70},{68,70},{68,20}, + {30,20},{30,-6},{38,-6}}, color={0,0,127})); + connect(boiPla.port_b, val.port_a) + annotation (Line(points={{43,14},{44,14},{44,28}}, color={0,127,255})); + connect(val.port_b, zon.port_a) + annotation (Line(points={{44,48},{44,60},{46,60}}, color={0,127,255})); + connect(conPID.y, val.y) annotation (Line(points={{72,110},{76,110},{76,86},{20, + 86},{20,38},{32,38}}, color={0,0,127})); annotation (Documentation(info="

This model couples the boiler plant model for a primary-only, condensing boiler @@ -291,7 +302,6 @@ First implementation. StartTime=518400, StopTime=691200, Interval=60, - Tolerance=1e-06, - __Dymola_Algorithm="Cvode"), + Tolerance=1e-06), Icon(coordinateSystem(extent={{-100,-100},{100,100}}))); end ClosedLoopTest; diff --git a/Buildings/Examples/BoilerPlant/PlantModel/BoilerPlant.mo b/Buildings/Examples/BoilerPlant/PlantModel/BoilerPlant.mo deleted file mode 100644 index fb2ec2eacf1..00000000000 --- a/Buildings/Examples/BoilerPlant/PlantModel/BoilerPlant.mo +++ /dev/null @@ -1,1011 +0,0 @@ -within Buildings.Examples.BoilerPlant.PlantModel; -model BoilerPlant - "Boiler plant model for closed loop testing" - - replaceable package MediumA = - Buildings.Media.Air; - - replaceable package MediumW = - Buildings.Media.Water - "Medium model"; - - parameter Modelica.SIunits.MassFlowRate mA_flow_nominal = V*1.2*6/3600 - "Nominal mass flow rate" - annotation(dialog(group="Zone parameters")); - - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = boiEff1[1]*boiCap1 + boiEff2[1]*boiCap2 - "Nominal heat flow rate of radiator" - annotation(dialog(group="Radiator parameters")); - - parameter Modelica.SIunits.HeatFlowRate boiCap1= 15000 - "Boiler capacity for boiler-1" - annotation(dialog(group="Boiler parameters")); - - parameter Modelica.SIunits.HeatFlowRate boiCap2= 15000 - "Boiler capacity for boiler-2" - annotation(dialog(group="Boiler parameters")); - - parameter Real boiEff1[6]( - final unit="1", - displayUnit="1") = {0.6246, 0.7711, -1.2077*10e-15, 0.008576, -0.005933, 0.003156} - "Efficiency for boiler-1" - annotation(dialog(group="Boiler parameters")); - - parameter Real boiEff2[6]( - final unit="1", - displayUnit="1") = {0.6246, 0.7711, -1.2077*10e-15, 0.008576, -0.005933, 0.003156} - "Efficiency for boiler-2" - annotation(dialog(group="Boiler parameters")); - - parameter Modelica.SIunits.Temperature TRadSup_nominal = 273.15+70 - "Radiator nominal supply water temperature" - annotation(dialog(group="Radiator parameters")); - - parameter Modelica.SIunits.Temperature TRadRet_nominal = 273.15+50 - "Radiator nominal return water temperature" - annotation(dialog(group="Radiator parameters")); - - parameter Modelica.SIunits.MassFlowRate mRad_flow_nominal=0.000604*1000 - "Radiator nominal mass flow rate" - annotation(dialog(group="Radiator parameters")); - - parameter Modelica.SIunits.Temperature TBoiSup_nominal = 273.15+70 - "Boiler nominal supply water temperature" - annotation(dialog(group="Boiler parameters")); - - parameter Modelica.SIunits.Temperature TBoiRet_min = 273.15+60 - "Boiler minimum return water temperature" - annotation(dialog(group="Boiler parameters")); - - parameter Modelica.SIunits.MassFlowRate mBoi_flow_nominal1=mRad_flow_nominal - "Boiler-1 nominal mass flow rate" - annotation(dialog(group="Boiler parameters")); - - parameter Modelica.SIunits.MassFlowRate mBoi_flow_nominal2=mRad_flow_nominal - "Boiler-2 nominal mass flow rate" - annotation(dialog(group="Boiler parameters")); - - parameter Modelica.SIunits.Volume V=1200 - "Room volume" - annotation(dialog(group="Zone parameters")); - - parameter Modelica.SIunits.Temperature TAir_nominal=273.15 + 23.9 - "Air temperature at nominal condition" - annotation(dialog(group="Zone parameters")); - - parameter Real zonTheCap( - final unit="J/K", - displayUnit="J/K", - final quantity="HeatCapacity") = 2*V*1.2*1500 - "Zone thermal capacitance" - annotation(dialog(group="Zone parameters")); - - parameter Modelica.SIunits.PressureDifference dpValve_nominal_value=6000 - "Nominal pressure drop of fully open valve, used if CvData=Buildings.Fluid.Types.CvTypes.OpPoint"; - - parameter Modelica.SIunits.PressureDifference dpFixed_nominal_value=1000 - "Pressure drop of pipe and other resistances that are in series"; - - Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uBoiSta[2] - "Boiler status signal" - annotation (Placement(transformation(extent={{-360,100},{-320,140}}), - iconTransformation(extent={{-140,70},{-100,110}}))); - - Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uPumSta[1] - "Pump status signal" - annotation (Placement(transformation(extent={{-360,20},{-320,60}}), - iconTransformation(extent={{-140,10},{-100,50}}))); - - Buildings.Controls.OBC.CDL.Interfaces.RealInput uHotIsoVal[2]( - final unit="1", - displayUnit="1") - "Hot water isolation valve signal" - annotation (Placement(transformation(extent={{-360,50},{-320,90}}), - iconTransformation(extent={{-140,40},{-100,80}}))); - - Buildings.Controls.OBC.CDL.Interfaces.RealInput uPumSpe( - final unit="1", - displayUnit="1") - "Pump speed signal" - annotation (Placement(transformation(extent={{-360,-20},{-320,20}}), - iconTransformation(extent={{-140,-20},{-100,20}}))); - - Buildings.Controls.OBC.CDL.Interfaces.RealInput uBypValSig( - final unit="1", - displayUnit="1") - "Bypass valve signal" - annotation (Placement(transformation(extent={{-360,-60},{-320,-20}}), - iconTransformation(extent={{-140,-50},{-100,-10}}))); - - Buildings.Controls.OBC.CDL.Interfaces.RealInput QRooInt_flowrate( - final unit="W", - displayUnit="W", - final quantity="EnergyFlowRate") - "Room internal load flowrate" - annotation (Placement(transformation(extent={{-360,190},{-320,230}}), - iconTransformation(extent={{-140,100},{-100,140}}))); - - Buildings.Controls.OBC.CDL.Interfaces.RealInput uRadConVal( - final unit="1", - displayUnit="1") "Radiator control valve signal" - annotation (Placement(transformation(extent={{-360,150},{-320,190}}), - iconTransformation(extent={{-140,-80},{-100,-40}}))); - - Buildings.Controls.OBC.CDL.Interfaces.RealInput TOutAir( - final unit="K", - displayUnit="degC", - final quantity="ThermodynamicTemperature") - "Measured outdoor air temperature" - annotation (Placement(transformation(extent={{-360,-100},{-320,-60}}), - iconTransformation(extent={{-140,-110},{-100,-70}}))); - - Buildings.Controls.OBC.CDL.Interfaces.RealInput TBoiHotWatSupSet[2]( - final unit=fill("K", 2), - displayUnit=fill("degC", 2), - final quantity=fill("ThermodynamicTemperature", 2)) - "Boiler hot water supply temperature setpoint vector" - annotation (Placement(transformation(extent={{-360,-150},{-320,-110}}), - iconTransformation(extent={{-140,-140},{-100,-100}}))); - - Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput yBoiSta[2] - "Boiler status signal" - annotation (Placement(transformation(extent={{320,-90},{360,-50}}), - iconTransformation(extent={{100,-80},{140,-40}}))); - - Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput yPumSta[1] - "Pump status signal" - annotation (Placement(transformation(extent={{320,-130},{360,-90}}), - iconTransformation(extent={{100,-110},{140,-70}}))); - - Buildings.Controls.OBC.CDL.Interfaces.RealOutput yZonTem( - final unit="K", - displayUnit="degC", - final quantity="ThermodynamicTemperature") - "Measured zone temperature" - annotation (Placement(transformation(extent={{320,120},{360,160}}), - iconTransformation(extent={{100,70},{140,110}}))); - - Buildings.Controls.OBC.CDL.Interfaces.RealOutput ySupTem( - final unit="K", - displayUnit="degC", - final quantity="ThermodynamicTemperature") - "Measured supply temperature" - annotation (Placement(transformation(extent={{320,80},{360,120}}), - iconTransformation(extent={{100,40},{140,80}}))); - - Buildings.Controls.OBC.CDL.Interfaces.RealOutput yRetTem( - final unit="K", - displayUnit="degC", - final quantity="ThermodynamicTemperature") - "Measured return temperature" - annotation (Placement(transformation(extent={{320,40},{360,80}}), - iconTransformation(extent={{100,10},{140,50}}))); - - Buildings.Controls.OBC.CDL.Interfaces.RealOutput yHotWatDp[1]( - final unit="Pa", - displayUnit="Pa") - "Hot water differential pressure between supply and return" - annotation (Placement(transformation(extent={{320,-10},{360,30}}), - iconTransformation(extent={{100,-20},{140,20}}))); - - Buildings.Controls.OBC.CDL.Interfaces.RealOutput VHotWat_flow( - final unit="m3/s", - displayUnit="m3/s", - final quantity="VolumeFlowRate") - "Measured flowrate in primary circuit" - annotation (Placement(transformation(extent={{320,-50},{360,-10}}), - iconTransformation(extent={{100,-50},{140,-10}}))); - - Buildings.Controls.OBC.CDL.Interfaces.RealOutput yHotWatIsoVal[2]( - final unit=fill("1",2), - displayUnit=fill("1",2)) - "Measured boiler hot water isolation valve position" - annotation (Placement(transformation(extent={{320,-170},{360,-130}}), - iconTransformation(extent={{100,-140},{140,-100}}))); - - Buildings.Controls.OBC.CDL.Interfaces.RealOutput yBypValSig( - final unit="1", - displayUnit="1") - "Measured bypass valve position signal" - annotation (Placement(transformation(extent={{320,160},{360,200}}), - iconTransformation(extent={{100,100},{140,140}}))); - - Buildings.Fluid.MixingVolumes.MixingVolume vol( - redeclare package Medium = MediumA, - final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, - final m_flow_nominal=mA_flow_nominal, - final V=1.2*V, - final nPorts=1) - "Mixing volume to represent zone air" - annotation (Placement(transformation(extent={{140,150},{160,170}}))); - - Modelica.Thermal.HeatTransfer.Components.ThermalConductor theCon( - final G=20000/30) - "Thermal conductance with the ambient" - annotation (Placement(transformation(extent={{100,170},{120,190}}))); - - Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow preHea - "Prescribed heat flow" - annotation (Placement(transformation(extent={{100,200},{120,220}}))); - - Modelica.Thermal.HeatTransfer.Components.HeatCapacitor heaCap( - final C=zonTheCap) - "Heat capacity for furniture and walls" - annotation (Placement(transformation(extent={{140,180},{160,200}}))); - - Buildings.Fluid.HeatExchangers.Radiators.RadiatorEN442_2 rad( - redeclare package Medium = MediumW, - final m_flow_nominal=mRad_flow_nominal, - final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, - final Q_flow_nominal=Q_flow_nominal, - final T_a_nominal=TRadSup_nominal, - final T_b_nominal=TRadRet_nominal, - final TAir_nominal=TAir_nominal, - final dp_nominal=0) - "Radiator" - annotation (Placement(transformation(extent={{80,110},{100,130}}))); - - Buildings.Fluid.Boilers.BoilerPolynomial boi( - redeclare package Medium = MediumW, - final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, - final m_flow_nominal=mBoi_flow_nominal1, - final dp_nominal=dpFixed_nominal_value, - final Q_flow_nominal=boiCap1, - final T_nominal=TBoiSup_nominal, - final effCur=Buildings.Fluid.Types.EfficiencyCurves.Constant, - final a=boiEff1, - final fue=Fluid.Data.Fuels.NaturalGasHigherHeatingValue(), - final UA=boiCap1/39.81) - "Boiler-2" - annotation (Placement(transformation(extent={{110,-160},{90,-140}}))); - - Buildings.Fluid.Sources.Boundary_pT preSou( - redeclare package Medium = MediumW, - p=100000, - nPorts=1) - "Source for pressure and to account for thermal expansion of water" - annotation (Placement(transformation(extent={{0,-100},{-20,-80}}))); - - Buildings.Fluid.Boilers.BoilerPolynomial boi1( - redeclare package Medium = MediumW, - final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, - final m_flow_nominal=mBoi_flow_nominal2, - final dp_nominal=dpFixed_nominal_value, - final Q_flow_nominal=boiCap2, - final T_nominal=TBoiSup_nominal, - final effCur=Buildings.Fluid.Types.EfficiencyCurves.Constant, - final a=boiEff2, - final fue=Buildings.Fluid.Data.Fuels.HeatingOilLowerHeatingValue(), - final UA=boiCap2/39.81) - "Boiler-1" - annotation (Placement(transformation(extent={{110,-220},{90,-200}}))); - - Buildings.Fluid.Movers.SpeedControlled_y pum( - redeclare package Medium = Media.Water, - final allowFlowReversal=true, - redeclare Fluid.Movers.Data.Pumps.BoilerPlant per, - final inputType=Buildings.Fluid.Types.InputType.Continuous, - final addPowerToMedium=false, - riseTime=15) "Hot water primary pump-1" annotation (Placement( - transformation( - extent={{-10,-10},{10,10}}, - rotation=90, - origin={-30,-70}))); - - Buildings.Fluid.FixedResistances.Junction spl1( - redeclare package Medium = MediumW, - final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, - final m_flow_nominal={mBoi_flow_nominal2,-mRad_flow_nominal,mBoi_flow_nominal1}, - final dp_nominal={0,0,0}) - "Splitter" - annotation (Placement(transformation(extent={{-10,-10},{10,10}}, - rotation=90, - origin={-30,-150}))); - - Buildings.Fluid.FixedResistances.Junction spl4( - redeclare package Medium = MediumW, - final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, - final m_flow_nominal={mRad_flow_nominal,-mRad_flow_nominal,-mRad_flow_nominal}, - final dp_nominal={0,0,0}) - "Splitter" - annotation (Placement(transformation(extent={{-10,-10},{10,10}}, - rotation=90, - origin={-30,40}))); - - Buildings.Fluid.Actuators.Valves.TwoWayLinear val( - redeclare package Medium = Media.Water, - final m_flow_nominal=mRad_flow_nominal, - final dpValve_nominal=dpValve_nominal_value, - riseTime=30, - dpFixed_nominal=dpFixed_nominal_value) - "Minimum flow bypass valve" - annotation (Placement(transformation(extent={{80,30},{100,50}}))); - - Buildings.Fluid.FixedResistances.Junction spl5( - redeclare package Medium = MediumW, - final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, - final m_flow_nominal={mRad_flow_nominal,-mRad_flow_nominal, - mRad_flow_nominal}, - final dp_nominal={0,0,0}) - "Splitter" - annotation (Placement(transformation(extent={{-10,-10},{10,10}}, - rotation=270, - origin={210,40}))); - - Buildings.Fluid.Actuators.Valves.TwoWayLinear val1( - redeclare package Medium = Media.Water, - final m_flow_nominal=mRad_flow_nominal, - final dpValve_nominal=dpValve_nominal_value, - y_start=0, - dpFixed_nominal=dpFixed_nominal_value) - "Isolation valve for boiler-2" - annotation (Placement(transformation(extent={{0,-220},{20,-200}}))); - - Buildings.Fluid.Actuators.Valves.TwoWayLinear val2( - redeclare package Medium = Media.Water, - final m_flow_nominal=mRad_flow_nominal, - final dpValve_nominal=dpValve_nominal_value, - y_start=0, - dpFixed_nominal=dpFixed_nominal_value) - "Isolation valve for boiler-1" - annotation (Placement(transformation(extent={{0,-160},{20,-140}}))); - - Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea[1] - "Boolean to Real conversion" - annotation (Placement(transformation(extent={{-220,30},{-200,50}}))); - - Buildings.Controls.OBC.CDL.Continuous.Product pro[1] - "Element-wise product" - annotation (Placement(transformation(extent={{-210,-20},{-190,0}}))); - - Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea1[2] - "Boolean to Real conversion" - annotation (Placement(transformation(extent={{-160,110},{-140,130}}))); - - Buildings.Fluid.Sensors.Temperature zonTem( - redeclare package Medium = Media.Air) - "Measured zone air temperature" - annotation (Placement(transformation(extent={{180,150},{200,170}}))); - - Buildings.Fluid.Actuators.Valves.TwoWayLinear val3( - redeclare package Medium = Media.Water, - final m_flow_nominal=mRad_flow_nominal, - final dpValve_nominal=6000, - y_start=0, - dpFixed_nominal=1000) - "Isolation valve for radiator" - annotation (Placement(transformation(extent={{20,110},{40,130}}))); - - Buildings.Fluid.Sensors.RelativePressure senRelPre( - redeclare package Medium = Media.Water) - "Differential pressure sensor between hot water supply and return" - annotation (Placement(transformation(extent={{80,70},{100,90}}))); - - Buildings.Fluid.Sensors.VolumeFlowRate senVolFlo( - redeclare package Medium = Media.Water, - final m_flow_nominal=mRad_flow_nominal/1000) - "Volume flow-rate through primary circuit" - annotation (Placement(transformation(extent={{0,-10},{20,10}}))); - - Modelica.Thermal.HeatTransfer.Sources.PrescribedTemperature TOut - "Outside temperature" - annotation (Placement(transformation(extent={{-280,-90},{-260,-70}}))); - - Buildings.Fluid.Sensors.TemperatureTwoPort senTem( - redeclare package Medium =Media.Water, - final m_flow_nominal=mRad_flow_nominal) - "Measured radiator supply temperature" - annotation (Placement(transformation(extent={{-20,110},{0,130}}))); - - Buildings.Fluid.Sensors.TemperatureTwoPort senTem1( - redeclare package Medium = Media.Water, - final m_flow_nominal=mRad_flow_nominal) - "Measured radiator return temperature" - annotation (Placement(transformation(extent={{180,110},{200,130}}))); - - Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator reaRep( - final nout=1) - "Real replicator" - annotation (Placement(transformation(extent={{260,0},{280,20}}))); - - Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys2[1]( - final uLow=fill(0.09,1), - final uHigh=fill(0.1, 1)) - "Check if pumps are on" - annotation (Placement(transformation(extent={{100,-20},{120,0}}))); - - Buildings.Controls.OBC.CDL.Logical.Latch lat[1] - "Hold pump enable status until change process is completed" - annotation (Placement(transformation(extent={{-300,30},{-280,50}}))); - - Buildings.Controls.OBC.CDL.Logical.Switch logSwi[1] - "Switch to signal from controller once enabling process has been completed" - annotation (Placement(transformation(extent={{-260,30},{-240,50}}))); - - Buildings.Controls.OBC.CDL.Logical.Pre pre[1] - "Logical pre block" - annotation (Placement(transformation(extent={{240,-140},{260,-120}}))); - - Buildings.Fluid.Sensors.VolumeFlowRate senVolFlo1( - redeclare package Medium = Media.Water, - final m_flow_nominal=mRad_flow_nominal) - "Volume flow-rate through boiler" - annotation (Placement(transformation(extent={{34,-160},{54,-140}}))); - - Buildings.Fluid.Sensors.VolumeFlowRate senVolFlo2( - redeclare package Medium = Media.Water, - final m_flow_nominal=mRad_flow_nominal) - "Volume flow-rate through boiler" - annotation (Placement(transformation(extent={{34,-220},{54,-200}}))); - - Buildings.Fluid.Sensors.TemperatureTwoPort senTem2( - redeclare package Medium = Media.Water, - final m_flow_nominal=mBoi_flow_nominal1) - "Measured boiler supply hot water temperature" - annotation (Placement(transformation(extent={{60,-160},{80,-140}}))); - - Buildings.Fluid.Sensors.TemperatureTwoPort senTem3( - redeclare package Medium = Media.Water, - final m_flow_nominal=mBoi_flow_nominal2) - "Measured boiler supply hot water temperature" - annotation (Placement(transformation(extent={{60,-220},{80,-200}}))); - - Buildings.Controls.OBC.CDL.Logical.Switch logSwi1[2] - "Switch to signal from controller once enabling process has been completed" - annotation (Placement(transformation(extent={{-210,110},{-190,130}}))); - - Buildings.Controls.OBC.CDL.Logical.Latch lat1[2] - "Hold pump enable status until change process is completed" - annotation (Placement(transformation(extent={{-260,110},{-240,130}}))); - - Buildings.Controls.OBC.CDL.Logical.Pre pre1[2] - "Logical pre block" - annotation (Placement(transformation(extent={{-300,142},{-280,162}}))); - - Buildings.Controls.OBC.CDL.Continuous.PID conPID[2]( - final controllerType=fill(Buildings.Controls.OBC.CDL.Types.SimpleController.PI,2), - final k=fill(10e-3, 2), - final Ti=fill(90, 2), - final xi_start=fill(1, 2)) - "PI controller for regulating hot water supply temperature from boiler" - annotation (Placement(transformation(extent={{-230,-120},{-210,-100}}))); - - Buildings.Controls.OBC.CDL.Continuous.Product pro1[2] - "Product of required boiler part load ratio and current status" - annotation (Placement(transformation(extent={{-120,-120},{-100,-100}}))); - - Buildings.Controls.OBC.CDL.Continuous.Switch swi[2] - "Switch" - annotation (Placement(transformation(extent={{-90,-170},{-70,-150}}))); - - Buildings.Fluid.FixedResistances.Junction spl6( - redeclare package Medium = MediumW, - final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, - final m_flow_nominal={-mBoi_flow_nominal1,mRad_flow_nominal,-mBoi_flow_nominal2}, - final dp_nominal={0,0,0}) - "Splitter" - annotation (Placement(transformation(extent={{-10,-10},{10,10}}, - rotation=0, - origin={150,-150}))); - - Buildings.Controls.OBC.CDL.Routing.BooleanScalarReplicator booRep( - final nout=2) - "Boolean replicator" - annotation (Placement(transformation(extent={{-160,-170},{-140,-150}}))); - - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2[2]( - final t=fill(273.15 + 95, 2)) - "Check if supply temperature has exceeded safe operation limit" - annotation (Placement(transformation(extent={{-210,-218},{-190,-198}}))); - - Buildings.Controls.OBC.CDL.Logical.MultiOr mulOr1( - final nin=2) - "Multi Or" - annotation (Placement(transformation(extent={{-180,-218},{-160,-198}}))); - - Buildings.Controls.OBC.CDL.Logical.Or or2 - "End boiler part load hold when supply temperature setpoint is achieved or if supply temperature exceeds safe operation limit" - annotation (Placement(transformation(extent={{-140,-218},{-120,-198}}))); - - Buildings.Controls.OBC.CDL.Continuous.Add add1[2]( - final k1=fill(-1, 2)) - "Find difference between setpoint and measured temperature" - annotation (Placement(transformation(extent={{-290,-170},{-270,-150}}))); - - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr[2]( - final h=fill(0.3, 2)) - "Check if supply temperature setpoint is met" - annotation (Placement(transformation(extent={{-260,-170},{-240,-150}}))); - - Buildings.Controls.OBC.CDL.Logical.MultiAnd mulAnd( - final nin=2) - "Multi And" - annotation (Placement(transformation(extent={{-230,-170},{-210,-150}}))); - - Buildings.Controls.OBC.CDL.Logical.Latch lat3 - "Hold boiler part load signal at 1 until supply temperature setpoint is achieved" - annotation (Placement(transformation(extent={{-190,-170},{-170,-150}}))); - - Buildings.Controls.OBC.CDL.Logical.Edge edg[2] - "Trigger boiler enable process to meet required supply temperature setpoint" - annotation (Placement(transformation(extent={{-290,74},{-270,94}}))); - - Buildings.Controls.OBC.CDL.Logical.MultiOr mulOr2( - final nin=2) - "Multi-Or" - annotation (Placement(transformation(extent={{-250,74},{-230,94}}))); - - Buildings.Controls.OBC.CDL.Continuous.Product pro2[2] - "Product of required boiler part load ratio and current status" - annotation (Placement(transformation(extent={{-270,-120},{-250,-100}}))); - - Buildings.Controls.OBC.CDL.Logical.Latch lat2[2] - "Latch" - annotation (Placement(transformation(extent={{260,-80},{280,-60}}))); - - Buildings.Controls.OBC.CDL.Logical.Pre pre2[2] - "Logical pre block" - annotation (Placement(transformation(extent={{160,-80},{180,-60}}))); - - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr3[2]( - final t=fill(0.02,2)) - "Check if boilers are enabled" - annotation (Placement(transformation(extent={{160,-210},{180,-190}}))); - - Buildings.Controls.OBC.CDL.Logical.Pre pre3[2] - "Logical pre block" - annotation (Placement(transformation(extent={{200,-210},{220,-190}}))); - - Buildings.Controls.OBC.CDL.Logical.Not not1[2] - "Logical not" - annotation (Placement(transformation(extent={{100,-70},{120,-50}}))); - - Buildings.Controls.OBC.CDL.Logical.Timer tim[1]( - final t=fill(120, 1)) - "Timer for pump proven ON signal" - annotation (Placement(transformation(extent={{140,-20},{160,0}}))); - - Modelica.Fluid.Pipes.DynamicPipe pipe( - redeclare package Medium = MediumW, - final nParallel=1, - final length=2000, - final isCircular=true, - final diameter=0.0762, - final height_ab=0.0102, - redeclare model FlowModel = - Modelica.Fluid.Pipes.BaseClasses.FlowModels.NominalLaminarFlow, - final nNodes=2, - final use_HeatTransfer=true, - redeclare model HeatTransfer = - Modelica.Fluid.Pipes.BaseClasses.HeatTransfer.ConstantFlowHeatTransfer, - flowModel( - final dp_nominal(displayUnit="Pa") = 50000, - final m_flow_nominal=mRad_flow_nominal), - heatTransfer( - final alpha0=15*1/0.3)) - "Dynamic pipe element to represent duct loss" - annotation (Placement(transformation(extent={{-10,-10},{10,10}}, rotation=-90, - origin={210,-16}))); - - Modelica.Thermal.HeatTransfer.Sources.PrescribedTemperature TOut1 - "Pipe external surface temperature" - annotation (Placement(transformation(extent={{230,-20},{250,0}}))); - -equation - connect(theCon.port_b, vol.heatPort) annotation (Line( - points={{120,180},{130,180},{130,160},{140,160}}, - color={191,0,0}, - smooth=Smooth.None)); - - connect(preHea.port, vol.heatPort) annotation (Line( - points={{120,210},{130,210},{130,160},{140,160}}, - color={191,0,0}, - smooth=Smooth.None)); - - connect(heaCap.port, vol.heatPort) annotation (Line( - points={{150,180},{130,180},{130,160},{140,160}}, - color={191,0,0}, - smooth=Smooth.None)); - - connect(rad.heatPortCon, vol.heatPort) annotation (Line( - points={{88,127.2},{88,160},{140,160}}, - color={191,0,0}, - smooth=Smooth.None)); - - connect(rad.heatPortRad, vol.heatPort) annotation (Line( - points={{92,127.2},{92,160},{140,160}}, - color={191,0,0}, - smooth=Smooth.None)); - - connect(spl4.port_3, val.port_a) - annotation (Line(points={{-20,40},{80,40}}, color={0,127,255})); - - connect(val.port_b, spl5.port_3) - annotation (Line(points={{100,40},{200,40}}, color={0,127,255})); - - connect(val2.port_a, spl1.port_3) - annotation (Line(points={{0,-150},{-20,-150}}, color={0,127,255})); - - connect(val1.port_a, spl1.port_1) annotation (Line(points={{0,-210},{-30,-210}, - {-30,-160}}, color={0,127,255})); - - connect(uBypValSig, val.y) annotation (Line(points={{-340,-40},{-120,-40},{ - -120,64},{90,64},{90,52}}, color={0,0,127})); - - connect(uHotIsoVal[1], val1.y) annotation (Line(points={{-340,60},{-340,70},{-170, - 70},{-170,-130},{-10,-130},{-10,-180},{10,-180},{10,-198}}, - color={0,0,127})); - - connect(uHotIsoVal[2], val2.y) annotation (Line(points={{-340,80},{-340,70},{-170, - 70},{-170,-130},{10,-130},{10,-138}}, color={0,0,127})); - - connect(QRooInt_flowrate, preHea.Q_flow) - annotation (Line(points={{-340,210},{100,210}}, - color={0,0,127})); - - connect(zonTem.port, vol.ports[1]) annotation (Line(points={{190,150},{190, - 144},{150,144},{150,150}}, - color={0,127,255})); - - connect(zonTem.T, yZonTem) annotation (Line(points={{197,160},{280,160},{280, - 140},{340,140}}, - color={0,0,127})); - - connect(val3.port_b, rad.port_a) - annotation (Line(points={{40,120},{80,120}}, color={0,127,255})); - - connect(uRadConVal, val3.y) - annotation (Line(points={{-340,170},{30,170},{30,132}}, - color={0,0,127})); - - connect(spl4.port_2, senRelPre.port_a) annotation (Line(points={{-30,50},{-30, - 80},{80,80}}, color={0,127,255})); - - connect(senRelPre.port_b, spl5.port_1) annotation (Line(points={{100,80},{210, - 80},{210,50}}, color={0,127,255})); - - connect(senVolFlo.port_b, spl4.port_1) annotation (Line(points={{20,0},{40,0}, - {40,20},{-30,20},{-30,30}}, color={0,127,255})); - - connect(senVolFlo.V_flow, VHotWat_flow) annotation (Line(points={{10,11},{10,16}, - {80,16},{80,-30},{340,-30}}, color={0,0,127})); - - connect(TOutAir, TOut.T) - annotation (Line(points={{-340,-80},{-282,-80}}, color={0,0,127})); - - connect(TOut.port, theCon.port_a) annotation (Line(points={{-260,-80},{-180,-80}, - {-180,180},{100,180}}, - color={191,0,0})); - - connect(senTem.port_b, val3.port_a) - annotation (Line(points={{0,120},{20,120}}, color={0,127,255})); - - connect(spl4.port_2, senTem.port_a) annotation (Line(points={{-30,50},{-30,120}, - {-20,120}}, color={0,127,255})); - - connect(senTem.T, ySupTem) annotation (Line(points={{-10,131},{-10,140},{270, - 140},{270,100},{340,100}}, color={0,0,127})); - - connect(rad.port_b, senTem1.port_a) - annotation (Line(points={{100,120},{180,120}}, - color={0,127,255})); - - connect(senTem1.port_b, spl5.port_1) annotation (Line(points={{200,120},{210, - 120},{210,50}}, color={0,127,255})); - - connect(senTem1.T, yRetTem) annotation (Line(points={{190,131},{190,134},{260, - 134},{260,60},{340,60}}, - color={0,0,127})); - - connect(reaRep.y, yHotWatDp) - annotation (Line(points={{282,10},{340,10}}, color={0,0,127})); - - connect(senRelPre.p_rel, reaRep.u) annotation (Line(points={{90,71},{90,66},{240, - 66},{240,10},{258,10}}, color={0,0,127})); - - connect(pro[1].y, pum.y) annotation (Line(points={{-188,-10},{-110,-10},{-110, - -70},{-42,-70}}, color={0,0,127})); - - connect(yHotWatIsoVal[1], val1.y_actual) annotation (Line(points={{340,-160}, - {280,-160},{280,-174},{30,-174},{30,-203},{15,-203}},color={0,0,127})); - - connect(yHotWatIsoVal[2], val2.y_actual) annotation (Line(points={{340,-140}, - {280,-140},{280,-174},{30,-174},{30,-143},{15,-143}},color={0,0,127})); - - connect(uPumSpe, pro[1].u2) annotation (Line(points={{-340,0},{-290,0},{-290,-16}, - {-212,-16}}, color={0,0,127})); - - connect(uPumSta, lat.u) - annotation (Line(points={{-340,40},{-302,40}}, color={255,0,255})); - - connect(lat.y, logSwi.u2) - annotation (Line(points={{-278,40},{-262,40}}, color={255,0,255})); - - connect(lat.y, logSwi.u1) annotation (Line(points={{-278,40},{-270,40},{-270, - 48},{-262,48}}, color={255,0,255})); - - connect(logSwi.y, booToRea.u) - annotation (Line(points={{-238,40},{-222,40}}, color={255,0,255})); - - connect(uPumSta, logSwi.u3) annotation (Line(points={{-340,40},{-310,40},{ - -310,28},{-270,28},{-270,32},{-262,32}}, color={255,0,255})); - - connect(pre.y, lat.clr) annotation (Line(points={{262,-130},{272,-130},{272, - -220},{-314,-220},{-314,34},{-302,34}}, color={255,0,255})); - - connect(pum.y_actual, hys2[1].u) annotation (Line(points={{-37,-59},{-37,-24}, - {90,-24},{90,-10},{98,-10}}, color={0,0,127})); - - connect(val2.port_b, senVolFlo1.port_a) - annotation (Line(points={{20,-150},{34,-150}}, color={0,127,255})); - - connect(val1.port_b, senVolFlo2.port_a) - annotation (Line(points={{20,-210},{34,-210}}, color={0,127,255})); - - connect(senVolFlo1.port_b, senTem2.port_a) - annotation (Line(points={{54,-150},{60,-150}}, color={0,127,255})); - - connect(senTem2.port_b, boi.port_b) - annotation (Line(points={{80,-150},{90,-150}}, color={0,127,255})); - - connect(senVolFlo2.port_b, senTem3.port_a) - annotation (Line(points={{54,-210},{60,-210}}, color={0,127,255})); - - connect(senTem3.port_b, boi1.port_b) - annotation (Line(points={{80,-210},{90,-210}}, color={0,127,255})); - - connect(uBoiSta, lat1.u) - annotation (Line(points={{-340,120},{-262,120}}, color={255,0,255})); - - connect(lat1.y, logSwi1.u2) - annotation (Line(points={{-238,120},{-212,120}}, color={255,0,255})); - - connect(logSwi1.y, booToRea1.u) - annotation (Line(points={{-188,120},{-162,120}}, color={255,0,255})); - - connect(uBoiSta, logSwi1.u3) annotation (Line(points={{-340,120},{-310,120},{ - -310,100},{-220,100},{-220,112},{-212,112}}, color={255,0,255})); - - connect(lat1.y, logSwi1.u1) annotation (Line(points={{-238,120},{-220,120},{ - -220,128},{-212,128}}, color={255,0,255})); - - connect(pre1.y, lat1.clr) annotation (Line(points={{-278,152},{-270,152},{ - -270,114},{-262,114}}, color={255,0,255})); - - connect(senTem3.T, conPID[1].u_m) annotation (Line(points={{70,-199},{70,-188}, - {-300,-188},{-300,-126},{-220,-126},{-220,-122}}, - color={0,0,127})); - - connect(senTem2.T, conPID[2].u_m) annotation (Line(points={{70,-139},{70,-126}, - {-220,-126},{-220,-122}}, color={0,0,127})); - - connect(conPID.y, pro1.u2) annotation (Line(points={{-208,-110},{-180,-110},{-180, - -116},{-122,-116}}, color={0,0,127})); - - connect(booToRea1.y, pro1.u1) annotation (Line(points={{-138,120},{-130,120},{ - -130,-104},{-122,-104}}, color={0,0,127})); - - connect(boi.port_a, spl6.port_1) - annotation (Line(points={{110,-150},{140,-150}}, color={0,127,255})); - - connect(boi1.port_a, spl6.port_3) annotation (Line(points={{110,-210},{150, - -210},{150,-160}}, color={0,127,255})); - - connect(pro1.y, swi.u3) annotation (Line(points={{-98,-110},{-96,-110},{-96, - -168},{-92,-168}}, color={0,0,127})); - - connect(booToRea1.y, swi.u1) annotation (Line(points={{-138,120},{-130,120},{ - -130,-152},{-92,-152}}, color={0,0,127})); - - connect(booRep.y, swi.u2) - annotation (Line(points={{-138,-160},{-92,-160}}, color={255,0,255})); - - connect(swi[1].y, boi1.y) annotation (Line(points={{-68,-160},{-60,-160},{-60, - -116},{120,-116},{120,-202},{112,-202}}, color={0,0,127})); - - connect(swi[2].y, boi.y) annotation (Line(points={{-68,-160},{-60,-160},{-60, - -116},{120,-116},{120,-142},{112,-142}}, color={0,0,127})); - - connect(senTem3.T, greThr2[1].u) annotation (Line(points={{70,-199},{70,-188}, - {-300,-188},{-300,-208},{-212,-208}}, color={0,0,127})); - - connect(senTem2.T, greThr2[2].u) annotation (Line(points={{70,-139},{70,-126}, - {-300,-126},{-300,-208},{-212,-208}}, color={0,0,127})); - - connect(greThr2.y, mulOr1.u[1:2]) annotation (Line(points={{-188,-208},{-186,-208}, - {-186,-211.5},{-182,-211.5}}, color={255,0,255})); - - connect(mulOr1.y, or2.u1) - annotation (Line(points={{-158,-208},{-142,-208}}, color={255,0,255})); - - connect(greThr.y, mulAnd.u[1:2]) annotation (Line(points={{-238,-160},{-236,-160}, - {-236,-163.5},{-232,-163.5}}, color={255,0,255})); - - connect(add1.y, greThr.u) - annotation (Line(points={{-268,-160},{-262,-160}}, color={0,0,127})); - - connect(senTem3.T, add1[1].u2) annotation (Line(points={{70,-199},{70,-188},{-300, - -188},{-300,-166},{-292,-166}}, color={0,0,127})); - - connect(senTem2.T, add1[2].u2) annotation (Line(points={{70,-139},{70,-126},{-300, - -126},{-300,-166},{-292,-166}}, color={0,0,127})); - - connect(mulAnd.y, or2.u2) annotation (Line(points={{-208,-160},{-200,-160},{-200, - -180},{-150,-180},{-150,-216},{-142,-216}}, color={255,0,255})); - - connect(or2.y, lat3.clr) annotation (Line(points={{-118,-208},{-110,-208},{-110, - -176},{-196,-176},{-196,-166},{-192,-166}}, color={255,0,255})); - - connect(edg.y,mulOr2. u[1:2]) annotation (Line(points={{-268,84},{-260,84},{-260, - 80.5},{-252,80.5}}, color={255,0,255})); - - connect(uBoiSta, edg.u) annotation (Line(points={{-340,120},{-310,120},{-310,84}, - {-292,84}}, color={255,0,255})); - - connect(mulOr2.y, lat3.u) annotation (Line(points={{-228,84},{-160,84},{-160,-140}, - {-196,-140},{-196,-160},{-192,-160}}, color={255,0,255})); - - connect(lat3.y, booRep.u) - annotation (Line(points={{-168,-160},{-162,-160}}, color={255,0,255})); - - connect(pro2.y, conPID.u_s) - annotation (Line(points={{-248,-110},{-232,-110}}, color={0,0,127})); - - connect(TBoiHotWatSupSet, pro2.u2) annotation (Line(points={{-340,-130},{-308, - -130},{-308,-116},{-272,-116}}, color={0,0,127})); - - connect(booToRea1.y, pro2.u1) annotation (Line(points={{-138,120},{-130,120},{ - -130,-94},{-280,-94},{-280,-104},{-272,-104}}, color={0,0,127})); - - connect(pro2.y, add1.u1) annotation (Line(points={{-248,-110},{-240,-110},{-240, - -134},{-296,-134},{-296,-154},{-292,-154}}, color={0,0,127})); - - connect(lat2.y, yBoiSta) - annotation (Line(points={{282,-70},{340,-70}}, color={255,0,255})); - - connect(pre2.y, lat2.clr) annotation (Line(points={{182,-70},{196,-70},{196,-76}, - {258,-76}}, color={255,0,255})); - - connect(swi.y, greThr3.u) annotation (Line(points={{-68,-160},{-60,-160},{-60, - -116},{120,-116},{120,-200},{158,-200}}, color={0,0,127})); - - connect(greThr3.y, pre3.u) - annotation (Line(points={{182,-200},{198,-200}}, color={255,0,255})); - - connect(pre3.y, lat2.u) annotation (Line(points={{222,-200},{230,-200},{230,-70}, - {258,-70}}, color={255,0,255})); - - connect(lat2.y, pre1.u) annotation (Line(points={{282,-70},{292,-70},{292,220}, - {-308,220},{-308,152},{-302,152}}, color={255,0,255})); - - connect(not1.y, pre2.u) annotation (Line(points={{122,-60},{140,-60},{140,-70}, - {158,-70}}, color={255,0,255})); - - connect(logSwi1.y, not1.u) annotation (Line(points={{-188,120},{-172,120},{-172, - 92},{74,92},{74,-60},{98,-60}}, color={255,0,255})); - - connect(spl1.port_2, pum.port_a) - annotation (Line(points={{-30,-140},{-30,-80}}, color={0,127,255})); - - connect(preSou.ports[1], pum.port_a) annotation (Line(points={{-20,-90},{-30,-90}, - {-30,-80}}, color={0,127,255})); - - connect(pum.port_b, senVolFlo.port_a) - annotation (Line(points={{-30,-60},{-30,0},{0,0}}, color={0,127,255})); - - connect(booToRea.y, pro.u1) annotation (Line(points={{-198,40},{-192,40},{-192, - 20},{-220,20},{-220,-4},{-212,-4}}, color={0,0,127})); - - connect(hys2.y, tim.u) - annotation (Line(points={{122,-10},{138,-10}}, color={255,0,255})); - - connect(tim.passed, yPumSta) annotation (Line(points={{162,-18},{200,-18},{200, - -110},{340,-110}}, color={255,0,255})); - - connect(tim.passed, pre.u) annotation (Line(points={{162,-18},{200,-18},{200,-130}, - {238,-130}}, color={255,0,255})); - - connect(val.y_actual, yBypValSig) annotation (Line(points={{95,47},{160,47},{160, - 90},{240,90},{240,180},{340,180}}, color={0,0,127})); - - connect(spl5.port_2, pipe.port_a) - annotation (Line(points={{210,30},{210,-6}}, color={0,127,255})); - - connect(pipe.port_b, spl6.port_2) annotation (Line(points={{210,-26},{210,-150}, - {160,-150}}, color={0,127,255})); - - connect(zonTem.T, TOut1.T) annotation (Line(points={{197,160},{220,160},{220, - -10},{228,-10}}, color={0,0,127})); - - connect(TOut1.port, pipe.heatPorts[1]) annotation (Line(points={{250,-10},{ - 260,-10},{260,-26},{220,-26},{220,-14.55},{214.4,-14.55}}, color={191, - 0,0})); - - connect(TOut1.port, pipe.heatPorts[2]) annotation (Line(points={{250,-10},{ - 260,-10},{260,-26},{220,-26},{220,-17.65},{214.4,-17.65}}, color={191, - 0,0})); - - annotation (defaultComponentName="boiPla", - Documentation(info=" -

- This model implements a primary-only, condensing boiler plant with a headered, - variable-speed primary pump, as defined in ASHRAE RP-1711, March 2020 draft. -

- ", revisions=" - - "), - Diagram(coordinateSystem(preserveAspectRatio=false, - extent={{-320,-240},{320,240}})), - Icon(coordinateSystem(extent={{-100,-100},{100,100}}), - graphics={ - Text( - extent={{-100,160},{100,120}}, - lineColor={0,0,255}, - textString="%name"), - Rectangle( - extent={{-100,100},{100,-100}}, - lineColor={28,108,200}, - fillColor={255,255,255}, - fillPattern=FillPattern.Solid), - Rectangle( - extent={{-40,-18},{40,-98}}, - lineColor={0,0,255}, - pattern=LinePattern.None, - fillColor={95,95,95}, - fillPattern=FillPattern.Solid), - Rectangle( - extent={{-60,-54},{60,-60}}, - lineColor={0,0,255}, - pattern=LinePattern.None, - fillColor={0,0,255}, - fillPattern=FillPattern.Solid), - Rectangle( - extent={{0,-60},{60,-54}}, - lineColor={0,0,255}, - pattern=LinePattern.None, - fillColor={255,0,0}, - fillPattern=FillPattern.Solid), - Polygon( - points={{0,-80},{-12,-98},{14,-98},{0,-80}}, - pattern=LinePattern.None, - smooth=Smooth.None, - fillColor={255,255,0}, - fillPattern=FillPattern.Solid, - lineColor={0,0,0}), - Ellipse(extent={{-80,58},{-50,26}}, lineColor={28,108,200}), - Polygon( - points={{-80,40},{-50,40},{-66,58},{-80,40}}, - lineColor={28,108,200}, - fillColor={28,108,200}, - fillPattern=FillPattern.Solid), - Line(points={{-66,-40},{-66,-12}}, color={28,108,200}), - Line(points={{-66,58},{-66,88}}, color={28,108,200}), - Line(points={{70,88},{70,-44},{70,-50}}, color={28,108,200}), - Polygon(points={{-80,26},{-80,26}}, lineColor={28,108,200}), - Polygon( - points={{-76,-12},{-54,-12},{-66,0},{-76,-12}}, - lineColor={28,108,200}, - fillColor={28,108,200}, - fillPattern=FillPattern.Solid), - Polygon( - points={{-76,12},{-54,12},{-66,0},{-76,12}}, - lineColor={28,108,200}, - fillColor={28,108,200}, - fillPattern=FillPattern.Solid), - Line(points={{-66,12},{-66,26}}, color={28,108,200}), - Ellipse( - extent={{-82,-40},{-52,-72}}, - lineColor={28,108,200}, - lineThickness=0.5), - Ellipse( - extent={{56,-38},{86,-70}}, - lineColor={28,108,200}, - lineThickness=0.5, - fillColor={28,108,200}, - fillPattern=FillPattern.Solid)})); -end BoilerPlant; diff --git a/Buildings/Examples/BoilerPlant/PlantModel/Validation/BoilerPlant.mo b/Buildings/Examples/BoilerPlant/PlantModel/Validation/BoilerPlant.mo deleted file mode 100644 index b861c531836..00000000000 --- a/Buildings/Examples/BoilerPlant/PlantModel/Validation/BoilerPlant.mo +++ /dev/null @@ -1,175 +0,0 @@ -within Buildings.Examples.BoilerPlant.PlantModel.Validation; -model BoilerPlant - "Validation for boiler plant model" - extends Modelica.Icons.Example; - replaceable package MediumA = - Buildings.Media.Air; - - replaceable package MediumW = - Buildings.Media.Water "Medium model"; - - parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 20000 - "Nominal heat flow rate of radiator"; - - Buildings.Examples.BoilerPlant.PlantModel.BoilerPlant boilerPlant( - final boiCap1=60000, - final boiCap2=60000, - final TRadRet_nominal=273.15 + 50) - "Boiler plant model" - annotation (Placement(transformation(extent={{-50,-12},{-30,8}}))); - - Buildings.Controls.OBC.CDL.Logical.Sources.Constant con[1]( - final k=fill(true, 1)) - "Boiler availability signal" - annotation (Placement(transformation(extent={{-110,10},{-90,30}}))); - - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con2( - final k=0) - "Bypass valve position signal" - annotation (Placement(transformation(extent={{-110,-30},{-90,-10}}))); - - Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys( - final uLow=273.15 + 60, - final uHigh=273.15 + 70) - "Check if hot water supply temperature is at setpoint" - annotation (Placement(transformation(extent={{-10,10},{10,30}}))); - - Buildings.Controls.OBC.CDL.Logical.Not not1 - "Logical not" - annotation (Placement(transformation(extent={{20,10},{40,30}}))); - - Buildings.Controls.OBC.CDL.Routing.BooleanScalarReplicator booRep( - final nout=2) - "Boolean replicator" - annotation (Placement(transformation(extent={{80,10},{100,30}}))); - - Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea - "Boolean to Real converter" - annotation (Placement(transformation(extent={{50,-30},{70,-10}}))); - - Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator reaRep( - final nout=2) - "Real replicator" - annotation (Placement(transformation(extent={{80,-30},{100,-10}}))); - - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con1( - final k=-Q_flow_nominal) - "Thermal load on zone" - annotation (Placement(transformation(extent={{-110,50},{-90,70}}))); - - Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys1( - final uLow=273.15 + 21.7, - final uHigh=273.15 + 23.89) - "Check if zone temperature is at setpoint" - annotation (Placement(transformation(extent={{-10,-30},{10,-10}}))); - - Buildings.Controls.OBC.CDL.Logical.Not not2 - "Logical not" - annotation (Placement(transformation(extent={{20,-30},{40,-10}}))); - - Buildings.Controls.OBC.CDL.Logical.And and2 - "Enable boilers only if supply temperature is below setpoint and pumps are on" - annotation (Placement(transformation(extent={{50,10},{70,30}}))); - - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con3( - final k=273.15 + 21) - "Outdoor air temperature" - annotation (Placement(transformation(extent={{-110,-70},{-90,-50}}))); - - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con4( - final k=273.15 + 70) - "Boiler hot water supply temperature setpoint" - annotation (Placement(transformation(extent={{-110,-110},{-90,-90}}))); - - Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator reaScaRep( - final nout=2) - "Real replicator" - annotation (Placement(transformation(extent={{-80,-110},{-60,-90}}))); - -equation - connect(con.y, boilerPlant.uPumSta) annotation (Line(points={{-88,20},{-80,20}, - {-80,1},{-52,1}}, color={255,0,255})); - - connect(con2.y, boilerPlant.uBypValSig) annotation (Line(points={{-88,-20},{ - -80,-20},{-80,-5},{-52,-5}}, - color={0,0,127})); - - connect(hys.y, not1.u) - annotation (Line(points={{12,20},{18,20}}, color={255,0,255})); - - connect(booRep.y, boilerPlant.uBoiSta) annotation (Line(points={{102,20},{110, - 20},{110,40},{-60,40},{-60,7},{-52,7}}, color={255,0,255})); - - connect(booToRea.y, reaRep.u) - annotation (Line(points={{72,-20},{78,-20}}, color={0,0,127})); - - connect(reaRep.y, boilerPlant.uHotIsoVal) annotation (Line(points={{102,-20}, - {110,-20},{110,-40},{-70,-40},{-70,4},{-52,4}}, - color={0,0,127})); - - connect(con1.y, boilerPlant.QRooInt_flowrate) annotation (Line(points={{-88,60}, - {-70,60},{-70,10},{-52,10}}, color={0,0,127})); - - connect(boilerPlant.ySupTem, hys.u) annotation (Line(points={{-28,4},{-20,4}, - {-20,20},{-12,20}}, color={0,0,127})); - - connect(boilerPlant.yZonTem, hys1.u) annotation (Line(points={{-28,7},{-24,7}, - {-24,-20},{-12,-20}}, color={0,0,127})); - - connect(hys1.y, not2.u) - annotation (Line(points={{12,-20},{18,-20}}, color={255,0,255})); - - connect(not2.y, booToRea.u) - annotation (Line(points={{42,-20},{48,-20}}, color={255,0,255})); - - connect(booRep.u, and2.y) - annotation (Line(points={{78,20},{72,20}}, color={255,0,255})); - - connect(not1.y, and2.u1) - annotation (Line(points={{42,20},{48,20}}, color={255,0,255})); - - connect(not2.y, and2.u2) annotation (Line(points={{42,-20},{46,-20},{46,12},{ - 48,12}}, color={255,0,255})); - - connect(booToRea.y,boilerPlant.uRadConVal) annotation (Line(points={{72,-20}, - {76,-20},{76,-50},{-60,-50},{-60,-8},{-52,-8}}, color={0,0,127})); - - connect(con3.y, boilerPlant.TOutAir) annotation (Line(points={{-88,-60},{-76, - -60},{-76,-11},{-52,-11}}, - color={0,0,127})); - - connect(con4.y, reaScaRep.u) - annotation (Line(points={{-88,-100},{-82,-100}}, color={0,0,127})); - - connect(reaScaRep.y, boilerPlant.TBoiHotWatSupSet) annotation (Line(points={{ - -58,-100},{-58,-14},{-52,-14}}, color={0,0,127})); - - connect(booToRea.y, boilerPlant.uPumSpe) annotation (Line(points={{72,-20},{ - 76,-20},{76,-50},{-60,-50},{-60,-2},{-52,-2}}, color={0,0,127})); - - annotation (Documentation(info=" -

- This example validates - - Buildings.Examples.BoilerPlant.PlantModel.BoilerPlant. -

- ", revisions=" - - "), - Diagram(coordinateSystem(preserveAspectRatio=false,extent={{-120,-120},{120, - 120}})), - __Dymola_Commands(file= - "modelica://Buildings/Resources/Scripts/Dymola/Examples/BoilerPlant/PlantModel/Validation/BoilerPlant.mos" - "Simulate and plot"), - experiment( - StopTime=60000, - Interval=1, - Tolerance=1e-06, - __Dymola_Algorithm="Cvode"), - Icon(coordinateSystem(extent={{-100,-100},{100,100}}))); -end BoilerPlant; diff --git a/Buildings/Examples/BoilerPlant/PlantModel/Validation/package.mo b/Buildings/Examples/BoilerPlant/PlantModel/Validation/package.mo deleted file mode 100644 index f781a1677e7..00000000000 --- a/Buildings/Examples/BoilerPlant/PlantModel/Validation/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within Buildings.Examples.BoilerPlant.PlantModel; -package Validation "Validation model for boiler plant" -end Validation; diff --git a/Buildings/Examples/BoilerPlant/PlantModel/Validation/package.order b/Buildings/Examples/BoilerPlant/PlantModel/Validation/package.order deleted file mode 100644 index 52bc0217dee..00000000000 --- a/Buildings/Examples/BoilerPlant/PlantModel/Validation/package.order +++ /dev/null @@ -1 +0,0 @@ -BoilerPlant diff --git a/Buildings/Examples/BoilerPlant/PlantModel/package.mo b/Buildings/Examples/BoilerPlant/PlantModel/package.mo deleted file mode 100644 index 06191331ea2..00000000000 --- a/Buildings/Examples/BoilerPlant/PlantModel/package.mo +++ /dev/null @@ -1,3 +0,0 @@ -within Buildings.Examples.BoilerPlant; -package PlantModel "Plant model for primary-only, condensing boiler plant" -end PlantModel; diff --git a/Buildings/Examples/BoilerPlant/PlantModel/package.order b/Buildings/Examples/BoilerPlant/PlantModel/package.order deleted file mode 100644 index 60e7fb09745..00000000000 --- a/Buildings/Examples/BoilerPlant/PlantModel/package.order +++ /dev/null @@ -1,2 +0,0 @@ -BoilerPlant -Validation diff --git a/Buildings/Examples/BoilerPlant/package.order b/Buildings/Examples/BoilerPlant/package.order index 46d0ef66c03..185c7a86ca8 100644 --- a/Buildings/Examples/BoilerPlant/package.order +++ b/Buildings/Examples/BoilerPlant/package.order @@ -1,2 +1,2 @@ ClosedLoopTest -PlantModel +Baseclasses diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_BypassValve_Validation_BypassValvePosition.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_BypassValve_Validation_BypassValvePosition.txt index da6bc5a28b2..63aa2183d72 100644 --- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_BypassValve_Validation_BypassValvePosition.txt +++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_BypassValve_Validation_BypassValvePosition.txt @@ -1,4 +1,4 @@ -last-generated=2021-10-15 +last-generated=2022-11-22 statistics-simulation= { "linear": " ", diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_EquipmentRotation_Subsequences_Validation_ContinuousLeadSwapTwo_uDevSta.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_EquipmentRotation_Subsequences_Validation_ContinuousLeadSwapTwo_uDevSta.txt index f6a2f66d8cd..bd97c5f73b8 100644 --- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_EquipmentRotation_Subsequences_Validation_ContinuousLeadSwapTwo_uDevSta.txt +++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_EquipmentRotation_Subsequences_Validation_ContinuousLeadSwapTwo_uDevSta.txt @@ -1,19 +1,19 @@ -last-generated=2021-04-12 +last-generated=2022-11-22 statistics-simulation= { "linear": " ", "nonlinear": " ", "numerical Jacobians": "0" } +time=[0e+00, 1.8e+02] leaSwa.uDevRolSet[1]=[1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 3.814682699498917e-06, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00] leaSwa.uDevRolSet[2]=[0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 9.999961853173005e-01, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00] -time=[0e+00, 1.8e+02] -leaSwa.uDevSta[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999898275774282e-01, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999898275774282e-01, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999898275773808e-01, 1e+00, 1e+00, 1e+00, 1e+00] leaSwa.uDevSta[1]=[1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 3.814682699498917e-06, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00] +leaSwa.uDevSta[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999898275774282e-01, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999898275774282e-01, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999898275773808e-01, 1e+00, 1e+00, 1e+00, 1e+00] leaSwa.yDevStaSet[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 3.814682699498917e-06, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1.017242257184137e-05, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00] leaSwa.yDevStaSet[2]=[0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 9.999961853173005e-01, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00] -leaSwa1.uDevRolSet[2]=[0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 9.999961853173005e-01, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00] leaSwa1.uDevRolSet[1]=[1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 3.814682699498917e-06, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00] +leaSwa1.uDevRolSet[2]=[0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 9.999961853173005e-01, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00] leaSwa1.uDevSta[1]=[1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 3.814682699498917e-06, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 9.999961853173005e-01, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00] leaSwa1.uDevSta[2]=[0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 9.999961853172827e-01, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00] leaSwa1.yDevStaSet[1]=[1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 3.814682717262485e-06, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00] @@ -24,9 +24,9 @@ leaSwa2.uDevSta[1]=[1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+0 leaSwa2.uDevSta[2]=[0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 9.99999364217523e-01, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 9.999898275774282e-01, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 9.999389685687561e-01, 1e+00, 0e+00, 0e+00, 9.999898275774756e-01, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00] leaSwa2.yDevStaSet[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 6.357824769986919e-07, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1.017242257184137e-05, 0e+00, 1e+00, 1e+00, 1e+00, 1.017242257184137e-05, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 6.103143124391863e-05, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00] leaSwa2.yDevStaSet[2]=[0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 9.999898275774282e-01, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 9.999999999999605e-01, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00] -leaSwa3.uDevRolSet[2]=[0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 9.999961853173005e-01, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00] leaSwa3.uDevRolSet[1]=[1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 3.814682699498917e-06, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00] -leaSwa3.uDevSta[2]=[1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 9.999961853172827e-01, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 3.814682699498917e-06, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00] +leaSwa3.uDevRolSet[2]=[0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 9.999961853173005e-01, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00] leaSwa3.uDevSta[1]=[1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 3.814682699498917e-06, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00] -leaSwa3.yDevStaSet[2]=[0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 9.999961853173005e-01, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00] +leaSwa3.uDevSta[2]=[1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 9.999961853172827e-01, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 3.814682699498917e-06, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00] leaSwa3.yDevStaSet[1]=[1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 3.814682717262485e-06, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00] +leaSwa3.yDevStaSet[2]=[0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 9.999961853173005e-01, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00] diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_EquipmentRotation_Subsequences_Validation_LeastRuntime_uDevRol.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_EquipmentRotation_Subsequences_Validation_LeastRuntime_uDevRol.txt index 0b996df4504..1f7672b4d2d 100644 --- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_EquipmentRotation_Subsequences_Validation_LeastRuntime_uDevRol.txt +++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_EquipmentRotation_Subsequences_Validation_LeastRuntime_uDevRol.txt @@ -1,26 +1,26 @@ -last-generated=2021-04-13 +last-generated=2022-11-22 statistics-simulation= { "linear": " ", "nonlinear": " ", "numerical Jacobians": "0" } +time=[0e+00, 1e+05] rotTwo.yDevRol[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1.820765760385257e-14, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] rotTwo.yDevRol[2]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999999999818e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -time=[0e+00, 1e+05] leaRunTim.uDevSta[1]=[1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 9.999999999999818e-01, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00] leaRunTim.uDevSta[2]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999999999818e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -leaRunTim.accTim[2].y=[0e+00, 1e+03, 2e+03, 3e+03, 4e+03, 5e+03, 5.76e+03, 5.76e+03, 6.48e+03, 6.48e+03, 6.48e+03, 6.68e+03, 7.2e+03, 7.2e+03, 7.2e+03, 7.8e+03, 8.8e+03, 9.8e+03, 1.08e+04, 1.18e+04, 1.28e+04, 1.296e+04, 1.336e+04, 1.368e+04, 1.368e+04, 1.368e+04, 1.44e+04, 1.44e+04, 1.44e+04, 1.46e+04, 1.56e+04, 1.66e+04, 1.76e+04, 1.86e+04, 1.96e+04, 2.016e+04, 2.016e+04, 2.088e+04, 2.088e+04, 2.088e+04, 2.128e+04, 2.16e+04, 2.16e+04, 2.16e+04, 2.24e+04, 2.34e+04, 2.44e+04, 2.54e+04, 2.64e+04, 2.736e+04, 2.736e+04, 2.796e+04, 2.808e+04, 2.808e+04, 2.808e+04, 2.88e+04, 2.88e+04, 2.88e+04, 2.919999999999999e+04, 3.02e+04, 3.12e+04, 3.22e+04, 3.32e+04, 3.42e+04, 3.456e+04, 3.476e+04, 3.528e+04, 3.528e+04, 3.528e+04, 3.588e+04, 3.6e+04, 3.6e+04, 3.6e+04, 3.7e+04, 3.8e+04, 3.9e+04, 4e+04, 4.1e+04, 4.176e+04, 4.176e+04, 4.248e+04, 4.248e+04, 4.248e+04, 4.268e+04, 4.32e+04, 4.32e+04, 4.32e+04, 4.38e+04, 4.48e+04, 4.58e+04, 4.68e+04, 4.78e+04, 4.88e+04, 4.896e+04, 4.936e+04, 4.968e+04, 4.968e+04, 4.968e+04, 5.04e+04, 5.04e+04, 5.04e+04] leaRunTim.accTim[1].y=[0e+00, 7.2e+02, 7.2e+02, 7.2e+02, 1.12e+03, 1.44e+03, 1.44e+03, 1.44e+03, 2.24e+03, 3.24e+03, 4.24e+03, 5.24e+03, 6.24e+03, 7.2e+03, 7.2e+03, 7.8e+03, 7.92e+03, 7.92e+03, 7.92e+03, 8.64e+03, 8.64e+03, 8.64e+03, 9.04e+03, 1.004e+04, 1.104e+04, 1.204e+04, 1.304e+04, 1.404e+04, 1.44e+04, 1.46e+04, 1.512e+04, 1.512e+04, 1.512e+04, 1.572e+04, 1.584e+04, 1.584e+04, 1.584e+04, 1.684e+04, 1.784e+04, 1.884e+04, 1.984e+04, 2.084e+04, 2.16e+04, 2.16e+04, 2.232e+04, 2.232e+04, 2.232e+04, 2.252e+04, 2.304e+04, 2.304e+04, 2.304e+04, 2.364e+04, 2.464e+04, 2.564e+04, 2.664e+04, 2.764000000000001e+04, 2.864000000000001e+04, 2.88e+04, 2.919999999999999e+04, 2.952e+04, 2.952e+04, 2.952e+04, 3.024e+04, 3.024e+04, 3.024e+04, 3.044e+04, 3.144e+04, 3.244e+04, 3.344e+04, 3.444e+04, 3.544e+04, 3.6e+04, 3.6e+04, 3.672e+04, 3.672e+04, 3.672e+04, 3.712e+04, 3.744e+04, 3.744e+04, 3.744e+04, 3.824e+04, 3.924e+04, 4.024e+04, 4.124e+04, 4.224e+04, 4.32e+04, 4.32e+04, 4.38e+04, 4.392e+04, 4.392e+04, 4.392e+04, 4.464e+04, 4.464e+04, 4.464e+04, 4.504e+04, 4.604e+04, 4.704e+04, 4.804e+04, 4.904e+04, 5.004e+04, 5.04e+04] -rotTwo1.yDevRol[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] +leaRunTim.accTim[2].y=[0e+00, 1e+03, 2e+03, 3e+03, 4e+03, 5e+03, 5.76e+03, 5.76e+03, 6.48e+03, 6.48e+03, 6.48e+03, 6.68e+03, 7.2e+03, 7.2e+03, 7.2e+03, 7.8e+03, 8.8e+03, 9.8e+03, 1.08e+04, 1.18e+04, 1.28e+04, 1.296e+04, 1.336e+04, 1.368e+04, 1.368e+04, 1.368e+04, 1.44e+04, 1.44e+04, 1.44e+04, 1.46e+04, 1.56e+04, 1.66e+04, 1.76e+04, 1.86e+04, 1.96e+04, 2.016e+04, 2.016e+04, 2.088e+04, 2.088e+04, 2.088e+04, 2.128e+04, 2.16e+04, 2.16e+04, 2.16e+04, 2.24e+04, 2.34e+04, 2.44e+04, 2.54e+04, 2.64e+04, 2.736e+04, 2.736e+04, 2.796e+04, 2.808e+04, 2.808e+04, 2.808e+04, 2.88e+04, 2.88e+04, 2.88e+04, 2.919999999999999e+04, 3.02e+04, 3.12e+04, 3.22e+04, 3.32e+04, 3.42e+04, 3.456e+04, 3.476e+04, 3.528e+04, 3.528e+04, 3.528e+04, 3.588e+04, 3.6e+04, 3.6e+04, 3.6e+04, 3.7e+04, 3.8e+04, 3.9e+04, 4e+04, 4.1e+04, 4.176e+04, 4.176e+04, 4.248e+04, 4.248e+04, 4.248e+04, 4.268e+04, 4.32e+04, 4.32e+04, 4.32e+04, 4.38e+04, 4.48e+04, 4.58e+04, 4.68e+04, 4.78e+04, 4.88e+04, 4.896e+04, 4.936e+04, 4.968e+04, 4.968e+04, 4.968e+04, 5.04e+04, 5.04e+04, 5.04e+04] rotTwo1.yDevRol[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +rotTwo1.yDevRol[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] leaRunTim1.uDevSta[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 9.999999999999818e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] leaRunTim1.uDevSta[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00] -leaRunTim1.accTim[2].y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8e+02, 1.8e+03, 2.8e+03, 3.8e+03, 4.8e+03, 5.76e+03, 5.76e+03, 6.36e+03, 7.36e+03, 8.36e+03, 9.36e+03, 1.036e+04, 1.136e+04, 1.152e+04, 1.152e+04, 1.152e+04, 1.152e+04, 1.152e+04, 1.152e+04, 1.152e+04, 1.152e+04, 1.152e+04, 1.152e+04, 1.152e+04, 1.152e+04, 1.152e+04, 1.152e+04, 1.152e+04, 1.152e+04, 1.252e+04, 1.352e+04, 1.452e+04, 1.552e+04, 1.652e+04, 1.728e+04, 1.728e+04, 1.808e+04, 1.908e+04, 2.008e+04, 2.108e+04, 2.208e+04, 2.304e+04, 2.304e+04, 2.304e+04, 2.304e+04, 2.304e+04, 2.304e+04, 2.304e+04, 2.304e+04, 2.304e+04, 2.304e+04, 2.304e+04, 2.304e+04, 2.304e+04, 2.304e+04, 2.304e+04, 2.304e+04, 2.324e+04, 2.424e+04, 2.524e+04, 2.624e+04, 2.724e+04, 2.824e+04, 2.88e+04, 2.88e+04, 2.98e+04, 3.08e+04, 3.18e+04, 3.28e+04, 3.38e+04, 3.456e+04, 3.456e+04, 3.456e+04, 3.456e+04, 3.456e+04, 3.456e+04, 3.456e+04, 3.456e+04, 3.456e+04, 3.456e+04, 3.456e+04, 3.456e+04, 3.456e+04, 3.456e+04, 3.456e+04, 3.456e+04, 3.496e+04, 3.596e+04, 3.696e+04, 3.796e+04, 3.896e+04, 3.996e+04, 4.032e+04] leaRunTim1.accTim[1].y=[0e+00, 1e+03, 2e+03, 3e+03, 4e+03, 5e+03, 5.76e+03, 5.76e+03, 5.76e+03, 5.76e+03, 5.76e+03, 5.76e+03, 5.76e+03, 5.76e+03, 5.76e+03, 5.76e+03, 5.76e+03, 5.76e+03, 5.76e+03, 5.76e+03, 5.76e+03, 5.76e+03, 6.16e+03, 7.16e+03, 8.16e+03, 9.16e+03, 1.016e+04, 1.116e+04, 1.152e+04, 1.172e+04, 1.272e+04, 1.372e+04, 1.472e+04, 1.572e+04, 1.672e+04, 1.728e+04, 1.728e+04, 1.728e+04, 1.728e+04, 1.728e+04, 1.728e+04, 1.728e+04, 1.728e+04, 1.728e+04, 1.728e+04, 1.728e+04, 1.728e+04, 1.728e+04, 1.728e+04, 1.728e+04, 1.728e+04, 1.788e+04, 1.888e+04, 1.988e+04, 2.088e+04, 2.188000000000001e+04, 2.288000000000001e+04, 2.304e+04, 2.343999999999999e+04, 2.444e+04, 2.544e+04, 2.644e+04, 2.744e+04, 2.844e+04, 2.88e+04, 2.88e+04, 2.88e+04, 2.88e+04, 2.88e+04, 2.88e+04, 2.88e+04, 2.88e+04, 2.88e+04, 2.88e+04, 2.88e+04, 2.88e+04, 2.88e+04, 2.88e+04, 2.88e+04, 2.88e+04, 2.96e+04, 3.06e+04, 3.16e+04, 3.26e+04, 3.36e+04, 3.456e+04, 3.456e+04, 3.516e+04, 3.616e+04, 3.716e+04, 3.816e+04, 3.916e+04, 4.016e+04, 4.032e+04, 4.032e+04, 4.032e+04, 4.032e+04, 4.032e+04, 4.032e+04, 4.032e+04, 4.032e+04] +leaRunTim1.accTim[2].y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8e+02, 1.8e+03, 2.8e+03, 3.8e+03, 4.8e+03, 5.76e+03, 5.76e+03, 6.36e+03, 7.36e+03, 8.36e+03, 9.36e+03, 1.036e+04, 1.136e+04, 1.152e+04, 1.152e+04, 1.152e+04, 1.152e+04, 1.152e+04, 1.152e+04, 1.152e+04, 1.152e+04, 1.152e+04, 1.152e+04, 1.152e+04, 1.152e+04, 1.152e+04, 1.152e+04, 1.152e+04, 1.152e+04, 1.252e+04, 1.352e+04, 1.452e+04, 1.552e+04, 1.652e+04, 1.728e+04, 1.728e+04, 1.808e+04, 1.908e+04, 2.008e+04, 2.108e+04, 2.208e+04, 2.304e+04, 2.304e+04, 2.304e+04, 2.304e+04, 2.304e+04, 2.304e+04, 2.304e+04, 2.304e+04, 2.304e+04, 2.304e+04, 2.304e+04, 2.304e+04, 2.304e+04, 2.304e+04, 2.304e+04, 2.304e+04, 2.324e+04, 2.424e+04, 2.524e+04, 2.624e+04, 2.724e+04, 2.824e+04, 2.88e+04, 2.88e+04, 2.98e+04, 3.08e+04, 3.18e+04, 3.28e+04, 3.38e+04, 3.456e+04, 3.456e+04, 3.456e+04, 3.456e+04, 3.456e+04, 3.456e+04, 3.456e+04, 3.456e+04, 3.456e+04, 3.456e+04, 3.456e+04, 3.456e+04, 3.456e+04, 3.456e+04, 3.456e+04, 3.456e+04, 3.496e+04, 3.596e+04, 3.696e+04, 3.796e+04, 3.896e+04, 3.996e+04, 4.032e+04] rotTwo2.yDevRol[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1.820765760385257e-14, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] rotTwo2.yDevRol[2]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999999999818e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -leaRunTim2.uDevSta[2]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 9.999999999999818e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00] leaRunTim2.uDevSta[1]=[1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00] +leaRunTim2.uDevSta[2]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 9.999999999999818e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00] leaRunTim2.accTim[1].y=[0e+00, 1e+03, 1.08e+03, 1.08e+03, 1.08e+03, 1.08e+03, 1.68e+03, 2.16e+03, 2.96e+03, 3.96e+03, 4.96e+03, 5.96e+03, 6.96e+03, 7.92e+03, 7.92e+03, 7.92e+03, 7.92e+03, 8.72e+03, 9e+03, 9e+03, 9e+03, 9e+03, 9.4e+03, 1.04e+04, 1.14e+04, 1.24e+04, 1.34e+04, 1.44e+04, 1.476e+04, 1.476e+04, 1.476e+04, 1.476e+04, 1.476e+04, 1.536e+04, 1.584e+04, 1.584e+04, 1.584e+04, 1.684e+04, 1.784e+04, 1.884e+04, 1.984e+04, 2.084e+04, 2.16e+04, 2.16e+04, 2.24e+04, 2.268e+04, 2.268e+04, 2.268e+04, 2.268e+04, 2.308e+04, 2.376e+04, 2.436e+04, 2.536e+04, 2.636e+04, 2.736e+04, 2.836000000000001e+04, 2.936000000000001e+04, 2.952e+04, 2.952e+04, 2.952e+04, 3.012e+04, 3.06e+04, 3.06e+04, 3.06e+04, 3.06e+04, 3.08e+04, 3.18e+04, 3.28e+04, 3.38e+04, 3.48e+04, 3.58e+04, 3.636e+04, 3.636e+04, 3.636e+04, 3.636e+04, 3.636e+04, 3.676e+04, 3.744e+04, 3.744e+04, 3.744e+04, 3.824e+04, 3.924e+04, 4.024e+04, 4.124e+04, 4.224e+04, 4.32e+04, 4.32e+04, 4.38e+04, 4.428e+04, 4.428e+04, 4.428e+04, 4.428e+04, 4.448e+04, 4.536e+04, 4.576e+04, 4.676e+04, 4.776e+04, 4.876e+04, 4.976e+04, 5.076e+04, 5.112e+04] leaRunTim2.accTim[2].y=[0e+00, 1e+03, 2e+03, 3e+03, 4e+03, 5e+03, 5.76e+03, 5.76e+03, 5.76e+03, 5.76e+03, 5.76e+03, 5.96e+03, 6.84e+03, 6.84e+03, 6.84e+03, 7.44e+03, 8.44e+03, 9.44e+03, 1.044e+04, 1.144e+04, 1.244e+04, 1.26e+04, 1.3e+04, 1.368e+04, 1.368e+04, 1.368e+04, 1.368e+04, 1.368e+04, 1.468e+04, 1.496e+04, 1.596e+04, 1.696e+04, 1.796e+04, 1.896e+04, 1.996e+04, 2.052e+04, 2.052e+04, 2.052e+04, 2.072e+04, 2.16e+04, 2.16e+04, 2.16e+04, 2.16e+04, 2.16e+04, 2.24e+04, 2.34e+04, 2.44e+04, 2.54e+04, 2.64e+04, 2.736e+04, 2.736e+04, 2.736e+04, 2.736e+04, 2.736e+04, 2.736e+04, 2.836000000000001e+04, 2.844e+04, 2.844e+04, 2.883999999999999e+04, 2.984e+04, 3.084e+04, 3.184e+04, 3.284e+04, 3.384e+04, 3.42e+04, 3.44e+04, 3.528e+04, 3.528e+04, 3.528e+04, 3.528e+04, 3.528e+04, 3.608e+04, 3.636e+04, 3.736e+04, 3.836e+04, 3.936e+04, 4.036e+04, 4.136e+04, 4.212e+04, 4.212e+04, 4.212e+04, 4.212e+04, 4.312e+04, 4.32e+04, 4.32e+04, 4.32e+04, 4.32e+04, 4.38e+04, 4.48e+04, 4.58e+04, 4.68e+04, 4.78e+04, 4.88e+04, 4.896e+04, 4.896e+04, 4.896e+04, 4.896e+04, 4.896e+04, 4.976e+04, 5.004e+04, 5.004e+04] diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_EquipmentRotation_Subsequences_Validation_MinimumLeadRuntime_uDevRol.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_EquipmentRotation_Subsequences_Validation_MinimumLeadRuntime_uDevRol.txt index 62533ae1443..ea65a6499ad 100644 --- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_EquipmentRotation_Subsequences_Validation_MinimumLeadRuntime_uDevRol.txt +++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_EquipmentRotation_Subsequences_Validation_MinimumLeadRuntime_uDevRol.txt @@ -1,23 +1,23 @@ -last-generated=2021-04-13 +last-generated=2022-11-22 statistics-simulation= { "linear": " ", "nonlinear": " ", "numerical Jacobians": "0" } +time=[0e+00, 1e+05] rotTwo.yDevRol[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00] rotTwo.yDevRol[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00] -time=[0e+00, 1e+05] -minLeaTim.uDevSta[2]=[1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999999999818e-01, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00] minLeaTim.uDevSta[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 9.999999999999818e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00] +minLeaTim.uDevSta[2]=[1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999999999818e-01, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00] minLeaTim.accTim[1].y=[0e+00, 1e+03, 2e+03, 3e+03, 4e+03, 5e+03, 5.76e+03, 5.76e+03, 6.56e+03, 7.56e+03, 8.56e+03, 9.56e+03, 1.056e+04, 1.152e+04, 1.152e+04, 1.212e+04, 1.312e+04, 1.412e+04, 1.512e+04, 1.612e+04, 1.712e+04, 1.728e+04, 1.768e+04, 1.868e+04, 1.968e+04, 2.068e+04, 2.168e+04, 2.268e+04, 2.304e+04, 2.324e+04, 2.424e+04, 2.524e+04, 2.624e+04, 2.724e+04, 2.824e+04, 2.88e+04, 2.88e+04, 2.98e+04, 3.08e+04, 3.18e+04, 3.28e+04, 3.38e+04, 3.456e+04, 3.456e+04, 3.536e+04, 3.636e+04, 3.736e+04, 3.836e+04, 3.936e+04, 4.032e+04, 4.032e+04, 4.092e+04, 4.192e+04, 4.292e+04, 4.392e+04, 7.2e+02, 7.2e+02, 7.2e+02, 1.119999999999993e+03, 1.44e+03, 1.44e+03, 1.44e+03, 2.16e+03, 2.16e+03, 2.16e+03, 2.36e+03, 2.88e+03, 2.88e+03, 2.88e+03, 3.48e+03, 3.6e+03, 3.6e+03, 3.6e+03, 4.32e+03, 4.32e+03, 4.32e+03, 4.72e+03, 5.04e+03, 5.04e+03, 5.04e+03, 5.76e+03, 5.76e+03, 5.76e+03, 5.96e+03, 6.48e+03, 6.48e+03, 6.48e+03, 7.08e+03, 7.2e+03, 7.2e+03, 7.2e+03, 7.92e+03, 7.92e+03, 7.92e+03, 8.32e+03, 8.64e+03, 8.64e+03, 8.64e+03, 9.44e+03, 1.044e+04, 1.08e+04] minLeaTim.accTim[2].y=[0e+00, 7.2e+02, 7.2e+02, 7.2e+02, 1.12e+03, 1.44e+03, 1.44e+03, 1.44e+03, 2.16e+03, 2.16e+03, 2.16e+03, 2.36e+03, 2.88e+03, 2.88e+03, 2.88e+03, 3.48e+03, 3.6e+03, 3.6e+03, 3.6e+03, 4.32e+03, 4.32e+03, 4.32e+03, 4.72e+03, 5.04e+03, 5.04e+03, 5.04e+03, 5.76e+03, 5.76e+03, 5.76e+03, 5.959999999999996e+03, 6.48e+03, 6.48e+03, 6.48e+03, 7.08e+03, 7.2e+03, 7.2e+03, 7.2e+03, 7.92e+03, 7.92e+03, 7.92e+03, 8.32e+03, 8.64e+03, 8.64e+03, 8.64e+03, 9.36e+03, 9.36e+03, 9.36e+03, 9.56e+03, 1.008e+04, 1.008e+04, 1.008e+04, 1.068e+04, 1.08e+04, 1.08e+04, 1.08e+04, 1.180000000000001e+04, 1.280000000000001e+04, 1.296e+04, 1.335999999999999e+04, 1.436e+04, 1.536e+04, 1.636e+04, 1.736e+04, 1.836e+04, 1.872e+04, 1.892e+04, 1.992e+04, 2.092e+04, 2.192e+04, 2.292e+04, 2.392e+04, 2.448e+04, 2.448e+04, 2.548e+04, 2.648e+04, 2.748e+04, 2.848e+04, 2.948e+04, 3.024e+04, 3.024e+04, 3.104e+04, 3.204e+04, 3.304e+04, 3.404e+04, 3.504e+04, 3.6e+04, 3.6e+04, 3.66e+04, 3.76e+04, 3.86e+04, 3.96e+04, 4.06e+04, 4.16e+04, 4.176e+04, 4.216e+04, 4.316e+04, 4.416e+04, 4.516e+04, 7.2e+02, 7.2e+02, 7.2e+02] -minLeaTim.accTim[2].passed=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00] minLeaTim.accTim[1].passed=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -rotTwo1.yDevRol[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] +minLeaTim.accTim[2].passed=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00] rotTwo1.yDevRol[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -minLeaTim1.uDevSta[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999999999818e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00] +rotTwo1.yDevRol[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] minLeaTim1.uDevSta[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +minLeaTim1.uDevSta[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999999999818e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00] minLeaTim1.accTim[1].y=[0e+00, 1e+03, 2e+03, 3e+03, 4e+03, 5e+03, 5.76e+03, 5.76e+03, 6.56e+03, 7.56e+03, 8.56e+03, 9.56e+03, 1.056e+04, 1.152e+04, 1.152e+04, 1.212e+04, 1.312e+04, 1.412e+04, 1.512e+04, 1.612e+04, 1.712e+04, 1.728e+04, 1.768e+04, 1.868e+04, 1.968e+04, 2.068e+04, 2.168e+04, 2.268e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.999999999999927e+02, 1.4e+03, 2.4e+03, 3.4e+03, 4.4e+03, 5.4e+03, 5.76e+03, 5.96e+03, 6.96e+03, 7.96e+03, 8.96e+03, 9.96e+03, 1.096e+04, 1.152e+04, 1.152e+04, 1.252e+04, 1.352e+04, 1.452e+04, 1.552e+04, 1.652e+04, 1.728e+04, 1.728e+04, 1.808e+04, 1.908e+04, 2.008e+04, 2.108e+04, 2.208e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] minLeaTim1.accTim[2].y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.999999999999964e+02, 1.2e+03, 2.2e+03, 3.2e+03, 4.2e+03, 5.2e+03, 5.76e+03, 5.76e+03, 6.76e+03, 7.76e+03, 8.76e+03, 9.76e+03, 1.076e+04, 1.152e+04, 1.152e+04, 1.232e+04, 1.332e+04, 1.432e+04, 1.532e+04, 1.632e+04, 1.728e+04, 1.728e+04, 1.788e+04, 1.888e+04, 1.988e+04, 2.088e+04, 2.188000000000001e+04, 2.288000000000001e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6e+02, 1.6e+03, 2.6e+03, 3.6e+03, 4.6e+03, 5.6e+03, 5.76e+03, 6.16e+03, 7.16e+03, 8.16e+03, 9.16e+03, 1.016e+04, 1.116e+04, 1.152e+04] minLeaTim1.accTim[1].passed=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] @@ -26,7 +26,7 @@ rotTwo2.yDevRol[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+0 rotTwo2.yDevRol[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] minLeaTim2.uDevSta[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00] minLeaTim2.uDevSta[2]=[1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 9.999999999999818e-01, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00] -minLeaTim2.accTim[2].y=[0e+00, 1e+03, 1.08e+03, 1.08e+03, 1.08e+03, 1.08e+03, 1.68e+03, 2.16e+03, 2.16e+03, 2.16e+03, 2.16e+03, 2.36e+03, 3.24e+03, 3.24e+03, 3.24e+03, 3.24e+03, 3.24e+03, 4.04e+03, 4.32e+03, 4.32e+03, 4.32e+03, 4.32e+03, 4.72e+03, 5.72e+03, 6.72e+03, 7.72e+03, 8.72e+03, 9.72e+03, 1.008e+04, 1.028e+04, 1.128e+04, 1.228e+04, 1.328e+04, 1.428e+04, 3.6e+02, 3.6e+02, 3.6e+02, 3.6e+02, 5.6e+02, 1.44e+03, 1.44e+03, 1.44e+03, 1.44e+03, 1.44e+03, 2.24e+03, 2.52e+03, 2.52e+03, 2.52e+03, 2.52e+03, 2.88e+03, 2.88e+03, 3.48e+03, 4.48e+03, 5.48e+03, 6.48e+03, 7.480000000000007e+03, 8.480000000000007e+03, 8.64e+03, 9.039999999999993e+03, 1.004e+04, 1.104e+04, 1.204e+04, 1.304e+04, 1.404e+04, 1.44e+04, 2e+02, 1.08e+03, 1.08e+03, 1.08e+03, 1.08e+03, 1.08e+03, 1.88e+03, 2.16e+03, 2.16e+03, 2.16e+03, 2.16e+03, 2.56e+03, 3.24e+03, 3.24e+03, 3.24e+03, 4.04e+03, 5.04e+03, 6.04e+03, 7.04e+03, 8.04e+03, 9e+03, 9e+03, 9.6e+03, 1.06e+04, 1.16e+04, 1.26e+04, 1.36e+04, 2e+02, 1.08e+03, 1.08e+03, 1.08e+03, 1.08e+03, 1.08e+03, 1.88e+03, 2.16e+03, 2.16e+03] minLeaTim2.accTim[1].y=[0e+00, 1e+03, 2e+03, 3e+03, 4e+03, 5e+03, 5.76e+03, 5.76e+03, 6.56e+03, 7.56e+03, 8.56e+03, 9.56e+03, 1.056e+04, 1.152e+04, 1.152e+04, 1.212e+04, 1.312e+04, 1.412e+04, 1.512e+04, 1.612e+04, 1.712e+04, 0e+00, 4e+02, 1.08e+03, 1.08e+03, 1.08e+03, 1.08e+03, 1.08e+03, 2.080000000000004e+03, 2.16e+03, 2.16e+03, 2.16e+03, 2.16e+03, 2.76e+03, 3.76e+03, 4.32e+03, 4.32e+03, 5.32e+03, 6.32e+03, 7.32e+03, 8.32e+03, 9.32e+03, 1.008e+04, 1.008e+04, 1.088e+04, 1.188e+04, 1.288e+04, 1.388e+04, 1.488e+04, 4e+02, 1.08e+03, 1.08e+03, 1.08e+03, 1.08e+03, 1.08e+03, 2.080000000000007e+03, 2.16e+03, 2.16e+03, 2.16e+03, 2.16e+03, 2.76e+03, 3.24e+03, 3.24e+03, 3.24e+03, 3.24e+03, 3.44e+03, 4.44e+03, 5.44e+03, 6.44e+03, 7.44e+03, 8.44e+03, 9e+03, 9e+03, 1e+04, 1.1e+04, 1.2e+04, 1.3e+04, 1.4e+04, 0e+00, 0e+00, 0e+00, 0e+00, 1e+03, 1.08e+03, 1.08e+03, 1.08e+03, 1.08e+03, 1.68e+03, 2.16e+03, 2.16e+03, 2.16e+03, 2.16e+03, 2.36e+03, 2.52e+03, 2.92e+03, 3.92e+03, 4.92e+03, 5.92e+03, 6.92e+03, 7.92e+03, 8.28e+03] -minLeaTim2.accTim[2].passed=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +minLeaTim2.accTim[2].y=[0e+00, 1e+03, 1.08e+03, 1.08e+03, 1.08e+03, 1.08e+03, 1.68e+03, 2.16e+03, 2.16e+03, 2.16e+03, 2.16e+03, 2.36e+03, 3.24e+03, 3.24e+03, 3.24e+03, 3.24e+03, 3.24e+03, 4.04e+03, 4.32e+03, 4.32e+03, 4.32e+03, 4.32e+03, 4.72e+03, 5.72e+03, 6.72e+03, 7.72e+03, 8.72e+03, 9.72e+03, 1.008e+04, 1.028e+04, 1.128e+04, 1.228e+04, 1.328e+04, 1.428e+04, 3.6e+02, 3.6e+02, 3.6e+02, 3.6e+02, 5.6e+02, 1.44e+03, 1.44e+03, 1.44e+03, 1.44e+03, 1.44e+03, 2.24e+03, 2.52e+03, 2.52e+03, 2.52e+03, 2.52e+03, 2.88e+03, 2.88e+03, 3.48e+03, 4.48e+03, 5.48e+03, 6.48e+03, 7.480000000000007e+03, 8.480000000000007e+03, 8.64e+03, 9.039999999999993e+03, 1.004e+04, 1.104e+04, 1.204e+04, 1.304e+04, 1.404e+04, 1.44e+04, 2e+02, 1.08e+03, 1.08e+03, 1.08e+03, 1.08e+03, 1.08e+03, 1.88e+03, 2.16e+03, 2.16e+03, 2.16e+03, 2.16e+03, 2.56e+03, 3.24e+03, 3.24e+03, 3.24e+03, 4.04e+03, 5.04e+03, 6.04e+03, 7.04e+03, 8.04e+03, 9e+03, 9e+03, 9.6e+03, 1.06e+04, 1.16e+04, 1.26e+04, 1.36e+04, 2e+02, 1.08e+03, 1.08e+03, 1.08e+03, 1.08e+03, 1.08e+03, 1.88e+03, 2.16e+03, 2.16e+03] minLeaTim2.accTim[1].passed=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +minLeaTim2.accTim[2].passed=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_EquipmentRotation_Subsequences_Validation_Scheduler.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_EquipmentRotation_Subsequences_Validation_Scheduler.txt index ba746801a3e..f3d36e8ed9d 100644 --- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_EquipmentRotation_Subsequences_Validation_Scheduler.txt +++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_EquipmentRotation_Subsequences_Validation_Scheduler.txt @@ -1,15 +1,15 @@ -last-generated=2021-04-13 +last-generated=2022-11-22 statistics-simulation= { "linear": " ", "nonlinear": " ", "numerical Jacobians": "0" } -truFalHol4.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -truFalHol1.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -truFalHol3.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -truFalHol2.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] time=[0e+00, 3e+06] truFalHol.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +truFalHol1.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +truFalHol2.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +truFalHol3.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +truFalHol4.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] rotSch.calTim.weekDay=[2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 4e+00, 4e+00, 4e+00, 5e+00, 5e+00, 5e+00, 6e+00, 6e+00, 6e+00, 7e+00, 7e+00, 7e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 4e+00, 4e+00, 4e+00, 5e+00, 5e+00, 5e+00, 6e+00, 6e+00, 6e+00, 7e+00, 7e+00, 7e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 4e+00, 4e+00, 5e+00, 5e+00, 5e+00, 6e+00, 6e+00, 6e+00, 7e+00, 7e+00, 7e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 4e+00, 4e+00, 4e+00, 5e+00, 5e+00, 5e+00, 6e+00, 6e+00, 7e+00, 7e+00, 7e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 4e+00, 4e+00, 4e+00, 5e+00, 5e+00, 5e+00, 6e+00, 6e+00, 6e+00, 7e+00, 7e+00, 1e+00, 1e+00, 1e+00] rotSch.calTim.hour=[0e+00, 8e+00, 1.6e+01, 0e+00, 9e+00, 1.7e+01, 1e+00, 1e+01, 1.8e+01, 2e+00, 1.1e+01, 1.9e+01, 3e+00, 1.2e+01, 2e+01, 4e+00, 1.3e+01, 2.1e+01, 5e+00, 1.4e+01, 2.2e+01, 6e+00, 1.5e+01, 2.3e+01, 7e+00, 1.6e+01, 0e+00, 8e+00, 1.7e+01, 9.999999999999516e-01, 9e+00, 1.8e+01, 2e+00, 1e+01, 1.9e+01, 3e+00, 1.1e+01, 2e+01, 4e+00, 1.2e+01, 2.1e+01, 5e+00, 1.3e+01, 2.2e+01, 6e+00, 1.4e+01, 2.3e+01, 7e+00, 1.5e+01, 0e+00, 8e+00, 1.6e+01, 1e+00, 9e+00, 1.7e+01, 2e+00, 1e+01, 1.799999999999994e+01, 2.999999999999806e+00, 1.1e+01, 1.9e+01, 4e+00, 1.2e+01, 2e+01, 5e+00, 1.3e+01, 2.1e+01, 6e+00, 1.4e+01, 2.199999999999994e+01, 7e+00, 1.5e+01, 2.3e+01, 8e+00, 1.6e+01, 0e+00, 9e+00, 1.7e+01, 1e+00, 1e+01, 1.8e+01, 2e+00, 1.1e+01, 1.9e+01, 3e+00, 1.2e+01, 2e+01, 4e+00, 1.3e+01, 2.1e+01, 5e+00, 1.4e+01, 2.2e+01, 6e+00, 1.5e+01, 2.3e+01, 7e+00, 1.6e+01, 0e+00, 8e+00, 1.7e+01] diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_EquipmentRotation_Subsequences_Validation_Two_uRot.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_EquipmentRotation_Subsequences_Validation_Two_uRot.txt index 19caffd0ffd..8f7eeb217e5 100644 --- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_EquipmentRotation_Subsequences_Validation_Two_uRot.txt +++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_EquipmentRotation_Subsequences_Validation_Two_uRot.txt @@ -1,16 +1,16 @@ -last-generated=2021-04-13 +last-generated=2022-11-22 statistics-simulation= { "linear": " ", "nonlinear": " ", "numerical Jacobians": "0" } +time=[0e+00, 1e+06] rotTwo.yDevRol[1]=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] rotTwo.yDevRol[2]=[0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -time=[0e+00, 1e+06] rotTwo.yPreDevRolSig[1]=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] rotTwo.yPreDevRolSig[2]=[0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -rotTwo1.yDevRol[2]=[0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] rotTwo1.yDevRol[1]=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] -rotTwo1.yPreDevRolSig[2]=[0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +rotTwo1.yDevRol[2]=[0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] rotTwo1.yPreDevRolSig[1]=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] +rotTwo1.yPreDevRolSig[2]=[0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_EquipmentRotation_Validation_ControllerTwo.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_EquipmentRotation_Validation_ControllerTwo.txt index ce67afc598e..70d658fad0e 100644 --- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_EquipmentRotation_Validation_ControllerTwo.txt +++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_EquipmentRotation_Validation_ControllerTwo.txt @@ -1,34 +1,34 @@ -last-generated=2021-04-13 +last-generated=2022-11-22 statistics-simulation= { "linear": " ", "nonlinear": " ", "numerical Jacobians": "0" } +time=[0e+00, 1e+05] leaLag.uLeaStaSet=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 9.999999999999818e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00] leaLag.uLagStaSet=[1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999999999818e-01, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -time=[0e+00, 1e+05] -leaLag.yDevStaSet[2]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999999999818e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] leaLag.yDevStaSet[1]=[1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 9.999999999999818e-01, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00] -leaLag.yDevRol[2]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999999999818e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +leaLag.yDevStaSet[2]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999999999818e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] leaLag.yDevRol[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1.820765760385257e-14, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] -leaLag1.uLagStaSet=[1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00] +leaLag.yDevRol[2]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999999999818e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] leaLag1.uLeaStaSet=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 9.999999999999818e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00] -leaLag1.yDevStaSet[2]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 9.999999999999818e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00] +leaLag1.uLagStaSet=[1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00] leaLag1.yDevStaSet[1]=[1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00] -leaLag1.yDevRol[2]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999999999818e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +leaLag1.yDevStaSet[2]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 9.999999999999818e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00] leaLag1.yDevRol[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1.820765760385257e-14, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] +leaLag1.yDevRol[2]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999999999818e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] leaSta.uLeaStaSet=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 9.999999999999818e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00] -leaSta.yDevStaSet[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00] leaSta.yDevStaSet[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 9.999999999999818e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -leaSta.yDevRol[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] +leaSta.yDevStaSet[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00] leaSta.yDevRol[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +leaSta.yDevRol[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] conLeaSimSta.yDevStaSet[1]=[1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 9.999999999999818e-01, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00] conLeaSimSta.yDevStaSet[2]=[1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 7.271960811294775e-14, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00] -conLeaSimSta.yDevRol[2]=[0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1.820765760385257e-14, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00] conLeaSimSta.yDevRol[1]=[1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 9.999999999999818e-01, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00] -conLeaSch.yDevStaSet[2]=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +conLeaSimSta.yDevRol[2]=[0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1.820765760385257e-14, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00] conLeaSch.yDevStaSet[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] +conLeaSch.yDevStaSet[2]=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] conLeaSch.yDevRol[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] conLeaSch.yDevRol[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] conLeaSch.rotSch.onCouInt.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_EquipmentRotation_Validation_ControllerTwo_MinimumLeadRuntime.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_EquipmentRotation_Validation_ControllerTwo_MinimumLeadRuntime.txt index efa339fd603..98db6abf4b2 100644 --- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_EquipmentRotation_Validation_ControllerTwo_MinimumLeadRuntime.txt +++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_EquipmentRotation_Validation_ControllerTwo_MinimumLeadRuntime.txt @@ -1,40 +1,40 @@ -last-generated=2021-04-13 +last-generated=2022-11-22 statistics-simulation= { "linear": " ", "nonlinear": " ", "numerical Jacobians": "0" } +time=[0e+00, 1e+05] leaLag.uLeaStaSet=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 9.999999999999818e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00] leaLag.uLagStaSet=[1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999999999818e-01, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -time=[0e+00, 1e+05] -leaLag.yDevStaSet[2]=[1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999999999818e-01, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00] leaLag.yDevStaSet[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 9.999999999999818e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00] -leaLag.yDevRol[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00] +leaLag.yDevStaSet[2]=[1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999999999818e-01, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00] leaLag.yDevRol[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00] -leaLag.minLeaTim.accTim[2].y=[0e+00, 7.2e+02, 7.2e+02, 7.2e+02, 1.12e+03, 1.44e+03, 1.44e+03, 1.44e+03, 2.16e+03, 2.16e+03, 2.16e+03, 2.36e+03, 2.88e+03, 2.88e+03, 2.88e+03, 3.48e+03, 3.6e+03, 3.6e+03, 3.6e+03, 4.32e+03, 4.32e+03, 4.32e+03, 4.72e+03, 5.04e+03, 5.04e+03, 5.04e+03, 5.76e+03, 5.76e+03, 5.76e+03, 5.959999999999996e+03, 6.48e+03, 6.48e+03, 6.48e+03, 7.08e+03, 7.2e+03, 7.2e+03, 7.2e+03, 7.92e+03, 7.92e+03, 7.92e+03, 8.32e+03, 8.64e+03, 8.64e+03, 8.64e+03, 9.36e+03, 9.36e+03, 9.36e+03, 9.56e+03, 1.008e+04, 1.008e+04, 1.008e+04, 1.068e+04, 1.08e+04, 1.08e+04, 1.08e+04, 1.180000000000001e+04, 1.280000000000001e+04, 1.296e+04, 1.335999999999999e+04, 1.436e+04, 1.536e+04, 1.636e+04, 1.736e+04, 1.836e+04, 1.872e+04, 1.892e+04, 1.992e+04, 2.092e+04, 2.192e+04, 2.292e+04, 2.392e+04, 2.448e+04, 2.448e+04, 2.548e+04, 2.648e+04, 2.748e+04, 2.848e+04, 2.948e+04, 3.024e+04, 3.024e+04, 3.104e+04, 3.204e+04, 3.304e+04, 3.404e+04, 3.504e+04, 3.6e+04, 3.6e+04, 3.66e+04, 3.76e+04, 3.86e+04, 3.96e+04, 4.06e+04, 4.16e+04, 4.176e+04, 4.216e+04, 4.316e+04, 4.416e+04, 4.516e+04, 7.2e+02, 7.2e+02, 7.2e+02] +leaLag.yDevRol[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00] leaLag.minLeaTim.accTim[1].y=[0e+00, 1e+03, 2e+03, 3e+03, 4e+03, 5e+03, 5.76e+03, 5.76e+03, 6.56e+03, 7.56e+03, 8.56e+03, 9.56e+03, 1.056e+04, 1.152e+04, 1.152e+04, 1.212e+04, 1.312e+04, 1.412e+04, 1.512e+04, 1.612e+04, 1.712e+04, 1.728e+04, 1.768e+04, 1.868e+04, 1.968e+04, 2.068e+04, 2.168e+04, 2.268e+04, 2.304e+04, 2.324e+04, 2.424e+04, 2.524e+04, 2.624e+04, 2.724e+04, 2.824e+04, 2.88e+04, 2.88e+04, 2.98e+04, 3.08e+04, 3.18e+04, 3.28e+04, 3.38e+04, 3.456e+04, 3.456e+04, 3.536e+04, 3.636e+04, 3.736e+04, 3.836e+04, 3.936e+04, 4.032e+04, 4.032e+04, 4.092e+04, 4.192e+04, 4.292e+04, 4.392e+04, 7.2e+02, 7.2e+02, 7.2e+02, 1.119999999999993e+03, 1.44e+03, 1.44e+03, 1.44e+03, 2.16e+03, 2.16e+03, 2.16e+03, 2.36e+03, 2.88e+03, 2.88e+03, 2.88e+03, 3.48e+03, 3.6e+03, 3.6e+03, 3.6e+03, 4.32e+03, 4.32e+03, 4.32e+03, 4.72e+03, 5.04e+03, 5.04e+03, 5.04e+03, 5.76e+03, 5.76e+03, 5.76e+03, 5.96e+03, 6.48e+03, 6.48e+03, 6.48e+03, 7.08e+03, 7.2e+03, 7.2e+03, 7.2e+03, 7.92e+03, 7.92e+03, 7.92e+03, 8.32e+03, 8.64e+03, 8.64e+03, 8.64e+03, 9.44e+03, 1.044e+04, 1.08e+04] +leaLag.minLeaTim.accTim[2].y=[0e+00, 7.2e+02, 7.2e+02, 7.2e+02, 1.12e+03, 1.44e+03, 1.44e+03, 1.44e+03, 2.16e+03, 2.16e+03, 2.16e+03, 2.36e+03, 2.88e+03, 2.88e+03, 2.88e+03, 3.48e+03, 3.6e+03, 3.6e+03, 3.6e+03, 4.32e+03, 4.32e+03, 4.32e+03, 4.72e+03, 5.04e+03, 5.04e+03, 5.04e+03, 5.76e+03, 5.76e+03, 5.76e+03, 5.959999999999996e+03, 6.48e+03, 6.48e+03, 6.48e+03, 7.08e+03, 7.2e+03, 7.2e+03, 7.2e+03, 7.92e+03, 7.92e+03, 7.92e+03, 8.32e+03, 8.64e+03, 8.64e+03, 8.64e+03, 9.36e+03, 9.36e+03, 9.36e+03, 9.56e+03, 1.008e+04, 1.008e+04, 1.008e+04, 1.068e+04, 1.08e+04, 1.08e+04, 1.08e+04, 1.180000000000001e+04, 1.280000000000001e+04, 1.296e+04, 1.335999999999999e+04, 1.436e+04, 1.536e+04, 1.636e+04, 1.736e+04, 1.836e+04, 1.872e+04, 1.892e+04, 1.992e+04, 2.092e+04, 2.192e+04, 2.292e+04, 2.392e+04, 2.448e+04, 2.448e+04, 2.548e+04, 2.648e+04, 2.748e+04, 2.848e+04, 2.948e+04, 3.024e+04, 3.024e+04, 3.104e+04, 3.204e+04, 3.304e+04, 3.404e+04, 3.504e+04, 3.6e+04, 3.6e+04, 3.66e+04, 3.76e+04, 3.86e+04, 3.96e+04, 4.06e+04, 4.16e+04, 4.176e+04, 4.216e+04, 4.316e+04, 4.416e+04, 4.516e+04, 7.2e+02, 7.2e+02, 7.2e+02] leaLag.minLeaRuntime=[4.32e+04, 4.32e+04] -leaLag.minLeaTim.accTim[2].passed=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00] leaLag.minLeaTim.accTim[1].passed=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -leaLag1.uLagStaSet=[1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00] +leaLag.minLeaTim.accTim[2].passed=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00] leaLag1.uLeaStaSet=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 9.999999999999818e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00] -leaLag1.yDevStaSet[2]=[1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00] +leaLag1.uLagStaSet=[1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00] leaLag1.yDevStaSet[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 9.999999999999818e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00] -leaLag1.yDevRol[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] +leaLag1.yDevStaSet[2]=[1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00] leaLag1.yDevRol[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -leaLag1.minLeaRuntime=[5.4e+04, 5.4e+04] -leaLag1.minLeaTim.accTim[2].y=[0e+00, 1e+03, 1.08e+03, 1.08e+03, 1.08e+03, 1.08e+03, 1.68e+03, 2.16e+03, 2.16e+03, 2.16e+03, 2.16e+03, 2.36e+03, 3.24e+03, 3.24e+03, 3.24e+03, 3.24e+03, 3.24e+03, 4.04e+03, 4.32e+03, 4.32e+03, 4.32e+03, 4.32e+03, 4.72e+03, 5.4e+03, 5.4e+03, 5.4e+03, 5.4e+03, 5.4e+03, 6.400000000000004e+03, 6.48e+03, 6.48e+03, 6.48e+03, 6.48e+03, 7.08e+03, 7.56e+03, 7.56e+03, 7.56e+03, 7.56e+03, 7.76e+03, 8.64e+03, 8.64e+03, 8.64e+03, 8.64e+03, 8.64e+03, 9.44e+03, 9.72e+03, 9.72e+03, 9.72e+03, 9.72e+03, 1.012e+04, 1.08e+04, 1.08e+04, 1.08e+04, 1.08e+04, 1.08e+04, 1.180000000000001e+04, 1.188e+04, 1.188e+04, 1.188e+04, 1.188e+04, 1.248e+04, 1.296e+04, 1.296e+04, 1.296e+04, 1.296e+04, 1.316e+04, 1.404e+04, 1.404e+04, 1.404e+04, 1.404e+04, 1.404e+04, 1.44e+04, 1.44e+04, 1.54e+04, 1.64e+04, 1.74e+04, 1.84e+04, 1.94e+04, 2.016e+04, 2.016e+04, 2.096e+04, 2.196e+04, 2.296e+04, 2.396e+04, 2.496e+04, 2.592e+04, 2.592e+04, 2.652e+04, 2.752e+04, 2.852e+04, 2.952e+04, 3.052e+04, 3.152e+04, 3.168e+04, 3.208e+04, 3.308e+04, 3.408e+04, 3.508e+04, 3.608e+04, 3.708e+04, 3.744e+04] +leaLag1.yDevRol[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] leaLag1.minLeaTim.accTim[1].y=[0e+00, 1e+03, 2e+03, 3e+03, 4e+03, 5e+03, 5.76e+03, 5.76e+03, 6.56e+03, 7.56e+03, 8.56e+03, 9.56e+03, 1.056e+04, 1.152e+04, 1.152e+04, 1.212e+04, 1.312e+04, 1.412e+04, 1.512e+04, 1.612e+04, 1.712e+04, 1.728e+04, 1.768e+04, 1.868e+04, 1.968e+04, 2.068e+04, 2.168e+04, 2.268e+04, 2.304e+04, 2.324e+04, 2.424e+04, 2.524e+04, 2.624e+04, 2.724e+04, 2.824e+04, 2.88e+04, 2.88e+04, 2.98e+04, 3.08e+04, 3.18e+04, 3.28e+04, 3.38e+04, 3.456e+04, 3.456e+04, 3.536e+04, 3.636e+04, 3.736e+04, 3.836e+04, 3.936e+04, 4.032e+04, 4.032e+04, 4.092e+04, 4.192e+04, 4.292e+04, 4.392e+04, 4.492000000000001e+04, 4.592000000000001e+04, 4.608e+04, 4.647999999999999e+04, 4.748e+04, 4.848e+04, 4.948e+04, 5.048e+04, 5.148e+04, 5.184e+04, 5.204e+04, 5.304e+04, 5.404e+04, 5.504e+04, 5.604e+04, 5.704e+04, 8e+02, 1.08e+03, 1.08e+03, 1.08e+03, 1.08e+03, 1.48e+03, 2.16e+03, 2.16e+03, 2.16e+03, 2.16e+03, 2.16e+03, 3.16e+03, 3.24e+03, 3.24e+03, 3.24e+03, 3.24e+03, 3.84e+03, 4.32e+03, 4.32e+03, 4.32e+03, 4.32e+03, 4.52e+03, 5.4e+03, 5.4e+03, 5.4e+03, 5.4e+03, 5.4e+03, 6.2e+03, 6.48e+03, 6.48e+03] -leaLag1.minLeaTim.accTim[2].passed=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +leaLag1.minLeaTim.accTim[2].y=[0e+00, 1e+03, 1.08e+03, 1.08e+03, 1.08e+03, 1.08e+03, 1.68e+03, 2.16e+03, 2.16e+03, 2.16e+03, 2.16e+03, 2.36e+03, 3.24e+03, 3.24e+03, 3.24e+03, 3.24e+03, 3.24e+03, 4.04e+03, 4.32e+03, 4.32e+03, 4.32e+03, 4.32e+03, 4.72e+03, 5.4e+03, 5.4e+03, 5.4e+03, 5.4e+03, 5.4e+03, 6.400000000000004e+03, 6.48e+03, 6.48e+03, 6.48e+03, 6.48e+03, 7.08e+03, 7.56e+03, 7.56e+03, 7.56e+03, 7.56e+03, 7.76e+03, 8.64e+03, 8.64e+03, 8.64e+03, 8.64e+03, 8.64e+03, 9.44e+03, 9.72e+03, 9.72e+03, 9.72e+03, 9.72e+03, 1.012e+04, 1.08e+04, 1.08e+04, 1.08e+04, 1.08e+04, 1.08e+04, 1.180000000000001e+04, 1.188e+04, 1.188e+04, 1.188e+04, 1.188e+04, 1.248e+04, 1.296e+04, 1.296e+04, 1.296e+04, 1.296e+04, 1.316e+04, 1.404e+04, 1.404e+04, 1.404e+04, 1.404e+04, 1.404e+04, 1.44e+04, 1.44e+04, 1.54e+04, 1.64e+04, 1.74e+04, 1.84e+04, 1.94e+04, 2.016e+04, 2.016e+04, 2.096e+04, 2.196e+04, 2.296e+04, 2.396e+04, 2.496e+04, 2.592e+04, 2.592e+04, 2.652e+04, 2.752e+04, 2.852e+04, 2.952e+04, 3.052e+04, 3.152e+04, 3.168e+04, 3.208e+04, 3.308e+04, 3.408e+04, 3.508e+04, 3.608e+04, 3.708e+04, 3.744e+04] +leaLag1.minLeaRuntime=[5.4e+04, 5.4e+04] leaLag1.minLeaTim.accTim[1].passed=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +leaLag1.minLeaTim.accTim[2].passed=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] leaSta.uLeaStaSet=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 9.999999999999818e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00] -leaSta.yDevStaSet[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00] leaSta.yDevStaSet[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 9.999999999999818e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -leaSta.yDevRol[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] +leaSta.yDevStaSet[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00] leaSta.yDevRol[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -leaSta.minLeaRuntime=[4.32e+04, 4.32e+04] +leaSta.yDevRol[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] leaSta.minLeaTim.accTim[1].y=[0e+00, 4e+02, 1.4e+03, 2.4e+03, 3.4e+03, 4.4e+03, 5.16e+03, 5.16e+03, 5.36e+03, 6.36e+03, 7.36e+03, 8.36e+03, 9.36e+03, 1.032e+04, 1.032e+04, 1.032e+04, 1.132e+04, 1.232e+04, 1.332e+04, 1.432e+04, 1.532e+04, 1.548e+04, 1.548e+04, 1.628e+04, 1.728e+04, 1.828e+04, 1.928e+04, 2.028e+04, 2.064e+04, 2.064e+04, 2.124e+04, 2.224e+04, 2.324e+04, 2.424e+04, 2.524e+04, 2.58e+04, 2.58e+04, 2.62e+04, 2.72e+04, 2.82e+04, 2.92e+04, 3.02e+04, 3.096e+04, 3.096e+04, 3.116e+04, 3.216e+04, 3.316e+04, 3.416e+04, 3.516e+04, 3.612e+04, 3.612e+04, 3.612e+04, 3.712e+04, 3.812e+04, 3.912e+04, 4.012000000000001e+04, 4.112000000000001e+04, 4.128e+04, 4.128e+04, 4.208e+04, 4.308e+04, 4.408e+04, 4.508e+04, 4.608e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] leaSta.minLeaTim.accTim[2].y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6e+02, 1.6e+03, 2.6e+03, 3.6e+03, 4.6e+03, 5.16e+03, 5.16e+03, 5.56e+03, 6.56e+03, 7.56e+03, 8.56e+03, 9.56e+03, 1.032e+04, 1.032e+04, 1.052e+04, 1.152e+04, 1.252e+04, 1.352e+04, 1.452e+04, 1.548e+04, 1.548e+04, 1.548e+04, 1.648e+04, 1.748e+04, 1.848e+04, 1.948e+04, 2.048e+04, 2.064e+04, 2.064e+04, 2.144e+04, 2.244e+04, 2.344e+04, 2.444e+04, 2.544e+04, 2.58e+04] +leaSta.minLeaRuntime=[4.32e+04, 4.32e+04] leaSta.minLeaTim.accTim[1].passed=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] leaSta.minLeaTim.accTim[2].passed=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_Subsequences_Validation_HWIsoVal.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_Subsequences_Validation_HWIsoVal.txt index e644714ab3d..fbdaecc8b05 100644 --- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_Subsequences_Validation_HWIsoVal.txt +++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_Subsequences_Validation_HWIsoVal.txt @@ -1,18 +1,18 @@ -last-generated=2021-04-13 +last-generated=2022-11-22 statistics-simulation= { "linear": " ", "nonlinear": " ", "numerical Jacobians": "0" } -cloHotIsoVal.uHotWatIsoVal=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.166666865348816e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] time=[0e+00, 3.6e+03] -cloHotIsoVal.uUpsDevSta=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] +cloHotIsoVal.uHotWatIsoVal=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.166666865348816e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] cloHotIsoVal.chaPro=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] +cloHotIsoVal.uUpsDevSta=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] cloHotIsoVal.yHotWatIsoVal=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.000000059604645e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] cloHotIsoVal.yDisHotWatIsoVal=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] cloHotIsoVal1.uHotWatIsoVal=[7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 1.666666865348816e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -cloHotIsoVal1.uUpsDevSta=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] cloHotIsoVal1.chaPro=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] +cloHotIsoVal1.uUpsDevSta=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] cloHotIsoVal1.yHotWatIsoVal=[7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 1.500000059604645e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] cloHotIsoVal1.yDisHotWatIsoVal=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_Validation_PlantDisable.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_Validation_PlantDisable.txt index 8663f4058b9..4797c40f078 100644 --- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_Validation_PlantDisable.txt +++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_Validation_PlantDisable.txt @@ -1,30 +1,30 @@ -last-generated=2021-04-13 +last-generated=2022-11-22 statistics-simulation= { "linear": " ", "nonlinear": " ", "numerical Jacobians": "0" } -plaDis.uPla=[0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] time=[0e+00, 9e+02] +plaDis.uPla=[0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] plaDis.uBoi[1]=[0e+00, 0e+00] plaDis.uBoi[2]=[1e+00, 1e+00] plaDis.uHotWatIsoVal[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] plaDis.uHotWatIsoVal[2]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 8.833333253860474e-01, 7.333333492279053e-01, 5.833333134651184e-01, 4.333333373069763e-01, 2.833333313465118e-01, 1.333333551883698e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -plaDis.yBoi[2]=[0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] plaDis.yBoi[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +plaDis.yBoi[2]=[0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] truFalHol.y=[0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] plaDis1.uPla=[0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -plaDis1.uBoi[2]=[1e+00, 1e+00] plaDis1.uBoi[1]=[0e+00, 0e+00] -plaDis1.uHotWatIsoVal[2]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 8.833333253860474e-01, 7.333333492279053e-01, 5.833333134651184e-01, 4.333333373069763e-01, 2.833333313465118e-01, 1.333333551883698e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +plaDis1.uBoi[2]=[1e+00, 1e+00] plaDis1.uHotWatIsoVal[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +plaDis1.uHotWatIsoVal[2]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 8.833333253860474e-01, 7.333333492279053e-01, 5.833333134651184e-01, 4.333333373069763e-01, 2.833333313465118e-01, 1.333333551883698e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] plaDis1.yBoi[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] plaDis1.yBoi[2]=[0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] truFalHol1.y=[0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] plaDis2.uPla=[0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] plaDis2.uBoi[1]=[0e+00, 0e+00] plaDis2.uBoi[2]=[1e+00, 1e+00] -plaDis2.yBoi[2]=[0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] plaDis2.yBoi[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +plaDis2.yBoi[2]=[0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] truFalHol2.y=[1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_Validation_PlantEnable.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_Validation_PlantEnable.txt index 033b8643425..0d2847735df 100644 --- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_Validation_PlantEnable.txt +++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_Validation_PlantEnable.txt @@ -1,40 +1,40 @@ -last-generated=2021-04-13 +last-generated=2022-11-22 statistics-simulation= { "linear": " ", "nonlinear": " ", "numerical Jacobians": "0" } +time=[0e+00, 7.2e+03] plaEna.nIgnReq=[2e+00, 2e+00] plaEna.supResReq=[2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00] -time=[0e+00, 7.2e+03] -plaEna.TOut=[3e+02, 2.993388671875e+02, 2.989344177246094e+02, 2.989597473144531e+02, 2.994046325683594e+02, 3.000896606445312e+02, 3.00738525390625e+02, 3.010895080566406e+02, 3.010010681152344e+02, 3.005088806152344e+02, 2.998114318847656e+02, 2.991900329589844e+02, 2.988953247070312e+02, 2.990461730957031e+02, 2.995817260742188e+02, 3.002859802246094e+02, 3.008748779296875e+02, 3.011109313964844e+02, 3.008988952636719e+02, 3.003243408203125e+02, 2.996189270019531e+02, 2.990672302246094e+02, 2.988917541503906e+02, 2.991632690429688e+02, 2.997722473144531e+02, 3.004730834960938e+02, 3.009831237792969e+02, 3.010966491699219e+02, 3.007678527832031e+02, 3.001293640136719e+02, 2.994386901855469e+02, 2.989744262695312e+02, 2.989237976074219e+02, 2.993072204589844e+02, 2.999700927734375e+02, 3.006449890136719e+02, 3.010597839355469e+02, 3.010470886230469e+02, 3.006121215820312e+02, 2.999302368164062e+02, 2.992764892578125e+02, 2.989145812988281e+02, 2.989904174804688e+02, 2.994734802246094e+02, 3.001688842773438e+02, 3.007961730957031e+02, 3.011023559570312e+02, 3.009638977050781e+02, 3.004367065429688e+02, 2.997333374023438e+02, 2.991375427246094e+02, 2.988896179199219e+02, 2.990895080566406e+02, 2.996566467285156e+02, 3.003622741699219e+02, 3.009217834472656e+02, 3.011094970703125e+02, 3.008497314453125e+02, 3.002472534179688e+02, 2.995450439453125e+02, 2.990263366699219e+02, 2.989003295898438e+02, 2.992178649902344e+02, 2.998508605957031e+02, 3.005440063476562e+02, 3.010177307128906e+02, 3.010809936523438e+02, 3.00708251953125e+02, 3.000498352050781e+02, 2.99371337890625e+02, 2.989463806152344e+02, 2.989463806152344e+02, 2.99371337890625e+02, 3.000498352050781e+02, 3.00708251953125e+02, 3.010809936523438e+02, 3.010177307128906e+02, 3.005440063476562e+02, 2.998508605957031e+02, 2.992178649902344e+02, 2.989003295898438e+02, 2.990263366699219e+02, 2.995450439453125e+02, 3.002472534179688e+02, 3.008497314453125e+02, 3.011094970703125e+02, 3.009217834472656e+02, 3.003622741699219e+02, 2.996566467285156e+02, 2.990895080566406e+02, 2.988896179199219e+02, 2.991375427246094e+02, 2.997333374023438e+02, 3.004367065429688e+02, 3.009638977050781e+02, 3.011023559570312e+02, 3.007961730957031e+02, 3.001688842773438e+02, 2.994734802246094e+02, 2.989904174804688e+02, 2.989145812988281e+02] plaEna.TOutLoc=[3e+02, 3e+02] +plaEna.TOut=[3e+02, 2.993388671875e+02, 2.989344177246094e+02, 2.989597473144531e+02, 2.994046325683594e+02, 3.000896606445312e+02, 3.00738525390625e+02, 3.010895080566406e+02, 3.010010681152344e+02, 3.005088806152344e+02, 2.998114318847656e+02, 2.991900329589844e+02, 2.988953247070312e+02, 2.990461730957031e+02, 2.995817260742188e+02, 3.002859802246094e+02, 3.008748779296875e+02, 3.011109313964844e+02, 3.008988952636719e+02, 3.003243408203125e+02, 2.996189270019531e+02, 2.990672302246094e+02, 2.988917541503906e+02, 2.991632690429688e+02, 2.997722473144531e+02, 3.004730834960938e+02, 3.009831237792969e+02, 3.010966491699219e+02, 3.007678527832031e+02, 3.001293640136719e+02, 2.994386901855469e+02, 2.989744262695312e+02, 2.989237976074219e+02, 2.993072204589844e+02, 2.999700927734375e+02, 3.006449890136719e+02, 3.010597839355469e+02, 3.010470886230469e+02, 3.006121215820312e+02, 2.999302368164062e+02, 2.992764892578125e+02, 2.989145812988281e+02, 2.989904174804688e+02, 2.994734802246094e+02, 3.001688842773438e+02, 3.007961730957031e+02, 3.011023559570312e+02, 3.009638977050781e+02, 3.004367065429688e+02, 2.997333374023438e+02, 2.991375427246094e+02, 2.988896179199219e+02, 2.990895080566406e+02, 2.996566467285156e+02, 3.003622741699219e+02, 3.009217834472656e+02, 3.011094970703125e+02, 3.008497314453125e+02, 3.002472534179688e+02, 2.995450439453125e+02, 2.990263366699219e+02, 2.989003295898438e+02, 2.992178649902344e+02, 2.998508605957031e+02, 3.005440063476562e+02, 3.010177307128906e+02, 3.010809936523438e+02, 3.00708251953125e+02, 3.000498352050781e+02, 2.99371337890625e+02, 2.989463806152344e+02, 2.989463806152344e+02, 2.99371337890625e+02, 3.000498352050781e+02, 3.00708251953125e+02, 3.010809936523438e+02, 3.010177307128906e+02, 3.005440063476562e+02, 2.998508605957031e+02, 2.992178649902344e+02, 2.989003295898438e+02, 2.990263366699219e+02, 2.995450439453125e+02, 3.002472534179688e+02, 3.008497314453125e+02, 3.011094970703125e+02, 3.009217834472656e+02, 3.003622741699219e+02, 2.996566467285156e+02, 2.990895080566406e+02, 2.988896179199219e+02, 2.991375427246094e+02, 2.997333374023438e+02, 3.004367065429688e+02, 3.009638977050781e+02, 3.011023559570312e+02, 3.007961730957031e+02, 3.001688842773438e+02, 2.994734802246094e+02, 2.989904174804688e+02, 2.989145812988281e+02] plaEna.enaSch.y[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] -plaEna.plaOnThrTim=[9e+02, 9e+02] +plaEna.tim.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.652248764038086e+01, 1.285224914550781e+02, 2.005224914550781e+02, 2.725224914550786e+02, 3.445224914550786e+02, 4.165224914550786e+02, 4.885224914550781e+02, 5.605224609375e+02, 6.325224609375e+02, 7.045224609375e+02, 7.765224609375e+02, 8.485224609375e+02, 9.205224609375e+02, 9.925224609375e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.652248764038086e+01, 1.285224914550781e+02, 2.005224914550781e+02, 2.725224914550781e+02, 3.445224914550781e+02, 4.165224914550781e+02, 4.885224914550781e+02, 5.605224609375e+02, 6.325224609375e+02, 7.045224609375e+02, 7.765224609375e+02, 8.485224609375e+02, 9.205224609375e+02, 9.925224609375e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] plaEna.tim2.y=[0e+00, 7.2e+01, 1.44e+02, 2.16e+02, 2.88e+02, 3.6e+02, 4.32e+02, 5.040000000000001e+02, 5.76e+02, 6.48e+02, 7.2e+02, 7.92e+02, 8.64e+02, 9.36e+02, 1.008e+03, 1.08e+03, 1.152e+03, 1.224e+03, 1.296e+03, 1.368e+03, 1.44e+03, 1.512e+03, 1.584e+03, 1.656e+03, 1.728e+03, 1.8e+03, 1.872e+03, 1.944e+03, 2.016e+03, 2.088e+03, 2.16e+03, 2.232e+03, 2.304e+03, 2.376e+03, 2.448e+03, 2.52e+03, 2.592e+03, 2.664e+03, 2.736e+03, 2.808e+03, 2.88e+03, 2.952e+03, 3.024e+03, 3.096e+03, 3.168e+03, 3.24e+03, 3.312e+03, 3.384e+03, 3.456e+03, 3.528e+03, 3.6e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.347751235961914e+01, 8.547750854492188e+01, 1.574775085449219e+02, 2.294775085449219e+02, 3.014775085449219e+02, 3.734775085449219e+02, 4.454775085449219e+02, 5.174775390625e+02, 5.894775390625e+02, 6.614775390625e+02, 7.334775390625e+02, 8.054775390625e+02, 8.774775390625e+02, 9.494775390625e+02, 1.0214775390625e+03, 1.0934775390625e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.424819946289062e+01, 1.362481994628906e+02, 2.082481994628906e+02, 2.802481994628906e+02, 3.522481994628906e+02, 4.242481994628906e+02] plaEna.plaOffThrTim=[9e+02, 9e+02] -plaEna.tim.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.652248764038086e+01, 1.285224914550781e+02, 2.005224914550781e+02, 2.725224914550786e+02, 3.445224914550786e+02, 4.165224914550786e+02, 4.885224914550781e+02, 5.605224609375e+02, 6.325224609375e+02, 7.045224609375e+02, 7.765224609375e+02, 8.485224609375e+02, 9.205224609375e+02, 9.925224609375e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.652248764038086e+01, 1.285224914550781e+02, 2.005224914550781e+02, 2.725224914550781e+02, 3.445224914550781e+02, 4.165224914550781e+02, 4.885224914550781e+02, 5.605224609375e+02, 6.325224609375e+02, 7.045224609375e+02, 7.765224609375e+02, 8.485224609375e+02, 9.205224609375e+02, 9.925224609375e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +plaEna.plaOnThrTim=[9e+02, 9e+02] plaEna.yPla=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] plaEna1.nIgnReq=[2e+00, 2e+00] plaEna1.supResReq=[2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00, 4e+00, 3e+00, 1e+00, 0e+00, 2e+00] -plaEna1.TOut=[2.97e+02, 2.97e+02] plaEna1.TOutLoc=[3e+02, 3e+02] +plaEna1.TOut=[2.97e+02, 2.97e+02] plaEna1.enaSch.y[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] -plaEna1.tim2.y=[0e+00, 7.2e+01, 1.44e+02, 2.16e+02, 2.88e+02, 3.6e+02, 4.32e+02, 5.040000000000001e+02, 5.76e+02, 6.48e+02, 7.2e+02, 7.92e+02, 8.64e+02, 9.36e+02, 1.008e+03, 1.08e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.347751235961914e+01, 8.547750854492188e+01, 1.574775085449219e+02, 2.294775085449219e+02, 3.014775085449219e+02, 3.734775085449219e+02, 4.454775085449219e+02, 5.174775390625e+02, 5.894775390625e+02, 6.614775390625e+02, 7.334775390625e+02, 8.054775390625e+02, 8.774775390625e+02, 9.494775390625e+02, 1.0214775390625e+03, 1.0934775390625e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.347751235961914e+01, 8.547750854492188e+01, 1.574775085449219e+02, 2.294775085449219e+02, 3.014775085449219e+02, 3.734775085449219e+02, 4.454775085449219e+02, 5.174775390625e+02, 5.894775390625e+02, 6.614775390625e+02, 7.334775390625e+02, 8.054775390625e+02, 8.774775390625e+02, 9.494775390625e+02, 1.0214775390625e+03, 1.0934775390625e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.347751235961914e+01, 8.547750854492188e+01, 1.574775085449219e+02, 2.294775085449219e+02, 3.014775085449219e+02, 3.734775085449219e+02, 4.454775085449219e+02, 5.174775390625e+02, 5.894775390625e+02, 6.614775390625e+02, 7.334775390625e+02] plaEna1.tim.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.652248764038086e+01, 1.285224914550781e+02, 2.005224914550781e+02, 2.725224914550781e+02, 3.445224914550781e+02, 4.165224914550781e+02, 4.885224914550781e+02, 5.605224609375e+02, 6.325224609375e+02, 7.045224609375e+02, 7.765224609375e+02, 8.485224609375002e+02, 9.205224609375002e+02, 9.925224609375e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.652248764038086e+01, 1.285224914550781e+02, 2.005224914550781e+02, 2.725224914550781e+02, 3.445224914550781e+02, 4.165224914550781e+02, 4.885224914550781e+02, 5.605224609375e+02, 6.325224609375005e+02, 7.045224609375005e+02, 7.765224609375005e+02, 8.485224609375e+02, 9.205224609375e+02, 9.925224609375e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.652248764038086e+01, 1.285224914550781e+02, 2.005224914550781e+02, 2.725224914550781e+02, 3.445224914550781e+02, 4.165224914550781e+02, 4.885224914550781e+02, 5.605224609375e+02, 6.325224609375e+02, 7.045224609375e+02, 7.765224609375e+02, 8.485224609375e+02, 9.205224609375e+02, 9.925224609375e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -plaEna1.plaOnThrTim=[9e+02, 9e+02] +plaEna1.tim2.y=[0e+00, 7.2e+01, 1.44e+02, 2.16e+02, 2.88e+02, 3.6e+02, 4.32e+02, 5.040000000000001e+02, 5.76e+02, 6.48e+02, 7.2e+02, 7.92e+02, 8.64e+02, 9.36e+02, 1.008e+03, 1.08e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.347751235961914e+01, 8.547750854492188e+01, 1.574775085449219e+02, 2.294775085449219e+02, 3.014775085449219e+02, 3.734775085449219e+02, 4.454775085449219e+02, 5.174775390625e+02, 5.894775390625e+02, 6.614775390625e+02, 7.334775390625e+02, 8.054775390625e+02, 8.774775390625e+02, 9.494775390625e+02, 1.0214775390625e+03, 1.0934775390625e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.347751235961914e+01, 8.547750854492188e+01, 1.574775085449219e+02, 2.294775085449219e+02, 3.014775085449219e+02, 3.734775085449219e+02, 4.454775085449219e+02, 5.174775390625e+02, 5.894775390625e+02, 6.614775390625e+02, 7.334775390625e+02, 8.054775390625e+02, 8.774775390625e+02, 9.494775390625e+02, 1.0214775390625e+03, 1.0934775390625e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.347751235961914e+01, 8.547750854492188e+01, 1.574775085449219e+02, 2.294775085449219e+02, 3.014775085449219e+02, 3.734775085449219e+02, 4.454775085449219e+02, 5.174775390625e+02, 5.894775390625e+02, 6.614775390625e+02, 7.334775390625e+02] plaEna1.plaOffThrTim=[9e+02, 9e+02] +plaEna1.plaOnThrTim=[9e+02, 9e+02] plaEna1.yPla=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] plaEna2.nIgnReq=[2e+00, 2e+00] plaEna2.supResReq=[3e+00, 3e+00] plaEna2.TOutLoc=[3e+02, 3e+02] plaEna2.TOut=[3e+02, 2.993388671875e+02, 2.989344177246094e+02, 2.989597473144531e+02, 2.994046325683594e+02, 3.000896606445312e+02, 3.00738525390625e+02, 3.010895080566406e+02, 3.010010681152344e+02, 3.005088806152344e+02, 2.998114318847656e+02, 2.991900329589844e+02, 2.988953247070312e+02, 2.990461730957031e+02, 2.995817260742188e+02, 3.002859802246094e+02, 3.008748779296875e+02, 3.011109313964844e+02, 3.008988952636719e+02, 3.003243408203125e+02, 2.996189270019531e+02, 2.990672302246094e+02, 2.988917541503906e+02, 2.991632690429688e+02, 2.997722473144531e+02, 3.004730834960938e+02, 3.009831237792969e+02, 3.010966491699219e+02, 3.007678527832031e+02, 3.001293640136719e+02, 2.994386901855469e+02, 2.989744262695312e+02, 2.989237976074219e+02, 2.993072204589844e+02, 2.999700927734375e+02, 3.006449890136719e+02, 3.010597839355469e+02, 3.010470886230469e+02, 3.006121215820312e+02, 2.999302368164062e+02, 2.992764892578125e+02, 2.989145812988281e+02, 2.989904174804688e+02, 2.994734802246094e+02, 3.001688842773438e+02, 3.007961730957031e+02, 3.011023559570312e+02, 3.009638977050781e+02, 3.004367065429688e+02, 2.997333374023438e+02, 2.991375427246094e+02, 2.988896179199219e+02, 2.990895080566406e+02, 2.996566467285156e+02, 3.003622741699219e+02, 3.009217834472656e+02, 3.011094970703125e+02, 3.008497314453125e+02, 3.002472534179688e+02, 2.995450439453125e+02, 2.990263366699219e+02, 2.989003295898438e+02, 2.992178649902344e+02, 2.998508605957031e+02, 3.005440063476562e+02, 3.010177307128906e+02, 3.010809936523438e+02, 3.00708251953125e+02, 3.000498352050781e+02, 2.99371337890625e+02, 2.989463806152344e+02, 2.989463806152344e+02, 2.99371337890625e+02, 3.000498352050781e+02, 3.00708251953125e+02, 3.010809936523438e+02, 3.010177307128906e+02, 3.005440063476562e+02, 2.998508605957031e+02, 2.992178649902344e+02, 2.989003295898438e+02, 2.990263366699219e+02, 2.995450439453125e+02, 3.002472534179688e+02, 3.008497314453125e+02, 3.011094970703125e+02, 3.009217834472656e+02, 3.003622741699219e+02, 2.996566467285156e+02, 2.990895080566406e+02, 2.988896179199219e+02, 2.991375427246094e+02, 2.997333374023438e+02, 3.004367065429688e+02, 3.009638977050781e+02, 3.011023559570312e+02, 3.007961730957031e+02, 3.001688842773438e+02, 2.994734802246094e+02, 2.989904174804688e+02, 2.989145812988281e+02] plaEna2.enaSch.y[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] -plaEna2.plaOffThrTim=[9e+02, 9e+02] -plaEna2.plaOnThrTim=[9e+02, 9e+02] plaEna2.tim.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.6e+01, 1.080000000000001e+02, 1.8e+02, 2.52e+02, 3.24e+02, 3.96e+02, 4.68e+02, 5.4e+02, 6.12e+02, 6.84e+02, 7.56e+02, 8.28e+02, 9e+02, 9.72e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7e+00, 7.9e+01, 1.51e+02, 2.23e+02, 2.95e+02, 3.67e+02, 4.39e+02, 5.11e+02, 5.83e+02, 6.55e+02, 7.27e+02, 7.99e+02, 8.71e+02, 9.43e+02, 1.015e+03, 1.087e+03, 1.159e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.7e+01, 1.39e+02, 2.11e+02, 2.83e+02, 3.55e+02, 4.27e+02, 4.99e+02, 5.71e+02, 6.43e+02, 7.15e+02, 7.87e+02, 8.59e+02, 9.31e+02, 1.003e+03, 1.075e+03, 1.147e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.5e+01, 1.27e+02, 1.99e+02] plaEna2.tim2.y=[0e+00, 7.2e+01, 1.44e+02, 2.16e+02, 2.88e+02, 3.6e+02, 4.32e+02, 5.040000000000001e+02, 5.76e+02, 6.48e+02, 7.2e+02, 7.92e+02, 8.64e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.824819946289085e+01, 1.402481994628909e+02, 2.122481994628906e+02, 2.842481994628906e+02, 3.562481994628906e+02, 4.282481994628906e+02, 5.002481994628906e+02, 5.722482299804688e+02, 6.442482299804688e+02, 7.162482299804688e+02, 7.882482299804688e+02, 8.602482299804688e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.624820327758835e+01, 1.282481994628906e+02, 2.002481994628906e+02, 2.722481994628906e+02, 3.442481994628906e+02, 4.162481994628906e+02, 4.882481994628906e+02, 5.602482299804688e+02, 6.322482299804688e+02, 7.042482299804688e+02, 7.762482299804688e+02, 8.482482299804688e+02, 9.202482299804688e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.424820327758789e+01, 1.162481994628906e+02, 1.882481994628906e+02, 2.602481994628906e+02, 3.322481994628906e+02, 4.042481994628906e+02, 4.762481994628906e+02, 5.482482299804688e+02, 6.202482299804688e+02, 6.922482299804688e+02, 7.642482299804688e+02, 8.362482299804688e+02, 9.082482299804688e+02, 0e+00, 0e+00, 0e+00] +plaEna2.plaOffThrTim=[9e+02, 9e+02] +plaEna2.plaOnThrTim=[9e+02, 9e+02] plaEna2.yPla=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00] plaEna3.nIgnReq=[2e+00, 2e+00] plaEna3.supResReq=[3e+00, 3e+00] @@ -43,6 +43,6 @@ plaEna3.TOut=[2.97e+02, 2.97e+02] plaEna3.enaSch.y[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] plaEna3.tim.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.2e+01, 1.44e+02, 2.16e+02, 2.880000000000005e+02, 3.600000000000005e+02, 4.320000000000005e+02, 5.04e+02, 5.76e+02, 6.48e+02, 7.2e+02, 7.92e+02, 8.64e+02, 9.36e+02, 1.008e+03, 1.08e+03, 1.152e+03, 1.224e+03, 1.296e+03, 1.368e+03, 1.44e+03, 1.512e+03, 1.584e+03, 1.656e+03, 1.728e+03, 1.8e+03, 1.872e+03, 1.944e+03, 2.016e+03, 2.088e+03, 2.16e+03, 2.232e+03, 2.304e+03, 2.376e+03, 2.448e+03, 2.52e+03, 2.592e+03, 2.664e+03, 2.736e+03, 2.808e+03, 2.88e+03, 2.952e+03, 3.024e+03, 3.096e+03, 3.168e+03, 3.24e+03, 3.312e+03, 3.384e+03, 3.456e+03, 3.528e+03, 3.6e+03] plaEna3.tim2.y=[0e+00, 7.2e+01, 1.44e+02, 2.16e+02, 2.88e+02, 3.6e+02, 4.32e+02, 5.040000000000001e+02, 5.76e+02, 6.48e+02, 7.2e+02, 7.92e+02, 8.64e+02, 9.36e+02, 1.008e+03, 1.08e+03, 1.152e+03, 1.224e+03, 1.296e+03, 1.368e+03, 1.44e+03, 1.512e+03, 1.584e+03, 1.656e+03, 1.728e+03, 1.8e+03, 1.872e+03, 1.944e+03, 2.016e+03, 2.088e+03, 2.16e+03, 2.232e+03, 2.304e+03, 2.376e+03, 2.448e+03, 2.52e+03, 2.592e+03, 2.664e+03, 2.736e+03, 2.808e+03, 2.88e+03, 2.952e+03, 3.024e+03, 3.096e+03, 3.168e+03, 3.24e+03, 3.312e+03, 3.384e+03, 3.456e+03, 3.528e+03, 3.6e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -plaEna3.plaOnThrTim=[9e+02, 9e+02] plaEna3.plaOffThrTim=[9e+02, 9e+02] +plaEna3.plaOnThrTim=[9e+02, 9e+02] plaEna3.yPla=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_Validation_RotationController.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_Validation_RotationController.txt index 39c55466310..d9d6b178a70 100644 --- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_Validation_RotationController.txt +++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Generic_Validation_RotationController.txt @@ -1,28 +1,28 @@ -last-generated=2021-04-13 +last-generated=2022-11-22 statistics-simulation= { "linear": " ", "nonlinear": " ", "numerical Jacobians": "0" } -rotCon.uDevStaSet[2]=[0e+00, 0e+00] -rotCon.uDevStaSet[1]=[0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999999999716e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] time=[0e+00, 6e+02] +rotCon.uDevStaSet[1]=[0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999999999716e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +rotCon.uDevStaSet[2]=[0e+00, 0e+00] rotCon.yDevStaSet[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] rotCon.yDevStaSet[2]=[0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999999999716e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -rotCon.uDevSta[2]=[0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] rotCon.uDevSta[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +rotCon.uDevSta[2]=[0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] rotCon.yStaFee[1]=[0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] rotCon.yStaFee[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -rotCon.equRot.yDevRol[2]=[0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999999999716e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] rotCon.equRot.yDevRol[1]=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2.842170943040401e-14, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +rotCon.equRot.yDevRol[2]=[0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999999999716e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] rotCon1.uDevStaSet[1]=[0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] rotCon1.uDevStaSet[2]=[0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999999999716e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] rotCon1.yDevStaSet[1]=[0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999999999716e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] rotCon1.yDevStaSet[2]=[0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] rotCon1.uDevSta[1]=[0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] rotCon1.uDevSta[2]=[0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] -rotCon1.yStaFee[2]=[0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] rotCon1.yStaFee[1]=[0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] -rotCon1.equRot.yDevRol[2]=[0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] +rotCon1.yStaFee[2]=[0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] rotCon1.equRot.yDevRol[1]=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +rotCon1.equRot.yDevRol[2]=[0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_SetPoints_Subsequences_Validation_ProportionalRegulator.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_SetPoints_Subsequences_Validation_ProportionalRegulator.txt index 4fe09db5501..354744ddf40 100644 --- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_SetPoints_Subsequences_Validation_ProportionalRegulator.txt +++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_SetPoints_Subsequences_Validation_ProportionalRegulator.txt @@ -1,12 +1,12 @@ -last-generated=2020-07-28 +last-generated=2022-11-22 statistics-simulation= { "linear": " ", "nonlinear": " ", "numerical Jacobians": "0" } +time=[0e+00, 6e+01] proReg.THotWatRet=[6e+01, 6.031395338719434e+01, 6.062666699791529e+01, 6.093690493172229e+01, 6.124345011635225e+01, 6.154508590698242e+01, 6.184062199455361e+01, 6.212889489600248e+01, 6.240876761238084e+01, 6.267913432656856e+01, 6.293892669677734e+01, 6.318711856854804e+01, 6.342273719394728e+01, 6.36448439863515e+01, 6.385256589172698e+01, 6.404508209228516e+01, 6.422164143243162e+01, 6.438153080927931e+01, 6.452413173181651e+01, 6.464888007725384e+01, 6.475527954101562e+01, 6.484291834511325e+01, 6.491143800637415e+01, 6.496057127592938e+01, 6.499013520414874e+01, 6.5e+01, 6.499013520414874e+01, 6.496057133664694e+01, 6.491143791096262e+01, 6.484291834511325e+01, 6.475527954101562e+01, 6.464888007725384e+01, 6.452413194273326e+01, 6.438153056711249e+01, 6.422164143243162e+01, 6.404508209228516e+01, 6.385256589172698e+01, 6.364484432678538e+01, 6.342273682865402e+01, 6.318711837558766e+01, 6.293892669677734e+01, 6.267913453686079e+01, 6.240876804905079e+01, 6.212889444339827e+01, 6.184062176207599e+01, 6.154508590698242e+01, 6.124345035793387e+01, 6.093690529915541e+01, 6.062666662607115e+01, 6.031395320023773e+01, 6e+01, 5.968604679976227e+01, 5.937333337392885e+01, 5.906309470084459e+01, 5.875655061027085e+01, 5.845491409301758e+01, 5.815937731079125e+01, 5.787110555660749e+01, 5.759123195094367e+01, 5.732086630833415e+01, 5.706107330322266e+01, 5.681288085734748e+01, 5.657726317135063e+01, 5.635515567321031e+01, 5.614743474770793e+01, 5.595491409301758e+01, 5.577836185033084e+01, 5.561846561824184e+01, 5.547586424259106e+01, 5.535111647921241e+01, 5.524471664428711e+01, 5.515708522487409e+01, 5.508856208903862e+01, 5.50394248486793e+01, 5.500986486232791e+01, 5.5e+01, 5.500986486232791e+01, 5.50394248486793e+01, 5.508856208903862e+01, 5.515708522487409e+01, 5.524471664428711e+01, 5.535111647921241e+01, 5.547586424259106e+01, 5.561846561824184e+01, 5.577836185033084e+01, 5.595491409301758e+01, 5.614743474770793e+01, 5.635515567321031e+01, 5.657726317135063e+01, 5.681288085734748e+01, 5.706107330322266e+01, 5.732086630833415e+01, 5.759123195094367e+01, 5.787110555660749e+01, 5.815937731079125e+01, 5.845491409301758e+01, 5.875655061027085e+01, 5.906309470083836e+01, 5.937333337393515e+01, 5.968604580335164e+01, 6e+01] -proReg.TRetMinAll=[5.720000076293945e+01, 5.720000076293945e+01] proReg.TRetSet=[6e+01, 6e+01] -time=[0e+00, 6e+01] +proReg.TRetMinAll=[5.720000076293945e+01, 5.720000076293945e+01] proReg.yRegSig=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.121258545000747e-01, 2.238092049047075e-01, 3.346096186817693e-01, 4.440888080573288e-01, 5.518160462379456e-01, 6.573655271364933e-01, 7.603200571442347e-01, 8.602745586775219e-01, 9.56833299525521e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.56833299525521e-01, 8.602745586775219e-01, 7.603200571442347e-01, 6.573655271364933e-01, 5.518160462379456e-01, 4.440888080573288e-01, 3.346096186839947e-01, 2.23809204902456e-01, 1.121262103688644e-01, 0e+00] diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_SetPoints_Subsequences_Validation_PumpSpeedLimits.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_SetPoints_Subsequences_Validation_PumpSpeedLimits.txt index 9e45323f19f..ab5698e6627 100644 --- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_SetPoints_Subsequences_Validation_PumpSpeedLimits.txt +++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_SetPoints_Subsequences_Validation_PumpSpeedLimits.txt @@ -1,12 +1,12 @@ -last-generated=2020-07-28 +last-generated=2022-11-22 statistics-simulation= { "linear": " ", "nonlinear": " ", "numerical Jacobians": "0" } -pumSpeLim.uRegSig=[5e-01, 5.376743063275602e-01, 5.751999586875818e-01, 6.124287873097954e-01, 6.492139042898054e-01, 6.8541020154953e-01, 7.208747323296468e-01, 7.554676044810981e-01, 7.890521778586632e-01, 8.214960643519617e-01, 8.526711463928223e-01, 8.824543998870947e-01, 9.107282844602312e-01, 9.373811400799414e-01, 9.623079451542254e-01, 9.85410213470459e-01, 1.006596790695478e+00, 1.025784021362792e+00, 1.042896265581281e+00, 1.057865866761343e+00, 1.070633888244629e+00, 1.081149929615895e+00, 1.089372398640726e+00, 1.095268843981518e+00, 1.098816038532798e+00, 1.100000023841858e+00, 1.098816038532798e+00, 1.095268851266722e+00, 1.089372387190819e+00, 1.081149929615895e+00, 1.070633888244629e+00, 1.057865866761343e+00, 1.042896290888783e+00, 1.025783992298341e+00, 1.006596790695478e+00, 9.85410213470459e-01, 9.623079451542255e-01, 9.373811809328643e-01, 9.107282406264587e-01, 8.824543767307744e-01, 8.526711463928223e-01, 8.214960895872719e-01, 7.890522302575496e-01, 7.55467550168306e-01, 7.208747044322431e-01, 6.8541020154953e-01, 6.492139332802072e-01, 6.124288314000645e-01, 5.751999140672519e-01, 5.376742838934061e-01, 5e-01, 4.623257161065939e-01, 4.248001157350704e-01, 3.87571168599746e-01, 3.50786153101801e-01, 3.1458979845047e-01, 2.791251843125982e-01, 2.445324647334521e-01, 2.109477548408135e-01, 1.785039969352783e-01, 1.473288536071777e-01, 1.175455312213626e-01, 8.927177427530836e-02, 6.261878926443756e-02, 3.769211667953461e-02, 1.458980329334736e-02, -6.596806097009087e-03, -2.578398484762625e-02, -4.289624991143087e-02, -5.786585575377606e-02, -7.06339105963707e-02, -8.114992172763209e-02, -8.937234248742505e-02, -9.526882891559166e-02, -9.88160305571644e-02, -1.000000014901161e-01, -9.88160305571644e-02, -9.526882891559166e-02, -8.937234248742505e-02, -8.114992172763209e-02, -7.06339105963707e-02, -5.786585575377606e-02, -4.289624991143087e-02, -2.578398484762625e-02, -6.596806097009087e-03, 1.458980329334736e-02, 3.769211667953461e-02, 6.261878926443756e-02, 8.927177427530837e-02, 1.175455312213626e-01, 1.473288536071777e-01, 1.785039969352783e-01, 2.109477548408135e-01, 2.445324647334521e-01, 2.791251843125982e-01, 3.1458979845047e-01, 3.50786153101801e-01, 3.875711685989983e-01, 4.248001157358269e-01, 4.623255965346502e-01, 5e-01] time=[0e+00, 6e+01] +pumSpeLim.uRegSig=[5e-01, 5.376743063275602e-01, 5.751999586875818e-01, 6.124287873097954e-01, 6.492139042898054e-01, 6.8541020154953e-01, 7.208747323296468e-01, 7.554676044810981e-01, 7.890521778586632e-01, 8.214960643519617e-01, 8.526711463928223e-01, 8.824543998870947e-01, 9.107282844602312e-01, 9.373811400799414e-01, 9.623079451542254e-01, 9.85410213470459e-01, 1.006596790695478e+00, 1.025784021362792e+00, 1.042896265581281e+00, 1.057865866761343e+00, 1.070633888244629e+00, 1.081149929615895e+00, 1.089372398640726e+00, 1.095268843981518e+00, 1.098816038532798e+00, 1.100000023841858e+00, 1.098816038532798e+00, 1.095268851266722e+00, 1.089372387190819e+00, 1.081149929615895e+00, 1.070633888244629e+00, 1.057865866761343e+00, 1.042896290888783e+00, 1.025783992298341e+00, 1.006596790695478e+00, 9.85410213470459e-01, 9.623079451542255e-01, 9.373811809328643e-01, 9.107282406264587e-01, 8.824543767307744e-01, 8.526711463928223e-01, 8.214960895872719e-01, 7.890522302575496e-01, 7.55467550168306e-01, 7.208747044322431e-01, 6.8541020154953e-01, 6.492139332802072e-01, 6.124288314000645e-01, 5.751999140672519e-01, 5.376742838934061e-01, 5e-01, 4.623257161065939e-01, 4.248001157350704e-01, 3.87571168599746e-01, 3.50786153101801e-01, 3.1458979845047e-01, 2.791251843125982e-01, 2.445324647334521e-01, 2.109477548408135e-01, 1.785039969352783e-01, 1.473288536071777e-01, 1.175455312213626e-01, 8.927177427530836e-02, 6.261878926443756e-02, 3.769211667953461e-02, 1.458980329334736e-02, -6.596806097009087e-03, -2.578398484762625e-02, -4.289624991143087e-02, -5.786585575377606e-02, -7.06339105963707e-02, -8.114992172763209e-02, -8.937234248742505e-02, -9.526882891559166e-02, -9.88160305571644e-02, -1.000000014901161e-01, -9.88160305571644e-02, -9.526882891559166e-02, -8.937234248742505e-02, -8.114992172763209e-02, -7.06339105963707e-02, -5.786585575377606e-02, -4.289624991143087e-02, -2.578398484762625e-02, -6.596806097009087e-03, 1.458980329334736e-02, 3.769211667953461e-02, 6.261878926443756e-02, 8.927177427530837e-02, 1.175455312213626e-01, 1.473288536071777e-01, 1.785039969352783e-01, 2.109477548408135e-01, 2.445324647334521e-01, 2.791251843125982e-01, 3.1458979845047e-01, 3.50786153101801e-01, 3.875711685989983e-01, 4.248001157358269e-01, 4.623255965346502e-01, 5e-01] pumSpeLim.yMaxSecPumSpe=[1e+00, 9.321862486103893e-01, 8.646401220460734e-01, 7.976281590004913e-01, 7.314149245947008e-01, 6.662616729736328e-01, 6.024254460439057e-01, 5.401583715385546e-01, 4.797060381312496e-01, 4.213070662851041e-01, 3.651919364929199e-01, 3.115820802032627e-01, 2.606891237343517e-01, 2.127138971922284e-01, 1.678456689201477e-01, 1.262616515159607e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.262616515159607e-01, 1.678456689201476e-01, 2.127138236571237e-01, 2.606892026352748e-01, 3.115821218845871e-01, 3.651919364929199e-01, 4.213070208617254e-01, 4.797059438135384e-01, 5.401584693012391e-01, 6.024254962591375e-01, 6.662616729736328e-01, 7.314148724121766e-01, 7.976280796377228e-01, 8.646402023627381e-01, 9.321862889918311e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] pumSpeLim.yMinPriPumSpe=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.397211457706639e-01, 8.796801732553353e-01, 8.201138816805983e-01, 7.612578568838105e-01, 7.033436894416809e-01, 6.466002829796829e-01, 5.912519793359312e-01, 5.375164077453775e-01, 4.856064129776871e-01, 4.357261657714844e-01, 3.880728499544076e-01, 3.42834826919716e-01, 3.001900687836025e-01, 2.603073807270183e-01, 2.233436852693558e-01, 2.000000029802322e-01, 2.000000029802322e-01, 2.000000029802322e-01, 2.000000029802322e-01, 2.000000029802322e-01, 2.000000029802322e-01, 2.000000029802322e-01, 2.000000029802322e-01, 2.000000029802322e-01, 2.000000029802322e-01, 2.000000029802322e-01, 2.000000029802322e-01, 2.000000029802322e-01, 2.000000029802322e-01, 2.000000029802322e-01, 2.000000029802322e-01, 2.000000029802322e-01, 2.000000029802322e-01, 2.000000029802322e-01, 2.233436852693558e-01, 2.603073807270183e-01, 3.001900687836025e-01, 3.42834826919716e-01, 3.880728499544076e-01, 4.357261657714844e-01, 4.856064129776871e-01, 5.375164077453775e-01, 5.912519793359312e-01, 6.466002829796829e-01, 7.033436894416809e-01, 7.612578568838105e-01, 8.201138816794019e-01, 8.796801732565458e-01, 9.397209544555919e-01, 1e+00] pumSpeLim1.uRegSig=[5e-01, 5.376743063275602e-01, 5.751999586875818e-01, 6.124287873097954e-01, 6.492139042898054e-01, 6.8541020154953e-01, 7.208747323296468e-01, 7.554676044810981e-01, 7.890521778586632e-01, 8.214960643519617e-01, 8.526711463928223e-01, 8.824543998870947e-01, 9.107282844602312e-01, 9.373811400799414e-01, 9.623079451542254e-01, 9.85410213470459e-01, 1.006596790695478e+00, 1.025784021362792e+00, 1.042896265581281e+00, 1.057865866761343e+00, 1.070633888244629e+00, 1.081149929615895e+00, 1.089372398640726e+00, 1.095268843981518e+00, 1.098816038532798e+00, 1.100000023841858e+00, 1.098816038532798e+00, 1.095268851266722e+00, 1.089372387190819e+00, 1.081149929615895e+00, 1.070633888244629e+00, 1.057865866761343e+00, 1.042896290888783e+00, 1.025783992298341e+00, 1.006596790695478e+00, 9.85410213470459e-01, 9.623079451542255e-01, 9.373811809328643e-01, 9.107282406264587e-01, 8.824543767307744e-01, 8.526711463928223e-01, 8.214960895872719e-01, 7.890522302575496e-01, 7.55467550168306e-01, 7.208747044322431e-01, 6.8541020154953e-01, 6.492139332802072e-01, 6.124288314000645e-01, 5.751999140672519e-01, 5.376742838934061e-01, 5e-01, 4.623257161065939e-01, 4.248001157350704e-01, 3.87571168599746e-01, 3.50786153101801e-01, 3.1458979845047e-01, 2.791251843125982e-01, 2.445324647334521e-01, 2.109477548408135e-01, 1.785039969352783e-01, 1.473288536071777e-01, 1.175455312213626e-01, 8.927177427530836e-02, 6.261878926443756e-02, 3.769211667953461e-02, 1.458980329334736e-02, -6.596806097009087e-03, -2.578398484762625e-02, -4.289624991143087e-02, -5.786585575377606e-02, -7.06339105963707e-02, -8.114992172763209e-02, -8.937234248742505e-02, -9.526882891559166e-02, -9.88160305571644e-02, -1.000000014901161e-01, -9.88160305571644e-02, -9.526882891559166e-02, -8.937234248742505e-02, -8.114992172763209e-02, -7.06339105963707e-02, -5.786585575377606e-02, -4.289624991143087e-02, -2.578398484762625e-02, -6.596806097009087e-03, 1.458980329334736e-02, 3.769211667953461e-02, 6.261878926443756e-02, 8.927177427530837e-02, 1.175455312213626e-01, 1.473288536071777e-01, 1.785039969352783e-01, 2.109477548408135e-01, 2.445324647334521e-01, 2.791251843125982e-01, 3.1458979845047e-01, 3.50786153101801e-01, 3.875711685989983e-01, 4.248001157358269e-01, 4.623255965346502e-01, 5e-01] diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_SetPoints_Validation_HotWaterSupplyTemperatureReset.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_SetPoints_Validation_HotWaterSupplyTemperatureReset.txt index 4ffb165f2c2..515829a75c5 100644 --- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_SetPoints_Validation_HotWaterSupplyTemperatureReset.txt +++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_SetPoints_Validation_HotWaterSupplyTemperatureReset.txt @@ -1,4 +1,4 @@ -last-generated=2021-10-14 +last-generated=2022-11-22 statistics-simulation= { "linear": " ", diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_SetPoints_Validation_MinimumFlowSetPoint.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_SetPoints_Validation_MinimumFlowSetPoint.txt index cb35fadb1cf..1e69561575c 100644 --- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_SetPoints_Validation_MinimumFlowSetPoint.txt +++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_SetPoints_Validation_MinimumFlowSetPoint.txt @@ -1,4 +1,4 @@ -last-generated=2022-05-09 +last-generated=2022-11-22 statistics-simulation= { "linear": " ", @@ -18,7 +18,7 @@ minBoiFloSet.maxFloSet[2]=[8.999999761581421e-01, 8.999999761581421e-01] minBoiFloSet.VHotWatMinSet_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.999995045371726e-02, 8.999994486552741e-02, 9.999999403953552e-02, 9.999999403953552e-02, 9.999999403953552e-02, 9.999999403953552e-02, 9.999999403953552e-02, 9.999999403953552e-02, 9.999999403953552e-02, 9.999999403953552e-02, 9.999999403953552e-02, 9.999999403953552e-02, 9.999999403953552e-02, 9.999999403953552e-02, 9.999999403953552e-02, 9.999999403953552e-02, 9.999999403953552e-02, 9.999999403953552e-02, 9.999999403953552e-02, 9.999999403953552e-02, 9.999999403953552e-02, 9.999999403953552e-02, 9.999999403953552e-02, 9.999999403953552e-02, 9.999999403953552e-02, 1.300000566239389e-01, 1.900000059601805e-01, 2.499999552965164e-01, 3.099999046328524e-01, 3.699998390680275e-01, 4.299999940389672e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.500000262258617e-01, 3.900000023838069e-01, 3.299998176103557e-01, 2.999999821186066e-01, 2.999999821186066e-01, 2.999999821186066e-01, 2.999999821186066e-01, 2.999999821186066e-01, 2.999999821186066e-01, 2.999999821186066e-01, 2.999999821186066e-01, 2.999999821186066e-01, 2.999999821186066e-01, 2.999999821186066e-01, 2.999999821186066e-01, 2.999999821186066e-01, 2.999999821186066e-01, 3.300000596052887e-01, 3.899997735062908e-01, 4.499998986721039e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01, 4.599999785423279e-01] minBoiFloSet1.uStaSet=[4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] minBoiFloSet1.uOnOff=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] -truFalHol1.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 3.814682717262485e-06, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 3.814682699498917e-06, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +truFalHol1.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 3.814682717262485e-06, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 3.814682699498917e-06, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] minBoiFloSet1.uLasDisBoi=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00] minBoiFloSet1.minFloSet[1]=[1.000000014901161e-01, 1.000000014901161e-01] minBoiFloSet1.minFloSet[2]=[3.00000011920929e-01, 3.00000011920929e-01] diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Validation_Controller.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Validation_Controller.txt index 5e7a0cbb887..5e62fa634f3 100644 --- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Validation_Controller.txt +++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_ASHRAE_PrimarySystem_BoilerPlant_Validation_Controller.txt @@ -1,13 +1,13 @@ -last-generated=2022-05-09 +last-generated=2022-11-26 statistics-simulation= { "linear": " ", "nonlinear": " ", - "number of continuous time states": "19", + "number of continuous time states": "25", "numerical Jacobians": "0" } time=[0e+00, 7.5e+03] -controller.supResReq=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +controller.plaReq=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] controller.staSetCon.ySta=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] controller.yHotWatIsoVal[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 6.666666865348816e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.333333134651184e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.421606287360191e-02, 1.088272780179977e-02, 1.088272780179977e-02, 1.088272780179977e-02, 1.088272780179977e-02, 1.088272780179977e-02, 4.557839334011078e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] controller.yPriPum[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] @@ -21,7 +21,7 @@ controller.dpHotWatPri_rem[1]=[4e+03, 4e+03] controller.maxLocDpPri=[4.1e+03, 4.1e+03] controller.minLocDpPri=[3.9e+03, 3.9e+03] controller.yPriPumSpe=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] -controller1.supResReq=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +controller1.plaReq=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] controller1.staSetCon.ySta=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] controller1.yHotWatIsoVal[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 6.666667014360428e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 3.966702222824097e-01, 1.333688665181398e-02, 1.333688665181398e-02, 1.333688665181398e-02, 1.333688665181398e-02, 1.333688665181398e-02, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] controller1.yPriPum[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] @@ -40,7 +40,7 @@ controller1.dpHotWatSec_rem[1]=[4e+03, 4e+03] controller1.maxLocDpSec=[4.1e+03, 4.1e+03] controller1.minLocDpSec=[3.9e+03, 3.9e+03] controller1.ySecPumSpe=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] -controller2.supResReq=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +controller2.plaReq=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] controller2.staSetCon.ySta=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] controller2.yPriPum[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] controller2.yBoi[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Examples_BoilerPlant_ClosedLoopTest.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Examples_BoilerPlant_ClosedLoopTest.txt index 336061384e1..7b8ac119002 100644 --- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Examples_BoilerPlant_ClosedLoopTest.txt +++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Examples_BoilerPlant_ClosedLoopTest.txt @@ -1,32 +1,32 @@ -last-generated=2021-10-15 +last-generated=2022-11-26 statistics-initialization= { - "linear": "0, 0", - "nonlinear": "5, 4, 0", + "nonlinear": "5, 3, 0, 0, 0", "numerical Jacobians": "0" } statistics-simulation= { - "linear": "0, 0, 0, 0, 0, 0, 0, 0", + "linear": "0, 0, 0, 0, 0, 0, 0", "nonlinear": "3, 1", - "number of continuous time states": "37", + "number of continuous time states": "43", "numerical Jacobians": "0" } time=[5.184e+05, 6.912e+05] -boilerPlant.TOutAir=[2.5425e+02, 2.542709197998047e+02, 2.542664947509766e+02, 2.540465850830078e+02, 2.537970123291016e+02, 2.535099945068359e+02, 2.532220001220703e+02, 2.529340057373047e+02, 2.5264599609375e+02, 2.523821716308594e+02, 2.521596069335938e+02, 2.518072204589844e+02, 2.512178039550781e+02, 2.507414855957031e+02, 2.504530792236328e+02, 2.503481140136719e+02, 2.5080126953125e+02, 2.519077453613281e+02, 2.536924133300781e+02, 2.551365356445312e+02, 2.562203674316406e+02, 2.57208984375e+02, 2.581070861816406e+02, 2.587918395996094e+02, 2.587844848632812e+02, 2.5875e+02, 2.592784118652344e+02, 2.59817138671875e+02, 2.602023620605469e+02, 2.603697204589844e+02, 2.601742553710938e+02, 2.599153747558594e+02, 2.5965087890625e+02, 2.593579406738281e+02, 2.587002563476562e+02, 2.574121704101562e+02, 2.568208923339844e+02, 2.566363830566406e+02, 2.561019592285156e+02, 2.552156372070312e+02, 2.547695465087891e+02, 2.549156494140625e+02, 2.546984252929688e+02, 2.541324615478516e+02, 2.536492919921875e+02, 2.533141326904297e+02, 2.531456298828125e+02, 2.535110473632812e+02, 2.537394104003906e+02, 2.535141448974609e+02, 2.531499938964844e+02, 2.525212554931641e+02, 2.520538177490234e+02, 2.520500030517578e+02, 2.520500030517578e+02, 2.520500030517578e+02, 2.520500030517578e+02, 2.520500030517578e+02, 2.520500030517578e+02, 2.519049987792969e+02, 2.515124053955078e+02, 2.514499969482422e+02, 2.514499969482422e+02, 2.514499969482422e+02, 2.514499969482422e+02, 2.514559326171875e+02, 2.516438751220703e+02, 2.524502868652344e+02, 2.544878387451172e+02, 2.563212280273438e+02, 2.577486877441406e+02, 2.589198913574219e+02, 2.59783203125e+02, 2.603899841308594e+02, 2.606515502929688e+02, 2.609500122070312e+02, 2.617729187011719e+02, 2.625220947265625e+02, 2.628139953613281e+02, 2.631019897460938e+02, 2.633900146484375e+02, 2.636780090332031e+02, 2.638633422851562e+02, 2.637967834472656e+02, 2.635606079101562e+02, 2.632027893066406e+02, 2.631499938964844e+02, 2.631499938964844e+02, 2.631499938964844e+02, 2.631499938964844e+02, 2.631949462890625e+02, 2.635242919921875e+02, 2.63836669921875e+02, 2.640842895507812e+02, 2.6428759765625e+02, 2.642657165527344e+02, 2.642728576660156e+02, 2.646228637695312e+02, 2.648471984863281e+02, 2.645320129394531e+02, 2.6425e+02] -boilerPlant.yZonTem=[2.931499938964844e+02, 2.931375122070312e+02, 2.931253967285156e+02, 2.931161193847656e+02, 2.931034545898438e+02, 2.930903625488281e+02, 2.930648498535156e+02, 2.930271911621094e+02, 2.929829711914062e+02, 2.928836364746094e+02, 2.927773132324219e+02, 2.926029968261719e+02, 2.926803588867188e+02, 2.9309765625e+02, 2.936551513671875e+02, 2.942947692871094e+02, 2.950055236816406e+02, 2.95570068359375e+02, 2.956469421386719e+02, 2.955363464355469e+02, 2.953652648925781e+02, 2.951759338378906e+02, 2.949862670898438e+02, 2.947942504882812e+02, 2.945941467285156e+02, 2.943858032226562e+02, 2.941556701660156e+02, 2.939213562011719e+02, 2.938371276855469e+02, 2.941305236816406e+02, 2.944555358886719e+02, 2.945095825195312e+02, 2.943816223144531e+02, 2.9417919921875e+02, 2.93946044921875e+02, 2.937845458984375e+02, 2.940849914550781e+02, 2.945646362304688e+02, 2.948000183105469e+02, 2.948695983886719e+02, 2.948739624023438e+02, 2.948438110351562e+02, 2.948009643554688e+02, 2.947434997558594e+02, 2.94675537109375e+02, 2.9460595703125e+02, 2.945390930175781e+02, 2.944674682617188e+02, 2.943863525390625e+02, 2.943038940429688e+02, 2.942242736816406e+02, 2.94146240234375e+02, 2.940690612792969e+02, 2.93990234375e+02, 2.939087524414062e+02, 2.938244018554688e+02, 2.937375183105469e+02, 2.936488647460938e+02, 2.935611877441406e+02, 2.934745178222656e+02, 2.933828735351562e+02, 2.932900695800781e+02, 2.932027893066406e+02, 2.931564025878906e+02, 2.934277954101562e+02, 2.940295715332031e+02, 2.948542175292969e+02, 2.956638793945312e+02, 2.959609069824219e+02, 2.960101928710938e+02, 2.959960632324219e+02, 2.959546508789062e+02, 2.959038391113281e+02, 2.958512878417969e+02, 2.957975769042969e+02, 2.957420654296875e+02, 2.956884765625e+02, 2.956285095214844e+02, 2.95570068359375e+02, 2.955097961425781e+02, 2.954533996582031e+02, 2.953931884765625e+02, 2.953311157226562e+02, 2.952540283203125e+02, 2.951709594726562e+02, 2.950825500488281e+02, 2.949913024902344e+02, 2.948994445800781e+02, 2.948016967773438e+02, 2.947110595703125e+02, 2.946312561035156e+02, 2.945479431152344e+02, 2.944626159667969e+02, 2.943798522949219e+02, 2.942962646484375e+02, 2.942144775390625e+02, 2.941302490234375e+02, 2.940398864746094e+02, 2.939486694335938e+02, 2.938522644042969e+02, 2.937544555664062e+02] -controller.supResReq=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -controller.plaEna.yPla=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -controller.staSetCon.ySta=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2e+00, 3e+00, 2e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2e+00, 3e+00, 2e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2e+00, 3e+00, 3e+00, 3e+00, 2e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -controller.yHotWatIsoVal[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.972739815711975e-01, 9.968024492263794e-01, 9.968029856681824e-01, 9.968029856681824e-01, 9.968029856681824e-01, 9.968029856681824e-01, 9.968029856681824e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.014590241014957e-02, 9.967496991157532e-01, 1.464305259287357e-02, 8.00000011920929e-01, 0e+00, 0e+00, 0e+00, 9.972679615020752e-01, 9.967532157897949e-01, 1.990596204996109e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.972572922706604e-01, 9.967289566993713e-01, 9.967289566993713e-01, 9.967289566993713e-01, 9.967289566993713e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -controller.yBoi[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -controller.yHotWatIsoVal[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -6.56230462720113e-18, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.26222813129425e-01, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -controller.yBoi[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -controller.VHotWatPri_flow=[-1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, 2.349241264164448e-02, 5.297282710671425e-02, 8.436010032892227e-02, 8.436017483472824e-02, 8.419138193130493e-02, 6.801988929510117e-02, 3.171288222074509e-02, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, 2.622528932988644e-02, 3.577729314565659e-02, 2.405611053109169e-02, 1.445069536566734e-02, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, 2.585051022469997e-02, 3.901675716042519e-02, 2.459140866994858e-02, -1.51576018403432e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, 3.650438785552979e-02, 8.167701959609985e-02, 8.435995131731033e-02, 7.916823029518127e-02, 3.084850125014782e-02, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09, -1.513077552139919e-09] -controller.VHotWatPri_flow_nominal=[1.134499981999397e-01, 1.134499981999397e-01] -controller.yPriPum[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] -controller.dpHotWatPri_rem[1]=[-2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, 4.784025390625e+03, 4.7009580078125e+03, 3.8364375e+03, 3.836376708984375e+03, 3.974597412109375e+03, 5.78933837890625e+03, 4.9628515625e+03, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.039276296272874e-06, 4.4522177734375e+03, 4.98479248046875e+03, 5.350259765625e+03, 7.4986474609375e+03, -2.091299393214285e-06, -2.091299393214285e-06, -2.056753146462142e-06, 4.5704541015625e+03, 4.9365810546875e+03, 5.4078681640625e+03, -2.095010131597519e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, 4.21570703125e+03, 4.5785107421875e+03, 3.836356201171875e+03, 5.40664794921875e+03, 5.15064599609375e+03, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06, -2.091299393214285e-06] -controller.maxLocDpPri=[5e+03, 5e+03] -controller.yPriPumSpe=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.349772572517395e-01, 7.737722396850586e-01, 1e+00, 1e+00, 1e+00, 8.981376886367798e-01, 6.010331511497498e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.572777986526489e-01, 6.364135146141052e-01, 5.479106903076172e-01, 4.806333482265472e-01, 1e+00, 1e+00, 1e+00, 5.432340502738953e-01, 6.632137894630432e-01, 5.538232922554016e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 6.430885195732117e-01, 9.876682162284851e-01, 1e+00, 9.761129021644592e-01, 5.95853865146637e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] -controller.minBoiFloSet.VHotWatMinSet_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.539999946951866e-03, 1.217999961227179e-02, 2.081999927759171e-02, 2.94599998742342e-02, 3.40300016105175e-02, 3.40300016105175e-02, 3.20499986410141e-02, 2.340999990701675e-02, 1.477000024169683e-02, 6.130000110715628e-03, 4.999989869247656e-06, 4.999989869247656e-06, 4.999989869247656e-06, 4.999989869247656e-06, 4.999989869247656e-06, 4.999989869247656e-06, 4.999989869247656e-06, 7.925000041723251e-03, 1.656500063836575e-02, 2.192559652030468e-02, 1.328559778630733e-02, 4.645597189664841e-03, 5.973726047159289e-07, 5.973726047159289e-07, 6.900597363710403e-03, 1.554059702903032e-02, 2.277251146733761e-02, 1.413251180201769e-02, 5.492512136697769e-03, 2.512098490115022e-06, 2.512098490115022e-06, 2.512098490115022e-06, 2.512098490115022e-06, 2.512098490115022e-06, 2.512098490115022e-06, 2.512098490115022e-06, 2.512098490115022e-06, 2.512098490115022e-06, 2.512098490115022e-06, 2.512098490115022e-06, 2.512098490115022e-06, 2.512098490115022e-06, 2.512098490115022e-06, 2.512098490115022e-06, 2.512098490115022e-06, 2.512098490115022e-06, 2.512098490115022e-06, 2.512098490115022e-06, 2.512098490115022e-06, 2.512098490115022e-06, 2.512098490115022e-06, 2.512098490115022e-06, 4.322512075304985e-03, 1.29625117406249e-02, 2.160251140594482e-02, 3.024251200258732e-02, 3.385251387953758e-02, 2.521251142024994e-02, 1.657251268625259e-02, 7.9325120896101e-03, 2.512088485673303e-06, 2.512088485673303e-06, 2.512088485673303e-06, 2.512088485673303e-06, 2.512088485673303e-06, 2.512088485673303e-06, 2.512088485673303e-06, 2.512088485673303e-06, 2.512088485673303e-06, 2.512088485673303e-06, 2.512088485673303e-06, 2.512088485673303e-06, 2.512088485673303e-06, 2.512088485673303e-06, 2.512088485673303e-06, 2.512088485673303e-06, 2.512088485673303e-06, 2.512088485673303e-06, 2.512088485673303e-06, 2.512088485673303e-06, 2.512088485673303e-06, 2.512088485673303e-06, 2.512088485673303e-06, 2.512088485673303e-06, 2.512088485673303e-06, 2.512088485673303e-06, 2.512088485673303e-06, 2.512088485673303e-06, 2.512088485673303e-06, 2.512088485673303e-06] -controller.yBypValPos=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.628374218940735e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1.785998940467834e-01, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.718836843967438e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] +conPID.u_m=[2.931499938964844e+02, 2.931436096191406e+02, 2.931375305175781e+02, 2.931343811035156e+02, 2.931277221679687e+02, 2.931207580566406e+02, 2.931006286621094e+02, 2.930683715820313e+02, 2.930293823242188e+02, 2.929344177246094e+02, 2.928316345214844e+02, 2.926596008164084e+02, 2.927882259326353e+02, 2.930029357910156e+02, 2.933746520996094e+02, 2.936983337402344e+02, 2.940509033203125e+02, 2.945056396484375e+02, 2.949769470214844e+02, 2.952294435406675e+02, 2.951545715332031e+02, 2.949856384277344e+02, 2.948006530761719e+02, 2.946091552734375e+02, 2.944084228515625e+02, 2.941991882324219e+02, 2.939674438476562e+02, 2.938620422363281e+02, 2.941674621582031e+02, 2.943941251314603e+02, 2.944088745117188e+02, 2.942530639648438e+02, 2.940289794921875e+02, 2.938118169256981e+02, 2.940454711914062e+02, 2.943279724121094e+02, 2.944452251271401e+02, 2.9447939453125e+02, 2.944508728027344e+02, 2.94426025390625e+02, 2.943949584960938e+02, 2.943498291015625e+02, 2.9430185546875e+02, 2.942433288574219e+02, 2.941765991210938e+02, 2.941099548339844e+02, 2.940473327636719e+02, 2.939791015625e+02, 2.939025146484375e+02, 2.938232177734375e+02, 2.937477111816406e+02, 2.936738891601562e+02, 2.936012023925781e+02, 2.935265747070313e+02, 2.934493591308594e+02, 2.933692016601562e+02, 2.932864562988281e+02, 2.932016723632813e+02, 2.931190063476562e+02, 2.930357849121094e+02, 2.929480895996094e+02, 2.928606308654303e+02, 2.931505798339844e+02, 2.935828981047223e+02, 2.938955749511719e+02, 2.941138000488281e+02, 2.942635469081038e+02, 2.944030517578125e+02, 2.94544091796875e+02, 2.946652221679688e+02, 2.947065124511719e+02, 2.946771423339844e+02, 2.946304321289062e+02, 2.945803955078125e+02, 2.945294555664062e+02, 2.944769592285156e+02, 2.944265747070312e+02, 2.943696350097656e+02, 2.943149047851563e+02, 2.942573974609375e+02, 2.942043762207031e+02, 2.941474792480469e+02, 2.940876953125e+02, 2.940127868652344e+02, 2.941005981445313e+02, 2.944466857910156e+02, 2.945670104980469e+02, 2.945341979980469e+02, 2.944592895507812e+02, 2.943786437988281e+02, 2.943053283691406e+02, 2.942264953613281e+02, 2.94143701171875e+02, 2.940641662597656e+02, 2.939822509765625e+02, 2.942030029296875e+02, 2.945232950846354e+02, 2.945807373046875e+02, 2.945341003417969e+02, 2.944542785644531e+02, 2.943649291992188e+02] +conPID.u_s=[2.8875e+02, 2.8875e+02, 2.8875e+02, 2.8875e+02, 2.8875e+02, 2.8875e+02, 2.8875e+02, 2.8875e+02, 2.8875e+02, 2.909500122070312e+02, 2.909500122070312e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.8875e+02, 2.8875e+02, 2.8875e+02, 2.8875e+02, 2.8875e+02, 2.8875e+02, 2.8875e+02, 2.8875e+02, 2.8875e+02, 2.8875e+02, 2.8875e+02, 2.8875e+02, 2.8875e+02, 2.909500122070312e+02, 2.909500122070312e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.941499938964844e+02, 2.8875e+02, 2.8875e+02, 2.8875e+02, 2.8875e+02, 2.8875e+02] +boiPlaCon.plaReq=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +boiPlaCon.yPla=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +boiPlaCon.TPlaHotWatSupSet=[3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.175950012207031e+02, 3.109289855957031e+02, 3.142650146484375e+02, 3.176010131835938e+02, 3.208258117675781e+02, 3.231499938964844e+02, 3.175950012207031e+02, 3.131510009765625e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.220390014648438e+02, 3.153729858398438e+02, 3.131510009765625e+02, 3.053699951171875e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.187059936523438e+02, 3.109289855957031e+02, 3.064849853515625e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.180393981933594e+02, 3.136704076293168e+02, 3.053739929199219e+02, 3.053699951171875e+02, 3.053699951171875e+02, 3.053699951171875e+02, 3.053699951171875e+02, 3.053699951171875e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.142619934082031e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.187059936523438e+02, 3.142619934082031e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02] +boiPla.ySupTem=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.25682456295274e+02, 3.013146910259715e+02, 3.145777160644531e+02, 3.150550231933594e+02, 3.180483703613281e+02, 3.215523132324219e+02, 3.236309448242188e+02, 3.199804870605469e+02, 3.134269714355469e+02, 3.134269714355469e+02, 3.134269714355469e+02, 3.134269714355469e+02, 3.134269714355469e+02, 3.134269714355469e+02, 3.134269714355469e+02, 3.134269714355469e+02, 3.250888793945313e+02, 3.203164428710937e+02, 3.119534301757812e+02, 3.074465942382812e+02, 3.074463500976562e+02, 3.074463500976562e+02, 3.341803965467088e+02, 3.18042919921875e+02, 3.115831909179688e+02, 3.071161298119794e+02, 3.071068115234375e+02, 3.071068115234375e+02, 3.071068115234375e+02, 3.071068115234375e+02, 3.071068115234375e+02, 3.071068115234375e+02, 3.071068115234375e+02, 3.071068115234375e+02, 3.071068115234375e+02, 3.071068115234375e+02, 3.071068115234375e+02, 3.071068115234375e+02, 3.071068115234375e+02, 3.071068115234375e+02, 3.071068115234375e+02, 3.071068115234375e+02, 3.071068115234375e+02, 3.071068115234375e+02, 3.071068115234375e+02, 3.071068115234375e+02, 3.071068115234375e+02, 3.071068115234375e+02, 3.071068115234375e+02, 3.071068115234375e+02, 3.087912945494711e+02, 3.197897521972656e+02, 3.112688045428817e+02, 3.122779174804688e+02, 3.050882263183594e+02, 3.048262463585805e+02, 3.055160400390625e+02, 3.052781555175781e+02, 3.064602661132812e+02, 3.067430114746094e+02, 3.067430114746094e+02, 3.067430114746094e+02, 3.067430114746094e+02, 3.067430114746094e+02, 3.067430114746094e+02, 3.067430114746094e+02, 3.067430114746094e+02, 3.067430114746094e+02, 3.067430114746094e+02, 3.067430114746094e+02, 3.067430114746094e+02, 3.067430114746094e+02, 3.067430114746094e+02, 3.208284851074219e+02, 3.214857482910156e+02, 3.136243286132812e+02, 3.136243286132812e+02, 3.136243286132812e+02, 3.136243286132812e+02, 3.136243286132812e+02, 3.136243286132812e+02, 3.136243286132812e+02, 3.136243286132812e+02, 3.067405151367187e+02, 3.192846069335938e+02, 3.1900244140625e+02, 3.1900244140625e+02, 3.1900244140625e+02, 3.1900244140625e+02, 3.1900244140625e+02] +boiPlaCon.staSetCon.ySta=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 2e+00, 1e+00, 0e+00, 0e+00, 0e+00, 2e+00, 3e+00, 3e+00, 2e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 2e+00, 2e+00, 3e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2e+00, 2e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 2e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +boiPlaCon.yHotWatIsoVal[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.973223209381104e-01, 9.985816492023964e-01, 9.972900152206421e-01, 9.972900152206421e-01, 9.972900152206421e-01, 9.972900152206421e-01, 9.972900152206421e-01, 9.972900152206421e-01, 1.155366257275685e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.973338842391968e-01, 1.459186431020498e-02, 1e+00, 0e+00, 0e+00, 0e+00, 9.973770380020142e-01, 9.9744154214859e-01, 9.974415898323059e-01, 1.459816512301981e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.973808526992798e-01, 1.451912149786949e-02, 1.45791582763195e-02, 9.972971677780151e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.973294734954834e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.973807334899902e-01, 1.447906997054815e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +boiPlaCon.yBoi[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 5.241635687732342e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +boiPlaCon.yHotWatIsoVal[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.513087376185995e-16, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1.155366257674377e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -5.907934528420235e-16, 1e+00, 1.465367060154676e-02, 4.124661386013031e-01, 0e+00, 0e+00, -4.832491807488434e-16, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -3.632353172309386e-16, 1e+00, 1e+00, 1e+00, 1.457650028169155e-02, 1.457649655640125e-02, 1.457649655640125e-02, 1.457649655640125e-02, 1.457649655640125e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -8.627194415720783e-17, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +boiPlaCon.yBoi[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +boiPlaCon.yPriPum[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +boiPlaCon.dpHotWatPri_rem[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.142113432382069e+04, 5.616303564997677e+04, 4.92875109375e+04, 4.999088203125e+04, 4.9999890625e+04, 5e+04, 5.01572e+04, 5.11601765625e+04, 7.88829280362271e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.451911015625e+04, 4.894122734375e+04, 5.081046243990384e+04, 1.647068176269531e+02, 0e+00, 0e+00, 3.681657704454787e+04, 5.34768421875e+04, 5.080091796875e+04, 5.010401085005523e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.592450917770575e+04, 4.78938921875e+04, 4.251856041003185e+04, 4.994719765625e+04, 4.700343359375e+04, 5.010974564353814e+04, 5.052994453125e+04, 5.16758734375e+04, 5.429313671875e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.73571859375e+04, 5.216904296875e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.224584609375e+04, 4.892850390625e+04, 7.372086585678701e-02, 0e+00, 0e+00, 0e+00, 0e+00] +boiPlaCon.maxLocDpPri=[5e+04, 5e+04] +boiPlaCon.yPriPumSpe=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.573330878009989e-01, 7.740439176559448e-01, 7.67163896560669e-01, 7.730876564979553e-01, 7.731545567512512e-01, 7.731553316116333e-01, 7.70719337463379e-01, 7.484281301498413e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 6.691130518913269e-01, 7.718074560165405e-01, 6.787466727770292e-01, 1e+00, 1e+00, 1e+00, 5.909956287830433e-01, 7.234950304031372e-01, 6.888207793235779e-01, 6.469249476038128e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 3.878483474254608e-01, 7.20603597164154e-01, 7.941950544430192e-01, 7.557503700256347e-01, 8.059866428375244e-01, 8.273578938791307e-01, 8.139183282852173e-01, 7.705091834068298e-01, 6.395201444625854e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 6.42707359790802e-01, 6.133165955543518e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 3.633021831512451e-01, 6.779518127441406e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00] +boiPlaCon.VHotWatPri_flow=[-0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, 2.56943477011074e-02, 5.295492409551897e-02, 5.947019830346108e-02, 6.006335243582726e-02, 6.00687637925148e-02, 6.006882712244987e-02, 5.930879339575768e-02, 5.266767665743828e-02, 7.164839120341999e-04, 8.014187030851346e-24, 8.014187030851346e-24, 8.014187030851346e-24, 8.014187030851346e-24, 8.014187030851346e-24, 8.014187030851346e-24, 8.01418466426863e-24, 3.276886120438575e-02, 3.929389268159866e-02, 2.84749366916143e-02, 4.607457958627492e-04, -5.52473496935125e-23, -5.524733707173801e-23, 2.576265614876088e-02, 4.310572072863579e-02, 3.727516159415245e-02, 1.875972746979769e-02, -1.232739841497848e-23, -1.232739841497848e-23, -1.232739762611758e-23, -1.232739762611758e-23, -1.232739762611758e-23, -1.232739762611758e-23, -1.232739762611758e-23, -1.232739762611758e-23, -1.232739604839577e-23, -1.232739210409124e-23, -1.232739210409124e-23, -1.232739210409124e-23, -1.232739210409124e-23, -1.232739210409124e-23, -1.232739210409124e-23, -1.232739210409124e-23, -1.232739210409124e-23, -1.232739210409124e-23, -1.232739210409124e-23, -1.232739210409124e-23, -1.232739210409124e-23, -1.232739210409124e-23, -1.232739210409124e-23, -1.232739210409124e-23, 1.524035536223159e-02, 3.286032974720001e-02, 4.57736500936329e-02, 5.593854486942292e-02, 5.520578846335411e-02, 5.639222679754435e-02, 5.391660332679749e-02, 4.564535841345787e-02, 1.406910102814436e-02, 4.152248260721318e-26, 4.152248260721318e-26, 4.152248260721318e-26, 4.152248260721318e-26, 4.152248260721318e-26, 4.152248260721318e-26, 4.152248260721318e-26, 4.152248260721318e-26, 4.152248260721318e-26, 4.152248260721318e-26, 4.152248260721318e-26, 4.152247952572527e-26, 4.152247028126153e-26, 4.15224610367978e-26, 2.584859803318977e-02, 1.01954098790884e-02, 1.008326742218929e-23, 1.008326663332838e-23, 1.008326663332838e-23, 1.008326663332838e-23, 1.008326663332838e-23, 1.008326663332838e-23, 1.008326663332838e-23, 1.008326426674567e-23, 1.77106112241745e-02, 2.544023469090462e-02, 2.766755760527448e-05, 3.610755518260252e-23, 3.610755518260252e-23, 3.610755518260252e-23, 3.610755518260252e-23] +boiPlaCon.minBoiFloSet.VHotWatMinSet_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.489490069943289e-03, 1.140590549055418e-02, 1.701749488711357e-02, 1.701749488711357e-02, 1.701749488711357e-02, 1.701749488711357e-02, 1.701749488711357e-02, 1.701749488711357e-02, 1.585215597533354e-02, 7.212110329419374e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.537997767329216e-03, 1.021049730479717e-02, 5.146132208980047e-03, -1.38272454545789e-23, -4.375056810608131e-21, -4.375056810608131e-21, 4.158703402239591e-03, 1.199367139488459e-02, 1.701749488711357e-02, 1.497566809024612e-02, 1.183244194835424e-02, 3.192442003637552e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.872626464528356e-03, 1.021049730479717e-02, 1.021049730479717e-02, 1.701749488711357e-02, 1.587578281760216e-02, 7.235885877162218e-03, 4.537997767329216e-03, 4.537997767329216e-03, 4.537997767329216e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.792944088578224e-03, 1.021049730479717e-02, 2.568581607192755e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.683125738054514e-03, 1.021049730479717e-02, 8.955214808626873e-03, 3.152477846015245e-04, 0e+00, 0e+00, -0e+00] +boiPlaCon.yBypValPos=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 9.023226499557495e-01, 9.023226499557495e-01, 9.023226499557495e-01, 9.023226499557495e-01, 9.023226499557495e-01, 9.023226499557495e-01, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 9.013388156890869e-01, 9.013388156890869e-01, 9.013388156890869e-01, 9.013388156890869e-01, 9.013388156890869e-01, 9.013388156890869e-01, 9.013388156890869e-01, 9.013388156890869e-01, 9.013388156890869e-01, 9.013388156890869e-01, 9.013388156890869e-01, 9.013388156890869e-01, 9.013388156890869e-01, 9.013388156890869e-01, 9.013388156890869e-01, 9.013388156890869e-01, 9.013388156890869e-01, 9.013388156890869e-01, 9.013388156890869e-01, 9.013388156890869e-01, 9.013388156890869e-01, 9.013388156890869e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.01276171207428e-01, 9.01276171207428e-01, 9.01276171207428e-01, 9.01276171207428e-01, 9.01276171207428e-01, 9.01276171207428e-01, 9.01276171207428e-01, 9.01276171207428e-01, 9.01276171207428e-01, 9.01276171207428e-01, 9.01276171207428e-01, 9.01276171207428e-01, 9.01276171207428e-01, 9.01276171207428e-01, 0e+00, 1.419482193887234e-02, 1e+00, 9.014318585395813e-01, 9.014318585395813e-01, 9.014318585395813e-01, 9.014318585395813e-01, 9.014318585395813e-01, 9.014318585395813e-01, 9.014318585395813e-01, 6.910076141357421e-02, 0e+00, 1e+00, 1e+00, 9.024857878684998e-01, 9.024857878684998e-01, 9.024857878684998e-01] diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/BypassValve/Validation/BypassValvePosition.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/BypassValve/Validation/BypassValvePosition.mos index 990d5f9ddb6..0f4e8668b91 100644 --- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/BypassValve/Validation/BypassValvePosition.mos +++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/BypassValve/Validation/BypassValvePosition.mos @@ -1,4 +1,4 @@ simulateModel("Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.BypassValve.Validation.BypassValvePosition", startTime=0,tolerance=1e-6, stopTime=300, method="cvode", resultFile="BypassValvePosition"); createPlot(id=1, position={0, 0, 1545, 998}, y={"bypValPos.uPumSta[1]", "bypValPos.uPumSta[2]"}, range={0.0, 300.0, -1.0, 0.8}, grid=true, colors={{28,108,200}, {28,108,200}}); -createPlot(id=1, position={0, 0, 1545, 330}, y={"bypValPos.VHotWat_flow", "bypValPos.VHotWatMinSet_flow"}, range={0.0, 300.0, 0.6000000000000001, 1.8000000000000003}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); -createPlot(id=1, position={0, 0, 1545, 329}, y={"bypValPos.yBypValPos", "bypValPos.uMinBypValPos"}, range={0.0, 300.0, -0.2, 1.2000000000000002}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}}); +createPlot(id=1, position={0, 0, 1545, 330}, y={"bypValPos.VHotWat_flow", "bypValPos.VHotWatMinSet_flow"}, range={0.0, 300.0, 0.6, 1.8}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); +createPlot(id=1, position={0, 0, 1545, 329}, y={"bypValPos.yBypValPos", "bypValPos.uMinBypValPos"}, range={0.0, 300.0, -0.2, 1.2}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}}); diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/Validation/PlantDisable.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/Validation/PlantDisable.mos index 11bc6fba524..a38793b9583 100644 --- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/Validation/PlantDisable.mos +++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Generic/Validation/PlantDisable.mos @@ -12,7 +12,7 @@ createPlot(id=2, position={160, 947, 833, 183}, y={"plaDis1.uHotWatIsoVal[1]", " createPlot(id=2, position={160, 947, 833, 184}, y={"plaDis1.yBoi[1]", "plaDis1.yBoi[2]"}, range={0.0, 900.0, -0.5, 1.5}, grid=true, subPlot=4, colors={{28,108,200}, {28,108,200}}); createPlot(id=2, position={160, 947, 833, 184}, y={"truFalHol1.y"}, range={0.0, 900.0, -0.5, 1.5}, grid=true, subPlot=5, colors={{28,108,200}}); -createPlot(id=3, position={0, 0, 833, 939}, y={"plaDis2.uPla"}, range={0.0, 900.0, -0.2, 1.2000000000000002}, grid=true, colors={{28,108,200}}); -createPlot(id=3, position={0, 0, 833, 231}, y={"plaDis2.uBoi[1]", "plaDis2.uBoi[2]"}, range={0.0, 900.0, -0.2, 1.2000000000000002}, grid=true, subPlot=2, colors={{28,108,200}, {28,108,200}}); -createPlot(id=3, position={0, 0, 833, 231}, y={"plaDis2.yBoi[1]", "plaDis2.yBoi[2]"}, range={0.0, 900.0, -0.2, 1.2000000000000002}, grid=true, subPlot=3, colors={{28,108,200}, {28,108,200}}); -createPlot(id=3, position={0, 0, 833, 231}, y={"truFalHol2.y"}, range={0.0, 900.0, -0.2, 1.2000000000000002}, grid=true, subPlot=4, colors={{28,108,200}}); +createPlot(id=3, position={0, 0, 833, 939}, y={"plaDis2.uPla"}, range={0.0, 900.0, -0.2, 1.2}, grid=true, colors={{28,108,200}}); +createPlot(id=3, position={0, 0, 833, 231}, y={"plaDis2.uBoi[1]", "plaDis2.uBoi[2]"}, range={0.0, 900.0, -0.2, 1.2}, grid=true, subPlot=2, colors={{28,108,200}, {28,108,200}}); +createPlot(id=3, position={0, 0, 833, 231}, y={"plaDis2.yBoi[1]", "plaDis2.yBoi[2]"}, range={0.0, 900.0, -0.2, 1.2}, grid=true, subPlot=3, colors={{28,108,200}, {28,108,200}}); +createPlot(id=3, position={0, 0, 833, 231}, y={"truFalHol2.y"}, range={0.0, 900.0, -0.2, 1.2}, grid=true, subPlot=4, colors={{28,108,200}}); diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Subsequences/Validation/EnableLead_dedicated.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Subsequences/Validation/EnableLead_dedicated.mos index 8ac553d629c..534b3cda566 100644 --- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Subsequences/Validation/EnableLead_dedicated.mos +++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Subsequences/Validation/EnableLead_dedicated.mos @@ -1,4 +1,4 @@ simulateModel("Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.Pumps.PrimaryPumps.Subsequences.Validation.EnableLead_dedicated", method="Cvode", stopTime=3600, tolerance=1e-06, resultFile="enaLeaPriPum_dedicated"); -createPlot(id=1, position={0, 0, 1545, 998}, y={"enaLeaPriPum.uPlaEna"}, range={0.0, 3600.0, -0.2, 1.2000000000000002}, grid=true, colors={{28,108,200}}); -createPlot(id=1, position={0, 0, 1545, 330}, y={"enaLeaPriPum.uLeaBoiSta"}, range={0.0, 3600.0, 0.8, 2.4000000000000004}, grid=true, subPlot=2, colors={{28,108,200}}); -createPlot(id=1, position={0, 0, 1545, 329}, y={"enaLeaPriPum.yLea"}, range={0.0, 3600.0, -0.2, 1.2000000000000002}, grid=true, subPlot=3, colors={{28,108,200}}); +createPlot(id=1, position={0, 0, 1545, 998}, y={"enaLeaPriPum.uPlaEna"}, range={0.0, 3600.0, -0.2, 1.2}, grid=true, colors={{28,108,200}}); +createPlot(id=1, position={0, 0, 1545, 330}, y={"enaLeaPriPum.uLeaBoiSta"}, range={0.0, 3600.0, 0.8, 2.4}, grid=true, subPlot=2, colors={{28,108,200}}); +createPlot(id=1, position={0, 0, 1545, 329}, y={"enaLeaPriPum.yLea"}, range={0.0, 3600.0, -0.2, 1.2}, grid=true, subPlot=3, colors={{28,108,200}}); diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Subsequences/Validation/EnableLead_headered.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Subsequences/Validation/EnableLead_headered.mos index 4b84f729f92..a376fdcacc4 100644 --- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Subsequences/Validation/EnableLead_headered.mos +++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Subsequences/Validation/EnableLead_headered.mos @@ -1,4 +1,4 @@ simulateModel("Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.Pumps.PrimaryPumps.Subsequences.Validation.EnableLead_headered", method="Cvode", stopTime=3600, tolerance=1e-06, resultFile="EnableLead_headered"); createPlot(id=1, position={0, 0, 1545, 998}, y={"enaLeaPriPum.uHotWatIsoVal[1]"}, range={0.0, 3600.0, -0.1, 1.1}, grid=true, colors={{28,108,200}}); -createPlot(id=1, position={0, 0, 1545, 330}, y={"enaLeaPriPum.uHotWatIsoVal[2]"}, range={0.0, 3600.0, -0.2, 1.2000000000000002}, grid=true, subPlot=2, colors={{28,108,200}}); -createPlot(id=1, position={0, 0, 1545, 329}, y={"enaLeaPriPum.yLea"}, range={0.0, 3600.0, -0.2, 1.2000000000000002}, grid=true, subPlot=3, colors={{28,108,200}}); +createPlot(id=1, position={0, 0, 1545, 330}, y={"enaLeaPriPum.uHotWatIsoVal[2]"}, range={0.0, 3600.0, -0.2, 1.2}, grid=true, subPlot=2, colors={{28,108,200}}); +createPlot(id=1, position={0, 0, 1545, 329}, y={"enaLeaPriPum.yLea"}, range={0.0, 3600.0, -0.2, 1.2}, grid=true, subPlot=3, colors={{28,108,200}}); diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Subsequences/Validation/Speed_flow.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Subsequences/Validation/Speed_flow.mos index 8d74ac77276..a15a095b2e8 100644 --- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Subsequences/Validation/Speed_flow.mos +++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Subsequences/Validation/Speed_flow.mos @@ -1,7 +1,7 @@ simulateModel("Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.Pumps.PrimaryPumps.Subsequences.Validation.Speed_flow", method="Cvode", stopTime=10, tolerance=1e-06, resultFile="Speed_flow"); -createPlot(id=1, position={0, 0, 1545, 998}, y={"hotPumSpe.uHotWatPum[1]", "hotPumSpe.uHotWatPum[2]"}, range={0.0, 10.0, -0.2, 1.2000000000000002}, grid=true, colors={{28,108,200}, {28,108,200}}); +createPlot(id=1, position={0, 0, 1545, 998}, y={"hotPumSpe.uHotWatPum[1]", "hotPumSpe.uHotWatPum[2]"}, range={0.0, 10.0, -0.2, 1.2}, grid=true, colors={{28,108,200}, {28,108,200}}); createPlot(id=1, position={0, 0, 1545, 330}, y={"hotPumSpe.VHotWatPri_flow", "hotPumSpe.VHotWatSec_flow"}, range={0.0, 10.0, 6.5, 10.5}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); -createPlot(id=1, position={0, 0, 1545, 329}, y={"hotPumSpe.yHotWatPumSpe"}, range={0.0, 10.0, -0.2, 1.2000000000000002}, grid=true, subPlot=3, colors={{28,108,200}}); -createPlot(id=2, position={0, 0, 1545, 998}, y={"hotPumSpe1.uHotWatPum[1]", "hotPumSpe1.uHotWatPum[2]"}, range={0.0, 10.0, -0.2, 1.2000000000000002}, grid=true, colors={{28,108,200}, {28,108,200}}); -createPlot(id=2, position={0, 0, 1545, 330}, y={"hotPumSpe1.VHotWatDec_flow"}, range={0.0, 10.0, -0.6000000000000001, 0.8}, grid=true, subPlot=2, colors={{28,108,200}}); -createPlot(id=2, position={0, 0, 1545, 329}, y={"hotPumSpe1.yHotWatPumSpe"}, range={0.0, 10.0, -0.2, 1.2000000000000002}, grid=true, subPlot=3, colors={{28,108,200}}); +createPlot(id=1, position={0, 0, 1545, 329}, y={"hotPumSpe.yHotWatPumSpe"}, range={0.0, 10.0, -0.2, 1.2}, grid=true, subPlot=3, colors={{28,108,200}}); +createPlot(id=2, position={0, 0, 1545, 998}, y={"hotPumSpe1.uHotWatPum[1]", "hotPumSpe1.uHotWatPum[2]"}, range={0.0, 10.0, -0.2, 1.2}, grid=true, colors={{28,108,200}, {28,108,200}}); +createPlot(id=2, position={0, 0, 1545, 330}, y={"hotPumSpe1.VHotWatDec_flow"}, range={0.0, 10.0, -0.6, 0.8}, grid=true, subPlot=2, colors={{28,108,200}}); +createPlot(id=2, position={0, 0, 1545, 329}, y={"hotPumSpe1.yHotWatPumSpe"}, range={0.0, 10.0, -0.2, 1.2}, grid=true, subPlot=3, colors={{28,108,200}}); diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Subsequences/Validation/Speed_temperature.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Subsequences/Validation/Speed_temperature.mos index aec9e5d036d..826f8569b1f 100644 --- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Subsequences/Validation/Speed_temperature.mos +++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Subsequences/Validation/Speed_temperature.mos @@ -1,8 +1,8 @@ simulateModel("Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.Pumps.PrimaryPumps.Subsequences.Validation.Speed_temperature", method="Cvode", stopTime=3600, tolerance=1e-06, resultFile="Speed_temperature"); -createPlot(id=1, position={0, 0, 1545, 998}, y={"hotPumSpe.uHotWatPum[1]", "hotPumSpe.uHotWatPum[2]"}, range={0.0, 3600.0, -0.2, 1.2000000000000002}, grid=true, colors={{28,108,200}, {28,108,200}}); +createPlot(id=1, position={0, 0, 1545, 998}, y={"hotPumSpe.uHotWatPum[1]", "hotPumSpe.uHotWatPum[2]"}, range={0.0, 3600.0, -0.2, 1.2}, grid=true, colors={{28,108,200}, {28,108,200}}); createPlot(id=1, position={0, 0, 1545, 246}, y={"hotPumSpe.THotWatPri", "hotPumSpe.THotWatSec"}, range={0.0, 3600.0, -2.0, 12.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); createPlot(id=1, position={0, 0, 1545, 246}, y={"hotPumSpe.intSwi1.y"}, range={0.0, 3600.0, -0.5, 2.5}, grid=true, subPlot=3, colors={{28,108,200}}); -createPlot(id=1, position={0, 0, 1545, 246}, y={"hotPumSpe.yHotWatPumSpe"}, range={0.0, 3600.0, -0.2, 1.2000000000000002}, grid=true, subPlot=4, colors={{28,108,200}}); +createPlot(id=1, position={0, 0, 1545, 246}, y={"hotPumSpe.yHotWatPumSpe"}, range={0.0, 3600.0, -0.2, 1.2}, grid=true, subPlot=4, colors={{28,108,200}}); createPlot(id=2, position={0, 0, 1545, 998}, y={"hotPumSpe1.uHotWatPum[1]", "hotPumSpe1.uHotWatPum[2]"}, range={0.0, 3600.0, -0.5, 1.5}, grid=true, colors={{28,108,200}, {28,108,200}}); createPlot(id=2, position={0, 0, 1545, 162}, y={"hotPumSpe1.THotWatBoiSup[1]", "hotPumSpe1.THotWatBoiSup[2]"}, range={0.0, 3600.0, 4.0, 12.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); createPlot(id=2, position={0, 0, 1545, 162}, y={"hotPumSpe1.uBoiSta[1]", "hotPumSpe1.uBoiSta[2]"}, range={0.0, 3600.0, -0.5, 1.5}, grid=true, subPlot=3, colors={{28,108,200}, {28,108,200}}); diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Validation/Controller.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Validation/Controller.mos index ee13f7a0d1e..2df4b5206ea 100644 --- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Validation/Controller.mos +++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/PrimaryPumps/Validation/Controller.mos @@ -2,7 +2,7 @@ simulateModel("Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.Pumps.Pri createPlot(id=1, position={0, 967, 756, 959}, y={"priPumCon.uPumLeaLag[1]", "priPumCon.uPumLeaLag[2]"}, range={0.0, 3600.0, 0.5, 2.5}, grid=true, colors={{28,108,200}, {28,108,200}}); createPlot(id=1, position={0, 967, 756, 155}, y={"priPumCon.uHotIsoVal[2]"}, range={0.0, 3600.0, -0.5, 1.5}, grid=true, subPlot=2, colors={{28,108,200}}); createPlot(id=1, position={0, 967, 756, 156}, y={"priPumCon.yHotWatPum[2]"}, range={0.0, 3600.0, -0.5, 1.5}, grid=true, subPlot=3, colors={{28,108,200}}); -createPlot(id=1, position={0, 967, 756, 156}, y={"priPumCon.VHotWat_flow", "priPumCon.VHotWat_flow_nominal"}, range={0.0, 3600.0, 0.0, 0.6000000000000001}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}}); +createPlot(id=1, position={0, 967, 756, 156}, y={"priPumCon.VHotWat_flow", "priPumCon.VHotWat_flow_nominal"}, range={0.0, 3600.0, 0.0, 0.6}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}}); createPlot(id=1, position={0, 967, 756, 155}, y={"priPumCon.enaLagHotPum.tim.y", "priPumCon.enaLagHotPum.tim1.y", "priPumCon.enaLagHotPum.timPer"}, range={0.0, 3600.0, -500.0, 1000.0}, grid=true, subPlot=5, colors={{28,108,200}, {238,46,47}, {0,140,72}}); createPlot(id=1, position={0, 967, 756, 156}, y={"priPumCon.yHotWatPum[1]"}, range={0.0, 3600.0, -0.5, 1.5}, grid=true, subPlot=6, colors={{28,108,200}}); createPlot(id=2, position={320, 967, 756, 959}, y={"priPumCon.dpHotWatSet", "priPumCon.dpHotWat_remote[1]"}, range={0.0, 3600.0, 0.4, 1.6}, grid=true, colors={{28,108,200}, {238,46,47}}); @@ -10,10 +10,10 @@ createPlot(id=2, position={320, 967, 756, 477}, y={"priPumCon.yPumSpe"}, range={ createPlot(id=3, position={480, 967, 757, 959}, y={"priPumCon1.uPumLeaLag[1]", "priPumCon1.uPumLeaLag[2]"}, range={0.0, 3600.0, 0.5, 2.5}, grid=true, colors={{28,108,200}, {28,108,200}}); createPlot(id=3, position={480, 967, 757, 155}, y={"priPumCon1.uHotIsoVal[1]"}, range={0.0, 3600.0, -0.5, 1.5}, grid=true, subPlot=2, colors={{28,108,200}}); createPlot(id=3, position={480, 967, 757, 156}, y={"priPumCon1.yHotWatPum[2]"}, range={0.0, 3600.0, -0.5, 1.5}, grid=true, subPlot=3, colors={{28,108,200}}); -createPlot(id=3, position={480, 967, 757, 156}, y={"priPumCon1.VHotWat_flow", "priPumCon1.VHotWat_flow_nominal"}, range={0.0, 3600.0, 0.0, 0.6000000000000001}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}}); +createPlot(id=3, position={480, 967, 757, 156}, y={"priPumCon1.VHotWat_flow", "priPumCon1.VHotWat_flow_nominal"}, range={0.0, 3600.0, 0.0, 0.6}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}}); createPlot(id=3, position={480, 967, 757, 155}, y={"priPumCon1.enaLagHotPum.tim.y", "priPumCon1.enaLagHotPum.tim1.y", "priPumCon1.enaLagHotPum.timPer"}, range={0.0, 3600.0, -500.0, 1000.0}, grid=true, subPlot=5, colors={{28,108,200}, {238,46,47}, {0,140,72}}); createPlot(id=3, position={480, 967, 757, 156}, y={"priPumCon1.yHotWatPum[1]"}, range={0.0, 3600.0, -0.5, 1.5}, grid=true, subPlot=6, colors={{28,108,200}}); -createPlot(id=4, position={640, 967, 757, 959}, y={"priPumCon1.dpHotWat_remote[1]", "priPumCon1.dpHotWatSet"}, range={0.0, 3600.0, 0.4, 1.8000000000000003}, grid=true, colors={{28,108,200}, {238,46,47}}); +createPlot(id=4, position={640, 967, 757, 959}, y={"priPumCon1.dpHotWat_remote[1]", "priPumCon1.dpHotWatSet"}, range={0.0, 3600.0, 0.4, 1.8}, grid=true, colors={{28,108,200}, {238,46,47}}); createPlot(id=4, position={640, 967, 757, 317}, y={"priPumCon1.dpHotWat_local", "priPumCon1.pumSpeLocDp.locDpSet.y"}, range={0.0, 3600.0, 2.0, 14.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); createPlot(id=4, position={640, 967, 757, 316}, y={"priPumCon1.yPumSpe"}, range={0.0, 3600.0, 0.2, 1.1}, grid=true, subPlot=3, colors={{28,108,200}}); createPlot(id=5, position={800, 967, 756, 959}, y={"priPumCon2.uPumLeaLag[1]", "priPumCon2.uPumLeaLag[2]"}, range={0.0, 3600.0, 0.0, 3.0}, grid=true, colors={{28,108,200}, {28,108,200}}); @@ -41,7 +41,7 @@ createPlot(id=9, position={0, 936, 756, 133}, y={"priPumCon4.uStaUp"}, range={0. createPlot(id=9, position={0, 936, 756, 133}, y={"priPumCon4.uBoiSta[1]", "priPumCon4.uBoiSta[2]"}, range={0.0, 3600.0, -1.0, 2.0}, grid=true, subPlot=5, colors={{28,108,200}, {28,108,200}}); createPlot(id=9, position={0, 936, 756, 132}, y={"truFalHol2.y"}, range={0.0, 3600.0, -1.0, 2.0}, grid=true, subPlot=6, colors={{28,108,200}}); createPlot(id=9, position={0, 936, 756, 133}, y={"priPumCon4.yHotWatPum[1]"}, range={0.0, 3600.0, -1.0, 2.0}, grid=true, subPlot=7, colors={{28,108,200}}); -createPlot(id=10, position={160, 936, 756, 959}, y={"priPumCon4.THotWatPri", "priPumCon4.THotWatSec"}, range={0.0, 3600.0, -0.6000000000000001, 2.6}, grid=true, colors={{28,108,200}, {238,46,47}}); +createPlot(id=10, position={160, 936, 756, 959}, y={"priPumCon4.THotWatPri", "priPumCon4.THotWatSec"}, range={0.0, 3600.0, -0.6, 2.6}, grid=true, colors={{28,108,200}, {238,46,47}}); createPlot(id=10, position={160, 936, 756, 477}, y={"priPumCon4.yPumSpe"}, range={0.0, 3600.0, 0.2, 1.1}, grid=true, subPlot=2, colors={{28,108,200}}); createPlot(id=11, position={320, 936, 756, 959}, y={"priPumCon5.uPumLeaLag[1]", "priPumCon5.uPumLeaLag[2]"}, range={0.0, 3600.0, 0.0, 3.0}, grid=true, colors={{28,108,200}, {28,108,200}}); createPlot(id=11, position={320, 936, 756, 132}, y={"priPumCon5.uHotIsoVal[1]"}, range={0.0, 3600.0, -1.0, 2.0}, grid=true, subPlot=2, colors={{28,108,200}}); @@ -50,7 +50,7 @@ createPlot(id=11, position={320, 936, 756, 133}, y={"priPumCon5.uStaUp"}, range= createPlot(id=11, position={320, 936, 756, 133}, y={"priPumCon5.uBoiSta[1]", "priPumCon5.uBoiSta[2]"}, range={0.0, 3600.0, -1.0, 2.0}, grid=true, subPlot=5, colors={{28,108,200}, {28,108,200}}); createPlot(id=11, position={320, 936, 756, 132}, y={"truFalHol3.y"}, range={0.0, 3600.0, -1.0, 2.0}, grid=true, subPlot=6, colors={{28,108,200}}); createPlot(id=11, position={320, 936, 756, 133}, y={"priPumCon5.yHotWatPum[1]"}, range={0.0, 3600.0, -1.0, 2.0}, grid=true, subPlot=7, colors={{28,108,200}}); -createPlot(id=12, position={480, 936, 757, 959}, y={"priPumCon5.THotWatBoiSup[1]", "priPumCon5.THotWatSec"}, range={0.0, 3600.0, -0.6000000000000001, 2.6}, grid=true, colors={{28,108,200}, {238,46,47}}); +createPlot(id=12, position={480, 936, 757, 959}, y={"priPumCon5.THotWatBoiSup[1]", "priPumCon5.THotWatSec"}, range={0.0, 3600.0, -0.6, 2.6}, grid=true, colors={{28,108,200}, {238,46,47}}); createPlot(id=12, position={480, 936, 757, 477}, y={"priPumCon5.yPumSpe"}, range={0.0, 3600.0, 0.2, 1.1}, grid=true, subPlot=2, colors={{28,108,200}}); createPlot(id=13, position={640, 936, 757, 959}, y={"priPumCon6.uPumLeaLag[1]", "priPumCon6.uPumLeaLag[2]"}, range={0.0, 3600.0, 0.0, 3.0}, grid=true, colors={{28,108,200}, {28,108,200}}); createPlot(id=13, position={640, 936, 757, 132}, y={"priPumCon6.uHotIsoVal[1]"}, range={0.0, 3600.0, -1.0, 2.0}, grid=true, subPlot=2, colors={{28,108,200}}); @@ -59,21 +59,21 @@ createPlot(id=13, position={640, 936, 757, 133}, y={"priPumCon6.uStaUp"}, range= createPlot(id=13, position={640, 936, 757, 133}, y={"priPumCon6.uBoiSta[1]", "priPumCon6.uBoiSta[2]"}, range={0.0, 3600.0, -1.0, 2.0}, grid=true, subPlot=5, colors={{28,108,200}, {28,108,200}}); createPlot(id=13, position={640, 936, 757, 132}, y={"truFalHol4.y"}, range={0.0, 3600.0, -1.0, 2.0}, grid=true, subPlot=6, colors={{28,108,200}}); createPlot(id=13, position={640, 936, 757, 133}, y={"priPumCon6.yHotWatPum[1]"}, range={0.0, 3600.0, -1.0, 2.0}, grid=true, subPlot=7, colors={{28,108,200}}); -createPlot(id=14, position={800, 936, 756, 959}, y={"priPumCon7.uPlaEna", "priPumCon7.uBoiSta[1]", "priPumCon7.uBoiSta[2]"}, range={0.0, 3600.0, -0.2, 1.2000000000000002}, grid=true, colors={{28,108,200}, {28,108,200}, {28,108,200}}); -createPlot(id=14, position={800, 936, 756, 236}, y={"priPumCon7.yHotWatPum[1]", "priPumCon7.yHotWatPum[2]", "truFalHol5.y"}, range={0.0, 3600.0, -0.2, 1.2000000000000002}, grid=true, subPlot=2, colors={{28,108,200}, {28,108,200}, {28,108,200}}); -createPlot(id=14, position={800, 936, 756, 236}, y={"priPumCon7.VHotWat_flow", "priPumCon7.VHotWatSec_flow"}, range={0.0, 3600.0, -0.4, 0.8000000000000002}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}}); -createPlot(id=14, position={800, 936, 756, 236}, y={"priPumCon7.yPumSpe"}, range={0.0, 3600.0, -0.2, 1.2000000000000002}, grid=true, subPlot=4, colors={{28,108,200}}); -createPlot(id=15, position={960, 936, 757, 959}, y={"priPumCon8.uPlaEna", "priPumCon8.uBoiSta[1]", "priPumCon8.uBoiSta[2]"}, range={0.0, 3600.0, -0.2, 1.2000000000000002}, grid=true, colors={{28,108,200}, {28,108,200}, {28,108,200}}); -createPlot(id=15, position={960, 936, 757, 236}, y={"priPumCon8.yHotWatPum[1]", "priPumCon8.yHotWatPum[2]", "truFalHol6.y"}, range={0.0, 3600.0, -0.2, 1.2000000000000002}, grid=true, subPlot=2, colors={{28,108,200}, {28,108,200}, {28,108,200}}); -createPlot(id=15, position={960, 936, 757, 236}, y={"priPumCon8.VHotWatDec_flow"}, range={0.0, 3600.0, -0.6000000000000001, 0.6000000000000001}, grid=true, subPlot=3, colors={{28,108,200}}); -createPlot(id=15, position={960, 936, 757, 236}, y={"priPumCon8.yPumSpe"}, range={0.0, 3600.0, -0.2, 1.2000000000000002}, grid=true, subPlot=4, colors={{28,108,200}}); -createPlot(id=16, position={1120, 936, 756, 959}, y={"priPumCon9.uPlaEna", "priPumCon9.uBoiSta[1]", "priPumCon9.uBoiSta[2]"}, range={0.0, 3600.0, -0.2, 1.2000000000000002}, grid=true, colors={{28,108,200}, {28,108,200}, {28,108,200}}); -createPlot(id=16, position={1120, 936, 756, 236}, y={"priPumCon9.yHotWatPum[1]", "priPumCon9.yHotWatPum[2]", "truFalHol7.y"}, range={0.0, 3600.0, -0.2, 1.2000000000000002}, grid=true, subPlot=2, colors={{28,108,200}, {28,108,200}, {28,108,200}}); +createPlot(id=14, position={800, 936, 756, 959}, y={"priPumCon7.uPlaEna", "priPumCon7.uBoiSta[1]", "priPumCon7.uBoiSta[2]"}, range={0.0, 3600.0, -0.2, 1.2}, grid=true, colors={{28,108,200}, {28,108,200}, {28,108,200}}); +createPlot(id=14, position={800, 936, 756, 236}, y={"priPumCon7.yHotWatPum[1]", "priPumCon7.yHotWatPum[2]", "truFalHol5.y"}, range={0.0, 3600.0, -0.2, 1.2}, grid=true, subPlot=2, colors={{28,108,200}, {28,108,200}, {28,108,200}}); +createPlot(id=14, position={800, 936, 756, 236}, y={"priPumCon7.VHotWat_flow", "priPumCon7.VHotWatSec_flow"}, range={0.0, 3600.0, -0.4, 0.8}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}}); +createPlot(id=14, position={800, 936, 756, 236}, y={"priPumCon7.yPumSpe"}, range={0.0, 3600.0, -0.2, 1.2}, grid=true, subPlot=4, colors={{28,108,200}}); +createPlot(id=15, position={960, 936, 757, 959}, y={"priPumCon8.uPlaEna", "priPumCon8.uBoiSta[1]", "priPumCon8.uBoiSta[2]"}, range={0.0, 3600.0, -0.2, 1.2}, grid=true, colors={{28,108,200}, {28,108,200}, {28,108,200}}); +createPlot(id=15, position={960, 936, 757, 236}, y={"priPumCon8.yHotWatPum[1]", "priPumCon8.yHotWatPum[2]", "truFalHol6.y"}, range={0.0, 3600.0, -0.2, 1.2}, grid=true, subPlot=2, colors={{28,108,200}, {28,108,200}, {28,108,200}}); +createPlot(id=15, position={960, 936, 757, 236}, y={"priPumCon8.VHotWatDec_flow"}, range={0.0, 3600.0, -0.6, 0.6}, grid=true, subPlot=3, colors={{28,108,200}}); +createPlot(id=15, position={960, 936, 757, 236}, y={"priPumCon8.yPumSpe"}, range={0.0, 3600.0, -0.2, 1.2}, grid=true, subPlot=4, colors={{28,108,200}}); +createPlot(id=16, position={1120, 936, 756, 959}, y={"priPumCon9.uPlaEna", "priPumCon9.uBoiSta[1]", "priPumCon9.uBoiSta[2]"}, range={0.0, 3600.0, -0.2, 1.2}, grid=true, colors={{28,108,200}, {28,108,200}, {28,108,200}}); +createPlot(id=16, position={1120, 936, 756, 236}, y={"priPumCon9.yHotWatPum[1]", "priPumCon9.yHotWatPum[2]", "truFalHol7.y"}, range={0.0, 3600.0, -0.2, 1.2}, grid=true, subPlot=2, colors={{28,108,200}, {28,108,200}, {28,108,200}}); createPlot(id=16, position={1120, 936, 756, 236}, y={"priPumCon9.THotWatPri", "priPumCon9.THotWatSec"}, range={0.0, 3600.0, -1.5, 2.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}}); -createPlot(id=16, position={1120, 936, 756, 236}, y={"priPumCon9.yPumSpe"}, range={0.0, 3600.0, -0.2, 1.2000000000000002}, grid=true, subPlot=4, colors={{28,108,200}}); -createPlot(id=17, position={773, 0, 756, 959}, y={"priPumCon10.uPlaEna", "priPumCon10.uBoiSta[1]", "priPumCon10.uBoiSta[2]"}, range={0.0, 3600.0, -0.2, 1.2000000000000002}, grid=true, colors={{28,108,200}, {28,108,200}, {28,108,200}}); -createPlot(id=17, position={773, 0, 756, 236}, y={"priPumCon10.yHotWatPum[1]", "priPumCon10.yHotWatPum[2]", "truFalHol8.y"}, range={0.0, 3600.0, -0.2, 1.2000000000000002}, grid=true, subPlot=2, colors={{28,108,200}, {28,108,200}, {28,108,200}}); +createPlot(id=16, position={1120, 936, 756, 236}, y={"priPumCon9.yPumSpe"}, range={0.0, 3600.0, -0.2, 1.2}, grid=true, subPlot=4, colors={{28,108,200}}); +createPlot(id=17, position={773, 0, 756, 959}, y={"priPumCon10.uPlaEna", "priPumCon10.uBoiSta[1]", "priPumCon10.uBoiSta[2]"}, range={0.0, 3600.0, -0.2, 1.2}, grid=true, colors={{28,108,200}, {28,108,200}, {28,108,200}}); +createPlot(id=17, position={773, 0, 756, 236}, y={"priPumCon10.yHotWatPum[1]", "priPumCon10.yHotWatPum[2]", "truFalHol8.y"}, range={0.0, 3600.0, -0.2, 1.2}, grid=true, subPlot=2, colors={{28,108,200}, {28,108,200}, {28,108,200}}); createPlot(id=17, position={773, 0, 756, 236}, y={"priPumCon10.THotWatBoiSup[1]", "priPumCon10.THotWatSec"}, range={0.0, 3600.0, -1.0, 3.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}}); -createPlot(id=17, position={773, 0, 756, 236}, y={"priPumCon10.yPumSpe"}, range={0.0, 3600.0, -0.2, 1.2000000000000002}, grid=true, subPlot=4, colors={{28,108,200}}); +createPlot(id=17, position={773, 0, 756, 236}, y={"priPumCon10.yPumSpe"}, range={0.0, 3600.0, -0.2, 1.2}, grid=true, subPlot=4, colors={{28,108,200}}); createPlot(id=18, position={0, 0, 757, 959}, y={"priPumCon11.uPlaEna", "priPumCon11.uBoiSta[1]", "priPumCon11.uBoiSta[2]"}, range={0.0, 3600.0, -0.1, 1.1}, grid=true, colors={{28,108,200}, {28,108,200}, {28,108,200}}); createPlot(id=18, position={0, 0, 757, 477}, y={"priPumCon11.yHotWatPum[1]", "priPumCon11.yHotWatPum[2]", "truFalHol9.y"}, range={0.0, 3600.0, -0.1, 1.1}, grid=true, subPlot=2, colors={{28,108,200}, {28,108,200}, {28,108,200}}); diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/SecondaryPumps/Subsequences/Validation/EnableLag_pumpSpeed.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/SecondaryPumps/Subsequences/Validation/EnableLag_pumpSpeed.mos index 989b1aacf6d..6c80a3ee0b7 100644 --- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/SecondaryPumps/Subsequences/Validation/EnableLag_pumpSpeed.mos +++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/SecondaryPumps/Subsequences/Validation/EnableLag_pumpSpeed.mos @@ -1,4 +1,4 @@ simulateModel("Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.Pumps.SecondaryPumps.Subsequences.Validation.EnableLag_pumpSpeed", method="Cvode", stopTime=3600, tolerance=1e-06, resultFile="EnableLag_pumpSpeed"); -createPlot(id=1, position={0, 0, 1372, 998}, y={"enaLagSecPum.speLim", "enaLagSecPum.speLim1", "enaLagSecPum.speLim2", "enaLagSecPum.uPumSpe"}, range={0.0, 3600.0, -0.2, 1.2000000000000002}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}); +createPlot(id=1, position={0, 0, 1372, 998}, y={"enaLagSecPum.speLim", "enaLagSecPum.speLim1", "enaLagSecPum.speLim2", "enaLagSecPum.uPumSpe"}, range={0.0, 3600.0, -0.2, 1.2}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}); createPlot(id=1, position={0, 0, 1372, 330}, y={"enaLagSecPum.timPer", "enaLagSecPum.timPer1", "enaLagSecPum.timPer2", "enaLagSecPum.tim.y", "enaLagSecPum.tim1.y", "enaLagSecPum.tim2.y"}, range={0.0, 3600.0, -100.0, 700.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}, {162,29,33}}); -createPlot(id=1, position={0, 0, 1372, 329}, y={"yUp.y", "yDow.y"}, range={0.0, 3600.0, -0.2, 1.2000000000000002}, grid=true, subPlot=3, colors={{28,108,200}, {28,108,200}}); +createPlot(id=1, position={0, 0, 1372, 329}, y={"yUp.y", "yDow.y"}, range={0.0, 3600.0, -0.2, 1.2}, grid=true, subPlot=3, colors={{28,108,200}, {28,108,200}}); diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/SecondaryPumps/Subsequences/Validation/EnableLead.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/SecondaryPumps/Subsequences/Validation/EnableLead.mos index beedf1b4c69..2998d817bb1 100644 --- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/SecondaryPumps/Subsequences/Validation/EnableLead.mos +++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/SecondaryPumps/Subsequences/Validation/EnableLead.mos @@ -1,4 +1,4 @@ simulateModel("Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.Pumps.SecondaryPumps.Subsequences.Validation.EnableLead", method="Cvode", stopTime=30, tolerance=1e-06, resultFile="EnableLead"); createPlot(id=1, position={0, 0, 1545, 998}, y={"enaLeaSecPum.uPlaEna"}, range={0.0, 30.0, -0.2, 1.2}, grid=true, colors={{28,108,200}}); -createPlot(id=1, position={0, 0, 1545, 330}, y={"enaLeaSecPum.supResReq"}, range={0.0, 30.0, -0.2, 1.2000000000000002}, grid=true, subPlot=2, colors={{28,108,200}}); -createPlot(id=1, position={0, 0, 1545, 329}, y={"enaLeaSecPum.yLea"}, range={0.0, 30.0, -0.2, 1.2000000000000002}, grid=true, subPlot=3, colors={{28,108,200}}); +createPlot(id=1, position={0, 0, 1545, 330}, y={"enaLeaSecPum.supResReq"}, range={0.0, 30.0, -0.2, 1.2}, grid=true, subPlot=2, colors={{28,108,200}}); +createPlot(id=1, position={0, 0, 1545, 329}, y={"enaLeaSecPum.yLea"}, range={0.0, 30.0, -0.2, 1.2}, grid=true, subPlot=3, colors={{28,108,200}}); diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/SecondaryPumps/Validation/Controller.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/SecondaryPumps/Validation/Controller.mos index 17a458cb8c3..9d3c5f69838 100644 --- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/SecondaryPumps/Validation/Controller.mos +++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Pumps/SecondaryPumps/Validation/Controller.mos @@ -2,22 +2,22 @@ simulateModel("Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.Pumps.Sec createPlot(id=1, position={0, 0, 1372, 998}, y={"secPumCon.uPumLeaLag[1]", "secPumCon.uPumLeaLag[2]"}, range={0.0, 3600.0, 0.5, 2.5}, grid=true, colors={{28,108,200}, {28,108,200}}); createPlot(id=1, position={0, 0, 1372, 162}, y={"secPumCon.uPlaEna", "secPumCon.supResReq"}, range={0.0, 3600.0, 0.0, 4.0}, grid=true, subPlot=2, colors={{28,108,200}, {28,108,200}}); createPlot(id=1, position={0, 0, 1372, 162}, y={"secPumCon.yHotWatPum[2]"}, range={0.0, 3600.0, 0.0, 2.0}, grid=true, subPlot=3, colors={{28,108,200}}); -createPlot(id=1, position={0, 0, 1372, 163}, y={"secPumCon.VHotWat_flow", "secPumCon.VHotWat_flow_nominal"}, range={0.0, 3600.0, 0.0, 0.6000000000000001}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}}); +createPlot(id=1, position={0, 0, 1372, 163}, y={"secPumCon.VHotWat_flow", "secPumCon.VHotWat_flow_nominal"}, range={0.0, 3600.0, 0.0, 0.6}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}}); createPlot(id=1, position={0, 0, 1372, 162}, y={"secPumCon.enaLagHotPum.tim.y", "secPumCon.enaLagHotPum.tim1.y", "secPumCon.enaLagHotPum.timPer"}, range={0.0, 3600.0, -500.0, 1000.0}, grid=true, subPlot=5, colors={{28,108,200}, {238,46,47}, {0,140,72}}); createPlot(id=1, position={0, 0, 1372, 162}, y={"secPumCon.yHotWatPum[1]"}, range={0.0, 3600.0, -0.5, 1.5}, grid=true, subPlot=6, colors={{28,108,200}}); createPlot(id=2, position={0, 0, 1372, 998}, y={"secPumCon.dpHotWat_remote[1]", "secPumCon.dpHotWatSet"}, range={0.0, 3600.0, 0.4, 1.6}, grid=true, colors={{28,108,200}, {238,46,47}}); -createPlot(id=2, position={0, 0, 1372, 330}, y={"secPumCon.uMaxSecPumSpeCon"}, range={0.0, 3600.0, 0.30000000000000004, 1.0}, grid=true, subPlot=2, colors={{28,108,200}}); -createPlot(id=2, position={0, 0, 1372, 329}, y={"secPumCon.yPumSpe"}, range={0.0, 3600.0, -0.2, 1.0000000000000002}, grid=true, subPlot=3, colors={{28,108,200}}); +createPlot(id=2, position={0, 0, 1372, 330}, y={"secPumCon.uMaxSecPumSpeCon"}, range={0.0, 3600.0, 0.3, 1.0}, grid=true, subPlot=2, colors={{28,108,200}}); +createPlot(id=2, position={0, 0, 1372, 329}, y={"secPumCon.yPumSpe"}, range={0.0, 3600.0, -0.2, 1.0}, grid=true, subPlot=3, colors={{28,108,200}}); createPlot(id=3, position={0, 0, 1372, 998}, y={"secPumCon1.uPumLeaLag[1]", "secPumCon1.uPumLeaLag[2]"}, range={0.0, 3600.0, 0.5, 2.5}, grid=true, colors={{28,108,200}, {28,108,200}}); createPlot(id=3, position={0, 0, 1372, 162}, y={"secPumCon1.uPlaEna", "secPumCon1.supResReq"}, range={0.0, 3600.0, -1.0, 3.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); createPlot(id=3, position={0, 0, 1372, 162}, y={"secPumCon1.yHotWatPum[2]"}, range={0.0, 3600.0, -0.5, 1.5}, grid=true, subPlot=3, colors={{28,108,200}}); -createPlot(id=3, position={0, 0, 1372, 163}, y={"secPumCon1.VHotWat_flow", "secPumCon1.VHotWat_flow_nominal"}, range={0.0, 3600.0, 0.0, 0.6000000000000001}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}}); +createPlot(id=3, position={0, 0, 1372, 163}, y={"secPumCon1.VHotWat_flow", "secPumCon1.VHotWat_flow_nominal"}, range={0.0, 3600.0, 0.0, 0.6}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}}); createPlot(id=3, position={0, 0, 1372, 162}, y={"secPumCon1.enaLagHotPum.tim.y", "secPumCon1.enaLagHotPum.tim1.y", "secPumCon1.enaLagHotPum.timPer"}, range={0.0, 3600.0, -500.0, 1000.0}, grid=true, subPlot=5, colors={{28,108,200}, {238,46,47}, {0,140,72}}); createPlot(id=3, position={0, 0, 1372, 162}, y={"secPumCon1.yHotWatPum[1]"}, range={0.0, 3600.0, -0.5, 1.5}, grid=true, subPlot=6, colors={{28,108,200}}); -createPlot(id=4, position={0, 0, 1372, 998}, y={"secPumCon1.dpHotWat_remote[1]", "secPumCon1.dpHotWatSet"}, range={0.0, 3600.0, 0.4, 1.8000000000000003}, grid=true, colors={{28,108,200}, {238,46,47}}); +createPlot(id=4, position={0, 0, 1372, 998}, y={"secPumCon1.dpHotWat_remote[1]", "secPumCon1.dpHotWatSet"}, range={0.0, 3600.0, 0.4, 1.8}, grid=true, colors={{28,108,200}, {238,46,47}}); createPlot(id=4, position={0, 0, 1372, 246}, y={"secPumCon1.pumSpeLocDp.locDpSet.y", "secPumCon1.dpHotWat_local"}, range={0.0, 3600.0, 2.0, 14.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); -createPlot(id=4, position={0, 0, 1372, 245}, y={"secPumCon1.uMaxSecPumSpeCon"}, range={0.0, 3600.0, 0.30000000000000004, 1.0}, grid=true, subPlot=3, colors={{28,108,200}}); -createPlot(id=4, position={0, 0, 1372, 246}, y={"secPumCon1.yPumSpe"}, range={0.0, 3600.0, -0.2, 1.0000000000000002}, grid=true, subPlot=4, colors={{28,108,200}}); +createPlot(id=4, position={0, 0, 1372, 245}, y={"secPumCon1.uMaxSecPumSpeCon"}, range={0.0, 3600.0, 0.3, 1.0}, grid=true, subPlot=3, colors={{28,108,200}}); +createPlot(id=4, position={0, 0, 1372, 246}, y={"secPumCon1.yPumSpe"}, range={0.0, 3600.0, -0.2, 1.0}, grid=true, subPlot=4, colors={{28,108,200}}); createPlot(id=5, position={0, 0, 1372, 998}, y={"secPumCon2.uPumLeaLag[1]", "secPumCon2.uPumLeaLag[2]"}, range={0.0, 3600.0, 0.5, 2.5}, grid=true, colors={{28,108,200}, {28,108,200}}); createPlot(id=5, position={0, 0, 1372, 162}, y={"secPumCon2.uPlaEna", "secPumCon2.supResReq"}, range={0.0, 3600.0, -1.0, 3.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); createPlot(id=5, position={0, 0, 1372, 162}, y={"secPumCon2.yHotWatPum[2]"}, range={0.0, 3600.0, -0.5, 1.5}, grid=true, subPlot=3, colors={{28,108,200}}); @@ -25,18 +25,18 @@ createPlot(id=5, position={0, 0, 1372, 163}, y={"secPumCon2.yPumSpe", "secPumCon createPlot(id=5, position={0, 0, 1372, 162}, y={"secPumCon2.timPer1", "secPumCon2.timPer3", "secPumCon2.enaLagSecPum.tim.y", "secPumCon2.enaLagSecPum.tim2.y"}, range={0.0, 3600.0, -500.0, 1000.0}, grid=true, subPlot=5, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}); createPlot(id=5, position={0, 0, 1372, 162}, y={"secPumCon2.yHotWatPum[1]"}, range={0.0, 3600.0, -0.5, 1.5}, grid=true, subPlot=6, colors={{28,108,200}}); createPlot(id=6, position={0, 0, 1372, 998}, y={"secPumCon2.dpHotWat_remote[1]", "secPumCon2.dpHotWatSet"}, range={0.0, 3600.0, 0.4, 1.6}, grid=true, colors={{28,108,200}, {238,46,47}}); -createPlot(id=6, position={0, 0, 1372, 330}, y={"secPumCon2.uMaxSecPumSpeCon"}, range={0.0, 3600.0, 0.30000000000000004, 1.0}, grid=true, subPlot=2, colors={{28,108,200}}); -createPlot(id=6, position={0, 0, 1372, 329}, y={"secPumCon2.yPumSpe"}, range={0.0, 3600.0, -0.2, 1.0000000000000002}, grid=true, subPlot=3, colors={{28,108,200}}); +createPlot(id=6, position={0, 0, 1372, 330}, y={"secPumCon2.uMaxSecPumSpeCon"}, range={0.0, 3600.0, 0.3, 1.0}, grid=true, subPlot=2, colors={{28,108,200}}); +createPlot(id=6, position={0, 0, 1372, 329}, y={"secPumCon2.yPumSpe"}, range={0.0, 3600.0, -0.2, 1.0}, grid=true, subPlot=3, colors={{28,108,200}}); createPlot(id=7, position={0, 0, 1372, 998}, y={"secPumCon3.uPumLeaLag[1]", "secPumCon3.uPumLeaLag[2]"}, range={0.0, 3600.0, 0.5, 2.5}, grid=true, colors={{28,108,200}, {238,46,47}}); createPlot(id=7, position={0, 0, 1372, 162}, y={"secPumCon3.uPlaEna", "secPumCon3.supResReq"}, range={0.0, 3600.0, -1.0, 3.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); createPlot(id=7, position={0, 0, 1372, 162}, y={"secPumCon3.yHotWatPum[2]"}, range={0.0, 3600.0, -0.5, 1.5}, grid=true, subPlot=3, colors={{28,108,200}}); createPlot(id=7, position={0, 0, 1372, 163}, y={"secPumCon3.yPumSpe", "secPumCon3.speLim", "secPumCon3.speLim1", "secPumCon3.speLim2"}, range={0.0, 3600.0, -0.5, 1.5}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}); createPlot(id=7, position={0, 0, 1372, 162}, y={"secPumCon3.timPer1", "secPumCon3.timPer3", "secPumCon3.enaLagSecPum.tim.y", "secPumCon3.enaLagSecPum.tim2.y"}, range={0.0, 3600.0, -500.0, 1000.0}, grid=true, subPlot=5, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}); createPlot(id=7, position={0, 0, 1372, 162}, y={"secPumCon3.yHotWatPum[1]"}, range={0.0, 3600.0, -0.5, 1.5}, grid=true, subPlot=6, colors={{28,108,200}}); -createPlot(id=8, position={0, 0, 1372, 998}, y={"secPumCon3.dpHotWat_remote[1]", "secPumCon3.dpHotWatSet"}, range={0.0, 3600.0, 0.4, 1.8000000000000003}, grid=true, colors={{28,108,200}, {238,46,47}}); +createPlot(id=8, position={0, 0, 1372, 998}, y={"secPumCon3.dpHotWat_remote[1]", "secPumCon3.dpHotWatSet"}, range={0.0, 3600.0, 0.4, 1.8}, grid=true, colors={{28,108,200}, {238,46,47}}); createPlot(id=8, position={0, 0, 1372, 246}, y={"secPumCon3.pumSpeLocDp.locDpSet.y", "secPumCon3.pumSpeLocDp.dpHotWat_local"}, range={0.0, 3600.0, 2.0, 14.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); -createPlot(id=8, position={0, 0, 1372, 245}, y={"secPumCon3.uMaxSecPumSpeCon"}, range={0.0, 3600.0, 0.30000000000000004, 1.0}, grid=true, subPlot=3, colors={{28,108,200}}); -createPlot(id=8, position={0, 0, 1372, 246}, y={"secPumCon3.yPumSpe"}, range={0.0, 3600.0, -0.2, 1.0000000000000002}, grid=true, subPlot=4, colors={{28,108,200}}); +createPlot(id=8, position={0, 0, 1372, 245}, y={"secPumCon3.uMaxSecPumSpeCon"}, range={0.0, 3600.0, 0.3, 1.0}, grid=true, subPlot=3, colors={{28,108,200}}); +createPlot(id=8, position={0, 0, 1372, 246}, y={"secPumCon3.yPumSpe"}, range={0.0, 3600.0, -0.2, 1.0}, grid=true, subPlot=4, colors={{28,108,200}}); createPlot(id=9, position={0, 0, 1372, 998}, y={"secPumCon4.uPumLeaLag[1]", "secPumCon4.uPumLeaLag[2]"}, range={0.0, 3600.0, 0.5, 2.5}, grid=true, colors={{28,108,200}, {238,46,47}}); createPlot(id=9, position={0, 0, 1372, 195}, y={"secPumCon4.uPlaEna", "secPumCon4.supResReq"}, range={0.0, 3600.0, -1.0, 3.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); createPlot(id=9, position={0, 0, 1372, 196}, y={"secPumCon4.yHotWatPum[2]"}, range={0.0, 3600.0, -0.5, 1.5}, grid=true, subPlot=3, colors={{28,108,200}}); diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/Validation/CondensationControl.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/Validation/CondensationControl.mos index 62bc2531c90..fb3953182e8 100644 --- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/Validation/CondensationControl.mos +++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/Validation/CondensationControl.mos @@ -1,15 +1,15 @@ simulateModel("Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.SetPoints.Validation.CondensationControl", startTime=0,tolerance=1e-6, stopTime=60, method="dassl", resultFile="CondensationControl"); createPlot(id=1, position={0, 0, 1545, 978}, y={"conSet.THotWatRet", "conSet.TRetSet", "conSet.TRetMinAll"}, range={0.0, 60.0, 54.0, 66.0}, autoscale=false, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}}); -createPlot(id=1, position={0, 0, 1545, 496}, y={"conSet.yMinBypValPos"}, range={0.0, 60.0, 0.0, 1.2000000000000002}, autoscale=false, grid=true, subPlot=2, colors={{28,108,200}}); +createPlot(id=1, position={0, 0, 1545, 496}, y={"conSet.yMinBypValPos"}, range={0.0, 60.0, 0.0, 1.2}, autoscale=false, grid=true, subPlot=2, colors={{28,108,200}}); createPlot(id=2, position={0, 0, 1545, 978}, y={"conSet1.THotWatRet", "conSet1.TRetSet", "conSet1.TRetMinAll"}, range={0.0, 60.0, 54.0, 66.0}, autoscale=false, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}}); createPlot(id=2, position={0, 0, 1545, 322}, y={"conSet1.yMinPriPumSpe"}, range={0.0, 60.0, 0.1, 1.1}, autoscale=false, grid=true, subPlot=2, colors={{28,108,200}}); -createPlot(id=2, position={0, 0, 1545, 323}, y={"conSet1.yMaxSecPumSpe"}, range={0.0, 60.0, 0.0, 1.2000000000000002}, autoscale=false, grid=true, subPlot=3, colors={{28,108,200}}); +createPlot(id=2, position={0, 0, 1545, 323}, y={"conSet1.yMaxSecPumSpe"}, range={0.0, 60.0, 0.0, 1.2}, autoscale=false, grid=true, subPlot=3, colors={{28,108,200}}); createPlot(id=3, position={0, 0, 1545, 978}, y={"conSet2.THotWatRet", "conSet1.TRetSet", "conSet1.TRetMinAll"}, range={0.0, 60.0, 54.0, 66.0}, autoscale=false, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}}); -createPlot(id=3, position={0, 0, 1545, 496}, y={"conSet2.yMaxSecPumSpe"}, range={0.0, 60.0, 0.0, 1.2000000000000002}, autoscale=false, grid=true, subPlot=2, colors={{28,108,200}}); +createPlot(id=3, position={0, 0, 1545, 496}, y={"conSet2.yMaxSecPumSpe"}, range={0.0, 60.0, 0.0, 1.2}, autoscale=false, grid=true, subPlot=2, colors={{28,108,200}}); createPlot(id=4, position={0, 0, 1545, 978}, y={"conSet3.THotWatRet", "conSet3.TRetSet", "conSet3.TRetMinAll"}, range={0.0, 60.0, 54.0, 66.0}, autoscale=false, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}}); createPlot(id=4, position={0, 0, 1545, 322}, y={"conSet3.yMinPriPumSpe"}, range={0.0, 60.0, 0.1, 1.1}, autoscale=false, grid=true, subPlot=2, colors={{28,108,200}}); -createPlot(id=4, position={0, 0, 1545, 323}, y={"conSet3.yMaxSecPumSpe"}, range={0.0, 60.0, 0.0, 1.2000000000000002}, autoscale=false, grid=true, subPlot=3, colors={{28,108,200}}); +createPlot(id=4, position={0, 0, 1545, 323}, y={"conSet3.yMaxSecPumSpe"}, range={0.0, 60.0, 0.0, 1.2}, autoscale=false, grid=true, subPlot=3, colors={{28,108,200}}); diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/Validation/HotWaterSupplyTemperatureReset.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/Validation/HotWaterSupplyTemperatureReset.mos index 81d54881da4..ccc30d92872 100644 --- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/Validation/HotWaterSupplyTemperatureReset.mos +++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/SetPoints/Validation/HotWaterSupplyTemperatureReset.mos @@ -1,29 +1,29 @@ simulateModel("Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.SetPoints.Validation.HotWaterSupplyTemperatureReset", startTime=0,tolerance=1e-6, stopTime=7200, method="dassl", resultFile="HotWaterSupplyTemperatureReset1"); createPlot(id=1, position={0, 0, 1495, 998}, y={"hotWatSupTemRes.uHotWatPumSta[1]", "hotWatSupTemRes.uHotWatPumSta[2]"}, range={0.0, 7200.0, -0.5, 1.5}, grid=true, colors={{28,108,200}, {28,108,200}}); -createPlot(id=1, position={0, 0, 1495, 162}, y={"hotWatSupTemRes.nHotWatSupResReq", "hotWatSupTemRes.nHotWatResReqIgn"}, range={0.0, 7200.0, 1.6, 2.4000000000000004}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); +createPlot(id=1, position={0, 0, 1495, 162}, y={"hotWatSupTemRes.nHotWatSupResReq", "hotWatSupTemRes.nHotWatResReqIgn"}, range={0.0, 7200.0, 1.6, 2.4}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); createPlot(id=1, position={0, 0, 1495, 162}, y={"hotWatSupTemRes.uStaCha"}, range={0.0, 7200.0, -2.0, 2.0}, grid=true, subPlot=3, colors={{28,108,200}}); -createPlot(id=1, position={0, 0, 1495, 163}, y={"hotWatSupTemRes.uTyp[1]", "hotWatSupTemRes.uCurStaSet"}, range={0.0, 7200.0, 0.8, 1.2000000000000002}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}}); +createPlot(id=1, position={0, 0, 1495, 163}, y={"hotWatSupTemRes.uTyp[1]", "hotWatSupTemRes.uCurStaSet"}, range={0.0, 7200.0, 0.8, 1.2}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}}); createPlot(id=1, position={0, 0, 1495, 162}, y={"hotWatSupTemRes.TPlaHotWatSupSet"}, range={0.0, 7200.0, 300.0, 360.0}, grid=true, subPlot=5, colors={{28,108,200}}); createPlot(id=1, position={0, 0, 1495, 162}, y={"hotWatSupTemRes.TBoiHotWatSupSet[1]", "hotWatSupTemRes.TBoiHotWatSupSet[2]"}, range={0.0, 7200.0, 300.0, 360.0}, grid=true, subPlot=6, colors={{28,108,200}, {238,46,47}}); createPlot(id=2, position={0, 0, 1495, 998}, y={"hotWatSupTemRes1.uHotWatPumSta[1]", "hotWatSupTemRes1.uHotWatPumSta[2]"}, range={0.0, 7200.0, -0.5, 1.5}, grid=true, colors={{28,108,200}, {28,108,200}}); -createPlot(id=2, position={0, 0, 1495, 162}, y={"hotWatSupTemRes1.nHotWatSupResReq", "hotWatSupTemRes1.nHotWatResReqIgn"}, range={0.0, 7200.0, 1.6, 2.4000000000000004}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); +createPlot(id=2, position={0, 0, 1495, 162}, y={"hotWatSupTemRes1.nHotWatSupResReq", "hotWatSupTemRes1.nHotWatResReqIgn"}, range={0.0, 7200.0, 1.6, 2.4}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); createPlot(id=2, position={0, 0, 1495, 162}, y={"hotWatSupTemRes1.uStaCha"}, range={0.0, 7200.0, -2.0, 2.0}, grid=true, subPlot=3, colors={{28,108,200}}); -createPlot(id=2, position={0, 0, 1495, 163}, y={"hotWatSupTemRes1.uTyp[1]", "hotWatSupTemRes1.uCurStaSet"}, range={0.0, 7200.0, 0.8, 1.2000000000000002}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}}); +createPlot(id=2, position={0, 0, 1495, 163}, y={"hotWatSupTemRes1.uTyp[1]", "hotWatSupTemRes1.uCurStaSet"}, range={0.0, 7200.0, 0.8, 1.2}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}}); createPlot(id=2, position={0, 0, 1495, 162}, y={"hotWatSupTemRes1.TPlaHotWatSupSet"}, range={0.0, 7200.0, 300.0, 360.0}, grid=true, subPlot=5, colors={{28,108,200}}); createPlot(id=2, position={0, 0, 1495, 162}, y={"hotWatSupTemRes1.TBoiHotWatSupSet[1]", "hotWatSupTemRes1.TBoiHotWatSupSet[2]"}, range={0.0, 7200.0, 300.0, 360.0}, grid=true, subPlot=6, colors={{28,108,200}, {238,46,47}}); createPlot(id=3, position={0, 0, 1495, 998}, y={"hotWatSupTemRes2.uHotWatPumSta[1]", "hotWatSupTemRes2.uHotWatPumSta[2]"}, range={0.0, 7200.0, -0.5, 1.5}, grid=true, colors={{28,108,200}, {28,108,200}}); -createPlot(id=3, position={0, 0, 1495, 162}, y={"hotWatSupTemRes2.nHotWatSupResReq", "hotWatSupTemRes2.nHotWatResReqIgn"}, range={0.0, 7200.0, 1.6, 2.4000000000000004}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); +createPlot(id=3, position={0, 0, 1495, 162}, y={"hotWatSupTemRes2.nHotWatSupResReq", "hotWatSupTemRes2.nHotWatResReqIgn"}, range={0.0, 7200.0, 1.6, 2.4}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); createPlot(id=3, position={0, 0, 1495, 162}, y={"hotWatSupTemRes2.uStaCha"}, range={0.0, 7200.0, -2.0, 2.0}, grid=true, subPlot=3, colors={{28,108,200}}); -createPlot(id=3, position={0, 0, 1495, 163}, y={"hotWatSupTemRes2.uTyp[1]", "hotWatSupTemRes2.uCurStaSet"}, range={0.0, 7200.0, 0.8, 1.2000000000000002}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}}); +createPlot(id=3, position={0, 0, 1495, 163}, y={"hotWatSupTemRes2.uTyp[1]", "hotWatSupTemRes2.uCurStaSet"}, range={0.0, 7200.0, 0.8, 1.2}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}}); createPlot(id=3, position={0, 0, 1495, 162}, y={"hotWatSupTemRes2.TPlaHotWatSupSet"}, range={0.0, 7200.0, 300.0, 360.0}, grid=true, subPlot=5, colors={{28,108,200}}); createPlot(id=3, position={0, 0, 1495, 162}, y={"hotWatSupTemRes2.TBoiHotWatSupSet[1]", "hotWatSupTemRes2.TBoiHotWatSupSet[2]"}, range={0.0, 7200.0, 300.0, 360.0}, grid=true, subPlot=6, colors={{28,108,200}, {238,46,47}}); createPlot(id=4, position={0, 0, 1495, 998}, y={"hotWatSupTemRes3.uHotWatPumSta[1]", "hotWatSupTemRes3.uHotWatPumSta[2]"}, range={0.0, 7200.0, -0.5, 1.5}, grid=true, colors={{28,108,200}, {28,108,200}}); -createPlot(id=4, position={0, 0, 1495, 162}, y={"hotWatSupTemRes3.nHotWatSupResReq", "hotWatSupTemRes3.nHotWatResReqIgn"}, range={0.0, 7200.0, 1.6, 2.4000000000000004}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); +createPlot(id=4, position={0, 0, 1495, 162}, y={"hotWatSupTemRes3.nHotWatSupResReq", "hotWatSupTemRes3.nHotWatResReqIgn"}, range={0.0, 7200.0, 1.6, 2.4}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); createPlot(id=4, position={0, 0, 1495, 162}, y={"hotWatSupTemRes3.uStaCha"}, range={0.0, 7200.0, -2.0, 2.0}, grid=true, subPlot=3, colors={{28,108,200}}); -createPlot(id=4, position={0, 0, 1495, 163}, y={"hotWatSupTemRes3.uTyp[1]", "hotWatSupTemRes3.uCurStaSet"}, range={0.0, 7200.0, 0.8, 1.2000000000000002}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}}); +createPlot(id=4, position={0, 0, 1495, 163}, y={"hotWatSupTemRes3.uTyp[1]", "hotWatSupTemRes3.uCurStaSet"}, range={0.0, 7200.0, 0.8, 1.2}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}}); createPlot(id=4, position={0, 0, 1495, 162}, y={"hotWatSupTemRes3.TPlaHotWatSupSet"}, range={0.0, 7200.0, 300.0, 360.0}, grid=true, subPlot=5, colors={{28,108,200}}); createPlot(id=4, position={0, 0, 1495, 162}, y={"hotWatSupTemRes3.TBoiHotWatSupSet[1]", "hotWatSupTemRes3.TBoiHotWatSupSet[2]"}, range={0.0, 7200.0, 300.0, 360.0}, grid=true, subPlot=6, colors={{28,108,200}, {238,46,47}}); diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Subsequences/Validation/ResetHotWaterSupplyTemperature.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Subsequences/Validation/ResetHotWaterSupplyTemperature.mos index cbaf03ccd5e..8969d855158 100644 --- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Subsequences/Validation/ResetHotWaterSupplyTemperature.mos +++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/Processes/Subsequences/Validation/ResetHotWaterSupplyTemperature.mos @@ -1,15 +1,15 @@ simulateModel("Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.Staging.Processes.Subsequences.Validation.ResetHotWaterSupplyTemperature", method="Dassl", stopTime=3200, tolerance=1e-06, resultFile="ResetHotWaterSupplyTemperature"); -createPlot(id=1, position={0, 0, 1495, 998}, y={"hotWatSupTemRes.uStaUp"}, range={0.0, 3200.0, -0.2, 1.2000000000000002}, grid=true, colors={{28,108,200}}); +createPlot(id=1, position={0, 0, 1495, 998}, y={"hotWatSupTemRes.uStaUp"}, range={0.0, 3200.0, -0.2, 1.2}, grid=true, colors={{28,108,200}}); createPlot(id=1, position={0, 0, 1495, 246}, y={"hotWatSupTemRes.THotWatSup", "hotWatSupTemRes.TMinSupNonConBoi"}, range={0.0, 3200.0, 331.0, 336.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); -createPlot(id=1, position={0, 0, 1495, 245}, y={"hotWatSupTemRes.uStaTyp[1]", "hotWatSupTemRes.uStaSet"}, range={0.0, 3200.0, 0.8500000000000001, 1.1500000000000001}, grid=true, subPlot=3, colors={{28,108,200}, {28,108,200}}); -createPlot(id=1, position={0, 0, 1495, 246}, y={"hotWatSupTemRes.yHotWatSupTemRes"}, range={0.0, 3200.0, -0.2, 1.2000000000000002}, grid=true, subPlot=4, colors={{28,108,200}}); +createPlot(id=1, position={0, 0, 1495, 245}, y={"hotWatSupTemRes.uStaTyp[1]", "hotWatSupTemRes.uStaSet"}, range={0.0, 3200.0, 0.85, 1.15}, grid=true, subPlot=3, colors={{28,108,200}, {28,108,200}}); +createPlot(id=1, position={0, 0, 1495, 246}, y={"hotWatSupTemRes.yHotWatSupTemRes"}, range={0.0, 3200.0, -0.2, 1.2}, grid=true, subPlot=4, colors={{28,108,200}}); -createPlot(id=2, position={0, 0, 1495, 998}, y={"hotWatSupTemRes1.uStaUp"}, range={0.0, 3200.0, -0.2, 1.2000000000000002}, grid=true, colors={{28,108,200}}); +createPlot(id=2, position={0, 0, 1495, 998}, y={"hotWatSupTemRes1.uStaUp"}, range={0.0, 3200.0, -0.2, 1.2}, grid=true, colors={{28,108,200}}); createPlot(id=2, position={0, 0, 1495, 246}, y={"hotWatSupTemRes1.THotWatSup", "hotWatSupTemRes1.TMinSupNonConBoi"}, range={0.0, 3200.0, 331.0, 336.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); createPlot(id=2, position={0, 0, 1495, 245}, y={"hotWatSupTemRes1.uStaTyp[1]", "hotWatSupTemRes1.uStaSet"}, range={0.0, 3200.0, 0.8, 2.2}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}}); -createPlot(id=2, position={0, 0, 1495, 246}, y={"hotWatSupTemRes1.yHotWatSupTemRes"}, range={0.0, 3200.0, -0.2, 1.2000000000000002}, grid=true, subPlot=4, colors={{28,108,200}}); +createPlot(id=2, position={0, 0, 1495, 246}, y={"hotWatSupTemRes1.yHotWatSupTemRes"}, range={0.0, 3200.0, -0.2, 1.2}, grid=true, subPlot=4, colors={{28,108,200}}); -createPlot(id=3, position={0, 0, 1495, 998}, y={"hotWatSupTemRes2.uStaUp"}, range={0.0, 3200.0, -0.2, 1.2000000000000002}, grid=true, colors={{28,108,200}}); +createPlot(id=3, position={0, 0, 1495, 998}, y={"hotWatSupTemRes2.uStaUp"}, range={0.0, 3200.0, -0.2, 1.2}, grid=true, colors={{28,108,200}}); createPlot(id=3, position={0, 0, 1495, 246}, y={"hotWatSupTemRes2.THotWatSup", "hotWatSupTemRes2.TMinSupNonConBoi"}, range={0.0, 3200.0, 331.0, 336.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); createPlot(id=3, position={0, 0, 1495, 245}, y={"hotWatSupTemRes2.uStaTyp[1]", "hotWatSupTemRes2.uStaTyp[2]", "hotWatSupTemRes2.uStaSet"}, range={0.0, 3200.0, -0.5, 2.5}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}, {0,140,72}}); -createPlot(id=3, position={0, 0, 1495, 246}, y={"hotWatSupTemRes2.yHotWatSupTemRes"}, range={0.0, 3200.0, -0.2, 1.2000000000000002}, grid=true, subPlot=4, colors={{28,108,200}}); +createPlot(id=3, position={0, 0, 1495, 246}, y={"hotWatSupTemRes2.yHotWatSupTemRes"}, range={0.0, 3200.0, -0.2, 1.2}, grid=true, subPlot=4, colors={{28,108,200}}); diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Validation/Configurator.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Validation/Configurator.mos index 14b405736f2..f7a007af74c 100644 --- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Validation/Configurator.mos +++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Validation/Configurator.mos @@ -3,7 +3,7 @@ removePlots(false); createPlot(id=1, position={0, 0, 813, 1000}, y={"conf.nSta", "conf.nBoi"}, range={0.0, 10.0, 2.0, 6.0}, grid=true, colors={{28,108,200}, {238,46,47}}); createPlot(id=1, position={0, 0, 813, 196}, y={"conf.uBoiAva[1]", "conf.uBoiAva[2]", "conf.uBoiAva[3]"}, range={0.0, 10.0, -0.5, 1.5}, grid=true, subPlot=2, colors={{28,108,200}, {28,108,200}, {28,108,200}}); createPlot(id=1, position={0, 0, 813, 196}, y={"conf.boiDesCap[1]", "conf.boiDesCap[2]", "conf.boiDesCap[3]"}, range={0.0, 10.0, -100.0, 300.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}, {0,140,72}}); -createPlot(id=1, position={0, 0, 813, 196}, y={"conf.boiFirMin[1]", "conf.boiFirMin[2]", "conf.boiFirMin[3]"}, range={0.0, 10.0, -0.2, 0.6000000000000001}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}, {0,140,72}}); +createPlot(id=1, position={0, 0, 813, 196}, y={"conf.boiFirMin[1]", "conf.boiFirMin[2]", "conf.boiFirMin[3]"}, range={0.0, 10.0, -0.2, 0.6}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}, {0,140,72}}); createPlot(id=1, position={0, 0, 813, 196}, y={"conf.boiTyp[1]", "conf.boiTyp[2]", "conf.boiTyp[3]"}, range={0.0, 10.0, -1.0, 3.0}, grid=true, subPlot=5, colors={{28,108,200}, {238,46,47}, {0,140,72}}); createPlot(id=2, position={831, 0, 815, 1000}, y={"conf.yAva[1]", "conf.yAva[2]", "conf.yAva[3]", "conf.yAva[4]", "conf.yAva[5]"}, range={0.0, 10.0, 0.85, 1.15}, grid=true, colors={{28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}}); @@ -16,7 +16,7 @@ createPlot(id=2, position={831, 0, 815, 246}, y={"conf.yCapMin[1]", "conf.yCapMi createPlot(id=3, position={0, 0, 813, 1000}, y={"conf1.nSta", "conf1.nBoi"}, range={0.0, 10.0, 2.0, 6.0}, grid=true, colors={{28,108,200}, {238,46,47}}); createPlot(id=3, position={0, 0, 813, 196}, y={"conf1.uBoiAva[1]", "conf1.uBoiAva[2]", "conf1.uBoiAva[3]"}, range={0.0, 10.0, -0.5, 1.5}, grid=true, subPlot=2, colors={{28,108,200}, {28,108,200}, {28,108,200}}); createPlot(id=3, position={0, 0, 813, 196}, y={"conf1.boiDesCap[1]", "conf1.boiDesCap[2]", "conf1.boiDesCap[3]"}, range={0.0, 10.0, -100.0, 300.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}, {0,140,72}}); -createPlot(id=3, position={0, 0, 813, 196}, y={"conf1.boiFirMin[1]", "conf1.boiFirMin[2]", "conf1.boiFirMin[3]"}, range={0.0, 10.0, -0.2, 0.6000000000000001}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}, {0,140,72}}); +createPlot(id=3, position={0, 0, 813, 196}, y={"conf1.boiFirMin[1]", "conf1.boiFirMin[2]", "conf1.boiFirMin[3]"}, range={0.0, 10.0, -0.2, 0.6}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}, {0,140,72}}); createPlot(id=3, position={0, 0, 813, 196}, y={"conf1.boiTyp[1]", "conf1.boiTyp[2]", "conf1.boiTyp[3]"}, range={0.0, 10.0, -1.0, 3.0}, grid=true, subPlot=5, colors={{28,108,200}, {238,46,47}, {0,140,72}}); createPlot(id=4, position={831, 0, 815, 1000}, y={"conf1.yAva[1]", "conf1.yAva[2]", "conf1.yAva[3]", "conf1.yAva[4]", "conf1.yAva[5]"}, range={0.0, 10.0, 0.85, 1.15}, grid=true, colors={{28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}}); @@ -27,7 +27,7 @@ createPlot(id=4, position={831, 0, 815, 246}, y={"conf1.yCapMin[1]", "conf1.yCap createPlot(id=5, position={0, 0, 813, 1000}, y={"conf2.nSta", "conf2.nBoi"}, range={0.0, 10.0, 2.0, 6.0}, grid=true, colors={{28,108,200}, {238,46,47}}); createPlot(id=5, position={0, 0, 813, 196}, y={"conf2.uBoiAva[1]", "conf2.uBoiAva[2]", "conf2.uBoiAva[3]"}, range={0.0, 10.0, -0.5, 1.5}, grid=true, subPlot=2, colors={{28,108,200}, {28,108,200}, {28,108,200}}); createPlot(id=5, position={0, 0, 813, 196}, y={"conf2.boiDesCap[1]", "conf2.boiDesCap[2]", "conf2.boiDesCap[3]"}, range={0.0, 10.0, -100.0, 300.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}, {0,140,72}}); -createPlot(id=5, position={0, 0, 813, 196}, y={"conf2.boiFirMin[1]", "conf2.boiFirMin[2]", "conf2.boiFirMin[3]"}, range={0.0, 10.0, -0.2, 0.6000000000000001}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}, {0,140,72}}); +createPlot(id=5, position={0, 0, 813, 196}, y={"conf2.boiFirMin[1]", "conf2.boiFirMin[2]", "conf2.boiFirMin[3]"}, range={0.0, 10.0, -0.2, 0.6}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}, {0,140,72}}); createPlot(id=5, position={0, 0, 813, 196}, y={"conf2.boiTyp[1]", "conf2.boiTyp[2]", "conf2.boiTyp[3]"}, range={0.0, 10.0, -1.0, 3.0}, grid=true, subPlot=5, colors={{28,108,200}, {238,46,47}, {0,140,72}}); createPlot(id=6, position={831, 0, 815, 1000}, y={"conf2.yAva[1]", "conf2.yAva[2]", "conf2.yAva[3]", "conf2.yAva[4]", "conf2.yAva[5]"}, range={0.0, 10.0, 0.85, 1.15}, grid=true, colors={{28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}}); @@ -38,7 +38,7 @@ createPlot(id=6, position={831, 0, 815, 246}, y={"conf2.yCapMin[1]", "conf2.yCap createPlot(id=7, position={0, 0, 813, 1000}, y={"conf3.nSta", "conf3.nBoi"}, range={0.0, 10.0, 2.0, 6.0}, grid=true, colors={{28,108,200}, {238,46,47}}); createPlot(id=7, position={0, 0, 813, 196}, y={"conf3.uBoiAva[1]", "conf3.uBoiAva[2]", "conf3.uBoiAva[3]"}, range={0.0, 10.0, -0.5, 1.5}, grid=true, subPlot=2, colors={{28,108,200}, {28,108,200}, {28,108,200}}); createPlot(id=7, position={0, 0, 813, 196}, y={"conf3.boiDesCap[1]", "conf3.boiDesCap[2]", "conf3.boiDesCap[3]"}, range={0.0, 10.0, -100.0, 300.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}, {0,140,72}}); -createPlot(id=7, position={0, 0, 813, 196}, y={"conf3.boiFirMin[1]", "conf3.boiFirMin[2]", "conf3.boiFirMin[3]"}, range={0.0, 10.0, -0.2, 0.6000000000000001}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}, {0,140,72}}); +createPlot(id=7, position={0, 0, 813, 196}, y={"conf3.boiFirMin[1]", "conf3.boiFirMin[2]", "conf3.boiFirMin[3]"}, range={0.0, 10.0, -0.2, 0.6}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}, {0,140,72}}); createPlot(id=7, position={0, 0, 813, 196}, y={"conf3.boiTyp[1]", "conf3.boiTyp[2]", "conf3.boiTyp[3]"}, range={0.0, 10.0, -1.0, 3.0}, grid=true, subPlot=5, colors={{28,108,200}, {238,46,47}, {0,140,72}}); createPlot(id=8, position={831, 0, 815, 1000}, y={"conf3.yAva[1]", "conf3.yAva[2]", "conf3.yAva[3]", "conf3.yAva[4]", "conf3.yAva[5]"}, range={0.0, 10.0, 0.85, 1.15}, grid=true, colors={{28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}}); @@ -49,7 +49,7 @@ createPlot(id=8, position={831, 0, 815, 246}, y={"conf3.yCapMin[1]", "conf3.yCap createPlot(id=9, position={0, 0, 813, 1000}, y={"conf4.nSta", "conf4.nBoi"}, range={0.0, 10.0, 2.0, 6.0}, grid=true, colors={{28,108,200}, {238,46,47}}); createPlot(id=9, position={0, 0, 813, 196}, y={"conf4.uBoiAva[1]", "conf4.uBoiAva[2]", "conf4.uBoiAva[3]"}, range={0.0, 10.0, -0.5, 1.5}, grid=true, subPlot=2, colors={{28,108,200}, {28,108,200}, {28,108,200}}); createPlot(id=9, position={0, 0, 813, 196}, y={"conf4.boiDesCap[1]", "conf4.boiDesCap[2]", "conf4.boiDesCap[3]"}, range={0.0, 10.0, -100.0, 300.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}, {0,140,72}}); -createPlot(id=9, position={0, 0, 813, 196}, y={"conf4.boiFirMin[1]", "conf4.boiFirMin[2]", "conf4.boiFirMin[3]"}, range={0.0, 10.0, -0.2, 0.6000000000000001}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}, {0,140,72}}); +createPlot(id=9, position={0, 0, 813, 196}, y={"conf4.boiFirMin[1]", "conf4.boiFirMin[2]", "conf4.boiFirMin[3]"}, range={0.0, 10.0, -0.2, 0.6}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}, {0,140,72}}); createPlot(id=9, position={0, 0, 813, 196}, y={"conf4.boiTyp[1]", "conf4.boiTyp[2]", "conf4.boiTyp[3]"}, range={0.0, 10.0, -1.0, 3.0}, grid=true, subPlot=5, colors={{28,108,200}, {238,46,47}, {0,140,72}}); createPlot(id=10, position={831, 0, 815, 1000}, y={"conf4.yAva[1]", "conf4.yAva[2]", "conf4.yAva[3]", "conf4.yAva[4]", "conf4.yAva[5]"}, range={0.0, 10.0, 0.85, 1.15}, grid=true, colors={{28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}}); @@ -60,7 +60,7 @@ createPlot(id=10, position={831, 0, 815, 246}, y={"conf4.yCapMin[1]", "conf4.yCa createPlot(id=11, position={0, 0, 813, 1000}, y={"conf5.nSta", "conf5.nBoi"}, range={0.0, 10.0, 2.0, 6.0}, grid=true, colors={{28,108,200}, {238,46,47}}); createPlot(id=11, position={0, 0, 813, 196}, y={"conf5.uBoiAva[1]", "conf5.uBoiAva[2]", "conf5.uBoiAva[3]"}, range={0.0, 10.0, -0.5, 1.5}, grid=true, subPlot=2, colors={{28,108,200}, {28,108,200}, {28,108,200}}); createPlot(id=11, position={0, 0, 813, 196}, y={"conf5.boiDesCap[1]", "conf5.boiDesCap[2]", "conf5.boiDesCap[3]"}, range={0.0, 10.0, -100.0, 300.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}, {0,140,72}}); -createPlot(id=11, position={0, 0, 813, 196}, y={"conf5.boiFirMin[1]", "conf5.boiFirMin[2]", "conf5.boiFirMin[3]"}, range={0.0, 10.0, -0.2, 0.6000000000000001}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}, {0,140,72}}); +createPlot(id=11, position={0, 0, 813, 196}, y={"conf5.boiFirMin[1]", "conf5.boiFirMin[2]", "conf5.boiFirMin[3]"}, range={0.0, 10.0, -0.2, 0.6}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}, {0,140,72}}); createPlot(id=11, position={0, 0, 813, 196}, y={"conf5.boiTyp[1]", "conf5.boiTyp[2]", "conf5.boiTyp[3]"}, range={0.0, 10.0, -1.0, 3.0}, grid=true, subPlot=5, colors={{28,108,200}, {238,46,47}, {0,140,72}}); createPlot(id=12, position={831, 0, 815, 1000}, y={"conf5.yAva[1]", "conf5.yAva[2]", "conf5.yAva[3]", "conf5.yAva[4]", "conf5.yAva[5]"}, range={0.0, 10.0, 0.85, 1.15}, grid=true, colors={{28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}}); diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Validation/Down.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Validation/Down.mos index 299661b37e7..9d86d8e7e32 100644 --- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Validation/Down.mos +++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Validation/Down.mos @@ -1,16 +1,16 @@ simulateModel("Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.Staging.SetPoints.Subsequences.Validation.Down", method="dassl", stopTime=16000, tolerance=1e-06, resultFile="Down"); removePlots(false); -createPlot(id=1, position={0, 0, 1660, 998}, y={"staDow.uCapReq", "staDow.uCapMin"}, range={0.0, 16000.0, 0.8, 1.4000000000000001}, grid=true, colors={{28,108,200}, {238,46,47}}); -createPlot(id=1, position={0, 0, 1660, 162}, y={"staDow.uPumSpe"}, range={0.0, 16000.0, 0.6000000000000001, 1.2000000000000002}, grid=true, subPlot=2, colors={{28,108,200}}); +createPlot(id=1, position={0, 0, 1660, 998}, y={"staDow.uCapReq", "staDow.uCapMin"}, range={0.0, 16000.0, 0.8, 1.40}, grid=true, colors={{28,108,200}, {238,46,47}}); +createPlot(id=1, position={0, 0, 1660, 162}, y={"staDow.uPumSpe"}, range={0.0, 16000.0, 0.6, 1.2}, grid=true, subPlot=2, colors={{28,108,200}}); createPlot(id=1, position={0, 0, 1660, 162}, y={"staDow.TPriHotWatRet", "staDow.TSecHotWatRet"}, range={0.0, 16000.0, 78.0, 84.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}}); createPlot(id=1, position={0, 0, 1660, 163}, y={"staDow.faiSafCon.yFaiCon"}, range={0.0, 16000.0, -0.5, 1.5}, grid=true, subPlot=4, colors={{28,108,200}}); createPlot(id=1, position={0, 0, 1660, 162}, y={"staDow.uCapReq", "staDow.uCapDowDes"}, range={0.0, 16000.0, 1.0, 2.5}, grid=true, subPlot=5, colors={{28,108,200}, {238,46,47}}); createPlot(id=1, position={0, 0, 1660, 162}, y={"staDow.yStaDow"}, range={0.0, 16000.0, -0.5, 1.5}, grid=true, subPlot=6, colors={{28,108,200}}); createPlot(id=2, position={0, 0, 1660, 998}, y={"staDow1.uCapReq", "staDow1.uCapDowDes"}, range={0.0, 16000.0, 1.0, 2.2}, grid=true, colors={{28,108,200}, {238,46,47}}); -createPlot(id=2, position={0, 0, 1660, 330}, y={"staDow1.faiSafCon.yFaiCon"}, range={0.0, 16000.0, -0.2, 1.2000000000000002}, grid=true, subPlot=2, colors={{28,108,200}}); -createPlot(id=2, position={0, 0, 1660, 329}, y={"staDow1.yStaDow"}, range={0.0, 16000.0, -0.2, 1.2000000000000002}, grid=true, subPlot=3, colors={{28,108,200}}); +createPlot(id=2, position={0, 0, 1660, 330}, y={"staDow1.faiSafCon.yFaiCon"}, range={0.0, 16000.0, -0.2, 1.2}, grid=true, subPlot=2, colors={{28,108,200}}); +createPlot(id=2, position={0, 0, 1660, 329}, y={"staDow1.yStaDow"}, range={0.0, 16000.0, -0.2, 1.2}, grid=true, subPlot=3, colors={{28,108,200}}); createPlot(id=3, position={95, 95, 1660, 998}, y={"staDow2.uCapReq", "staDow2.uCapMin"}, range={0.0, 16000.0, 0.9, 1.4}, grid=true, colors={{28,108,200}, {238,46,47}}); createPlot(id=3, position={95, 95, 1660, 196}, y={"staDow2.uBypValPos"}, range={0.0, 16000.0, -0.2, 0.3}, grid=true, subPlot=2, colors={{28,108,200}}); diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Validation/EfficiencyCondition.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Validation/EfficiencyCondition.mos index 44500c8df36..a051d867c5c 100644 --- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Validation/EfficiencyCondition.mos +++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Validation/EfficiencyCondition.mos @@ -1,8 +1,8 @@ simulateModel("Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.Staging.SetPoints.Subsequences.Validation.EfficiencyCondition", startTime=0,tolerance=1e-6, stopTime=7200, outputInterval=1, method="dassl", resultFile="EfficiencyCondition1"); removePlots(false); createPlot(id=1, position={0, 0, 1660, 998}, y={"effCon.uCapReq", "effCon.uCapUpMin"}, range={0.0, 7200.0, 0.9, 1.6}, grid=true, colors={{28,108,200}, {238,46,47}}); -createPlot(id=1, position={0, 0, 1660, 329}, y={"effCon.VHotWat_flow", "effCon.VUpMinSet_flow"}, range={0.0, 7200.0, -0.2, 1.2000000000000002}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); -createPlot(id=1, position={0, 0, 1660, 329}, y={"effCon.yEffCon"}, range={0.0, 7200.0, -0.2, 1.2000000000000002}, grid=true, subPlot=3, colors={{28,108,200}}); +createPlot(id=1, position={0, 0, 1660, 329}, y={"effCon.VHotWat_flow", "effCon.VUpMinSet_flow"}, range={0.0, 7200.0, -0.2, 1.2}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); +createPlot(id=1, position={0, 0, 1660, 329}, y={"effCon.yEffCon"}, range={0.0, 7200.0, -0.2, 1.2}, grid=true, subPlot=3, colors={{28,108,200}}); //ExportPlotAsImage("./Resources/Images/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/EfficiencyCondition1.png", 1, true, false); createPlot(id=2, position={0, 0, 1660, 998}, y={"effCon1.uCapReq", "effCon1.uCapDes"}, range={0.0, 7200.0, 0.78, 1.02}, grid=true, colors={{28,108,200}, {238,46,47}}); diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Validation/Up.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Validation/Up.mos index 895e8a5ade5..dc7269cd521 100644 --- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Validation/Up.mos +++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Validation/Up.mos @@ -1,19 +1,19 @@ simulateModel("Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.Staging.SetPoints.Subsequences.Validation.Up", method="dassl", stopTime=7200, tolerance=1e-06, resultFile="Up"); -createPlot(id=1, position={0, 0, 1660, 998}, y={"staUp.VHotWat_flow", "staUp.VUpMinSet_flow"}, range={0.0, 7200.0, 0.8500000000000001, 1.05}, grid=true, colors={{28,108,200}, {238,46,47}}); -createPlot(id=1, position={0, 0, 1660, 246}, y={"staUp.THotWatSupSet", "staUp.THotWatSup"}, range={0.0, 7200.0, 79.80000000000001, 81.20000000000002}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); +createPlot(id=1, position={0, 0, 1660, 998}, y={"staUp.VHotWat_flow", "staUp.VUpMinSet_flow"}, range={0.0, 7200.0, 0.85, 1.05}, grid=true, colors={{28,108,200}, {238,46,47}}); +createPlot(id=1, position={0, 0, 1660, 246}, y={"staUp.THotWatSupSet", "staUp.THotWatSup"}, range={0.0, 7200.0, 79.8, 81.2}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); createPlot(id=1, position={0, 0, 1660, 245}, y={"staUp.uAvaCur"}, range={0.0, 7200.0, 1.7, 2.3}, grid=true, subPlot=3, colors={{28,108,200}}); -createPlot(id=1, position={0, 0, 1660, 246}, y={"staUp.yStaUp"}, range={0.0, 7200.0, -0.2, 1.2000000000000002}, grid=true, subPlot=4, colors={{28,108,200}}); +createPlot(id=1, position={0, 0, 1660, 246}, y={"staUp.yStaUp"}, range={0.0, 7200.0, -0.2, 1.2}, grid=true, subPlot=4, colors={{28,108,200}}); -createPlot(id=2, position={0, 0, 1660, 998}, y={"staUp1.VHotWat_flow", "staUp1.VUpMinSet_flow"}, range={0.0, 7200.0, 0.8500000000000001, 1.05}, grid=true, colors={{28,108,200}, {238,46,47}}); -createPlot(id=2, position={0, 0, 1660, 246}, y={"staUp1.THotWatSupSet", "staUp1.THotWatSup"}, range={0.0, 7200.0, 79.80000000000001, 81.20000000000002}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); +createPlot(id=2, position={0, 0, 1660, 998}, y={"staUp1.VHotWat_flow", "staUp1.VUpMinSet_flow"}, range={0.0, 7200.0, 0.85, 1.05}, grid=true, colors={{28,108,200}, {238,46,47}}); +createPlot(id=2, position={0, 0, 1660, 246}, y={"staUp1.THotWatSupSet", "staUp1.THotWatSup"}, range={0.0, 7200.0, 79.8, 81.2}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); createPlot(id=2, position={0, 0, 1660, 245}, y={"staUp1.uAvaCur"}, range={0.0, 7200.0, 1.7, 2.3}, grid=true, subPlot=3, colors={{28,108,200}}); -createPlot(id=2, position={0, 0, 1660, 246}, y={"staUp1.yStaUp"}, range={0.0, 7200.0, -0.2, 1.2000000000000002}, grid=true, subPlot=4, colors={{28,108,200}}); +createPlot(id=2, position={0, 0, 1660, 246}, y={"staUp1.yStaUp"}, range={0.0, 7200.0, -0.2, 1.2}, grid=true, subPlot=4, colors={{28,108,200}}); -createPlot(id=3, position={0, 0, 1660, 998}, y={"staUp2.VHotWat_flow", "staUp2.VUpMinSet_flow"}, range={0.0, 7200.0, 0.8500000000000001, 1.05}, grid=true, colors={{28,108,200}, {238,46,47}}); -createPlot(id=3, position={0, 0, 1660, 246}, y={"staUp2.THotWatSupSet", "staUp2.THotWatSup"}, range={0.0, 7200.0, 79.80000000000001, 81.20000000000002}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); +createPlot(id=3, position={0, 0, 1660, 998}, y={"staUp2.VHotWat_flow", "staUp2.VUpMinSet_flow"}, range={0.0, 7200.0, 0.85, 1.05}, grid=true, colors={{28,108,200}, {238,46,47}}); +createPlot(id=3, position={0, 0, 1660, 246}, y={"staUp2.THotWatSupSet", "staUp2.THotWatSup"}, range={0.0, 7200.0, 79.8, 81.2}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); createPlot(id=3, position={0, 0, 1660, 245}, y={"staUp2.uAvaCur"}, range={0.0, 7200.0, 1.7, 2.3}, grid=true, subPlot=3, colors={{28,108,200}}); -createPlot(id=3, position={0, 0, 1660, 246}, y={"staUp2.yStaUp"}, range={0.0, 7200.0, -0.2, 1.2000000000000002}, grid=true, subPlot=4, colors={{28,108,200}}); +createPlot(id=3, position={0, 0, 1660, 246}, y={"staUp2.yStaUp"}, range={0.0, 7200.0, -0.2, 1.2}, grid=true, subPlot=4, colors={{28,108,200}}); //ExportPlotAsImage("./Resources/Images/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Up1.png", 1, true, false); //ExportPlotAsImage("./Resources/Images/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Up2.png", 2, true, false); //ExportPlotAsImage("./Resources/Images/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Subsequences/Up3.png", 3, true, false); diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Validation/SetpointController.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Validation/SetpointController.mos index 8cabd4a7cf6..a397927503a 100644 --- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Validation/SetpointController.mos +++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Staging/SetPoints/Validation/SetpointController.mos @@ -1,7 +1,7 @@ simulateModel("Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.Staging.SetPoints.Validation.SetpointController", method="Dassl", stopTime=14000, tolerance=1e-06, resultFile="SetpointController"); createPlot(id=1, position={0, 0, 731, 959}, y={"staSetCon.u"}, range={0.0, 14000.0, -2.0, 4.0}, grid=true, colors={{28,108,200}}); -createPlot(id=1, position={0, 0, 731, 155}, y={"staSetCon.capReq1.y", "staSetCon.cap.yUpMin"}, range={0.0, 14000.0, -1000000.0, 2000000.0}, autoscale=false, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}, range2={0.0, 0.15000000000000002}); +createPlot(id=1, position={0, 0, 731, 155}, y={"staSetCon.capReq1.y", "staSetCon.cap.yUpMin"}, range={0.0, 14000.0, -1000000.0, 2000000.0}, autoscale=false, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}, range2={0.0, 0.15}); createPlot(id=1, position={0, 0, 731, 156}, y={"staSetCon.capReq1.y", "staSetCon.cap.yDowDes"}, range={0.0, 14000.0, -1000000.0, 3000000.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}}); createPlot(id=1, position={0, 0, 731, 156}, y={"staSetCon.capReq1.y", "staSetCon.cap.yMin"}, range={0.0, 14000.0, -1000000.0, 3000000.0}, autoscale=false, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}}, range2={0.2, 0.8}); createPlot(id=1, position={0, 0, 731, 155}, y={"staSetCon.VHotWat_flow", "staSetCon.VMinSet_flow[1]", "staSetCon.VMinSet_flow[2]", "staSetCon.VMinSet_flow[3]"}, range={0.0, 14000.0, -0.02, 0.06}, grid=true, subPlot=5, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}); diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Validation/Controller.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Validation/Controller.mos index b8ee04fda1a..6bafa4c8998 100644 --- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Validation/Controller.mos +++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/BoilerPlant/Validation/Controller.mos @@ -1,6 +1,6 @@ simulateModel("Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.Validation.Controller", startTime=0,tolerance=1e-6, stopTime=7500, outputInterval=1, method="cvode", resultFile="BoilerPlantController"); removePlots(false); -createPlot(id=1, position={160, 947, 485, 285}, y={"controller.supResReq"}, range={0.0, 7500.0, -5.0, 5.0}, grid=true, colors={{28,108,200}}); +createPlot(id=1, position={160, 947, 485, 285}, y={"controller.plaReq"}, range={0.0, 7500.0, -5.0, 5.0}, grid=true, colors={{28,108,200}}); createPlot(id=1, position={160, 947, 485, 32}, y={"controller.staSetCon.ySta"}, range={0.0, 7500.0, -10.0, 10.0}, grid=true, subPlot=2, colors={{28,108,200}}); createPlot(id=1, position={160, 947, 485, 31}, y={"controller.yHotWatIsoVal[1]"}, range={0.0, 7500.0, -5.0, 5.0}, grid=true, subPlot=3, colors={{28,108,200}}); createPlot(id=1, position={160, 947, 485, 31}, y={"controller.yPriPum[1]"}, range={0.0, 7500.0, -5.0, 5.0}, grid=true, subPlot=4, colors={{28,108,200}}); @@ -15,7 +15,7 @@ createPlot(id=2, position={320, 947, 485, 53}, y={"controller.yPriPum[2]"}, rang createPlot(id=2, position={320, 947, 485, 53}, y={"controller.dpHotWatPri_rem[1]", "controller.maxLocDpPri", "controller.minLocDpPri"}, range={0.0, 7500.0, 3800.0, 4200.0}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}, {0,140,72}}); createPlot(id=2, position={320, 947, 485, 53}, y={"controller.yPriPumSpe"}, range={0.0, 7500.0, -2.0, 2.0}, grid=true, subPlot=5, colors={{28,108,200}}); -createPlot(id=3, position={480, 947, 482, 288}, y={"controller1.supResReq"}, range={0.0, 7500.0, -5.0, 5.0}, grid=true, colors={{28,108,200}}); +createPlot(id=3, position={480, 947, 482, 288}, y={"controller1.plaReq"}, range={0.0, 7500.0, -5.0, 5.0}, grid=true, colors={{28,108,200}}); createPlot(id=3, position={480, 947, 482, 37}, y={"controller1.staSetCon.ySta"}, range={0.0, 7500.0, -10.0, 10.0}, grid=true, subPlot=2, colors={{28,108,200}}); createPlot(id=3, position={480, 947, 482, 37}, y={"controller1.yHotWatIsoVal[1]"}, range={0.0, 7500.0, -5.0, 5.0}, grid=true, subPlot=3, colors={{28,108,200}}); createPlot(id=3, position={480, 947, 482, 36}, y={"controller1.yPriPum[1]"}, range={0.0, 7500.0, -5.0, 5.0}, grid=true, subPlot=4, colors={{28,108,200}}); @@ -27,30 +27,30 @@ createPlot(id=4, position={640, 947, 482, 288}, y={"controller1.yPriPum[1]"}, ra createPlot(id=4, position={640, 947, 482, 44}, y={"controller1.yBoi[1]"}, range={0.0, 7500.0, -2.0, 2.0}, grid=true, subPlot=2, colors={{28,108,200}}); createPlot(id=4, position={640, 947, 482, 43}, y={"controller1.yBoi[2]"}, range={0.0, 7500.0, -2.0, 2.0}, grid=true, subPlot=3, colors={{28,108,200}}); createPlot(id=4, position={640, 947, 482, 44}, y={"controller1.yPriPum[2]"}, range={0.0, 7500.0, -2.0, 2.0}, grid=true, subPlot=4, colors={{28,108,200}}); -createPlot(id=4, position={640, 947, 482, 44}, y={"controller1.VHotWatPri_flow", "controller1.VHotWatSec_flow"}, range={0.0, 7500.0, 0.00028000000000000003, 0.00032}, grid=true, subPlot=5, colors={{28,108,200}, {238,46,47}}); +createPlot(id=4, position={640, 947, 482, 44}, y={"controller1.VHotWatPri_flow", "controller1.VHotWatSec_flow"}, range={0.0, 7500.0, 0.00028, 0.00032}, grid=true, subPlot=5, colors={{28,108,200}, {238,46,47}}); createPlot(id=4, position={640, 947, 482, 44}, y={"controller1.yPriPumSpe"}, range={0.0, 7500.0, -2.0, 2.0}, grid=true, subPlot=6, colors={{28,108,200}}); createPlot(id=5, position={751, 0, 733, 939}, y={"controller1.plaEna.yPla"}, range={0.0, 7500.0, -1.0, 2.0}, grid=true, colors={{28,108,200}}); -createPlot(id=5, position={751, 0, 733, 130}, y={"controller1.supResReq"}, range={0.0, 7500.0, -2.0, 4.0}, grid=true, subPlot=2, colors={{28,108,200}}); +createPlot(id=5, position={751, 0, 733, 130}, y={"controller1.plaReq"}, range={0.0, 7500.0, -2.0, 4.0}, grid=true, subPlot=2, colors={{28,108,200}}); createPlot(id=5, position={751, 0, 733, 130}, y={"controller1.ySecPum[1]"}, range={0.0, 7500.0, -1.0, 2.0}, grid=true, subPlot=3, colors={{28,108,200}}); -createPlot(id=5, position={751, 0, 733, 129}, y={"controller1.VHotWatSec_flow", "controller1.VHotWatSec_flow_nominal"}, range={0.0, 7500.0, 0.00020000000000000004, 0.0005}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}}); +createPlot(id=5, position={751, 0, 733, 129}, y={"controller1.VHotWatSec_flow", "controller1.VHotWatSec_flow_nominal"}, range={0.0, 7500.0, 0.0002, 0.0005}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}}); createPlot(id=5, position={751, 0, 733, 130}, y={"controller1.ySecPum[2]"}, range={0.0, 7500.0, -1.0, 2.0}, grid=true, subPlot=5, colors={{28,108,200}}); createPlot(id=5, position={751, 0, 733, 130}, y={"controller1.dpHotWatSec_rem[1]", "controller1.maxLocDpSec", "controller1.minLocDpSec"}, range={0.0, 7500.0, 3800.0, 4200.0}, grid=true, subPlot=6, colors={{28,108,200}, {238,46,47}, {0,140,72}}); createPlot(id=5, position={751, 0, 733, 130}, y={"controller1.ySecPumSpe"}, range={0.0, 7500.0, -1.0, 2.0}, grid=true, subPlot=7, colors={{28,108,200}}); -createPlot(id=6, position={0, 0, 485, 615}, y={"controller2.supResReq"}, range={0.0, 7600.0, -2.0, 4.0}, grid=true, colors={{28,108,200}}); +createPlot(id=6, position={0, 0, 485, 615}, y={"controller2.plaReq"}, range={0.0, 7600.0, -2.0, 4.0}, grid=true, colors={{28,108,200}}); createPlot(id=6, position={0, 0, 485, 72}, y={"controller2.staSetCon.ySta"}, range={0.0, 7600.0, -5.0, 5.0}, grid=true, subPlot=2, colors={{28,108,200}}); createPlot(id=6, position={0, 0, 485, 73}, y={"controller2.yPriPum[1]"}, range={0.0, 7600.0, -1.0, 2.0}, grid=true, subPlot=3, colors={{28,108,200}}); createPlot(id=6, position={0, 0, 485, 72}, y={"controller2.yBoi[1]"}, range={0.0, 7600.0, -1.0, 2.0}, grid=true, subPlot=4, colors={{28,108,200}}); createPlot(id=6, position={0, 0, 485, 73}, y={"controller2.yPriPum[2]"}, range={0.0, 7600.0, -1.0, 2.0}, grid=true, subPlot=5, colors={{28,108,200}}); createPlot(id=6, position={0, 0, 485, 72}, y={"controller2.yBoi[2]"}, range={0.0, 7600.0, -1.0, 2.0}, grid=true, subPlot=6, colors={{28,108,200}}); -createPlot(id=6, position={0, 0, 485, 73}, y={"controller2.VHotWatPri_flow", "controller2.VHotWatSec_flow"}, range={0.0, 7600.0, 0.00028000000000000003, 0.00031000000000000005}, grid=true, subPlot=7, colors={{28,108,200}, {238,46,47}}); +createPlot(id=6, position={0, 0, 485, 73}, y={"controller2.VHotWatPri_flow", "controller2.VHotWatSec_flow"}, range={0.0, 7600.0, 0.00028, 0.00031}, grid=true, subPlot=7, colors={{28,108,200}, {238,46,47}}); createPlot(id=6, position={0, 0, 485, 72}, y={"controller2.yPriPumSpe"}, range={0.0, 7600.0, -1.0, 2.0}, grid=true, subPlot=8, colors={{28,108,200}}); -createPlot(id=7, position={0, 0, 1500, 978}, y={"controller2.supResReq"}, range={0.0, 7600.0, -2.0, 4.0}, grid=true, colors={{28,108,200}}); +createPlot(id=7, position={0, 0, 1500, 978}, y={"controller2.plaReq"}, range={0.0, 7600.0, -2.0, 4.0}, grid=true, colors={{28,108,200}}); createPlot(id=7, position={0, 0, 1500, 136}, y={"controller2.plaEna.yPla"}, range={0.0, 7600.0, -1.0, 2.0}, grid=true, subPlot=2, colors={{28,108,200}}); createPlot(id=7, position={0, 0, 1500, 135}, y={"controller2.ySecPum[1]"}, range={0.0, 7600.0, -1.0, 2.0}, grid=true, subPlot=3, colors={{28,108,200}}); -createPlot(id=7, position={0, 0, 1500, 136}, y={"controller2.VHotWatSec_flow", "controller2.VHotWatSec_flow_nominal"}, range={0.0, 7600.0, 0.00020000000000000004, 0.0005}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}}); +createPlot(id=7, position={0, 0, 1500, 136}, y={"controller2.VHotWatSec_flow", "controller2.VHotWatSec_flow_nominal"}, range={0.0, 7600.0, 0.0002, 0.0005}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}}); createPlot(id=7, position={0, 0, 1500, 135}, y={"controller2.ySecPum[2]"}, range={0.0, 7600.0, -1.0, 2.0}, grid=true, subPlot=5, colors={{28,108,200}}); createPlot(id=7, position={0, 0, 1500, 136}, y={"controller2.dpHotWatSec_rem[1]", "controller2.maxLocDpSec", "controller2.minLocDpSec"}, range={0.0, 7600.0, 3800.0, 4200.0}, grid=true, subPlot=6, colors={{28,108,200}, {238,46,47}, {0,140,72}}); createPlot(id=7, position={0, 0, 1500, 135}, y={"controller2.ySecPumSpe"}, range={0.0, 7600.0, -1.0, 2.0}, grid=true, subPlot=7, colors={{28,108,200}}); diff --git a/Buildings/Resources/Scripts/Dymola/Examples/BoilerPlant/ClosedLoopTest.mos b/Buildings/Resources/Scripts/Dymola/Examples/BoilerPlant/ClosedLoopTest.mos index edf4b00c99f..8bd9ed3cf8b 100644 --- a/Buildings/Resources/Scripts/Dymola/Examples/BoilerPlant/ClosedLoopTest.mos +++ b/Buildings/Resources/Scripts/Dymola/Examples/BoilerPlant/ClosedLoopTest.mos @@ -1,19 +1,20 @@ simulateModel("Buildings.Examples.BoilerPlant.ClosedLoopTest", startTime=518400,tolerance=1e-4, stopTime=691200, outputInterval=60, method="cvode", resultFile="ClosedLoopTest"); removePlots(false); -createPlot(id=1, position={0, 0, 1500, 978}, y={"boilerPlant.TOutAir"}, range={255000.0, 435000.0, -20.0, 0.0}, grid=true, colors={{28,108,200}}, displayUnits={"degC"}); -createPlot(id=1, position={0, 0, 1500, 104}, y={"boilerPlant.yZonTem"}, range={255000.0, 435000.0, 15.0, 25.0}, grid=true, subPlot=2, colors={{28,108,200}}, displayUnits={"degC"}); -createPlot(id=1, position={0, 0, 1500, 105}, y={"controller.supResReq"}, range={255000.0, 435000.0, -10.0, 10.0}, grid=true, subPlot=3, colors={{28,108,200}}); -createPlot(id=1, position={0, 0, 1500, 104}, y={"controller.plaEna.yPla"}, range={255000.0, 435000.0, -2.0, 2.0}, grid=true, subPlot=4, colors={{28,108,200}}); -createPlot(id=1, position={0, 0, 1500, 104}, y={"controller.staSetCon.ySta"}, range={255000.0, 435000.0, -5.0, 5.0}, grid=true, subPlot=5, colors={{28,108,200}}); -createPlot(id=1, position={0, 0, 1500, 104}, y={"controller.yHotWatIsoVal[1]"}, range={255000.0, 435000.0, -2.0, 2.0}, grid=true, subPlot=6, colors={{28,108,200}}); -createPlot(id=1, position={0, 0, 1500, 105}, y={"controller.yBoi[1]"}, range={255000.0, 435000.0, -1.0, 2.0}, grid=true, subPlot=7, colors={{28,108,200}}); -createPlot(id=1, position={0, 0, 1500, 104}, y={"controller.yHotWatIsoVal[2]"}, range={255000.0, 435000.0, -2.0, 2.0}, grid=true, subPlot=8, colors={{28,108,200}}); -createPlot(id=1, position={0, 0, 1500, 104}, y={"controller.yBoi[2]"}, range={255000.0, 435000.0, -2.0, 2.0}, grid=true, subPlot=9, colors={{28,108,200}}); +createPlot(id=1, position={0, 0, 997, 856}, y={"conPID.u_m", "conPID.u_s"}, range={515000.0, 695000.0, 288.0, 296.0}, grid=true, colors={{28,108,200}, {238,46,47}}); +createPlot(id=1, position={0, 0, 997, 282}, y={"boiPlaCon.plaReq"}, range={515000.0, 695000.0, -0.2, 1.2}, grid=true, subPlot=2, colors={{28,108,200}}); +createPlot(id=1, position={0, 0, 997, 282}, y={"boiPlaCon.yPla"}, range={515000.0, 695000.0, -0.2, 1.2}, grid=true, subPlot=3, colors={{28,108,200}}); -createPlot(id=2, position={0, 0, 1500, 939}, y={"controller.VHotWatPri_flow", "controller.VHotWatPri_flow_nominal"}, range={255000.0, 435000.0, -0.0005, 0.001}, grid=true, colors={{28,108,200}, {238,46,47}}); -createPlot(id=2, position={0, 0, 1500, 130}, y={"controller.yPriPum[1]"}, range={250000.0, 440000.0, -1.0, 2.0}, grid=true, subPlot=2, colors={{28,108,200}}); -createPlot(id=2, position={0, 0, 1500, 129}, y={"controller.dpHotWatPri_rem[1]", "controller.maxLocDpPri"}, range={250000.0, 440000.0, -5000.0, 10000.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}}); -createPlot(id=2, position={0, 0, 1500, 130}, y={"controller.yPriPumSpe"}, range={250000.0, 440000.0, -1.0, 2.0}, grid=true, subPlot=4, colors={{28,108,200}}); -createPlot(id=2, position={0, 0, 1500, 130}, y={"controller.VHotWatPri_flow", "controller.minBoiFloSet.VHotWatMinSet_flow"}, range={250000.0, 440000.0, -0.0002, 0.0004000000000000001}, grid=true, subPlot=5, colors={{28,108,200}, {238,46,47}}); -createPlot(id=2, position={0, 0, 1500, 130}, y={"controller.yBypValPos"}, range={250000.0, 440000.0, -1.0, 2.0}, grid=true, subPlot=6, colors={{28,108,200}}); +createPlot(id=2, position={0, 0, 1500, 978}, y={"boiPlaCon.yPla"}, range={510000.0, 700000.0, -1.0, 2.0}, grid=true, colors={{28,108,200}}); +createPlot(id=2, position={0, 0, 1500, 136}, y={"boiPlaCon.TPlaHotWatSupSet", "boiPla.ySupTem"}, range={510000.0, 700000.0, 250.0, 350.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); +createPlot(id=2, position={0, 0, 1500, 135}, y={"boiPlaCon.staSetCon.ySta"}, range={510000.0, 700000.0, -5.0, 5.0}, grid=true, subPlot=3, colors={{28,108,200}}); +createPlot(id=2, position={0, 0, 1500, 136}, y={"boiPlaCon.yHotWatIsoVal[1]"}, range={510000.0, 700000.0, -1.0, 2.0}, grid=true, subPlot=4, colors={{28,108,200}}); +createPlot(id=2, position={0, 0, 1500, 135}, y={"boiPlaCon.yBoi[1]"}, range={510000.0, 700000.0, -1.0, 2.0}, grid=true, subPlot=5, colors={{28,108,200}}); +createPlot(id=2, position={0, 0, 1500, 136}, y={"boiPlaCon.yHotWatIsoVal[2]"}, range={510000.0, 700000.0, -1.0, 2.0}, grid=true, subPlot=6, colors={{28,108,200}}); +createPlot(id=2, position={0, 0, 1500, 135}, y={"boiPlaCon.yBoi[2]"}, range={510000.0, 700000.0, -1.0, 2.0}, grid=true, subPlot=7, colors={{28,108,200}}); + +createPlot(id=3, position={0, 0, 1500, 939}, y={"boiPlaCon.yPriPum[1]"}, range={510000.0, 700000.0, -0.5, 1.5}, grid=true, colors={{28,108,200}}); +createPlot(id=3, position={0, 0, 1500, 184}, y={"boiPlaCon.dpHotWatPri_rem[1]", "boiPlaCon.maxLocDpPri"}, range={510000.0, 700000.0, -50000.0, 150000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); +createPlot(id=3, position={0, 0, 1500, 183}, y={"boiPlaCon.yPriPumSpe"}, range={510000.0, 700000.0, 0.0, 1.5}, grid=true, subPlot=3, colors={{28,108,200}}); +createPlot(id=3, position={0, 0, 1500, 184}, y={"boiPlaCon.VHotWatPri_flow", "boiPlaCon.minBoiFloSet.VHotWatMinSet_flow"}, range={510000.0, 700000.0, -0.05, 0.1}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}}); +createPlot(id=3, position={0, 0, 1500, 184}, y={"boiPlaCon.yBypValPos"}, range={510000.0, 700000.0, -0.5, 1.5}, grid=true, subPlot=5, colors={{28,108,200}}); diff --git a/Buildings/Resources/Scripts/Dymola/Examples/BoilerPlant/PlantModel/Validation/BoilerPlant.mos b/Buildings/Resources/Scripts/Dymola/Examples/BoilerPlant/PlantModel/Validation/BoilerPlant.mos deleted file mode 100644 index fadc199a13a..00000000000 --- a/Buildings/Resources/Scripts/Dymola/Examples/BoilerPlant/PlantModel/Validation/BoilerPlant.mos +++ /dev/null @@ -1,11 +0,0 @@ -simulateModel("Buildings.Examples.BoilerPlant.PlantModel.Validation.BoilerPlant", startTime=0,tolerance=1e-4, stopTime=60000, outputInterval=1, method="cvode", resultFile="BoilerPlant"); -removePlots(false); - -createPlot(id=1, position={0, 0, 1549, 998}, y={"boilerPlant.yZonTem"}, range={0.0, 60000.0, 18.0, 26.0}, grid=true, colors={{28,108,200}}, displayUnits={"degC"}); -plotExpression(apply(BoilerPlant[end].hys1.uHigh-273.15), false, "BoilerPlant[end].hys1.uHigh - 273.15", 1); -createPlot(id=1, position={0, 0, 1549, 162}, y={"boilerPlant.uPumSpe"}, range={0.0, 60000.0, -0.5, 1.5}, grid=true, subPlot=2, colors={{28,108,200}}); -createPlot(id=1, position={0, 0, 1549, 162}, y={"boilerPlant.ySupTem"}, range={0.0, 60000.0, 0.0, 80.0}, grid=true, subPlot=3, colors={{28,108,200}}, displayUnits={"degC"}); -plotExpression(apply(BoilerPlant[end].hys.uHigh-273.15), false, "BoilerPlant[end].hys.uHigh - 273.15", 1); -createPlot(id=1, position={0, 0, 1549, 163}, y={"boilerPlant.uBoiSta[1]", "boilerPlant.uBoiSta[2]"}, range={0.0, 60000.0, -0.5, 1.5}, grid=true, subPlot=4, colors={{28,108,200}, {28,108,200}}); -createPlot(id=1, position={0, 0, 1549, 162}, y={"boilerPlant.uHotIsoVal[1]", "boilerPlant.yHotWatIsoVal[1]"}, range={0.0, 60000.0, -0.5, 1.5}, grid=true, subPlot=5, colors={{28,108,200}, {238,46,47}}); -createPlot(id=1, position={0, 0, 1549, 162}, y={"boilerPlant.VHotWat_flow"}, range={0.0, 60000.0, -0.0005, 0.001}, grid=true, subPlot=6, colors={{28,108,200}}); diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.Validation.Controller.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.Validation.Controller.mos index ff02653dbca..348243d2e20 100644 --- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.Validation.Controller.mos +++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.PrimarySystem.BoilerPlant.Validation.Controller.mos @@ -1,6 +1,6 @@ compareVars := { - "controller.supResReq", + "controller.plaReq", "controller.staSetCon.ySta", "controller.yHotWatIsoVal[1]", "controller.yPriPum[1]", @@ -14,7 +14,7 @@ compareVars := "controller.maxLocDpPri", "controller.minLocDpPri", "controller.yPriPumSpe", - "controller1.supResReq", + "controller1.plaReq", "controller1.staSetCon.ySta", "controller1.yHotWatIsoVal[1]", "controller1.yPriPum[1]", @@ -34,7 +34,7 @@ compareVars := "controller1.maxLocDpSec", "controller1.minLocDpSec", "controller1.ySecPumSpe", - "controller2.supResReq", + "controller2.plaReq", "controller2.staSetCon.ySta", "controller2.yPriPum[1]", "controller2.yBoi[1]", diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Examples.BoilerPlant.ClosedLoopTest.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Examples.BoilerPlant.ClosedLoopTest.mos index e6293c9a004..99071b50129 100644 --- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Examples.BoilerPlant.ClosedLoopTest.mos +++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Examples.BoilerPlant.ClosedLoopTest.mos @@ -1,21 +1,21 @@ compareVars := { - "boilerPlant.TOutAir", - "boilerPlant.yZonTem", - "controller.supResReq", - "controller.plaEna.yPla", - "controller.staSetCon.ySta", - "controller.yHotWatIsoVal[1]", - "controller.yBoi[1]", - "controller.yHotWatIsoVal[2]", - "controller.yBoi[2]", - "controller.VHotWatPri_flow", - "controller.VHotWatPri_flow_nominal", - "controller.yPriPum[1]", - "controller.dpHotWatPri_rem[1]", - "controller.maxLocDpPri", - "controller.yPriPumSpe", - "controller.VHotWatPri_flow", - "controller.minBoiFloSet.VHotWatMinSet_flow", - "controller.yBypValPos" + "conPID.u_m", + "conPID.u_s", + "boiPlaCon.plaReq", + "boiPlaCon.yPla", + "boiPlaCon.TPlaHotWatSupSet", + "boiPla.ySupTem", + "boiPlaCon.staSetCon.ySta", + "boiPlaCon.yHotWatIsoVal[1]", + "boiPlaCon.yBoi[1]", + "boiPlaCon.yHotWatIsoVal[2]", + "boiPlaCon.yBoi[2]", + "boiPlaCon.yPriPum[1]", + "boiPlaCon.dpHotWatPri_rem[1]", + "boiPlaCon.maxLocDpPri", + "boiPlaCon.yPriPumSpe", + "boiPlaCon.VHotWatPri_flow", + "boiPlaCon.minBoiFloSet.VHotWatMinSet_flow", + "boiPlaCon.yBypValPos" };