From c5fd934cf19f648017bcf9c97d1975b4042bc812 Mon Sep 17 00:00:00 2001 From: Michael Wetter Date: Tue, 2 Apr 2024 10:41:38 -0700 Subject: [PATCH] Batch pr master (#3767) * Remove reference to network design data record in Combined.PartialBuildingTimeSeriesWithETS * Renamed CDL.Logical.TrueHoldWithReset to TrueHold For #3689 * Expand to full class names * Refactored implementation to avoid infinite event iteration in OpenModelica For #3754 * wrong variable description in Fluid.HeatExchangers * corrected location of revisions in annotation * Corrected assertion for operating mode For #3664 --------- Co-authored-by: David Blum Co-authored-by: AntoineGautier Co-authored-by: hcasperfu --- .../ControllerChillerDXHeatingEconomizer.mo | 33 ++-- .../BaseClasses/BaselinePrediction.mo | 36 +++- .../BaseClasses/NormalOperation.mo | 31 ---- .../BaseClasses/PartialDemandResponse.mo | 42 ----- .../BaseClasses/ShedOperation.mo | 37 ---- .../DemandResponse/BaseClasses/package.order | 3 - Buildings/Controls/DemandResponse/Client.mo | 169 +++++------------- .../OBC/CDL/Conversions/BooleanToInteger.mo | 4 +- .../OBC/CDL/Conversions/BooleanToReal.mo | 4 +- .../OBC/CDL/Conversions/IntegerToReal.mo | 4 +- .../OBC/CDL/Conversions/RealToInteger.mo | 4 +- .../OBC/CDL/Discrete/FirstOrderHold.mo | 4 +- .../Controls/OBC/CDL/Discrete/Sampler.mo | 4 +- .../Controls/OBC/CDL/Discrete/TriggeredMax.mo | 6 +- .../OBC/CDL/Discrete/TriggeredMovingMean.mo | 6 +- .../OBC/CDL/Discrete/TriggeredSampler.mo | 6 +- .../Controls/OBC/CDL/Discrete/UnitDelay.mo | 4 +- .../OBC/CDL/Discrete/ZeroOrderHold.mo | 4 +- Buildings/Controls/OBC/CDL/Integers/Abs.mo | 4 +- Buildings/Controls/OBC/CDL/Integers/Add.mo | 6 +- .../Controls/OBC/CDL/Integers/AddParameter.mo | 4 +- Buildings/Controls/OBC/CDL/Integers/Change.mo | 8 +- Buildings/Controls/OBC/CDL/Integers/Equal.mo | 6 +- .../Controls/OBC/CDL/Integers/Greater.mo | 6 +- .../Controls/OBC/CDL/Integers/GreaterEqual.mo | 6 +- .../OBC/CDL/Integers/GreaterEqualThreshold.mo | 4 +- .../OBC/CDL/Integers/GreaterThreshold.mo | 4 +- Buildings/Controls/OBC/CDL/Integers/Less.mo | 6 +- .../Controls/OBC/CDL/Integers/LessEqual.mo | 6 +- .../OBC/CDL/Integers/LessEqualThreshold.mo | 4 +- .../OBC/CDL/Integers/LessThreshold.mo | 4 +- Buildings/Controls/OBC/CDL/Integers/Max.mo | 6 +- Buildings/Controls/OBC/CDL/Integers/Min.mo | 6 +- .../Controls/OBC/CDL/Integers/MultiSum.mo | 4 +- .../Controls/OBC/CDL/Integers/Multiply.mo | 6 +- .../Controls/OBC/CDL/Integers/OnCounter.mo | 6 +- .../OBC/CDL/Integers/Sources/Constant.mo | 2 +- .../OBC/CDL/Integers/Sources/Pulse.mo | 2 +- .../OBC/CDL/Integers/Sources/TimeTable.mo | 2 +- .../Controls/OBC/CDL/Integers/Subtract.mo | 6 +- Buildings/Controls/OBC/CDL/Integers/Switch.mo | 8 +- Buildings/Controls/OBC/CDL/Logical/And.mo | 6 +- Buildings/Controls/OBC/CDL/Logical/Change.mo | 4 +- Buildings/Controls/OBC/CDL/Logical/Edge.mo | 4 +- .../Controls/OBC/CDL/Logical/FallingEdge.mo | 4 +- Buildings/Controls/OBC/CDL/Logical/Latch.mo | 18 +- .../Controls/OBC/CDL/Logical/MultiAnd.mo | 4 +- Buildings/Controls/OBC/CDL/Logical/MultiOr.mo | 6 +- Buildings/Controls/OBC/CDL/Logical/Nand.mo | 6 +- Buildings/Controls/OBC/CDL/Logical/Nor.mo | 6 +- Buildings/Controls/OBC/CDL/Logical/Not.mo | 4 +- Buildings/Controls/OBC/CDL/Logical/Or.mo | 6 +- Buildings/Controls/OBC/CDL/Logical/Pre.mo | 4 +- .../OBC/CDL/Logical/Sources/Constant.mo | 2 +- .../Controls/OBC/CDL/Logical/Sources/Pulse.mo | 2 +- .../OBC/CDL/Logical/Sources/SampleTrigger.mo | 2 +- .../OBC/CDL/Logical/Sources/TimeTable.mo | 2 +- Buildings/Controls/OBC/CDL/Logical/Switch.mo | 8 +- Buildings/Controls/OBC/CDL/Logical/Toggle.mo | 16 +- .../Controls/OBC/CDL/Logical/TrueDelay.mo | 4 +- .../Controls/OBC/CDL/Logical/TrueFalseHold.mo | 4 +- .../Controls/OBC/CDL/Logical/TrueHold.mo | 4 +- Buildings/Controls/OBC/CDL/Logical/Xor.mo | 6 +- .../CDL/Psychrometrics/DewPoint_TDryBulPhi.mo | 6 +- .../SpecificEnthalpy_TDryBulPhi.mo | 6 +- .../CDL/Psychrometrics/WetBulb_TDryBulPhi.mo | 6 +- Buildings/Controls/OBC/CDL/Reals/Abs.mo | 4 +- Buildings/Controls/OBC/CDL/Reals/Acos.mo | 4 +- Buildings/Controls/OBC/CDL/Reals/Add.mo | 6 +- .../Controls/OBC/CDL/Reals/AddParameter.mo | 4 +- Buildings/Controls/OBC/CDL/Reals/Asin.mo | 4 +- Buildings/Controls/OBC/CDL/Reals/Atan.mo | 4 +- Buildings/Controls/OBC/CDL/Reals/Atan2.mo | 6 +- Buildings/Controls/OBC/CDL/Reals/Average.mo | 6 +- Buildings/Controls/OBC/CDL/Reals/Cos.mo | 4 +- Buildings/Controls/OBC/CDL/Reals/Divide.mo | 6 +- Buildings/Controls/OBC/CDL/Reals/Exp.mo | 4 +- Buildings/Controls/OBC/CDL/Reals/Greater.mo | 18 +- .../OBC/CDL/Reals/GreaterThreshold.mo | 12 +- .../Controls/OBC/CDL/Reals/Hysteresis.mo | 4 +- Buildings/Controls/OBC/CDL/Reals/Less.mo | 18 +- .../Controls/OBC/CDL/Reals/LessThreshold.mo | 12 +- .../Controls/OBC/CDL/Reals/LimitSlewRate.mo | 4 +- Buildings/Controls/OBC/CDL/Reals/Limiter.mo | 4 +- Buildings/Controls/OBC/CDL/Reals/Line.mo | 12 +- Buildings/Controls/OBC/CDL/Reals/Log.mo | 4 +- Buildings/Controls/OBC/CDL/Reals/Log10.mo | 4 +- .../Controls/OBC/CDL/Reals/MatrixGain.mo | 4 +- Buildings/Controls/OBC/CDL/Reals/MatrixMax.mo | 4 +- Buildings/Controls/OBC/CDL/Reals/MatrixMin.mo | 4 +- Buildings/Controls/OBC/CDL/Reals/Max.mo | 6 +- Buildings/Controls/OBC/CDL/Reals/Min.mo | 6 +- Buildings/Controls/OBC/CDL/Reals/Modulo.mo | 6 +- .../Controls/OBC/CDL/Reals/MovingAverage.mo | 4 +- Buildings/Controls/OBC/CDL/Reals/MultiMax.mo | 4 +- Buildings/Controls/OBC/CDL/Reals/MultiMin.mo | 4 +- Buildings/Controls/OBC/CDL/Reals/MultiSum.mo | 4 +- Buildings/Controls/OBC/CDL/Reals/Multiply.mo | 6 +- .../OBC/CDL/Reals/MultiplyByParameter.mo | 4 +- Buildings/Controls/OBC/CDL/Reals/Round.mo | 4 +- Buildings/Controls/OBC/CDL/Reals/Sin.mo | 4 +- Buildings/Controls/OBC/CDL/Reals/Sort.mo | 4 +- .../OBC/CDL/Reals/Sources/CalendarTime.mo | 12 +- .../OBC/CDL/Reals/Sources/CivilTime.mo | 2 +- .../OBC/CDL/Reals/Sources/Constant.mo | 2 +- .../Controls/OBC/CDL/Reals/Sources/Pulse.mo | 2 +- .../Controls/OBC/CDL/Reals/Sources/Ramp.mo | 2 +- .../OBC/CDL/Reals/Sources/TimeTable.mo | 2 +- Buildings/Controls/OBC/CDL/Reals/Sqrt.mo | 4 +- Buildings/Controls/OBC/CDL/Reals/Subtract.mo | 6 +- Buildings/Controls/OBC/CDL/Reals/Switch.mo | 8 +- Buildings/Controls/OBC/CDL/Reals/Tan.mo | 4 +- .../OBC/CDL/Routing/BooleanExtractSignal.mo | 4 +- .../OBC/CDL/Routing/BooleanExtractor.mo | 6 +- .../CDL/Routing/BooleanScalarReplicator.mo | 4 +- .../OBC/CDL/Routing/BooleanVectorFilter.mo | 4 +- .../CDL/Routing/BooleanVectorReplicator.mo | 4 +- .../OBC/CDL/Routing/IntegerExtractSignal.mo | 4 +- .../OBC/CDL/Routing/IntegerExtractor.mo | 6 +- .../CDL/Routing/IntegerScalarReplicator.mo | 4 +- .../OBC/CDL/Routing/IntegerVectorFilter.mo | 4 +- .../CDL/Routing/IntegerVectorReplicator.mo | 4 +- .../OBC/CDL/Routing/RealExtractSignal.mo | 4 +- .../Controls/OBC/CDL/Routing/RealExtractor.mo | 6 +- .../OBC/CDL/Routing/RealScalarReplicator.mo | 4 +- .../OBC/CDL/Routing/RealVectorFilter.mo | 4 +- .../OBC/CDL/Routing/RealVectorReplicator.mo | 4 +- .../Controls/OBC/CDL/Utilities/SunRiseSet.mo | 6 +- .../Combined/BaseClasses/PartialSeries.mo | 10 +- .../BaseClasses/PartialBuildingWithETS.mo | 13 +- .../Combined/BuildingTimeSeriesWithETS.mo | 4 +- .../BuildingTimeSeriesWithETSWithDHWTank.mo | 11 +- .../BaseClasses/MassExchange.mo | 2 +- .../HeatExchangers/EvaporatorCondenser.mo | 2 +- .../Data/EquationFitReversible/Generic.mo | 12 +- .../Fluid/HeatPumps/EquationFitReversible.mo | 18 +- .../BaseClasses/ControlledFlowMachine.mo | 4 +- .../Controls/OBC/CDL/Interfaces/package.mo | 2 +- ...n_ControllerChillerDXHeatingEconomizer.txt | 14 +- ...AV_Examples_ChillerDXHeatingEconomizer.txt | 14 +- ...lities_Plotters_Examples_SingleZoneVAV.txt | 4 +- .../Resources/Scripts/BuildingsPy/conf.yml | 2 +- Buildings/package.mo | 6 + 143 files changed, 492 insertions(+), 611 deletions(-) delete mode 100644 Buildings/Controls/DemandResponse/BaseClasses/NormalOperation.mo delete mode 100644 Buildings/Controls/DemandResponse/BaseClasses/PartialDemandResponse.mo delete mode 100644 Buildings/Controls/DemandResponse/BaseClasses/ShedOperation.mo diff --git a/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerChillerDXHeatingEconomizer.mo b/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerChillerDXHeatingEconomizer.mo index 015dbfbb345..587ba098fe7 100644 --- a/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerChillerDXHeatingEconomizer.mo +++ b/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerChillerDXHeatingEconomizer.mo @@ -212,11 +212,6 @@ model ControllerChillerDXHeatingEconomizer annotation (Placement(transformation(extent={{-60,-30},{-40,-10}}))); Buildings.Controls.OBC.CDL.Reals.Switch swiFan "Switch fan on" annotation (Placement(transformation(extent={{70,120},{90,140}}))); - Buildings.Controls.OBC.CDL.Reals.Hysteresis hysHea( - final uLow=0.01, - final uHigh=0.05) - "Hysteresis for heating" - annotation (Placement(transformation(extent={{-30,120},{-10,140}}))); Buildings.Controls.OBC.CDL.Logical.MultiOr orFan(nin=3) "Switch fan on if heating, cooling, or occupied" annotation (Placement(transformation(extent={{40,94},{60,114}}))); @@ -226,6 +221,9 @@ model ControllerChillerDXHeatingEconomizer "Chiller on signal based on room temperature" annotation (Placement(transformation(extent={{20,-80},{40,-60}}))); + Controls.OBC.CDL.Reals.Greater heaOnTRoo(h=0.5) + "Heater on signal based on room temperature" + annotation (Placement(transformation(extent={{-60,120},{-40,140}}))); protected Modelica.Blocks.Sources.Constant TSetSupChiConst( final k=TSupChi_nominal) @@ -271,21 +269,17 @@ equation 138},{68,138}}, color={0,0,127})); connect(swiFan.y, yFan) annotation (Line(points={{92,130},{96,130},{96,90},{ 110,90}}, color={0,0,127})); - connect(conSup.yHea, hysHea.u) annotation (Line(points={{-39,86},{-34,86},{ - -34,130},{-32,130}}, color={0,0,127})); connect(swiFan.u2, orFan.y) annotation (Line(points={{68,130},{64,130},{64,104},{62,104}}, color={255,0,255})); - connect(hysHea.y, orFan.u[1]) annotation (Line(points={{-8,130},{24,130},{24, - 108.667},{38,108.667}}, - color={255,0,255})); connect(conEco.TMixSet, conCooVal.u_s) annotation (Line(points={{39,78},{-10, 78},{-10,-20},{-2,-20}}, color={0,0,127})); connect(and1.y, chiOn) annotation (Line(points={{91,-30},{96,-30},{96,-54},{110, -54}}, color={255,0,255})); connect(conEco.yCoiSta, and1.u1) annotation (Line(points={{61,62},{64,62},{64, -30},{68,-30}}, color={255,0,255})); - connect(uOcc, orFan.u[2]) annotation (Line(points={{-120,0},{-14,0},{-14,104}, - {38,104}}, color={255,0,255})); + connect(uOcc, orFan.u[1]) annotation (Line(points={{-120,0},{-14,0},{-14, + 101.667},{38,101.667}}, + color={255,0,255})); connect(TMix, conEco.TMix) annotation (Line(points={{-120,30},{-26,30},{-26,75}, {39,75}}, color={0,0,127})); connect(TOut, conEco.TOut) annotation (Line(points={{-120,-40},{-66,-40},{-66, @@ -303,8 +297,14 @@ equation connect(chiOnTRoo.y, conEco.cooSta) annotation (Line(points={{42,-70},{50,-70}, {50,40},{34,40},{34,62},{39,62}}, color={255,0,255})); - connect(chiOnTRoo.y, orFan.u[3]) annotation (Line(points={{42,-70},{50,-70},{ - 50,40},{34,40},{34,99.3333},{38,99.3333}}, color={255,0,255})); + connect(chiOnTRoo.y, orFan.u[2]) annotation (Line(points={{42,-70},{50,-70},{ + 50,40},{34,40},{34,104},{38,104}}, color={255,0,255})); + connect(heaOnTRoo.y, orFan.u[3]) annotation (Line(points={{-38,130},{20,130}, + {20,106.333},{38,106.333}}, color={255,0,255})); + connect(heaOnTRoo.u2, TRoo) annotation (Line(points={{-62,122},{-86,122},{-86, + -80},{-120,-80}}, color={0,0,127})); + connect(TSetRooHea, heaOnTRoo.u1) annotation (Line(points={{-120,120},{-80, + 120},{-80,130},{-62,130}}, color={0,0,127})); annotation ( defaultComponentName="conChiDXHeaEco", Icon(graphics={Line(points={{-100,-100},{0,2},{-100,100}}, color= @@ -316,6 +316,11 @@ heating coil and a cooling coil. ", revisions="
  • +March 28, 2024, by David Blum:
    +Adjust heating hysteresis to avoid chattering. +This is for issue 3735. +
    • +
  • November 20, 2020, by David Blum:
    Turn fan on when setup cooling required. This is for issue 2265. diff --git a/Buildings/Controls/DemandResponse/BaseClasses/BaselinePrediction.mo b/Buildings/Controls/DemandResponse/BaseClasses/BaselinePrediction.mo index 9ce57387544..910eb0df495 100644 --- a/Buildings/Controls/DemandResponse/BaseClasses/BaselinePrediction.mo +++ b/Buildings/Controls/DemandResponse/BaseClasses/BaselinePrediction.mo @@ -1,10 +1,34 @@ within Buildings.Controls.DemandResponse.BaseClasses; block BaselinePrediction "Predicts the baseline consumption" - extends Buildings.Controls.DemandResponse.BaseClasses.PartialDemandResponse(nIn=1, - nOut=1); + extends Modelica.Blocks.Icons.DiscreteBlock; + + parameter Integer nSam + "Number of intervals in a day for which baseline is computed"; + + parameter Integer nPre(min=1) + "Number of intervals for which future load need to be predicted (set to one to only predict current time, or to nSam to predict one day)"; + + parameter Buildings.Controls.Predictors.Types.PredictionModel predictionModel + "Load prediction model"; parameter Integer nHis(min=1) = 10 "Number of history terms to be stored"; + Modelica.Blocks.Interfaces.RealInput ECon(unit="J") + "Consumed electrical energy" + annotation (Placement(transformation(extent={{-140,-50},{-100,-10}}), + iconTransformation(extent={{-120,-30},{-100,-10}}))); + Modelica.Blocks.Interfaces.RealOutput PPre[nPre](each unit="W") + "Predicted power consumption for the current time interval" + annotation (Placement(transformation(extent={{100,-10},{120,10}}), + iconTransformation(extent={{100,-10},{120,10}}))); + + Modelica.Blocks.Interfaces.RealInput TOutFut[nPre-1](each unit="K") + if (predictionModel == Buildings.Controls.Predictors.Types.PredictionModel.WeatherRegression) + "Future outside air temperatures" + annotation (Placement( + transformation(extent={{-140,-110},{-100,-70}}), + iconTransformation(extent={{-120,-100},{-100,-80}}))); + Modelica.Blocks.Interfaces.RealInput TOut(unit="K", displayUnit="degC") if (predictionModel == Buildings.Controls.Predictors.Types.PredictionModel.WeatherRegression) "Outside air temperature" @@ -41,7 +65,7 @@ equation color={0,0,127}, smooth=Smooth.None)); connect(basLin.PPre, PPre) annotation (Line( - points={{11,0},{40,0},{40,-80},{110,-80}}, + points={{11,0},{110,0}}, color={0,0,127}, smooth=Smooth.None)); connect(stoHis.u, isEventDay) annotation (Line( @@ -93,6 +117,12 @@ the current type of day, then the predicted power consumption ", revisions="
    • +March 29, 2024, by Michael Wetter:
      +Refactored implementation to avoid an infinite event iteration in OpenModelica.
      +This is for +#3754. +
      • +
    • March 20, 2014 by Michael Wetter:
      First implementation.
      • diff --git a/Buildings/Controls/DemandResponse/BaseClasses/NormalOperation.mo b/Buildings/Controls/DemandResponse/BaseClasses/NormalOperation.mo deleted file mode 100644 index b5727be48c8..00000000000 --- a/Buildings/Controls/DemandResponse/BaseClasses/NormalOperation.mo +++ /dev/null @@ -1,31 +0,0 @@ -within Buildings.Controls.DemandResponse.BaseClasses; -block NormalOperation "Normal operation" - extends Modelica.StateGraph.StepWithSignal(nIn=1, nOut=1); - Modelica.Blocks.Interfaces.RealInput PCon(unit="W") - "Consumed electrical power" - annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}), - iconTransformation(extent={{-140,-100},{-100,-60}}))); - Modelica.Blocks.Interfaces.RealOutput PPre(unit="W") - "Predicted power consumption for current hour" - annotation (Placement(transformation(extent={{100,-90},{120,-70}}))); - -equation - PPre = PCon; - annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100, - -100},{100,100}}), graphics={Text( - extent={{-70,64},{74,-54}}, - textColor={0,0,255}, - textString="N")}), Documentation(info=" -

      -Block that outputs the currently consumed electrical power, -which is equal to its input signal. -

      -", revisions=" -
        -
      • -March 20, 2014 by Michael Wetter:
        -First implementation. -
        • -
      -")); -end NormalOperation; diff --git a/Buildings/Controls/DemandResponse/BaseClasses/PartialDemandResponse.mo b/Buildings/Controls/DemandResponse/BaseClasses/PartialDemandResponse.mo deleted file mode 100644 index 9d94a02394d..00000000000 --- a/Buildings/Controls/DemandResponse/BaseClasses/PartialDemandResponse.mo +++ /dev/null @@ -1,42 +0,0 @@ -within Buildings.Controls.DemandResponse.BaseClasses; -partial block PartialDemandResponse - "Partial block that declares common data for demand response models" - extends Modelica.StateGraph.Step(nIn=1, nOut=1); - parameter Integer nSam - "Number of intervals in a day for which baseline is computed"; - - parameter Integer nPre(min=1) - "Number of intervals for which future load need to be predicted (set to one to only predict current time, or to nSam to predict one day)"; - - parameter Buildings.Controls.Predictors.Types.PredictionModel predictionModel - "Load prediction model"; - - Modelica.Blocks.Interfaces.RealInput ECon(unit="J") - "Consumed electrical energy" - annotation (Placement(transformation(extent={{-140,-50},{-100,-10}}), - iconTransformation(extent={{-120,-30},{-100,-10}}))); - Modelica.Blocks.Interfaces.RealOutput PPre[nPre](each unit="W") - "Predicted power consumption for the current time interval" - annotation (Placement(transformation(extent={{100,-90},{120,-70}}))); - - Modelica.Blocks.Interfaces.RealInput TOutFut[nPre-1](each unit="K") - if (predictionModel == Buildings.Controls.Predictors.Types.PredictionModel.WeatherRegression) - "Future outside air temperatures" - annotation (Placement( - transformation(extent={{-140,-110},{-100,-70}}), - iconTransformation(extent={{-120,-100},{-100,-80}}))); - annotation ( Documentation(info=" -

      -This is a partial block that declares parameters, inputs and outputs that are -used by the blocks that compute the demand reponse client. -

      -", -revisions=" -
        -
      • -March 20, 2014 by Michael Wetter:
        -First implementation. -
        • -
      -")); -end PartialDemandResponse; diff --git a/Buildings/Controls/DemandResponse/BaseClasses/ShedOperation.mo b/Buildings/Controls/DemandResponse/BaseClasses/ShedOperation.mo deleted file mode 100644 index a66cfb5dff0..00000000000 --- a/Buildings/Controls/DemandResponse/BaseClasses/ShedOperation.mo +++ /dev/null @@ -1,37 +0,0 @@ -within Buildings.Controls.DemandResponse.BaseClasses; -block ShedOperation "Computes the consumption with the shed taken into account" - extends Modelica.StateGraph.Step(nIn=1, nOut=1); - Modelica.Blocks.Interfaces.RealInput PCon(unit="W") - "Consumed electrical power" - annotation (Placement(transformation(extent={{-120,-90},{-100,-70}}), - iconTransformation(extent={{-140,-110},{-100,-70}}))); - - Modelica.Blocks.Interfaces.RealInput yShed(min=-1, max=1, unit="1") - "Amount of load to shed. Set to 0.5 to shed 50% of load" - annotation (Placement(transformation(extent={{-120,-50},{-100,-30}}), - iconTransformation(extent={{-120,-30},{-100,-10}}))); - - Modelica.Blocks.Interfaces.RealOutput PPre(unit="W") - "Predicted power consumption for current hour" - annotation (Placement(transformation(extent={{100,-90},{120,-70}}))); - -equation - PPre = yShed*PCon; - annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100, - -100},{100,100}}), graphics={Text( - extent={{-70,64},{74,-54}}, - textColor={0,0,255}, - textString="SH")}), Documentation(info=" -

      -This model computes the predicted load as the product of the shed -control signal and the consumed electrical power. -

      -", revisions=" -
        -
      • -March 20, 2014 by Michael Wetter:
        -First implementation. -
        • -
      -")); -end ShedOperation; diff --git a/Buildings/Controls/DemandResponse/BaseClasses/package.order b/Buildings/Controls/DemandResponse/BaseClasses/package.order index 254a1fc7712..1c812c9576e 100644 --- a/Buildings/Controls/DemandResponse/BaseClasses/package.order +++ b/Buildings/Controls/DemandResponse/BaseClasses/package.order @@ -1,4 +1 @@ BaselinePrediction -NormalOperation -PartialDemandResponse -ShedOperation diff --git a/Buildings/Controls/DemandResponse/Client.mo b/Buildings/Controls/DemandResponse/Client.mo index 82fb125f180..18128e756e9 100644 --- a/Buildings/Controls/DemandResponse/Client.mo +++ b/Buildings/Controls/DemandResponse/Client.mo @@ -1,11 +1,10 @@ within Buildings.Controls.DemandResponse; model Client "Demand response client" - extends Modelica.Blocks.Icons.Block; + extends Modelica.Blocks.Icons.DiscreteBlock; final parameter Modelica.Units.SI.Time tPeriod=24*3600 "Period, generally one day"; - final parameter Modelica.Units.SI.Time tSample=tPeriod/nSam - "Sample period, generally 900 or 3600 seconds"; + parameter Integer nSam "Number of samples in a day. For 1 hour sampling, set to 24"; parameter Integer nPre(min=1) = 1 @@ -65,162 +64,72 @@ model Client "Demand response client" annotation (Placement(transformation(extent={{100,40},{120,60}}))); protected - Modelica.StateGraph.InitialStep initialStep(nIn=0, nOut=1) - annotation (Placement(transformation(extent={{-80,70},{-60,90}}))); - inner Modelica.StateGraph.StateGraphRoot stateGraphRoot - annotation (Placement(transformation(extent={{60,60},{80,80}}))); - Modelica.StateGraph.Transition transition - annotation (Placement(transformation(extent={{-40,70},{-20,90}}))); + OBC.CDL.Reals.Multiply she "Outputs load taking shed signal into account" + annotation (Placement(transformation(extent={{30,20},{50,40}}))); + OBC.CDL.Routing.RealExtractor extIndRea + annotation (Placement(transformation(extent={{-10,60},{10,80}}))); + OBC.CDL.Integers.Sources.Constant conInt(k=1) + "Outputs 1 to extract the first signal of the demand prediction array" + annotation (Placement(transformation(extent={{-32,20},{-12,40}}))); BaseClasses.BaselinePrediction comBasLin( final nSam=nSam, final nHis=nHis, final nPre=nPre, - final predictionModel=predictionModel, - nIn=3, - nOut=1) + final predictionModel=predictionModel) "Baseline prediction" - annotation (Placement(transformation(extent={{20,40},{40,60}}))); - Modelica.StateGraph.Transition t1 "State transition" annotation (Placement( - transformation( - extent={{10,-10},{-10,10}}, - rotation=90, - origin={60,20}))); - BaseClasses.NormalOperation norOpe(nOut=2, nIn=1) - "Normal operation" - annotation (Placement(transformation(extent={{40,-40},{20,-20}}))); - Modelica.StateGraph.TransitionWithSignal - t2(enableTimer=false) "State transition" - annotation (Placement(transformation( - extent={{10,-10},{-10,10}}, - rotation=270, - origin={10,20}))); - Modelica.StateGraph.TransitionWithSignal t3 "State transition" - annotation (Placement(transformation( - extent={{10,10},{-10,-10}}, - origin={-2,-30}))); - BaseClasses.ShedOperation she(nIn=1, nOut=1) - "Operation during load shedding" - annotation (Placement(transformation(extent={{-10,-40},{-30,-20}}))); - Modelica.StateGraph.TransitionWithSignal - t4(enableTimer=false) "State transition" - annotation (Placement(transformation( - extent={{10,-10},{-10,10}}, - rotation=270, - origin={-40,10}))); - Modelica.Blocks.Sources.SampleTrigger tri(period=tSample) "Sample trigger" - annotation (Placement(transformation(extent={{-90,10},{-70,30}}))); + annotation (Placement(transformation(extent={{-60,60},{-40,80}}))); + Modelica.Blocks.Logical.Switch switch "Switch to select normal or shedded load" - annotation (Placement(transformation(extent={{40,-80},{60,-60}}))); + annotation (Placement(transformation(extent={{68,-10},{88,10}}))); equation - connect(initialStep.outPort[1], transition.inPort) annotation (Line( - points={{-59.5,80},{-34,80}}, - color={0,0,0}, - smooth=Smooth.None)); - connect(transition.outPort, comBasLin.inPort[1]) annotation (Line( - points={{-28.5,80},{6,80},{6,50.5},{19,50.5},{19,50.6667}}, - color={0,0,0}, - smooth=Smooth.None)); - connect(t1.inPort, comBasLin.outPort[1]) annotation (Line( - points={{60,24},{60,50},{40.5,50}}, - color={0,0,0}, - smooth=Smooth.None)); - connect(t1.outPort, norOpe.inPort[1]) annotation (Line( - points={{60,18.5},{60,-30},{41,-30}}, - color={0,0,0}, - smooth=Smooth.None)); connect(comBasLin.ECon, ECon) annotation (Line( - points={{19,48},{-64,48},{-64,36},{-94,36},{-94,4.44089e-16},{-110,4.44089e-16}}, - color={0,0,127}, - smooth=Smooth.None)); - connect(comBasLin.PPre[1], norOpe.PCon) annotation (Line( - points={{41,42},{80,42},{80,-38},{42,-38}}, + points={{-61,68},{-80,68},{-80,0},{-110,0}}, color={0,0,127}, smooth=Smooth.None)); - connect(t2.outPort, comBasLin.inPort[2]) annotation (Line( - points={{10,21.5},{10,50},{19,50}}, - color={0,0,0}, - smooth=Smooth.None)); - connect(t3.outPort, she.inPort[1]) annotation (Line( - points={{-3.5,-30},{-9,-30}}, - color={0,0,0}, - smooth=Smooth.None)); - connect(t4.inPort, she.outPort[1]) annotation (Line( - points={{-40,6},{-40,-30},{-30.5,-30}}, - color={0,0,0}, - smooth=Smooth.None)); - connect(t4.outPort, comBasLin.inPort[3]) annotation (Line( - points={{-40,11.5},{-40,50},{-20,50},{-20,49.3333},{19,49.3333}}, - color={0,0,0}, - smooth=Smooth.None)); - connect(t4.condition, tri.y) annotation (Line( - points={{-52,10},{-66,10},{-66,20},{-69,20}}, - color={255,0,255}, - smooth=Smooth.None)); - connect(t2.condition, tri.y) annotation (Line( - points={{-2,20},{-69,20}}, - color={255,0,255}, - smooth=Smooth.None)); - connect(norOpe.PPre, she.PCon) annotation (Line( - points={{19,-38},{6,-38},{6,-39},{-8,-39}}, - color={0,0,127}, - smooth=Smooth.None)); - connect(norOpe.active, switch.u2) annotation (Line( - points={{30,-41},{30,-70},{38,-70}}, - color={255,0,255}, - smooth=Smooth.None)); - connect(norOpe.outPort[1], t2.inPort) annotation (Line( - points={{19.5,-29.75},{10,-29.75},{10,16}}, - color={0,0,0}, - smooth=Smooth.None)); - connect(norOpe.outPort[2], t3.inPort) annotation (Line( - points={{19.5,-30.25},{12,-30.25},{12,-30},{2,-30}}, - color={0,0,0}, - smooth=Smooth.None)); - connect(shed, t3.condition) annotation (Line( - points={{-110,-30},{-80,-30},{-80,-10},{-2,-10},{-2,-18}}, - color={255,0,255}, - smooth=Smooth.None)); - connect(switch.u1, she.PCon) annotation (Line( - points={{38,-62},{10,-62},{10,-39},{-8,-39}}, - color={0,0,127}, - smooth=Smooth.None)); - connect(switch.u3, she.PPre) annotation (Line( - points={{38,-78},{-40,-78},{-40,-38},{-31,-38}}, - color={0,0,127}, - smooth=Smooth.None)); connect(isEventDay, comBasLin.isEventDay) annotation (Line( - points={{-110,40},{-90,40},{-90,54},{19,54}}, + points={{-110,40},{-88,40},{-88,74},{-61,74}}, color={255,0,255}, smooth=Smooth.None)); connect(comBasLin.TOut, TOut) annotation (Line( - points={{19,45},{-60,45},{-60,-70},{-110,-70}}, + points={{-61,65},{-74,65},{-74,-70},{-110,-70}}, color={0,0,127}, smooth=Smooth.None)); connect(typeOfDay, comBasLin.typeOfDay) annotation (Line( - points={{-110,80},{-90,80},{-90,58},{19,58}}, + points={{-110,80},{-86,80},{-86,78},{-61,78}}, color={0,127,0}, smooth=Smooth.None)); connect(comBasLin.TOutFut, TOutFut) annotation (Line( - points={{19,41},{-56,41},{-56,-90},{-110,-90}}, - color={0,0,127}, - smooth=Smooth.None)); - connect(yShed, she.yShed) annotation (Line( - points={{-110,-50},{-48,-50},{-48,-14},{-6,-14},{-6,-32},{-9,-32}}, + points={{-61,61},{-72,61},{-72,-90},{-110,-90}}, color={0,0,127}, smooth=Smooth.None)); // Only PPre[1] will take into account the shedded load. connect(switch.y, PPre) annotation (Line( - points={{61,-70},{90,-70},{90,0},{110,0}}, + points={{89,0},{110,0}}, color={0,0,127}, smooth=Smooth.None)); connect(comBasLin.PPre, PPreNoShe) annotation (Line( - points={{41,42},{80,42},{80,50},{110,50}}, + points={{-39,70},{-20,70},{-20,50},{110,50}}, color={0,0,127}, smooth=Smooth.None)); + connect(switch.u1, she.y) + annotation (Line(points={{66,8},{60,8},{60,30},{52,30}}, color={0,0,127})); + connect(yShed, she.u2) annotation (Line(points={{-110,-50},{24,-50},{24,24},{28, + 24}}, color={0,0,127})); + connect(shed, switch.u2) annotation (Line(points={{-110,-30},{-12,-30},{-12,0}, + {66,0}}, color={255,0,255})); + connect(comBasLin.PPre, extIndRea.u) + annotation (Line(points={{-39,70},{-12,70}}, color={0,0,127})); + connect(conInt.y, extIndRea.index) + annotation (Line(points={{-10,30},{0,30},{0,58}}, color={255,127,0})); + connect(switch.u3, extIndRea.y) annotation (Line(points={{66,-8},{20,-8},{20,70}, + {12,70}}, color={0,0,127})); + connect(extIndRea.y, she.u1) annotation (Line(points={{12,70},{20,70},{20,36}, + {28,36}}, color={0,0,127})); annotation ( - Icon(graphics={ Text( + Icon(graphics={ + Text( extent={{-70,54},{74,-64}}, textColor={0,0,255}, textString="DR")}), @@ -264,6 +173,12 @@ Buildings.Controls.Predictors.ElectricalLoad. ", revisions="
      • +March 29, 2024, by Michael Wetter:
        +Refactored implementation to avoid an infinite event iteration in OpenModelica.
        +This is for +#3754. +
        • +
      • October 29, 2014, by Michael Wetter:
        Revised implementation.
        • diff --git a/Buildings/Controls/OBC/CDL/Conversions/BooleanToInteger.mo b/Buildings/Controls/OBC/CDL/Conversions/BooleanToInteger.mo index 48c362187ec..e4076afd5ea 100644 --- a/Buildings/Controls/OBC/CDL/Conversions/BooleanToInteger.mo +++ b/Buildings/Controls/OBC/CDL/Conversions/BooleanToInteger.mo @@ -5,10 +5,10 @@ block BooleanToInteger "Output signal for true Boolean input"; parameter Integer integerFalse=0 "Output signal for false Boolean input"; - Interfaces.BooleanInput u + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u "Connector of Boolean input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.IntegerOutput y + Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y "Connector of Integer output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Conversions/BooleanToReal.mo b/Buildings/Controls/OBC/CDL/Conversions/BooleanToReal.mo index 55e2827b477..5809d67b250 100644 --- a/Buildings/Controls/OBC/CDL/Conversions/BooleanToReal.mo +++ b/Buildings/Controls/OBC/CDL/Conversions/BooleanToReal.mo @@ -5,10 +5,10 @@ block BooleanToReal "Output signal for true Boolean input"; parameter Real realFalse=0.0 "Output signal for false Boolean input"; - Interfaces.BooleanInput u + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u "Connector of Boolean input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector of Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Conversions/IntegerToReal.mo b/Buildings/Controls/OBC/CDL/Conversions/IntegerToReal.mo index 497b3ac4ee3..8df684521e1 100644 --- a/Buildings/Controls/OBC/CDL/Conversions/IntegerToReal.mo +++ b/Buildings/Controls/OBC/CDL/Conversions/IntegerToReal.mo @@ -1,10 +1,10 @@ within Buildings.Controls.OBC.CDL.Conversions; block IntegerToReal "Convert Integer to Real signals" - Interfaces.IntegerInput u + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u "Connector of Integer input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector of Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Conversions/RealToInteger.mo b/Buildings/Controls/OBC/CDL/Conversions/RealToInteger.mo index 1010beb6061..e702193fec2 100644 --- a/Buildings/Controls/OBC/CDL/Conversions/RealToInteger.mo +++ b/Buildings/Controls/OBC/CDL/Conversions/RealToInteger.mo @@ -1,10 +1,10 @@ within Buildings.Controls.OBC.CDL.Conversions; block RealToInteger "Convert Real to Integer signal" - Interfaces.RealInput u + Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Connector of Real input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.IntegerOutput y + Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y "Connector of Integer output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Discrete/FirstOrderHold.mo b/Buildings/Controls/OBC/CDL/Discrete/FirstOrderHold.mo index e6afe0749d8..734ce804e85 100644 --- a/Buildings/Controls/OBC/CDL/Discrete/FirstOrderHold.mo +++ b/Buildings/Controls/OBC/CDL/Discrete/FirstOrderHold.mo @@ -6,10 +6,10 @@ block FirstOrderHold final unit="s", min=1E-3) "Sample period of component"; - Interfaces.RealInput u + Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Continuous input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Continuous output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Discrete/Sampler.mo b/Buildings/Controls/OBC/CDL/Discrete/Sampler.mo index d53a67f2456..ac9928a9d29 100644 --- a/Buildings/Controls/OBC/CDL/Discrete/Sampler.mo +++ b/Buildings/Controls/OBC/CDL/Discrete/Sampler.mo @@ -6,10 +6,10 @@ block Sampler final unit="s", min=1E-3) "Sample period of component"; - Interfaces.RealInput u + Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Continuous input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Continuous output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Discrete/TriggeredMax.mo b/Buildings/Controls/OBC/CDL/Discrete/TriggeredMax.mo index 37c20407a7a..64eba774431 100644 --- a/Buildings/Controls/OBC/CDL/Discrete/TriggeredMax.mo +++ b/Buildings/Controls/OBC/CDL/Discrete/TriggeredMax.mo @@ -1,13 +1,13 @@ within Buildings.Controls.OBC.CDL.Discrete; block TriggeredMax "Output the maximum, absolute value of a continuous signal at trigger instants" - Interfaces.RealInput u + Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Connector with a Real input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanInput trigger + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput trigger "Connector for trigger" annotation (Placement(transformation(origin={0,-120},extent={{-20,-20},{20,20}},rotation=90))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector with a Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Discrete/TriggeredMovingMean.mo b/Buildings/Controls/OBC/CDL/Discrete/TriggeredMovingMean.mo index f8d378af6ae..8c649359f3f 100644 --- a/Buildings/Controls/OBC/CDL/Discrete/TriggeredMovingMean.mo +++ b/Buildings/Controls/OBC/CDL/Discrete/TriggeredMovingMean.mo @@ -4,13 +4,13 @@ block TriggeredMovingMean parameter Integer n( min=1) "Number of samples over which the input is averaged"; - Interfaces.RealInput u + Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Continuous input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanInput trigger + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput trigger "Boolean signal that triggers the block" annotation (Placement(transformation(origin={0,-120},extent={{-20,-20},{20,20}},rotation=90),iconTransformation(extent={{-20,-20},{20,20}},rotation=90,origin={0,-120}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Discrete averaged signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Discrete/TriggeredSampler.mo b/Buildings/Controls/OBC/CDL/Discrete/TriggeredSampler.mo index d3e2d771623..3523ac18c00 100644 --- a/Buildings/Controls/OBC/CDL/Discrete/TriggeredSampler.mo +++ b/Buildings/Controls/OBC/CDL/Discrete/TriggeredSampler.mo @@ -3,13 +3,13 @@ block TriggeredSampler "Triggered sampling of continuous signals" parameter Real y_start=0 "Initial value of output signal"; - Interfaces.RealInput u + Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Connector with a Real input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanInput trigger + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput trigger "Signal that triggers the sampler" annotation (Placement(transformation(origin={0,-120},extent={{-20,-20},{20,20}},rotation=90))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector with a Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Discrete/UnitDelay.mo b/Buildings/Controls/OBC/CDL/Discrete/UnitDelay.mo index 190697dfbd9..dd15269b482 100644 --- a/Buildings/Controls/OBC/CDL/Discrete/UnitDelay.mo +++ b/Buildings/Controls/OBC/CDL/Discrete/UnitDelay.mo @@ -8,10 +8,10 @@ block UnitDelay "Sample period of component"; parameter Real y_start=0 "Initial value of output signal"; - Interfaces.RealInput u + Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Continuous input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Continuous output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Discrete/ZeroOrderHold.mo b/Buildings/Controls/OBC/CDL/Discrete/ZeroOrderHold.mo index ec418d4b4c8..6c9189a9fbe 100644 --- a/Buildings/Controls/OBC/CDL/Discrete/ZeroOrderHold.mo +++ b/Buildings/Controls/OBC/CDL/Discrete/ZeroOrderHold.mo @@ -6,10 +6,10 @@ block ZeroOrderHold final unit="s", min=1E-3) "Sample period of component"; - Interfaces.RealInput u + Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Continuous input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Continuous output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/Abs.mo b/Buildings/Controls/OBC/CDL/Integers/Abs.mo index b33e87704f7..95936844b3d 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Abs.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Abs.mo @@ -1,10 +1,10 @@ within Buildings.Controls.OBC.CDL.Integers; block Abs "Output the absolute value of the input" - Interfaces.IntegerInput u + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u "Connector of Integer input signals" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.IntegerOutput y + Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y "Connector of Integer output signals" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/Add.mo b/Buildings/Controls/OBC/CDL/Integers/Add.mo index 812d671f352..573e430afe9 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Add.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Add.mo @@ -1,13 +1,13 @@ within Buildings.Controls.OBC.CDL.Integers; block Add "Output the sum of the two inputs" - Interfaces.IntegerInput u1 + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u1 "Connector of Integer input signal 1" annotation (Placement(transformation(extent={{-140,40},{-100,80}}))); - Interfaces.IntegerInput u2 + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u2 "Connector of Integer input signal 2" annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}))); - Interfaces.IntegerOutput y + Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y "Connector of Integer output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/AddParameter.mo b/Buildings/Controls/OBC/CDL/Integers/AddParameter.mo index b6ff918f857..f7cd31ef70e 100644 --- a/Buildings/Controls/OBC/CDL/Integers/AddParameter.mo +++ b/Buildings/Controls/OBC/CDL/Integers/AddParameter.mo @@ -2,9 +2,9 @@ within Buildings.Controls.OBC.CDL.Integers; block AddParameter "Output the sum of an input plus a parameter" parameter Integer p "Value to be added"; - Interfaces.IntegerInput u "Connector of Integer input signal" + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u "Connector of Integer input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.IntegerOutput y "Connector of Integer output signal" + Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y "Connector of Integer output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); equation diff --git a/Buildings/Controls/OBC/CDL/Integers/Change.mo b/Buildings/Controls/OBC/CDL/Integers/Change.mo index 567ef291076..dd57641f82d 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Change.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Change.mo @@ -3,16 +3,16 @@ block Change "Output whether the Integer input changes values, increases or decreases" parameter Integer pre_u_start=0 "Start value of pre(u) at initial time"; - Interfaces.IntegerInput u + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u "Connector of Integer input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Connector of Boolean output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); - Interfaces.BooleanOutput up + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput up "Connector of Boolean output signal indicating input increase" annotation (Placement(transformation(extent={{100,40},{140,80}}))); - Interfaces.BooleanOutput down + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput down "Connector of Boolean output signal indicating input decrease" annotation (Placement(transformation(extent={{100,-80},{140,-40}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/Equal.mo b/Buildings/Controls/OBC/CDL/Integers/Equal.mo index 6112721a8f7..3320714b50d 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Equal.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Equal.mo @@ -1,13 +1,13 @@ within Buildings.Controls.OBC.CDL.Integers; block Equal "Output y is true, if input u1 is equal to input u2" - Interfaces.IntegerInput u1 + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u1 "Connector of first Integer input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.IntegerInput u2 + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u2 "Connector of second Integer input signal" annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Connector of Boolean output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/Greater.mo b/Buildings/Controls/OBC/CDL/Integers/Greater.mo index 6293637d000..bb69622e7ae 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Greater.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Greater.mo @@ -1,13 +1,13 @@ within Buildings.Controls.OBC.CDL.Integers; block Greater "Output y is true, if input u1 is greater than input u2" - Interfaces.IntegerInput u1 + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u1 "Connector of first Integer input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.IntegerInput u2 + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u2 "Connector of second Integer input signal" annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Connector of Boolean output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/GreaterEqual.mo b/Buildings/Controls/OBC/CDL/Integers/GreaterEqual.mo index 9857b293c10..0924fba9a44 100644 --- a/Buildings/Controls/OBC/CDL/Integers/GreaterEqual.mo +++ b/Buildings/Controls/OBC/CDL/Integers/GreaterEqual.mo @@ -1,13 +1,13 @@ within Buildings.Controls.OBC.CDL.Integers; block GreaterEqual "Output y is true, if input u1 is greater or equal than input u2" - Interfaces.IntegerInput u1 + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u1 "Connector of first Integer input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.IntegerInput u2 + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u2 "Connector of second Integer input signal" annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Connector of Boolean output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/GreaterEqualThreshold.mo b/Buildings/Controls/OBC/CDL/Integers/GreaterEqualThreshold.mo index a170947d544..b1c582d03a2 100644 --- a/Buildings/Controls/OBC/CDL/Integers/GreaterEqualThreshold.mo +++ b/Buildings/Controls/OBC/CDL/Integers/GreaterEqualThreshold.mo @@ -3,10 +3,10 @@ block GreaterEqualThreshold "Output y is true, if input u is greater or equal than threshold" parameter Integer t=0 "Comparison with respect to a threshold"; - Interfaces.IntegerInput u + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u "Connector of Integer input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Connector of Boolean output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/GreaterThreshold.mo b/Buildings/Controls/OBC/CDL/Integers/GreaterThreshold.mo index 5df8b1c8187..0e3e96cfb15 100644 --- a/Buildings/Controls/OBC/CDL/Integers/GreaterThreshold.mo +++ b/Buildings/Controls/OBC/CDL/Integers/GreaterThreshold.mo @@ -3,10 +3,10 @@ block GreaterThreshold "Output y is true, if input u is greater than a threshold" parameter Integer t=0 "Threshold for comparison"; - Interfaces.IntegerInput u + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u "Connector of Integer input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Connector of Boolean output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/Less.mo b/Buildings/Controls/OBC/CDL/Integers/Less.mo index c5b1dc1cf54..3a7dd12bf90 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Less.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Less.mo @@ -1,13 +1,13 @@ within Buildings.Controls.OBC.CDL.Integers; block Less "Output y is true, if input u1 is less than input u2" - Interfaces.IntegerInput u1 + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u1 "Connector of first Integer input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.IntegerInput u2 + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u2 "Connector of second Integer input signal" annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Connector of Boolean output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/LessEqual.mo b/Buildings/Controls/OBC/CDL/Integers/LessEqual.mo index 888de514668..1d6fad2c9d8 100644 --- a/Buildings/Controls/OBC/CDL/Integers/LessEqual.mo +++ b/Buildings/Controls/OBC/CDL/Integers/LessEqual.mo @@ -1,13 +1,13 @@ within Buildings.Controls.OBC.CDL.Integers; block LessEqual "Output y is true, if input u1 is less or equal than input u2" - Interfaces.IntegerInput u1 + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u1 "Connector of first Integer input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.IntegerInput u2 + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u2 "Connector of second Integer input signal" annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Connector of Boolean output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/LessEqualThreshold.mo b/Buildings/Controls/OBC/CDL/Integers/LessEqualThreshold.mo index 7467e814a3c..b5bb065179f 100644 --- a/Buildings/Controls/OBC/CDL/Integers/LessEqualThreshold.mo +++ b/Buildings/Controls/OBC/CDL/Integers/LessEqualThreshold.mo @@ -3,10 +3,10 @@ block LessEqualThreshold "Output y is true, if input u is less or equal than a threshold" parameter Integer t=0 "Threshold for comparison"; - Interfaces.IntegerInput u + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u "Connector of Integer input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Connector of Boolean output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/LessThreshold.mo b/Buildings/Controls/OBC/CDL/Integers/LessThreshold.mo index 4e7ec435009..a8ffcdfb71c 100644 --- a/Buildings/Controls/OBC/CDL/Integers/LessThreshold.mo +++ b/Buildings/Controls/OBC/CDL/Integers/LessThreshold.mo @@ -3,10 +3,10 @@ block LessThreshold "Output y is true, if input u is less than a threshold" parameter Integer t=0 "Threshold for comparison"; - Interfaces.IntegerInput u + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u "Connector of Integer input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Connector of Boolean output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/Max.mo b/Buildings/Controls/OBC/CDL/Integers/Max.mo index 3f12e48ba34..543759df237 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Max.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Max.mo @@ -1,13 +1,13 @@ within Buildings.Controls.OBC.CDL.Integers; block Max "Pass through the largest signal" - Interfaces.IntegerInput u1 + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u1 "Connector of Integer input signal 1" annotation (Placement(transformation(extent={{-140,40},{-100,80}}))); - Interfaces.IntegerInput u2 + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u2 "Connector of Integer input signal 2" annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}))); - Interfaces.IntegerOutput y + Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y "Connector of Integer output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/Min.mo b/Buildings/Controls/OBC/CDL/Integers/Min.mo index 4d94420217a..784130cf638 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Min.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Min.mo @@ -1,13 +1,13 @@ within Buildings.Controls.OBC.CDL.Integers; block Min "Pass through the smallest signal" - Interfaces.IntegerInput u1 + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u1 "Connector of Integer input signal 1" annotation (Placement(transformation(extent={{-140,40},{-100,80}}))); - Interfaces.IntegerInput u2 + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u2 "Connector of Integer input signal 2" annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}))); - Interfaces.IntegerOutput y + Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y "Connector of Integer output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/MultiSum.mo b/Buildings/Controls/OBC/CDL/Integers/MultiSum.mo index eddbf959511..9b9a411ca28 100644 --- a/Buildings/Controls/OBC/CDL/Integers/MultiSum.mo +++ b/Buildings/Controls/OBC/CDL/Integers/MultiSum.mo @@ -9,10 +9,10 @@ block MultiSum 1, nin) "Input gains"; - Interfaces.IntegerInput u[nin] + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u[nin] "Connector of Integer input signals" annotation (Placement(transformation(extent={{-140,70},{-100,-70}}))); - Interfaces.IntegerOutput y + Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y "Connector of Integer output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/Multiply.mo b/Buildings/Controls/OBC/CDL/Integers/Multiply.mo index a061e24a143..71bd59a92e1 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Multiply.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Multiply.mo @@ -1,12 +1,12 @@ within Buildings.Controls.OBC.CDL.Integers; block Multiply "Output product of the two inputs" - Interfaces.IntegerInput u1 + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u1 "Connector of Integer input signal 1" annotation (Placement(transformation(extent={{-140,40},{-100,80}}))); - Interfaces.IntegerInput u2 + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u2 "Connector of Integer input signal 2" annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}))); - Interfaces.IntegerOutput y + Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y "Connector of Integer output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/OnCounter.mo b/Buildings/Controls/OBC/CDL/Integers/OnCounter.mo index 7992aea89d2..9d9612150b1 100644 --- a/Buildings/Controls/OBC/CDL/Integers/OnCounter.mo +++ b/Buildings/Controls/OBC/CDL/Integers/OnCounter.mo @@ -3,13 +3,13 @@ block OnCounter "Increment the output if the input switches to true" parameter Integer y_start=0 "Initial and reset value of y if input reset switches to true"; - Interfaces.BooleanInput trigger + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput trigger "Boolean input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanInput reset + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput reset "Reset the counter" annotation (Placement(transformation(extent={{-20,-20},{20,20}},rotation=90,origin={0,-120}))); - Interfaces.IntegerOutput y + Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y "Integer output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/Sources/Constant.mo b/Buildings/Controls/OBC/CDL/Integers/Sources/Constant.mo index c9d0f05db6c..e7dc5354d92 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Sources/Constant.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Sources/Constant.mo @@ -3,7 +3,7 @@ block Constant "Output constant signal of type Integer" parameter Integer k "Constant output value"; - Interfaces.IntegerOutput y + Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y "Connector of Integer output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/Sources/Pulse.mo b/Buildings/Controls/OBC/CDL/Integers/Sources/Pulse.mo index b39faa2ffc7..82a5b4f7f83 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Sources/Pulse.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Sources/Pulse.mo @@ -19,7 +19,7 @@ block Pulse "Shift time for output"; parameter Integer offset=0 "Offset of output signals"; - Interfaces.IntegerOutput y + Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y "Connector of Pulse output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/Sources/TimeTable.mo b/Buildings/Controls/OBC/CDL/Integers/Sources/TimeTable.mo index 3a9609d3525..1114703510e 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Sources/TimeTable.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Sources/TimeTable.mo @@ -11,7 +11,7 @@ block TimeTable final unit="s", min=1E-6) "Periodicity of table"; - Interfaces.IntegerOutput y[nout] + Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y[nout] "Output of the table" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/Subtract.mo b/Buildings/Controls/OBC/CDL/Integers/Subtract.mo index 042dcea96f5..2b5b03d4a12 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Subtract.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Subtract.mo @@ -1,12 +1,12 @@ within Buildings.Controls.OBC.CDL.Integers; block Subtract "Output the difference of the two inputs" - Interfaces.IntegerInput u1 + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u1 "Connector of Integer input signal 1" annotation (Placement(transformation(extent={{-140,40},{-100,80}}))); - Interfaces.IntegerInput u2 + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u2 "Connector of Integer input signal 2" annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}))); - Interfaces.IntegerOutput y + Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y "Connector of Integer output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}), iconTransformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/Switch.mo b/Buildings/Controls/OBC/CDL/Integers/Switch.mo index d319d1a2270..3e3270926a3 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Switch.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Switch.mo @@ -1,16 +1,16 @@ within Buildings.Controls.OBC.CDL.Integers; block Switch "Switch between two integer signals" - Interfaces.IntegerInput u1 + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u1 "Integer input signal" annotation (Placement(transformation(extent={{-140,60},{-100,100}}))); - Interfaces.BooleanInput u2 + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u2 "Boolean switch input signal, if true, y=u1, else y=u3" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.IntegerInput u3 + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u3 "Integer input signal" annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}))); - Interfaces.IntegerOutput y + Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y "Integer output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Logical/And.mo b/Buildings/Controls/OBC/CDL/Logical/And.mo index 77d04d82aeb..91ea76cac43 100644 --- a/Buildings/Controls/OBC/CDL/Logical/And.mo +++ b/Buildings/Controls/OBC/CDL/Logical/And.mo @@ -1,13 +1,13 @@ within Buildings.Controls.OBC.CDL.Logical; block And "Logical 'and': y = u1 and u2" - Interfaces.BooleanInput u1 + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1 "Connector of first Boolean input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanInput u2 + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u2 "Connector of second Boolean input signal" annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Connector of Boolean output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Logical/Change.mo b/Buildings/Controls/OBC/CDL/Logical/Change.mo index ed700868a52..891a2381aa7 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Change.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Change.mo @@ -3,10 +3,10 @@ block Change "Output y is true, if the input u has a rising or falling edge (y = change(u))" parameter Boolean pre_u_start=false "Start value of pre(u) at initial time"; - Interfaces.BooleanInput u + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u "Connector of Boolean input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Connector of Boolean output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Logical/Edge.mo b/Buildings/Controls/OBC/CDL/Logical/Edge.mo index 0dda7d7b360..425f3849f06 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Edge.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Edge.mo @@ -3,10 +3,10 @@ block Edge "Output y is true, if the input u has a rising edge (y = edge(u))" parameter Boolean pre_u_start=false "Start value of pre(u) at initial time"; - Interfaces.BooleanInput u + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u "Connector of Boolean input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Connector of Boolean output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Logical/FallingEdge.mo b/Buildings/Controls/OBC/CDL/Logical/FallingEdge.mo index 57c25da19b6..0e73242c655 100644 --- a/Buildings/Controls/OBC/CDL/Logical/FallingEdge.mo +++ b/Buildings/Controls/OBC/CDL/Logical/FallingEdge.mo @@ -3,10 +3,10 @@ block FallingEdge "Output y is true, if the input u has a falling edge (y = edge(not u))" parameter Boolean pre_u_start=false "Start value of pre(u) at initial time"; - Interfaces.BooleanInput u + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u "Connector of Boolean input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Connector of Boolean output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Logical/Latch.mo b/Buildings/Controls/OBC/CDL/Logical/Latch.mo index 2c2a70f75c6..8f87877d59d 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Latch.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Latch.mo @@ -1,13 +1,13 @@ within Buildings.Controls.OBC.CDL.Logical; block Latch "Maintains a true signal until change condition" - Interfaces.BooleanInput u + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u "Latch input" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanInput clr + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput clr "Clear input" annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); @@ -122,10 +122,10 @@ equation Documentation( info="

        -Block that generates a true output when the latch input u -rises from false to true, provided that the clear input +Block that generates a true output when the latch input u +rises from false to true, provided that the clear input clr is false or also became at the same time false. -The output remains true until the clear input clr rises +The output remains true until the clear input clr rises from false to true.

        @@ -134,8 +134,8 @@ switches to false (if it was true) and it remains u.

        -At initial time, if clr = false, then the output will be -y = u. Otherwise it will be y=false +At initial time, if clr = false, then the output will be +y = u. Otherwise it will be y=false (because the clear input clr is true).

        @@ -159,7 +159,7 @@ Simplified implementation, and made model work with OpenModelica.
      • April 4, 2019, by Jianjun Hu:
        -Corrected implementation that causes wrong output at initial stage. +Corrected implementation that causes wrong output at initial stage. This is for issue 1402.
      • diff --git a/Buildings/Controls/OBC/CDL/Logical/MultiAnd.mo b/Buildings/Controls/OBC/CDL/Logical/MultiAnd.mo index ed4e154d0c8..2d550637fe6 100644 --- a/Buildings/Controls/OBC/CDL/Logical/MultiAnd.mo +++ b/Buildings/Controls/OBC/CDL/Logical/MultiAnd.mo @@ -5,10 +5,10 @@ block MultiAnd min=0)=0 "Number of input connections" annotation (Dialog(connectorSizing=true),HideResult=true); - Interfaces.BooleanInput u[nin] + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u[nin] "Connector of Boolean input signals" annotation (Placement(transformation(extent={{-140,70},{-100,-70}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Connector of Boolean output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Logical/MultiOr.mo b/Buildings/Controls/OBC/CDL/Logical/MultiOr.mo index 0baa2e6e6c3..952e30b4628 100644 --- a/Buildings/Controls/OBC/CDL/Logical/MultiOr.mo +++ b/Buildings/Controls/OBC/CDL/Logical/MultiOr.mo @@ -5,10 +5,10 @@ block MultiOr min=0)=0 "Number of input connections" annotation (Dialog(connectorSizing=true),HideResult=true); - Interfaces.BooleanInput u[nin] + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u[nin] "Connector of Boolean input signals" annotation (Placement(transformation(extent={{-140,70},{-100,-70}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Connector of Boolean output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); @@ -71,7 +71,7 @@ equation Documentation( info="

        -Block that outputs y = true if any element in the input +Block that outputs y = true if any element in the input vector u is true. If no connection to the input connector u is present, the output is y=false. diff --git a/Buildings/Controls/OBC/CDL/Logical/Nand.mo b/Buildings/Controls/OBC/CDL/Logical/Nand.mo index 6bc90e0b873..596b7f36a5f 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Nand.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Nand.mo @@ -1,13 +1,13 @@ within Buildings.Controls.OBC.CDL.Logical; block Nand "Logical 'nand': y = not (u1 and u2)" - Interfaces.BooleanInput u1 + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1 "Connector of first Boolean input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanInput u2 + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u2 "Connector of second Boolean input signal" annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Connector of Boolean output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Logical/Nor.mo b/Buildings/Controls/OBC/CDL/Logical/Nor.mo index 63ab1097a05..86aa7a2478b 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Nor.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Nor.mo @@ -1,13 +1,13 @@ within Buildings.Controls.OBC.CDL.Logical; block Nor "Logical 'nor': y = not (u1 or u2)" - Interfaces.BooleanInput u1 + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1 "Connector of first Boolean input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanInput u2 + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u2 "Connector of second Boolean input signal" annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Connector of Boolean output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Logical/Not.mo b/Buildings/Controls/OBC/CDL/Logical/Not.mo index 91848627db4..5ec83472322 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Not.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Not.mo @@ -1,10 +1,10 @@ within Buildings.Controls.OBC.CDL.Logical; block Not "Logical not" - Interfaces.BooleanInput u + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u "Connector of Boolean input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Connector of Boolean output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Logical/Or.mo b/Buildings/Controls/OBC/CDL/Logical/Or.mo index 00f591962d2..4ecd8c68238 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Or.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Or.mo @@ -1,13 +1,13 @@ within Buildings.Controls.OBC.CDL.Logical; block Or "Logical 'or': y = u1 or u2" - Interfaces.BooleanInput u1 + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1 "Connector of first Boolean input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanInput u2 + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u2 "Connector of second Boolean input signal" annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Connector of Boolean output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Logical/Pre.mo b/Buildings/Controls/OBC/CDL/Logical/Pre.mo index caf35d3f862..5c0d14945e1 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Pre.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Pre.mo @@ -3,10 +3,10 @@ block Pre "Breaks algebraic loops by an infinitesimal small time delay (y = pre(u): event iteration continues until u = pre(u))" parameter Boolean pre_u_start=false "Start value of pre(u) at initial time"; - Interfaces.BooleanInput u + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u "Connector of Boolean input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Connector of Boolean output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Logical/Sources/Constant.mo b/Buildings/Controls/OBC/CDL/Logical/Sources/Constant.mo index f5f1a168861..6274e6e9249 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Sources/Constant.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Sources/Constant.mo @@ -3,7 +3,7 @@ block Constant "Output constant signal of type Boolean" parameter Boolean k "Constant output value"; - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Connector of Boolean output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Logical/Sources/Pulse.mo b/Buildings/Controls/OBC/CDL/Logical/Sources/Pulse.mo index 7ed10731274..d947528a833 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Sources/Pulse.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Sources/Pulse.mo @@ -15,7 +15,7 @@ block Pulse final quantity="Time", final unit="s")=0 "Shift time for output"; - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Connector of Boolean output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Logical/Sources/SampleTrigger.mo b/Buildings/Controls/OBC/CDL/Logical/Sources/SampleTrigger.mo index c0399c3d756..44b1b4edacc 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Sources/SampleTrigger.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Sources/SampleTrigger.mo @@ -10,7 +10,7 @@ block SampleTrigger final quantity="Time", final unit="s")=0 "Shift time for output"; - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Connector of Boolean output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Logical/Sources/TimeTable.mo b/Buildings/Controls/OBC/CDL/Logical/Sources/TimeTable.mo index bb5bfc2d07f..6759618579e 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Sources/TimeTable.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Sources/TimeTable.mo @@ -10,7 +10,7 @@ block TimeTable final quantity="Time", final unit="s") "Periodicity of table"; - Interfaces.BooleanOutput y[nout] + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y[nout] "Output of the table" annotation (Placement(transformation(extent={{120,-20},{160,20}}),iconTransformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Logical/Switch.mo b/Buildings/Controls/OBC/CDL/Logical/Switch.mo index b429da31a44..9ce83261a95 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Switch.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Switch.mo @@ -1,16 +1,16 @@ within Buildings.Controls.OBC.CDL.Logical; block Switch "Switch between two boolean signals" - Interfaces.BooleanInput u1 + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1 "Boolean input signal" annotation (Placement(transformation(extent={{-140,60},{-100,100}}))); - Interfaces.BooleanInput u2 + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u2 "Boolean switch input signal, if true, y=u1, else y=u3" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanInput u3 + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u3 "Boolean input signal" annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Booelan output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Logical/Toggle.mo b/Buildings/Controls/OBC/CDL/Logical/Toggle.mo index de2c5b99b0c..86c45bc13cb 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Toggle.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Toggle.mo @@ -1,13 +1,13 @@ within Buildings.Controls.OBC.CDL.Logical; block Toggle "Toggles output value whenever its input turns true" - Interfaces.BooleanInput u + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u "Toggle input" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanInput clr + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput clr "Clear input" annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); @@ -121,9 +121,9 @@ equation Documentation( info="

        -Block that generates a true output when toggle input u +Block that generates a true output when toggle input u rises from false to true, provided that the clear input -clr is false or also became at the same time +clr is false or also became at the same time false. The output remains true until

          @@ -141,8 +141,8 @@ regardless of the value of the toggle input u.

          -At initial time, if clr = false, then the output will be -y = u. Otherwise it will be y=false +At initial time, if clr = false, then the output will be +y = u. Otherwise it will be y=false (because the clear input clr is true).

          @@ -166,7 +166,7 @@ Simplified implementation, and made model work with OpenModelica.
        • April 4, 2019, by Jianjun Hu:
          -Corrected implementation that causes wrong output at initial stage. +Corrected implementation that causes wrong output at initial stage. This is for issue 1402.
        • diff --git a/Buildings/Controls/OBC/CDL/Logical/TrueDelay.mo b/Buildings/Controls/OBC/CDL/Logical/TrueDelay.mo index 4c1a539ad7a..78acc0a7128 100644 --- a/Buildings/Controls/OBC/CDL/Logical/TrueDelay.mo +++ b/Buildings/Controls/OBC/CDL/Logical/TrueDelay.mo @@ -7,10 +7,10 @@ block TrueDelay "Delay time"; parameter Boolean delayOnInit=false "Set to true to delay initial true input"; - Interfaces.BooleanInput u + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u "Connector of Boolean input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Connector of Boolean output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Logical/TrueFalseHold.mo b/Buildings/Controls/OBC/CDL/Logical/TrueFalseHold.mo index a8ad1065a5f..703593ea794 100644 --- a/Buildings/Controls/OBC/CDL/Logical/TrueFalseHold.mo +++ b/Buildings/Controls/OBC/CDL/Logical/TrueFalseHold.mo @@ -9,10 +9,10 @@ block TrueFalseHold final quantity="Time", final unit="s")=trueHoldDuration "false hold duration"; - Interfaces.BooleanInput u + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u "Boolean input signal" annotation (Placement(transformation(extent={{-220,-20},{-180,20}}),iconTransformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Boolean output signal" annotation (Placement(transformation(extent={{160,-20},{200,20}}),iconTransformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Logical/TrueHold.mo b/Buildings/Controls/OBC/CDL/Logical/TrueHold.mo index 8836745dc64..41afc4f2819 100644 --- a/Buildings/Controls/OBC/CDL/Logical/TrueHold.mo +++ b/Buildings/Controls/OBC/CDL/Logical/TrueHold.mo @@ -5,10 +5,10 @@ block TrueHold final quantity="Time", final unit="s") "Time duration of the true output signal hold"; - Interfaces.BooleanInput u + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u "Boolean input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Boolean output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Logical/Xor.mo b/Buildings/Controls/OBC/CDL/Logical/Xor.mo index 1fcff2f14b1..28bb8fe2b3d 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Xor.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Xor.mo @@ -1,13 +1,13 @@ within Buildings.Controls.OBC.CDL.Logical; block Xor "Logical 'xor': y = u1 xor u2" - Interfaces.BooleanInput u1 + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1 "Connector of first Boolean input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanInput u2 + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u2 "Connector of second Boolean input signal" annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Connector of Boolean output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Psychrometrics/DewPoint_TDryBulPhi.mo b/Buildings/Controls/OBC/CDL/Psychrometrics/DewPoint_TDryBulPhi.mo index 8e8c87faa9f..a0245c665a8 100644 --- a/Buildings/Controls/OBC/CDL/Psychrometrics/DewPoint_TDryBulPhi.mo +++ b/Buildings/Controls/OBC/CDL/Psychrometrics/DewPoint_TDryBulPhi.mo @@ -1,19 +1,19 @@ within Buildings.Controls.OBC.CDL.Psychrometrics; block DewPoint_TDryBulPhi "Block to compute the dew point temperature based on relative humidity" - Interfaces.RealInput TDryBul( + Buildings.Controls.OBC.CDL.Interfaces.RealInput TDryBul( final quantity="ThermodynamicTemperature", final unit="K", final min=100) "Dry bulb temperature" annotation (Placement(transformation(extent={{-140,40},{-100,80}}))); - Interfaces.RealInput phi( + Buildings.Controls.OBC.CDL.Interfaces.RealInput phi( final min=0, final max=1, unit="1") "Relative air humidity" annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}))); - Interfaces.RealOutput TDewPoi( + Buildings.Controls.OBC.CDL.Interfaces.RealOutput TDewPoi( final quantity="ThermodynamicTemperature", final unit="K", final min=100) diff --git a/Buildings/Controls/OBC/CDL/Psychrometrics/SpecificEnthalpy_TDryBulPhi.mo b/Buildings/Controls/OBC/CDL/Psychrometrics/SpecificEnthalpy_TDryBulPhi.mo index 883f03d319b..65b76d220ca 100644 --- a/Buildings/Controls/OBC/CDL/Psychrometrics/SpecificEnthalpy_TDryBulPhi.mo +++ b/Buildings/Controls/OBC/CDL/Psychrometrics/SpecificEnthalpy_TDryBulPhi.mo @@ -5,18 +5,18 @@ block SpecificEnthalpy_TDryBulPhi final quantity="Pressure", final unit="Pa")=101325 "Atmospheric pressure"; - Interfaces.RealInput TDryBul( + Buildings.Controls.OBC.CDL.Interfaces.RealInput TDryBul( final quantity="ThermodynamicTemperature", final unit="K", final min=100) "Dry bulb temperature" annotation (Placement(transformation(extent={{-140,40},{-100,80}}),iconTransformation(extent={{-140,40},{-100,80}}))); - Interfaces.RealInput phi( + Buildings.Controls.OBC.CDL.Interfaces.RealInput phi( final min=0, final max=1) "Relative air humidity" annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}),iconTransformation(extent={{-140,-80},{-100,-40}}))); - Interfaces.RealOutput h( + Buildings.Controls.OBC.CDL.Interfaces.RealOutput h( final quantity="SpecificEnergy", final unit="J/kg") "Specific enthalpy" diff --git a/Buildings/Controls/OBC/CDL/Psychrometrics/WetBulb_TDryBulPhi.mo b/Buildings/Controls/OBC/CDL/Psychrometrics/WetBulb_TDryBulPhi.mo index b02628b20db..62683845492 100644 --- a/Buildings/Controls/OBC/CDL/Psychrometrics/WetBulb_TDryBulPhi.mo +++ b/Buildings/Controls/OBC/CDL/Psychrometrics/WetBulb_TDryBulPhi.mo @@ -1,18 +1,18 @@ within Buildings.Controls.OBC.CDL.Psychrometrics; block WetBulb_TDryBulPhi "Block to compute the wet bulb temperature based on relative humidity" - Interfaces.RealInput TDryBul( + Buildings.Controls.OBC.CDL.Interfaces.RealInput TDryBul( final quantity="ThermodynamicTemperature", final unit="K", final min=100) "Dry bulb temperature" annotation (Placement(transformation(extent={{-140,40},{-100,80}}),iconTransformation(extent={{-140,40},{-100,80}}))); - Interfaces.RealInput phi( + Buildings.Controls.OBC.CDL.Interfaces.RealInput phi( final min=0, final max=1) "Relative air humidity" annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}),iconTransformation(extent={{-140,-80},{-100,-40}}))); - Interfaces.RealOutput TWetBul( + Buildings.Controls.OBC.CDL.Interfaces.RealOutput TWetBul( final quantity="ThermodynamicTemperature", final unit="K", final min=100) diff --git a/Buildings/Controls/OBC/CDL/Reals/Abs.mo b/Buildings/Controls/OBC/CDL/Reals/Abs.mo index ce1a9cd8f98..f19c4325fd7 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Abs.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Abs.mo @@ -1,10 +1,10 @@ within Buildings.Controls.OBC.CDL.Reals; block Abs "Output the absolute value of the input" - Interfaces.RealInput u + Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Connector of Real input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector of Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/Acos.mo b/Buildings/Controls/OBC/CDL/Reals/Acos.mo index 76b2657afbf..e8e4882689e 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Acos.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Acos.mo @@ -1,9 +1,9 @@ within Buildings.Controls.OBC.CDL.Reals; block Acos "Output the arc cosine of the input" - Interfaces.RealInput u + Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Connector of Real input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y(unit="rad") + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y(unit="rad") "Connector of Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); equation diff --git a/Buildings/Controls/OBC/CDL/Reals/Add.mo b/Buildings/Controls/OBC/CDL/Reals/Add.mo index 8d06ccfa3c8..a470cf622d8 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Add.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Add.mo @@ -1,13 +1,13 @@ within Buildings.Controls.OBC.CDL.Reals; block Add "Output the sum of the two inputs" - Interfaces.RealInput u1 + Buildings.Controls.OBC.CDL.Interfaces.RealInput u1 "Connector of Real input signal 1" annotation (Placement(transformation(extent={{-140,40},{-100,80}}))); - Interfaces.RealInput u2 + Buildings.Controls.OBC.CDL.Interfaces.RealInput u2 "Connector of Real input signal 2" annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector of Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/AddParameter.mo b/Buildings/Controls/OBC/CDL/Reals/AddParameter.mo index 55d72c8402f..fdfe8dc8bf2 100644 --- a/Buildings/Controls/OBC/CDL/Reals/AddParameter.mo +++ b/Buildings/Controls/OBC/CDL/Reals/AddParameter.mo @@ -3,9 +3,9 @@ block AddParameter "Output the sum of an input plus a parameter" parameter Real p "Value to be added"; - Interfaces.RealInput u "Connector of Real input signal" + Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Connector of Real input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y "Connector of Real output signal" + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector of Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); equation diff --git a/Buildings/Controls/OBC/CDL/Reals/Asin.mo b/Buildings/Controls/OBC/CDL/Reals/Asin.mo index 8d7c6f14cfd..401b9f8bb1f 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Asin.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Asin.mo @@ -1,9 +1,9 @@ within Buildings.Controls.OBC.CDL.Reals; block Asin "Output the arc sine of the input" - Interfaces.RealInput u + Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Connector of Real input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y(unit="rad") + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y(unit="rad") "Connector of Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); equation diff --git a/Buildings/Controls/OBC/CDL/Reals/Atan.mo b/Buildings/Controls/OBC/CDL/Reals/Atan.mo index d4717d7345e..4cb61bf2e7b 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Atan.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Atan.mo @@ -1,10 +1,10 @@ within Buildings.Controls.OBC.CDL.Reals; block Atan "Output the arc tangent of the input" - Interfaces.RealInput u + Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Connector of Real input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y(unit="rad") + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y(unit="rad") "Connector of Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/Atan2.mo b/Buildings/Controls/OBC/CDL/Reals/Atan2.mo index df3c3e227ca..857a754ba68 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Atan2.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Atan2.mo @@ -1,13 +1,13 @@ within Buildings.Controls.OBC.CDL.Reals; block Atan2 "Output atan(u1/u2) of the inputs u1 and u2" - Interfaces.RealInput u1 + Buildings.Controls.OBC.CDL.Interfaces.RealInput u1 "Connector of Real input signal 1" annotation (Placement(transformation(extent={{-140,40},{-100,80}}))); - Interfaces.RealInput u2 + Buildings.Controls.OBC.CDL.Interfaces.RealInput u2 "Connector of Real input signal 2" annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}))); - Interfaces.RealOutput y(unit="rad") + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y(unit="rad") "Connector of Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/Average.mo b/Buildings/Controls/OBC/CDL/Reals/Average.mo index 65da68559a9..99ce40d2b95 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Average.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Average.mo @@ -1,13 +1,13 @@ within Buildings.Controls.OBC.CDL.Reals; block Average "Output the average of its two inputs" - Interfaces.RealInput u1 + Buildings.Controls.OBC.CDL.Interfaces.RealInput u1 "Connector of Real input signal 1" annotation (Placement(transformation(extent={{-140,40},{-100,80}}),iconTransformation(extent={{-140,40},{-100,80}}))); - Interfaces.RealInput u2 + Buildings.Controls.OBC.CDL.Interfaces.RealInput u2 "Connector of Real input signal 2" annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}),iconTransformation(extent={{-140,-80},{-100,-40}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector of Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/Cos.mo b/Buildings/Controls/OBC/CDL/Reals/Cos.mo index a755ce9b6d2..07d2b923017 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Cos.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Cos.mo @@ -1,10 +1,10 @@ within Buildings.Controls.OBC.CDL.Reals; block Cos "Output the cosine of the input" - Interfaces.RealInput u(unit="rad") + Buildings.Controls.OBC.CDL.Interfaces.RealInput u(unit="rad") "Connector of Real input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector of Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/Divide.mo b/Buildings/Controls/OBC/CDL/Reals/Divide.mo index c1712cc2298..5add4d67214 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Divide.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Divide.mo @@ -1,12 +1,12 @@ within Buildings.Controls.OBC.CDL.Reals; block Divide "Output first input divided by second input" - Interfaces.RealInput u1 + Buildings.Controls.OBC.CDL.Interfaces.RealInput u1 "Connector for dividend" annotation (Placement(transformation(extent={{-140,40},{-100,80}}))); - Interfaces.RealInput u2 + Buildings.Controls.OBC.CDL.Interfaces.RealInput u2 "Connector for divisor" annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector for quotient" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/Exp.mo b/Buildings/Controls/OBC/CDL/Reals/Exp.mo index a547924b093..cfac5725c32 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Exp.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Exp.mo @@ -1,10 +1,10 @@ within Buildings.Controls.OBC.CDL.Reals; block Exp "Output the exponential (base e) of the input" - Interfaces.RealInput u + Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Connector of Real input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector of Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/Greater.mo b/Buildings/Controls/OBC/CDL/Reals/Greater.mo index ffa00faf6f7..2b66ddaad0f 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Greater.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Greater.mo @@ -8,13 +8,13 @@ block Greater parameter Boolean pre_y_start=false "Value of pre(y) at initial time" annotation (Dialog(tab="Advanced")); - Interfaces.RealInput u1 + Buildings.Controls.OBC.CDL.Interfaces.RealInput u1 "Input u1" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealInput u2 + Buildings.Controls.OBC.CDL.Interfaces.RealInput u2 "Input u2" annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Output y" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); @@ -32,13 +32,13 @@ protected annotation (Placement(transformation(extent={{-10,-40},{10,-20}}))); block GreaterNoHysteresis "Greater block without hysteresis" - Interfaces.RealInput u1 + Buildings.Controls.OBC.CDL.Interfaces.RealInput u1 "Input u1" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealInput u2 + Buildings.Controls.OBC.CDL.Interfaces.RealInput u2 "Input u2" annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Output y" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); @@ -69,13 +69,13 @@ protected parameter Boolean pre_y_start=false "Value of pre(y) at initial time" annotation (Dialog(tab="Advanced")); - Interfaces.RealInput u1 + Buildings.Controls.OBC.CDL.Interfaces.RealInput u1 "Input u1" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealInput u2 + Buildings.Controls.OBC.CDL.Interfaces.RealInput u2 "Input u2" annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Output y" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/GreaterThreshold.mo b/Buildings/Controls/OBC/CDL/Reals/GreaterThreshold.mo index bc239f17f49..4ece4286607 100644 --- a/Buildings/Controls/OBC/CDL/Reals/GreaterThreshold.mo +++ b/Buildings/Controls/OBC/CDL/Reals/GreaterThreshold.mo @@ -10,10 +10,10 @@ block GreaterThreshold parameter Boolean pre_y_start=false "Value of pre(y) at initial time" annotation (Dialog(tab="Advanced")); - Interfaces.RealInput u + Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Input" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Output" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); @@ -35,10 +35,10 @@ protected "Greater block without hysteresis" parameter Real t=0 "Threshold for comparison"; - Interfaces.RealInput u + Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Input u" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Output y" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); @@ -71,10 +71,10 @@ protected parameter Boolean pre_y_start=false "Value of pre(y) at initial time" annotation (Dialog(tab="Advanced")); - Interfaces.RealInput u + Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Input u" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Output y" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/Hysteresis.mo b/Buildings/Controls/OBC/CDL/Reals/Hysteresis.mo index fc8ba95c9bc..a5abdce0f39 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Hysteresis.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Hysteresis.mo @@ -7,10 +7,10 @@ block Hysteresis "if y=false and u>uHigh, switch to y=true"; parameter Boolean pre_y_start=false "Value of pre(y) at initial time"; - Interfaces.RealInput u + Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Real input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Boolean output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/Less.mo b/Buildings/Controls/OBC/CDL/Reals/Less.mo index 29553c0eb6a..dd512be5f96 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Less.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Less.mo @@ -8,13 +8,13 @@ block Less parameter Boolean pre_y_start=false "Value of pre(y) at initial time" annotation (Dialog(tab="Advanced")); - Interfaces.RealInput u1 + Buildings.Controls.OBC.CDL.Interfaces.RealInput u1 "Input u1" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealInput u2 + Buildings.Controls.OBC.CDL.Interfaces.RealInput u2 "Input u2" annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Output y" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); @@ -32,13 +32,13 @@ protected annotation (Placement(transformation(extent={{-10,-40},{10,-20}}))); block LessNoHysteresis "Less block without hysteresis" - Interfaces.RealInput u1 + Buildings.Controls.OBC.CDL.Interfaces.RealInput u1 "Input u1" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealInput u2 + Buildings.Controls.OBC.CDL.Interfaces.RealInput u2 "Input u2" annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Output y" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); @@ -69,13 +69,13 @@ protected parameter Boolean pre_y_start=false "Value of pre(y) at initial time" annotation (Dialog(tab="Advanced")); - Interfaces.RealInput u1 + Buildings.Controls.OBC.CDL.Interfaces.RealInput u1 "Input u1" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealInput u2 + Buildings.Controls.OBC.CDL.Interfaces.RealInput u2 "Input u2" annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Output y" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/LessThreshold.mo b/Buildings/Controls/OBC/CDL/Reals/LessThreshold.mo index 6e94a5320b8..46e088ff434 100644 --- a/Buildings/Controls/OBC/CDL/Reals/LessThreshold.mo +++ b/Buildings/Controls/OBC/CDL/Reals/LessThreshold.mo @@ -10,10 +10,10 @@ block LessThreshold parameter Boolean pre_y_start=false "Value of pre(y) at initial time" annotation (Dialog(tab="Advanced")); - Interfaces.RealInput u + Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Input" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Output" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); @@ -35,10 +35,10 @@ protected "Less block without hysteresis" parameter Real t=0 "Threshold for comparison"; - Interfaces.RealInput u + Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Input u" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Output y" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); @@ -71,10 +71,10 @@ protected parameter Boolean pre_y_start=false "Value of pre(y) at initial time" annotation (Dialog(tab="Advanced")); - Interfaces.RealInput u + Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Input u" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Output y" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/LimitSlewRate.mo b/Buildings/Controls/OBC/CDL/Reals/LimitSlewRate.mo index 2786b55475c..095a5431b7b 100644 --- a/Buildings/Controls/OBC/CDL/Reals/LimitSlewRate.mo +++ b/Buildings/Controls/OBC/CDL/Reals/LimitSlewRate.mo @@ -15,10 +15,10 @@ block LimitSlewRate "Limit the increase or decrease rate of input" "Derivative time constant"; parameter Boolean enable=true "Set to false to disable rate limiter"; - Interfaces.RealInput u + Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Connector of Real input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector of Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/Limiter.mo b/Buildings/Controls/OBC/CDL/Reals/Limiter.mo index b324495cf3b..bf1f6d39e4c 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Limiter.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Limiter.mo @@ -5,10 +5,10 @@ block Limiter "Upper limit of input signal"; parameter Real uMin "Lower limit of input signal"; - Interfaces.RealInput u + Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Connector of Real input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector of Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/Line.mo b/Buildings/Controls/OBC/CDL/Reals/Line.mo index 12e8e87a267..eb2b0379543 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Line.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Line.mo @@ -7,22 +7,22 @@ block Line parameter Boolean limitAbove=true "If true, limit input u to be no larger than x2" annotation (Evaluate=true); - Interfaces.RealInput x1 + Buildings.Controls.OBC.CDL.Interfaces.RealInput x1 "Support point x1, with x1 < x2" annotation (Placement(transformation(extent={{-140,60},{-100,100}}))); - Interfaces.RealInput f1 + Buildings.Controls.OBC.CDL.Interfaces.RealInput f1 "Support point f(x1)" annotation (Placement(transformation(extent={{-140,20},{-100,60}}))); - Interfaces.RealInput x2 + Buildings.Controls.OBC.CDL.Interfaces.RealInput x2 "Support point x2, with x2 > x1" annotation (Placement(transformation(extent={{-140,-60},{-100,-20}}))); - Interfaces.RealInput f2 + Buildings.Controls.OBC.CDL.Interfaces.RealInput f2 "Support point f(x2)" annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}))); - Interfaces.RealInput u + Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Independent variable" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "f(x) along the line specified by (x1, f1) and (x2, f2)" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/Log.mo b/Buildings/Controls/OBC/CDL/Reals/Log.mo index 8212bd9196a..067120d2c49 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Log.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Log.mo @@ -1,10 +1,10 @@ within Buildings.Controls.OBC.CDL.Reals; block Log "Output the natural (base e) logarithm of the input (input > 0 required)" - Interfaces.RealInput u + Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Connector of Real input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector of Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/Log10.mo b/Buildings/Controls/OBC/CDL/Reals/Log10.mo index acb5333c3e2..ae0b9445553 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Log10.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Log10.mo @@ -1,10 +1,10 @@ within Buildings.Controls.OBC.CDL.Reals; block Log10 "Output the base 10 logarithm of the input (input > 0 required)" - Interfaces.RealInput u + Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Connector of Real input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector of Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/MatrixGain.mo b/Buildings/Controls/OBC/CDL/Reals/MatrixGain.mo index 90be5697063..fdd50af6d83 100644 --- a/Buildings/Controls/OBC/CDL/Reals/MatrixGain.mo +++ b/Buildings/Controls/OBC/CDL/Reals/MatrixGain.mo @@ -5,10 +5,10 @@ block MatrixGain 1,0; 0,1] "Gain matrix which is multiplied with the input"; - Interfaces.RealInput u[nin] + Buildings.Controls.OBC.CDL.Interfaces.RealInput u[nin] "Connector of Real input signals" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y[nout] + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y[nout] "Connector of Real output signals" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/MatrixMax.mo b/Buildings/Controls/OBC/CDL/Reals/MatrixMax.mo index d6f6b1560c2..c8f060d9713 100644 --- a/Buildings/Controls/OBC/CDL/Reals/MatrixMax.mo +++ b/Buildings/Controls/OBC/CDL/Reals/MatrixMax.mo @@ -9,10 +9,10 @@ block MatrixMax parameter Integer nCol( final min=1) "Number of columns in input matrix"; - Interfaces.RealInput u[nRow,nCol] + Buildings.Controls.OBC.CDL.Interfaces.RealInput u[nRow,nCol] "Connector of Real input signals" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y[ + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y[ if rowMax then size( u, diff --git a/Buildings/Controls/OBC/CDL/Reals/MatrixMin.mo b/Buildings/Controls/OBC/CDL/Reals/MatrixMin.mo index cfe998dce73..a595c3b800b 100644 --- a/Buildings/Controls/OBC/CDL/Reals/MatrixMin.mo +++ b/Buildings/Controls/OBC/CDL/Reals/MatrixMin.mo @@ -9,10 +9,10 @@ block MatrixMin parameter Integer nCol( final min=1) "Number of columns in input matrix"; - Interfaces.RealInput u[nRow,nCol] + Buildings.Controls.OBC.CDL.Interfaces.RealInput u[nRow,nCol] "Connector of Real input signals" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y[ + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y[ if rowMin then size( u, diff --git a/Buildings/Controls/OBC/CDL/Reals/Max.mo b/Buildings/Controls/OBC/CDL/Reals/Max.mo index 87d65efb369..b72f20c4110 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Max.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Max.mo @@ -1,13 +1,13 @@ within Buildings.Controls.OBC.CDL.Reals; block Max "Pass through the largest signal" - Interfaces.RealInput u1 + Buildings.Controls.OBC.CDL.Interfaces.RealInput u1 "Connector of Real input signal 1" annotation (Placement(transformation(extent={{-140,40},{-100,80}}))); - Interfaces.RealInput u2 + Buildings.Controls.OBC.CDL.Interfaces.RealInput u2 "Connector of Real input signal 2" annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector of Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/Min.mo b/Buildings/Controls/OBC/CDL/Reals/Min.mo index ad1ac1690d4..9bf9dac9573 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Min.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Min.mo @@ -1,13 +1,13 @@ within Buildings.Controls.OBC.CDL.Reals; block Min "Pass through the smallest signal" - Interfaces.RealInput u1 + Buildings.Controls.OBC.CDL.Interfaces.RealInput u1 "Connector of Real input signal 1" annotation (Placement(transformation(extent={{-140,40},{-100,80}}))); - Interfaces.RealInput u2 + Buildings.Controls.OBC.CDL.Interfaces.RealInput u2 "Connector of Real input signal 2" annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector of Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/Modulo.mo b/Buildings/Controls/OBC/CDL/Reals/Modulo.mo index d6e2d8d59cb..ff576ccddbf 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Modulo.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Modulo.mo @@ -1,13 +1,13 @@ within Buildings.Controls.OBC.CDL.Reals; block Modulo "Output the remainder of first input divided by second input (~=0)" - Interfaces.RealInput u1 + Buildings.Controls.OBC.CDL.Interfaces.RealInput u1 "Connector of Real input signal 1" annotation (Placement(transformation(extent={{-140,40},{-100,80}}))); - Interfaces.RealInput u2 + Buildings.Controls.OBC.CDL.Interfaces.RealInput u2 "Connector of Real input signal 2" annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector of Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/MovingAverage.mo b/Buildings/Controls/OBC/CDL/Reals/MovingAverage.mo index a24d2632c44..93da7e5aa23 100644 --- a/Buildings/Controls/OBC/CDL/Reals/MovingAverage.mo +++ b/Buildings/Controls/OBC/CDL/Reals/MovingAverage.mo @@ -5,10 +5,10 @@ block MovingAverage "Block to output moving average" final unit="s", min=1E-5) "Time horizon over which the input is averaged"; - Interfaces.RealInput u + Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Connector of Real input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector of Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/MultiMax.mo b/Buildings/Controls/OBC/CDL/Reals/MultiMax.mo index 78cf8fcaf63..9c8eb96dad5 100644 --- a/Buildings/Controls/OBC/CDL/Reals/MultiMax.mo +++ b/Buildings/Controls/OBC/CDL/Reals/MultiMax.mo @@ -5,10 +5,10 @@ block MultiMax min=0)=0 "Number of input connections" annotation (Dialog(connectorSizing=true),HideResult=true); - Interfaces.RealInput u[nin] + Buildings.Controls.OBC.CDL.Interfaces.RealInput u[nin] "Connector of Real input signals" annotation (Placement(transformation(extent={{-140,20},{-100,-20}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector of Real output signals" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/MultiMin.mo b/Buildings/Controls/OBC/CDL/Reals/MultiMin.mo index 8205c09f9b0..c93821a66a0 100644 --- a/Buildings/Controls/OBC/CDL/Reals/MultiMin.mo +++ b/Buildings/Controls/OBC/CDL/Reals/MultiMin.mo @@ -5,10 +5,10 @@ block MultiMin min=0)=0 "Number of input connections" annotation (Dialog(connectorSizing=true),HideResult=true); - Interfaces.RealInput u[nin] + Buildings.Controls.OBC.CDL.Interfaces.RealInput u[nin] "Connector of Real input signals" annotation (Placement(transformation(extent={{-140,20},{-100,-20}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector of Real output signals" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/MultiSum.mo b/Buildings/Controls/OBC/CDL/Reals/MultiSum.mo index a52c7817e52..e566dffb02a 100644 --- a/Buildings/Controls/OBC/CDL/Reals/MultiSum.mo +++ b/Buildings/Controls/OBC/CDL/Reals/MultiSum.mo @@ -9,10 +9,10 @@ block MultiSum 1, nin) "Input gains"; - Interfaces.RealInput u[nin] + Buildings.Controls.OBC.CDL.Interfaces.RealInput u[nin] "Connector of Real input signals" annotation (Placement(transformation(extent={{-140,20},{-100,-20}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector of Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/Multiply.mo b/Buildings/Controls/OBC/CDL/Reals/Multiply.mo index 76b7e6a6b39..4b1d5b61c08 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Multiply.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Multiply.mo @@ -1,12 +1,12 @@ within Buildings.Controls.OBC.CDL.Reals; block Multiply "Output product of the two inputs" - Interfaces.RealInput u1 + Buildings.Controls.OBC.CDL.Interfaces.RealInput u1 "Connector of Real input signal 1" annotation (Placement(transformation(extent={{-140,40},{-100,80}}))); - Interfaces.RealInput u2 + Buildings.Controls.OBC.CDL.Interfaces.RealInput u2 "Connector of Real input signal 2" annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector of Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/MultiplyByParameter.mo b/Buildings/Controls/OBC/CDL/Reals/MultiplyByParameter.mo index 795b6e2e43b..554d13a774b 100644 --- a/Buildings/Controls/OBC/CDL/Reals/MultiplyByParameter.mo +++ b/Buildings/Controls/OBC/CDL/Reals/MultiplyByParameter.mo @@ -3,10 +3,10 @@ block MultiplyByParameter "Output the product of a gain value with the input signal" parameter Real k "Gain value multiplied with input signal"; - Interfaces.RealInput u + Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Input signal connector" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Output signal connector" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/Round.mo b/Buildings/Controls/OBC/CDL/Reals/Round.mo index 7fa2ff02887..0ed5fdd40ba 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Round.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Round.mo @@ -3,10 +3,10 @@ block Round "Round real number to given digits" parameter Integer n "Number of digits being round to"; - Interfaces.RealInput u + Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Connector of Real input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector of Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/Sin.mo b/Buildings/Controls/OBC/CDL/Reals/Sin.mo index b1ce423a2df..10f680e00ad 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Sin.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Sin.mo @@ -1,10 +1,10 @@ within Buildings.Controls.OBC.CDL.Reals; block Sin "Output the sine of the input" - Interfaces.RealInput u(unit="rad") + Buildings.Controls.OBC.CDL.Interfaces.RealInput u(unit="rad") "Connector of Real input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector of Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/Sort.mo b/Buildings/Controls/OBC/CDL/Reals/Sort.mo index 371d9802bf5..1ba7b3a4bad 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Sort.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Sort.mo @@ -7,10 +7,10 @@ block Sort annotation (Dialog(connectorSizing=true),HideResult=true); parameter Boolean ascending=true "Set to true if ascending order, otherwise order is descending"; - Interfaces.RealInput u[nin] + Buildings.Controls.OBC.CDL.Interfaces.RealInput u[nin] "Connector of Real input signals" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y[nin] + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y[nin] "Connector of Real output signals" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/Sources/CalendarTime.mo b/Buildings/Controls/OBC/CDL/Reals/Sources/CalendarTime.mo index 902254b2dc3..1b5e429b753 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Sources/CalendarTime.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Sources/CalendarTime.mo @@ -13,24 +13,24 @@ model CalendarTime final unit="s")=0 "Offset that is added to 'time', may be used for computing time in different time zone" annotation (Dialog(tab="Advanced")); - discrete Interfaces.IntegerOutput year + discrete Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput year "Year" annotation (Placement(transformation(extent={{100,-40},{120,-20}}),iconTransformation(extent={{100,-40},{120,-20}}))); - discrete Interfaces.IntegerOutput month + discrete Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput month "Month of the year" annotation (Placement(transformation(extent={{100,-10},{120,10}}),iconTransformation(extent={{100,-10},{120,10}}))); - Interfaces.IntegerOutput day( + Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput day( fixed=false) "Day of the month" annotation (Placement(transformation(extent={{100,20},{120,40}}),iconTransformation(extent={{100,20},{120,40}}))); - Interfaces.IntegerOutput hour( + Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput hour( fixed=false) "Hour of the day" annotation (Placement(transformation(extent={{100,50},{120,70}}),iconTransformation(extent={{100,50},{120,70}}))); - Interfaces.RealOutput minute + Buildings.Controls.OBC.CDL.Interfaces.RealOutput minute "Minute of the hour" annotation (Placement(transformation(extent={{100,80},{120,100}}),iconTransformation(extent={{100,80},{120,100}}))); - Interfaces.IntegerOutput weekDay( + Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput weekDay( fixed=false) "Integer output representing week day (monday = 1, sunday = 7)" annotation (Placement(transformation(extent={{100,-70},{120,-50}}),iconTransformation(extent={{100,-70},{120,-50}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/Sources/CivilTime.mo b/Buildings/Controls/OBC/CDL/Reals/Sources/CivilTime.mo index c94c56a7c00..f9c841e1e2f 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Sources/CivilTime.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Sources/CivilTime.mo @@ -1,6 +1,6 @@ within Buildings.Controls.OBC.CDL.Reals.Sources; block CivilTime "Civil time" - Interfaces.RealOutput y( + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y( final unit="s") "Civil time" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/Sources/Constant.mo b/Buildings/Controls/OBC/CDL/Reals/Sources/Constant.mo index 1c936f09c7a..9fe238fad87 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Sources/Constant.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Sources/Constant.mo @@ -3,7 +3,7 @@ block Constant "Output constant signal of type Real" parameter Real k "Constant output value"; - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector of Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/Sources/Pulse.mo b/Buildings/Controls/OBC/CDL/Reals/Sources/Pulse.mo index e60cee12bf4..bbb8c39c8e9 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Sources/Pulse.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Sources/Pulse.mo @@ -19,7 +19,7 @@ block Pulse "Shift time for output"; parameter Real offset=0.0 "Offset of output signals"; - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector of Pulse output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/Sources/Ramp.mo b/Buildings/Controls/OBC/CDL/Reals/Sources/Ramp.mo index 4288ffefb1c..7233e15b349 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Sources/Ramp.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Sources/Ramp.mo @@ -14,7 +14,7 @@ block Ramp final quantity="Time", final unit="s")=0 "Output = offset for time < startTime"; - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector of Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/Sources/TimeTable.mo b/Buildings/Controls/OBC/CDL/Reals/Sources/TimeTable.mo index f9ea8c44bc1..12bb45a0f37 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Sources/TimeTable.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Sources/TimeTable.mo @@ -14,7 +14,7 @@ block TimeTable parameter Real timeScale( final unit="1")=1 "Time scale of first table column. Set to 3600 if time in table is in hours"; - Interfaces.RealOutput y[nout] + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y[nout] "Output of the table" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/Sqrt.mo b/Buildings/Controls/OBC/CDL/Reals/Sqrt.mo index 59da51e357f..ef7beaaf041 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Sqrt.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Sqrt.mo @@ -1,10 +1,10 @@ within Buildings.Controls.OBC.CDL.Reals; block Sqrt "Output the square root of the input (input >= 0 required)" - Interfaces.RealInput u + Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Connector of Real input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector of Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/Subtract.mo b/Buildings/Controls/OBC/CDL/Reals/Subtract.mo index b30a2853a57..ac94b679f69 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Subtract.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Subtract.mo @@ -1,12 +1,12 @@ within Buildings.Controls.OBC.CDL.Reals; block Subtract "Output the difference of the two inputs" - Interfaces.RealInput u1 + Buildings.Controls.OBC.CDL.Interfaces.RealInput u1 "Connector of Real input signal 1" annotation (Placement(transformation(extent={{-140,40},{-100,80}}))); - Interfaces.RealInput u2 + Buildings.Controls.OBC.CDL.Interfaces.RealInput u2 "Connector of Real input signal 2" annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector of Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/Switch.mo b/Buildings/Controls/OBC/CDL/Reals/Switch.mo index 5a6be85162c..ca62cdfe98b 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Switch.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Switch.mo @@ -1,16 +1,16 @@ within Buildings.Controls.OBC.CDL.Reals; block Switch "Switch between two Real signals" - Interfaces.RealInput u1 + Buildings.Controls.OBC.CDL.Interfaces.RealInput u1 "Real input signal" annotation (Placement(transformation(extent={{-140,60},{-100,100}}))); - Interfaces.BooleanInput u2 + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u2 "Boolean switch input signal, if true, y=u1, else y=u3" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealInput u3 + Buildings.Controls.OBC.CDL.Interfaces.RealInput u3 "Real input signal" annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Reals/Tan.mo b/Buildings/Controls/OBC/CDL/Reals/Tan.mo index d124116616e..ca4a3dd30d4 100644 --- a/Buildings/Controls/OBC/CDL/Reals/Tan.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Tan.mo @@ -1,10 +1,10 @@ within Buildings.Controls.OBC.CDL.Reals; block Tan "Output the tangent of the input" - Interfaces.RealInput u(unit="rad") + Buildings.Controls.OBC.CDL.Interfaces.RealInput u(unit="rad") "Connector of Real input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector of Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Routing/BooleanExtractSignal.mo b/Buildings/Controls/OBC/CDL/Routing/BooleanExtractSignal.mo index efca767728e..57047426dc7 100644 --- a/Buildings/Controls/OBC/CDL/Routing/BooleanExtractSignal.mo +++ b/Buildings/Controls/OBC/CDL/Routing/BooleanExtractSignal.mo @@ -7,10 +7,10 @@ block BooleanExtractSignal "Number of outputs"; parameter Integer extract[nout]=1:nout "Extracting vector"; - Interfaces.BooleanInput u[nin] + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u[nin] "Boolean input signals" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanOutput y[nout] + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y[nout] "Boolean signals extracted from the input vector with the extraction scheme specified by the integer vector" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Routing/BooleanExtractor.mo b/Buildings/Controls/OBC/CDL/Routing/BooleanExtractor.mo index 6aba8917530..f77be4786ce 100644 --- a/Buildings/Controls/OBC/CDL/Routing/BooleanExtractor.mo +++ b/Buildings/Controls/OBC/CDL/Routing/BooleanExtractor.mo @@ -3,13 +3,13 @@ block BooleanExtractor "Extract scalar signal out of boolean signal vector dependent on integer input index" parameter Integer nin=1 "Number of inputs"; - Interfaces.IntegerInput index + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput index "Index of input vector element to be extracted out" annotation (Placement(transformation(origin={0,-120},extent={{-20,-20},{20,20}},rotation=90))); - Interfaces.BooleanInput u[nin] + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u[nin] "Boolean input signals" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanOutput y + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Boolean signal extracted from input vector, u[index]" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Routing/BooleanScalarReplicator.mo b/Buildings/Controls/OBC/CDL/Routing/BooleanScalarReplicator.mo index e1d7e41b9c0..68a6aef20b7 100644 --- a/Buildings/Controls/OBC/CDL/Routing/BooleanScalarReplicator.mo +++ b/Buildings/Controls/OBC/CDL/Routing/BooleanScalarReplicator.mo @@ -3,10 +3,10 @@ block BooleanScalarReplicator "Boolean signal replicator" parameter Integer nout=1 "Number of outputs"; - Interfaces.BooleanInput u + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u "Connector of Boolean input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanOutput y[nout] + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y[nout] "Connector of Boolean output signals" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Routing/BooleanVectorFilter.mo b/Buildings/Controls/OBC/CDL/Routing/BooleanVectorFilter.mo index eafd0cdf34f..1550bf4327d 100644 --- a/Buildings/Controls/OBC/CDL/Routing/BooleanVectorFilter.mo +++ b/Buildings/Controls/OBC/CDL/Routing/BooleanVectorFilter.mo @@ -5,10 +5,10 @@ block BooleanVectorFilter parameter Integer nout "Size of output vector"; parameter Boolean msk[nin]=fill(true,nin) "Array mask"; - Interfaces.BooleanInput u[nin] + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u[nin] "Connector of Boolean input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanOutput y[nout] + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y[nout] "Connector of Boolean output signals" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Routing/BooleanVectorReplicator.mo b/Buildings/Controls/OBC/CDL/Routing/BooleanVectorReplicator.mo index 6c49f3e2257..b9435dbcb36 100644 --- a/Buildings/Controls/OBC/CDL/Routing/BooleanVectorReplicator.mo +++ b/Buildings/Controls/OBC/CDL/Routing/BooleanVectorReplicator.mo @@ -2,10 +2,10 @@ within Buildings.Controls.OBC.CDL.Routing; block BooleanVectorReplicator "Boolean vector signal replicator" parameter Integer nin=1 "Size of input vector"; parameter Integer nout=1 "Number of row in output"; - Interfaces.BooleanInput u[nin] + Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u[nin] "Connector of Boolean vector input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.BooleanOutput y[nout, nin] + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y[nout, nin] "Connector of Boolean matrix output signals" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Routing/IntegerExtractSignal.mo b/Buildings/Controls/OBC/CDL/Routing/IntegerExtractSignal.mo index 18fce10b2ba..dfc82f7e772 100644 --- a/Buildings/Controls/OBC/CDL/Routing/IntegerExtractSignal.mo +++ b/Buildings/Controls/OBC/CDL/Routing/IntegerExtractSignal.mo @@ -7,10 +7,10 @@ block IntegerExtractSignal "Number of outputs"; parameter Integer extract[nout]=1:nout "Extracting vector"; - Interfaces.IntegerInput u[nin] + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u[nin] "Integer input signals" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.IntegerOutput y[nout] + Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y[nout] "Integer signals extracted from the input vector with the extraction scheme specified by the integer vector" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Routing/IntegerExtractor.mo b/Buildings/Controls/OBC/CDL/Routing/IntegerExtractor.mo index 0a8cc9c4fc3..d2ed3317074 100644 --- a/Buildings/Controls/OBC/CDL/Routing/IntegerExtractor.mo +++ b/Buildings/Controls/OBC/CDL/Routing/IntegerExtractor.mo @@ -3,13 +3,13 @@ block IntegerExtractor "Extract scalar signal out of integer signal vector dependent on integer input index" parameter Integer nin=1 "Number of inputs"; - Interfaces.IntegerInput index + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput index "Index of input vector element to be extracted out" annotation (Placement(transformation(origin={0,-120},extent={{-20,-20},{20,20}},rotation=90))); - Interfaces.IntegerInput u[nin] + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u[nin] "Integer input signals" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.IntegerOutput y + Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y "Integer signal extracted from input vector, u[index]" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Routing/IntegerScalarReplicator.mo b/Buildings/Controls/OBC/CDL/Routing/IntegerScalarReplicator.mo index e3c0b9cbf89..026395cd0a1 100644 --- a/Buildings/Controls/OBC/CDL/Routing/IntegerScalarReplicator.mo +++ b/Buildings/Controls/OBC/CDL/Routing/IntegerScalarReplicator.mo @@ -3,10 +3,10 @@ block IntegerScalarReplicator "Integer signal replicator" parameter Integer nout=1 "Number of outputs"; - Interfaces.IntegerInput u + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u "Connector of Integer input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.IntegerOutput y[nout] + Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y[nout] "Connector of Integer output signals" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Routing/IntegerVectorFilter.mo b/Buildings/Controls/OBC/CDL/Routing/IntegerVectorFilter.mo index 2dc5450169c..ae10a4ec3db 100644 --- a/Buildings/Controls/OBC/CDL/Routing/IntegerVectorFilter.mo +++ b/Buildings/Controls/OBC/CDL/Routing/IntegerVectorFilter.mo @@ -5,10 +5,10 @@ block IntegerVectorFilter parameter Integer nout "Size of output vector"; parameter Boolean msk[nin]=fill(true,nin) "Array mask"; - Interfaces.IntegerInput u[nin] + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u[nin] "Connector of Integer input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.IntegerOutput y[nout] + Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y[nout] "Connector of Integer output signals" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Routing/IntegerVectorReplicator.mo b/Buildings/Controls/OBC/CDL/Routing/IntegerVectorReplicator.mo index 42b73409658..cb87a2178ec 100644 --- a/Buildings/Controls/OBC/CDL/Routing/IntegerVectorReplicator.mo +++ b/Buildings/Controls/OBC/CDL/Routing/IntegerVectorReplicator.mo @@ -2,10 +2,10 @@ within Buildings.Controls.OBC.CDL.Routing; block IntegerVectorReplicator "Integer vector signal replicator" parameter Integer nin=1 "Size of input vector"; parameter Integer nout=1 "Number of row in output"; - Interfaces.IntegerInput u[nin] + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u[nin] "Connector of Integer vector input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.IntegerOutput y[nout, nin] + Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y[nout, nin] "Connector of Integer matrix output signals" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Routing/RealExtractSignal.mo b/Buildings/Controls/OBC/CDL/Routing/RealExtractSignal.mo index 7007035b3cc..f267ccd1aa2 100644 --- a/Buildings/Controls/OBC/CDL/Routing/RealExtractSignal.mo +++ b/Buildings/Controls/OBC/CDL/Routing/RealExtractSignal.mo @@ -7,10 +7,10 @@ block RealExtractSignal "Number of outputs"; parameter Integer extract[nout]=1:nout "Extracting vector"; - Interfaces.RealInput u[nin] + Buildings.Controls.OBC.CDL.Interfaces.RealInput u[nin] "Real input signals" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y[nout] + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y[nout] "Real signals extracted from the input vector with the extraction scheme specified by the integer vector" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Routing/RealExtractor.mo b/Buildings/Controls/OBC/CDL/Routing/RealExtractor.mo index 164219e3c52..9285caa0906 100644 --- a/Buildings/Controls/OBC/CDL/Routing/RealExtractor.mo +++ b/Buildings/Controls/OBC/CDL/Routing/RealExtractor.mo @@ -3,13 +3,13 @@ block RealExtractor "Extract scalar signal out of real signal vector dependent on integer input index" parameter Integer nin=1 "Number of inputs"; - Interfaces.IntegerInput index + Buildings.Controls.OBC.CDL.Interfaces.IntegerInput index "Index of input vector element to be extracted out" annotation (Placement(transformation(origin={0,-120},extent={{-20,-20},{20,20}},rotation=90))); - Interfaces.RealInput u[nin] + Buildings.Controls.OBC.CDL.Interfaces.RealInput u[nin] "Real input signals" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Real signal extracted from input vector, u[index]" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Routing/RealScalarReplicator.mo b/Buildings/Controls/OBC/CDL/Routing/RealScalarReplicator.mo index 0934c62693c..3e93e00164b 100644 --- a/Buildings/Controls/OBC/CDL/Routing/RealScalarReplicator.mo +++ b/Buildings/Controls/OBC/CDL/Routing/RealScalarReplicator.mo @@ -3,10 +3,10 @@ block RealScalarReplicator "Real signal replicator" parameter Integer nout=1 "Number of outputs"; - Interfaces.RealInput u + Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Connector of Real input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y[nout] + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y[nout] "Connector of Real output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Routing/RealVectorFilter.mo b/Buildings/Controls/OBC/CDL/Routing/RealVectorFilter.mo index 80f5c4e61c5..a02d0806373 100644 --- a/Buildings/Controls/OBC/CDL/Routing/RealVectorFilter.mo +++ b/Buildings/Controls/OBC/CDL/Routing/RealVectorFilter.mo @@ -5,10 +5,10 @@ block RealVectorFilter parameter Integer nout "Size of output vector"; parameter Boolean msk[nin]=fill(true,nin) "Array mask"; - Interfaces.RealInput u[nin] + Buildings.Controls.OBC.CDL.Interfaces.RealInput u[nin] "Connector of Real input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y[nout] + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y[nout] "Connector of Real output signals" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Routing/RealVectorReplicator.mo b/Buildings/Controls/OBC/CDL/Routing/RealVectorReplicator.mo index d4cb6e22939..ed50d4e496f 100644 --- a/Buildings/Controls/OBC/CDL/Routing/RealVectorReplicator.mo +++ b/Buildings/Controls/OBC/CDL/Routing/RealVectorReplicator.mo @@ -2,10 +2,10 @@ within Buildings.Controls.OBC.CDL.Routing; block RealVectorReplicator "Real vector signal replicator" parameter Integer nin=1 "Size of input vector"; parameter Integer nout=1 "Number of row in output"; - Interfaces.RealInput u[nin] + Buildings.Controls.OBC.CDL.Interfaces.RealInput u[nin] "Connector of Real vector input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); - Interfaces.RealOutput y[nout, nin] + Buildings.Controls.OBC.CDL.Interfaces.RealOutput y[nout, nin] "Connector of Real matrix output signals" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); diff --git a/Buildings/Controls/OBC/CDL/Utilities/SunRiseSet.mo b/Buildings/Controls/OBC/CDL/Utilities/SunRiseSet.mo index d818b1d7771..7713a1f7351 100644 --- a/Buildings/Controls/OBC/CDL/Utilities/SunRiseSet.mo +++ b/Buildings/Controls/OBC/CDL/Utilities/SunRiseSet.mo @@ -16,19 +16,19 @@ block SunRiseSet final unit="s", displayUnit="h") "Time zone"; - Interfaces.RealOutput nextSunRise( + Buildings.Controls.OBC.CDL.Interfaces.RealOutput nextSunRise( final quantity="Time", final unit="s", displayUnit="h") "Time of next sunrise" annotation (Placement(transformation(extent={{100,40},{140,80}}))); - Interfaces.RealOutput nextSunSet( + Buildings.Controls.OBC.CDL.Interfaces.RealOutput nextSunSet( final quantity="Time", final unit="s", displayUnit="h") "Time of next sunset" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); - Interfaces.BooleanOutput sunUp + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput sunUp "Output true if the sun is up" annotation (Placement(transformation(extent={{100,-80},{140,-40}}))); diff --git a/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/PartialSeries.mo b/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/PartialSeries.mo index 303740b2c53..5059731cd69 100644 --- a/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/PartialSeries.mo +++ b/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/PartialSeries.mo @@ -123,7 +123,9 @@ partial model PartialSeries "Partial model for series network" redeclare each final package MediumBui = Medium, redeclare each final package MediumSer = Medium, each final allowFlowReversalBui=allowFlowReversalBui, - each final allowFlowReversalSer=allowFlowReversalSer) "Building and ETS" + each final allowFlowReversalSer=allowFlowReversalSer, + each final TDisWatMin=datDes.TLooMin, + each final TDisWatMax=datDes.TLooMax) "Building and ETS" annotation (Placement(transformation(extent={{-10,170},{10,190}}))); Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatSupMaxSet[nBui]( k=bui.THeaWatSup_nominal) @@ -252,6 +254,12 @@ equation Documentation(revisions="
          • +March 18, 2024, by David Blum:
            +Updated use of datDes for min and max loop temperatures.
            +This is for +issue 3697. +
            • +
          • December 12, 2023, by Ettore Zanetti:
            Changed to preconfigured pump model, This is for diff --git a/Buildings/Experimental/DHC/Loads/Combined/BaseClasses/PartialBuildingWithETS.mo b/Buildings/Experimental/DHC/Loads/Combined/BaseClasses/PartialBuildingWithETS.mo index 915f8be9700..8ee749b21c7 100644 --- a/Buildings/Experimental/DHC/Loads/Combined/BaseClasses/PartialBuildingWithETS.mo +++ b/Buildings/Experimental/DHC/Loads/Combined/BaseClasses/PartialBuildingWithETS.mo @@ -5,8 +5,10 @@ model PartialBuildingWithETS Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS( nPorts_heaWat=1, nPorts_chiWat=1); - outer parameter Buildings.Experimental.DHC.Examples.Combined.BaseClasses.DesignDataSeries datDes "DHC system design data" - annotation (Placement(transformation(extent={{-250,262},{-230,282}}))); + parameter Modelica.Units.SI.Temperature TDisWatMin=6 + 273.15 + "District water minimum temperature" annotation (Dialog(group="ETS model parameters")); + parameter Modelica.Units.SI.Temperature TDisWatMax=17 + 273.15 + "District water maximum temperature" annotation (Dialog(group="ETS model parameters")); parameter Modelica.Units.SI.TemperatureDifference dT_nominal(min=0) = 4 "Water temperature drop/increase accross load and source-side HX (always positive)" annotation (Dialog(group="ETS model parameters")); @@ -118,6 +120,13 @@ connected to a repleacable building load model. ", revisions="
            • +March 18, 2024, by David Blum:
              +Added parameters TDisWatMin and TDisWatMax +in lieu of using datDes.
              +This is for +issue 3697. +
              • +
            • February 23, 2021, by Antoine Gautier:
              First implementation.
              • diff --git a/Buildings/Experimental/DHC/Loads/Combined/BuildingTimeSeriesWithETS.mo b/Buildings/Experimental/DHC/Loads/Combined/BuildingTimeSeriesWithETS.mo index 2130db00757..bb9b3ddbd72 100644 --- a/Buildings/Experimental/DHC/Loads/Combined/BuildingTimeSeriesWithETS.mo +++ b/Buildings/Experimental/DHC/Loads/Combined/BuildingTimeSeriesWithETS.mo @@ -14,8 +14,8 @@ model BuildingTimeSeriesWithETS Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger ets( final dT_nominal=dT_nominal, - final TDisWatMin=datDes.TLooMin, - final TDisWatMax=datDes.TLooMax, + final TDisWatMin=TDisWatMin, + final TDisWatMax=TDisWatMax, final TChiWatSup_nominal=TChiWatSup_nominal, final THeaWatSup_nominal=THeaWatSup_nominal, final THotWatSup_nominal=THotWatSup_nominal, diff --git a/Buildings/Experimental/DHC/Loads/Combined/BuildingTimeSeriesWithETSWithDHWTank.mo b/Buildings/Experimental/DHC/Loads/Combined/BuildingTimeSeriesWithETSWithDHWTank.mo index a0578074033..83bc8ddd393 100644 --- a/Buildings/Experimental/DHC/Loads/Combined/BuildingTimeSeriesWithETSWithDHWTank.mo +++ b/Buildings/Experimental/DHC/Loads/Combined/BuildingTimeSeriesWithETSWithDHWTank.mo @@ -14,8 +14,8 @@ model BuildingTimeSeriesWithETSWithDHWTank Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchangerDHWTank ets( final dT_nominal=dT_nominal, - final TDisWatMin=datDes.TLooMin, - final TDisWatMax=datDes.TLooMax, + final TDisWatMin=TDisWatMin, + final TDisWatMax=TDisWatMax, final TChiWatSup_nominal=TChiWatSup_nominal, final THeaWatSup_nominal=THeaWatSup_nominal, final THotWatSup_nominal=THotWatSup_nominal, @@ -123,6 +123,13 @@ Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger ", revisions="
              • +March 18, 2024, by David Blum:
                +Added parameters TDisWatMin and TDisWatMax +in lieu of using datDes.
                +This is for +issue 3697. +
                • +
              • September 13, 2022, by David Blum:
                First implementation. This is for diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/MassExchange.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/MassExchange.mo index 34fc082884a..d2cd387fbab 100644 --- a/Buildings/Fluid/HeatExchangers/BaseClasses/MassExchange.mo +++ b/Buildings/Fluid/HeatExchangers/BaseClasses/MassExchange.mo @@ -44,7 +44,7 @@ protected p=Medium.p_default, X=Medium.X_default); parameter Modelica.Units.SI.SpecificHeatCapacity cp_default= Medium.specificHeatCapacityCp(sta_default) - "Density, used to compute fluid volume"; + "Specific heat capacity"; parameter Real cpLe_default(unit="J/(kg.K)") = cp_default * Le^(1-n); equation connect(TSur, TDewPoi.T) annotation (Line(points={{-120,80},{-80,80},{-80,50}, diff --git a/Buildings/Fluid/HeatExchangers/EvaporatorCondenser.mo b/Buildings/Fluid/HeatExchangers/EvaporatorCondenser.mo index feeae432bfd..40f15964b38 100644 --- a/Buildings/Fluid/HeatExchangers/EvaporatorCondenser.mo +++ b/Buildings/Fluid/HeatExchangers/EvaporatorCondenser.mo @@ -46,7 +46,7 @@ model EvaporatorCondenser protected parameter Modelica.Units.SI.SpecificHeatCapacity cp_default= Medium.specificHeatCapacityCp(sta_default) - "Density, used to compute fluid volume"; + "Specific heat capacity"; Modelica.Thermal.HeatTransfer.Sensors.HeatFlowSensor heaFlo "Heat flow sensor" diff --git a/Buildings/Fluid/HeatPumps/Data/EquationFitReversible/Generic.mo b/Buildings/Fluid/HeatPumps/Data/EquationFitReversible/Generic.mo index 8fd02bad276..5f5fb7173db 100644 --- a/Buildings/Fluid/HeatPumps/Data/EquationFitReversible/Generic.mo +++ b/Buildings/Fluid/HeatPumps/Data/EquationFitReversible/Generic.mo @@ -8,9 +8,13 @@ record Generic mLoa_flow = hea.mLoa_flow, mSou_flow = hea.mSou_flow) "Performance data for cooling mode (set coo.P = 0 to disable operation in cooling mode)"; - parameter Modelica.Units.SI.PressureDifference dpHeaLoa_nominal(min=0) = + parameter Modelica.Units.SI.PressureDifference dpHeaLoa_nominal( + min=0, + displayUnit="Pa") = 30000 "Nominal pressure drop at load heat exchanger side at hea.mLoa_flow"; - parameter Modelica.Units.SI.PressureDifference dpHeaSou_nominal(min=0) = + parameter Modelica.Units.SI.PressureDifference dpHeaSou_nominal( + min=0, + displayUnit="Pa") = 30000 "Nominal pressure drop at load heat exchanger side at hea.mSou_flow"; final parameter Boolean reverseCycle=coo.P > Modelica.Constants.eps @@ -30,6 +34,10 @@ Buildings.Fluid.HeatPumps.EquationFitReversible. ", revisions="
                • +April 1, 2024, by Michael Wetter:
                  +Added displayUnit for pressure drop. +
                  • +
                • May 16, 2022, by Michael Wetter:
                  Removed protected keyword as the Modelica Language Specification only allows public sections in a record.
                  diff --git a/Buildings/Fluid/HeatPumps/EquationFitReversible.mo b/Buildings/Fluid/HeatPumps/EquationFitReversible.mo index d12aec66415..bd434a44ade 100644 --- a/Buildings/Fluid/HeatPumps/EquationFitReversible.mo +++ b/Buildings/Fluid/HeatPumps/EquationFitReversible.mo @@ -112,12 +112,12 @@ protected "Prescribed source side heat flow rate" annotation (Placement(transformation(extent={{59,-70},{39,-50}}))); - Buildings.Controls.OBC.CDL.Integers.LessThreshold lesThr(final t=0) if not - per.reverseCycle "Indicator, outputs true if in cooling mode" + Controls.OBC.CDL.Integers.GreaterEqualThreshold greEqu( + final t=0) if not per.reverseCycle + "Indicator, outputs true if in cooling mode" annotation (Placement(transformation(extent={{-80,-90},{-60,-70}}))); - Buildings.Controls.OBC.CDL.Utilities.Assert aleMes( - message="uMod cannot be -1 if reverseCycle is false.") + Buildings.Controls.OBC.CDL.Utilities.Assert aleMes(message="uMod = -1 (cooling) is not allowed as reverseCycle is false.") if not per.reverseCycle "Generate alert message if control input is not valid" annotation (Placement(transformation(extent={{-52,-90},{-32,-70}}))); @@ -148,9 +148,9 @@ equation annotation (Line(points={{-10,60},{-14,60},{-14,20},{39,20}}, color={191,0,0})); connect(vol2.heatPort, preHeaFloSou.port) annotation (Line(points={{12,-60},{39,-60}},color={191,0,0})); - connect(aleMes.u, lesThr.y) + connect(aleMes.u,greEqu.y) annotation (Line(points={{-54,-80},{-58,-80}}, color={255,0,255})); - connect(lesThr.u, uMod) annotation (Line(points={{-82,-80},{-88,-80},{-88,0},{ + connect(greEqu.u, uMod) annotation (Line(points={{-82,-80},{-88,-80},{-88,0},{ -112,0}}, color={255,127,0})); connect(equFit.Q_flow_set, Q_flow_set.y) annotation (Line(points={{-11,9},{-44,9},{-44,40},{-59,40}},color={0,0,127})); @@ -365,6 +365,12 @@ Master Thesis. Oklahoma State University, Oklahoma, USA. 2005. ", revisions="
                  • +April 1, 2024, by Michael Wetter:
                    +Corrected wrong assertion.
                    +This is for +#3664. +
                    • +
                  • September 16, 2019 by Michael Wetter:
                    Refactored implementation.
                    • diff --git a/Buildings/Fluid/Movers/Validation/BaseClasses/ControlledFlowMachine.mo b/Buildings/Fluid/Movers/Validation/BaseClasses/ControlledFlowMachine.mo index 46a2f04e0a7..a9357403239 100644 --- a/Buildings/Fluid/Movers/Validation/BaseClasses/ControlledFlowMachine.mo +++ b/Buildings/Fluid/Movers/Validation/BaseClasses/ControlledFlowMachine.mo @@ -166,7 +166,7 @@ equation Documentation(info=" This example demonstrates the use of the flow model with four different configuration. At steady-state, all flow models have the same mass flow rate and pressure difference. -"), revisions=" +", revisions="
                    • March 21, 2023, by Hongxiang Fu:
                      @@ -175,5 +175,5 @@ This is for IBPSA, #1704.
                    -"); +")); end ControlledFlowMachine; diff --git a/Buildings/Obsolete/Controls/OBC/CDL/Interfaces/package.mo b/Buildings/Obsolete/Controls/OBC/CDL/Interfaces/package.mo index 97129797427..6b068a5d772 100644 --- a/Buildings/Obsolete/Controls/OBC/CDL/Interfaces/package.mo +++ b/Buildings/Obsolete/Controls/OBC/CDL/Interfaces/package.mo @@ -4,7 +4,7 @@ package Interfaces "Package with obsolete interfaces" annotation (preferredView="info", Documentation(info="

                    -Package with obsolete interfaces. +Package with obsolete Buildings.Controls.OBC.CDL.Interfaces.

                    ")); end Interfaces; diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Air_Systems_SingleZone_VAV_BaseClasses_Validation_ControllerChillerDXHeatingEconomizer.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Air_Systems_SingleZone_VAV_BaseClasses_Validation_ControllerChillerDXHeatingEconomizer.txt index 9db24bf6bb4..eabd7d68c81 100644 --- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Air_Systems_SingleZone_VAV_BaseClasses_Validation_ControllerChillerDXHeatingEconomizer.txt +++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Air_Systems_SingleZone_VAV_BaseClasses_Validation_ControllerChillerDXHeatingEconomizer.txt @@ -1,4 +1,4 @@ -last-generated=2020-11-20 +last-generated=2024-04-01 statistics-simulation= { "linear": " ", @@ -6,12 +6,12 @@ statistics-simulation= "number of continuous time states": "4", "numerical Jacobians": "0" } -con.TRoo=[2.941499938964844e+02, 2.954033203125e+02, 2.966369018554688e+02, 2.978312377929688e+02, 2.98967529296875e+02, 3.000278625488281e+02, 3.009954833984375e+02, 3.018551330566406e+02, 3.025932922363281e+02, 3.031982727050781e+02, 3.036605529785156e+02, 3.039728698730469e+02, 3.041302795410156e+02, 3.041302795410156e+02, 3.039728698730469e+02, 3.036605529785156e+02, 3.031982727050781e+02, 3.025932922363281e+02, 3.018551330566406e+02, 3.009954833984375e+02, 3.000278625488281e+02, 2.98967529296875e+02, 2.978312377929688e+02, 2.966369018554688e+02, 2.954033203125e+02, 2.941499938964844e+02, 2.928966674804688e+02, 2.916630859375e+02, 2.9046875e+02, 2.893324584960938e+02, 2.882721557617188e+02, 2.873045349121094e+02, 2.864448547363281e+02, 2.857067260742188e+02, 2.851017150878906e+02, 2.846394348144531e+02, 2.843271179199219e+02, 2.841697387695312e+02, 2.841697387695312e+02, 2.843271179199219e+02, 2.846394348144531e+02, 2.851017150878906e+02, 2.857067260742188e+02, 2.864448547363281e+02, 2.873045349121094e+02, 2.882721557617188e+02, 2.893324584960938e+02, 2.9046875e+02, 2.916630859375e+02, 2.928966674804688e+02, 2.941499938964844e+02, 2.954033203125e+02, 2.966369018554688e+02, 2.978312377929688e+02, 2.98967529296875e+02, 3.000278625488281e+02, 3.009954833984375e+02, 3.018551330566406e+02, 3.025932922363281e+02, 3.031982727050781e+02, 3.036605529785156e+02, 3.039728698730469e+02, 3.041302795410156e+02, 3.041302795410156e+02, 3.039728698730469e+02, 3.036605529785156e+02, 3.031982727050781e+02, 3.025932922363281e+02, 3.018551330566406e+02, 3.009954833984375e+02, 3.000278625488281e+02, 2.98967529296875e+02, 2.978312377929688e+02, 2.966369018554688e+02, 2.954033203125e+02, 2.941499938964844e+02, 2.928966674804688e+02, 2.916630859375e+02, 2.9046875e+02, 2.893324584960938e+02, 2.882721557617188e+02, 2.873045349121094e+02, 2.864448547363281e+02, 2.857067260742188e+02, 2.851017150878906e+02, 2.846394348144531e+02, 2.843271179199219e+02, 2.841697387695312e+02, 2.841697387695312e+02, 2.843271179199219e+02, 2.846394348144531e+02, 2.851017150878906e+02, 2.857067260742188e+02, 2.864448547363281e+02, 2.873045349121094e+02, 2.882721557617188e+02, 2.893324584960938e+02, 2.9046875e+02, 2.916630859375e+02, 2.928966674804688e+02, 2.941499938964844e+02] +time=[0e+00, 1.728e+05] con.TSetRooCoo=[3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02] con.TSetRooHea=[2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+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, 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, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+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, 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, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02] -time=[0e+00, 1.728e+05] -con.yHea=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 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.647239878773689e-02, 3.273643553256989e-01, 8.477213382720975e-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, 9.816431403160095e-01, 7.517172694206238e-01, 3.030463457107544e-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, 3.647343069314957e-02, 3.2736536860466e-01, 8.477223515510559e-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, 9.816421270370483e-01, 7.517160177230835e-01, 3.030450940132141e-01, 0e+00, 0e+00, 0e+00] -con.yCooCoiVal=[0e+00, 1.720682084560394e-01, 5.100926756858826e-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, 9.956660270690918e-01, 8.23597252368927e-01, 4.855729043483734e-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, 4.33625653386116e-03, 1.764044463634491e-01, 5.144289135932922e-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, 9.956595301628113e-01, 8.235909938812256e-01, 4.85566645860672e-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, 4.33625653386116e-03] -con.yFan=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.082911416888237e-01, 2.105162441730499e-01, 3.722033500671387e-01, 5.635502934455872e-01, 7.542873620986938e-01, 9.141548871994021e-01, 1e+00, 9.980849027633667e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.542088508605957e-01, 6.596971154212952e-01, 1.278783231973648e-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.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.082934960722923e-01, 2.105187922716141e-01, 3.722059428691864e-01, 5.635528564453125e-01, 7.542899250984192e-01, 9.14157509803772e-01, 1e+00, 9.980853199958801e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.542136192321777e-01, 6.597015261650085e-01, 1.278822422027588e-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.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 0e+00, 0e+00, 0e+00] -con.TSetSupAir=[2.861499938964844e+02, 2.861499938964844e+02] +con.TRoo=[2.941499938964844e+02, 2.954033203125e+02, 2.966369018554688e+02, 2.978312377929688e+02, 2.98967529296875e+02, 3.000278625488281e+02, 3.009954833984375e+02, 3.018551330566406e+02, 3.025932922363281e+02, 3.031982727050781e+02, 3.036605529785156e+02, 3.039728698730469e+02, 3.041302795410156e+02, 3.041302795410156e+02, 3.039728698730469e+02, 3.036605529785156e+02, 3.031982727050781e+02, 3.025932922363281e+02, 3.018551330566406e+02, 3.009954833984375e+02, 3.000278625488281e+02, 2.98967529296875e+02, 2.978312377929688e+02, 2.966369018554688e+02, 2.954033203125e+02, 2.941499938964844e+02, 2.928966674804688e+02, 2.916630859375e+02, 2.9046875e+02, 2.893324584960938e+02, 2.882721557617188e+02, 2.873045349121094e+02, 2.864448547363281e+02, 2.857067260742188e+02, 2.851017150878906e+02, 2.846394348144531e+02, 2.843271179199219e+02, 2.841697387695312e+02, 2.841697387695312e+02, 2.843271179199219e+02, 2.846394348144531e+02, 2.851017150878906e+02, 2.857067260742188e+02, 2.864448547363281e+02, 2.873045349121094e+02, 2.882721557617188e+02, 2.893324584960938e+02, 2.9046875e+02, 2.916630859375e+02, 2.928966674804688e+02, 2.941499938964844e+02, 2.954033203125e+02, 2.966369018554688e+02, 2.978312377929688e+02, 2.98967529296875e+02, 3.000278625488281e+02, 3.009954833984375e+02, 3.018551330566406e+02, 3.025932922363281e+02, 3.031982727050781e+02, 3.036605529785156e+02, 3.039728698730469e+02, 3.041302795410156e+02, 3.041302795410156e+02, 3.039728698730469e+02, 3.036605529785156e+02, 3.031982727050781e+02, 3.025932922363281e+02, 3.018551330566406e+02, 3.009954833984375e+02, 3.000278625488281e+02, 2.98967529296875e+02, 2.978312377929688e+02, 2.966369018554688e+02, 2.954033203125e+02, 2.941499938964844e+02, 2.928966674804688e+02, 2.916630859375e+02, 2.9046875e+02, 2.893324584960938e+02, 2.882721557617188e+02, 2.873045349121094e+02, 2.864448547363281e+02, 2.857067260742188e+02, 2.851017150878906e+02, 2.846394348144531e+02, 2.843271179199219e+02, 2.841697387695312e+02, 2.841697387695312e+02, 2.843271179199219e+02, 2.846394348144531e+02, 2.851017150878906e+02, 2.857067260742188e+02, 2.864448547363281e+02, 2.873045349121094e+02, 2.882721557617188e+02, 2.893324584960938e+02, 2.9046875e+02, 2.916630859375e+02, 2.928966674804688e+02, 2.941499938964844e+02] +con.yFan=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.082922741770744e-01, 2.105175256729126e-01, 3.722044825553894e-01, 5.635513663291931e-01, 7.542885541915894e-01, 9.141561388969424e-01, 1e+00, 9.980847835540771e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.542185664176941e-01, 6.597064137458801e-01, 1.278872042894363e-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.000000014901161e-01, 1.000000014901161e-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, 1.082927510142326e-01, 2.105180025100708e-01, 3.722049593925476e-01, 5.635518431663513e-01, 7.542890310287476e-01, 9.141566157341003e-01, 1e+00, 9.980847835540771e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.542185664176941e-01, 6.597064137458801e-01, 1.278872042894363e-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.000000014901161e-01, 1.000000014901161e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +con.yHea=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 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.64723913371563e-02, 3.273644745349884e-01, 8.477222323417691e-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, 9.8164302110672e-01, 7.51718282699585e-01, 3.030494749546051e-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, 3.64723913371563e-02, 3.273644745349884e-01, 8.477222323417664e-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, 9.8164302110672e-01, 7.51718282699585e-01, 3.030494749546051e-01, 0e+00, 0e+00, 0e+00] +con.yCooCoiVal=[0e+00, 1.720682084560394e-01, 5.100926756858826e-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, 9.956628680229187e-01, 8.235945701599121e-01, 4.855700731277466e-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, 4.336489364504814e-03, 1.76404669880867e-01, 5.144291520118713e-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, 9.956628680229187e-01, 8.235945701599121e-01, 4.855700731277466e-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, 4.336489364504814e-03] con.TSup=[2.861499938964844e+02, 2.8702734375e+02, 2.878908386230469e+02, 2.887268676757812e+02, 2.895222778320312e+02, 2.902644958496094e+02, 2.909418334960938e+02, 2.915435791015625e+02, 2.92060302734375e+02, 2.924837951660156e+02, 2.928074035644531e+02, 2.930260009765625e+02, 2.931361999511719e+02, 2.931361999511719e+02, 2.930260009765625e+02, 2.928074035644531e+02, 2.924837951660156e+02, 2.92060302734375e+02, 2.915435791015625e+02, 2.909418334960938e+02, 2.902644958496094e+02, 2.895222778320312e+02, 2.887268676757812e+02, 2.878908386230469e+02, 2.8702734375e+02, 2.861499938964844e+02, 2.852726745605469e+02, 2.844091796875e+02, 2.835731201171875e+02, 2.827777099609375e+02, 2.820354919433594e+02, 2.813581848144531e+02, 2.807564086914062e+02, 2.802397155761719e+02, 2.798162231445312e+02, 2.794926147460938e+02, 2.792739868164062e+02, 2.79163818359375e+02, 2.79163818359375e+02, 2.792739868164062e+02, 2.794926147460938e+02, 2.798162231445312e+02, 2.802397155761719e+02, 2.807564086914062e+02, 2.813581848144531e+02, 2.820354919433594e+02, 2.827777099609375e+02, 2.835731201171875e+02, 2.844091796875e+02, 2.852726745605469e+02, 2.861499938964844e+02, 2.8702734375e+02, 2.878908386230469e+02, 2.887268676757812e+02, 2.895222778320312e+02, 2.902644958496094e+02, 2.909418334960938e+02, 2.915435791015625e+02, 2.92060302734375e+02, 2.924837951660156e+02, 2.928074035644531e+02, 2.930260009765625e+02, 2.931361999511719e+02, 2.931361999511719e+02, 2.930260009765625e+02, 2.928074035644531e+02, 2.924837951660156e+02, 2.92060302734375e+02, 2.915435791015625e+02, 2.909418334960938e+02, 2.902644958496094e+02, 2.895222778320312e+02, 2.887268676757812e+02, 2.878908386230469e+02, 2.8702734375e+02, 2.861499938964844e+02, 2.852726745605469e+02, 2.844091796875e+02, 2.835731201171875e+02, 2.827777099609375e+02, 2.820354919433594e+02, 2.813581848144531e+02, 2.807564086914062e+02, 2.802397155761719e+02, 2.798162231445312e+02, 2.794926147460938e+02, 2.792739868164062e+02, 2.79163818359375e+02, 2.79163818359375e+02, 2.792739868164062e+02, 2.794926147460938e+02, 2.798162231445312e+02, 2.802397155761719e+02, 2.807564086914062e+02, 2.813581848144531e+02, 2.820354919433594e+02, 2.827777099609375e+02, 2.835731201171875e+02, 2.844091796875e+02, 2.852726745605469e+02, 2.861499938964844e+02] +con.TSetSupAir=[2.861499938964844e+02, 2.861499938964844e+02] diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Air_Systems_SingleZone_VAV_Examples_ChillerDXHeatingEconomizer.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Air_Systems_SingleZone_VAV_Examples_ChillerDXHeatingEconomizer.txt index 19c83138e85..e67a30b43c4 100644 --- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Air_Systems_SingleZone_VAV_Examples_ChillerDXHeatingEconomizer.txt +++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Air_Systems_SingleZone_VAV_Examples_ChillerDXHeatingEconomizer.txt @@ -1,4 +1,4 @@ -last-generated=2023-06-16 +last-generated=2024-03-28 statistics-initialization= { "linear": "19", @@ -13,11 +13,11 @@ statistics-simulation= "numerical Jacobians": "0" } time=[0e+00, 5.048e+05] -con.TRoo=[2.931499938964844e+02, 2.881458239119098e+02, 2.881132750108507e+02, 2.881048665364584e+02, 2.881011442057292e+02, 2.881063571506077e+02, 2.931441980938366e+02, 2.931304234483507e+02, 2.981698816457508e+02, 2.982812316894531e+02, 2.982970560709635e+02, 2.982501245795356e+02, 2.976850130208333e+02, 2.943042972140842e+02, 2.905318812391493e+02, 2.88130229695638e+02, 2.881117207845052e+02, 2.880957666015625e+02, 2.880845129394531e+02, 2.88075094672309e+02, 2.880690639919705e+02, 2.880634543863932e+02, 2.880589264594184e+02, 2.915165499815814e+02, 2.930083553059896e+02, 2.930214691162109e+02, 2.930190405273437e+02, 2.930169128417969e+02, 2.930125391981337e+02, 2.93002164984809e+02, 2.897204213145534e+02, 2.880541918945312e+02, 2.880427749294705e+02, 2.880367079671224e+02, 2.880343825954861e+02, 2.880335066053602e+02, 2.880345031738281e+02, 2.880339320882161e+02, 2.880302945963542e+02, 2.880278210449219e+02, 2.88474264187283e+02, 2.929802370876736e+02, 2.930349564615885e+02, 2.93857082655165e+02, 2.948437151421441e+02, 2.931369656476367e+02, 2.930649104817708e+02, 2.93011613023546e+02, 2.88057294921875e+02, 2.880393975830078e+02, 2.880325690375434e+02, 2.880278698730469e+02, 2.880208521864149e+02, 2.880172584364149e+02, 2.880172204589844e+02, 2.880166039360894e+02, 2.880174274359809e+02, 2.880476810709636e+02, 2.930611908637153e+02, 2.945135716063933e+02, 2.982007507324219e+02, 2.982234921603733e+02, 2.982080346679688e+02, 2.957201331497719e+02, 2.930482058376736e+02, 2.880754011366103e+02, 2.880496744791666e+02, 2.880381608751085e+02, 2.88036637234158e+02, 2.880355537923177e+02, 2.880364013671875e+02, 2.880595088704427e+02, 2.880612963867188e+02, 2.880621503363715e+02, 2.88095540500217e+02, 2.932049622468184e+02, 2.981838122376992e+02, 2.982645391845703e+02, 2.982858614095052e+02, 2.982657882351346e+02, 2.980193135510544e+02, 2.948067242431641e+02, 2.905028946940104e+02, 2.881298156738281e+02, 2.881034057617188e+02, 2.880948805067274e+02, 2.880910095214844e+02, 2.880875970458985e+02, 2.880952425130208e+02, 2.880917147488064e+02, 2.880894226074219e+02, 2.881098601616753e+02, 2.931753818115306e+02, 2.982176841227214e+02, 2.982943690321181e+02, 2.983226894802517e+02, 2.982930428059896e+02, 2.982161229790582e+02, 2.963477406777981e+02, 2.925950952148438e+02, 2.887920837402344e+02] -con.TSetRooHea=[2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.920055494520399e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.915475720884673e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.897793553184725e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.885944383409288e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.882388827853733e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.890499938964844e+02, 2.881499938964844e+02] -con.TSetRooCoo=[3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.992944383409288e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.997524157045015e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.015206324744962e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.027055494520399e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.030611050075955e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.022499938964844e+02, 3.031499938964844e+02] -EFan.y=[0e+00, 5.520335589430495e+02, 4.959542697482639e+03, 9.37129615234375e+03, 1.378305014322917e+04, 1.819480412326389e+04, 2.260655761465498e+04, 2.701831095920139e+04, 4.391144490897324e+04, 3.0789073234375e+05, 9.279758277777778e+05, 1.352337325277778e+06, 1.453162871666667e+06, 1.4591535e+06, 1.4591535e+06, 1.460798375e+06, 1.465210116666667e+06, 1.469621858333333e+06, 1.4740336e+06, 1.478445341666667e+06, 1.482857083333333e+06, 1.487268825e+06, 1.491680566666667e+06, 1.496092396869091e+06, 1.500504175e+06, 1.504915916666667e+06, 1.509327658333333e+06, 1.5137394e+06, 1.518151141666667e+06, 1.522562883333333e+06, 1.526764875e+06, 1.530735991666667e+06, 1.535147733333333e+06, 1.539559475e+06, 1.543971216666667e+06, 1.548382958333333e+06, 1.5527947e+06, 1.557206441666667e+06, 1.561618183333333e+06, 1.566029925e+06, 1.570441677777778e+06, 1.574853533333333e+06, 1.579265275e+06, 1.583677016666667e+06, 1.588088758333333e+06, 1.592500501382709e+06, 1.596912241666667e+06, 1.601323983333333e+06, 1.60490685e+06, 1.609318591666667e+06, 1.613730458333333e+06, 1.6181422e+06, 1.622553941666667e+06, 1.626965683333333e+06, 1.631377425e+06, 1.635789166666667e+06, 1.640200908333333e+06, 1.64461265e+06, 1.649024391666667e+06, 1.653436169452106e+06, 1.665027391666667e+06, 1.727436200833333e+06, 1.800720812222222e+06, 1.816383107325645e+06, 1.820794841666667e+06, 1.823943333333333e+06, 1.828355075e+06, 1.832766816666667e+06, 1.837178558333333e+06, 1.8415903e+06, 1.846002041666667e+06, 1.850413783333333e+06, 1.854825525e+06, 1.859237266666667e+06, 1.863649008333333e+06, 1.868060779426521e+06, 1.881909564517337e+06, 2.039027516111111e+06, 2.491209503333333e+06, 2.957609717777778e+06, 3.136012740176861e+06, 3.146572075e+06, 3.1478935e+06, 3.149770808333333e+06, 3.15418255e+06, 3.158594291666667e+06, 3.163006033333333e+06, 3.167417775e+06, 3.171829516666667e+06, 3.176241258333333e+06, 3.180653e+06, 3.185064892222222e+06, 3.189476733088294e+06, 3.223575888333333e+06, 3.557986627777778e+06, 4.455116472222222e+06, 5.34584958e+06, 5.713142935555556e+06, 5.732647873383145e+06, 5.73448e+06, 5.73448e+06] -EHea.y=[0e+00, 2.182094290336491e+05, 4.393073151111111e+06, 1.030567978666667e+07, 1.706873387555556e+07, 2.38059042e+07, 3.443325840573355e+07, 4.232165749333333e+07, 4.3246784e+07, 4.3246784e+07, 4.3246784e+07, 4.3246784e+07, 4.3246784e+07, 4.3246784e+07, 4.3246784e+07, 4.410182466666666e+07, 4.859313264e+07, 5.510733677333333e+07, 6.370505888e+07, 7.376332159999999e+07, 8.488596106666666e+07, 9.688705733333333e+07, 1.095776518755556e+08, 1.263894269188542e+08, 1.488219458133333e+08, 1.680331573333333e+08, 1.865306586311111e+08, 2.0539339712e+08, 2.246638894222222e+08, 2.449943992533333e+08, 2.655990812692561e+08, 2.755468058311111e+08, 2.901126418488889e+08, 3.059060381866667e+08, 3.223119486577778e+08, 3.388792117333333e+08, 3.5543132032e+08, 3.719193092266667e+08, 3.8875455488e+08, 4.060762434133334e+08, 4.241337265777778e+08, 4.522627504355556e+08, 4.746842397866667e+08, 4.80715648e+08, 4.80715648e+08, 4.809331219314576e+08, 4.880816035555556e+08, 5.042946705066667e+08, 5.1318469376e+08, 5.279413985422222e+08, 5.442589866666666e+08, 5.613741009066666e+08, 5.792503082666667e+08, 5.980160668444444e+08, 6.1693841152e+08, 6.359491399111111e+08, 6.549579266844444e+08, 6.728410065066667e+08, 6.942523172977778e+08, 7.002892576053983e+08, 7.00290112e+08, 7.00290112e+08, 7.00290112e+08, 7.002899751603658e+08, 7.08669632e+08, 7.150957952e+08, 7.279919726933334e+08, 7.432227677866666e+08, 7.593183246222222e+08, 7.7562169472e+08, 7.919248455111111e+08, 8.068823045688889e+08, 8.1898132224e+08, 8.315985854577777e+08, 8.431065671111112e+08, 8.537411029716895e+08, 8.53743808e+08, 8.53743808e+08, 8.53743808e+08, 8.53743808e+08, 8.53743808e+08, 8.53743808e+08, 8.53743808e+08, 8.555813832533333e+08, 8.6103020288e+08, 8.683541966222222e+08, 8.764791808e+08, 8.851852100266666e+08, 8.934610167466667e+08, 9.013309156977777e+08, 9.098644224e+08, 9.179788259555556e+08, 9.26628864e+08, 9.26628864e+08, 9.26628864e+08, 9.26628864e+08, 9.26628864e+08, 9.26628864e+08, 9.26628864e+08, 9.26628864e+08, 9.26628864e+08] +con.TRoo=[2.931499938964844e+02, 2.881405243773959e+02, 2.881132756890191e+02, 2.881048907470703e+02, 2.881012185329861e+02, 2.881063869900174e+02, 2.901690649414062e+02, 2.931300741238064e+02, 2.981699204983835e+02, 2.982812432861328e+02, 2.98297056749132e+02, 2.982501680501302e+02, 2.976862345377604e+02, 2.943053951009115e+02, 2.905322450086805e+02, 2.881306162516276e+02, 2.881117990451389e+02, 2.880957765028212e+02, 2.880845129394531e+02, 2.880751534695095e+02, 2.880691236707899e+02, 2.880634576416016e+02, 2.880589218478733e+02, 2.892990375434028e+02, 2.930083459472656e+02, 2.93021233452691e+02, 2.930189908854167e+02, 2.930168341064453e+02, 2.930125472005208e+02, 2.930021752251519e+02, 2.897158833041698e+02, 2.880548021104601e+02, 2.880428133138021e+02, 2.880367079671224e+02, 2.880343619791666e+02, 2.880335042317708e+02, 2.88034501953125e+02, 2.880339895290799e+02, 2.880303601074219e+02, 2.880278210449219e+02, 2.884742363823785e+02, 2.929802221001519e+02, 2.930350349934896e+02, 2.937985879043456e+02, 2.948517895507812e+02, 2.931155883789062e+02, 2.930649560546875e+02, 2.93011585422092e+02, 2.880567915852865e+02, 2.880394636366103e+02, 2.880326877170139e+02, 2.880279457600911e+02, 2.880208573404948e+02, 2.880172070990669e+02, 2.880172119140625e+02, 2.880166039360894e+02, 2.880174274359809e+02, 2.880476527913411e+02, 2.930612193467882e+02, 2.941417670579264e+02, 2.982007466634115e+02, 2.982234943305122e+02, 2.982080365668403e+02, 2.957183930876086e+02, 2.930483543565538e+02, 2.880713589138455e+02, 2.880498213704427e+02, 2.880382524278429e+02, 2.880366966417101e+02, 2.880355537923177e+02, 2.880364420572917e+02, 2.880597488742404e+02, 2.880612414550781e+02, 2.880621114095052e+02, 2.880955638292101e+02, 2.933144757220867e+02, 2.981838158876994e+02, 2.982643613688151e+02, 2.982858231608073e+02, 2.982658119032118e+02, 2.980189855937423e+02, 2.948020672607422e+02, 2.904991617838542e+02, 2.881070479329427e+02, 2.881034057617188e+02, 2.880948805067274e+02, 2.880910095214844e+02, 2.880875970458985e+02, 2.880953327094184e+02, 2.880916485595703e+02, 2.88089404296875e+02, 2.881098355441623e+02, 2.9316070018013e+02, 2.982176717122396e+02, 2.982944125705295e+02, 2.983226894802517e+02, 2.982930428059896e+02, 2.982162033420139e+02, 2.963495651910036e+02, 2.925980187988282e+02, 2.887948608398438e+02] +con.TSetRooHea=[2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.90216660563151e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.920055494520399e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.894055494520399e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.897659886089761e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.885944383409288e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.882388827853733e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.890499938964844e+02, 2.881499938964844e+02] +con.TSetRooCoo=[3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.010833272298177e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.992944383409288e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.018944383409288e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.015339991839926e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.027055494520399e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.030611050075955e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.022499938964844e+02, 3.031499938964844e+02] +EFan.y=[0e+00, 9.080334373967839e+02, 5.319786885850694e+03, 9.73154029296875e+03, 1.414329428385417e+04, 1.855504826388889e+04, 2.296680088541667e+04, 2.737855509982639e+04, 4.432637320767051e+04, 3.0859397703125e+05, 9.289764416666667e+05, 1.353566691666667e+06, 1.454482545e+06, 1.46047475e+06, 1.46047475e+06, 1.462144125e+06, 1.466555866666667e+06, 1.470967608333333e+06, 1.47537935e+06, 1.479791091666667e+06, 1.484202833333333e+06, 1.488614575e+06, 1.493026316666667e+06, 1.497438089722222e+06, 1.501849925e+06, 1.506261666666667e+06, 1.510673408333333e+06, 1.51508515e+06, 1.519496891666667e+06, 1.523908633333333e+06, 1.528110625e+06, 1.532171616666667e+06, 1.536583358333333e+06, 1.5409951e+06, 1.545406841666667e+06, 1.549818593055556e+06, 1.55423045e+06, 1.558642191666667e+06, 1.563053933333333e+06, 1.567465675e+06, 1.571877416666667e+06, 1.576289158333333e+06, 1.5807009e+06, 1.585112628215055e+06, 1.589524383333333e+06, 1.593936125e+06, 1.598347929444444e+06, 1.602759733333333e+06, 1.606473975e+06, 1.610885716666667e+06, 1.615297458333333e+06, 1.6197092e+06, 1.624120941666667e+06, 1.628532808333333e+06, 1.63294455e+06, 1.637356291666667e+06, 1.641768033333333e+06, 1.646179775e+06, 1.650591516666667e+06, 1.655003242144973e+06, 1.666596358333333e+06, 1.728992383611111e+06, 1.802251323888889e+06, 1.81790927276671e+06, 1.822321091666667e+06, 1.825659833333333e+06, 1.830071575e+06, 1.834483316666667e+06, 1.838895058333333e+06, 1.8433068e+06, 1.847718541666667e+06, 1.852130283333333e+06, 1.856542025e+06, 1.860953891666667e+06, 1.865365633333333e+06, 1.869777358044393e+06, 1.88362792293976e+06, 2.040103379722222e+06, 2.491380136666667e+06, 2.957414915e+06, 3.135799733178654e+06, 3.146281325e+06, 3.14760275e+06, 3.149641558333333e+06, 3.1540533e+06, 3.158465041666667e+06, 3.162876783333333e+06, 3.167288525e+06, 3.171700266666667e+06, 3.176112008333333e+06, 3.18052375e+06, 3.184935491666667e+06, 3.189347233333878e+06, 3.223407378333333e+06, 3.558560784444444e+06, 4.456434838888889e+06, 5.34727338e+06, 5.71475069e+06, 5.734303232834861e+06, 5.736135e+06, 5.736135e+06] +EHea.y=[0e+00, 5.224997060040278e+05, 4.408926968888889e+06, 1.031795445333333e+07, 1.707869444444444e+07, 2.380788362222222e+07, 3.248085178666667e+07, 4.232573241777778e+07, 4.3251684e+07, 4.3251684e+07, 4.3251684e+07, 4.3251684e+07, 4.3251684e+07, 4.3251684e+07, 4.3251684e+07, 4.410640946666667e+07, 4.859561953777778e+07, 5.511381551111111e+07, 6.371365616e+07, 7.377090688e+07, 8.489230968888889e+07, 9.689423168000001e+07, 1.095847973333333e+08, 1.2508503968e+08, 1.488291061333333e+08, 1.680464302222222e+08, 1.865435136711111e+08, 2.0541200512e+08, 2.246839163733333e+08, 2.450152041955556e+08, 2.656182330627892e+08, 2.756114527288889e+08, 2.901644273777778e+08, 3.059520072533333e+08, 3.223545915733333e+08, 3.389266592e+08, 3.5547995392e+08, 3.719628374755555e+08, 3.887908421688889e+08, 4.061119374933333e+08, 4.241720817777778e+08, 4.523029738666667e+08, 4.747087159466667e+08, 4.80716832e+08, 4.80716832e+08, 4.810800128e+08, 4.880642993777778e+08, 5.042725534577778e+08, 5.132251776e+08, 5.279604702577778e+08, 5.442670506666666e+08, 5.613752187733333e+08, 5.792464887466667e+08, 5.980213340444444e+08, 6.1694647296e+08, 6.359577002666667e+08, 6.549663746844444e+08, 6.7284975104e+08, 6.942616192e+08, 7.002992e+08, 7.002992e+08, 7.002992e+08, 7.002992e+08, 7.002994748673553e+08, 7.086742994488889e+08, 7.151693212444445e+08, 7.280421597866666e+08, 7.432601508977778e+08, 7.593568804977778e+08, 7.756583125333333e+08, 7.919605902222222e+08, 8.069140743111111e+08, 8.190114483200001e+08, 8.316284371911111e+08, 8.431374225066667e+08, 8.53668587462063e+08, 8.53774464e+08, 8.53774464e+08, 8.53774464e+08, 8.53774464e+08, 8.53774464e+08, 8.53774464e+08, 8.53774464e+08, 8.555812330666667e+08, 8.610747426133333e+08, 8.683986403555555e+08, 8.765226743466667e+08, 8.852317777066667e+08, 8.935006492444445e+08, 9.013690144711111e+08, 9.099055872e+08, 9.180191554844445e+08, 9.26666624e+08, 9.26666624e+08, 9.26666624e+08, 9.26666624e+08, 9.26666624e+08, 9.26666624e+08, 9.26666624e+08, 9.26666624e+08, 9.26666624e+08] ECoo.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] -EHVAC.y=[0e+00, 2.187614641882735e+05, 4.398032835555555e+06, 1.031505096e+07, 1.708251583111111e+07, 2.382409915555555e+07, 3.445586603960676e+07, 4.234867686222222e+07, 4.329069798958714e+07, 4.355467552e+07, 4.417476204444444e+07, 4.459912287111111e+07, 4.469994794666667e+07, 4.470594e+07, 4.470594e+07, 4.556262546666667e+07, 5.005834202666666e+07, 5.657695809777778e+07, 6.51790904e+07, 7.524176474666667e+07, 8.636881315555556e+07, 9.837432565333334e+07, 1.110693287822222e+08, 1.278855191569947e+08, 1.503224426666667e+08, 1.695380684444444e+08, 1.880399895466667e+08, 2.0690714784e+08, 2.261820439466667e+08, 2.465169629511111e+08, 2.671258440552996e+08, 2.770775562666667e+08, 2.916477896533333e+08, 3.0744558336e+08, 3.238559128177778e+08, 3.404275861333333e+08, 3.569841216e+08, 3.734765078755556e+08, 3.903161828977778e+08, 4.076422688e+08, 4.257041813333333e+08, 4.5383760256e+08, 4.762635178666667e+08, 4.822993268622222e+08, 4.8230374656e+08, 4.825256365827529e+08, 4.896785065244445e+08, 5.058959997866667e+08, 5.147896136533333e+08, 5.295507163022223e+08, 5.458727111111112e+08, 5.629922555733334e+08, 5.808728914488889e+08, 5.996430473955555e+08, 6.185697894400001e+08, 6.375849152e+08, 6.565980993422222e+08, 6.7448563584e+08, 6.959013486933334e+08, 7.019426752107966e+08, 7.019551061333333e+08, 7.020175239111111e+08, 7.020908012088889e+08, 7.021063209717484e+08, 7.104904556088889e+08, 7.169197361777778e+08, 7.2982031104e+08, 7.450555642311112e+08, 7.611554801777778e+08, 7.774632891733333e+08, 7.937708373333334e+08, 8.087327294577777e+08, 8.2083611136e+08, 8.334578333866667e+08, 8.449702124088889e+08, 8.556091797586492e+08, 8.556257249305016e+08, 8.557828140088888e+08, 8.562350037333333e+08, 8.567014219377778e+08, 8.568798149283201e+08, 8.5689039488e+08, 8.56891712e+08, 8.587311328711112e+08, 8.641844002133334e+08, 8.715128049777777e+08, 8.796421865244445e+08, 8.8835261312e+08, 8.966328558933333e+08, 9.045071645866667e+08, 9.130450816e+08, 9.211638825244445e+08, 9.298183179558308e+08, 9.298524356266667e+08, 9.301868600888889e+08, 9.310839928888888e+08, 9.319746875733334e+08, 9.323419837155555e+08, 9.323614743189523e+08, 9.32363328e+08, 9.32363328e+08] +EHVAC.y=[0e+00, 5.234077241789048e+05, 4.414246702222222e+06, 1.032768583333333e+07, 1.709283800888889e+07, 2.382644055555556e+07, 3.250381813333333e+07, 4.235311178666667e+07, 4.329600939130612e+07, 4.356027672e+07, 4.418065786666667e+07, 4.460524799111111e+07, 4.470616586666667e+07, 4.4712156e+07, 4.4712156e+07, 4.556855053333333e+07, 5.006217692444444e+07, 5.658478483555555e+07, 6.518903472e+07, 7.525069916444445e+07, 8.637650613333334e+07, 9.838284842666666e+07, 1.1107781824e+08, 1.265824771733333e+08, 1.5033095744e+08, 1.695526853333333e+08, 1.880541885866667e+08, 2.0692709984e+08, 2.262034107022222e+08, 2.465391065244445e+08, 2.671463450627892e+08, 2.771436111644444e+08, 2.917009831822222e+08, 3.0749301568e+08, 3.238999957333333e+08, 3.404765006222222e+08, 3.5703417856e+08, 3.735214761244444e+08, 3.903538872888889e+08, 4.0767940288e+08, 4.257439473777778e+08, 4.538792659911111e+08, 4.7628940544e+08, 4.823019585339746e+08, 4.823063482311111e+08, 4.826739584e+08, 4.896626584177778e+08, 5.058753257955555e+08, 5.148316433066667e+08, 5.295713560177778e+08, 5.458823751111112e+08, 5.629949405866667e+08, 5.808706079288889e+08, 5.996498709333333e+08, 6.185794048e+08, 6.375950755555556e+08, 6.566081473422222e+08, 6.744959210666667e+08, 6.959122076444445e+08, 7.019542524048784e+08, 7.019658496e+08, 7.020282119111111e+08, 7.021014892088889e+08, 7.021173780357436e+08, 7.104966590577778e+08, 7.169949902222222e+08, 7.298722261333333e+08, 7.450946146133333e+08, 7.611957831111112e+08, 7.775016192e+08, 7.938083100444444e+08, 8.087661915022222e+08, 8.2086796288e+08, 8.334893723022223e+08, 8.450027958044444e+08, 8.555383479820107e+08, 8.556580734315673e+08, 8.558145143466667e+08, 8.562658039466667e+08, 8.567318441244445e+08, 8.569102062409424e+08, 8.5692073088e+08, 8.56922048e+08, 8.5873089408e+08, 8.642288119466667e+08, 8.715571207111111e+08, 8.796855520711111e+08, 8.883990528e+08, 8.966723857066667e+08, 9.045451483022223e+08, 9.130861184e+08, 9.212040840533333e+08, 9.298559499205909e+08, 9.298900155733334e+08, 9.302251406222222e+08, 9.311230464e+08, 9.3201387008e+08, 9.323813447111111e+08, 9.324008969776491e+08, 9.32402752e+08, 9.32402752e+08] EPum.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_Utilities_Plotters_Examples_SingleZoneVAV.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Utilities_Plotters_Examples_SingleZoneVAV.txt index e19ac89667e..909b08df26c 100644 --- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Utilities_Plotters_Examples_SingleZoneVAV.txt +++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Utilities_Plotters_Examples_SingleZoneVAV.txt @@ -1,4 +1,4 @@ -last-generated=2023-06-16 +last-generated=2024-04-01 statistics-initialization= { "linear": "19", @@ -13,4 +13,4 @@ statistics-simulation= "numerical Jacobians": "0" } time=[1.5552e+07, 1.5984e+07] -hvac.PFan=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.739606738090515e-01, 2.330735683441162e+00, 1.505723190307617e+01, 3.092379379272461e+01, 3.843521499633789e+01, 3.176835823059082e+01, 1.667304420471191e+01, 8.65913200378418e+00, 4.104891777038574e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.739606738090515e-01, 2.462905645370483e+00, 1.487477970123291e+01, 3.047177314758301e+01, 3.909217071533203e+01, 3.18489818572998e+01, 1.813684844970703e+01, 9.817239761352539e+00, 6.499245643615723e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.739606738090515e-01, 6.720651626586914e+00, 2.241079711914062e+01, 3.547736740112305e+01, 3.558864212036133e+01, 2.822850227355957e+01, 1.649150276184082e+01, 9.09346866607666e+00, 4.777174949645996e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.739606738090515e-01, 8.739606738090515e-01, 4.284562110900879e+00, 8.46577262878418e+00, 8.218067169189453e+00, 5.322678089141846e+00, 3.283688068389893e+00, 2.010621786117554e+00, 9.306935667991638e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.739606738090515e-01, 0e+00, 0e+00, 8.739606738090515e-01, 8.739606738090515e-01, 2.323882341384888e+00, 9.79957389831543e+00, 1.343301868438721e+01, 1.082698726654053e+01, 4.26008129119873e+00, 1.369602203369141e+00, 8.739606738090515e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] +hvac.PFan=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.739606738090515e-01, 2.330735683441162e+00, 1.505723190307617e+01, 3.092379379272461e+01, 3.843521499633789e+01, 3.176835823059082e+01, 1.667304420471191e+01, 8.65913200378418e+00, 4.104892253875732e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.739606738090515e-01, 2.462905645370483e+00, 1.487477970123291e+01, 3.047177314758301e+01, 3.909217071533203e+01, 3.18489818572998e+01, 1.813684272766113e+01, 9.817237854003906e+00, 6.499245166778564e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.739606738090515e-01, 6.720760822296143e+00, 2.24108715057373e+01, 3.547740173339844e+01, 3.558865737915039e+01, 2.822850608825684e+01, 1.649150466918945e+01, 9.09346866607666e+00, 4.777174949645996e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.739606738090515e-01, 8.739606738090515e-01, 4.284562587738037e+00, 8.46577262878418e+00, 8.218067169189453e+00, 5.322678089141846e+00, 3.283688068389893e+00, 2.010621786117554e+00, 9.306936860084534e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.739606738090515e-01, 8.739606738090515e-01, 0e+00, 8.739606738090515e-01, 8.739606738090515e-01, 2.277922630310059e+00, 9.743946075439453e+00, 1.340563774108887e+01, 1.081786823272705e+01, 4.258317470550537e+00, 1.369292616844177e+00, 8.739606738090515e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00] diff --git a/Buildings/Resources/Scripts/BuildingsPy/conf.yml b/Buildings/Resources/Scripts/BuildingsPy/conf.yml index 266775dda4c..a1e97f3fdb6 100644 --- a/Buildings/Resources/Scripts/BuildingsPy/conf.yml +++ b/Buildings/Resources/Scripts/BuildingsPy/conf.yml @@ -29,7 +29,7 @@ - model_name: Buildings.Controls.DemandResponse.Examples.ClientLBNL90 openmodelica: comment: 'TimeoutExpired: omc timed out after 300 seconds' - translate: false + time_out: 600 - model_name: Buildings.Electrical.AC.ThreePhasesBalanced.Loads.Examples.ParallelLoads openmodelica: comment: 'division leads to inf or nan at time 0.901, (a=nan) / (b=230400), where divisor b is: varRL_P.v[1] ^ 2.0 + varRL_P.v[2] ^ 2.0' diff --git a/Buildings/package.mo b/Buildings/package.mo index f7621c11d5a..ab977027662 100644 --- a/Buildings/package.mo +++ b/Buildings/package.mo @@ -443,6 +443,12 @@ have been improved in a Buildings.Controls.OBC.CDL +All classes + + Expanded interface class names to full class names for all classes within Buildings.Controls.OBC.CDL.
                    + This is for #3746. + + Buildings.Controls.OBC.CDL.Discrete.Examples Changed the package name from Examples to Validation.