From 6740b5327a7c136979bd8b2dd9aae83678b3e2b8 Mon Sep 17 00:00:00 2001 From: Michael Wetter Date: Sat, 6 Apr 2024 08:55:23 -0700 Subject: [PATCH] Reformulated InductiveLoad to avoid infinite value (#3780) For #3776 --- .../Electrical/Interfaces/InductiveLoad.mo | 13 +- .../build/html/_sources/bestPractice.rst.txt | 42 +- .../build/html/_sources/development.rst.txt | 34 +- .../html/_sources/gettingStarted.rst.txt | 6 +- .../build/html/_sources/performance.rst.txt | 16 +- .../userGuide/build/html/bestPractice.html | 42 +- .../userGuide/build/html/development.html | 34 +- .../userGuide/build/html/gettingStarted.html | 6 +- .../userGuide/build/html/performance.html | 16 +- .../userGuide/source/bestPractice.rst | 42 +- .../userGuide/source/development.rst | 34 +- .../userGuide/source/gettingStarted.rst | 6 +- .../userGuide/source/performance.rst | 16 +- ...AC_OnePhase_Examples_GeneratorLoadGrid.txt | 15 +- ...sBalanced_Loads_Examples_ParallelLoads.txt | 24 +- .../Resources/Scripts/BuildingsPy/conf.yml | 4 - .../StagingRotation/EquipmentEnable.mo | 20 +- Buildings/package.mo | 473 ++++++++++++++++-- README.md | 2 +- 19 files changed, 633 insertions(+), 212 deletions(-) diff --git a/Buildings/Electrical/Interfaces/InductiveLoad.mo b/Buildings/Electrical/Interfaces/InductiveLoad.mo index 14cd425372c..c80b4a578eb 100644 --- a/Buildings/Electrical/Interfaces/InductiveLoad.mo +++ b/Buildings/Electrical/Interfaces/InductiveLoad.mo @@ -24,7 +24,11 @@ protected "Magnetic flux"; Modelica.Units.SI.Impedance Z[2] "Impedance of the load"; Modelica.Units.SI.AngularVelocity omega "Angular frequency"; - Modelica.Units.SI.Power Q=P*tan(acos(pf_internal)) + Modelica.Units.SI.Power Q=P*tan(acos( + Buildings.Utilities.Math.Functions.smoothMin( + x1=pf_internal, + x2=0.99999, + deltaX=0.0000025))) "Reactive power (positive because inductive load)"; equation connect(pf_in, pf_internal); @@ -36,6 +40,13 @@ equation annotation (Documentation(revisions=" @@ -557,23 +557,23 @@

5.4. Adding a new class which is shared by all sensors with one fluid port in the package -Buildings.Fluid.Sensors.

+See for example Buildings.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor which is shared by all sensors with one fluid port in the package +Buildings.Fluid.Sensors.

The next sections give guidance that is specific to the implementation of thermofluid flow devices, pressure drop models and control sequences.

5.4.1. Thermofluid flow device

To add a component of a thermofluid flow device, the package -Buildings.Fluid.Interface contains basic classes that can be extended. -See Buildings.Fluid.Interface.UsersGuide for a description of these classes. +Buildings.Fluid.Interface contains basic classes that can be extended. +See Buildings.Fluid.Interface.UsersGuide for a description of these classes. Alternatively, simple models such as the models below may be used as a starting point for implementing new models for thermofluid flow devices:

-
Buildings.Fluid.HeatExchangers.HeaterCooler_u

For a device that adds heat to a fluid stream.

+
Buildings.Fluid.HeatExchangers.HeaterCooler_u

For a device that adds heat to a fluid stream.

-
Buildings.Fluid.Humidifiers.Humidifier_u

For a device that adds humidity to a fluid stream.

+
Buildings.Fluid.Humidifiers.Humidifier_u

For a device that adds humidity to a fluid stream.

-
Buildings.Fluid.Chillers.Carnot_y

For a device that exchanges heat between two fluid streams.

+
Buildings.Fluid.Chillers.Carnot_y

For a device that exchanges heat between two fluid streams.

-
Buildings.Fluid.MassExchangers.ConstantEffectiveness

For a device that exchanges heat and humidity between two fluid streams.

+
Buildings.Fluid.MassExchangers.ConstantEffectiveness

For a device that exchanges heat and humidity between two fluid streams.

@@ -595,11 +595,11 @@

5.4.1. Thermofluid flow device5.4.2. Pressure drop

When implementing equations for pressure drop, it is recommended to expand the base class -Buildings.Fluid.BaseClasses.PartialResistance. +Buildings.Fluid.BaseClasses.PartialResistance. Models should allow computing the flow resistance as a quadratic function with regularization near zero as implemented in -Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp and in -Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow. +Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp and in +Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow. The governing equation is

\[k = \frac{\dot m}{\sqrt{\Delta p}}\]
@@ -645,7 +645,7 @@

5.4.3. Control sequences using the Contr

  1. The naming of parameters, inputs, outputs and instances must follow the naming conventions in -Buildings.UsersGuide.Conventions. +Buildings.UsersGuide.Conventions. Avoid providing duplicate information in the instance name, for example if the block is within the Boilers package, the instance name must not contain boi. Ensure that the instance name is unambiguous when viewed in a top level controller block. @@ -821,7 +821,7 @@

    5.4.3. Control sequences using the Contr unit tests wiki page.

    For simple models, the validation can be against analytic solutions. This is for example done in -Buildings.Fluid.FixedResistances.PressureDrop +Buildings.Fluid.FixedResistances.PressureDrop which uses a regression tests that checks the correct relation between mass flow rate and pressure drop.

    For complex thermofluid flow devices, a comparative model validation needs to be done, for example by comparing the result of the Modelica model against the results from EnergyPlus. diff --git a/Buildings/Resources/Documentation/userGuide/build/html/gettingStarted.html b/Buildings/Resources/Documentation/userGuide/build/html/gettingStarted.html index 8de4f421f78..accebad4224 100644 --- a/Buildings/Resources/Documentation/userGuide/build/html/gettingStarted.html +++ b/Buildings/Resources/Documentation/userGuide/build/html/gettingStarted.html @@ -197,7 +197,7 @@

    1.2. Running the First SimulationsExamples.

    Study the detailed tutorials with step-by-step instructions for how to build system models, -which can be found in the Tutorial package.

    +which can be found in the Tutorial package.

    Note that heat transfer models, which can be found in Buildings.HeatTransfer.*.Examples are easier to understand than fluid flow models because;

@@ -217,7 +217,7 @@

1.3. Software Requirements

1.4. Literature for Developers

It is essential that users who develop new thermo-fluid models to understand the concept of stream connectors. -Stream connectors are explained in the Modelica language definition, available at https://modelica.org/documents, +Stream connectors are explained in the Modelica language definition, available at https://modelica.org/language, and in the paper Franke et al. [Fra2009a]. The Buildings library uses similar modeling principles, and the same base classes, as the Modelica.Fluid library. Hence, we also recommend reading the paper about the standardization of thermo-fluid models in Modelica.Fluid [Fra2009b].

diff --git a/Buildings/Resources/Documentation/userGuide/build/html/performance.html b/Buildings/Resources/Documentation/userGuide/build/html/performance.html index 0b3712856d4..688d5905dad 100644 --- a/Buildings/Resources/Documentation/userGuide/build/html/performance.html +++ b/Buildings/Resources/Documentation/userGuide/build/html/performance.html @@ -247,8 +247,8 @@

3.1. Unstable control loopsUser’s Guide of the flow machine package, and the -User’s Guide of the actuator package.

+User’s Guide of the flow machine package, and the +User’s Guide of the actuator package.

3.3. Fluid flow systems

@@ -258,9 +258,9 @@

3.3.1. Breaking algebraic loopsBuildings.Fluid.FixedResistances.Junction), +(Buildings.Fluid.FixedResistances.Junction), or in models for fans or pumps (such as the model -Buildings.Fluid.Movers.SpeedControlled_y), +Buildings.Fluid.Movers.SpeedControlled_y), the parameter dynamicBalance can be set to true. This adds a control volume at the fluid junction that can decouple the system of equations.

@@ -330,13 +330,13 @@

3.3.2. Reducing nonlinear equations of s The valve model then computes the pressure drop using \(\bar k\) and the same equations as described above for the fixed resistances. Thus, the composite model has the same valve authority and mass flow rate, but a nonlinear equation can be avoided.

For more details, see the -User’s Guide of the actuator package.

+User’s Guide of the actuator package.

3.3.3. Prescribed mass flow rate

For some system models, the mass flow rate can be prescribed by using an idealized pump or fan (model -Buildings.Fluid.Movers.FlowControlled_m_flow) or a source element that outputs the required mass flow rate (such as the model Buildings.Fluid.Sources.MassFlowSource_T). +Buildings.Fluid.Movers.FlowControlled_m_flow) or a source element that outputs the required mass flow rate (such as the model Buildings.Fluid.Sources.MassFlowSource_T). Using these models avoids having to compute the intersection of the fan curve and the flow resistance. In some situations, this can lead to faster and more robust simulation.

@@ -399,12 +399,12 @@

3.3.4. Avoiding eventstau>0 is a time constant. See, for example, -Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort +Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort for a robust implementation.

Note

In the package -Buildings.Utilities.Math +Buildings.Utilities.Math the functions and blocks whose names start with smooth can be used to avoid events.

diff --git a/Buildings/Resources/Documentation/userGuide/source/bestPractice.rst b/Buildings/Resources/Documentation/userGuide/source/bestPractice.rst index 5a326980dc1..196ed9a5919 100644 --- a/Buildings/Resources/Documentation/userGuide/source/bestPractice.rst +++ b/Buildings/Resources/Documentation/userGuide/source/bestPractice.rst @@ -42,9 +42,9 @@ Building large system models When creating a large system model, it is typically easier to build the system model through the composition of subsystem models that can be tested in isolation. For example, the package -`Buildings.Examples.ChillerPlant.BaseClasses.Controls.Examples `_ +`Buildings.Examples.ChillerPlant.BaseClasses.Controls.Examples `_ contains small test models that are used to test individual components in the large system model -`Buildings.Examples.ChillerPlant `_. +`Buildings.Examples.ChillerPlant `_. Creating small test models typically saves time as the proper response of controls, and the proper operation of subsystems, can be tested in isolation of complex system-interactions that are often present in large models. @@ -270,9 +270,9 @@ a fluid port represents the physical phenomena that was intended to model. However, in more complex flow configurations, one may want to explicitly control what branches of a piping or duct network mix. This may be achieved by using an instance of the model -`Junction `_ +`Junction `_ as shown in the left figure below, which is derived from the test model -`BoilerPolynomialClosedLoop `_ +`BoilerPolynomialClosedLoop `_ .. _fig_flu_cor_wro: @@ -283,7 +283,7 @@ as shown in the left figure below, which is derived from the test model In :numref:`fig_flu_cor_wro` (a), the mixing points have been correctly defined by use of the model -`Junction `_. +`Junction `_. However, in :numref:`fig_flu_cor_wro` (b), all connections are made to the port of the instance ``spl2``. This results in the same configuration as is shown in :numref:`fig_flu_cor_wro` (c). This is certainly not the intention of the modeler, as this causes all flows to be mixed in the port. @@ -301,13 +301,13 @@ Use of sensors in fluid flow systems When selecting a sensor model, a distinction needs to be made whether the measured quantity depends on the direction of the flow or not. If the quantity depends on the flow direction, such as temperature or relative humidity, then sensors with two ports from the -`Buildings.Fluid.Sensors `_ +`Buildings.Fluid.Sensors `_ library should be used. These sensors have a more efficient implementation than sensors with one port for situations where the flow reverses its direction. The proper use sensors is described in the -`User's Guide `_ +`User's Guide `_ of the -`Buildings.Fluid.Sensors `_ +`Buildings.Fluid.Sensors `_ package. @@ -319,9 +319,9 @@ Reference pressure for incompressible fluids such as water This section explains how to set a reference pressure for fluids that model the flow as :term:`incompressible flow`, such as -`Buildings.Media.Water `_ +`Buildings.Media.Water `_ and -`Buildings.Media.Antifreeze.PropyleneGlycolWater `_. +`Buildings.Media.Antifreeze.PropyleneGlycolWater `_. Consider the flow circuit shown in :numref:`fig_flow_cir` that consists of a pump or fan, a flow resistance and a volume. @@ -354,7 +354,7 @@ In this situation, attempting to translate the model leads, in Dymola, to the fo The number of scalar Real equation elements are 58. Similarly, if the medium model -`Buildings.Media.Specialized.Water.TemperatureDependentDensity `_, +`Buildings.Media.Specialized.Water.TemperatureDependentDensity `_, which models density as a function of pressure and enthalpy, is used, then the model is well-defined, but the pressure increases the longer the pump runs. The reason is that the pump adds heat to the water. When the water temperature @@ -364,7 +364,7 @@ the pressure increases from :math:`1 \, \mathrm{bars}` to :math:`150 \, \mathrm{ To avoid this singularity or increase in pressure, use a model that imposes a pressure source and that accounts for the expansion of the fluid. For example, use -`Buildings.Fluid.Sources.Boundary_pT `_ +`Buildings.Fluid.Sources.Boundary_pT `_ to form the system model shown in :numref:`fig_flow_cir_wit_bou`. .. _fig_flow_cir_wit_bou: @@ -376,15 +376,15 @@ to form the system model shown in :numref:`fig_flow_cir_wit_bou`. provides a reference presssure. Alternatively, you may use -`Buildings.Fluid.Storage.ExpansionVessel `_, +`Buildings.Fluid.Storage.ExpansionVessel `_, but -`Buildings.Fluid.Sources.Boundary_pT `_ +`Buildings.Fluid.Sources.Boundary_pT `_ usually leads to simpler equations than -`Buildings.Fluid.Storage.ExpansionVessel `_. +`Buildings.Fluid.Storage.ExpansionVessel `_. Note that the medium that flows out of the fluid port of -`Buildings.Fluid.Sources.Boundary_pT `_ +`Buildings.Fluid.Sources.Boundary_pT `_ is at a fixed temperature, while the model -`Buildings.Fluid.Storage.ExpansionVessel `_ +`Buildings.Fluid.Storage.ExpansionVessel `_ conserves energy. However, since the thermal expansion of the fluid is usually small, this effect can be neglected in most building HVAC applications. @@ -393,10 +393,10 @@ this effect can be neglected in most building HVAC applications. In each water circuit, there must be exactly on instance of `Buildings.Fluid.Sources.Boundary_pT - `_, + `_, or instance of `Buildings.Fluid.Storage.ExpansionVessel - `_. + `_. If there is more than one such device, then there are multiple points in the system that set the reference static pressure. @@ -592,5 +592,5 @@ is produced. This shows the iteration variables and their start values. These start values can be overwritten in the model. -.. _PressureDrop: https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.PressureDrop -.. _WetCoilDiscretized: https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_HeatExchangers.html#Buildings.Fluid.HeatExchangers.WetCoilDiscretized +.. _PressureDrop: https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.PressureDrop +.. _WetCoilDiscretized: https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_HeatExchangers.html#Buildings.Fluid.HeatExchangers.WetCoilDiscretized diff --git a/Buildings/Resources/Documentation/userGuide/source/development.rst b/Buildings/Resources/Documentation/userGuide/source/development.rst index 3eb7fbba829..06ab4da9321 100644 --- a/Buildings/Resources/Documentation/userGuide/source/development.rst +++ b/Buildings/Resources/Documentation/userGuide/source/development.rst @@ -24,13 +24,13 @@ Models, blocks and functions that are contributed need to adhere to the followin * They should be of general interest to other users and well documented and tested. * They need to follow the coding conventions described in - - the `Buildings library user guide `_ and + - the `Buildings library user guide `_ and - the `Style Guide` provided in :numref:`sec_sty_gui` - * They need to be made available under the `Modelica Buildings Library license `_. + * They need to be made available under the `Modelica Buildings Library license `_. * For models of thermofluid flow components, they need to be based on the base classes in - `Buildings.Fluid.Interfaces `_, - which are described in the `user guide `_ of this package. + `Buildings.Fluid.Interfaces `_, + which are described in the `user guide `_ of this package. Otherwise, it becomes difficult to ensure that the implementation is numerically robust. .. _sec_sty_gui: @@ -408,8 +408,8 @@ Adding a new class, such as a model or a function, is usually easiest by extendi In many cases, the similar component already exists. In this situation, it is recommended to copy and modify a similar component. If both components share a significant amount of similar code, then a base class should be introduced that implements the common code. -See for example `Buildings.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor `_ which is shared by all sensors with one fluid port in the package -`Buildings.Fluid.Sensors `_. +See for example `Buildings.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor `_ which is shared by all sensors with one fluid port in the package +`Buildings.Fluid.Sensors `_. The next sections give guidance that is specific to the implementation of thermofluid flow devices, pressure drop models and control sequences. @@ -417,20 +417,20 @@ Thermofluid flow device ~~~~~~~~~~~~~~~~~~~~~~~ To add a component of a thermofluid flow device, the package -`Buildings.Fluid.Interface `_ contains basic classes that can be extended. -See `Buildings.Fluid.Interface.UsersGuide `_ for a description of these classes. +`Buildings.Fluid.Interface `_ contains basic classes that can be extended. +See `Buildings.Fluid.Interface.UsersGuide `_ for a description of these classes. Alternatively, simple models such as the models below may be used as a starting point for implementing new models for thermofluid flow devices: -`Buildings.Fluid.HeatExchangers.HeaterCooler_u `_ +`Buildings.Fluid.HeatExchangers.HeaterCooler_u `_ For a device that adds heat to a fluid stream. -`Buildings.Fluid.Humidifiers.Humidifier_u `_ +`Buildings.Fluid.Humidifiers.Humidifier_u `_ For a device that adds humidity to a fluid stream. -`Buildings.Fluid.Chillers.Carnot_y `_ +`Buildings.Fluid.Chillers.Carnot_y `_ For a device that exchanges heat between two fluid streams. -`Buildings.Fluid.MassExchangers.ConstantEffectiveness `_ +`Buildings.Fluid.MassExchangers.ConstantEffectiveness `_ For a device that exchanges heat and humidity between two fluid streams. .. _fig_merkel: @@ -454,11 +454,11 @@ Pressure drop When implementing equations for pressure drop, it is recommended to expand the base class -`Buildings.Fluid.BaseClasses.PartialResistance `_. +`Buildings.Fluid.BaseClasses.PartialResistance `_. Models should allow computing the flow resistance as a quadratic function with regularization near zero as implemented in -`Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp `_ and in -`Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow `_. +`Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp `_ and in +`Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow `_. The governing equation is .. math:: @@ -514,7 +514,7 @@ The following rules need to be followed, in addition to the guidelines described #. The naming of parameters, inputs, outputs and instances must follow the naming conventions in - `Buildings.UsersGuide.Conventions `_. + `Buildings.UsersGuide.Conventions `_. Avoid providing duplicate information in the instance name, for example if the block is within the ``Boilers`` package, the instance name must not contain ``boi``. Ensure that the instance name is unambiguous when viewed in a top level controller block. @@ -671,7 +671,7 @@ The validation models are part of automated unit tests as described at the For simple models, the validation can be against analytic solutions. This is for example done in -`Buildings.Fluid.FixedResistances.PressureDrop `_ +`Buildings.Fluid.FixedResistances.PressureDrop `_ which uses a regression tests that checks the correct relation between mass flow rate and pressure drop. For complex thermofluid flow devices, a comparative model validation needs to be done, for example diff --git a/Buildings/Resources/Documentation/userGuide/source/gettingStarted.rst b/Buildings/Resources/Documentation/userGuide/source/gettingStarted.rst index 55e1c46105b..01ddbe3b3b3 100644 --- a/Buildings/Resources/Documentation/userGuide/source/gettingStarted.rst +++ b/Buildings/Resources/Documentation/userGuide/source/gettingStarted.rst @@ -40,7 +40,7 @@ or by replacing existing component models by new ones. The example models can be found in the packages `Examples`. Study the detailed tutorials with step-by-step instructions for how to build system models, -which can be found in the `Tutorial package `_. +which can be found in the `Tutorial package `_. Note that heat transfer models, which can be found in `Buildings.HeatTransfer.*.Examples` are easier to understand than fluid flow models because; @@ -51,7 +51,7 @@ are easier to understand than fluid flow models because; To get started with Spawn of EnergyPlus, we recommend to first familiarize yourself with Modelica, as described above. Next, read the -`user guide for the Spawn models `_ +`user guide for the Spawn models `_ which provides step-by-step instructions and points to various examples. @@ -65,7 +65,7 @@ Literature for Developers ------------------------- It is essential that users who develop new thermo-fluid models to understand the concept of stream connectors. -Stream connectors are explained in the Modelica language definition, available at https://modelica.org/documents, +Stream connectors are explained in the Modelica language definition, available at https://modelica.org/language, and in the paper Franke et al. [Fra2009a]_. The `Buildings` library uses similar modeling principles, and the same base classes, as the `Modelica.Fluid` library. Hence, we also recommend reading the paper about the standardization of thermo-fluid models in Modelica.Fluid [Fra2009b]_. diff --git a/Buildings/Resources/Documentation/userGuide/source/performance.rst b/Buildings/Resources/Documentation/userGuide/source/performance.rst index 5ab89802d21..8d24a727f88 100644 --- a/Buildings/Resources/Documentation/userGuide/source/performance.rst +++ b/Buildings/Resources/Documentation/userGuide/source/performance.rst @@ -78,8 +78,8 @@ The default value is ``raiseTime=120`` seconds. closed loop control performance. For further information, see the -`User's Guide of the flow machine package `_, and the -`User's Guide of the actuator package `_. +`User's Guide of the flow machine package `_, and the +`User's Guide of the actuator package `_. Fluid flow systems @@ -92,9 +92,9 @@ In fluid flow systems, flow junctions where mass flow rates separate and mix can This leads to larger systems of coupled equations that need to be solved, which often causes larger computing time and can sometimes cause convergence problems. To decouple these systems of equations, in the model of a flow junction -(`Buildings.Fluid.FixedResistances.Junction `_), +(`Buildings.Fluid.FixedResistances.Junction `_), or in models for fans or pumps (such as the model -`Buildings.Fluid.Movers.SpeedControlled_y `_), +`Buildings.Fluid.Movers.SpeedControlled_y `_), the parameter ``dynamicBalance`` can be set to ``true``. This adds a control volume at the fluid junction that can decouple the system of equations. @@ -174,7 +174,7 @@ The valve model then computes the pressure drop using :math:`\bar k` and the sam Thus, the composite model has the same :term:`valve authority` and mass flow rate, but a nonlinear equation can be avoided. For more details, see the -`User's Guide of the actuator package `_. +`User's Guide of the actuator package `_. @@ -183,7 +183,7 @@ Prescribed mass flow rate For some system models, the mass flow rate can be prescribed by using an idealized pump or fan (model -`Buildings.Fluid.Movers.FlowControlled_m_flow `_) or a source element that outputs the required mass flow rate (such as the model `Buildings.Fluid.Sources.MassFlowSource_T `_). +`Buildings.Fluid.Movers.FlowControlled_m_flow `_) or a source element that outputs the required mass flow rate (such as the model `Buildings.Fluid.Sources.MassFlowSource_T `_). Using these models avoids having to compute the intersection of the fan curve and the flow resistance. In some situations, this can lead to faster and more robust simulation. @@ -258,12 +258,12 @@ Adding dynamics may be achieved using a formulation such as der(h)=(hMed-h)/tau; where ``tau``>0 is a time constant. See, for example, -`Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort `_ +`Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort `_ for a robust implementation. .. note:: In the package - `Buildings.Utilities.Math `_ + `Buildings.Utilities.Math `_ the functions and blocks whose names start with ``smooth`` can be used to avoid events. diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Electrical_AC_OnePhase_Examples_GeneratorLoadGrid.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Electrical_AC_OnePhase_Examples_GeneratorLoadGrid.txt index b29f152b0f4..ef10afff270 100644 --- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Electrical_AC_OnePhase_Examples_GeneratorLoadGrid.txt +++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Electrical_AC_OnePhase_Examples_GeneratorLoadGrid.txt @@ -1,5 +1,10 @@ -last-generated=2015-05-08 -statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': '0'} -grid.P.real=[5000., 5000., 5000., 5000., 5000., 5000., 5000., 5000., 5000., 5000., 5000., 4833.33348615961403993424, 4666.66645920329392538406, 4499.99992052691322896862, 4333.33350602774044091348, 4166.6666032476086911629, 3999.99994039562170655699, 3833.33328175553242544993, 3666.66686725563204163336, 3499.99996026374765278888, 3333.3333016238038908341, 3166.6666387713808035187, 2999.99998013187405376812, 2833.33332149207581096562, 2666.66665863965272365022, 2500., 2333.33309300811561115552, 2166.66692686000988032902, 2000.00001986819847843435, 1833.33323494604542247544, 1666.66682465855183181702, 1500.0000397363978663634, 1333.33325481424390090979, 1166.66684452675031025137, 1000.00005960459634479776, 833.33321364746893777919, 666.66692542966939072357, 500.00007947265021357452, 333.33326403313640184933, 166.666433334760768048, 0.00009934086479290727, -166.6667313574441777746, -333.33356205564700758259, -499.999880790915540274, -666.66672674804385678726, -833.33351167027058181702, -999.99986092286258099193, -1166.66664584476097843435, -1333.33355283657260770269, -1499.99984105440853454638, -1666.6666259765625, -1833.33353296607856464107, -2000.00031788644605512673, -2166.66722487479773917585, -2333.33289433218396879965, -2499.99980132169957869337, -2666.66670830974044292816, -2833.3333711609780038998, -3000.00027814962095362716, -3166.66718513913656352088, -3333.33285459652279314469, -3499.9997615860384030384, -3666.66666857497239107033, -3833.33333142502760892967, -4000.0002384139615969616, -4166.66690126576304464834, -4333.33305899828701512888, -4499.99972184834223298822, -4666.66638470014368067496, -4833.33353583030293521006, -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000.] -grid.P.apparent=[5000., 5000., 5000., 5000., 5000., 5000., 5000., 5000., 5000., 5000., 5000., 4834.29100581935745140072, 4670.63325724062542576576, 4509.24943546803297067527, 4350.39356409194715524791, 4194.35263135346940543968, 4041.45185034590394934639, 3892.06228230378928856226, 3746.60361846113937644986, 3605.55123658723596236086, 3469.44339930719343101373, 3338.88419411656786905951, 3214.5502786307770293206, 3097.19120983075617914437, 2987.62885019220721005695, 2886.75146484375, 2795.49894232645283409511, 2714.8426110333616634307, 2645.75122836090895361849, 2589.15108238512266325415, 2545.87553330332912082667, 2516.61157787450383693795, 2501.85106998240507891751, 2501.85106645211772047332, 2516.61156489087488807854, 2545.87551079228933303966, 2589.15105334101372136502, 2645.75119126407798830769, 2714.84256562420250702417, 2795.49914813551959014148, 2886.75140806592980879941, 2987.62894424220849032281, 3097.19131209085890077404, 3214.55020694091172117624, 3338.88430790474740206264, 3469.44351910377417880227, 3605.55115422720064088935, 3746.60353276435625957674, 3892.06241452586073137354, 4041.45176042761931967107, 4194.3525390625, 4350.39370515641348902136, 4509.24981768563338846434, 4670.63376650683130719699, 4834.29066262712422030745, 4999.99980154434069845593, 5167.56245988334649155149, 5336.80432093938543403056, 5507.57059891875178436749, 5679.72408633097620622721, 5853.14069868674050667323, 6027.71361683476698090089, 6203.34415434489528706763, 6379.94539696952779195271, 6557.4387311864384173532, 6735.75335592334431566996, 6914.8252132104707925464, 7094.59882062216001941124, 7275.02037859018855670001, 7456.04398855378076405032, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625] -time=[0., 1.] +last-generated=2024-04-04 +statistics-simulation= +{ + "linear": "0", + "nonlinear": " ", + "numerical Jacobians": "0" +} +time=[0e+00, 1e+00] +grid.P.real=[5e+03, 5e+03, 5e+03, 5e+03, 5e+03, 5e+03, 5e+03, 5e+03, 5e+03, 5e+03, 5e+03, 4.833333486159614e+03, 4.666666459203294e+03, 4.499999920526913e+03, 4.33333350602774e+03, 4.166666603247609e+03, 3.999999940395622e+03, 3.833333281755532e+03, 3.666666867255632e+03, 3.499999960263748e+03, 3.333333301623804e+03, 3.166666638771381e+03, 2.999999980131874e+03, 2.833333321492076e+03, 2.666666658639653e+03, 2.5e+03, 2.333333093008116e+03, 2.16666692686001e+03, 2.000000019868198e+03, 1.833333234946045e+03, 1.666666824658552e+03, 1.500000039736398e+03, 1.333333254814244e+03, 1.16666684452675e+03, 1.000000059604596e+03, 8.333332136474689e+02, 6.666669254296694e+02, 5.000000794726502e+02, 3.333332640331364e+02, 1.666664333347608e+02, 9.934086505580808e-05, -1.666667313574442e+02, -3.33333562055647e+02, -4.999998807909155e+02, -6.666667267480439e+02, -8.333335116702706e+02, -9.999998609228626e+02, -1.166666645844761e+03, -1.333333552836573e+03, -1.499999841054409e+03, -1.666666625976562e+03, -1.833333532966079e+03, -2.000000317886446e+03, -2.166667224874798e+03, -2.333332894332184e+03, -2.4999998013217e+03, -2.66666670830974e+03, -2.833333371160978e+03, -3.000000278149621e+03, -3.166667185139137e+03, -3.333332854596523e+03, -3.499999761586038e+03, -3.666666668574972e+03, -3.833333331425028e+03, -4.000000238413962e+03, -4.166666901265763e+03, -4.333333058998287e+03, -4.499999721848342e+03, -4.666666384700144e+03, -4.833333535830303e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03] +grid.P.apparent=[5.0000498046875e+03, 5.0000498046875e+03, 5.0000498046875e+03, 5.0000498046875e+03, 5.0000498046875e+03, 5.0000498046875e+03, 5.0000498046875e+03, 5.0000498046875e+03, 5.0000498046875e+03, 5.0000498046875e+03, 5.0000498046875e+03, 4.833897939385459e+03, 4.669765093045849e+03, 4.507873458652912e+03, 4.348472665687626e+03, 4.191846284056652e+03, 4.03831806104941e+03, 3.888254665240271e+03, 3.742073101415614e+03, 3.600245816472694e+03, 3.463308145654874e+03, 3.331862953278726e+03, 3.206585923045612e+03, 3.088227587210179e+03, 2.977612980471399e+03, 2.87563623046875e+03, 2.783246499818916e+03, 2.701428061505466e+03, 2.631166999984546e+03, 2.573410114638883e+03, 2.529014694770704e+03, 2.498692388666142e+03, 2.48295897948644e+03, 2.482092278465293e+03, 2.496107658888839e+03, 2.524757102270478e+03, 2.567550712158811e+03, 2.62379684570589e+03, 2.692652379995837e+03, 2.773178347249496e+03, 2.864390324087376e+03, 2.965303016534463e+03, 3.074961087647957e+03, 3.192463292764907e+03, 3.31697683724848e+03, 3.447741370925297e+03, 3.584072882551323e+03, 3.725360857011919e+03, 3.87106217064717e+03, 4.020696633241664e+03, 4.17384228515625e+03, 4.330125638978333e+03, 4.489220032971753e+03, 4.650835915600903e+03, 4.814718884806662e+03, 4.98064726222282e+03, 5.148421834833287e+03, 5.317868285926324e+03, 5.48883182970531e+03, 5.661174770411334e+03, 5.834773999037261e+03, 6.009522210340299e+03, 6.185321693328235e+03, 6.362085045482697e+03, 6.539734141559217e+03, 6.718198668772585e+03, 6.897414080026612e+03, 7.07732587117524e+03, 7.257880730058394e+03, 7.439031781552799e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03] diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Electrical_AC_ThreePhasesBalanced_Loads_Examples_ParallelLoads.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Electrical_AC_ThreePhasesBalanced_Loads_Examples_ParallelLoads.txt index fffc3cb9653..a6d0023c17f 100644 --- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Electrical_AC_ThreePhasesBalanced_Loads_Examples_ParallelLoads.txt +++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Electrical_AC_ThreePhasesBalanced_Loads_Examples_ParallelLoads.txt @@ -1,18 +1,18 @@ -last-generated=2017-04-05 +last-generated=2024-04-04 statistics-simulation= { - "numerical Jacobians": "0", - "nonlinear": " ", - "linear": " " + "linear": " ", + "nonlinear": " ", + "numerical Jacobians": "0" } -varRL_P.S[2]=[-1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.399999934435024e+03, -1.299999988079095e+03, -1.200000041723167e+03, -1.099999946355929e+03, -1e+03, -8.999999046327615e+02, -8.00000107288143e+02, -7.000000119209045e+02, -5.999999165536666e+02, -5.000001192090481e+02, -4.000000238418096e+02, -2.999999284745712e+02, -2.000001311299526e+02, -1.000000357627141e+02, 5.960452410238568e-05, 9.99998569491423e+01, 1.999999523163808e+02, 3.000000476836192e+02, 4.000001430508577e+02, 4.999999403954762e+02, 6.000000357627141e+02, 7.000001311299526e+02, 7.999999284745711e+02, 9.000000238418096e+02, 1.000000119209048e+03, 1.099999916553667e+03, 1.200000011920905e+03, 1.300000107288143e+03, 1.399999904632762e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03] -varRC_y.S[2]=[1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 5.000003278248816e+01, 1.000000059604524e+02, 1.499999791384166e+02, 2.000000268220357e+02, 2.5e+02, 3.000000476836192e+02, 3.499999463559285e+02, 3.999999940395477e+02, 4.500000417231667e+02, 4.99999940395476e+02, 5.499999880790951e+02, 6.000000357627144e+02, 6.499999344350236e+02, 6.999999821186429e+02, 7.500000298022619e+02, 7.999999284745711e+02, 8.499999761581904e+02, 9.000000238418096e+02, 9.500000715254289e+02, 9.999999701977381e+02, 1.050000017881357e+03, 1.100000065564976e+03, 1.149999964237286e+03, 1.200000011920905e+03, 1.250000059604524e+03, 1.299999958276833e+03, 1.350000005960452e+03, 1.400000053644071e+03, 1.449999952316381e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03] -RL_pf.S[2]=[-1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.499999937929129e+03, -1.447974864060056e+03, -1.39600869359162e+03, -1.344008277962633e+03, -1.291872486319249e+03, -1.239488647460938e+03, -1.186730296092848e+03, -1.133452168157194e+03, -1.07948543988269e+03, -1.024630489678647e+03, -9.686442934328024e+02, -9.112269425571172e+02, -8.519964166702321e+02, -7.904504560227468e+02, -7.259029011267214e+02, -6.573683930384672e+02, -5.833334227618516e+02, -5.012472945322541e+02, -4.061172584754012e+02, -2.849843401512993e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00] -varRL_P.S[1]=[-2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -1.866666538556728e+03, -1.733333358128849e+03, -1.600000055630804e+03, -1.466666554451243e+03, -1.333333374023438e+03, -1.199999872843876e+03, -1.066666769027856e+03, -9.333333288828328e+02, -7.999998887381373e+02, -6.666668459568737e+02, -5.33333344777385e+02, -3.999999046327979e+02, -2.666668313342108e+02, -1.333333759306983e+02, 7.947269690840413e-05, 1.333331375126116e+02, 2.666665929160059e+02, 4.000000635781347e+02, 5.333335037229037e+02, 6.666666075389597e+02, 8.000000476836552e+02, 9.333334878283515e+02, 1.06666653060947e+03, 1.200000031789031e+03, 1.333333532968592e+03, 1.466666514714954e+03, 1.600000015894515e+03, 1.733333517074077e+03, 1.866666498820439e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03] -varRC_y.S[1]=[-2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -6.66667078335277e+01, -1.333333361943463e+02, -1.999999721845662e+02, -2.666666922568822e+02, -3.333333435058594e+02, -4.000000635782075e+02, -4.666665849688211e+02, -5.333333050410237e+02, -6.00000055630804e+02, -6.666666075387775e+02, -7.333332970937657e+02, -8.000000476835464e+02, -8.666665995914835e+02, -9.333332891465082e+02, -1.000000039736288e+03, -1.066666530609906e+03, -1.133333342234261e+03, -1.200000031789177e+03, -1.266666721344092e+03, -1.333333334286967e+03, -1.400000023841882e+03, -1.466666713396798e+03, -1.533333326339673e+03, -1.600000015894588e+03, -1.666666705449504e+03, -1.733333318392379e+03, -1.800000007947294e+03, -1.866666697502209e+03, -1.933333310445084e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03] -varRL_y.S[1]=[-2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -6.66667078335277e+01, -1.333333361943463e+02, -1.999999721845662e+02, -2.666666922568822e+02, -3.333333435058594e+02, -4.000000635782075e+02, -4.666665849688211e+02, -5.333333050410237e+02, -6.00000055630804e+02, -6.666666075387775e+02, -7.333332970937657e+02, -8.000000476835464e+02, -8.666665995914835e+02, -9.333332891465082e+02, -1.000000039736288e+03, -1.066666530609906e+03, -1.133333342234261e+03, -1.200000031789177e+03, -1.266666721344092e+03, -1.333333334286967e+03, -1.400000023841882e+03, -1.466666713396798e+03, -1.533333326339673e+03, -1.600000015894588e+03, -1.666666705449504e+03, -1.733333318392379e+03, -1.800000007947294e+03, -1.866666697502209e+03, -1.933333310445084e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03] time=[0e+00, 1e+00] -varRL_y.S[2]=[-1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -5.000003278248816e+01, -1.000000059604524e+02, -1.499999791384166e+02, -2.000000268220357e+02, -2.5e+02, -3.000000476836192e+02, -3.499999463559285e+02, -3.999999940395477e+02, -4.500000417231667e+02, -4.99999940395476e+02, -5.499999880790951e+02, -6.000000357627144e+02, -6.499999344350236e+02, -6.999999821186429e+02, -7.500000298022619e+02, -7.999999284745711e+02, -8.499999761581904e+02, -9.000000238418096e+02, -9.500000715254289e+02, -9.999999701977381e+02, -1.050000017881357e+03, -1.100000065564976e+03, -1.149999964237286e+03, -1.200000011920905e+03, -1.250000059604524e+03, -1.299999958276833e+03, -1.350000005960452e+03, -1.400000053644071e+03, -1.449999952316381e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03] RL_pf.S[1]=[-2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03] -E.S[2]=[-3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -2.899999934435024e+03, -2.799999988079095e+03, -2.700000041723167e+03, -2.599999946355928e+03, -2.5e+03, -2.399999904632762e+03, -2.300000107288143e+03, -2.200000011920904e+03, -2.099999916553666e+03, -2.000000119209048e+03, -1.90000002384181e+03, -1.799999928474571e+03, -1.700000131129953e+03, -1.600000035762714e+03, -1.499999940395476e+03, -1.400000143050858e+03, -1.300000047683619e+03, -1.199999952316381e+03, -1.099999856949142e+03, -1.000000059604524e+03, -8.999999642372859e+02, -7.999998688700474e+02, -7.000000715254289e+02, -5.999999761581904e+02, -4.999998807909519e+02, -4.000000834463334e+02, -2.999999880790955e+02, -1.99999892711857e+02, -1.000000953672385e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.20705299981152e-05, 5.202510923677715e+01, 1.039912606323405e+02, 1.559917372955744e+02, 2.081275747154712e+02, 2.605113220214844e+02, 3.132697344248759e+02, 3.66547862359802e+02, 4.205144990834633e+02, 4.753694798044301e+02, 5.313557065671976e+02, 5.887730574428828e+02, 6.480035833297679e+02, 7.095495439772532e+02, 7.740970988732786e+02, 8.426316069615328e+02, 9.166665772381484e+02, 9.987527054677458e+02, 1.093882741524671e+03, 1.215015598813981e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03] +RL_pf.S[2]=[-1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.499999937929129e+03, -1.447974864060056e+03, -1.39600869359162e+03, -1.344008277962633e+03, -1.291872486319249e+03, -1.239488647460938e+03, -1.186730296092848e+03, -1.133452168157194e+03, -1.07948543988269e+03, -1.024630489678647e+03, -9.686442934328024e+02, -9.112269425571172e+02, -8.519964166702321e+02, -7.904504560227468e+02, -7.259029011267214e+02, -6.573683930384672e+02, -5.833334227618516e+02, -5.012472945322541e+02, -4.061172584754012e+02, -2.849843401512993e+02, -8.944338798522949e+00, -8.944338798522949e+00, -8.944338798522949e+00, -8.944338798522949e+00, -8.944338798522949e+00, -8.944338798522949e+00, -8.944338798522949e+00, -8.944338798522949e+00, -8.944338798522949e+00, -8.944338798522949e+00, -8.944338798522949e+00] +varRL_y.S[1]=[-2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -6.66667078335277e+01, -1.333333361943463e+02, -1.999999721845662e+02, -2.666666922568822e+02, -3.333333435058594e+02, -4.000000635782075e+02, -4.666665849688211e+02, -5.333333050410237e+02, -6.00000055630804e+02, -6.666666075387775e+02, -7.333332970937657e+02, -8.000000476835464e+02, -8.666665995914835e+02, -9.333332891465082e+02, -1.000000039736288e+03, -1.066666530609906e+03, -1.133333342234261e+03, -1.200000031789177e+03, -1.266666721344092e+03, -1.333333334286967e+03, -1.400000023841882e+03, -1.466666713396798e+03, -1.533333326339673e+03, -1.600000015894588e+03, -1.666666705449504e+03, -1.733333318392379e+03, -1.800000007947294e+03, -1.866666697502209e+03, -1.933333310445084e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03] +varRL_y.S[2]=[-1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -5.000003278248816e+01, -1.000000059604524e+02, -1.499999791384166e+02, -2.000000268220357e+02, -2.5e+02, -3.000000476836192e+02, -3.499999463559285e+02, -3.999999940395477e+02, -4.500000417231667e+02, -4.99999940395476e+02, -5.499999880790951e+02, -6.000000357627144e+02, -6.499999344350236e+02, -6.999999821186429e+02, -7.500000298022619e+02, -7.999999284745711e+02, -8.499999761581904e+02, -9.000000238418096e+02, -9.500000715254289e+02, -9.999999701977381e+02, -1.050000017881357e+03, -1.100000065564976e+03, -1.149999964237286e+03, -1.200000011920905e+03, -1.250000059604524e+03, -1.299999958276833e+03, -1.350000005960452e+03, -1.400000053644071e+03, -1.449999952316381e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03] +varRC_y.S[1]=[-2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -6.66667078335277e+01, -1.333333361943463e+02, -1.999999721845662e+02, -2.666666922568822e+02, -3.333333435058594e+02, -4.000000635782075e+02, -4.666665849688211e+02, -5.333333050410237e+02, -6.00000055630804e+02, -6.666666075387775e+02, -7.333332970937657e+02, -8.000000476835464e+02, -8.666665995914835e+02, -9.333332891465082e+02, -1.000000039736288e+03, -1.066666530609906e+03, -1.133333342234261e+03, -1.200000031789177e+03, -1.266666721344092e+03, -1.333333334286967e+03, -1.400000023841882e+03, -1.466666713396798e+03, -1.533333326339673e+03, -1.600000015894588e+03, -1.666666705449504e+03, -1.733333318392379e+03, -1.800000007947294e+03, -1.866666697502209e+03, -1.933333310445084e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03] +varRC_y.S[2]=[1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 5.000003278248816e+01, 1.000000059604524e+02, 1.499999791384166e+02, 2.000000268220357e+02, 2.5e+02, 3.000000476836192e+02, 3.499999463559285e+02, 3.999999940395477e+02, 4.500000417231667e+02, 4.99999940395476e+02, 5.499999880790951e+02, 6.000000357627144e+02, 6.499999344350236e+02, 6.999999821186429e+02, 7.500000298022619e+02, 7.999999284745711e+02, 8.499999761581904e+02, 9.000000238418096e+02, 9.500000715254289e+02, 9.999999701977381e+02, 1.050000017881357e+03, 1.100000065564976e+03, 1.149999964237286e+03, 1.200000011920905e+03, 1.250000059604524e+03, 1.299999958276833e+03, 1.350000005960452e+03, 1.400000053644071e+03, 1.449999952316381e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03] +varRL_P.S[1]=[-2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -1.866666538556728e+03, -1.733333358128849e+03, -1.600000055630804e+03, -1.466666554451243e+03, -1.333333374023438e+03, -1.199999872843876e+03, -1.066666769027856e+03, -9.333333288828328e+02, -7.999998887381373e+02, -6.666668459568737e+02, -5.33333344777385e+02, -3.999999046327979e+02, -2.666668313342108e+02, -1.333333759306983e+02, 7.947269690840413e-05, 1.333331375126116e+02, 2.666665929160059e+02, 4.000000635781347e+02, 5.333335037229037e+02, 6.666666075389597e+02, 8.000000476836552e+02, 9.333334878283515e+02, 1.06666653060947e+03, 1.200000031789031e+03, 1.333333532968592e+03, 1.466666514714954e+03, 1.600000015894515e+03, 1.733333517074077e+03, 1.866666498820439e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03] +varRL_P.S[2]=[-1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.399999934435024e+03, -1.299999988079095e+03, -1.200000041723167e+03, -1.099999946355929e+03, -1e+03, -8.999999046327615e+02, -8.00000107288143e+02, -7.000000119209045e+02, -5.999999165536666e+02, -5.000001192090481e+02, -4.000000238418096e+02, -2.999999284745712e+02, -2.000001311299526e+02, -1.000000357627141e+02, 5.960452410238568e-05, 9.99998569491423e+01, 1.999999523163808e+02, 3.000000476836192e+02, 4.000001430508577e+02, 4.999999403954762e+02, 6.000000357627141e+02, 7.000001311299526e+02, 7.999999284745711e+02, 9.000000238418096e+02, 1.000000119209048e+03, 1.099999916553667e+03, 1.200000011920905e+03, 1.300000107288143e+03, 1.399999904632762e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03] E.S[1]=[-6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03] +E.S[2]=[-3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -2.899999934435024e+03, -2.799999988079095e+03, -2.700000041723167e+03, -2.599999946355928e+03, -2.5e+03, -2.399999904632762e+03, -2.300000107288143e+03, -2.200000011920904e+03, -2.099999916553666e+03, -2.000000119209048e+03, -1.90000002384181e+03, -1.799999928474571e+03, -1.700000131129953e+03, -1.600000035762714e+03, -1.499999940395476e+03, -1.400000143050858e+03, -1.300000047683619e+03, -1.199999952316381e+03, -1.099999856949142e+03, -1.000000059604524e+03, -8.999999642372859e+02, -7.999998688700474e+02, -7.000000715254289e+02, -5.999999761581904e+02, -4.999998807909519e+02, -4.000000834463334e+02, -2.999999880790955e+02, -1.99999892711857e+02, -1.000000953672385e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.20705299981152e-05, 5.202510923677715e+01, 1.039912606323405e+02, 1.559917372955744e+02, 2.081275747154712e+02, 2.605113220214844e+02, 3.132697344248759e+02, 3.66547862359802e+02, 4.205144990834633e+02, 4.753694798044301e+02, 5.313557065671976e+02, 5.887730574428828e+02, 6.480035833297679e+02, 7.095495439772532e+02, 7.740970988732786e+02, 8.426316069615328e+02, 9.166665772381484e+02, 9.987527054677458e+02, 1.093882741524671e+03, 1.215015598813981e+03, 1.4910556640625e+03, 1.4910556640625e+03, 1.4910556640625e+03, 1.4910556640625e+03, 1.4910556640625e+03, 1.4910556640625e+03, 1.4910556640625e+03, 1.4910556640625e+03, 1.4910556640625e+03, 1.4910556640625e+03, 1.4910556640625e+03] diff --git a/Buildings/Resources/Scripts/BuildingsPy/conf.yml b/Buildings/Resources/Scripts/BuildingsPy/conf.yml index 232fd5992fa..f779685428d 100644 --- a/Buildings/Resources/Scripts/BuildingsPy/conf.yml +++ b/Buildings/Resources/Scripts/BuildingsPy/conf.yml @@ -30,10 +30,6 @@ openmodelica: comment: 'TimeoutExpired: omc timed out after 300 seconds' 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' - simulate: false - model_name: Buildings.Electrical.AC.ThreePhasesUnbalanced.Validation.IEEETests.Test4NodesFeeder.BalancedStepDown.DD openmodelica: comment: simulation terminated by an assertion at initialization. diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/EquipmentEnable.mo b/Buildings/Templates/Plants/Controls/StagingRotation/EquipmentEnable.mo index 474c3017598..b98bbce7707 100644 --- a/Buildings/Templates/Plants/Controls/StagingRotation/EquipmentEnable.mo +++ b/Buildings/Templates/Plants/Controls/StagingRotation/EquipmentEnable.mo @@ -59,11 +59,11 @@ block EquipmentEnable "Return true if equipment required without lead/lag alternate and available" annotation (Placement(transformation(extent={{-10,-50},{10,-30}}))); Buildings.Controls.OBC.CDL.Reals.GreaterThreshold isReqPosAlt[nEqu]( - each final t=0) + each final t=1E-4) "Return true if equipment required (with or without lead/lag alternate)" annotation (Placement(transformation(extent={{-60,30},{-40,50}}))); Buildings.Controls.OBC.CDL.Reals.LessThreshold isNotReqNoAlt[nEqu]( - each final t=1) + each final t=0.9999) "Return true if equipment not required or required with lead/lag alternate" annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); Buildings.Controls.OBC.CDL.Logical.MultiAnd isReqAltAva[nEqu]( @@ -141,10 +141,6 @@ block EquipmentEnable "Void if stage is equal to zero" annotation (Placement(transformation(extent={{-100,70},{-80,90}}))); equation - // HACK(AntoineGautier): Explicit `for` loops needed for OCT that cannot flatten the model otherwise. - for i in 1:nEqu loop - for j in 1:i loop end for; - end for; connect(intScaRep.y, reqEquSta.index) annotation (Line(points={{-108,0},{-100,0},{-100,60},{-150,60},{-150,68}}, color={255,127,0})); @@ -270,27 +266,27 @@ A staging matrix staEqu is required as a parameter.
  • Each row of this matrix corresponds to a given stage.
  • Each column of this matrix corresponds to a given equipment.
    • -
  • A coefficient staEqu[i, j] equal to 0 +
  • A coefficient staEqu[i, j] equal to 0 means that equipment j shall not be enabled at stage i.
    • -
  • A coefficient staEqu[i, j] equal to 1 +
  • A coefficient staEqu[i, j] equal to 1 means that equipment j is required at stage i. If equipment j is unavailable, stage i is deemed unavailable.
    • -
  • A coefficient staEqu[i, j] strictly lower than 1 -and strictly greater than 0 means that equipment j +
  • A coefficient staEqu[i, j] strictly lower than 1 +and strictly greater than 0 means that equipment j may be enabled at stage i as a lead/lag alternate equipment. If equipment j is unavailable but another lead/lag alternate equipment is available, then the latter equipment is enabled. Stage i is only deemed unavailable if all -lead/lag alternate equipment specified for stage i +lead/lag alternate equipment specified for stage i are unavailable.
  • The sum of the coefficients in a given row ∑_j staEqu[i, j] gives the number of equipment required at stage i. -If this number cannot be achieved with the available equipment, +If this number cannot be achieved with the available equipment, stage i is deemed unavailable.
  • diff --git a/Buildings/package.mo b/Buildings/package.mo index ab977027662..a27b2f8727f 100644 --- a/Buildings/package.mo +++ b/Buildings/package.mo @@ -209,14 +209,53 @@ Each class (i.e., model, block and function) must be used in an example or valid annotation (Documentation(info="

    -Version 11.0.0 is ... +Version 11.0.0 is a major release that adds various new packages and models.

    +

    +The library has been tested with +Dymola 2024x, +OpenModelica 1.22.1-1, +OPTIMICA 1.48.2 and recent versions of Impact. +

    +

    +The following major changes have been done compared to release 10.0.0: +

    +
      +
    • +A tutorial for how to build a simple system model has been added to Buildings.Examples.Tutorial.SimpleHouse. +
      • +
    • +A package for domestic hot water generation and loads that are served by a district system is added to +Buildings.DHC.Loads.HotWater. +
      • +
    • +The district heating and cooling models have been expanded and revised, user guide has been added, and the models have been +moved from the package Buildings.Experimental.DHC to Buildings.DHC. +
      • +
    • +A package for central plants with reversible air-to-water heat pumps has been added to Buildings.Templates.Plants.HeatPumps. +The package allows configuration of the type of hydronic integration and it consists pre-configured control sequences. +
      • +
    • +The initialization of the Spawn model has been refactored to avoid an iteration between Modelica and EnergyPlus as this +caused numerical problems in some cases. +
      • +
    • +The implementation of the blocks for the Control Description Language (CDL), which is being standardized through +ASHRAE Standard 231P, has been revised to comply with the latest draft of the standard. +
      • +

    The following new libraries have been added:

    + + + -
    Buildings.Templates.Plants + Package with template models for central plants with air-to-water reversible heat pumps, including the plant closed loop control. +
    Buildings.Examples.Tutorial.SimpleHouse Tutorial for how to build a simple system model. @@ -590,7 +629,6 @@ have been improved in a issue 3431.

    @@ -916,14 +954,6 @@ have been improved in a This change is supported in the conversion script. -xxx - - -xxx - - xxx. - -

    @@ -953,12 +983,141 @@ that can lead to wrong simulation results): and #3520. -xxx + + +")); + end Version_11_0_0; + + + class Version_10_1_0 "Version 10.1.0" + extends + Modelica.Icons.ReleaseNotes; + annotation ( + Documentation(info = " +

    +

    +Version 10.1.0 is backward compatible with version 10.0.0. +

    +

    +The library has been tested with +Dymola 2024x, +OpenModelica 1.22.1-1, +OPTIMICA 1.43.4 and recent versions of Impact. +

    +

    +The following major changes have been done compared to release 10.0.0: +

    +
      +
    • +A package to model aquifer thermal energy storage has been added. +
      • +
    +

    +Many models have been updated to improve performance, for compliance with the Modelica Language Standard and to correct model errors. +

    +
    + +

    +The following new libraries have been added: +

    + + + + +
    Buildings.Fluid.Geothermal.Aquifer + Library with component models for aquifer thermal energy storage. +
    + +

    +The following new components have been added +to existing libraries: +

    + + - - + +
    Buildings.ThermalZones.EnergyPlus_9_6_0
    xxx +
    Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Radiator xxx. + Added example for how to couple a radiator to the zone model.
    + This is for + Buildings, #3659. +
    + +

    +The following existing components +have been improved in a +backward compatible way: +

    + + + + + + + + + + + + + + + + + + + + + + + +
    Buildings.BoundaryConditions.WeatherData +
    Buildings.BoundaryConditions.WeatherData.Bus + Declared variables on weather data bus, which avoids + a warning in OMEdit, and improves usability of weather data bus.
    + This is for IBPSA, issue 1798. +
    Buildings.Experimental +
    Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETS
    + Buildings.Experimental.DHC.Loads.Combined.BaseClasses.PartialBuildingWithETS +     		Added parameters TDisWatMin and TDisWatMax + in lieu of using datDes.
    + This is for issue 3697. +
    Buildings.Occupants +
    Buildings.Occupants.BaseClasses.binaryVariableGeneration
    + Buildings.Occupants.BaseClasses.exponentialVariableGeneration
    + Buildings.Occupants.BaseClasses.weibullVariableGeneration +     		Initialized localSeed.
    + This is for #3549. +
    Buildings.ThermalZones.EnergyPlus_9_6_0 +
    Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone + Added radiative heat port to allow coupling of a radiator to the thermal zone.
    + This is for + Buildings, #3659. +
    Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.ThermalZoneAdapter + Added pre() operator on mass flow rate and radiative heat gain + to avoid an algebraic loop on discrete variables.
    + This is for + Buildings, #3659. +
    + + +

    +The following critical errors have been fixed (i.e., errors +that can lead to wrong simulation results): +

    + + + + +
    Buildings.Fluid.SolarCollectors +
    Buildings.Fluid.SolarCollectors.ASHRAE93
    + Buildings.Fluid.SolarCollectors.EN12975 +     		Corrected implementation of pressure drop calculation for the situation where the collectors are in parallel, + e.g., if sysConfig == Buildings.Fluid.SolarCollectors.Types.SystemConfiguration.Parallel.
    + This is for + Buildings, #3597.
    @@ -969,25 +1128,44 @@ that do not lead to wrong simulation results, e.g., units are wrong or errors in documentation):

    - - - + + + + + + + + + + + + +
    xxx +
    Buildings.Experimental.DHC
    xxx +
    Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialDirect
    + Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialIndirect
    + Buildings.Experimental.DHC.Loads.Steam.BuildingTimeSeriesAtETS     		xxx. + Corrected wrong displayUnit string. +
    Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.TankBranch + Corrected wrong use of displayUnit. +
    Buildings.Fluid.Geothermal.Borefields +
    Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.internalResistancesOneUTube
    + Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.internalResistancesTwoUTube +     		Corrected usage of getInstanceName(), which was called inside + these functions. This does not conform with the Modelica Language Standard, and causes + the compilation to fail in OpenModelica 1.22.0.
    + This is for IBPSA, #1814 +
    Buildings.ThermalZones.EnergyPlus_9_6_0 +
    Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.HeatPumpRadiantHeatingGroundHeatTransfer + Corrected wrong displayUnit string.
    -

    -Note: -

    -
      -
    • -xxx -
      • -
    ")); - end Version_11_0_0; + end Version_10_1_0; class Version_10_0_0 "Version 10.0.0" @@ -2210,6 +2388,235 @@ units are wrong or errors in documentation): ")); end Version_10_0_0; + + class Version_9_1_2 "Version 9.1.2" + extends Modelica.Icons.ReleaseNotes; + annotation (Documentation(info=" +
    +

    +Version 9.1.2 is backward compatible with 9.1.0 and 9.1.1, except that relative to 9.1.0, the Spawn binaries need to be updated as described +in Buildings.ThermalZones.EnergyPlus_9_6_0.UsersGuide.Installation. +

    +

    +The library has been tested with Dymola 2023x, OpenModelica 1.22.0-dev (41-g8a5b18f-1), OPTIMICA 1.43.4 and recent versions of Impact. +

    +

    +This backward compatible version adds a heat meter sensor and it adds a new example that demonstrates +how to use a hydronic radiator with the updated Spawn interface. +Also, many models have been updated to improve performance, for compliance with the Modelica Language Standard and +to correct model errors. +

    +
    + + +

    +The following new components have been added +to existing libraries: +

    + + + + + + + + + + + +
    Buildings.Fluid.Sensors +
    Buildings.Fluid.Sensors.HeatMeter + Sensor to measure the heat flow rate between a supply and return pipe in a fluid circuit.
    + This is for + IBPSA, #1831. + +
    Buildings.ThermalZones.EnergyPlus_9_6_0 +
    Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Radiator + Added example for how to couple a radiator to the zone model.
    + This is for + Buildings, #3659. +
    + +

    +The following existing components +have been improved in a +backward compatible way: +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Buildings.Air.Systems.SingleZone.VAV +
    Buildings.Air.Systems.SingleZone.VAV.BaseClasses.ControllerChillerDXHeatingEconomizer
    +     		Adjust hysteresis based on heating to avoid chatter.
    + This is for #3735. +
    Buildings.Controls.DemandResponse +
    Buildings.Controls.DemandResponse.Client + Refactored implementation so it works also with OpenModelica.
    + This is for #3754. +
    Buildings.Electrical +
    Buildings.Electrical.Interfaces.InductiveLoad + Reformulated calculation of reactive power to bound argument of tangent away from π, + which avoids an infinite function value.
    + This is for + Buildings, #3776. +
    Buildings.Fluid.FMI +
    Buildings.Fluid.FMI.AirToOutlet
    + Buildings.Fluid.FMI.InletToAir
    + Buildings.Fluid.FMI.FlowSplitter_u
    + Buildings.Fluid.FMI.Sink_T
    + Buildings.Fluid.FMI.Source_T
    + Buildings.Fluid.FMI.Adaptors.Inlet
    + Buildings.Fluid.FMI.Adaptors.Outlet +     		Added missing causality which is required for language compliance and for + Wolfram System Modeler.
    + This is for IBPSA, #1829 and + IBPSA, #1853. +
    Buildings.Fluid.Sensors.Examples +
    Buildings.Fluid.Sensors.Examples.PPM + Added pressure drop to avoid redundant initial conditions for pressure of control volume. + This corrects an issue in Wolfram System Modeler.
    + This is for #1830. +
    Buildings.Occupants +
    Buildings.Occupants.BaseClasses.binaryVariableGeneration
    + Buildings.Occupants.BaseClasses.exponentialVariableGeneration
    + Buildings.Occupants.BaseClasses.weibullVariableGeneration +     		Initialized localSeed.
    + This is for #3549. +
    Buildings.ThermalZones.EnergyPlus_9_6_0 +
    Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone + Added radiative heat port to allow coupling of a radiator to the thermal zone.
    + This is for + Buildings, #3659. +
    Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.ThermalZoneAdapter + Added pre() operator on mass flow rate and radiative heat gain + to avoid an algebraic loop on discrete variables.
    + This is for + Buildings, #3659. +
    + + +

    +The following critical errors have been fixed (i.e., errors +that can lead to wrong simulation results): +

    + + + + + + + + + + + +
    Buildings.Fluid.SolarCollectors +
    Buildings.Fluid.SolarCollectors.ASHRAE93
    + Buildings.Fluid.SolarCollectors.EN12975 +     		Corrected implementation of pressure drop calculation for the situation where the collectors are in parallel, + e.g., if sysConfig == Buildings.Fluid.SolarCollectors.Types.SystemConfiguration.Parallel.
    + This is for + Buildings, #3597. +
    Buildings.Airflow.Multizone +
    Buildings.Airflow.Multizone.BaseClasses.interpolate + Corrected implementation to ensure that the function is once continuously differentiable.
    + This is for + IBPSA, #1840. +
    + +

    +The following uncritical errors have been fixed (i.e., errors +that do not lead to wrong simulation results, e.g., +units are wrong or errors in documentation): +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Buildings.Airflow.Multizone +
    Buildings.Airflow.Multizone.MediumColumn
    + Buildings.Airflow.Multizone.MediumColumnDynamic +     		Corrected wrong annotation. + This is for IBPSA, #1842. +
    Buildings.BoundaryConditions +
    Buildings.BoundaryConditions.SolarIrradiation.BaseClasses.SkyClearness + Corrected wrong displayUnit attribute.
    + This is for IBPSA, #1848. +
    Buildings.Controls.OBC.ASHRAE.G36 +
    Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.SetPoints.ReliefFan
    + Buildings.Controls.OBC.ASHRAE.G36.AHUs.SingleZone.VAV.SetPoints.ReliefFan
    + Buildings.Controls.OBC.ASHRAE.G36.AHUs.SingleZone.VAV.SetPoints.ReliefFanGroup +     		Corrected wrong use displayUnit attribute. +
    Buildings.Examples +
    Buildings.Examples.DualFanDualDuct.ClosedLoop
    + Buildings.Examples.VAVReheat.BaseClasses.ASHRAE2006
    + Buildings.Examples.ScalableBenchmarks.BuildingVAV.Examples.OneFloor_OneZone +     		Corrected wrong use displayUnit attribute. +
    Buildings.Fluid.HeatPumps +
    Buildings.Fluid.HeatPumps.EquationFitReversible + Corrected wrong assertion for operation mode.
    + This is for + Buildings, #3664. +
    +")); + end Version_9_1_2; + class Version_9_1_1 "Version 9.1.1" extends Modelica.Icons.ReleaseNotes; annotation (Documentation(info=" @@ -13244,12 +13651,18 @@ on the Buildings library.

    • -Version 11.0.0 (xxx, 2023) +Version 11.0.0 (April 9, 2024) +
      • +
    • +Version 10.1.0 (April 9, 2024)
    • Version 10.0.0 (September 5, 2023)
    • +Version 9.1.2 (April 9, 2024) +
      • +
    • Version 9.1.1 (September 5, 2023)
    • @@ -13829,15 +14242,15 @@ end UsersGuide; annotation ( preferredView="info", version="11.0.0", -versionDate="2023-09-05", -dateModified="2023-09-05", +versionDate="2024-04-09", +dateModified="2024-04-09", uses(Modelica(version="4.0.0")), conversion( from( - version={"10.0.0"}, + version={"10.0.0", "10.1.0"}, script="modelica://Buildings/Resources/Scripts/Conversion/ConvertBuildings_from_10_to_11.0.0.mos"), from( - version={"9.0.0", "9.1.0", "9.1.1"}, + version={"9.0.0", "9.1.0", "9.1.1", "9.1.2"}, script="modelica://Buildings/Resources/Scripts/Conversion/ConvertBuildings_from_9_to_10.0.0.mos"), from( version={"8.0.0", "8.1.0", "8.1.1", "8.1.2", "8.1.3"}, diff --git a/README.md b/README.md index 4a39e755f01..11d92eeccf5 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ The main project site is http://simulationresearch.lbl.gov/modelica. ## Current release -Download [Buildings Library 10.0.0 (2023-09-05)](https://github.com/lbl-srg/modelica-buildings/releases/download/v10.0.0/Buildings-v10.0.0.zip) +Download [Buildings Library 11.0.0 (2024-04-09)](https://github.com/lbl-srg/modelica-buildings/releases/download/v11.0.0/Buildings-v11.0.0.zip) ## License