diff --git a/AixLib/.copiedFiles.txt b/AixLib/.copiedFiles.txt
index 7d716e510f..e8858afad0 100644
--- a/AixLib/.copiedFiles.txt
+++ b/AixLib/.copiedFiles.txt
@@ -201,13 +201,13 @@ AixLib\Controls\Discrete\Examples\package.mo
 AixLib\Controls\Discrete\Examples\package.order
 AixLib\Controls\Discrete\package.mo
 AixLib\Controls\Discrete\package.order
-AixLib\Controls\SetPoints\Examples\HotWaterTemperatureReset.mo
 AixLib\Controls\SetPoints\Examples\OccupancySchedule.mo
+AixLib\Controls\SetPoints\Examples\SupplyReturnTemperatureReset.mo
 AixLib\Controls\SetPoints\Examples\Table.mo
 AixLib\Controls\SetPoints\Examples\package.mo
 AixLib\Controls\SetPoints\Examples\package.order
-AixLib\Controls\SetPoints\HotWaterTemperatureReset.mo
 AixLib\Controls\SetPoints\OccupancySchedule.mo
+AixLib\Controls\SetPoints\SupplyReturnTemperatureReset.mo
 AixLib\Controls\SetPoints\Table.mo
 AixLib\Controls\SetPoints\Validation\OccupancyScheduleNegativeStartTime.mo
 AixLib\Controls\SetPoints\Validation\OccupancySchedulePositiveStartTime.mo
@@ -469,6 +469,8 @@ AixLib\Fluid\FixedResistances\BaseClasses\Validation\package.mo
 AixLib\Fluid\FixedResistances\BaseClasses\Validation\package.order
 AixLib\Fluid\FixedResistances\BaseClasses\package.mo
 AixLib\Fluid\FixedResistances\BaseClasses\package.order
+AixLib\Fluid\FixedResistances\CheckValve.mo
+AixLib\Fluid\FixedResistances\Examples\CheckValve.mo
 AixLib\Fluid\FixedResistances\Examples\FlowJunction.mo
 AixLib\Fluid\FixedResistances\Examples\HydraulicDiameter.mo
 AixLib\Fluid\FixedResistances\Examples\PlugFlowPipe.mo
@@ -1124,6 +1126,16 @@ AixLib\Fluid\Sources\Outside_CpLowRise.mo
 AixLib\Fluid\Sources\PropertySource_T.mo
 AixLib\Fluid\Sources\PropertySource_h.mo
 AixLib\Fluid\Sources\TraceSubstancesFlowSource.mo
+AixLib\Fluid\Sources\Validation\BaseClasses\BoundarySystem.mo
+AixLib\Fluid\Sources\Validation\BaseClasses\BoundarySystemWithX_in.mo
+AixLib\Fluid\Sources\Validation\BaseClasses\BoundarySystemWithXi_in.mo
+AixLib\Fluid\Sources\Validation\BaseClasses\package.mo
+AixLib\Fluid\Sources\Validation\BaseClasses\package.order
+AixLib\Fluid\Sources\Validation\Boundary.mo
+AixLib\Fluid\Sources\Validation\BoundaryWithX_in.mo
+AixLib\Fluid\Sources\Validation\BoundaryWithXi_in.mo
+AixLib\Fluid\Sources\Validation\package.mo
+AixLib\Fluid\Sources\Validation\package.order
 AixLib\Fluid\Sources\package.mo
 AixLib\Fluid\Sources\package.order
 AixLib\Fluid\Storage\BaseClasses\Buoyancy.mo
@@ -1149,6 +1161,7 @@ AixLib\Fluid\Storage\UsersGuide.mo
 AixLib\Fluid\Storage\Validation\HeatExchangerDynamics.mo
 AixLib\Fluid\Storage\Validation\HeatExchangerLocation.mo
 AixLib\Fluid\Storage\Validation\StratifiedLoadingUnloading.mo
+AixLib\Fluid\Storage\Validation\StratifiedNonUniformInitial.mo
 AixLib\Fluid\Storage\Validation\package.mo
 AixLib\Fluid\Storage\Validation\package.order
 AixLib\Fluid\Storage\package.mo
@@ -1274,8 +1287,8 @@ AixLib\Resources\Images\Controls\Continuous\Examples\PIDHysteresisTimerError.png
 AixLib\Resources\Images\Controls\Continuous\Examples\PIDHysteresisTimerOutput.png
 AixLib\Resources\Images\Controls\Continuous\Examples\SignalRankerU.png
 AixLib\Resources\Images\Controls\Continuous\Examples\SignalRankerY.png
-AixLib\Resources\Images\Controls\SetPoints\Examples\HotWaterTemperatureReset.png
 AixLib\Resources\Images\Controls\SetPoints\Examples\OccupancySchedule.png
+AixLib\Resources\Images\Controls\SetPoints\Examples\SupplyReturnTemperatureReset.png
 AixLib\Resources\Images\Controls\SetPoints\Table.png
 AixLib\Resources\Images\Fluid\Actuators\Valves\Examples\TwoWayValveTable_kv.png
 AixLib\Resources\Images\Fluid\Actuators\threeWayValvePressureDropSeries.png
@@ -1480,8 +1493,8 @@ AixLib\Resources\Scripts\Dymola\Controls\Continuous\Examples\SignalRanker.mos
 AixLib\Resources\Scripts\Dymola\Controls\Continuous\Validation\LimPIDReset.mos
 AixLib\Resources\Scripts\Dymola\Controls\Continuous\Validation\OffTimerNonZeroStart.mos
 AixLib\Resources\Scripts\Dymola\Controls\Discrete\Examples\BooleanDelay.mos
-AixLib\Resources\Scripts\Dymola\Controls\SetPoints\Examples\HotWaterTemperatureReset.mos
 AixLib\Resources\Scripts\Dymola\Controls\SetPoints\Examples\OccupancySchedule.mos
+AixLib\Resources\Scripts\Dymola\Controls\SetPoints\Examples\SupplyReturnTemperatureReset.mos
 AixLib\Resources\Scripts\Dymola\Controls\SetPoints\Examples\Table.mos
 AixLib\Resources\Scripts\Dymola\Controls\SetPoints\Validation\OccupancyScheduleNegativeStartTime.mos
 AixLib\Resources\Scripts\Dymola\Controls\SetPoints\Validation\OccupancySchedulePositiveStartTime.mos
@@ -1586,6 +1599,7 @@ AixLib\Resources\Scripts\Dymola\Fluid\FMI\Validation\HeaterFan.mos
 AixLib\Resources\Scripts\Dymola\Fluid\FMI\Validation\HeaterFanPressureDriven.mos
 AixLib\Resources\Scripts\Dymola\Fluid\FMI\Validation\HeaterFan_noReverseFlow.mos
 AixLib\Resources\Scripts\Dymola\Fluid\FixedResistances\BaseClasses\Validation\PlugFlowCore.mos
+AixLib\Resources\Scripts\Dymola\Fluid\FixedResistances\Examples\CheckValve.mos
 AixLib\Resources\Scripts\Dymola\Fluid\FixedResistances\Examples\FlowJunction.mos
 AixLib\Resources\Scripts\Dymola\Fluid\FixedResistances\Examples\HydraulicDiameter.mos
 AixLib\Resources\Scripts\Dymola\Fluid\FixedResistances\Examples\PlugFlowPipe.mos
@@ -1787,6 +1801,9 @@ AixLib\Resources\Scripts\Dymola\Fluid\Sources\Examples\Outside_CpLowRise.mos
 AixLib\Resources\Scripts\Dymola\Fluid\Sources\Examples\PropertySource_T.mos
 AixLib\Resources\Scripts\Dymola\Fluid\Sources\Examples\PropertySource_h.mos
 AixLib\Resources\Scripts\Dymola\Fluid\Sources\Examples\TraceSubstancesFlowSource.mos
+AixLib\Resources\Scripts\Dymola\Fluid\Sources\Validation\Boundary.mos
+AixLib\Resources\Scripts\Dymola\Fluid\Sources\Validation\BoundaryWithX_in.mos
+AixLib\Resources\Scripts\Dymola\Fluid\Sources\Validation\BoundaryWithXi_in.mos
 AixLib\Resources\Scripts\Dymola\Fluid\Storage\BaseClasses\Examples\IndirectTankHeatExchanger.mos
 AixLib\Resources\Scripts\Dymola\Fluid\Storage\Examples\ExpansionVessel.mos
 AixLib\Resources\Scripts\Dymola\Fluid\Storage\Examples\Stratified.mos
@@ -1795,6 +1812,7 @@ AixLib\Resources\Scripts\Dymola\Fluid\Storage\Examples\StratifiedUnloadAtMinimum
 AixLib\Resources\Scripts\Dymola\Fluid\Storage\Validation\HeatExchangerDynamics.mos
 AixLib\Resources\Scripts\Dymola\Fluid\Storage\Validation\HeatExchangerLocation.mos
 AixLib\Resources\Scripts\Dymola\Fluid\Storage\Validation\StratifiedLoadingUnloading.mos
+AixLib\Resources\Scripts\Dymola\Fluid\Storage\Validation\StratifiedNonUniformInitial.mos
 AixLib\Resources\Scripts\Dymola\Media\Antifreeze\Validation\PropyleneGlycolWater.mos
 AixLib\Resources\Scripts\Dymola\Media\Examples\AirDerivativeCheck.mos
 AixLib\Resources\Scripts\Dymola\Media\Examples\AirProperties.mos
@@ -1816,6 +1834,8 @@ AixLib\Resources\Scripts\Dymola\ThermalZones\ReducedOrder\Examples\SimpleRoomFou
 AixLib\Resources\Scripts\Dymola\ThermalZones\ReducedOrder\Examples\SimpleRoomOneElement.mos
 AixLib\Resources\Scripts\Dymola\ThermalZones\ReducedOrder\Examples\SimpleRoomThreeElements.mos
 AixLib\Resources\Scripts\Dymola\ThermalZones\ReducedOrder\Examples\SimpleRoomTwoElements.mos
+AixLib\Resources\Scripts\Dymola\ThermalZones\ReducedOrder\Validation\RoomWithLatentGain.mos
+AixLib\Resources\Scripts\Dymola\ThermalZones\ReducedOrder\Validation\RoomWithoutLatentGain.mos
 AixLib\Resources\Scripts\Dymola\ThermalZones\ReducedOrder\Validation\VDI6007\TestCase1.mos
 AixLib\Resources\Scripts\Dymola\ThermalZones\ReducedOrder\Validation\VDI6007\TestCase10.mos
 AixLib\Resources\Scripts\Dymola\ThermalZones\ReducedOrder\Validation\VDI6007\TestCase11.mos
@@ -1881,6 +1901,7 @@ AixLib\Resources\Scripts\Dymola\Utilities\Math\Functions\Examples\RegNonZeroPowe
 AixLib\Resources\Scripts\Dymola\Utilities\Math\Functions\Examples\RegNonZeroPowerDerivative_2_Check.mos
 AixLib\Resources\Scripts\Dymola\Utilities\Math\Functions\Examples\RegStep.mos
 AixLib\Resources\Scripts\Dymola\Utilities\Math\Functions\Examples\SmoothExponentialDerivativeCheck.mos
+AixLib\Resources\Scripts\Dymola\Utilities\Math\Functions\Examples\SmoothHeavisideDerivatives.mos
 AixLib\Resources\Scripts\Dymola\Utilities\Math\Functions\Examples\SpliceFunction.mos
 AixLib\Resources\Scripts\Dymola\Utilities\Math\Functions\Examples\SpliceFunctionDerivativeCheck.mos
 AixLib\Resources\Scripts\Dymola\Utilities\Math\Functions\Examples\TrapezoidalIntegration.mos
@@ -2012,6 +2033,8 @@ AixLib\ThermalZones\ReducedOrder\SolarGain\BaseClasses\package.order
 AixLib\ThermalZones\ReducedOrder\SolarGain\CorrectionGDoublePane.mo
 AixLib\ThermalZones\ReducedOrder\SolarGain\package.mo
 AixLib\ThermalZones\ReducedOrder\SolarGain\package.order
+AixLib\ThermalZones\ReducedOrder\Validation\RoomWithLatentGain.mo
+AixLib\ThermalZones\ReducedOrder\Validation\RoomWithoutLatentGain.mo
 AixLib\ThermalZones\ReducedOrder\Validation\VDI6007\BaseClasses\VerifyDifferenceThreePeriods.mo
 AixLib\ThermalZones\ReducedOrder\Validation\VDI6007\BaseClasses\package.mo
 AixLib\ThermalZones\ReducedOrder\Validation\VDI6007\BaseClasses\package.order
@@ -2165,6 +2188,7 @@ AixLib\Utilities\Math\Functions\Examples\RegNonZeroPowerDerivativeCheck.mo
 AixLib\Utilities\Math\Functions\Examples\RegNonZeroPowerDerivative_2_Check.mo
 AixLib\Utilities\Math\Functions\Examples\RegStep.mo
 AixLib\Utilities\Math\Functions\Examples\SmoothExponentialDerivativeCheck.mo
+AixLib\Utilities\Math\Functions\Examples\SmoothHeavisideDerivatives.mo
 AixLib\Utilities\Math\Functions\Examples\SpliceFunction.mo
 AixLib\Utilities\Math\Functions\Examples\SpliceFunctionDerivativeCheck.mo
 AixLib\Utilities\Math\Functions\Examples\TrapezoidalIntegration.mo
diff --git a/AixLib/Airflow/Multizone/Examples/OneOpenDoor.mo b/AixLib/Airflow/Multizone/Examples/OneOpenDoor.mo
index 392638a805..b1360adfdf 100644
--- a/AixLib/Airflow/Multizone/Examples/OneOpenDoor.mo
+++ b/AixLib/Airflow/Multizone/Examples/OneOpenDoor.mo
@@ -4,8 +4,8 @@ model OneOpenDoor "Model with one open and one closed door"
 
   package Medium = Modelica.Media.Air.SimpleAir;
 
-  AixLib.Airflow.Multizone.DoorDiscretizedOpen dooOpe(redeclare package Medium =
-        Medium) "Discretized door"
+  AixLib.Airflow.Multizone.DoorDiscretizedOpen dooOpe(redeclare package Medium
+      = Medium) "Discretized door"
     annotation (Placement(transformation(extent={{10,-8},{30,12}})));
 
   AixLib.Fluid.MixingVolumes.MixingVolume volA(
diff --git a/AixLib/BoundaryConditions/Types.mo b/AixLib/BoundaryConditions/Types.mo
index fc49d05b75..ea9e7e76a4 100644
--- a/AixLib/BoundaryConditions/Types.mo
+++ b/AixLib/BoundaryConditions/Types.mo
@@ -9,7 +9,8 @@ package Types "Package with type definitions"
 <p>
 Enumeration to define the data source used in the weather data reader.
 </p>
-</html>", revisions="<html>
+</html>", revisions=
+"<html>
 <ul>
 <li>
 July 20, 2011, by Michael Wetter:<br/>
@@ -31,7 +32,8 @@ First implementation.
 <p>
 Enumeration to define the data source used in the weather data reader.
 </p>
-</html>", revisions="<html>
+</html>", revisions=
+"<html>
 <ul>
 <li>
 August 13, 2012, by Wangda Zuo:<br/>
@@ -44,12 +46,13 @@ First implementation.
         "Use horizontal irradiation",
       TemperaturesAndSkyCover
         "Use dry-bulb and dew-point temperatures and sky cover")
-    "Enumeration for computation of sky temperature" annotation (Documentation(
-        info =                 "<html>
+    "Enumeration for computation of sky temperature"
+annotation (Documentation(info="<html>
 <p>
 Enumeration to define the method used to compute the sky temperature.
 </p>
-</html>", revisions="<html>
+</html>", revisions=
+"<html>
 <ul>
 <li>
 October 3, 2011, by Michael Wetter:<br/>
diff --git a/AixLib/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo b/AixLib/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo
index ce70f941cd..baf45f171f 100644
--- a/AixLib/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo
+++ b/AixLib/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo
@@ -14,7 +14,7 @@ algorithm
     AixLib.BoundaryConditions.WeatherData.BaseClasses.getHeaderElementTMY3(
       filNam=filNam,
       start="#LOCATION",
-      name = "longitude",
+      name=  "longitude",
       position=8);
    (nexInd, lon) :=Modelica.Utilities.Strings.Advanced.scanReal(
     string=element,
diff --git a/AixLib/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo b/AixLib/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo
index da1cf0cd2b..1e09bd82f0 100644
--- a/AixLib/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo
+++ b/AixLib/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo
@@ -14,7 +14,7 @@ algorithm
     AixLib.BoundaryConditions.WeatherData.BaseClasses.getHeaderElementTMY3(
       filNam=filNam,
       start="#LOCATION",
-      name = "longitude",
+      name=  "longitude",
       position=9);
    (nexInd, timZon) :=Modelica.Utilities.Strings.Advanced.scanReal(
     string=element,
diff --git a/AixLib/BoundaryConditions/WeatherData/ReaderTMY3.mo b/AixLib/BoundaryConditions/WeatherData/ReaderTMY3.mo
index 2127429ecd..4ebc1dceb9 100644
--- a/AixLib/BoundaryConditions/WeatherData/ReaderTMY3.mo
+++ b/AixLib/BoundaryConditions/WeatherData/ReaderTMY3.mo
@@ -964,6 +964,14 @@ equation
     Documentation(info="<html>
 <p>
 This component reads TMY3 weather data (Wilcox and Marion, 2008) or user specified weather data.
+The Modelica built-in variable <code>time</code> determines what row
+of the weather file is read.
+The value of <code>time</code> is the number of seconds
+that have passed since January 1st at midnight (00:00) in the local time zone.
+The local time zone value, longitude and latitute are also read from the weather data,
+such that the solar position computations are consistent with the weather data.
+</p>
+<p>
 The weather data format is the Typical Meteorological Year (TMY3)
 as obtained from the EnergyPlus web site at
 <a href=\"http://energyplus.net/weather\">
@@ -1591,6 +1599,12 @@ Technical Report, NREL/TP-581-43156, revised May 2008.
 </html>", revisions="<html>
 <ul>
 <li>
+August 20, 2019, by Filip Jorissen:<br/>
+Better clarified the meaning of <code>time</code> in the documentation.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1192\">#1192</a>.
+</li>
+<li>
 March 5, 2019, by Michael Wetter:<br/>
 Updated documentation.<br/>
 This is for
diff --git a/AixLib/Controls/Continuous/Examples/SignalRanker.mo b/AixLib/Controls/Continuous/Examples/SignalRanker.mo
index 19949b2a33..b8476575b3 100644
--- a/AixLib/Controls/Continuous/Examples/SignalRanker.mo
+++ b/AixLib/Controls/Continuous/Examples/SignalRanker.mo
@@ -5,7 +5,8 @@ model SignalRanker "Example model for signal ranker"
     annotation (Placement(transformation(extent={{-60,-20},{-40,0}})));
   Modelica.Blocks.Sources.Pulse pulse(period=0.25)
     annotation (Placement(transformation(extent={{-60,20},{-40,40}})));
-  AixLib.Controls.Continuous.SignalRanker sigRan( nin=3)
+  AixLib.Controls.Continuous.SignalRanker sigRan(
+                                                  nin=3)
     annotation (Placement(transformation(extent={{-20,20},{0,40}})));
   Modelica.Blocks.Sources.ExpSine expSine(freqHz=10, damping=1)
     annotation (Placement(transformation(extent={{-60,60},{-40,80}})));
diff --git a/AixLib/Controls/Continuous/LimPID.mo b/AixLib/Controls/Continuous/LimPID.mo
index 860bd1583d..4af162002f 100644
--- a/AixLib/Controls/Continuous/LimPID.mo
+++ b/AixLib/Controls/Continuous/LimPID.mo
@@ -178,10 +178,11 @@ protected
     annotation (
       Placement(transformation(extent={{60,-80},{40,-60}})));
 
-  Modelica.Blocks.Nonlinear.Limiter limiter(
+  Limiter limiter(
     final uMax=yMax,
     final uMin=yMin,
-    final strict=strict) "Output limiter"
+    final strict=strict)
+    "Output limiter"
     annotation (Placement(transformation(extent={{70,-10},{90,10}})));
 
 
@@ -191,6 +192,91 @@ protected
     "Signal source for integrator reset"
     annotation (Placement(transformation(extent={{-80,-90},{-60,-70}})));
 
+  // The block Limiter below has been implemented as it is introduced in MSL 3.2.3, but
+  // not all tools include MSL 3.2.3.
+  // See https://github.com/ibpsa/modelica-ibpsa/pull/1222#issuecomment-554114617
+block Limiter "Limit the range of a signal"
+  parameter Real uMax(start=1) "Upper limits of input signals";
+  parameter Real uMin= -uMax "Lower limits of input signals";
+  parameter Boolean strict=false "= true, if strict limits with noEvent(..)"
+    annotation (Evaluate=true, choices(checkBox=true), Dialog(tab="Advanced"));
+  parameter Boolean limitsAtInit=true
+    "Has no longer an effect and is only kept for backwards compatibility (the implementation uses now the homotopy operator)"
+    annotation (Dialog(tab="Dummy"),Evaluate=true, choices(checkBox=true));
+  extends Modelica.Blocks.Interfaces.SISO;
+
+equation
+  assert(uMax >= uMin, "Limiter: Limits must be consistent. However, uMax (=" + String(uMax) +
+                       ") < uMin (=" + String(uMin) + ")");
+
+  if strict then
+    y = smooth(0, noEvent(if u > uMax then uMax else if u < uMin then uMin else u));
+  else
+    y = smooth(0,if u > uMax then uMax else if u < uMin then uMin else u);
+  end if;
+  annotation (
+     Icon(coordinateSystem(
+    preserveAspectRatio=true,
+    extent={{-100,-100},{100,100}}), graphics={
+    Line(points={{0,-90},{0,68}}, color={192,192,192}),
+    Polygon(
+      points={{0,90},{-8,68},{8,68},{0,90}},
+      lineColor={192,192,192},
+      fillColor={192,192,192},
+      fillPattern=FillPattern.Solid),
+    Line(points={{-90,0},{68,0}}, color={192,192,192}),
+    Polygon(
+      points={{90,0},{68,-8},{68,8},{90,0}},
+      lineColor={192,192,192},
+      fillColor={192,192,192},
+      fillPattern=FillPattern.Solid),
+    Line(points={{-80,-70},{-50,-70},{50,70},{80,70}}),
+    Text(
+      extent={{-150,-150},{150,-110}},
+      textString="uMax=%uMax"),
+    Line(
+      visible=strict,
+      points={{50,70},{80,70}},
+      color={255,0,0}),
+    Line(
+      visible=strict,
+      points={{-80,-70},{-50,-70}},
+      color={255,0,0})}),
+    Diagram(coordinateSystem(
+    preserveAspectRatio=true,
+    extent={{-100,-100},{100,100}}), graphics={
+    Line(points={{0,-60},{0,50}}, color={192,192,192}),
+    Polygon(
+      points={{0,60},{-5,50},{5,50},{0,60}},
+      lineColor={192,192,192},
+      fillColor={192,192,192},
+      fillPattern=FillPattern.Solid),
+    Line(points={{-60,0},{50,0}}, color={192,192,192}),
+    Polygon(
+      points={{60,0},{50,-5},{50,5},{60,0}},
+      lineColor={192,192,192},
+      fillColor={192,192,192},
+      fillPattern=FillPattern.Solid),
+    Line(points={{-50,-40},{-30,-40},{30,40},{50,40}}),
+    Text(
+      extent={{46,-6},{68,-18}},
+      lineColor={128,128,128},
+      textString="u"),
+    Text(
+      extent={{-30,70},{-5,50}},
+      lineColor={128,128,128},
+      textString="y"),
+    Text(
+      extent={{-58,-54},{-28,-42}},
+      lineColor={128,128,128},
+      textString="uMin"),
+    Text(
+      extent={{26,40},{66,56}},
+      lineColor={128,128,128},
+      textString="uMax")}));
+end Limiter;
+
+
 initial equation
   if initType==Modelica.Blocks.Types.InitPID.InitialOutput then
      gainPID.y = y_start;
@@ -336,6 +422,13 @@ Some parameters assignments in the instances have been made final.
 revisions="<html>
 <ul>
 <li>
+October 19, 2019, by Filip Jorissen:<br/>
+Disabled homotopy to ensure bounded outputs
+by copying the implementation from MSL 3.2.3 and by
+hardcoding the implementation for <code>homotopyType=NoHomotopy</code>.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1221\">issue 1221</a>.
+</li>
+<li>
 September 29, 2016, by Michael Wetter:<br/>
 Refactored model.
 </li>
diff --git a/AixLib/Controls/Discrete/Examples/package.mo b/AixLib/Controls/Discrete/Examples/package.mo
index 261a7d7931..13ca5be3eb 100644
--- a/AixLib/Controls/Discrete/Examples/package.mo
+++ b/AixLib/Controls/Discrete/Examples/package.mo
@@ -1,7 +1,6 @@
 within AixLib.Controls.Discrete;
 package Examples "Collection of models that illustrate model use and test models"
   extends Modelica.Icons.ExamplesPackage;
-
 annotation (preferredView="info", Documentation(info="<html>
 <p>
 This package contains examples for the use of models that can be found in
diff --git a/AixLib/Controls/Discrete/package.mo b/AixLib/Controls/Discrete/package.mo
index 38994acda1..7e1fc02084 100644
--- a/AixLib/Controls/Discrete/package.mo
+++ b/AixLib/Controls/Discrete/package.mo
@@ -1,7 +1,6 @@
 within AixLib.Controls;
 package Discrete "Package with models for discrete time controls"
   extends Modelica.Icons.Package;
-
 annotation (
 preferredView="info", Documentation(info="<html>
 This package contains component models for discrete time controls.
diff --git a/AixLib/Controls/HVACAgentBasedControl/Examples/BuildingHeatingSystems/BuildingHeating.mo b/AixLib/Controls/HVACAgentBasedControl/Examples/BuildingHeatingSystems/BuildingHeating.mo
index 2f111b03e9..18190cd566 100644
--- a/AixLib/Controls/HVACAgentBasedControl/Examples/BuildingHeatingSystems/BuildingHeating.mo
+++ b/AixLib/Controls/HVACAgentBasedControl/Examples/BuildingHeatingSystems/BuildingHeating.mo
@@ -5,17 +5,14 @@ model BuildingHeating
 
   ThermalZones.ReducedOrder.ThermalZone.ThermalZone
               thermalZone(zoneParam=
-        DataBase.ThermalZones.OfficePassiveHouse.OPH_1_Office(), redeclare
+        DataBase.ThermalZones.OfficePassiveHouse.OPH_1_OfficeNoHeaterCooler(),
+                                                                 redeclare
       package Medium = Modelica.Media.Air.SimpleAir)                                                annotation(Placement(transformation(extent={{-60,58},
             {-34,84}})));
-  Modelica.Blocks.Sources.Constant infiltrationRate(k=0)   annotation(Placement(transformation(extent={{-138,40},
-            {-124,54}})));
-  Modelica.Blocks.Sources.Constant infiltrationTemperature(k = 288.15) annotation(Placement(transformation(extent={{-138,62},
-            {-124,76}})));
   ThermalZones.ReducedOrder.ThermalZone.ThermalZone
               thermalZone1(redeclare package Medium =
         Modelica.Media.Air.SimpleAir, zoneParam=
-        DataBase.ThermalZones.OfficePassiveHouse.OPH_1_Office())                                    annotation(Placement(transformation(extent={{22,58},
+        DataBase.ThermalZones.OfficePassiveHouse.OPH_1_OfficeNoHeaterCooler())                      annotation(Placement(transformation(extent={{22,58},
             {48,84}})));
   AixLib.Fluid.Movers.FlowControlled_m_flow fan(redeclare package Medium =
         Modelica.Media.Water.ConstantPropertyLiquidWater, m_flow_nominal=2)
@@ -316,17 +313,6 @@ equation
   connect(thermalZone1.intGainsRad, thermalZone1.intGainsConv) annotation (Line(
         points={{48,69.7},{52,69.7},{52,70},{54,70},{54,64.5},{48,64.5}}, color=
          {191,0,0}));
-  connect(thermalZone.ventTemp, infiltrationTemperature.y) annotation (Line(
-        points={{-61.69,65.93},{-91.845,65.93},{-91.845,69},{-123.3,69}}, color=
-         {0,0,127}));
-  connect(thermalZone1.ventTemp, infiltrationTemperature.y) annotation (Line(
-        points={{20.31,65.93},{-24,65.93},{-24,86},{-72,86},{-72,69},{-100,69},
-          {-123.3,69}}, color={0,0,127}));
-  connect(infiltrationRate.y, thermalZone.ventRate) annotation (Line(points={{
-          -123.3,47},{-86,47},{-86,56},{-56.1,56},{-56.1,60.08}}, color={0,0,
-          127}));
-  connect(thermalZone1.ventRate, thermalZone.ventRate) annotation (Line(points=
-          {{25.9,60.08},{25.9,56},{-56.1,56},{-56.1,60.08}}, color={0,0,127}));
   connect(thermalZone1.intGains, internalGains.y) annotation (Line(points={{
           45.4,60.08},{45.4,48},{-62,48},{-84,48},{-84,38},{-114,38},{-114,23},
           {-123.3,23}}, color={0,0,127}));
diff --git a/AixLib/Controls/HVACAgentBasedControl/Examples/BuildingHeatingSystems/BuildingWithPV.mo b/AixLib/Controls/HVACAgentBasedControl/Examples/BuildingHeatingSystems/BuildingWithPV.mo
index e2fa6452db..63fc0cb81a 100644
--- a/AixLib/Controls/HVACAgentBasedControl/Examples/BuildingHeatingSystems/BuildingWithPV.mo
+++ b/AixLib/Controls/HVACAgentBasedControl/Examples/BuildingHeatingSystems/BuildingWithPV.mo
@@ -170,21 +170,17 @@ model BuildingWithPV
   ThermalZones.ReducedOrder.ThermalZone.ThermalZone
               thermalZone(redeclare package Medium =
         Modelica.Media.Air.SimpleAir, zoneParam=
-        DataBase.ThermalZones.OfficePassiveHouse.OPH_1_Office())                                    annotation(Placement(transformation(extent={{-18,70},
+        DataBase.ThermalZones.OfficePassiveHouse.OPH_1_OfficeNoHeaterCooler())                      annotation(Placement(transformation(extent={{-18,70},
             {8,96}})));
   ThermalZones.ReducedOrder.ThermalZone.ThermalZone
               thermalZone1(redeclare package Medium =
         Modelica.Media.Air.SimpleAir, zoneParam=
-        DataBase.ThermalZones.OfficePassiveHouse.OPH_1_Office())                                    annotation(Placement(transformation(extent={{64,70},
+        DataBase.ThermalZones.OfficePassiveHouse.OPH_1_OfficeNoHeaterCooler())                      annotation(Placement(transformation(extent={{64,70},
             {90,96}})));
   BoundaryConditions.WeatherData.Bus        weaBus
     "Weather data bus"
     annotation (Placement(transformation(extent={{18,112},{52,144}}),
     iconTransformation(extent={{-70,-12},{-50,8}})));
-  Modelica.Blocks.Sources.Constant infiltrationRate(k=0)   annotation(Placement(transformation(extent={{-92,60},
-            {-78,74}})));
-  Modelica.Blocks.Sources.Constant infiltrationTemperature(k = 288.15) annotation(Placement(transformation(extent={{-92,82},
-            {-78,96}})));
   Modelica.Blocks.Sources.Constant internalGains[3](k={0,0,0})
     annotation (Placement(transformation(extent={{-92,36},{-78,50}})));
   Fluid.FixedResistances.HydraulicResistance hydraulicResistance1(
@@ -332,14 +328,6 @@ equation
           38,20},{50,20},{50,68},{96,68},{96,76.5},{90,76.5}}, color={191,0,0}));
   connect(vol1.heatPort, thermalZone1.intGainsRad) annotation (Line(points={{38,
           20},{50,20},{50,68},{98,68},{98,81.7},{90,81.7}}, color={191,0,0}));
-  connect(thermalZone.ventTemp, infiltrationTemperature.y) annotation (Line(
-        points={{-19.69,77.93},{-47.845,77.93},{-47.845,89},{-77.3,89}}, color=
-          {0,0,127}));
-  connect(thermalZone1.ventTemp, infiltrationTemperature.y) annotation (Line(
-        points={{62.31,77.93},{20,77.93},{20,106},{-28,106},{-28,89},{-77.3,89}},
-        color={0,0,127}));
-  connect(infiltrationRate.y, thermalZone.ventRate) annotation (Line(points={{
-          -77.3,67},{-42,67},{-42,76},{-14.1,76},{-14.1,72.08}}, color={0,0,127}));
   connect(thermalZone.intGains, internalGains.y) annotation (Line(points={{5.4,
           72.08},{5.4,68},{-40,68},{-40,58},{-70,58},{-70,43},{-77.3,43}},
         color={0,0,127}));
@@ -361,9 +349,6 @@ equation
           {-102,-4},{-102,36},{-116,36},{-116,30}}, color={0,0,127}));
   connect(to_degC2.u, roomAgent1.T) annotation (Line(points={{-120,-36},{-108,
           -36},{-108,-28},{80,-28},{80,40},{108,40},{108,32}}, color={0,0,127}));
-  connect(thermalZone1.ventRate, thermalZone.ventRate) annotation (Line(points=
-          {{67.9,72.08},{28,72.08},{28,64},{-42,64},{-42,68},{-42,68},{-42,76},
-          {-14.1,76},{-14.1,72.08}}, color={0,0,127}));
   connect(fan.port_b, hydraulicResistance1.port_a) annotation (Line(points={{72,
           -86},{72,-86},{72,-38},{-40,-38}}, color={0,127,255}));
   connect(hydraulicResistance1.port_b, hea.port_a) annotation (Line(points={{
diff --git a/AixLib/Controls/SetPoints/Examples/HotWaterTemperatureReset.mo b/AixLib/Controls/SetPoints/Examples/SupplyReturnTemperatureReset.mo
similarity index 79%
rename from AixLib/Controls/SetPoints/Examples/HotWaterTemperatureReset.mo
rename to AixLib/Controls/SetPoints/Examples/SupplyReturnTemperatureReset.mo
index 64dfa5de6f..a98e86e317 100644
--- a/AixLib/Controls/SetPoints/Examples/HotWaterTemperatureReset.mo
+++ b/AixLib/Controls/SetPoints/Examples/SupplyReturnTemperatureReset.mo
@@ -1,24 +1,27 @@
 within AixLib.Controls.SetPoints.Examples;
-model HotWaterTemperatureReset "Test model for the heating curve"
+model SupplyReturnTemperatureReset "Test model for the heating curve"
   extends Modelica.Icons.Example;
-  AixLib.Controls.SetPoints.HotWaterTemperatureReset heaCur(
+  AixLib.Controls.SetPoints.SupplyReturnTemperatureReset heaCur(
     m=1,
     TSup_nominal=333.15,
     TRet_nominal=313.15,
     TOut_nominal=263.15)
+    "Temperature reset"
     annotation (Placement(transformation(extent={{-40,40},{-20,60}})));
   Modelica.Blocks.Sources.Ramp TOut(
     height=40,
     duration=1,
     offset=263.15)
+    "Signal for outside air temperature"
     annotation (Placement(transformation(extent={{-80,40},{-60,60}})));
-  AixLib.Controls.SetPoints.HotWaterTemperatureReset heaCur1(
+  AixLib.Controls.SetPoints.SupplyReturnTemperatureReset heaCur1(
     m=1,
     use_TRoo_in=true,
     TSup_nominal=333.15,
     TRet_nominal=313.15,
     TOut_nominal=263.15,
     dTOutHeaBal=15)
+    "Temperature reset that uses room temperature as input"
     annotation (Placement(transformation(extent={{-40,0},{-20,20}})));
   Modelica.Blocks.Sources.Step TRoo(
     offset=273.15 + 20,
@@ -26,6 +29,7 @@ model HotWaterTemperatureReset "Test model for the heating curve"
     height=-5) "Night set back from 20 to 15 deg C"
     annotation (Placement(transformation(extent={{-80,-40},{-60,-20}})));
   Modelica.Blocks.Sources.Constant TOut2(k=273.15 - 10)
+   "Constant signal for outdoor air temperature"
     annotation (Placement(transformation(extent={{-80,0},{-60,20}})));
 equation
   connect(TOut.y, heaCur.TOut) annotation (Line(
@@ -38,7 +42,7 @@ equation
       points={{-59,-30},{-50,-30},{-50,4},{-41.9,4}},
       color={0,0,127}));
   annotation (experiment(Tolerance=1e-6, StopTime=1.0),
-__Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Controls/SetPoints/Examples/HotWaterTemperatureReset.mos"
+__Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Controls/SetPoints/Examples/SupplyReturnTemperatureReset.mos"
         "Simulate and plot"),
     Documentation(info="<html>
 <p>
@@ -56,7 +60,7 @@ an outside temperature of
 The figure below shows the computed supply and return water temperatures.
 </p>
 <p align=\"center\">
-<img src=\"modelica://AixLib/Resources/Images/Controls/SetPoints/Examples/HotWaterTemperatureReset.png\" border=\"1\" alt=\"Supply and return water temperatures.\"/>
+<img src=\"modelica://AixLib/Resources/Images/Controls/SetPoints/Examples/SupplyReturnTemperatureReset.png\" border=\"1\" alt=\"Supply and return water temperatures.\"/>
 </p>
 </html>", revisions="<html>
 <ul>
@@ -66,4 +70,4 @@ Added documentation.
 </li>
 </ul>
 </html>"));
-end HotWaterTemperatureReset;
+end SupplyReturnTemperatureReset;
diff --git a/AixLib/Controls/SetPoints/Examples/package.mo b/AixLib/Controls/SetPoints/Examples/package.mo
index 6563839190..ecb0ceb5be 100644
--- a/AixLib/Controls/SetPoints/Examples/package.mo
+++ b/AixLib/Controls/SetPoints/Examples/package.mo
@@ -1,7 +1,6 @@
 within AixLib.Controls.SetPoints;
 package Examples "Collection of models that illustrate model use and test models"
   extends Modelica.Icons.ExamplesPackage;
-
 annotation (preferredView="info", Documentation(info="<html>
 <p>
 This package contains examples for the use of models that can be found in
diff --git a/AixLib/Controls/SetPoints/Examples/package.order b/AixLib/Controls/SetPoints/Examples/package.order
index cb7e87519e..618e13fa96 100644
--- a/AixLib/Controls/SetPoints/Examples/package.order
+++ b/AixLib/Controls/SetPoints/Examples/package.order
@@ -1,3 +1,3 @@
-HotWaterTemperatureReset
 OccupancySchedule
+SupplyReturnTemperatureReset
 Table
diff --git a/AixLib/Controls/SetPoints/HotWaterTemperatureReset.mo b/AixLib/Controls/SetPoints/SupplyReturnTemperatureReset.mo
similarity index 91%
rename from AixLib/Controls/SetPoints/HotWaterTemperatureReset.mo
rename to AixLib/Controls/SetPoints/SupplyReturnTemperatureReset.mo
index 9fcddd2334..8cd5cdd3ff 100644
--- a/AixLib/Controls/SetPoints/HotWaterTemperatureReset.mo
+++ b/AixLib/Controls/SetPoints/SupplyReturnTemperatureReset.mo
@@ -1,6 +1,6 @@
 within AixLib.Controls.SetPoints;
-block HotWaterTemperatureReset
-  "Block to compute the supply and return set point of heating systems"
+block SupplyReturnTemperatureReset
+  "Block to compute the supply and return set point"
   extends Modelica.Blocks.Icons.Block;
 
   parameter Real m = 1.3 "Exponent for heat transfer";
@@ -63,17 +63,18 @@ equation
           + (TSup_nominal-TRet_nominal)/2 * qRel;
  TRet = TSup - qRel * (TSup_nominal-TRet_nominal);
   annotation (
-defaultComponentName="hotWatRes",
+defaultComponentName="watRes",
 Documentation(info="<html>
 <p>
 This block computes the set point temperatures for the
-supply and return temperature of a heating system.
+supply and return water temperature.
 The set point for the room air temperature can either be specified
 by a parameter, or it can be an input to the model. The latter allows
 to use this model with systems that have night set back.
 </p>
 <p>
-The parameter <code>dTOutHeaBal</code> can be used to shift the heating curve
+If used to reset the temperature in a heating system,
+the parameter <code>dTOutHeaBal</code> can be used to shift the heating curve
 to take into account that heat gains from solar, equipment and people
 make up for some of the transmission losses.
 For example, in energy efficient houses, the heating may not be switched on if
@@ -85,6 +86,13 @@ shift the heating curve.
 </html>", revisions="<html>
 <ul>
 <li>
+January 03, 2020, by Jianjun Hu:<br/>
+Changed name from <code>HotWaterTemperatureReset</code> to 
+<code>SupplyReturnTemperatureReset</code>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1273\">#1273</a>.
+</li>
+<li>
 May 29, 2014, by Michael Wetter:<br/>
 Removed undesirable annotation <code>Evaluate=true</code>.
 </li>
@@ -141,4 +149,4 @@ First implementation.
           extent={{42,-30},{92,-80}},
           lineColor={0,0,127},
           textString="TRet")}));
-end HotWaterTemperatureReset;
+end SupplyReturnTemperatureReset;
diff --git a/AixLib/Controls/SetPoints/package.mo b/AixLib/Controls/SetPoints/package.mo
index f4b5079d76..eaa4fa3051 100644
--- a/AixLib/Controls/SetPoints/package.mo
+++ b/AixLib/Controls/SetPoints/package.mo
@@ -1,7 +1,6 @@
 within AixLib.Controls;
 package SetPoints "Package with models for control set points"
   extends Modelica.Icons.VariantsPackage;
-
 annotation (preferredView="info", Documentation(info="<html>
 This package contains component models to compute set points of control systems.
 For additional models, see also
diff --git a/AixLib/Controls/SetPoints/package.order b/AixLib/Controls/SetPoints/package.order
index 9500eb8cec..89adda772b 100644
--- a/AixLib/Controls/SetPoints/package.order
+++ b/AixLib/Controls/SetPoints/package.order
@@ -1,6 +1,6 @@
 HeatingCurve
-HotWaterTemperatureReset
 OccupancySchedule
+SupplyReturnTemperatureReset
 Table
 Functions
 Examples
diff --git a/AixLib/Controls/package.mo b/AixLib/Controls/package.mo
index a3fd901085..5ccc75dcb0 100644
--- a/AixLib/Controls/package.mo
+++ b/AixLib/Controls/package.mo
@@ -1,7 +1,6 @@
 within AixLib;
 package Controls "Package with models for controls"
   extends Modelica.Icons.Package;
-
 annotation (
 preferredView="info", Documentation(info="<html>
 This package contains component models for controls.
diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/package.order b/AixLib/DataBase/Pumps/PumpPolynomialBased/package.order
index 10a1c5ba75..0c3ff80275 100644
--- a/AixLib/DataBase/Pumps/PumpPolynomialBased/package.order
+++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/package.order
@@ -1,26 +1,27 @@
+Examples
 PumpBaseRecord
-Pump_DN32
-Pump_DN40
-Pump_DN50
-Pump_DN65
 Pump_DN100
-Pump_DN200
-Pump_DN40_H1_45
-Pump_DN50_H1_38
-Pump_DN65_H1_17
 Pump_DN100_H1_17
+Pump_DN200
 Pump_DN25_H1_4_V3
 Pump_DN25_H1_6_V4
 Pump_DN25_H1_6_V8
 Pump_DN25_H1_8_V9
 Pump_DN30_H1_12_V13
-Pump_DN40_H1_8_V17
+Pump_DN32
+Pump_DN40
+Pump_DN40_H10
 Pump_DN40_H1_12_V24
 Pump_DN40_H1_16_V29
+Pump_DN40_H1_45
+Pump_DN40_H1_8_V17
+Pump_DN50
+Pump_DN50_H10
+Pump_DN50_H1_38
 Pump_DN50_H1_9_V29
+Pump_DN65
+Pump_DN65_H15
 Pump_DN65_H1_12_V48
 Pump_DN65_H1_16_V26
-Pump_DN40_H10
-Pump_DN50_H10
-Pump_DN65_H15
+Pump_DN65_H1_17
 Examples
diff --git a/AixLib/DataBase/ThermalMachines/Chiller/package.order b/AixLib/DataBase/ThermalMachines/Chiller/package.order
index 66cff3602b..b9194b4ef6 100644
--- a/AixLib/DataBase/ThermalMachines/Chiller/package.order
+++ b/AixLib/DataBase/ThermalMachines/Chiller/package.order
@@ -1,3 +1,3 @@
 ChillerBaseDataDefinition
-PerformanceData
 EN14511
+PerformanceData
diff --git a/AixLib/DataBase/ThermalMachines/HeatPump/package.order b/AixLib/DataBase/ThermalMachines/HeatPump/package.order
index 5518c53da9..e27a59356a 100644
--- a/AixLib/DataBase/ThermalMachines/HeatPump/package.order
+++ b/AixLib/DataBase/ThermalMachines/HeatPump/package.order
@@ -1,5 +1,5 @@
-HeatPumpBaseDataDefinition
-PerformanceData
 EN14511
 EN255
 Functions
+PerformanceData
+HeatPumpBaseDataDefinition
diff --git a/AixLib/Fluid/Actuators/BaseClasses/ActuatorSignal.mo b/AixLib/Fluid/Actuators/BaseClasses/ActuatorSignal.mo
index c5d34bf2f9..4e77020bd4 100644
--- a/AixLib/Fluid/Actuators/BaseClasses/ActuatorSignal.mo
+++ b/AixLib/Fluid/Actuators/BaseClasses/ActuatorSignal.mo
@@ -42,7 +42,8 @@ protected
      final y_start=y_start,
      final analogFilter=Modelica.Blocks.Types.AnalogFilter.CriticalDamping,
      final filterType=Modelica.Blocks.Types.FilterType.LowPass,
-     x(each stateSelect=StateSelect.always)) if
+     x(each stateSelect=StateSelect.always,
+       each start=0)) if
         use_inputFilter
     "Second order filter to approximate valve opening time, and to improve numerics"
     annotation (Placement(transformation(extent={{6,81},{20,95}})));
@@ -72,13 +73,13 @@ equation
           points={{0,70},{40,70}}),
         Rectangle(
           visible=use_inputFilter,
-          extent={{-32,40},{32,100}},
+          extent={{-30,40},{30,100}},
           lineColor={0,0,0},
           fillColor={135,135,135},
           fillPattern=FillPattern.Solid),
         Ellipse(
           visible=use_inputFilter,
-          extent={{-32,100},{32,40}},
+          extent={{-30,100},{30,40}},
           lineColor={0,0,0},
           fillColor={135,135,135},
           fillPattern=FillPattern.Solid),
@@ -111,6 +112,17 @@ for a description of the filter.
 </html>", revisions="<html>
 <ul>
 <li>
+November 14, 2019, by Michael Wetter:<br/>
+Set <code>start</code> attribute for <code>filter.x</code>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1252\">#1252</a>.
+</li>
+<li>
+October 25, 2019, by Jianjun Hu:<br/>
+Improved icon graphics annotation. This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1225\">#1225</a>.
+</li>
+<li>
 February 16, 2018, by Filip Jorissen:<br/>
 Propagated parameter <code>order</code>.<br/>
 This is for
diff --git a/AixLib/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo b/AixLib/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo
index e489bce485..d24c5ce094 100644
--- a/AixLib/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo
+++ b/AixLib/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo
@@ -9,7 +9,6 @@ partial model PartialThreeWayValve "Partial three way valve"
           deltaM=deltaM,
           dp(start=dpValve_nominal/2),
           from_dp=from_dp,
-          final l=l[1],
           final linearized=linearized[1],
           final homotopyInitialization=homotopyInitialization,
           final CvData=AixLib.Fluid.Types.CvTypes.OpPoint,
@@ -25,7 +24,6 @@ partial model PartialThreeWayValve "Partial three way valve"
           deltaM=deltaM,
           dp(start=dpValve_nominal/2),
           from_dp=from_dp,
-          final l=l[2],
           final linearized=linearized[2],
           final homotopyInitialization=homotopyInitialization,
           final CvData=AixLib.Fluid.Types.CvTypes.OpPoint,
@@ -69,79 +67,54 @@ equation
                      color={0,0,127}));
   annotation (Icon(coordinateSystem(preserveAspectRatio=true,  extent={{-100,
             -100},{100,100}}), graphics={
-        Line(
-          points={{0,70},{40,70}}),
-        Rectangle(
-          extent={{-100,44},{100,-36}},
-          lineColor={0,0,0},
-          fillPattern=FillPattern.HorizontalCylinder,
-          fillColor={192,192,192}),
-        Rectangle(
-          extent={{-100,26},{100,-20}},
-          lineColor={0,0,0},
-          fillPattern=FillPattern.HorizontalCylinder,
-          fillColor={0,127,255}),
-        Polygon(
-          points={{0,2},{-78,64},{-78,-56},{0,2}},
-          lineColor={0,0,0},
-          fillColor={0,0,0},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{-68,56},{0,2},{56,44},{76,60},{-68,56}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{-56,-40},{0,2},{56,44},{60,-40},{-56,-40}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{0,2},{82,64},{82,-54},{0,2}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-24,-56},{24,-100}},
-          lineColor={0,0,0},
-          fillPattern=FillPattern.VerticalCylinder,
-          fillColor={192,192,192}),
-        Rectangle(
-          extent={{-14,-56},{14,-100}},
-          lineColor={0,0,0},
-          fillPattern=FillPattern.VerticalCylinder,
-          fillColor={0,127,255}),
-        Polygon(
-          points={{0,2},{62,-80},{-58,-80},{0,2}},
-          lineColor={0,0,0},
-          fillColor={0,0,0},
-          fillPattern=FillPattern.Solid),
-        Line(
-          points={{-30,46},{30,46}}),
-        Line(
-          points={{0,100},{0,-2}}),
-        Rectangle(
-          visible=use_inputFilter,
-          extent={{-36,36},{36,100}},
-          lineColor={0,0,0},
-          fillColor={135,135,135},
-          fillPattern=FillPattern.Solid),
-        Ellipse(
-          visible=use_inputFilter,
-          extent={{-36,100},{36,36}},
-          lineColor={0,0,0},
-          fillColor={135,135,135},
-          fillPattern=FillPattern.Solid),
-        Text(
-          visible=use_inputFilter,
-          extent={{-22,92},{20,46}},
-          lineColor={0,0,0},
-          fillColor={135,135,135},
-          fillPattern=FillPattern.Solid,
-          textString="M",
-          textStyle={TextStyle.Bold})}),
+    Rectangle(
+      extent={{-100,40},{100,-40}},
+      lineColor={0,0,0},
+      fillPattern=FillPattern.HorizontalCylinder,
+      fillColor={192,192,192}),
+    Rectangle(
+      extent={{-100,22},{100,-22}},
+      lineColor={0,0,0},
+      fillPattern=FillPattern.HorizontalCylinder,
+      fillColor={0,127,255}),
+    Rectangle(
+      extent={{-60,40},{60,-40}},
+      fillColor={255,255,255},
+      fillPattern=FillPattern.Solid,
+      pattern=LinePattern.None),
+    Polygon(
+      points={{0,0},{-76,60},{-76,-60},{0,0}},
+      lineColor={0,0,0},
+      fillColor={0,0,0},
+      fillPattern=FillPattern.Solid),
+    Polygon(
+      points={{0,0},{76,60},{76,-60},{0,0}},
+      lineColor={0,0,0},
+      fillColor={255,255,255},
+      fillPattern=FillPattern.Solid),
+    Rectangle(
+      extent={{-40,-56},{40,-100}},
+      lineColor={0,0,0},
+      fillPattern=FillPattern.VerticalCylinder,
+      fillColor={192,192,192}),
+    Rectangle(
+      extent={{-22,-56},{22,-100}},
+      lineColor={0,0,0},
+      fillPattern=FillPattern.VerticalCylinder,
+      fillColor={0,127,255}),
+    Polygon(
+      points={{0,0},{60,-76},{-60,-76},{0,0}},
+      lineColor={0,0,0},
+      fillColor={0,0,0},
+      fillPattern=FillPattern.Solid),
+    Line(
+      visible=use_inputFilter,
+      points={{-30,40},{30,40}}),
+            Line(
+      points={{0,40},{0,0}}),
+    Line(
+      visible=not use_inputFilter,
+      points={{0,100},{0,40}})}),
     Documentation(info="<html>
 <p>
 Partial model of a three way valve. This is the base model for valves
@@ -172,6 +145,19 @@ for details regarding the valve implementation.
 </html>", revisions="<html>
 <ul>
 <li>
+November 5, 2019, by Michael Wetter:<br/>
+Moved assignment of leakage from <a href=\"modelica://AixLib.Fluid.Actuators.BaseClasses.PartialThreeWayValve\">
+AixLib.Fluid.Actuators.BaseClasses.PartialThreeWayValve</a>
+to the parent classes.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1227\">#1227</a>.
+</li>
+<li>
+October 25, 2019, by Jianjun Hu:<br/>
+Improved icon graphics annotation. This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1225\">#1225</a>.
+</li>
+<li>
 March 24, 2017, by Michael Wetter:<br/>
 Renamed <code>filteredInput</code> to <code>use_inputFilter</code>.<br/>
 This is for
diff --git a/AixLib/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo b/AixLib/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo
index c4cd3cec65..4c3c3162fa 100644
--- a/AixLib/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo
+++ b/AixLib/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo
@@ -28,37 +28,30 @@ partial model PartialTwoWayValve "Partial model for a two way valve"
 initial equation
   assert(dpFixed_nominal > -Modelica.Constants.eps, "Require dpFixed_nominal >= 0. Received dpFixed_nominal = "
         + String(dpFixed_nominal) + " Pa.");
-equation
-  assert(phi > -0.2, "Valve control signal needs to be bigger than zero, received phi = " + String(phi));
   annotation (Icon(coordinateSystem(preserveAspectRatio=true,  extent={{-100,-100},
-            {100,100}}),       graphics={
-        Polygon(
-          points={{2,-2},{-76,60},{-76,-60},{2,-2}},
-          lineColor={0,0,0},
-          fillColor={0,0,0},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{-50,40},{0,-2},{54,40},{54,40},{-50,40}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{-52,-42},{0,-4},{60,40},{60,-42},{-52,-42}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{0,-2},{82,60},{82,-60},{0,-2}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Line(
-          points={{0,40},{0,-4}}),
-        Line(
-          visible=not use_inputFilter,
-          points={{0,100},{0,40}})}),
+            {100,100}}),       graphics={Rectangle(
+      extent={{-60,40},{60,-40}},
+      fillColor={255,255,255},
+      fillPattern=FillPattern.Solid,
+      pattern=LinePattern.None),
+    Polygon(
+      points={{0,0},{-76,60},{-76,-60},{0,0}},
+      lineColor={0,0,0},
+      fillColor={0,0,0},
+      fillPattern=FillPattern.Solid),
+    Polygon(
+      points={{0,-0},{76,60},{76,-60},{0,0}},
+      lineColor={0,0,0},
+      fillColor={255,255,255},
+      fillPattern=FillPattern.Solid),
+    Line(
+      visible=use_inputFilter,
+      points={{-30,40},{30,40}}),
+    Line(
+      points={{0,40},{0,0}}),
+    Line(
+      visible=not use_inputFilter,
+      points={{0,100},{0,40}})}),
 Documentation(info="<html>
 <p>
 Partial model for a two way valve. This is the base model for valves
@@ -102,6 +95,19 @@ each valve opening characteristics has different parameters.
 revisions="<html>
 <ul>
 <li>
+November 9, 2019, by Filip Jorissen:<br/>
+Removed assert for <code>phi>-0.2</code>
+since the valve control input is now lower limited
+to zero.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1223\">
+issue 1223</a>.
+</li>
+<li>
+October 25, 2019, by Jianjun Hu:<br/>
+Improved icon graphics annotation. This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1225\">#1225</a>.
+</li>
+<li>
 March 24, 2017, by Michael Wetter:<br/>
 Renamed <code>filteredInput</code> to <code>use_inputFilter</code>.<br/>
 This is for
diff --git a/AixLib/Fluid/Actuators/BaseClasses/PartialTwoWayValveKv.mo b/AixLib/Fluid/Actuators/BaseClasses/PartialTwoWayValveKv.mo
index f18b773dd8..438c7dbc66 100644
--- a/AixLib/Fluid/Actuators/BaseClasses/PartialTwoWayValveKv.mo
+++ b/AixLib/Fluid/Actuators/BaseClasses/PartialTwoWayValveKv.mo
@@ -36,35 +36,7 @@ equation
       end if;
     end if; // homotopyInitialization
  end if; // linearized
-  annotation (Icon(coordinateSystem(preserveAspectRatio=true,  extent={{-100,-100},
-            {100,100}}),       graphics={
-        Polygon(
-          points={{2,-2},{-76,60},{-76,-60},{2,-2}},
-          lineColor={0,0,0},
-          fillColor={0,0,0},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{-50,40},{0,-2},{54,40},{54,40},{-50,40}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{-52,-42},{0,-4},{60,40},{60,-42},{-52,-42}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{0,-2},{82,60},{82,-60},{0,-2}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Line(
-          points={{0,40},{0,-4}}),
-        Line(
-          visible=not use_inputFilter,
-          points={{0,100},{0,40}})}),
+  annotation (
 Documentation(info="<html>
 <p>
 Partial model for valves with different opening characteristics,
@@ -85,6 +57,11 @@ AixLib.Fluid.Actuators.Valves.TwoWayLinear</a>.
 revisions="<html>
 <ul>
 <li>
+October 25, 2019, by Jianjun Hu:<br/>
+Removed icon graphics annotation. This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1225\">#1225</a>.
+</li>
+<li>
 March 24, 2017, by Michael Wetter:<br/>
 Renamed <code>filteredInput</code> to <code>use_inputFilter</code>.<br/>
 This is for
diff --git a/AixLib/Fluid/Actuators/Dampers/Examples/package.mo b/AixLib/Fluid/Actuators/Dampers/Examples/package.mo
index 7ed165ab41..6189bf3c0c 100644
--- a/AixLib/Fluid/Actuators/Dampers/Examples/package.mo
+++ b/AixLib/Fluid/Actuators/Dampers/Examples/package.mo
@@ -1,7 +1,6 @@
 within AixLib.Fluid.Actuators.Dampers;
 package Examples "Collection of models that illustrate model use and test models"
   extends Modelica.Icons.ExamplesPackage;
-
 annotation (preferredView="info", Documentation(info="<html>
 <p>
 This package contains examples for the use of models that can be found in
diff --git a/AixLib/Fluid/Actuators/Motors/Examples/package.mo b/AixLib/Fluid/Actuators/Motors/Examples/package.mo
index 337a069107..9adcecac32 100644
--- a/AixLib/Fluid/Actuators/Motors/Examples/package.mo
+++ b/AixLib/Fluid/Actuators/Motors/Examples/package.mo
@@ -1,7 +1,6 @@
 within AixLib.Fluid.Actuators.Motors;
 package Examples "Collection of models that illustrate model use and test models"
   extends Modelica.Icons.ExamplesPackage;
-
 annotation (preferredView="info", Documentation(info="<html>
 <p>
 This package contains examples for the use of models that can be found in
diff --git a/AixLib/Fluid/Actuators/Motors/package.mo b/AixLib/Fluid/Actuators/Motors/package.mo
index 0fc6476b61..93ee5ea686 100644
--- a/AixLib/Fluid/Actuators/Motors/package.mo
+++ b/AixLib/Fluid/Actuators/Motors/package.mo
@@ -1,7 +1,6 @@
 within AixLib.Fluid.Actuators;
 package Motors "Package with motor models for valves and dampers"
   extends Modelica.Icons.VariantsPackage;
-
 annotation (preferredView="info", Documentation(info="<html>
 This package contains component models for motors that may be
 used with the actuator models in
diff --git a/AixLib/Fluid/Actuators/Valves/Examples/package.mo b/AixLib/Fluid/Actuators/Valves/Examples/package.mo
index 6ad65c0c5d..2515883026 100644
--- a/AixLib/Fluid/Actuators/Valves/Examples/package.mo
+++ b/AixLib/Fluid/Actuators/Valves/Examples/package.mo
@@ -1,7 +1,6 @@
 within AixLib.Fluid.Actuators.Valves;
 package Examples "Collection of models that illustrate model use and test models"
   extends Modelica.Icons.ExamplesPackage;
-
 annotation (preferredView="info", Documentation(info="<html>
 <p>
 This package contains examples for the use of models that can be found in
diff --git a/AixLib/Fluid/Actuators/Valves/ExpansionValves/Examples/package.order b/AixLib/Fluid/Actuators/Valves/ExpansionValves/Examples/package.order
index c56bd9a36a..adb4f6831d 100644
--- a/AixLib/Fluid/Actuators/Valves/ExpansionValves/Examples/package.order
+++ b/AixLib/Fluid/Actuators/Valves/ExpansionValves/Examples/package.order
@@ -3,3 +3,4 @@ ExpansionValvePressureDifference
 ModularExpansionValvesMassFlowRate
 ModularExpansionValvesPressureDifference
 StaticHeatPumpBoundaries
+StaticHeatPumpBoundaries
diff --git a/AixLib/Fluid/Actuators/Valves/ExpansionValves/Utilities/FlowCoefficient/SpecifiedFlowCoefficients/package.order b/AixLib/Fluid/Actuators/Valves/ExpansionValves/Utilities/FlowCoefficient/SpecifiedFlowCoefficients/package.order
index 4ac88f96a9..419add5635 100644
--- a/AixLib/Fluid/Actuators/Valves/ExpansionValves/Utilities/FlowCoefficient/SpecifiedFlowCoefficients/package.order
+++ b/AixLib/Fluid/Actuators/Valves/ExpansionValves/Utilities/FlowCoefficient/SpecifiedFlowCoefficients/package.order
@@ -1,8 +1,8 @@
-ConstantFlowCoefficient
-Buck_R22R407CR410A_EEV_16_18
 Buck_R22R407CR410A_EEV_15_22
-Power_R134a_EEV_15
+Buck_R22R407CR410A_EEV_16_18
+ConstantFlowCoefficient
 Poly_R22R407CR410A_EEV_15_22
 Poly_R22_EEV_16
 Poly_R407c_EEV_18
 Poly_R410a_EEV_18
+Power_R134a_EEV_15
diff --git a/AixLib/Fluid/Actuators/Valves/ThreeWayEqualPercentageLinear.mo b/AixLib/Fluid/Actuators/Valves/ThreeWayEqualPercentageLinear.mo
index b8bea949a2..a2f8457453 100644
--- a/AixLib/Fluid/Actuators/Valves/ThreeWayEqualPercentageLinear.mo
+++ b/AixLib/Fluid/Actuators/Valves/ThreeWayEqualPercentageLinear.mo
@@ -2,8 +2,12 @@ within AixLib.Fluid.Actuators.Valves;
 model ThreeWayEqualPercentageLinear
   "Three way valve with equal percentage and linear characteristics"
     extends BaseClasses.PartialThreeWayValve(
-      redeclare TwoWayEqualPercentage res1(R=R, delta0=delta0),
-      redeclare TwoWayLinear res3);
+      redeclare TwoWayEqualPercentage res1(
+        R=R,
+        delta0=delta0,
+        final l=l[1]),
+      redeclare TwoWayLinear res3(
+        final l=l[2]));
   parameter Real R = 50 "Rangeability, R=50...100 typically";
   parameter Real delta0 = 0.01
     "Range of significant deviation from equal percentage law";
@@ -52,6 +56,14 @@ for the implementation of the regularization near the origin.
 revisions="<html>
 <ul>
 <li>
+November 5, 2019, by Michael Wetter:<br/>
+Moved assignment of leakage from <a href=\"modelica://AixLib.Fluid.Actuators.BaseClasses.PartialThreeWayValve\">
+AixLib.Fluid.Actuators.BaseClasses.PartialThreeWayValve</a>
+to the parent classes.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1227\">#1227</a>.
+</li>
+<li>
 February 20, 2012 by Michael Wetter:<br/>
 Renamed parameter <code>dp_nominal</code> to <code>dpValve_nominal</code>,
 and added new parameter <code>dpFixed_nominal</code>.
diff --git a/AixLib/Fluid/Actuators/Valves/ThreeWayLinear.mo b/AixLib/Fluid/Actuators/Valves/ThreeWayLinear.mo
index 8fb5ea6eec..158a6eb19a 100644
--- a/AixLib/Fluid/Actuators/Valves/ThreeWayLinear.mo
+++ b/AixLib/Fluid/Actuators/Valves/ThreeWayLinear.mo
@@ -1,8 +1,10 @@
 within AixLib.Fluid.Actuators.Valves;
 model ThreeWayLinear "Three way valve with linear characteristics"
     extends BaseClasses.PartialThreeWayValve(
-      redeclare TwoWayLinear res1,
-      redeclare TwoWayLinear res3);
+      redeclare TwoWayLinear res1(
+        final l=l[1]),
+      redeclare TwoWayLinear res3(
+        final l=l[2]));
 
 equation
   connect(inv.y, res3.y) annotation (Line(points={{-62.6,46},{20,46},{20,-50},{
@@ -36,6 +38,14 @@ for the implementation of the regularization near the origin.
 revisions="<html>
 <ul>
 <li>
+November 5, 2019, by Michael Wetter:<br/>
+Moved assignment of leakage from <a href=\"modelica://AixLib.Fluid.Actuators.BaseClasses.PartialThreeWayValve\">
+AixLib.Fluid.Actuators.BaseClasses.PartialThreeWayValve</a>
+to the parent classes.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1227\">#1227</a>.
+</li>
+<li>
 February 20, 2012 by Michael Wetter:<br/>
 Renamed parameter <code>dp_nominal</code> to <code>dpValve_nominal</code>,
 and added new parameter <code>dpFixed_nominal</code>.
diff --git a/AixLib/Fluid/Actuators/Valves/TwoWayEqualPercentage.mo b/AixLib/Fluid/Actuators/Valves/TwoWayEqualPercentage.mo
index 1b9c039c72..5631afa0cb 100644
--- a/AixLib/Fluid/Actuators/Valves/TwoWayEqualPercentage.mo
+++ b/AixLib/Fluid/Actuators/Valves/TwoWayEqualPercentage.mo
@@ -1,7 +1,8 @@
 within AixLib.Fluid.Actuators.Valves;
 model TwoWayEqualPercentage
   "Two way valve with equal percentage flow characteristics"
-  extends BaseClasses.PartialTwoWayValveKv(phi=if homotopyInitialization then
+  extends BaseClasses.PartialTwoWayValveKv(
+    phi=max(0, if homotopyInitialization then
         homotopy(actual=AixLib.Fluid.Actuators.BaseClasses.equalPercentage(
         y_actual,
         R,
@@ -11,7 +12,7 @@ model TwoWayEqualPercentage
         y_actual,
         R,
         l,
-        delta0));
+        delta0)));
   parameter Real R=50 "Rangeability, R=50...100 typically";
   parameter Real delta0=0.01
     "Range of significant deviation from equal percentage law";
@@ -39,6 +40,14 @@ as the regularization near the origin.
 </html>", revisions="<html>
 <ul>
 <li>
+November 9, 2019, by Filip Jorissen:<br/>
+Guarded the computation of <code>phi</code> using
+<code>max(0, . )</code> to avoid
+negative phi.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1223\">
+issue 1223</a>.
+</li>
+<li>
 April 4, 2014, by Michael Wetter:<br/>
 Moved the assignment of the flow function <code>phi</code>
 to the model instantiation because in its base class,
diff --git a/AixLib/Fluid/Actuators/Valves/TwoWayLinear.mo b/AixLib/Fluid/Actuators/Valves/TwoWayLinear.mo
index bb40014637..4ea7ba1cc1 100644
--- a/AixLib/Fluid/Actuators/Valves/TwoWayLinear.mo
+++ b/AixLib/Fluid/Actuators/Valves/TwoWayLinear.mo
@@ -1,6 +1,6 @@
 within AixLib.Fluid.Actuators.Valves;
 model TwoWayLinear "Two way valve with linear flow characteristics"
-  extends BaseClasses.PartialTwoWayValveKv(phi=l + y_actual*(1 - l));
+  extends BaseClasses.PartialTwoWayValveKv(phi=max(0, l + y_actual*(1 - l)));
 
 initial equation
   // Since the flow model AixLib.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow computes
@@ -22,6 +22,14 @@ as the regularization near the origin.
 revisions="<html>
 <ul>
 <li>
+November 9, 2019, by Filip Jorissen:<br/>
+Guarded the computation of <code>phi</code> using
+<code>max(0, . )</code> to avoid
+negative phi.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1223\">
+issue 1223</a>.
+</li>
+<li>
 April 4, 2014, by Michael Wetter:<br/>
 Moved the assignment of the flow function <code>phi</code>
 to the model instantiation because in its base class,
diff --git a/AixLib/Fluid/Actuators/Valves/TwoWayPolynomial.mo b/AixLib/Fluid/Actuators/Valves/TwoWayPolynomial.mo
index ca9f7e99f9..b8d4d0ca82 100644
--- a/AixLib/Fluid/Actuators/Valves/TwoWayPolynomial.mo
+++ b/AixLib/Fluid/Actuators/Valves/TwoWayPolynomial.mo
@@ -1,7 +1,7 @@
 within AixLib.Fluid.Actuators.Valves;
 model TwoWayPolynomial "Two way valve with polynomial characteristic"
   extends AixLib.Fluid.Actuators.BaseClasses.PartialTwoWayValveKv(
-    phi=l + pol_y*(1 - l));
+    phi=max(0, l + pol_y*(1 - l)));
 
   parameter Real[:] c
     "Polynomial coefficients, starting with fixed offset";
@@ -51,6 +51,14 @@ as the regularization near the origin.
 revisions="<html>
 <ul>
 <li>
+November 9, 2019, by Filip Jorissen:<br/>
+Guarded the computation of <code>phi</code> using
+<code>max(0, . )</code> to avoid
+negative phi.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1223\">
+issue 1223</a>.
+</li>
+<li>
 September 30, 2017 by Filip Jorissen:<br/>
 First implementation.
 </li>
diff --git a/AixLib/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo b/AixLib/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo
index 49fcd7d220..cf6bfb9484 100644
--- a/AixLib/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo
+++ b/AixLib/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo
@@ -3,7 +3,7 @@ model TwoWayPressureIndependent "Model of a pressure-independent two way valve"
   extends AixLib.Fluid.Actuators.BaseClasses.PartialTwoWayValve(
             final linearized = false,
             from_dp=true,
-            phi=l + y_actual*(1 - l));
+            phi=max(0, l + y_actual*(1 - l)));
 
   parameter Real l2(min=1e-10) = 0.01
     "Gain for mass flow increase if pressure is above nominal pressure"
@@ -150,35 +150,6 @@ equation
     end if;
   end if;
   annotation (defaultComponentName="val",
-  Icon(coordinateSystem(preserveAspectRatio=true,  extent={{-100,-100},
-            {100,100}}),       graphics={
-        Polygon(
-          points={{2,-2},{-76,60},{-76,-60},{2,-2}},
-          lineColor={0,0,0},
-          fillColor={0,0,0},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{-50,40},{0,-2},{54,40},{54,40},{-50,40}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{-52,-42},{0,-4},{60,40},{60,-42},{-52,-42}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{0,-2},{82,60},{82,-60},{0,-2}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Line(
-          points={{0,40},{0,-4}}),
-        Line(
-          visible=not use_inputFilter,
-          points={{0,100},{0,40}})}),
 Documentation(info="<html>
 <p>
 Two way valve with a pressure-independent valve opening characteristic.
@@ -249,6 +220,19 @@ can serve both puroposes.
 revisions="<html>
 <ul>
 <li>
+November 9, 2019, by Filip Jorissen:<br/>
+Guarded the computation of <code>phi</code> using
+<code>max(0, . )</code> to avoid
+negative phi.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1223\">
+issue 1223</a>.
+</li>
+<li>
+October 25, 2019, by Jianjun Hu:<br/>
+Removed icon graphics annotation. This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1225\">#1225</a>.
+</li>
+<li>
 April 14, 2017, by Filip Jorissen:<br/>
 Revised implementation using <code>cubicHermite</code>
 such that it does not have a local maximum
diff --git a/AixLib/Fluid/Actuators/Valves/TwoWayQuickOpening.mo b/AixLib/Fluid/Actuators/Valves/TwoWayQuickOpening.mo
index 1dcf7a610f..af51be5930 100644
--- a/AixLib/Fluid/Actuators/Valves/TwoWayQuickOpening.mo
+++ b/AixLib/Fluid/Actuators/Valves/TwoWayQuickOpening.mo
@@ -1,15 +1,18 @@
 within AixLib.Fluid.Actuators.Valves;
 model TwoWayQuickOpening
   "Two way valve with quick opening flow characteristics"
-  extends BaseClasses.PartialTwoWayValveKv(phi=if homotopyInitialization then
-        homotopy(actual=l + Modelica.Fluid.Utilities.regPow(
-        y_actual,
-        alpInv,
-        delta0)*(1 - l), simplified=l + y_actual*(1 - l)) else l +
-        Modelica.Fluid.Utilities.regPow(
-        y_actual,
-        alpInv,
-        delta0)*(1 - l));
+  extends BaseClasses.PartialTwoWayValveKv(
+    phi=max(0,
+         if homotopyInitialization then
+           homotopy(
+             actual=l + Modelica.Fluid.Utilities.regPow(
+               y_actual,
+               alpInv,
+               delta0)*(1 - l),
+             simplified=l + y_actual*(1 - l))
+          else
+            l + Modelica.Fluid.Utilities.regPow(y_actual, alpInv, delta0)*(1 - l)));
+
   parameter Real alp = 2 "Parameter for valve characteristics, alp>0";
   parameter Real delta0 = 0.01 "Range of significant deviation from power law";
 protected
@@ -36,6 +39,14 @@ as the regularization near the origin.
 revisions="<html>
 <ul>
 <li>
+November 9, 2019, by Filip Jorissen:<br/>
+Guarded the computation of <code>phi</code> using
+<code>max(0, . )</code> to avoid
+negative phi.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1223\">
+issue 1223</a>.
+</li>
+<li>
 April 4, 2014, by Michael Wetter:<br/>
 Moved the assignment of the flow function <code>phi</code>
 to the model instantiation because in its base class,
diff --git a/AixLib/Fluid/Actuators/Valves/TwoWayTable.mo b/AixLib/Fluid/Actuators/Valves/TwoWayTable.mo
index d8916cdc88..b8e87f2e8a 100644
--- a/AixLib/Fluid/Actuators/Valves/TwoWayTable.mo
+++ b/AixLib/Fluid/Actuators/Valves/TwoWayTable.mo
@@ -1,7 +1,7 @@
 within AixLib.Fluid.Actuators.Valves;
 model TwoWayTable "Two way valve with table-specified flow characteristics"
   extends BaseClasses.PartialTwoWayValveKv(
-    phi=phiLooUp.y[1],
+    phi=max(0, phiLooUp.y[1]),
     final l = phiLooUp.table[1, 2]);
   parameter Data.Generic flowCharacteristics "Table with flow characteristics"
     annotation (choicesAllMatching=true, Placement(transformation(extent={{-80,
@@ -131,6 +131,14 @@ AixLib.Fluid.Actuators.Valves.Examples.TwoWayValveTable</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+November 9, 2019, by Filip Jorissen:<br/>
+Guarded the computation of <code>phi</code> using
+<code>max(0, . )</code> to avoid
+negative phi.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1223\">
+issue 1223</a>.
+</li>
+<li>
 January 26, 2016, by Michael Wetter:<br/>
 Removed equality comparison for <code>Real</code> in the
 <code>assert</code> statements as this is not allowed in Modelica.
diff --git a/AixLib/Fluid/Actuators/Valves/Validation/package.mo b/AixLib/Fluid/Actuators/Valves/Validation/package.mo
index 94911a046b..d423fe4f32 100644
--- a/AixLib/Fluid/Actuators/Valves/Validation/package.mo
+++ b/AixLib/Fluid/Actuators/Valves/Validation/package.mo
@@ -1,3 +1,4 @@
+
 within AixLib.Fluid.Actuators.Valves;
 package Validation "Collection of validation models"
   extends Modelica.Icons.ExamplesPackage;
diff --git a/AixLib/Fluid/Actuators/Valves/package.mo b/AixLib/Fluid/Actuators/Valves/package.mo
index 14db02eeda..8688510af9 100644
--- a/AixLib/Fluid/Actuators/Valves/package.mo
+++ b/AixLib/Fluid/Actuators/Valves/package.mo
@@ -1,7 +1,6 @@
 within AixLib.Fluid.Actuators;
 package Valves "Package with valve models"
   extends Modelica.Icons.VariantsPackage;
-
 annotation (preferredView="info", Documentation(info="<html>
 This package contains component models for two- and three-way valves.
 For motor models, see
diff --git a/AixLib/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mo b/AixLib/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mo
index ec253e5e5d..c5f078d31d 100644
--- a/AixLib/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mo
+++ b/AixLib/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mo
@@ -18,7 +18,7 @@ equation
   dp = time*gain;
   m_flow = AixLib.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp(
     dp=dp,
-    k = k,
+    k=  k,
     m_flow_turbulent=m_flow_turbulent);
   der(m_flow) = der(m_flow_comp);
   err = m_flow-m_flow_comp;
diff --git a/AixLib/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mo b/AixLib/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mo
index 3f1f1cb2d3..ed98345a87 100644
--- a/AixLib/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mo
+++ b/AixLib/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mo
@@ -26,7 +26,7 @@ equation
 
   m_flow = AixLib.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp(
     dp=dp,
-    k = k,
+    k=  k,
     m_flow_turbulent=m_flow_turbulent);
 
   // Equate first and second order derivatives
diff --git a/AixLib/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mo b/AixLib/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mo
index 3db8bf43d4..a57081f9c4 100644
--- a/AixLib/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mo
+++ b/AixLib/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mo
@@ -18,7 +18,7 @@ equation
   m_flow = time*gain;
   dp = AixLib.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow(
     m_flow=m_flow,
-    k = k,
+    k=  k,
     m_flow_turbulent=m_flow_turbulent);
   der(dp) = der(dp_comp);
   err = dp-dp_comp;
diff --git a/AixLib/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo b/AixLib/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo
index 9b71299537..c38ad3e6ac 100644
--- a/AixLib/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo
+++ b/AixLib/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo
@@ -18,9 +18,9 @@ protected
   Real dpNormSq=dpNorm^2
     "Square of normalised pressure difference";
 algorithm
-   m_flow :=  if noEvent(abs(dp)>dp_turbulent)
-              then sign(dp)*k*sqrt(abs(dp))
-              else (1.40625  + (0.15625*dpNormSq - 0.5625)*dpNormSq)*m_flow_turbulent*dpNorm;
+   m_flow := smooth(2, if noEvent(abs(dp)>dp_turbulent)
+               then sign(dp)*k*sqrt(abs(dp))
+               else (1.40625  + (0.15625*dpNormSq - 0.5625)*dpNormSq)*m_flow_turbulent*dpNorm);
   annotation(Inline=false,
            smoothOrder=2,
            derivative(order=1, zeroDerivative=k, zeroDerivative=m_flow_turbulent)=
@@ -57,6 +57,12 @@ The input <code>m_flow_turbulent</code> determines the location of the regulariz
 </html>", revisions="<html>
 <ul>
 <li>
+November 9, 2019, by Filip Jorissen:<br/>
+Added <code>smooth(2, . )</code> for avoiding
+a warning in the check valve model.<br/>
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/pull/1240\">#1240</a>.
+</li>
+<li>
 January 4, 2019, by Michael Wetter:<br/>
 Set `Inline=false`.<br/>
 See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1070\">#1070</a>.
diff --git a/AixLib/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo b/AixLib/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo
index b43aeb459e..5269660782 100644
--- a/AixLib/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo
+++ b/AixLib/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo
@@ -19,9 +19,9 @@ protected
     "Square of normalised mass flow rate";
 
 algorithm
- dp :=if noEvent(abs(m_flow)>m_flow_turbulent)
+ dp := smooth(2, if noEvent(abs(m_flow)>m_flow_turbulent)
       then sign(m_flow)*(m_flow/k)^2
-      else (0.375 + (0.75-0.125*m_flowNormSq)*m_flowNormSq)*dp_turbulent*m_flowNorm;
+      else (0.375 + (0.75-0.125*m_flowNormSq)*m_flowNormSq)*dp_turbulent*m_flowNorm);
 
  annotation (Inline=false,
              smoothOrder=2,
@@ -60,6 +60,13 @@ The input <code>m_flow_turbulent</code> determines the location of the regulariz
 revisions="<html>
 <ul>
 <li>
+December 9, 2019, by Michael Wetter:<br/>
+Added <code>smooth(2, . )</code>, similar to
+<a href=\"modelica://AixLib.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp\">
+AixLib.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp</a>.<br/>
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/pull/1240\">#1240</a>.
+</li>
+<li>
 January 4, 2019, by Michael Wetter:<br/>
 Set `Inline=false`.<br/>
 See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1070\">#1070</a>.
diff --git a/AixLib/Fluid/BaseClasses/IndexMassFraction.mo b/AixLib/Fluid/BaseClasses/IndexMassFraction.mo
index 9af3663351..25fde20bf1 100644
--- a/AixLib/Fluid/BaseClasses/IndexMassFraction.mo
+++ b/AixLib/Fluid/BaseClasses/IndexMassFraction.mo
@@ -8,17 +8,13 @@ block IndexMassFraction
   parameter String substanceName="" "Name of species substance";
 
 protected
-  parameter Integer i_x(fixed=false) "Index of substance";
-initial algorithm
-  // Compute index of species vector that carries the substance name
-  i_x :=-1;
-    for i in 1:Medium.nXi loop
-      if Modelica.Utilities.Strings.isEqual(string1=Medium.substanceNames[i],
-                                            string2=substanceName,
-                                            caseSensitive=false) then
-        i_x :=i;
-      end if;
-    end for;
+  parameter Integer i_x = sum(
+    if Modelica.Utilities.Strings.isEqual(string1=Medium.substanceNames[i],
+                                          string2=substanceName,
+                                          caseSensitive=false) then i else 0
+                                          for i in 1:Medium.nXi) "Index of substance"
+                                          annotation(Evaluate=true);
+initial equation
   assert(i_x > 0, "Substance '" + substanceName + "' is not present in medium '"
                   + Medium.mediumName + "'.\n"
                   + "Change medium model to one that has '" + substanceName + "' as a substance.");
@@ -37,6 +33,11 @@ to obtain the water vapor concentration, or to measure any other mass fraction.
 </html>", revisions="<html>
 <ul>
 <li>
+November 14, 2019, by Michael Wetter:<br/>
+Rewrote assignment of <code>i_x</code> to avoid a variable array index.<br/>
+This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1250\">#1250</a>.
+</li>
+<li>
 January 18, 2019, by Jianjun Hu:<br/>
 Limited the media choice to moist air only.
 See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1050\">#1050</a>.
diff --git a/AixLib/Fluid/BaseClasses/PartialResistance.mo b/AixLib/Fluid/BaseClasses/PartialResistance.mo
index 0e0dce0fc2..20b6df7061 100644
--- a/AixLib/Fluid/BaseClasses/PartialResistance.mo
+++ b/AixLib/Fluid/BaseClasses/PartialResistance.mo
@@ -53,7 +53,7 @@ equation
   annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
             -100},{100,100}}), graphics={
         Rectangle(
-          extent={{-100,40},{100,-42}},
+          extent={{-100,40},{100,-40}},
           lineColor={0,0,0},
           fillPattern=FillPattern.HorizontalCylinder,
           fillColor={192,192,192}),
@@ -64,7 +64,7 @@ equation
           fillColor={0,127,255}),
         Rectangle(
           visible=linearized,
-          extent={{-100,22},{100,-24}},
+          extent={{-100,22},{100,-22}},
           fillPattern=FillPattern.Backward,
           fillColor={0,128,255},
           pattern=LinePattern.None,
@@ -86,6 +86,11 @@ this base class.
 </html>", revisions="<html>
 <ul>
 <li>
+October 25, 2019, by Jianjun Hu:<br/>
+Improved icon graphics annotation. This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1225\">#1225</a>.
+</li>
+<li>
 November 3, 2016, by Michael Wetter:<br/>
 Removed start value for pressure difference
 to simplify the parameter window.<br/>
diff --git a/AixLib/Fluid/BaseClasses/package.mo b/AixLib/Fluid/BaseClasses/package.mo
index d605658dc2..4ff4d4ec6f 100644
--- a/AixLib/Fluid/BaseClasses/package.mo
+++ b/AixLib/Fluid/BaseClasses/package.mo
@@ -1,10 +1,10 @@
 within AixLib.Fluid;
 package BaseClasses "Package with base classes for AixLib.Fluid"
   extends Modelica.Icons.BasesPackage;
-
-annotation (preferredView="info", Documentation(info="<html><p>
-  This package contains base classes that are used to construct the
-  models in <a href=\"modelica://AixLib.Fluid\">AixLib.Fluid</a>.
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains base classes that are used to construct the models in
+<a href=\"modelica://AixLib.Fluid\">AixLib.Fluid</a>.
 </p>
 </html>"));
 end BaseClasses;
diff --git a/AixLib/Fluid/BoilerCHP/BaseClasses/package.order b/AixLib/Fluid/BoilerCHP/BaseClasses/package.order
index 63c28c3ea8..8f7bfb6e7e 100644
--- a/AixLib/Fluid/BoilerCHP/BaseClasses/package.order
+++ b/AixLib/Fluid/BoilerCHP/BaseClasses/package.order
@@ -1,3 +1,3 @@
-PartialHeatGenerator
 CondensingBoilerEfficiency
+PartialHeatGenerator
 Controllers
diff --git a/AixLib/Fluid/BoilerCHP/Examples/package.order b/AixLib/Fluid/BoilerCHP/Examples/package.order
index 935945bff8..0c3bc309a3 100644
--- a/AixLib/Fluid/BoilerCHP/Examples/package.order
+++ b/AixLib/Fluid/BoilerCHP/Examples/package.order
@@ -1,5 +1,5 @@
+BoilerNoControlSystem
 BoilerSystem
 CHPSystem
 HeatGeneratorNoControllSystem
 ModularCHPSystem
-BoilerNoControlSystem
diff --git a/AixLib/Fluid/BoilerCHP/package.order b/AixLib/Fluid/BoilerCHP/package.order
index c77d23d62f..728e0d87d2 100644
--- a/AixLib/Fluid/BoilerCHP/package.order
+++ b/AixLib/Fluid/BoilerCHP/package.order
@@ -1,8 +1,8 @@
 Boiler
+BoilerNoControl
 CHP
 HeatGeneratorNoControl
 ModularCHP
-BoilerNoControl
 Data
 Examples
 BaseClasses
diff --git a/AixLib/Fluid/Chillers/BaseClasses/Carnot.mo b/AixLib/Fluid/Chillers/BaseClasses/Carnot.mo
index c0039b7fe4..512a336e58 100644
--- a/AixLib/Fluid/Chillers/BaseClasses/Carnot.mo
+++ b/AixLib/Fluid/Chillers/BaseClasses/Carnot.mo
@@ -124,8 +124,8 @@ partial model Carnot
 
   Real etaPL(final unit = "1")=
     if evaluate_etaPL
-      then 1
-    else AixLib.Utilities.Math.Functions.polynomial(a=a, x=yPL)
+      then AixLib.Utilities.Math.Functions.polynomial(a=a, x=yPL)
+      else 1
     "Efficiency due to part load (etaPL(yPL=1)=1)";
 
   Real COP(min=0, final unit="1") = etaCarnot_nominal_internal * COPCar * etaPL
@@ -148,7 +148,7 @@ protected
   constant Boolean COP_is_for_cooling
     "Set to true if the specified COP is for cooling";
 
-  parameter Real etaCarnot_nominal_internal(unit="1")=
+  parameter Real etaCarnot_nominal_internal(unit="1") =
     if use_eta_Carnot_nominal
       then etaCarnot_nominal
       else COP_nominal/
@@ -157,8 +157,8 @@ protected
 
   // For Carnot_y, computing etaPL = f(yPL) introduces a nonlinear equation.
   // The parameter below avoids this if a = {1}.
-  final parameter Boolean evaluate_etaPL=
-    (size(a, 1) == 1 and abs(a[1] - 1)  < Modelica.Constants.eps)
+  final parameter Boolean evaluate_etaPL =
+    not ((size(a, 1) == 1 and abs(a[1] - 1)  < Modelica.Constants.eps))
     "Flag, true if etaPL should be computed as it depends on yPL"
     annotation(Evaluate=true);
 
@@ -382,6 +382,13 @@ and the part load ratio are set up.
 </html>", revisions="<html>
 <ul>
 <li>
+September 12, 2019, by Michael Wetter:<br/>
+Corrected value of <code>evaluate_etaPL</code> and how it is used.
+This correction only affects protected variables and does not affect the results.<br/>
+This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1200\">
+#1200</a>.
+</li>
+<li>
 June 16, 2017, by Michael Wetter:<br/>
 Added temperature difference between fluids in condenser and evaporator
 for computation of nominal COP and effectiveness.<br/>
diff --git a/AixLib/Fluid/Chillers/BaseClasses/package.mo b/AixLib/Fluid/Chillers/BaseClasses/package.mo
index 4535bf18aa..4d08136659 100644
--- a/AixLib/Fluid/Chillers/BaseClasses/package.mo
+++ b/AixLib/Fluid/Chillers/BaseClasses/package.mo
@@ -2,10 +2,10 @@ within AixLib.Fluid.Chillers;
 package BaseClasses "Package with base classes for AixLib.Fluid.Chillers"
   extends Modelica.Icons.BasesPackage;
 
-annotation (preferredView="info", Documentation(info="<html><p>
-  This package contains base classes that are used to construct the
-  models in <a href=
-  \"modelica://AixLib.Fluid.Chillers\">AixLib.Fluid.Chillers</a>.
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains base classes that are used to construct the models in
+<a href=\"modelica://AixLib.Fluid.Chillers\">AixLib.Fluid.Chillers</a>.
 </p>
 </html>"));
 end BaseClasses;
diff --git a/AixLib/Fluid/Chillers/BaseClasses/package.order b/AixLib/Fluid/Chillers/BaseClasses/package.order
index bfeb922413..263edf547e 100644
--- a/AixLib/Fluid/Chillers/BaseClasses/package.order
+++ b/AixLib/Fluid/Chillers/BaseClasses/package.order
@@ -1,4 +1,4 @@
 Carnot
+InnerCycle_Chiller
 PartialCarnot_T
 PartialCarnot_y
-InnerCycle_Chiller
diff --git a/AixLib/Fluid/Chillers/Examples/package.mo b/AixLib/Fluid/Chillers/Examples/package.mo
index 41260dc8e6..1941322a13 100644
--- a/AixLib/Fluid/Chillers/Examples/package.mo
+++ b/AixLib/Fluid/Chillers/Examples/package.mo
@@ -1,11 +1,11 @@
 within AixLib.Fluid.Chillers;
 package Examples "Collection of models that illustrate model use and test models"
   extends Modelica.Icons.ExamplesPackage;
-
-annotation (preferredView="info", Documentation(info="<html><p>
-  This package contains examples for the use of models that can be
-  found in <a href=
-  \"modelica://AixLib.Fluid.Chillers\">AixLib.Fluid.Chillers</a>.
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains examples for the use of models that can be found in
+<a href=\"modelica://AixLib.Fluid.Chillers\">
+AixLib.Fluid.Chillers</a>.
 </p>
 </html>"));
 end Examples;
diff --git a/AixLib/Fluid/Chillers/package.mo b/AixLib/Fluid/Chillers/package.mo
index c688a4ee9f..a13982eb49 100644
--- a/AixLib/Fluid/Chillers/package.mo
+++ b/AixLib/Fluid/Chillers/package.mo
@@ -1,9 +1,9 @@
 within AixLib.Fluid;
 package Chillers "Package with chiller models"
   extends Modelica.Icons.VariantsPackage;
-
-annotation (preferredView="info", Documentation(info="<html><p>
-  This package contains component models for chillers.
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains component models for chillers.
 </p>
 </html>"));
 end Chillers;
diff --git a/AixLib/Fluid/Delays/Examples/package.mo b/AixLib/Fluid/Delays/Examples/package.mo
index 8e476a3d41..07b7d7b6f0 100644
--- a/AixLib/Fluid/Delays/Examples/package.mo
+++ b/AixLib/Fluid/Delays/Examples/package.mo
@@ -1,7 +1,6 @@
 within AixLib.Fluid.Delays;
 package Examples "Collection of models that illustrate model use and test models"
   extends Modelica.Icons.ExamplesPackage;
-
 annotation (preferredView="info", Documentation(info="<html>
 <p>
 This package contains examples for the use of models that can be found in
diff --git a/AixLib/Fluid/Delays/package.mo b/AixLib/Fluid/Delays/package.mo
index 38e6b522ee..069558ad7d 100644
--- a/AixLib/Fluid/Delays/package.mo
+++ b/AixLib/Fluid/Delays/package.mo
@@ -1,7 +1,6 @@
 within AixLib.Fluid;
 package Delays "Package with delay models"
   extends Modelica.Icons.VariantsPackage;
-
 annotation (preferredView="info", Documentation(info="<html>
 <p>
 This package contains component models for transport delays in
diff --git a/AixLib/Fluid/Examples/SimpleHouse.mo b/AixLib/Fluid/Examples/SimpleHouse.mo
index 03cd3ef3dd..5d68eee5e8 100644
--- a/AixLib/Fluid/Examples/SimpleHouse.mo
+++ b/AixLib/Fluid/Examples/SimpleHouse.mo
@@ -202,8 +202,8 @@ equation
           {26,-100},{42,-100}}, color={0,0,127}));
   connect(heaWat.port_a, pump.port_b) annotation (Line(points={{44,-106},{40,-106},
           {40,-112},{40,-170},{60,-170}}, color={0,127,255}));
-  connect(const_dp.y, fan.dp_in) annotation (Line(points={{-31,160},{-22,160},{
-          -22,132},{-22,132}},                       color={0,0,127}));
+  connect(const_dp.y, fan.dp_in) annotation (Line(points={{-31,160},{-22,160},{-22,
+          132},{-22.2,132}},                         color={0,0,127}));
   connect(gaiWin.y, window.Q_flow) annotation (Line(points={{-39,-26},{-34,-26},
           {-30,-26},{-20,-26}}, color={0,0,127}));
   connect(gaiWin.u, weaBus.HGloHor) annotation (Line(points={{-62,-26},{-90,-26},
diff --git a/AixLib/Fluid/FixedResistances/BaseClasses/Validation/package.mo b/AixLib/Fluid/FixedResistances/BaseClasses/Validation/package.mo
index a385964edc..d8adbb6955 100644
--- a/AixLib/Fluid/FixedResistances/BaseClasses/Validation/package.mo
+++ b/AixLib/Fluid/FixedResistances/BaseClasses/Validation/package.mo
@@ -1,3 +1,4 @@
+
 within AixLib.Fluid.FixedResistances.BaseClasses;
 package Validation "Collection of validation models"
   extends Modelica.Icons.ExamplesPackage;
diff --git a/AixLib/Fluid/FixedResistances/BaseClasses/package.mo b/AixLib/Fluid/FixedResistances/BaseClasses/package.mo
index f5b161ff51..d9c97a4f50 100644
--- a/AixLib/Fluid/FixedResistances/BaseClasses/package.mo
+++ b/AixLib/Fluid/FixedResistances/BaseClasses/package.mo
@@ -1,7 +1,6 @@
 within AixLib.Fluid.FixedResistances;
 package BaseClasses "Package with base classes for AixLib.Fluid.FixedResistances"
   extends Modelica.Icons.BasesPackage;
-
 annotation (preferredView="info", Documentation(info="<html>
 <p>
 This package contains base classes that are used to construct the models in
diff --git a/AixLib/Fluid/FixedResistances/CheckValve.mo b/AixLib/Fluid/FixedResistances/CheckValve.mo
new file mode 100644
index 0000000000..eac16809f7
--- /dev/null
+++ b/AixLib/Fluid/FixedResistances/CheckValve.mo
@@ -0,0 +1,165 @@
+within AixLib.Fluid.FixedResistances;
+model CheckValve "Check valve that avoids flow reversal"
+  extends AixLib.Fluid.BaseClasses.PartialResistance(
+    dp(nominal=2000),
+    final dp_nominal=dpValve_nominal + dpFixed_nominal,
+    final m_flow_turbulent=deltaM*abs(m_flow_nominal),
+    final from_dp=true,
+    final linearized=false,
+    allowFlowReversal=true);
+  extends AixLib.Fluid.Actuators.BaseClasses.ValveParameters(
+    rhoStd=Medium.density_pTX(101325, 273.15 + 4, Medium.X_default));
+
+  parameter Modelica.SIunits.PressureDifference dpFixed_nominal(
+    displayUnit="Pa", min=0) = 0
+    "Pressure drop of pipe and other resistances that are in series"
+    annotation (Dialog(group="Nominal condition"));
+
+  parameter Modelica.SIunits.PressureDifference dpValve_closing = dpValve_nominal/2
+    "Pressure drop when the check valve starts to close"
+    annotation(Dialog(group="Nominal condition"));
+
+  parameter Real l(min=1e-10, max=1)=0.001 "Valve leakage, l=Kv(y=0)/Kv(y=1)";
+
+  parameter Real kFixed(unit="", min=0)=
+    if dpFixed_nominal > Modelica.Constants.eps then
+      m_flow_nominal/sqrt(dpFixed_nominal)
+    else 0
+    "Flow coefficient of fixed resistance that may be in series with valve, 
+    k=m_flow/sqrt(dp), with unit=(kg.m)^(1/2).";
+
+  Real k(min=Modelica.Constants.small)
+    "Flow coefficient of valve and pipe in series in allowed/forward direction, 
+    k=m_flow/sqrt(dp), with unit=(kg.m)^(1/2).";
+
+protected
+  Real a
+    "Scaled pressure variable";
+  Real cv
+    "Twice differentiable Heaviside check valve characteristic";
+  Real kCv
+    "Smoothed restriction characteristic";
+
+initial equation
+  assert(dpFixed_nominal > -Modelica.Constants.eps,
+    "In " + getInstanceName() + ": We require dpFixed_nominal >= 0. 
+    Received dpFixed_nominal = " + String(dpFixed_nominal) + " Pa.");
+  assert(l > -Modelica.Constants.eps,
+    "In " + getInstanceName() + ": We require l >= 0. Received l = " + String(l));
+equation
+  a = dp/dpValve_closing;
+  cv = smooth(2, max(0, min(1, a^3*(10+a*(-15+6*a)))));
+  kCv = Kv_SI*(cv*(1-l) + l);
+
+  if (dpFixed_nominal > Modelica.Constants.eps) then
+    k = sqrt(1/(1/kFixed^2 + 1/kCv^2));
+  else
+    k = kCv;
+  end if;
+
+  if homotopyInitialization then
+    m_flow = homotopy(
+      actual=AixLib.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp(
+            dp = dp,
+            k = k,
+            m_flow_turbulent = m_flow_turbulent),
+      simplified = m_flow_nominal_pos*dp/dp_nominal_pos);
+  else
+    m_flow = AixLib.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp(
+        dp = dp,
+        k = k,
+        m_flow_turbulent = m_flow_turbulent);
+  end if;
+  annotation (Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},
+            {100,100}}), graphics={
+        Polygon(
+          points={{100,-42},{-100,-42},{-100,40},{100,40},{100,-42}},
+          lineColor={255,255,255},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Line(
+          points={{-100,0},{-70,0}},
+          color={0,128,255},
+          lineThickness=0.5),
+        Line(
+          points={{0,70},{-70,0}},
+          color={0,128,255},
+          lineThickness=0.5),
+        Line(
+          points={{0,-70},{-70,0}},
+          color={0,128,255},
+          lineThickness=0.5),
+        Ellipse(
+          extent={{-40,-55},{70,55}},
+          lineColor={0,128,255},
+          fillColor={255,255,255},
+          lineThickness=0.5,
+          fillPattern=FillPattern.Solid),
+        Line(
+          points={{70,0},{100,0}},
+          color={0,128,255},
+          lineThickness=0.5)}),
+defaultComponentName="cheVal",
+Documentation(info="<html>
+<p>
+Implementation of a hydraulic check valve.
+Note that the small reverse flows can still occur with this model.
+</p>
+<h4>Main equations</h4>
+<p>
+The basic flow function
+</p>
+<p align=\"center\" style=\"font-style:italic;\">
+  m = sign(&Delta;p) k  &radic;<span style=\"text-decoration:overline;\">&nbsp;&Delta;p &nbsp;</span>,
+</p>
+<p>
+with regularization near the origin, is used to compute the pressure drop.
+The flow coefficient
+</p>
+<p align=\"center\" style=\"font-style:italic;\">
+  k = m &frasl; &radic;<span style=\"text-decoration:overline;\">&nbsp;&Delta;p &nbsp;</span>
+</p>
+<p>
+is increased from <code>l*KV_Si</code> to <code>KV_Si</code>,
+where <code>KV_Si</code> is equal to <code>Kv</code> but in SI units.
+Therefore, the flow coefficient <code>k</code> is set to a value close to zero for negative pressure differences, thereby
+restricting reverse flow to a small value.
+The flow coefficient <code>k</code> saturates to its maximum value at the pressure <code>dpValve_closing</code>.
+For larger pressure drops, the pressure drop is a quadratic function of the flow rate.
+</p>
+<h4>Typical use and important parameters</h4>
+<p>
+The parameters <code>m_flow_nominal</code> and <code>dpValve_nominal</code> 
+determine the flow coefficient of the check valve when it is fully opened. 
+A typical value for a nominal flow rate of <i>1</i> m/s is
+<code>dpValve_nominal = 3400 Pa</code>.
+The leakage ratio <code>l</code> determines the minimum flow coefficient, 
+for negative pressure differences.
+The parameter <code>dpFixed_nominal</code> allows to include a series
+pressure drop with a fixed flow coefficient into the model.
+The parameter <code>dpValve_closing</code> determines when the
+flow coefficient starts to increase,
+which is typically in the order of <code>dpValve_nominal</code>.
+</p>
+<h4>Implementation</h4>
+<p>
+The check valve implementation approximates the physics
+where a forward pressure difference opens the valve such that
+the valve opening increases, causing a growing orifice area
+and thus increasing the flow coefficient.
+Near <code>dp=dpValve_closing</code>, the valve is fully open and the flow coefficient saturates
+to the flow coefficient value determined by <code>dpValve_nominal</code> and <code>m_flow_nominal</code>.
+For typical valve diameters, the check valve is only fully open
+near nominal mass flow rate. Therefore, the model sets <code>dpValve_closing=dpValve_nominal/2</code>
+by default.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+September 16, 2019, by Kristoff Six and Filip Jorissen:<br/>
+Implementation of a hydraulic check valve. This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1198\">issue 1198</a>.
+</li>
+</ul>
+</html>"));
+end CheckValve;
diff --git a/AixLib/Fluid/FixedResistances/Examples/CheckValve.mo b/AixLib/Fluid/FixedResistances/Examples/CheckValve.mo
new file mode 100644
index 0000000000..034a8bc931
--- /dev/null
+++ b/AixLib/Fluid/FixedResistances/Examples/CheckValve.mo
@@ -0,0 +1,97 @@
+within AixLib.Fluid.FixedResistances.Examples;
+model CheckValve "Example model for check valve"
+  extends Modelica.Icons.Example;
+  package Medium = AixLib.Media.Water "Medium model";
+  Modelica.Blocks.Sources.Ramp P_dp(
+    duration=1,
+    height=4e5,
+    offset=3e5,
+    startTime=0)
+    "Ramp pressure signal"
+    annotation (Placement(transformation(extent={{-92,-2},{-72,18}})));
+  AixLib.Fluid.Sources.Boundary_pT sou(
+    redeclare package Medium = Medium,
+    T=273.15 + 20,
+    use_p_in=true,
+    nPorts=2)
+    "Pressure boundary condition"
+    annotation (Placement(transformation(
+          extent={{-50,-10},{-30,10}})));
+  AixLib.Fluid.Sources.Boundary_pT sin(
+    redeclare package Medium = Medium,
+    T=273.15 + 10,
+    p(displayUnit="bar") = 500000,
+    nPorts=3)
+    "Pressure boundary condition"
+    annotation (Placement(transformation(
+          extent={{50,-10},{30,10}})));
+  AixLib.Fluid.FixedResistances.CheckValve checkValve(
+    redeclare package Medium = AixLib.Media.Water,
+    m_flow_nominal=2,
+    dpValve_nominal=3600)
+    "Check valve"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+  AixLib.Fluid.FixedResistances.CheckValve checkValveDpFix(
+    redeclare package Medium = Media.Water,
+    m_flow_nominal=2,
+    dpValve_nominal=3600,
+    dpFixed_nominal=1e4)
+    "Check valve with series resistance"
+    annotation (Placement(transformation(extent={{-10,20},{10,40}})));
+  AixLib.Fluid.FixedResistances.CheckValve checkValve_m_flow(
+    redeclare package Medium = Media.Water,
+    m_flow_nominal=2,
+    dpValve_nominal=3600)
+    "Check valve where the flow rate is prescribed"
+    annotation (Placement(transformation(extent={{-10,-50},{10,-30}})));
+  Sources.MassFlowSource_T bou(
+    redeclare package Medium = Media.Water,
+    use_m_flow_in=true,
+    nPorts=1)
+    "Mass flow source"
+    annotation (Placement(transformation(extent={{-50,-50},{-30,-30}})));
+  Modelica.Blocks.Sources.Ramp P_m_flow(
+    duration=1,
+    height=5,
+    offset=0,
+    startTime=0)
+    "Ramp flow rate signal"
+    annotation (Placement(transformation(extent={{-90,-50},{-70,-30}})));
+equation
+  connect(P_dp.y, sou.p_in)
+    annotation (Line(points={{-71,8},{-52,8}}, color={0,0,127}));
+  connect(sou.ports[1], checkValve.port_a)
+    annotation (Line(points={{-30,2},{-20,2},{-20,0},{-10,0}},
+                                               color={0,127,255}));
+  connect(checkValve.port_b, sin.ports[1])
+    annotation (Line(points={{10,0},{20,0},{20,2.66667},{30,2.66667}},
+                                             color={0,127,255}));
+  connect(sou.ports[2], checkValveDpFix.port_a)
+    annotation (Line(points={{-30,-2},{-30,30},{-10,30}}, color={0,127,255}));
+  connect(checkValveDpFix.port_b, sin.ports[2])
+    annotation (Line(points={{10,30},{30,30},{30,-2.22045e-16}},
+                                                       color={0,127,255}));
+  connect(bou.ports[1], checkValve_m_flow.port_a)
+    annotation (Line(points={{-30,-40},{-10,-40}}, color={0,127,255}));
+  connect(P_m_flow.y, bou.m_flow_in) annotation (Line(points={{-69,-40},{-64,-40},
+          {-64,-32},{-52,-32}}, color={0,0,127}));
+  connect(checkValve_m_flow.port_b, sin.ports[3]) annotation (Line(points={{10,-40},
+          {30,-40},{30,-2.66667}}, color={0,127,255}));
+  annotation (experiment(Tolerance=1e-06, StopTime=1, __Dymola_Algorithm="Cvode"),
+      __Dymola_Commands(file=
+          "Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/CheckValve.mos"
+        "Simulate and plot"),
+    Documentation(revisions="<html>
+<ul>
+<li>
+September 16, 2019, by Kristoff Six and Filip Jorissen:<br/>
+Implementation of a hydraulic check valve. This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1198\">issue 1198</a>.
+</li>
+</ul>
+</html>", info="<html>
+<p>
+Example model for the use of a hydraulic check valve.
+</p>
+</html>"));
+end CheckValve;
diff --git a/AixLib/Fluid/FixedResistances/Examples/package.order b/AixLib/Fluid/FixedResistances/Examples/package.order
index 57061a01b6..f668d2de98 100644
--- a/AixLib/Fluid/FixedResistances/Examples/package.order
+++ b/AixLib/Fluid/FixedResistances/Examples/package.order
@@ -1,3 +1,4 @@
+CheckValve
 CompareFixedResistances
 FlowJunction
 HydraulicDiameter
diff --git a/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/BaseClasses/PipeDataULg.mo b/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/BaseClasses/PipeDataULg.mo
index 193fff729d..794baac581 100644
--- a/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/BaseClasses/PipeDataULg.mo
+++ b/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/BaseClasses/PipeDataULg.mo
@@ -1,4 +1,4 @@
-within AixLib.Fluid.FixedResistances.Validation.PlugFlowPipes.Data.BaseClasses;
+within AixLib.Fluid.FixedResistances.Validation.PlugFlowPipes.Data.BaseClasses;
 partial record PipeDataULg "Base class for ULg experimental data"
   extends PipeDataBaseDefinition;
   parameter Modelica.SIunits.Temp_C T_start_in = 20
diff --git a/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataAIT151218.mo b/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataAIT151218.mo
index 1991858048..10acfc3bf7 100644
--- a/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataAIT151218.mo
+++ b/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataAIT151218.mo
@@ -1,4 +1,4 @@
-within AixLib.Fluid.FixedResistances.Validation.PlugFlowPipes.Data;
+within AixLib.Fluid.FixedResistances.Validation.PlugFlowPipes.Data;
 record PipeDataAIT151218
   "Experimental data from AIT monitoring data December 18, 2015"
     extends BaseClasses.PipeDataBaseDefinition(final n=9, data=[0,
diff --git a/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg150801.mo b/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg150801.mo
index fd09a3b6e4..f6b26ac926 100644
--- a/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg150801.mo
+++ b/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg150801.mo
@@ -1,4 +1,4 @@
-within AixLib.Fluid.FixedResistances.Validation.PlugFlowPipes.Data;
+within AixLib.Fluid.FixedResistances.Validation.PlugFlowPipes.Data;
 record PipeDataULg150801
   "Experimental data from ULg's pipe test bench from August 1"
   //   Column 1: Time in s
diff --git a/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg151202.mo b/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg151202.mo
index f0ece3e689..cf16fd0c2a 100644
--- a/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg151202.mo
+++ b/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg151202.mo
@@ -1,4 +1,4 @@
-within AixLib.Fluid.FixedResistances.Validation.PlugFlowPipes.Data;
+within AixLib.Fluid.FixedResistances.Validation.PlugFlowPipes.Data;
 record PipeDataULg151202
   "Experimental data from ULg's pipe test bench from December 2, 2015"
   extends AixLib.Fluid.FixedResistances.Validation.PlugFlowPipes.Data.BaseClasses.PipeDataULg(
diff --git a/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg151204_1.mo b/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg151204_1.mo
index 72abed420d..43a00023d0 100644
--- a/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg151204_1.mo
+++ b/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg151204_1.mo
@@ -1,4 +1,4 @@
-within AixLib.Fluid.FixedResistances.Validation.PlugFlowPipes.Data;
+within AixLib.Fluid.FixedResistances.Validation.PlugFlowPipes.Data;
 record PipeDataULg151204_1
   "Experimental data from ULg's pipe test bench from December 4, 2015 (1);
   increase followed by a decrease in temperature"
diff --git a/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg151204_2.mo b/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg151204_2.mo
index 8fb57c8940..48179c3465 100644
--- a/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg151204_2.mo
+++ b/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg151204_2.mo
@@ -1,4 +1,4 @@
-within AixLib.Fluid.FixedResistances.Validation.PlugFlowPipes.Data;
+within AixLib.Fluid.FixedResistances.Validation.PlugFlowPipes.Data;
 record PipeDataULg151204_2
   "Experimental data from ULg's pipe test bench from December 4, 2015 (2)"
   extends AixLib.Fluid.FixedResistances.Validation.PlugFlowPipes.Data.BaseClasses.PipeDataULg(
diff --git a/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg151204_4.mo b/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg151204_4.mo
index 085b88f486..41ad324cd3 100644
--- a/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg151204_4.mo
+++ b/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg151204_4.mo
@@ -1,4 +1,4 @@
-within AixLib.Fluid.FixedResistances.Validation.PlugFlowPipes.Data;
+within AixLib.Fluid.FixedResistances.Validation.PlugFlowPipes.Data;
 record PipeDataULg151204_4
   "Experimental data from ULg's pipe test bench from December 4, 2015 (4); an increase followed by a decrease temperature"
   extends AixLib.Fluid.FixedResistances.Validation.PlugFlowPipes.Data.BaseClasses.PipeDataULg(
diff --git a/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg160104_2.mo b/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg160104_2.mo
index d2a9642e05..6d5433c60a 100644
--- a/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg160104_2.mo
+++ b/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg160104_2.mo
@@ -1,4 +1,4 @@
-within AixLib.Fluid.FixedResistances.Validation.PlugFlowPipes.Data;
+within AixLib.Fluid.FixedResistances.Validation.PlugFlowPipes.Data;
 record PipeDataULg160104_2 "Experimental data from ULg's pipe test bench from 4 January 2016. Low mass flow"
   extends AixLib.Fluid.FixedResistances.Validation.PlugFlowPipes.Data.BaseClasses.PipeDataULg(
     final n=5,
diff --git a/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg160118_1.mo b/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg160118_1.mo
index e41b552a00..15d2914920 100644
--- a/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg160118_1.mo
+++ b/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg160118_1.mo
@@ -1,4 +1,4 @@
-within AixLib.Fluid.FixedResistances.Validation.PlugFlowPipes.Data;
+within AixLib.Fluid.FixedResistances.Validation.PlugFlowPipes.Data;
 record PipeDataULg160118_1
   "Experimental data from ULg's pipe test bench from January 18, 2016"
   extends AixLib.Fluid.FixedResistances.Validation.PlugFlowPipes.Data.BaseClasses.PipeDataULg(
diff --git a/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/package.mo b/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/package.mo
index 6309474c3f..7c0651b686 100644
--- a/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/package.mo
+++ b/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/package.mo
@@ -1,4 +1,4 @@
-within AixLib.Fluid.FixedResistances.Validation.PlugFlowPipes;
+within AixLib.Fluid.FixedResistances.Validation.PlugFlowPipes;
 package Data "Experimental data for verification of pipe models"
 
 
diff --git a/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowULg.mo b/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowULg.mo
index 37bfb913f3..f3bde2e93d 100644
--- a/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowULg.mo
+++ b/AixLib/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowULg.mo
@@ -1,4 +1,4 @@
-within AixLib.Fluid.FixedResistances.Validation.PlugFlowPipes;
+within AixLib.Fluid.FixedResistances.Validation.PlugFlowPipes;
 model PlugFlowULg "Validation against data from Université de Liège"
   extends Modelica.Icons.Example;
   package Medium = AixLib.Media.Water;
diff --git a/AixLib/Fluid/FixedResistances/package.order b/AixLib/Fluid/FixedResistances/package.order
index 0c65d0220a..a4349f167d 100644
--- a/AixLib/Fluid/FixedResistances/package.order
+++ b/AixLib/Fluid/FixedResistances/package.order
@@ -1,3 +1,4 @@
+CheckValve
 HydraulicDiameter
 HydraulicResistance
 Junction
diff --git a/AixLib/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/ShaGFunction.mo b/AixLib/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/ShaGFunction.mo
index 38dd263fba..ccfafd5874 100644
--- a/AixLib/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/ShaGFunction.mo
+++ b/AixLib/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/ShaGFunction.mo
@@ -17,9 +17,9 @@ model ShaGFunction
     50,
     exp(5)) "SHA1-encrypted g-function inputs";
 
-  //Expected output (SHA1-encryption of '1.000e+0000.000e+0000.000e+0001.500e+0024.000e+0007.500e-0021.000e-0061.200e+0012.600e+0015.000e+0011.484e+002')
+  //Expected output (SHA1-encryption of (1,{{0,0}},150,4,0.075,1e-6,12,26,50,exp(5)))
   parameter String strEx=
-    "5d0475f93c93232dfe2452bb34acabd6b9fd28e5"
+    "f1213b0067741511110ed55c9689cd740f9d42ae"
     "Expected string output";
 
   //Comparison result
diff --git a/AixLib/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/shaGFunction.mo b/AixLib/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/shaGFunction.mo
index dcd4ecbaf7..24c31d9660 100644
--- a/AixLib/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/shaGFunction.mo
+++ b/AixLib/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/shaGFunction.mo
@@ -17,8 +17,8 @@ function shaGFunction
   "SHA1 encryption of the g-function arguments";
 
 protected
-  String formatStrGen =  "1.3e" "String format for general parameters";
-  String formatStrCoo =  ".2f" "String format for coordinate";
+  constant String formatStrGen =  "1.3e" "String format for general parameters";
+  constant String formatStrCoo =  ".2f" "String format for coordinate";
 algorithm
   sha := AixLib.Utilities.Cryptographics.sha(String(nBor, format=formatStrGen));
   sha := AixLib.Utilities.Cryptographics.sha(sha + String(hBor, format=formatStrGen));
@@ -56,6 +56,11 @@ The SHA1 encryption is computed using
 </html>", revisions="<html>
 <ul>
 <li>
+November 1, 2019 by Michael Wetter:<br/>
+Declared string as a constant due to JModelica's tigther type checking.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/pull/1230\">#1230</a>.
+</li>
+<li>
 September 11, 2018, by Michael Wetter:<br/>
 Refactored implementation to avoid buffer overflow.
 </li>
diff --git a/AixLib/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/Analytic_20Years.mo b/AixLib/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/Analytic_20Years.mo
index 613054d6a7..7ad7e3cfff 100644
--- a/AixLib/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/Analytic_20Years.mo
+++ b/AixLib/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/Analytic_20Years.mo
@@ -1,4 +1,4 @@
-within AixLib.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.Validation;
+within AixLib.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.Validation;
 model Analytic_20Years
   "Long term validation of ground temperature response model"
   extends Modelica.Icons.Example;
diff --git a/AixLib/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/BaseClasses/package.mo b/AixLib/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/BaseClasses/package.mo
index 4fe3dd24fc..09f8c3b760 100644
--- a/AixLib/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/BaseClasses/package.mo
+++ b/AixLib/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/BaseClasses/package.mo
@@ -1,7 +1,6 @@
 within AixLib.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.Validation;
 package BaseClasses "Package with base classes for AixLib.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.Validation"
   extends Modelica.Icons.BasesPackage;
-
 annotation (preferredView="info", Documentation(info="<html>
 <p>
 This package contains base classes that are used to construct the models in
diff --git a/AixLib/Fluid/Geothermal/Borefields/UsersGuide.mo b/AixLib/Fluid/Geothermal/Borefields/UsersGuide.mo
index fe5d2c953d..7edd9b3e7e 100644
--- a/AixLib/Fluid/Geothermal/Borefields/UsersGuide.mo
+++ b/AixLib/Fluid/Geothermal/Borefields/UsersGuide.mo
@@ -32,8 +32,7 @@ resistance matches the specified value.
 <li>
 User-defined vertical discretization of boreholes are supported.
 However, the borehole wall temperature
-is identical for each borehole and along the
-depth, as the ground temperature response model only computes the average borehole wall temperature
+is identical for each borehole, as the ground temperature response model only computes the average borehole wall temperature
 for all boreholes combined.
 </li>
 <li>
@@ -163,9 +162,6 @@ The conductivity, capacitance and density of the grout and pipe material are con
 There is no heat extraction or injection prior to the simulation start.
 </li>
 <li>
-The undisturbed ground temperature is the same all along the length of the boreholes.
-</li>
-<li>
 All of the boreholes in the borefield have uniform dimensions (including the pipe dimensions).
 </li>
 <li>
@@ -174,8 +170,9 @@ Inside the boreholes, the non-advective heat transfer is only in the radial dire
 </ul>
 <p>
 The borefield models are constructed in two main parts: the borehole(s) and the ground heat transfer.
-The former is modeled as a vertical discretization of borehole segments, all of them sharing a common
-uniform borehole wall temperature. The thermal effects of the circulating fluid (including the convection resistance),
+The former is modeled as a vertical discretization of borehole segments, where a uniform temperature increase or decrease
+(due to heat injection or extraction) is superimposed to the far-field ground temperature to obtain the borehole wall
+temperature. The thermal effects of the circulating fluid (including the convection resistance),
 of the pipes and of the filling material are all taken into consideration, which allows modeling
 short-term thermal effects in the borehole. The borehole segments do not take into account axial effects,
 thus only radial (horizontal) effects are considered within the borehole(s). The thermal
diff --git a/AixLib/Fluid/Geothermal/Borefields/Validation/BaseClasses/package.mo b/AixLib/Fluid/Geothermal/Borefields/Validation/BaseClasses/package.mo
index a6674f8225..67f1c2fc84 100644
--- a/AixLib/Fluid/Geothermal/Borefields/Validation/BaseClasses/package.mo
+++ b/AixLib/Fluid/Geothermal/Borefields/Validation/BaseClasses/package.mo
@@ -1,7 +1,6 @@
 within AixLib.Fluid.Geothermal.Borefields.Validation;
 package BaseClasses "Package with base classes for AixLib.Fluid.Geothermal.Borefields.Validation"
   extends Modelica.Icons.BasesPackage;
-
 annotation (preferredView="info", Documentation(info="<html>
 <p>
 This package contains base classes that are used to construct the models in
diff --git a/AixLib/Fluid/Geothermal/Borefields/package.mo b/AixLib/Fluid/Geothermal/Borefields/package.mo
index 42f5d7d080..fd2a949587 100644
--- a/AixLib/Fluid/Geothermal/Borefields/package.mo
+++ b/AixLib/Fluid/Geothermal/Borefields/package.mo
@@ -1,7 +1,6 @@
 within AixLib.Fluid.Geothermal;
 package Borefields "Package with borefield models"
   extends Modelica.Icons.VariantsPackage;
-
 annotation (preferredView="info", Documentation(info="<html>
 <p>
 Package with models for geothermal borefields.
diff --git a/AixLib/Fluid/Geothermal/package.mo b/AixLib/Fluid/Geothermal/package.mo
index 31669910e3..05640866ef 100644
--- a/AixLib/Fluid/Geothermal/package.mo
+++ b/AixLib/Fluid/Geothermal/package.mo
@@ -1,7 +1,6 @@
 within AixLib.Fluid;
 package Geothermal "Package with models for geothermal heat exchange"
   extends Modelica.Icons.VariantsPackage;
-
 annotation (preferredView="info", Documentation(info="<html>
 <p>
 Package with models for geothermal heat exchange.
diff --git a/AixLib/Fluid/HeatExchangers/Radiators/BaseClasses/package.order b/AixLib/Fluid/HeatExchangers/Radiators/BaseClasses/package.order
index 049da99ee9..e1338c0e42 100644
--- a/AixLib/Fluid/HeatExchangers/Radiators/BaseClasses/package.order
+++ b/AixLib/Fluid/HeatExchangers/Radiators/BaseClasses/package.order
@@ -5,3 +5,4 @@ PressureDropRadiator
 RadiatorTypes
 RadiatorWall
 calcHeaterExcessTemp
+RadiatorTypes
diff --git a/AixLib/Fluid/HeatPumps/BaseClasses/package.mo b/AixLib/Fluid/HeatPumps/BaseClasses/package.mo
index d3ac02311a..03168ea7a1 100644
--- a/AixLib/Fluid/HeatPumps/BaseClasses/package.mo
+++ b/AixLib/Fluid/HeatPumps/BaseClasses/package.mo
@@ -2,10 +2,10 @@ within AixLib.Fluid.HeatPumps;
 package BaseClasses "Package with base classes for AixLib.Fluid.HeatPumps"
   extends Modelica.Icons.BasesPackage;
 
-annotation (preferredView="info", Documentation(info="<html><p>
-  This package contains base classes that are used to construct the
-  models in <a href=
-  \"modelica://AixLib.Fluid.HeatPumps\">AixLib.Fluid.HeatPumps</a>.
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains base classes that are used to construct the models in
+<a href=\"modelica://AixLib.Fluid.HeatPumps\">AixLib.Fluid.HeatPumps</a>.
 </p>
 </html>"));
 end BaseClasses;
diff --git a/AixLib/Fluid/HeatPumps/Compressors/Validation/package.mo b/AixLib/Fluid/HeatPumps/Compressors/Validation/package.mo
index c1b124b801..a48cd85e80 100644
--- a/AixLib/Fluid/HeatPumps/Compressors/Validation/package.mo
+++ b/AixLib/Fluid/HeatPumps/Compressors/Validation/package.mo
@@ -2,7 +2,6 @@ within AixLib.Fluid.HeatPumps.Compressors;
 package Validation "Collection of models that validate the compressor models"
   extends Modelica.Icons.ExamplesPackage;
 
-
 annotation (preferredView="info", Documentation(info="<html>
 <p>
 This package contains validation models for the classes in
@@ -18,4 +17,5 @@ solutions. These model outputs are stored as reference data and
 used for continuous validation whenever models in the library change.
 </p>
 </html>"));
+
 end Validation;
diff --git a/AixLib/Fluid/HeatPumps/Compressors/package.mo b/AixLib/Fluid/HeatPumps/Compressors/package.mo
index 27cd14c2f6..c324cb39f8 100644
--- a/AixLib/Fluid/HeatPumps/Compressors/package.mo
+++ b/AixLib/Fluid/HeatPumps/Compressors/package.mo
@@ -2,10 +2,10 @@ within AixLib.Fluid.HeatPumps;
 package Compressors "Package with compressor models"
   extends Modelica.Icons.VariantsPackage;
 
-
   annotation (preferredView="info", Documentation(info="<html>
   <p>
   This package contains components models for compressors.
   </p>
   </html>"));
+
 end Compressors;
diff --git a/AixLib/Fluid/HeatPumps/Data/BaseClasses/HeatPumps.mo b/AixLib/Fluid/HeatPumps/Data/BaseClasses/HeatPumps.mo
index f355cdec7a..42dc0466de 100644
--- a/AixLib/Fluid/HeatPumps/Data/BaseClasses/HeatPumps.mo
+++ b/AixLib/Fluid/HeatPumps/Data/BaseClasses/HeatPumps.mo
@@ -26,14 +26,17 @@ partial record HeatPumps
   annotation (
     defaultComponentName="datHeaPum",
     preferredView="info",
-  Documentation(info="<html><p>
-  This is the base record for heat pump models.
+  Documentation(info="<html>
+<p>
+This is the base record for heat pump models.
 </p>
 </html>",
-revisions="<html><ul>
-  <li>December 6, 2016, by Massimo Cimmino:<br/>
-    First implementation.
-  </li>
+revisions="<html>
+<ul>
+<li>
+December 6, 2016, by Massimo Cimmino:<br/>
+First implementation.
+</li>
 </ul>
 </html>"),
     Icon(graphics={
diff --git a/AixLib/Fluid/HeatPumps/Data/BaseClasses/package.mo b/AixLib/Fluid/HeatPumps/Data/BaseClasses/package.mo
index 65bb311c90..49c44113ea 100644
--- a/AixLib/Fluid/HeatPumps/Data/BaseClasses/package.mo
+++ b/AixLib/Fluid/HeatPumps/Data/BaseClasses/package.mo
@@ -3,14 +3,17 @@ package BaseClasses "Base classes for package Data"
   extends Modelica.Icons.BasesPackage;
 
   annotation(preferredView="info",
-  Documentation(info="<html>This package contains the common parameters that are used to specify
-the heat pump models in <a href=
-\"AixLib.Fluid.HeatPumps\">AixLib.Fluid.HeatPumps</a>.
+  Documentation(info="<html>
+This package contains the common parameters that are used
+to specify the heat pump models in
+<a href=\"AixLib.Fluid.HeatPumps\">
+AixLib.Fluid.HeatPumps</a>.
 </html>", revisions="<html>
 <ul>
-  <li>December 6, 2016, by Massimo Cimmino:<br/>
-    First implementation.
-  </li>
+<li>
+December 6, 2016, by Massimo Cimmino:<br/>
+First implementation.
+</li>
 </ul>
 </html>"));
 end BaseClasses;
diff --git a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Carrier_50PSW122_38kW_4_29COP_R410A.mo b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Carrier_50PSW122_38kW_4_29COP_R410A.mo
index fc2c310b25..82cb3c3576 100644
--- a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Carrier_50PSW122_38kW_4_29COP_R410A.mo
+++ b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Carrier_50PSW122_38kW_4_29COP_R410A.mo
@@ -10,6 +10,7 @@ record Carrier_50PSW122_38kW_4_29COP_R410A =
     UACon = 9021.05488178,
     UAEva = 7132.41759701)
     "Calibrated parameters for Carrier 50PSW122"
+
   annotation (
     defaultComponentPrefixes = "parameter",
     defaultComponentName="datHeaPum",
diff --git a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Carrier_50PSW180_52kW_4_50COP_R410A.mo b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Carrier_50PSW180_52kW_4_50COP_R410A.mo
index ec54ad8410..17644cfb81 100644
--- a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Carrier_50PSW180_52kW_4_50COP_R410A.mo
+++ b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Carrier_50PSW180_52kW_4_50COP_R410A.mo
@@ -10,6 +10,7 @@ record Carrier_50PSW180_52kW_4_50COP_R410A =
     UACon = 8707.82060032,
     UAEva = 7982.84714185)
     "Calibrated parameters for Carrier 50PSW180"
+
   annotation (
     defaultComponentPrefixes = "parameter",
     defaultComponentName="datHeaPum",
diff --git a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Carrier_50PSW210_70kW_4_40COP_R410A.mo b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Carrier_50PSW210_70kW_4_40COP_R410A.mo
index 0192d1e632..937296935b 100644
--- a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Carrier_50PSW210_70kW_4_40COP_R410A.mo
+++ b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Carrier_50PSW210_70kW_4_40COP_R410A.mo
@@ -10,6 +10,7 @@ record Carrier_50PSW210_70kW_4_40COP_R410A =
     UACon = 14926.2266407,
     UAEva = 14718.9494319)
     "Calibrated parameters for Carrier 50PSW210"
+
   annotation (
     defaultComponentPrefixes = "parameter",
     defaultComponentName="datHeaPum",
diff --git a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Carrier_50PSW240_93kW_4_40COP_R410A.mo b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Carrier_50PSW240_93kW_4_40COP_R410A.mo
index f8198f8715..41674e685a 100644
--- a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Carrier_50PSW240_93kW_4_40COP_R410A.mo
+++ b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Carrier_50PSW240_93kW_4_40COP_R410A.mo
@@ -10,6 +10,7 @@ record Carrier_50PSW240_93kW_4_40COP_R410A =
     UACon = 15632.3350979,
     UAEva = 11572.8594812)
     "Calibrated parameters for Carrier 50PSW240"
+
   annotation (
     defaultComponentPrefixes = "parameter",
     defaultComponentName="datHeaPum",
diff --git a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Carrier_50PSW360_105kW_4_50COP_R410A.mo b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Carrier_50PSW360_105kW_4_50COP_R410A.mo
index e9503517fc..6e28636b8b 100644
--- a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Carrier_50PSW360_105kW_4_50COP_R410A.mo
+++ b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Carrier_50PSW360_105kW_4_50COP_R410A.mo
@@ -10,6 +10,7 @@ record Carrier_50PSW360_105kW_4_50COP_R410A =
     UACon = 16612.2868599,
     UAEva = 15988.0119559)
     "Calibrated parameters for Carrier 50PSW360"
+
   annotation (
     defaultComponentPrefixes = "parameter",
     defaultComponentName="datHeaPum",
diff --git a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Carrier_50PSW420_140kW_4_40COP_R410A.mo b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Carrier_50PSW420_140kW_4_40COP_R410A.mo
index 3f64352064..0d75a0531f 100644
--- a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Carrier_50PSW420_140kW_4_40COP_R410A.mo
+++ b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Carrier_50PSW420_140kW_4_40COP_R410A.mo
@@ -10,6 +10,7 @@ record Carrier_50PSW420_140kW_4_40COP_R410A =
     UACon = 22875.6244158,
     UAEva = 20395.4876127)
     "Calibrated parameters for Carrier 50PSW420"
+
   annotation (
     defaultComponentPrefixes = "parameter",
     defaultComponentName="datHeaPum",
diff --git a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/ClimateMaster_TMW036_12kW_4_90COP_R410A.mo b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/ClimateMaster_TMW036_12kW_4_90COP_R410A.mo
index dc06c79867..b95715c1a4 100644
--- a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/ClimateMaster_TMW036_12kW_4_90COP_R410A.mo
+++ b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/ClimateMaster_TMW036_12kW_4_90COP_R410A.mo
@@ -10,6 +10,7 @@ record ClimateMaster_TMW036_12kW_4_90COP_R410A =
     UACon = 2434.90888536,
     UAEva = 925.546637632)
     "Calibrated parameters for ClimateMaster TMW036"
+
   annotation (
     defaultComponentPrefixes = "parameter",
     defaultComponentName="datHeaPum",
diff --git a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/ClimateMaster_TMW060_21kW_4_60COP_R410A.mo b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/ClimateMaster_TMW060_21kW_4_60COP_R410A.mo
index a62e49c722..2aa6719860 100644
--- a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/ClimateMaster_TMW060_21kW_4_60COP_R410A.mo
+++ b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/ClimateMaster_TMW060_21kW_4_60COP_R410A.mo
@@ -10,6 +10,7 @@ record ClimateMaster_TMW060_21kW_4_60COP_R410A =
     UACon = 6976.43602782,
     UAEva = 1012.57723222)
     "Calibrated parameters for ClimateMaster TMW060"
+
   annotation (
     defaultComponentPrefixes = "parameter",
     defaultComponentName="datHeaPum",
diff --git a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/ClimateMaster_TMW120_42kW_4_50COP_R410A.mo b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/ClimateMaster_TMW120_42kW_4_50COP_R410A.mo
index 00920ecb19..3c00f5204f 100644
--- a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/ClimateMaster_TMW120_42kW_4_50COP_R410A.mo
+++ b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/ClimateMaster_TMW120_42kW_4_50COP_R410A.mo
@@ -10,6 +10,7 @@ record ClimateMaster_TMW120_42kW_4_50COP_R410A =
     UACon = 11851.7167307,
     UAEva = 2121.46076035)
     "Calibrated parameters for ClimateMaster TMW120"
+
   annotation (
     defaultComponentPrefixes = "parameter",
     defaultComponentName="datHeaPum",
diff --git a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/ClimateMaster_TMW170_48kW_4_30COP_R410A.mo b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/ClimateMaster_TMW170_48kW_4_30COP_R410A.mo
index 69a237c041..12fcbaac6d 100644
--- a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/ClimateMaster_TMW170_48kW_4_30COP_R410A.mo
+++ b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/ClimateMaster_TMW170_48kW_4_30COP_R410A.mo
@@ -10,6 +10,7 @@ record ClimateMaster_TMW170_48kW_4_30COP_R410A =
     UACon = 7127.67902377,
     UAEva = 6702.69056458)
     "Calibrated parameters for ClimateMaster TMW170"
+
   annotation (
     defaultComponentPrefixes = "parameter",
     defaultComponentName="datHeaPum",
diff --git a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/ClimateMaster_TMW340_98kW_4_40COP_R410A.mo b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/ClimateMaster_TMW340_98kW_4_40COP_R410A.mo
index 4fbf0e41a0..f353863c61 100644
--- a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/ClimateMaster_TMW340_98kW_4_40COP_R410A.mo
+++ b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/ClimateMaster_TMW340_98kW_4_40COP_R410A.mo
@@ -10,6 +10,7 @@ record ClimateMaster_TMW340_98kW_4_40COP_R410A =
     UACon = 14154.9112764,
     UAEva = 13705.1289797)
     "Calibrated parameters for ClimateMaster TMW340"
+
   annotation (
     defaultComponentPrefixes = "parameter",
     defaultComponentName="datHeaPum",
diff --git a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA036_13kW_4_50COP_R410A.mo b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA036_13kW_4_50COP_R410A.mo
index 211fa309d5..4a835e5415 100644
--- a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA036_13kW_4_50COP_R410A.mo
+++ b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA036_13kW_4_50COP_R410A.mo
@@ -10,6 +10,7 @@ record Daikin_WRA036_13kW_4_50COP_R410A =
     UACon = 2854.56883514,
     UAEva = 14984.5402787)
     "Calibrated parameters for Daikin WRA036"
+
   annotation (
     defaultComponentPrefixes = "parameter",
     defaultComponentName="datHeaPum",
diff --git a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA048_16kW_4_60COP_R410A.mo b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA048_16kW_4_60COP_R410A.mo
index 097a7a4e56..0e17ffabce 100644
--- a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA048_16kW_4_60COP_R410A.mo
+++ b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA048_16kW_4_60COP_R410A.mo
@@ -10,6 +10,7 @@ record Daikin_WRA048_16kW_4_60COP_R410A =
     UACon = 2860.44257631,
     UAEva = 17688.743889)
     "Calibrated parameters for Daikin WRA048"
+
   annotation (
     defaultComponentPrefixes = "parameter",
     defaultComponentName="datHeaPum",
diff --git a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA060_19kW_4_50COP_R410A.mo b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA060_19kW_4_50COP_R410A.mo
index 5788f2d8d0..c7a28e7ca7 100644
--- a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA060_19kW_4_50COP_R410A.mo
+++ b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA060_19kW_4_50COP_R410A.mo
@@ -10,6 +10,7 @@ record Daikin_WRA060_19kW_4_50COP_R410A =
     UACon = 3132.54953048,
     UAEva = 22163.5117527)
     "Calibrated parameters for Daikin WRA060"
+
   annotation (
     defaultComponentPrefixes = "parameter",
     defaultComponentName="datHeaPum",
diff --git a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA072_24kW_4_30COP_R410A.mo b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA072_24kW_4_30COP_R410A.mo
index fd9385ef0d..366a9d58fe 100644
--- a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA072_24kW_4_30COP_R410A.mo
+++ b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA072_24kW_4_30COP_R410A.mo
@@ -10,6 +10,7 @@ record Daikin_WRA072_24kW_4_30COP_R410A =
     UACon = 3112.7917639,
     UAEva = 29257.8652993)
     "Calibrated parameters for Daikin WRA072"
+
   annotation (
     defaultComponentPrefixes = "parameter",
     defaultComponentName="datHeaPum",
diff --git a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA120_37kW_4_40COP_R410A.mo b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA120_37kW_4_40COP_R410A.mo
index c4ecbe5921..265eb70906 100644
--- a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA120_37kW_4_40COP_R410A.mo
+++ b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA120_37kW_4_40COP_R410A.mo
@@ -10,6 +10,7 @@ record Daikin_WRA120_37kW_4_40COP_R410A =
     UACon = 6395.36493022,
     UAEva = 43952.8437636)
     "Calibrated parameters for Daikin WRA120"
+
   annotation (
     defaultComponentPrefixes = "parameter",
     defaultComponentName="datHeaPum",
diff --git a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA150_49kW_4_70COP_R410A.mo b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA150_49kW_4_70COP_R410A.mo
index 904e956bc0..6a78bd6ea6 100644
--- a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA150_49kW_4_70COP_R410A.mo
+++ b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA150_49kW_4_70COP_R410A.mo
@@ -10,6 +10,7 @@ record Daikin_WRA150_49kW_4_70COP_R410A =
     UACon = 10364.1606457,
     UAEva = 52300.8714734)
     "Calibrated parameters for Daikin WRA150"
+
   annotation (
     defaultComponentPrefixes = "parameter",
     defaultComponentName="datHeaPum",
diff --git a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA180_63kW_4_50COP_R410A.mo b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA180_63kW_4_50COP_R410A.mo
index 938cc09467..71d0835635 100644
--- a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA180_63kW_4_50COP_R410A.mo
+++ b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA180_63kW_4_50COP_R410A.mo
@@ -10,6 +10,7 @@ record Daikin_WRA180_63kW_4_50COP_R410A =
     UACon = 11553.9351864,
     UAEva = 83881.3683749)
     "Calibrated parameters for Daikin WRA180"
+
   annotation (
     defaultComponentPrefixes = "parameter",
     defaultComponentName="datHeaPum",
diff --git a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA240_79kW_4_40COP_R410A.mo b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA240_79kW_4_40COP_R410A.mo
index 2987ad2581..94b7d2b3a2 100644
--- a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA240_79kW_4_40COP_R410A.mo
+++ b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA240_79kW_4_40COP_R410A.mo
@@ -10,6 +10,7 @@ record Daikin_WRA240_79kW_4_40COP_R410A =
     UACon = 12615.4293459,
     UAEva = 94620.7400986)
     "Calibrated parameters for Daikin WRA240"
+
   annotation (
     defaultComponentPrefixes = "parameter",
     defaultComponentName="datHeaPum",
diff --git a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA300_93kW_4_60COP_R410A.mo b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA300_93kW_4_60COP_R410A.mo
index 217a23823a..3d2cbe08e0 100644
--- a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA300_93kW_4_60COP_R410A.mo
+++ b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA300_93kW_4_60COP_R410A.mo
@@ -10,6 +10,7 @@ record Daikin_WRA300_93kW_4_60COP_R410A =
     UACon = 16784.7393136,
     UAEva = 114049.474787)
     "Calibrated parameters for Daikin WRA300"
+
   annotation (
     defaultComponentPrefixes = "parameter",
     defaultComponentName="datHeaPum",
diff --git a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA360_116kW_4_60COP_R410A.mo b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA360_116kW_4_60COP_R410A.mo
index 68ef08ba69..7c15b5b077 100644
--- a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA360_116kW_4_60COP_R410A.mo
+++ b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA360_116kW_4_60COP_R410A.mo
@@ -10,6 +10,7 @@ record Daikin_WRA360_116kW_4_60COP_R410A =
     UACon = 25362.0976534,
     UAEva = 196974.891726)
     "Calibrated parameters for Daikin WRA360"
+
   annotation (
     defaultComponentPrefixes = "parameter",
     defaultComponentName="datHeaPum",
diff --git a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA420_137kW_4_50COP_R410A.mo b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA420_137kW_4_50COP_R410A.mo
index eb23183f6a..f7aa7772eb 100644
--- a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA420_137kW_4_50COP_R410A.mo
+++ b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Daikin_WRA420_137kW_4_50COP_R410A.mo
@@ -10,6 +10,7 @@ record Daikin_WRA420_137kW_4_50COP_R410A =
     UACon = 24801.5921552,
     UAEva = 297902.470363)
     "Calibrated parameters for Daikin WRA420"
+
   annotation (
     defaultComponentPrefixes = "parameter",
     defaultComponentName="datHeaPum",
diff --git a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Trane_EXW060_21kW_4_30COP_R410A.mo b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Trane_EXW060_21kW_4_30COP_R410A.mo
index f6d6e8cd90..41737ef039 100644
--- a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Trane_EXW060_21kW_4_30COP_R410A.mo
+++ b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Trane_EXW060_21kW_4_30COP_R410A.mo
@@ -10,6 +10,7 @@ record Trane_EXW060_21kW_4_30COP_R410A =
     UACon = 3260.47025405,
     UAEva = 41007.3610647)
     "Calibrated parameters for Trane EXW060"
+
   annotation (
     defaultComponentPrefixes = "parameter",
     defaultComponentName="datHeaPum",
diff --git a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Trane_EXW120_40kW_3_90COP_R410A.mo b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Trane_EXW120_40kW_3_90COP_R410A.mo
index 1d65100a84..eb9eddb6fa 100644
--- a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Trane_EXW120_40kW_3_90COP_R410A.mo
+++ b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Trane_EXW120_40kW_3_90COP_R410A.mo
@@ -10,6 +10,7 @@ record Trane_EXW120_40kW_3_90COP_R410A =
     UACon = 4233.2477479,
     UAEva = 38367.2250194)
     "Calibrated parameters for Trane EXW120"
+
   annotation (
     defaultComponentPrefixes = "parameter",
     defaultComponentName="datHeaPum",
diff --git a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Trane_EXW240_76kW_4_10COP_R410A.mo b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Trane_EXW240_76kW_4_10COP_R410A.mo
index 6c58aab366..e307ffa3ec 100644
--- a/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Trane_EXW240_76kW_4_10COP_R410A.mo
+++ b/AixLib/Fluid/HeatPumps/Data/ScrollWaterToWater/Heating/Trane_EXW240_76kW_4_10COP_R410A.mo
@@ -10,6 +10,7 @@ record Trane_EXW240_76kW_4_10COP_R410A =
     UACon = 14814.6977543,
     UAEva = 97189.7265209)
     "Calibrated parameters for Trane EXW240"
+
   annotation (
     defaultComponentPrefixes = "parameter",
     defaultComponentName="datHeaPum",
diff --git a/AixLib/Fluid/HeatPumps/Data/package.mo b/AixLib/Fluid/HeatPumps/Data/package.mo
index 6ee2849ad4..1aac99391a 100644
--- a/AixLib/Fluid/HeatPumps/Data/package.mo
+++ b/AixLib/Fluid/HeatPumps/Data/package.mo
@@ -2,6 +2,7 @@ within AixLib.Fluid.HeatPumps;
 package Data "Package with model parameters for heat pumps"
   extends Modelica.Icons.MaterialPropertiesPackage;
 
-  annotation (preferredView="info", Documentation(info="<html>Package with data for heat pump models.
+  annotation (preferredView="info", Documentation(info="<html>
+  Package with data for heat pump models.
 </html>"));
 end Data;
diff --git a/AixLib/Fluid/HeatPumps/Examples/package.mo b/AixLib/Fluid/HeatPumps/Examples/package.mo
index ab754604b9..38ac7d52e8 100644
--- a/AixLib/Fluid/HeatPumps/Examples/package.mo
+++ b/AixLib/Fluid/HeatPumps/Examples/package.mo
@@ -1,11 +1,11 @@
 within AixLib.Fluid.HeatPumps;
 package Examples "Collection of models that illustrate model use and test models"
   extends Modelica.Icons.ExamplesPackage;
-
-annotation (preferredView="info", Documentation(info="<html><p>
-  This package contains examples for the use of models that can be
-  found in <a href=
-  \"modelica://AixLib.Fluid.HeatPumps\">AixLib.Fluid.HeatPumps</a>.
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains examples for the use of models that can be found in
+<a href=\"modelica://AixLib.Fluid.HeatPumps\">
+AixLib.Fluid.HeatPumps</a>.
 </p>
 </html>"));
 end Examples;
diff --git a/AixLib/Fluid/HeatPumps/package.mo b/AixLib/Fluid/HeatPumps/package.mo
index f7634d1128..e14b977690 100644
--- a/AixLib/Fluid/HeatPumps/package.mo
+++ b/AixLib/Fluid/HeatPumps/package.mo
@@ -1,9 +1,10 @@
 within AixLib.Fluid;
 package HeatPumps "Package with models for heat pumps"
   extends Modelica.Icons.VariantsPackage;
-
-annotation (preferredView="info", Documentation(info="<html><p>
-  This package contains component models for heat pumps.
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains component models for heat pumps.
 </p>
 </html>"));
+
 end HeatPumps;
diff --git a/AixLib/Fluid/Humidifiers/Examples/package.order b/AixLib/Fluid/Humidifiers/Examples/package.order
index 6315fd33b4..2a7b7829e4 100644
--- a/AixLib/Fluid/Humidifiers/Examples/package.order
+++ b/AixLib/Fluid/Humidifiers/Examples/package.order
@@ -1,2 +1,2 @@
-Humidifier_u
 GenericHumidifier_u
+Humidifier_u
diff --git a/AixLib/Fluid/Humidifiers/package.order b/AixLib/Fluid/Humidifiers/package.order
index e008d8cb2e..1dbf04642e 100644
--- a/AixLib/Fluid/Humidifiers/package.order
+++ b/AixLib/Fluid/Humidifiers/package.order
@@ -1,6 +1,6 @@
+GenericHumidifier_u
 Humidifier_u
 SprayAirWasher_X
 SteamHumidifier_X
-GenericHumidifier_u
 Examples
 Validation
diff --git a/AixLib/Fluid/Interfaces/FourPortHeatMassExchanger.mo b/AixLib/Fluid/Interfaces/FourPortHeatMassExchanger.mo
index c421275b22..ea624eaaeb 100644
--- a/AixLib/Fluid/Interfaces/FourPortHeatMassExchanger.mo
+++ b/AixLib/Fluid/Interfaces/FourPortHeatMassExchanger.mo
@@ -69,7 +69,8 @@ model FourPortHeatMassExchanger
     "Heat flow rate into medium 2";
 
   replaceable AixLib.Fluid.MixingVolumes.BaseClasses.MixingVolumeHeatPort vol1
-    constrainedby AixLib.Fluid.MixingVolumes.BaseClasses.MixingVolumeHeatPort(
+    constrainedby
+    AixLib.Fluid.MixingVolumes.BaseClasses.MixingVolumeHeatPort(
         redeclare final package Medium = Medium1,
         nPorts = 2,
         V=m1_flow_nominal*tau1/rho1_nominal,
@@ -90,7 +91,8 @@ model FourPortHeatMassExchanger
     annotation (Placement(transformation(extent={{-10,70}, {10,50}})));
 
   replaceable AixLib.Fluid.MixingVolumes.MixingVolume vol2
-    constrainedby AixLib.Fluid.MixingVolumes.BaseClasses.MixingVolumeHeatPort(
+    constrainedby
+    AixLib.Fluid.MixingVolumes.BaseClasses.MixingVolumeHeatPort(
         redeclare final package Medium = Medium2,
         nPorts = 2,
         V=m2_flow_nominal*tau2/rho2_nominal,
diff --git a/AixLib/Fluid/MixingVolumes/BaseClasses/PartialMixingVolume.mo b/AixLib/Fluid/MixingVolumes/BaseClasses/PartialMixingVolume.mo
index 8f1a41a993..05f4e345f2 100644
--- a/AixLib/Fluid/MixingVolumes/BaseClasses/PartialMixingVolume.mo
+++ b/AixLib/Fluid/MixingVolumes/BaseClasses/PartialMixingVolume.mo
@@ -126,7 +126,8 @@ equation
   // asserts
   if not allowFlowReversal then
     assert(ports[1].m_flow > -m_flow_small,
-"Model has flow reversal, but the parameter allowFlowReversal is set to false.
+  "In " + getInstanceName() + ": Model has flow reversal,
+  but the parameter allowFlowReversal is set to false.
   m_flow_small    = " + String(m_flow_small) + "
   ports[1].m_flow = " + String(ports[1].m_flow) + "
 ");
@@ -298,6 +299,13 @@ AixLib.Fluid.MixingVolumes</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+October 30, 2019 by Filip Jorissen:<br/>
+Added <code>getInstanceName()</code> to flow
+reversal check.
+This if or <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1228\">
+issue 1228</a>.
+</li>
+<li>
 October 19, 2017, by Michael Wetter:<br/>
 Changed initialization of pressure from a <code>constant</code> to a <code>parameter</code>.<br/>
 Removed <code>partial</code> keyword as this model is not partial.<br/>
diff --git a/AixLib/Fluid/MixingVolumes/Validation/BaseClasses/MixingVolumeReverseFlow.mo b/AixLib/Fluid/MixingVolumes/Validation/BaseClasses/MixingVolumeReverseFlow.mo
index c29922ce02..d88d814830 100644
--- a/AixLib/Fluid/MixingVolumes/Validation/BaseClasses/MixingVolumeReverseFlow.mo
+++ b/AixLib/Fluid/MixingVolumes/Validation/BaseClasses/MixingVolumeReverseFlow.mo
@@ -27,7 +27,7 @@ partial model MixingVolumeReverseFlow
         rotation=180,
         origin={70,-20})));
   replaceable AixLib.Fluid.MixingVolumes.MixingVolume volDyn
-    constrainedby AixLib.Fluid.MixingVolumes.BaseClasses.PartialMixingVolume(
+    constrainedby AixLib.Fluid.MixingVolumes.BaseClasses.MixingVolumeHeatPort(
         redeclare package Medium = Medium,
         V=1,
         nPorts=2,
@@ -37,7 +37,7 @@ partial model MixingVolumeReverseFlow
     annotation (Placement(transformation(extent={{10,0},{30,20}})));
 
   replaceable AixLib.Fluid.MixingVolumes.MixingVolume volSte
-    constrainedby AixLib.Fluid.MixingVolumes.BaseClasses.PartialMixingVolume(
+    constrainedby AixLib.Fluid.MixingVolumes.BaseClasses.MixingVolumeHeatPort(
         redeclare package Medium = Medium,
         final prescribedHeatFlowRate = prescribedHeatFlowRate,
         V=1,
@@ -93,6 +93,12 @@ The mass flow rate starts positive and reverses its direction at <i>t=5</i> seco
 </html>", revisions="<html>
 <ul>
 <li>
+December 23, 2019, by Michael Wetter:<br/>
+Changed constraining clause to ensure that heat port is present.<br/>
+This is for
+<a href=\"modelica://https://github.com/ibpsa/modelica-ibpsa/issues/1268\">AixLib, #1268</a>.
+</li>
+<li>
 January 19, 2016, by Michael Wetter:<br/>
 First implementation.
 </li>
diff --git a/AixLib/Fluid/MixingVolumes/package.mo b/AixLib/Fluid/MixingVolumes/package.mo
index c96280b1d2..ba1a22d300 100644
--- a/AixLib/Fluid/MixingVolumes/package.mo
+++ b/AixLib/Fluid/MixingVolumes/package.mo
@@ -1,7 +1,6 @@
 within AixLib.Fluid;
 package MixingVolumes "Package with mixing volumes"
   extends Modelica.Icons.VariantsPackage;
-
 annotation (Documentation(info="<html>
 <p>
 This package contains models for completely mixed volumes.
diff --git a/AixLib/Fluid/Movers/BaseClasses/PartialFlowMachine.mo b/AixLib/Fluid/Movers/BaseClasses/PartialFlowMachine.mo
index 1f55dc77bf..c54741c6b1 100644
--- a/AixLib/Fluid/Movers/BaseClasses/PartialFlowMachine.mo
+++ b/AixLib/Fluid/Movers/BaseClasses/PartialFlowMachine.mo
@@ -469,23 +469,23 @@ equation
           visible=not use_inputFilter,
           points={{0,100},{0,40}}),
         Rectangle(
-          extent={{-100,16},{100,-14}},
+          extent={{-100,16},{100,-16}},
           lineColor={0,0,0},
           fillColor={0,127,255},
           fillPattern=FillPattern.HorizontalCylinder),
         Ellipse(
-          extent={{-58,50},{54,-58}},
+          extent={{-58,58},{58,-58}},
           lineColor={0,0,0},
           fillPattern=FillPattern.Sphere,
           fillColor={0,100,199}),
         Polygon(
-          points={{0,50},{0,-56},{54,2},{0,50}},
+          points={{0,50},{0,-50},{54,0},{0,50}},
           lineColor={0,0,0},
           pattern=LinePattern.None,
           fillPattern=FillPattern.HorizontalCylinder,
           fillColor={255,255,255}),
         Ellipse(
-          extent={{4,14},{34,-16}},
+          extent={{4,16},{36,-16}},
           lineColor={0,0,0},
           fillPattern=FillPattern.Sphere,
           visible=energyDynamics <> Modelica.Fluid.Types.Dynamics.SteadyState,
@@ -523,9 +523,14 @@ the enthalpy of the medium), but this setting does in some cases lead to simpler
 and more robust simulation, in particular if the mass flow is equal to zero.
 </p>
 </html>",
-      revisions="<html>
+revisions="<html>
 <ul>
 <li>
+October 25, 2019, by Jianjun Hu:<br/>
+Improved icon graphics annotation. This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1225\">#1225</a>.
+</li>
+<li>
 January 22, 2019, by Filip Jorissen:<br/>
 Split long assert output string into two strings to avoid compiler warnings
 in JModelica.<br/>
diff --git a/AixLib/Fluid/Movers/Compressors/Examples/package.order b/AixLib/Fluid/Movers/Compressors/Examples/package.order
index 8001d0fb36..2138466c66 100644
--- a/AixLib/Fluid/Movers/Compressors/Examples/package.order
+++ b/AixLib/Fluid/Movers/Compressors/Examples/package.order
@@ -1,4 +1,4 @@
+ModularRotaryCompressor
 RotaryCompressor
-RotaryCompressorPressureLosses
 RotaryCompressorPressureHeatLosses
-ModularRotaryCompressor
+RotaryCompressorPressureLosses
diff --git a/AixLib/Fluid/Movers/Examples/PumpsParallel.mo b/AixLib/Fluid/Movers/Examples/PumpsParallel.mo
index 037b0bd380..3149db9945 100644
--- a/AixLib/Fluid/Movers/Examples/PumpsParallel.mo
+++ b/AixLib/Fluid/Movers/Examples/PumpsParallel.mo
@@ -107,7 +107,7 @@ equation
       color={0,127,255},
       smooth=Smooth.None));
   connect(const1.y, floMac1.y) annotation (Line(
-      points={{21,140},{30,140},{30,122}},
+      points={{21,140},{29.8,140},{29.8,122}},
       color={0,0,127},
       smooth=Smooth.None));
   annotation (
diff --git a/AixLib/Fluid/Movers/Examples/PumpsSeries.mo b/AixLib/Fluid/Movers/Examples/PumpsSeries.mo
index 642f5f27e0..ff09c9d27a 100644
--- a/AixLib/Fluid/Movers/Examples/PumpsSeries.mo
+++ b/AixLib/Fluid/Movers/Examples/PumpsSeries.mo
@@ -47,7 +47,7 @@ model PumpsSeries "Two flow machines in series"
     nPorts=1) annotation (Placement(transformation(extent={{156,50},{136,70}})));
 equation
   connect(const1.y, floMac1.y) annotation (Line(
-      points={{-19,90},{-10,90},{-10,72}},
+      points={{-19,90},{-10.2,90},{-10.2,72}},
       color={0,0,127},
       smooth=Smooth.None));
   connect(floMac1.port_b, floMac2.port_a) annotation (Line(
diff --git a/AixLib/Fluid/Movers/PumpsPolynomialBased/BaseClasses/efficiencyCharacteristic/package.order b/AixLib/Fluid/Movers/PumpsPolynomialBased/BaseClasses/efficiencyCharacteristic/package.order
index dbeca903b8..9181b1afd8 100644
--- a/AixLib/Fluid/Movers/PumpsPolynomialBased/BaseClasses/efficiencyCharacteristic/package.order
+++ b/AixLib/Fluid/Movers/PumpsPolynomialBased/BaseClasses/efficiencyCharacteristic/package.order
@@ -1,2 +1,2 @@
-baseEfficiency
 Wilo_Formula_efficiency
+baseEfficiency
diff --git a/AixLib/Fluid/Movers/PumpsPolynomialBased/BaseClasses/package.order b/AixLib/Fluid/Movers/PumpsPolynomialBased/BaseClasses/package.order
index 82b021e7da..f0240a3aea 100644
--- a/AixLib/Fluid/Movers/PumpsPolynomialBased/BaseClasses/package.order
+++ b/AixLib/Fluid/Movers/PumpsPolynomialBased/BaseClasses/package.order
@@ -1,7 +1,7 @@
-powerInt
+PumpBus
+VariableLimiter
 polynomial2D
 polynomialABC
 polynomialABCinverse
-VariableLimiter
-PumpBus
+powerInt
 efficiencyCharacteristic
diff --git a/AixLib/Fluid/Movers/PumpsPolynomialBased/Controls/package.order b/AixLib/Fluid/Movers/PumpsPolynomialBased/Controls/package.order
index f56593c85f..9f683fef38 100644
--- a/AixLib/Fluid/Movers/PumpsPolynomialBased/Controls/package.order
+++ b/AixLib/Fluid/Movers/PumpsPolynomialBased/Controls/package.order
@@ -1,4 +1,4 @@
-BaseClasses
-CtrlPassThroughN
 CtrlDpVarH
 CtrlDpVarN
+CtrlPassThroughN
+BaseClasses
diff --git a/AixLib/Fluid/Movers/PumpsPolynomialBased/Examples/package.order b/AixLib/Fluid/Movers/PumpsPolynomialBased/Examples/package.order
index edcdbeb1c8..40c4ba7b5e 100644
--- a/AixLib/Fluid/Movers/PumpsPolynomialBased/Examples/package.order
+++ b/AixLib/Fluid/Movers/PumpsPolynomialBased/Examples/package.order
@@ -1,4 +1,4 @@
-PumpSpeedControlledTest
-PumpSpeedControlledLimiterTest
 PumpHdpVarControlTest
 PumpNdpVarControlTest
+PumpSpeedControlledLimiterTest
+PumpSpeedControlledTest
diff --git a/AixLib/Fluid/Movers/Validation/BaseClasses/ControlledFlowMachine.mo b/AixLib/Fluid/Movers/Validation/BaseClasses/ControlledFlowMachine.mo
index 85204514b5..8967df09e1 100644
--- a/AixLib/Fluid/Movers/Validation/BaseClasses/ControlledFlowMachine.mo
+++ b/AixLib/Fluid/Movers/Validation/BaseClasses/ControlledFlowMachine.mo
@@ -134,7 +134,7 @@ equation
       points={{-39,140},{-10,140},{-10,122}},
       color={0,0,127}));
   connect(masFloRat1.m_flow, fan2.m_flow_in) annotation (Line(
-      points={{70,71},{70,86},{42,86},{42,4},{-10,4},{-10,-8}},
+      points={{70,71},{70,86},{42,86},{42,4},{-10.2,4},{-10.2,-8}},
       color={0,0,127}));
   connect(relPre.p_rel, fan3.dp_in) annotation (Line(
       points={{-10,23},{-10,8},{-24,8},{-24,-40},{-10,-40},{-10,-48}},
diff --git a/AixLib/Fluid/Movers/Validation/FlowControlled_dp.mo b/AixLib/Fluid/Movers/Validation/FlowControlled_dp.mo
index bae48346be..fe2311fea5 100644
--- a/AixLib/Fluid/Movers/Validation/FlowControlled_dp.mo
+++ b/AixLib/Fluid/Movers/Validation/FlowControlled_dp.mo
@@ -16,10 +16,10 @@ model FlowControlled_dp "Fan with zero mass flow rate and head as input"
 
 equation
   connect(gain.y, floMacSta.dp_in) annotation (Line(
-      points={{-25,100},{30,100},{30,92}},
+      points={{-25,100},{29.8,100},{29.8,92}},
       color={0,0,127}));
   connect(gain.y, floMacDyn.dp_in) annotation (Line(
-      points={{-25,100},{10,100},{10,30},{30,30},{30,12}},
+      points={{-25,100},{10,100},{10,30},{29.8,30},{29.8,12}},
       color={0,0,127}));
   annotation (
     Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{160,
diff --git a/AixLib/Fluid/Movers/Validation/FlowControlled_dpSystem.mo b/AixLib/Fluid/Movers/Validation/FlowControlled_dpSystem.mo
index 6b364acce2..af46e10e47 100644
--- a/AixLib/Fluid/Movers/Validation/FlowControlled_dpSystem.mo
+++ b/AixLib/Fluid/Movers/Validation/FlowControlled_dpSystem.mo
@@ -134,10 +134,10 @@ model FlowControlled_dpSystem
     m_flow_nominal=m_flow_nominal/2) "Duct pressure drop"
     annotation (Placement(transformation(extent={{0,30},{20,50}})));
 equation
-  connect(y.y, floConDp.dp_in) annotation (Line(points={{-99,90},{-70,90},{-70,
+  connect(y.y, floConDp.dp_in) annotation (Line(points={{-99,90},{-70.2,90},{-70.2,
           72}}, color={0,0,127}));
   connect(y.y, floConDpSystem.dp_in) annotation (Line(points={{-99,90},{-90,90},
-          {-90,20},{-70,20},{-70,-68},{-70,-68}},
+          {-90,20},{-70,20},{-70,-68},{-70.2,-68}},
                                            color={0,0,127}));
   connect(zone2.ports[1], sin.ports[1])
     annotation (Line(points={{88,40},{100,40},{100,3}},    color={0,127,255}));
diff --git a/AixLib/Fluid/Movers/Validation/FlowControlled_m_flow.mo b/AixLib/Fluid/Movers/Validation/FlowControlled_m_flow.mo
index 876281b2c9..717ff2be63 100644
--- a/AixLib/Fluid/Movers/Validation/FlowControlled_m_flow.mo
+++ b/AixLib/Fluid/Movers/Validation/FlowControlled_m_flow.mo
@@ -17,10 +17,10 @@ model FlowControlled_m_flow
 
 equation
   connect(gain.y, floMacSta.m_flow_in) annotation (Line(
-      points={{-25,100},{30,100},{30,92}},
+      points={{-25,100},{29.8,100},{29.8,92}},
       color={0,0,127}));
   connect(gain.y, floMacDyn.m_flow_in) annotation (Line(
-      points={{-25,100},{10,100},{10,30},{30,30},{30,12}},
+      points={{-25,100},{10,100},{10,30},{29.8,30},{29.8,12}},
       color={0,0,127}));
   annotation (
     Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{160,
diff --git a/AixLib/Fluid/Movers/package.order b/AixLib/Fluid/Movers/package.order
index 418965ddff..e9aa8c4fb3 100644
--- a/AixLib/Fluid/Movers/package.order
+++ b/AixLib/Fluid/Movers/package.order
@@ -4,8 +4,8 @@ FlowControlled_m_flow
 Pump
 SpeedControlled_Nrpm
 SpeedControlled_y
-PumpsPolynomialBased
 Compressors
+PumpsPolynomialBased
 Data
 Examples
 Validation
diff --git a/AixLib/Fluid/Sensors/Conversions/Examples/package.mo b/AixLib/Fluid/Sensors/Conversions/Examples/package.mo
index a21009a5ca..eec4869b0e 100644
--- a/AixLib/Fluid/Sensors/Conversions/Examples/package.mo
+++ b/AixLib/Fluid/Sensors/Conversions/Examples/package.mo
@@ -1,7 +1,6 @@
 within AixLib.Fluid.Sensors.Conversions;
 package Examples "Collection of models that illustrate model use and test models"
   extends Modelica.Icons.ExamplesPackage;
-
 annotation (preferredView="info", Documentation(info="<html>
 <p>
 This package contains examples for the use of models that can be found in
diff --git a/AixLib/Fluid/Sensors/Conversions/package.mo b/AixLib/Fluid/Sensors/Conversions/package.mo
index a4c5a1c4e2..dcf02cdcc7 100644
--- a/AixLib/Fluid/Sensors/Conversions/package.mo
+++ b/AixLib/Fluid/Sensors/Conversions/package.mo
@@ -1,7 +1,6 @@
 within AixLib.Fluid.Sensors;
 package Conversions "Package with conversions for sensor models"
   extends Modelica.Icons.Package;
-
 annotation (preferredView="info", Documentation(info="<html>
 This package contains models to convert sensor output.
 </html>"));
diff --git a/AixLib/Fluid/Sensors/Examples/package.mo b/AixLib/Fluid/Sensors/Examples/package.mo
index 2446ec0adc..4b38cfea1b 100644
--- a/AixLib/Fluid/Sensors/Examples/package.mo
+++ b/AixLib/Fluid/Sensors/Examples/package.mo
@@ -1,7 +1,6 @@
 within AixLib.Fluid.Sensors;
 package Examples "Collection of models that illustrate model use and test models"
   extends Modelica.Icons.ExamplesPackage;
-
 annotation (preferredView="info", Documentation(info="<html>
 <p>
 This package contains examples for the use of models that can be found in
diff --git a/AixLib/Fluid/Sensors/TraceSubstances.mo b/AixLib/Fluid/Sensors/TraceSubstances.mo
index f6844f9b85..e331980cab 100644
--- a/AixLib/Fluid/Sensors/TraceSubstances.mo
+++ b/AixLib/Fluid/Sensors/TraceSubstances.mo
@@ -15,7 +15,8 @@ protected
                                             string2=substanceName,
                                             caseSensitive=false))
     then 1 else 0 for i in 1:Medium.nC}
-    "Vector with zero everywhere except where species is";
+    "Vector with zero everywhere except where species is"
+    annotation(Evaluate=true);
 initial equation
   assert(max(s) > 0.9, "Trace substance '" + substanceName + "' is not present in medium '"
          + Medium.mediumName + "'.\n"
diff --git a/AixLib/Fluid/Sensors/package.mo b/AixLib/Fluid/Sensors/package.mo
index 46115775d5..6a70f598f8 100644
--- a/AixLib/Fluid/Sensors/package.mo
+++ b/AixLib/Fluid/Sensors/package.mo
@@ -1,7 +1,6 @@
 within AixLib.Fluid;
 package Sensors "Package with sensor models"
   extends Modelica.Icons.SensorsPackage;
-
 annotation (preferredView="info",
 Documentation(info="<html>
 <p>
diff --git a/AixLib/Fluid/Sources/BaseClasses/Outside.mo b/AixLib/Fluid/Sources/BaseClasses/Outside.mo
index 9116fda8bd..476d769f66 100644
--- a/AixLib/Fluid/Sources/BaseClasses/Outside.mo
+++ b/AixLib/Fluid/Sources/BaseClasses/Outside.mo
@@ -25,18 +25,9 @@ protected
   AixLib.Utilities.Psychrometrics.X_pTphi x_pTphi if
        not singleSubstance "Block to compute water vapor concentration";
 
-  Modelica.Blocks.Interfaces.RealInput X_in_internal[Medium.nX](
-    each final unit="kg/kg",
-    final quantity=Medium.substanceNames)
-    "Needed to connect to conditional connector";
   Modelica.Blocks.Interfaces.RealInput T_in_internal(final unit="K",
                                                      displayUnit="degC")
     "Needed to connect to conditional connector";
-  Modelica.Blocks.Interfaces.RealInput p_in_internal(final unit="Pa")
-    "Needed to connect to conditional connector";
-  Modelica.Blocks.Interfaces.RealInput C_in_internal[Medium.nC](
-       quantity=Medium.extraPropertiesNames)
-    "Needed to connect to conditional connector";
   Modelica.Blocks.Interfaces.RealInput h_internal = Medium.specificEnthalpy(
     Medium.setState_pTX(p_in_internal, T_in_internal, X_in_internal));
 
@@ -132,9 +123,15 @@ with exception of boundary pressure, do not have an effect.
 revisions="<html>
 <ul>
 <li>
+November 14, 2019, by Michael Wetter:<br/>
+Removed duplicate connector.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1248\"> #1248</a>.
+</li>
+<li>
 January 14, 2019 by Jianjun Hu:<br/>
 Changed to extend <a href=\"modelica://AixLib.Fluid.Sources.BaseClasses.PartialSource\">
-AixLib.Fluid.Sources.BaseClasses.PartialSource</a>. This is for 
+AixLib.Fluid.Sources.BaseClasses.PartialSource</a>. This is for
 <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1050\"> #1050</a>.
 </li>
 <li>
diff --git a/AixLib/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo b/AixLib/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo
index f16895feee..2a5485503c 100644
--- a/AixLib/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo
+++ b/AixLib/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo
@@ -49,19 +49,31 @@ equation
     Modelica.Fluid.Utilities.checkBoundary(Medium.mediumName, Medium.substanceNames,
       Medium.singleState, true, X_in_internal, "Boundary_pT");
   end if;
-  connect(X_in[1:Medium.nXi], Xi_in_internal);
-  connect(X_in,X_in_internal);
+
+  // Assign Xi_in_internal and X_in_internal
+  // Note that at most one of X_in or Xi_in is present
+  connect(X_in, X_in_internal);
   connect(Xi_in, Xi_in_internal);
-  connect(C_in, C_in_internal);
 
-  connect(medium.Xi, Xi_in_internal);
-  if not use_X_in and not use_Xi_in then
-    Xi_in_internal = X[1:Medium.nXi];
-  end if;
-  if not use_X_in then
+  if use_Xi_in then
+    // Must assign all components of X_in_internal, using Xi_in
+    X_in_internal[1:Medium.nXi] = Xi_in_internal[1:Medium.nXi];
+    // If reducedX = true, medium contains the equation sum(X) = 1.0
+    // Media with only one substance (e.g., water) have reducedX=true
+    // FlueGas and SimpleNaturalGas has reducedX = false
+    if Medium.reducedX then
+      X_in_internal[Medium.nX] = 1-sum(Xi_in_internal);
+    end if;
+  elseif use_X_in then
     X_in_internal[1:Medium.nXi] = Xi_in_internal[1:Medium.nXi];
-    X_in_internal[Medium.nX] = 1-sum(X_in_internal[1:Medium.nXi]);
+  else
+    // No connector is used. Use parameter X.
+    X_in_internal = X;
+    Xi_in_internal = X[1:Medium.nXi];
   end if;
+
+  connect(C_in, C_in_internal);
+
   if not use_C_in then
     C_in_internal = C;
   end if;
@@ -108,6 +120,16 @@ Otherwise the parameter value is used.
 </html>", revisions="<html>
 <ul>
 <li>
+September 19, 2019, by Michael Wetter:<br/>
+Refactored handling of mass fractions which was needed to handle media such as
+<a href=\"modelica://Modelica.Media.IdealGases.MixtureGases.FlueGasSixComponents\">
+Modelica.Media.IdealGases.MixtureGases.FlueGasSixComponents</a> and
+<a href=\"modelica://Modelica.Media.IdealGases.MixtureGases.SimpleNaturalGas\">
+Modelica.Media.IdealGases.MixtureGases.SimpleNaturalGas</a>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1205\">AixLib, #1205</a>.
+</li>
+<li>
 February 13, 2018, by Michael Wetter:<br/>
 Corrected error in quantity assignment for <code>Xi_in</code>.
 This is for
diff --git a/AixLib/Fluid/Sources/MassFlowSource_WeatherData.mo b/AixLib/Fluid/Sources/MassFlowSource_WeatherData.mo
index 41c92e2867..2d3008c4dc 100644
--- a/AixLib/Fluid/Sources/MassFlowSource_WeatherData.mo
+++ b/AixLib/Fluid/Sources/MassFlowSource_WeatherData.mo
@@ -50,13 +50,6 @@ protected
   Modelica.Blocks.Interfaces.RealInput h_in_internal(
     final unit="J/kg")
     "Needed to connect to conditional connector";
-  Modelica.Blocks.Interfaces.RealOutput X_in_internal[Medium.nX](
-    each final unit = "kg/kg",
-    final quantity=Medium.substanceNames)
-    "Needed to connect to conditional connector";
-  Modelica.Blocks.Interfaces.RealOutput C_in_internal[Medium.nC](
-    final quantity=Medium.extraPropertiesNames)
-    "Needed to connect to conditional connector";
 
 equation
   Modelica.Fluid.Utilities.checkBoundary(
@@ -194,9 +187,15 @@ with exception of boundary flow rate, do not have an effect.
 revisions="<html>
 <ul>
 <li>
+November 14, 2019, by Michael Wetter:<br/>
+Removed duplicate connector.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1248\"> #1248</a>.
+</li>
+<li>
 January 14, 2019 by Jianjun Hu:<br/>
 Changed to extend <a href=\"modelica://AixLib.Fluid.Sources.BaseClasses.PartialSource\">
-AixLib.Fluid.Sources.BaseClasses.PartialSource</a>. This is for 
+AixLib.Fluid.Sources.BaseClasses.PartialSource</a>. This is for
 <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1050\"> #1050</a>.
 </li>
 <li>
diff --git a/AixLib/Fluid/Sources/TraceSubstancesFlowSource.mo b/AixLib/Fluid/Sources/TraceSubstancesFlowSource.mo
index eb1538d28c..98fd065972 100644
--- a/AixLib/Fluid/Sources/TraceSubstancesFlowSource.mo
+++ b/AixLib/Fluid/Sources/TraceSubstancesFlowSource.mo
@@ -28,12 +28,16 @@ model TraceSubstancesFlowSource
     annotation (Placement(transformation(extent={{90,40},{110,-40}})));
 
 protected
+  parameter Medium.ExtraProperty C_in_internal[Medium.nC](
+    final quantity=Medium.extraPropertiesNames)=
+     {if (Modelica.Utilities.Strings.isEqual(string1=Medium.extraPropertiesNames[i],
+                                             string2=substanceName,
+                                             caseSensitive=false)) then 1 else 0
+                                             for i in 1:Medium.nC}
+     "Boundary trace substances"
+     annotation(Evaluate=true);
   Modelica.Blocks.Interfaces.RealInput m_flow_in_internal(final unit="kg/s")
     "Needed to connect to conditional connector";
-  parameter Medium.ExtraProperty C_in_internal[Medium.nC](
-    each fixed=false,
-    final quantity=Medium.extraPropertiesNames) "Boundary trace substances"
-    annotation (Dialog(enable = Medium.nC > 0));
 
   Modelica.SIunits.SpecificEnthalpy h_default=
     Medium.specificEnthalpy(Medium.setState_pTX(
@@ -42,20 +46,11 @@ protected
       Medium.X_default))
       "Enthalpy of outstreaming medium";
 
-initial algorithm
-  for i in 1:Medium.nC loop
-    if ( Modelica.Utilities.Strings.isEqual(string1=Medium.extraPropertiesNames[i],
-                                            string2=substanceName,
-                                            caseSensitive=false)) then
-      C_in_internal[i] := 1;
-    else
-      C_in_internal[i] := 0;
-    end if;
-  end for;
+initial equation
   assert(sum(C_in_internal) > 1E-4, "Trace substance '" + substanceName + "' is not present in medium '"
          + Medium.mediumName + "'.\n"
          + "Check source parameter and medium model.");
-initial equation
+
   // Only one connection allowed to a port to avoid unwanted ideal mixing
   for i in 1:nPorts loop
     assert(cardinality(ports[i]) <= 1,"
@@ -111,6 +106,11 @@ which is more efficient than using this model.
 </html>", revisions="<html>
 <ul>
 <li>
+November 14, 2019, by Michael Wetter:<br/>
+Rewrote assignment of <code>C_in_internal</code> to avoid an initial algorithm section.<br/>
+This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1250\">#1250</a>.
+</li>
+<li>
 January 23, 2019, by Michael Wetter:<br/>
 Refactored implementation to provide default medium choice.
 This refactoring removes the dependency of the base class but is
diff --git a/AixLib/Fluid/Sources/Validation/BaseClasses/BoundarySystem.mo b/AixLib/Fluid/Sources/Validation/BaseClasses/BoundarySystem.mo
new file mode 100644
index 0000000000..06da348169
--- /dev/null
+++ b/AixLib/Fluid/Sources/Validation/BaseClasses/BoundarySystem.mo
@@ -0,0 +1,51 @@
+within AixLib.Fluid.Sources.Validation.BaseClasses;
+model BoundarySystem "System model for testing of boundary condition"
+  extends Modelica.Blocks.Icons.Block;
+  replaceable package Medium =
+    Modelica.Media.Interfaces.PartialMedium "Medium in the component";
+
+ Boundary_pT sou(redeclare final package Medium = Medium, nPorts=1) "Boundary"
+    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
+  MassFlowSource_T sin(
+    redeclare final package Medium = Medium,
+    m_flow=-1,
+    nPorts=1) "Mass flow source"
+    annotation (Placement(transformation(extent={{60,-10},{40,10}})));
+  Modelica.SIunits.Temperature T = senTem.T "Temperature coming out of the source";
+  Modelica.SIunits.MassFraction Xi[Medium.nXi]=sou.ports[1].Xi_outflow
+    "Mass fraction coming out of the source";
+  Modelica.SIunits.Pressure p = sou.ports[1].p "Pressure in the source";
+  Modelica.Fluid.Sensors.TemperatureTwoPort senTem(
+    redeclare package Medium = Medium,
+    allowFlowReversal=false,
+    m_flow_nominal=1,
+    m_flow_small=1E-4) "Temperature sensor"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+  inner Modelica.Fluid.System system
+    annotation (Placement(transformation(extent={{-80,60},{-60,80}})));
+equation
+  connect(sou.ports[1], senTem.port_a)
+    annotation (Line(points={{-40,0},{-10,0}}, color={0,127,255}));
+  connect(sin.ports[1], senTem.port_b)
+    annotation (Line(points={{40,0},{10,0}}, color={0,127,255}));
+  annotation (Documentation(info="<html>
+<p>
+System model used to test the boundary conditions for different media.
+This model has been introduced to get access to the medium mass fraction,
+which is a protected variable in
+<a href=\"modelica://AixLib.Fluid.Sources.Boundary_pT\">
+AixLib.Fluid.Sources.Boundary_pT</a>.
+Therefore, this model has been created so that the boundary model has a port which
+is used to access the mass fraction.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+September 13, 2019 by Michael Wetter:<br/>
+First implementation.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1205\">AixLib, #1205</a>.
+</li>
+</ul>
+</html>"));
+end BoundarySystem;
diff --git a/AixLib/Fluid/Sources/Validation/BaseClasses/BoundarySystemWithX_in.mo b/AixLib/Fluid/Sources/Validation/BaseClasses/BoundarySystemWithX_in.mo
new file mode 100644
index 0000000000..c5b9a6bce5
--- /dev/null
+++ b/AixLib/Fluid/Sources/Validation/BaseClasses/BoundarySystemWithX_in.mo
@@ -0,0 +1,29 @@
+within AixLib.Fluid.Sources.Validation.BaseClasses;
+model BoundarySystemWithX_in
+  "System model for testing boundary condition with mass fraction input"
+  extends AixLib.Fluid.Sources.Validation.BaseClasses.BoundarySystem(sou(use_X_in=true));
+  Modelica.Blocks.Interfaces.RealInput X_in[Medium.nX]
+    "Prescribed boundary composition"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
+equation
+  for i in 1:Medium.nXi loop
+    assert(abs(Xi[i] - X_in[i]) < 1E-6, "Error in implementation of mass fraction");
+  end for;
+  connect(sou.X_in, X_in) annotation (Line(points={{-62,-4},{-82,-4},{-82,0},{-120,
+          0}},      color={0,0,127}));
+  annotation (Documentation(info="<html>
+<p>
+System model used to test the boundary conditions for different media
+with prescribed mass fraction <code>X</code>.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+September 13, 2019 by Michael Wetter:<br/>
+First implementation.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1205\">AixLib, #1205</a>.
+</li>
+</ul>
+</html>"));
+end BoundarySystemWithX_in;
diff --git a/AixLib/Fluid/Sources/Validation/BaseClasses/BoundarySystemWithXi_in.mo b/AixLib/Fluid/Sources/Validation/BaseClasses/BoundarySystemWithXi_in.mo
new file mode 100644
index 0000000000..630c6dcb98
--- /dev/null
+++ b/AixLib/Fluid/Sources/Validation/BaseClasses/BoundarySystemWithXi_in.mo
@@ -0,0 +1,29 @@
+within AixLib.Fluid.Sources.Validation.BaseClasses;
+model BoundarySystemWithXi_in
+  "System model for testing boundary condition with mass fraction input"
+  extends AixLib.Fluid.Sources.Validation.BaseClasses.BoundarySystem(sou(use_Xi_in=true));
+  Modelica.Blocks.Interfaces.RealInput Xi_in[Medium.nXi]
+    "Prescribed boundary composition"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
+equation
+  for i in 1:Medium.nXi loop
+    assert(abs(Xi[i] - Xi_in[i]) < 1E-6, "Error in implementation of mass fraction");
+  end for;
+  connect(sou.Xi_in, Xi_in) annotation (Line(points={{-62,-4},{-82,-4},{-82,0},{
+          -120,0}}, color={0,0,127}));
+  annotation (Documentation(info="<html>
+<p>
+System model used to test the boundary conditions for different media
+with independent prescribed mass fraction <code>Xi</code>.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+September 13, 2019 by Michael Wetter:<br/>
+First implementation.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1205\">AixLib, #1205</a>.
+</li>
+</ul>
+</html>"));
+end BoundarySystemWithXi_in;
diff --git a/AixLib/Fluid/Sources/Validation/BaseClasses/package.mo b/AixLib/Fluid/Sources/Validation/BaseClasses/package.mo
new file mode 100644
index 0000000000..5403e2448b
--- /dev/null
+++ b/AixLib/Fluid/Sources/Validation/BaseClasses/package.mo
@@ -0,0 +1,11 @@
+within AixLib.Fluid.Sources.Validation;
+package BaseClasses "Package with base classes for AixLib.Fluid.Sources.Validation"
+  extends Modelica.Icons.BasesPackage;
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains base classes that are used to construct the models in
+<a href=\"modelica://AixLib.Fluid.Sources.Validation\">
+AixLib.Fluid.Sources.Validation</a>.
+</p>
+</html>"));
+end BaseClasses;
diff --git a/AixLib/Fluid/Sources/Validation/BaseClasses/package.order b/AixLib/Fluid/Sources/Validation/BaseClasses/package.order
new file mode 100644
index 0000000000..7084eb6024
--- /dev/null
+++ b/AixLib/Fluid/Sources/Validation/BaseClasses/package.order
@@ -0,0 +1,3 @@
+BoundarySystem
+BoundarySystemWithX_in
+BoundarySystemWithXi_in
diff --git a/AixLib/Fluid/Sources/Validation/Boundary.mo b/AixLib/Fluid/Sources/Validation/Boundary.mo
new file mode 100644
index 0000000000..c6e07f384c
--- /dev/null
+++ b/AixLib/Fluid/Sources/Validation/Boundary.mo
@@ -0,0 +1,62 @@
+within AixLib.Fluid.Sources.Validation;
+model Boundary "Validation model for boundary with different media"
+  extends Modelica.Icons.Example;
+
+ AixLib.Fluid.Sources.Validation.BaseClasses.BoundarySystem bouWat(
+   redeclare package Medium = AixLib.Media.Water)
+   "Boundary with water"
+    annotation (Placement(transformation(extent={{-60,60},{-40,80}})));
+ AixLib.Fluid.Sources.Validation.BaseClasses.BoundarySystem bouProGly(
+    redeclare package Medium = Media.Antifreeze.PropyleneGlycolWater(property_T=293.15, X_a=0.40))
+    "Boundary with propylene glycol"
+    annotation (Placement(transformation(extent={{-60,30},{-40,50}})));
+
+  AixLib.Fluid.Sources.Validation.BaseClasses.BoundarySystem bouMoiAir(
+    redeclare package Medium = AixLib.Media.Air)
+    "Boundary with moist air"
+    annotation (Placement(transformation(extent={{20,60},{40,80}})));
+  AixLib.Fluid.Sources.Validation.BaseClasses.BoundarySystem bouMoiAirCO2(
+    redeclare package Medium = AixLib.Media.Air(extraPropertiesNames={"CO2"}))
+    "Boundary with moist air"
+    annotation (Placement(transformation(extent={{20,30},{40,50}})));
+ AixLib.Fluid.Sources.Validation.BaseClasses.BoundarySystem bouProFluGas(
+   redeclare package Medium =
+        Modelica.Media.IdealGases.MixtureGases.FlueGasSixComponents)
+    "Boundary with flue gas"
+    annotation (Placement(transformation(extent={{20,0},{40,20}})));
+
+  AixLib.Fluid.Sources.Validation.BaseClasses.BoundarySystem bouNatGas(
+    redeclare package Medium =
+        Modelica.Media.IdealGases.MixtureGases.SimpleNaturalGas)
+   "Boundary with natural gas"
+    annotation (Placement(transformation(extent={{20,-30},{40,-10}})));
+
+  AixLib.Fluid.Sources.Validation.BaseClasses.BoundarySystem bouNatGasFix(
+    redeclare package Medium =
+        Modelica.Media.IdealGases.MixtureGases.SimpleNaturalGasFixedComposition)
+    "Boundary with natural gas"
+    annotation (Placement(transformation(extent={{20,-60},{40,-40}})));
+
+    annotation (Documentation(info="<html>
+<p>
+Validation model for <a href=\"modelica://AixLib.Fluid.Sources.Boundary_pT\">
+AixLib.Fluid.Sources.Boundary_pT</a>
+for different media.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+September 13, 2019 by Michael Wetter:<br/>
+First implementation.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1205\">AixLib, #1205</a>.
+</li>
+</ul>
+</html>"),
+__Dymola_Commands(file=
+          "Resources/Scripts/Dymola/Fluid/Sources/Validation/Boundary.mos"
+        "Simulate and plot"),
+experiment(
+      StopTime=1,
+      Tolerance=1e-06));
+end Boundary;
diff --git a/AixLib/Fluid/Sources/Validation/BoundaryWithX_in.mo b/AixLib/Fluid/Sources/Validation/BoundaryWithX_in.mo
new file mode 100644
index 0000000000..7b01302c76
--- /dev/null
+++ b/AixLib/Fluid/Sources/Validation/BoundaryWithX_in.mo
@@ -0,0 +1,66 @@
+within AixLib.Fluid.Sources.Validation;
+model BoundaryWithX_in
+  "Validation model for boundary with different media and mass fraction input"
+  extends Modelica.Icons.Example;
+
+  AixLib.Fluid.Sources.Validation.BaseClasses.BoundarySystemWithX_in bouMoiAir(
+    redeclare package Medium = AixLib.Media.Air)
+    "Boundary with moist air"
+    annotation (Placement(transformation(extent={{20,70},{40,90}})));
+
+  AixLib.Fluid.Sources.Validation.BaseClasses.BoundarySystemWithX_in bouMoiAirCO2(
+    redeclare package Medium = AixLib.Media.Air(extraPropertiesNames={"CO2"}))
+    "Boundary with moist air"
+    annotation (Placement(transformation(extent={{20,30},{40,50}})));
+
+  AixLib.Fluid.Sources.Validation.BaseClasses.BoundarySystemWithX_in bouProFluGas(
+   redeclare package Medium =
+        Modelica.Media.IdealGases.MixtureGases.FlueGasSixComponents)
+    "Boundary with flue gas"
+    annotation (Placement(transformation(extent={{20,-10},{40,10}})));
+
+  AixLib.Fluid.Sources.Validation.BaseClasses.BoundarySystemWithX_in bouNatGas(
+    redeclare package Medium =
+        Modelica.Media.IdealGases.MixtureGases.SimpleNaturalGas)
+    "Boundary with natural gas"
+    annotation (Placement(transformation(extent={{20,-50},{40,-30}})));
+
+  Modelica.Blocks.Sources.Constant X_2[2](k={0.015, 0.985})
+    "Prescribed mass fraction"
+    annotation (Placement(transformation(extent={{-20,66},{0,86}})));
+  Modelica.Blocks.Sources.Constant X_6[6](k={0.5,0.2,0.0,0.3,0.0,0.0})
+    "Prescribed mass fraction"
+    annotation (Placement(transformation(extent={{-20,-14},{0,6}})));
+
+equation
+  connect(X_6.y, bouProFluGas.X_in)
+    annotation (Line(points={{1,-4},{10,-4},{10,0},{18,0}}, color={0,0,127}));
+  connect(X_2.y, bouMoiAir.X_in) annotation (Line(points={{1,76},{10,76},{10,80},
+          {18,80}}, color={0,0,127}));
+  connect(X_6.y, bouNatGas.X_in) annotation (Line(points={{1,-4},{10,-4},{10,-40},
+          {18,-40}}, color={0,0,127}));
+  connect(X_2.y, bouMoiAirCO2.X_in) annotation (Line(points={{1,76},{10,76},{10,
+          40},{18,40}}, color={0,0,127}));
+  annotation (Documentation(info="<html>
+<p>
+Validation model for <a href=\"modelica://AixLib.Fluid.Sources.Boundary_pT\">
+AixLib.Fluid.Sources.Boundary_pT</a>
+for different media and with mass fraction <code>X</code> prescribed by an input.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+September 13, 2019 by Michael Wetter:<br/>
+First implementation.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1205\">AixLib, #1205</a>.
+</li>
+</ul>
+</html>"),
+__Dymola_Commands(file=
+          "Resources/Scripts/Dymola/Fluid/Sources/Validation/BoundaryWithX_in.mos"
+        "Simulate and plot"),
+experiment(
+      StopTime=1,
+      Tolerance=1e-06));
+end BoundaryWithX_in;
diff --git a/AixLib/Fluid/Sources/Validation/BoundaryWithXi_in.mo b/AixLib/Fluid/Sources/Validation/BoundaryWithXi_in.mo
new file mode 100644
index 0000000000..b7559ba9c0
--- /dev/null
+++ b/AixLib/Fluid/Sources/Validation/BoundaryWithXi_in.mo
@@ -0,0 +1,66 @@
+within AixLib.Fluid.Sources.Validation;
+model BoundaryWithXi_in
+  "Validation model for boundary with different media and independent mass fraction input"
+  extends Modelica.Icons.Example;
+
+  AixLib.Fluid.Sources.Validation.BaseClasses.BoundarySystemWithXi_in bouMoiAir(
+    redeclare package Medium = AixLib.Media.Air)
+    "Boundary with moist air"
+    annotation (Placement(transformation(extent={{20,70},{40,90}})));
+
+  AixLib.Fluid.Sources.Validation.BaseClasses.BoundarySystemWithXi_in bouMoiAirCO2(
+    redeclare package Medium = AixLib.Media.Air(extraPropertiesNames={"CO2"}))
+    "Boundary with moist air"
+    annotation (Placement(transformation(extent={{20,30},{40,50}})));
+
+  AixLib.Fluid.Sources.Validation.BaseClasses.BoundarySystemWithXi_in bouProFluGas(
+   redeclare package Medium =
+        Modelica.Media.IdealGases.MixtureGases.FlueGasSixComponents)
+    "Boundary with flue gas"
+    annotation (Placement(transformation(extent={{20,-10},{40,10}})));
+
+  AixLib.Fluid.Sources.Validation.BaseClasses.BoundarySystemWithXi_in bouNatGas(
+    redeclare package Medium =
+        Modelica.Media.IdealGases.MixtureGases.SimpleNaturalGas)
+    "Boundary with natural gas"
+    annotation (Placement(transformation(extent={{20,-50},{40,-30}})));
+
+  Modelica.Blocks.Sources.Constant Xi_1[1](k={0.015})
+    "Prescribed mass fraction"
+    annotation (Placement(transformation(extent={{-20,66},{0,86}})));
+  Modelica.Blocks.Sources.Constant Xi_6[6](k={0.5,0.2,0.0,0.3,0.0,0.0})
+    "Prescribed mass fraction"
+    annotation (Placement(transformation(extent={{-20,-14},{0,6}})));
+
+equation
+  connect(Xi_6.y, bouProFluGas.Xi_in)
+    annotation (Line(points={{1,-4},{10,-4},{10,0},{18,0}}, color={0,0,127}));
+  connect(Xi_1.y, bouMoiAir.Xi_in) annotation (Line(points={{1,76},{10,76},{10,80},
+          {18,80}}, color={0,0,127}));
+  connect(Xi_6.y, bouNatGas.Xi_in) annotation (Line(points={{1,-4},{10,-4},{10,-40},
+          {18,-40}}, color={0,0,127}));
+  connect(Xi_1.y, bouMoiAirCO2.Xi_in) annotation (Line(points={{1,76},{10,76},{10,
+          40},{18,40}}, color={0,0,127}));
+  annotation (Documentation(info="<html>
+<p>
+Validation model for <a href=\"modelica://AixLib.Fluid.Sources.Boundary_pT\">
+AixLib.Fluid.Sources.Boundary_pT</a>
+for different media and with independent mass fraction <code>Xi</code> prescribed by an input.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+September 13, 2019 by Michael Wetter:<br/>
+First implementation.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1205\">AixLib, #1205</a>.
+</li>
+</ul>
+</html>"),
+__Dymola_Commands(file=
+          "Resources/Scripts/Dymola/Fluid/Sources/Validation/BoundaryWithXi_in.mos"
+        "Simulate and plot"),
+experiment(
+      StopTime=1,
+      Tolerance=1e-06));
+end BoundaryWithXi_in;
diff --git a/AixLib/Fluid/Sources/Validation/package.mo b/AixLib/Fluid/Sources/Validation/package.mo
new file mode 100644
index 0000000000..3684341c7d
--- /dev/null
+++ b/AixLib/Fluid/Sources/Validation/package.mo
@@ -0,0 +1,20 @@
+within AixLib.Fluid.Sources;
+package Validation "Collection of validation models"
+  extends Modelica.Icons.ExamplesPackage;
+
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains validation models for the classes in
+<a href=\"modelica://AixLib.Fluid.Sources\">
+AixLib.Fluid.Sources</a>.
+</p>
+<p>
+Note that most validation models contain simple input data
+which may not be realistic, but for which the correct
+output can be obtained through an analytic solution.
+The examples plot various outputs, which have been verified against these
+solutions. These model outputs are stored as reference data and
+used for continuous validation whenever models in the library change.
+</p>
+</html>"));
+end Validation;
diff --git a/AixLib/Fluid/Sources/Validation/package.order b/AixLib/Fluid/Sources/Validation/package.order
new file mode 100644
index 0000000000..e3f1a62e5e
--- /dev/null
+++ b/AixLib/Fluid/Sources/Validation/package.order
@@ -0,0 +1,4 @@
+Boundary
+BoundaryWithX_in
+BoundaryWithXi_in
+BaseClasses
diff --git a/AixLib/Fluid/Sources/package.order b/AixLib/Fluid/Sources/package.order
index 9f5dbc6716..5754ab5bd1 100644
--- a/AixLib/Fluid/Sources/package.order
+++ b/AixLib/Fluid/Sources/package.order
@@ -9,4 +9,5 @@ PropertySource_T
 PropertySource_h
 TraceSubstancesFlowSource
 Examples
+Validation
 BaseClasses
diff --git a/AixLib/Fluid/Storage/BaseClasses/PartialStratified.mo b/AixLib/Fluid/Storage/BaseClasses/PartialStratified.mo
index 9228d6e2d9..d526260fd6 100644
--- a/AixLib/Fluid/Storage/BaseClasses/PartialStratified.mo
+++ b/AixLib/Fluid/Storage/BaseClasses/PartialStratified.mo
@@ -28,6 +28,9 @@ model PartialStratified
   parameter Medium.Temperature T_start=Medium.T_default
     "Start value of temperature"
     annotation(Dialog(tab = "Initialization"));
+  parameter Modelica.SIunits.Temperature TFlu_start[nSeg]=T_start*ones(nSeg)
+    "Initial temperature of the tank segments, with TFlu_start[1] being the top segment"
+    annotation(Dialog(tab = "Initialization"));
   parameter Medium.MassFraction X_start[Medium.nX] = Medium.X_default
     "Start value of mass fractions m_i/m"
     annotation (Dialog(tab="Initialization", enable=Medium.nXi > 0));
@@ -67,7 +70,7 @@ model PartialStratified
     each energyDynamics=energyDynamics,
     each massDynamics=massDynamics,
     each p_start=p_start,
-    each T_start=T_start,
+    T_start=TFlu_start,
     each X_start=X_start,
     each C_start=C_start,
     each V=VTan/nSeg,
@@ -205,6 +208,14 @@ AixLib.Fluid.Storage.BaseClasses.ThirdOrderStratifier</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+November 13, 2019 by Jianjun Hu:<br/>
+Added parameter <code>TFlu_start</code> and changed the initial tank segments
+temperature to <code>TFlu_start</code> so each segment could have different
+temperature.
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1246\">#1246</a>.
+</li>
+<li>
 June 7, 2018 by Filip Jorissen:<br/>
 Copied model from Buildings and update the model accordingly.
 This is for
diff --git a/AixLib/Fluid/Storage/Validation/StratifiedNonUniformInitial.mo b/AixLib/Fluid/Storage/Validation/StratifiedNonUniformInitial.mo
new file mode 100644
index 0000000000..ce14c7c47c
--- /dev/null
+++ b/AixLib/Fluid/Storage/Validation/StratifiedNonUniformInitial.mo
@@ -0,0 +1,148 @@
+within AixLib.Fluid.Storage.Validation;
+model StratifiedNonUniformInitial
+  "Test model for stratified tank with non-uniform initial temperature"
+  extends Modelica.Icons.Example;
+
+  package Medium = AixLib.Media.Water "Medium model";
+  constant Integer nSeg = 7 "Number of segments in tank";
+
+  parameter Modelica.SIunits.MassFlowRate m_flow_nominal= 1*1000/3600/4;
+
+  AixLib.Fluid.Sources.Boundary_pT sou_1(
+    p=300000 + 5000,
+    T=273.15 + 40,
+    redeclare package Medium = Medium,
+    use_T_in=false,
+    nPorts=2)
+    annotation (Placement(transformation(extent={{-100,-20},{-80,0}})));
+  AixLib.Fluid.Sources.MassFlowSource_T sin_1(
+    redeclare package Medium = Medium,
+    T=273.15 + 20,
+    m_flow=-m_flow_nominal,
+    nPorts=1)
+    "Mass flow source" annotation (Placement(transformation(extent={{80,10},{60,30}})));
+  AixLib.Fluid.Storage.Stratified heaTan(
+    redeclare package Medium = Medium,
+    hTan=3,
+    dIns=0.3,
+    VTan=0.1,
+    nSeg=nSeg,
+    show_T=true,
+    m_flow_nominal=m_flow_nominal,
+    TFlu_start={313.15,312.15,311.15,310.15,309.15,308.15,307.15})
+    "Tank that will be heated up"
+    annotation (Placement(transformation(extent={{-30,10},{-10,30}})));
+  AixLib.Fluid.Sources.MassFlowSource_T sin_2(
+    redeclare package Medium = Medium,
+    T=273.15 + 20,
+    m_flow=m_flow_nominal,
+    nPorts=1)
+    "Mass flow source" annotation (Placement(transformation(extent={{80,-60},{60,-40}})));
+  AixLib.Fluid.Storage.Stratified cooTan(
+    redeclare package Medium = Medium,
+    hTan=3,
+    dIns=0.3,
+    VTan=0.1,
+    nSeg=nSeg,
+    show_T=true,
+    m_flow_nominal=m_flow_nominal,
+    TFlu_start={313.15,312.15,311.15,310.15,309.15,308.15,307.15})
+    "Tank that will be cooled down"
+    annotation (Placement(transformation(extent={{-30,-60},{-10,-40}})));
+
+  AixLib.Fluid.Sensors.EnthalpyFlowRate HIn_flow(
+    redeclare package Medium = Medium,
+    m_flow_nominal=m_flow_nominal) "Enthalpy flow rate"
+    annotation (Placement(transformation(extent={{-58,-58},{-42,-42}})));
+  AixLib.Fluid.Sensors.EnthalpyFlowRate HOut_flow(
+    redeclare package Medium = Medium,
+    m_flow_nominal=m_flow_nominal) "Enthalpy flow rate"
+    annotation (Placement(transformation(extent={{2,-58},{18,-42}})));
+  AixLib.Fluid.Sensors.EnthalpyFlowRate HInEnh_flow(
+    redeclare package Medium = Medium,
+    m_flow_nominal=m_flow_nominal) "Enthalpy flow rate"
+    annotation (Placement(transformation(extent={{-60,12},{-44,28}})));
+  AixLib.Fluid.Sensors.EnthalpyFlowRate HOutEnh_flow(
+    redeclare package Medium = Medium,
+    m_flow_nominal=m_flow_nominal) "Enthalpy flow rate"
+    annotation (Placement(transformation(extent={{2,12},{18,28}})));
+  Modelica.Blocks.Math.Add add(k2=-1) "Adder for enthalpy difference"
+    annotation (Placement(transformation(extent={{20,40},{40,60}})));
+  Modelica.Blocks.Continuous.Integrator dHTanEnh
+    "Difference in enthalpy (should be zero at steady-state)"
+    annotation (Placement(transformation(extent={{60,40},{80,60}})));
+  Modelica.Blocks.Math.Add add1(k2=-1) "Adder for enthalpy difference"
+    annotation (Placement(transformation(extent={{20,-30},{40,-10}})));
+  Modelica.Blocks.Continuous.Integrator dHTan
+    "Difference in enthalpy (should be zero at steady-state)"
+    annotation (Placement(transformation(extent={{60,-30},{80,-10}})));
+
+equation
+  connect(HIn_flow.port_b, cooTan.port_a) annotation (Line(
+      points={{-42,-50},{-30,-50}},
+      color={0,127,255},
+      smooth=Smooth.None));
+  connect(cooTan.port_b, HOut_flow.port_a) annotation (Line(
+      points={{-10,-50},{2,-50}},
+      color={0,127,255},
+      smooth=Smooth.None));
+  connect(HOut_flow.port_b, sin_2.ports[1]) annotation (Line(
+      points={{18,-50},{60,-50}},
+      color={0,127,255},
+      smooth=Smooth.None));
+  connect(HOutEnh_flow.port_b, sin_1.ports[1]) annotation (Line(
+      points={{18,20},{60,20}},
+      color={0,127,255},
+      smooth=Smooth.None));
+  connect(HInEnh_flow.H_flow, add.u1) annotation (Line(
+      points={{-52,28.8},{-52,56},{18,56}},
+      color={0,0,127},
+      smooth=Smooth.None));
+  connect(HOutEnh_flow.H_flow, add.u2) annotation (Line(
+      points={{10,28.8},{10,44},{18,44}},
+      color={0,0,127},
+      smooth=Smooth.None));
+  connect(add.y, dHTanEnh.u) annotation (Line(
+      points={{41,50},{58,50}},
+      color={0,0,127},
+      smooth=Smooth.None));
+  connect(HIn_flow.H_flow, add1.u1) annotation (Line(
+      points={{-50,-41.2},{-50,-14},{18,-14}},
+      color={0,0,127},
+      smooth=Smooth.None));
+  connect(HOut_flow.H_flow, add1.u2) annotation (Line(
+      points={{10,-41.2},{10,-26},{18,-26}},
+      color={0,0,127},
+      smooth=Smooth.None));
+  connect(add1.y, dHTan.u) annotation (Line(
+      points={{41,-20},{58,-20}},
+      color={0,0,127},
+      smooth=Smooth.None));
+  connect(HInEnh_flow.port_b, heaTan.port_a)
+    annotation (Line(points={{-44,20},{-30,20}}, color={0,127,255}));
+  connect(heaTan.port_b, HOutEnh_flow.port_a)
+    annotation (Line(points={{-10,20},{2,20}}, color={0,127,255}));
+  connect(sou_1.ports[1], HInEnh_flow.port_a) annotation (Line(points={{-80,-8},
+          {-70,-8},{-70,20},{-60,20}}, color={0,127,255}));
+  connect(sou_1.ports[2], HIn_flow.port_a) annotation (Line(points={{-80,-12},{-70,
+          -12},{-70,-50},{-58,-50}}, color={0,127,255}));
+
+annotation (experiment(Tolerance=1e-6, StopTime=3600),
+  __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/Storage/Validation/StratifiedNonUniformInitial.mos"
+        "Simulate and plot"),
+Documentation(info="<html>
+This test model validates
+<a href=\"modelica://AixLib.Fluid.Storage.Stratified\">
+AixLib.Fluid.Storage.Stratified</a> by specifying a non-uniform initial 
+temperature. 
+</html>", revisions="<html>
+<ul>
+<li>
+November 13, 2019 by Jianjun Hu:<br/>
+Changed the uniform initial tank temperature to be non-uniform.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1246\">#1246</a>.
+</li>
+</ul>
+</html>"));
+end StratifiedNonUniformInitial;
diff --git a/AixLib/Fluid/Storage/Validation/package.order b/AixLib/Fluid/Storage/Validation/package.order
index 59146949b4..2d38c2590d 100644
--- a/AixLib/Fluid/Storage/Validation/package.order
+++ b/AixLib/Fluid/Storage/Validation/package.order
@@ -1,3 +1,4 @@
 HeatExchangerDynamics
 HeatExchangerLocation
 StratifiedLoadingUnloading
+StratifiedNonUniformInitial
diff --git a/AixLib/Fluid/Storage/package.mo b/AixLib/Fluid/Storage/package.mo
index ecba47d84e..3a2b782ee3 100644
--- a/AixLib/Fluid/Storage/package.mo
+++ b/AixLib/Fluid/Storage/package.mo
@@ -1,7 +1,6 @@
 within AixLib.Fluid;
 package Storage "Package with thermal energy storage models"
   extends Modelica.Icons.VariantsPackage;
-
 annotation (preferredView="info", Documentation(info="<html>
 This package contains thermal energy storage models.
 </html>"));
diff --git a/AixLib/Fluid/package.mo b/AixLib/Fluid/package.mo
index 42fd8db146..611bf2b1ab 100644
--- a/AixLib/Fluid/package.mo
+++ b/AixLib/Fluid/package.mo
@@ -190,7 +190,7 @@ For the mass balance, the following configurations can be selected:
 </tr>
 <tr>
   <td>SteadyStateInitial</td>
-  <td><i>dp(0)/dt</i></td>
+  <td><i>dp(0)/dt=0</i></td>
   <td>Unspecified</td>
   <td><i>dm(t)/dt = &sum; m&#775;(t)</i></td>
 </tr>
diff --git a/AixLib/Media/Air.mo b/AixLib/Media/Air.mo
index ac338d332c..52da0e6a11 100644
--- a/AixLib/Media/Air.mo
+++ b/AixLib/Media/Air.mo
@@ -763,7 +763,6 @@ protected
       "Specific heat capacity at constant volume";
     annotation (
       preferredView="info",
-      defaultComponentName="gas",
       Documentation(info="<html>
 <p>
 This data record contains the coefficients for perfect gases.
diff --git a/AixLib/Media/Examples/PropyleneGlycolWaterProperties.mo b/AixLib/Media/Examples/PropyleneGlycolWaterProperties.mo
index 803bcf05df..d818a98969 100644
--- a/AixLib/Media/Examples/PropyleneGlycolWaterProperties.mo
+++ b/AixLib/Media/Examples/PropyleneGlycolWaterProperties.mo
@@ -3,7 +3,8 @@ model PropyleneGlycolWaterProperties
   "Model that tests the implementation of the fluid properties"
   extends Modelica.Icons.Example;
   extends AixLib.Media.Examples.BaseClasses.FluidProperties(
-    redeclare package Medium = AixLib.Media.Antifreeze.PropyleneGlycolWater (
+    redeclare package Medium = AixLib.Media.Antifreeze.PropyleneGlycolWater
+        (
       X_a=0.60,
       property_T=293.15),
     TMin=273.15,
diff --git a/AixLib/Media/Examples/PropyleneGlycolWaterTemperatureEnthalpyInversion.mo b/AixLib/Media/Examples/PropyleneGlycolWaterTemperatureEnthalpyInversion.mo
index 416f1f73e5..73492ca010 100644
--- a/AixLib/Media/Examples/PropyleneGlycolWaterTemperatureEnthalpyInversion.mo
+++ b/AixLib/Media/Examples/PropyleneGlycolWaterTemperatureEnthalpyInversion.mo
@@ -3,7 +3,8 @@ model PropyleneGlycolWaterTemperatureEnthalpyInversion
   "Model to check computation of h(T) and its inverse"
   extends Modelica.Icons.Example;
   extends AixLib.Media.Examples.BaseClasses.TestTemperatureEnthalpyInversion(
-    redeclare package Medium = AixLib.Media.Antifreeze.PropyleneGlycolWater (
+    redeclare package Medium = AixLib.Media.Antifreeze.PropyleneGlycolWater
+        (
       X_a=0.60,
       property_T=293.15));
   annotation (
diff --git a/AixLib/Media/Refrigerants/R410A_HEoS/R410a_IIR_P1_48_T233_340_Formula/package.order b/AixLib/Media/Refrigerants/R410A_HEoS/R410a_IIR_P1_48_T233_340_Formula/package.order
index f547d28437..e69de29bb2 100644
--- a/AixLib/Media/Refrigerants/R410A_HEoS/R410a_IIR_P1_48_T233_340_Formula/package.order
+++ b/AixLib/Media/Refrigerants/R410A_HEoS/R410a_IIR_P1_48_T233_340_Formula/package.order
@@ -1,30 +0,0 @@
-refrigerantConstants
-SmoothTransition
-f_Idg
-f_Res
-t_fIdg_t
-tt_fIdg_tt
-t_fRes_t
-tt_fRes_tt
-d_fRes_d
-dd_fRes_dd
-td_fRes_td
-ttt_fIdg_ttt
-ttt_fRes_ttt
-ddd_fRes_ddd
-tdd_fRes_tdd
-ttd_fRes_ttd
-saturationPressure
-saturationTemperature
-bubbleDensity
-dewDensity
-bubbleEnthalpy
-dewEnthalpy
-bubbleEntropy
-dewEntropy
-temperature_ph
-temperature_ps
-density_pT
-dynamicViscosity
-thermalConductivity
-surfaceTension
diff --git a/AixLib/Media/Refrigerants/R410A_HEoS/R410a_IIR_P1_48_T233_340_Record/package.order b/AixLib/Media/Refrigerants/R410A_HEoS/R410a_IIR_P1_48_T233_340_Record/package.order
index b433689bb9..e69de29bb2 100644
--- a/AixLib/Media/Refrigerants/R410A_HEoS/R410a_IIR_P1_48_T233_340_Record/package.order
+++ b/AixLib/Media/Refrigerants/R410A_HEoS/R410a_IIR_P1_48_T233_340_Record/package.order
@@ -1,8 +0,0 @@
-refrigerantConstants
-EoS
-BDSP
-TSP
-SmoothTransition
-dynamicViscosity
-thermalConductivity
-surfaceTension
diff --git a/AixLib/Media/Refrigerants/R410A_HEoS/R410a_IIR_P1_48_T233_473_Formula/package.order b/AixLib/Media/Refrigerants/R410A_HEoS/R410a_IIR_P1_48_T233_473_Formula/package.order
index f547d28437..e69de29bb2 100644
--- a/AixLib/Media/Refrigerants/R410A_HEoS/R410a_IIR_P1_48_T233_473_Formula/package.order
+++ b/AixLib/Media/Refrigerants/R410A_HEoS/R410a_IIR_P1_48_T233_473_Formula/package.order
@@ -1,30 +0,0 @@
-refrigerantConstants
-SmoothTransition
-f_Idg
-f_Res
-t_fIdg_t
-tt_fIdg_tt
-t_fRes_t
-tt_fRes_tt
-d_fRes_d
-dd_fRes_dd
-td_fRes_td
-ttt_fIdg_ttt
-ttt_fRes_ttt
-ddd_fRes_ddd
-tdd_fRes_tdd
-ttd_fRes_ttd
-saturationPressure
-saturationTemperature
-bubbleDensity
-dewDensity
-bubbleEnthalpy
-dewEnthalpy
-bubbleEntropy
-dewEntropy
-temperature_ph
-temperature_ps
-density_pT
-dynamicViscosity
-thermalConductivity
-surfaceTension
diff --git a/AixLib/Media/Refrigerants/R410A_HEoS/R410a_IIR_P1_48_T233_473_Horner/package.order b/AixLib/Media/Refrigerants/R410A_HEoS/R410a_IIR_P1_48_T233_473_Horner/package.order
index f547d28437..e69de29bb2 100644
--- a/AixLib/Media/Refrigerants/R410A_HEoS/R410a_IIR_P1_48_T233_473_Horner/package.order
+++ b/AixLib/Media/Refrigerants/R410A_HEoS/R410a_IIR_P1_48_T233_473_Horner/package.order
@@ -1,30 +0,0 @@
-refrigerantConstants
-SmoothTransition
-f_Idg
-f_Res
-t_fIdg_t
-tt_fIdg_tt
-t_fRes_t
-tt_fRes_tt
-d_fRes_d
-dd_fRes_dd
-td_fRes_td
-ttt_fIdg_ttt
-ttt_fRes_ttt
-ddd_fRes_ddd
-tdd_fRes_tdd
-ttd_fRes_ttd
-saturationPressure
-saturationTemperature
-bubbleDensity
-dewDensity
-bubbleEnthalpy
-dewEnthalpy
-bubbleEntropy
-dewEntropy
-temperature_ph
-temperature_ps
-density_pT
-dynamicViscosity
-thermalConductivity
-surfaceTension
diff --git a/AixLib/Media/Specialized/Air/PerfectGas.mo b/AixLib/Media/Specialized/Air/PerfectGas.mo
index c2aea169ad..b8ca1f650e 100644
--- a/AixLib/Media/Specialized/Air/PerfectGas.mo
+++ b/AixLib/Media/Specialized/Air/PerfectGas.mo
@@ -520,7 +520,6 @@ protected
       "Specific heat capacity at constant volume";
     annotation (
       preferredView="info",
-      defaultComponentName="gas",
       Documentation(info="<html>
 <p>
 This data record contains the coefficients for perfect gases.
diff --git a/AixLib/Obsolete/Year2019/Fluid/package.order b/AixLib/Obsolete/Year2019/Fluid/package.order
index 7a2e5f691c..0ddae5b6c4 100644
--- a/AixLib/Obsolete/Year2019/Fluid/package.order
+++ b/AixLib/Obsolete/Year2019/Fluid/package.order
@@ -1,2 +1,2 @@
-Sources
 HeatPumps
+Sources
diff --git a/AixLib/Obsolete/package.order b/AixLib/Obsolete/package.order
index 59120666ed..d6630dd7b2 100644
--- a/AixLib/Obsolete/package.order
+++ b/AixLib/Obsolete/package.order
@@ -1,2 +1,2 @@
-BaseClasses
 Year2019
+BaseClasses
diff --git a/AixLib/Resources/C-Sources/cryptographicsHash.c b/AixLib/Resources/C-Sources/cryptographicsHash.c
index a0280cdf80..144a691c61 100644
--- a/AixLib/Resources/C-Sources/cryptographicsHash.c
+++ b/AixLib/Resources/C-Sources/cryptographicsHash.c
@@ -296,15 +296,19 @@ void SHA1(
 
 const char* cryptographicsHash(const char* str)
 {
-    char result[21];
-	char* hexresult = malloc(41*sizeof(char));
-    size_t offset;
+  char result[21];
+  size_t offset;
+  char* hexresult = malloc(41*sizeof(char));
 
-    SHA1( result, str, strlen(str) );
+  if (!hexresult){
+    ModelicaError("Failed to allocate memory in cryptographicHash.");
+  }
 
-    for( offset = 0; offset < 20; offset++) {
-        sprintf( ( hexresult + (2*offset)), "%02x", result[offset]&0xff);
-    }
+  SHA1( result, str, strlen(str) );
+
+  for(offset = 0; offset < 20; offset++) {
+    sprintf( ( hexresult + (2*offset)), "%02x", result[offset]&0xff);
+  }
 
-    return hexresult;
+  return hexresult;
 }
diff --git a/AixLib/Resources/Images/Controls/SetPoints/Examples/HotWaterTemperatureReset.png b/AixLib/Resources/Images/Controls/SetPoints/Examples/SupplyReturnTemperatureReset.png
similarity index 100%
rename from AixLib/Resources/Images/Controls/SetPoints/Examples/HotWaterTemperatureReset.png
rename to AixLib/Resources/Images/Controls/SetPoints/Examples/SupplyReturnTemperatureReset.png
diff --git a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Airflow_Multizone_Examples_ClosedDoors.txt b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Airflow_Multizone_Examples_ClosedDoors.txt
index 16322875e3..f4a35bbfc1 100644
--- a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Airflow_Multizone_Examples_ClosedDoors.txt
+++ b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Airflow_Multizone_Examples_ClosedDoors.txt
@@ -1,4 +1,4 @@
-last-generated=2018-06-18
+last-generated=2019-09-16
 statistics-simulation=
 {
   "linear": "0, 0, 0",
@@ -6,10 +6,10 @@ statistics-simulation=
   "number of continuous time states": "15",
   "numerical Jacobians": "0"
 }
-dooAB.vBA=[0e+00, 1.111115142703056e-02, 2.211779542267323e-02, 3.27056348323822e-02, 4.294609650969505e-02, 5.22051714360714e-02, 6.07013963162899e-02, 6.835141777992249e-02, 7.491672784090042e-02, 8.016769587993622e-02, 8.426868170499802e-02, 8.7025485932827e-02, 8.840712159872055e-02, 8.839273452758789e-02, 8.698377013206482e-02, 8.622918277978897e-02, 8.36825892329216e-02, 8.11244398355484e-02, 7.765066623687744e-02, 7.284629344940186e-02, 6.938136368989944e-02, 6.328053772449493e-02, 5.898294597864151e-02, 5.349129438400269e-02, 4.742077738046646e-02, 4.257921874523163e-02, 3.632570803165436e-02, 3.147053346037863e-02, 2.639007568359373e-02, 2.099429257214069e-02, 1.728047057986259e-02, 1.253535412251949e-02, 9.460530243813992e-03, 6.341343279927969e-03, 3.548890585079789e-03, 1.965493429452181e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.520413592923433e-04, 1.110055390745401e-02, 2.204285934567451e-02, 3.258880227804184e-02, 4.248150065541274e-02, 5.211789533495908e-02, 6.057470664381984e-02, 6.826436519622803e-02, 7.482999563217163e-02, 8.018625527620316e-02, 8.426882326602936e-02, 8.702432364225388e-02, 8.840865641832352e-02, 8.83900448679924e-02, 8.69913250207901e-02, 8.614853769540787e-02, 8.363389223814011e-02, 8.102670311927795e-02, 7.763514667749405e-02, 7.308149337768555e-02, 6.923269480466843e-02, 6.355920433998108e-02, 5.887430533766747e-02, 5.338294431567192e-02, 4.731149971485138e-02, 4.246982932090759e-02, 3.621638938784599e-02, 3.136907890439034e-02, 2.627437375485897e-02, 2.090518921613693e-02, 1.717980951070786e-02, 1.241517998278141e-02, 9.384605102241039e-03, 6.232105195522308e-03, 3.499709535390139e-03, 1.885778736323118e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.277503609657288e-04]
-dooAC.vAB=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 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.596126951250668e-11, -4.596125910416582e-11, 4.596126951250668e-11, -4.596125910416582e-11, 0e+00, -1.451439043754072e-24, -2.298061602123936e-10, -9.192250433054383e-11, 9.192255290280116e-11, 0e+00, 0e+00, -1.424798612426059e-10, -9.192250433054383e-11, 0e+00, -4.596125910416582e-11, -9.192250433054383e-11, 0e+00, 0e+00, -9.192250433054383e-11, 4.596126951250668e-11, -9.192250433054383e-11, 1.378838432319895e-10, 0e+00, -4.596125910416582e-11, 1.378838432319895e-10, -4.596125910416582e-11, 0e+00, -1.378837322096871e-10, 2.298064794015175e-10, 1.838451613167535e-10, 9.192255290280116e-11, 9.192255290280116e-11, -4.596125910415711e-11, 4.596126951250087e-11, 2.298064794015059e-10, 9.192255290280116e-11, 4.596126951250668e-11, 4.596126951250668e-11, -9.192250433054383e-11, -2.29806160212398e-10, 9.192255290280116e-11, -2.29806160212398e-10, 2.298064794015175e-10, -1.378837322096871e-10, 1.378838432319895e-10, -4.596125910416582e-11, -4.596125910416582e-11, 4.596126951250668e-11, -9.192250433054383e-11, 1.838451613167535e-10, 0e+00, 0e+00, -1.378837322096871e-10, -1.838449531499364e-10, 1.378838432319895e-10, 4.596126951250668e-11, 1.378838432319895e-10, -2.29806160212398e-10, 0e+00, 1.378838432319895e-10, 9.192255290280116e-11, 9.192255290280116e-11, -4.596125910416582e-11, -9.192250433054383e-11, 1.378838432319895e-10, 0e+00, 0e+00, -4.596125910416582e-11, -9.192250433054383e-11, 1.378838432319895e-10, 0e+00, 4.596126951250668e-11, -1.378837322096871e-10, 4.596126951250668e-11, 4.596126951250668e-11, -9.192250433054383e-11, 1.838451613167535e-10, -1.378837322096871e-10, -4.596125910416582e-11]
-dooBC.vAB=[0e+00, 1.111115142703056e-02, 2.211779542267323e-02, 3.27056348323822e-02, 4.294609650969505e-02, 5.22051714360714e-02, 6.07013963162899e-02, 6.835141777992249e-02, 7.491672784090042e-02, 8.016769587993622e-02, 8.426868170499802e-02, 8.7025485932827e-02, 8.840712159872055e-02, 8.839273452758789e-02, 8.698377013206482e-02, 8.622918277978897e-02, 8.36825892329216e-02, 8.11244398355484e-02, 7.765066623687744e-02, 7.284629344940186e-02, 6.938136368989944e-02, 6.328053772449493e-02, 5.898294597864151e-02, 5.349129438400269e-02, 4.742077738046646e-02, 4.257921874523163e-02, 3.632570803165436e-02, 3.147053346037863e-02, 2.639007568359373e-02, 2.099429257214069e-02, 1.728047057986259e-02, 1.253535412251949e-02, 9.460530243813992e-03, 6.341343279927969e-03, 3.548890585079789e-03, 1.965493429452181e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.520415921229869e-04, 1.110055390745401e-02, 2.204285934567451e-02, 3.258880227804184e-02, 4.248150065541274e-02, 5.211789533495908e-02, 6.057470664381984e-02, 6.826436519622803e-02, 7.482999563217163e-02, 8.018625527620316e-02, 8.426882326602936e-02, 8.702432364225388e-02, 8.840865641832352e-02, 8.83900448679924e-02, 8.69913250207901e-02, 8.614853769540787e-02, 8.363389223814011e-02, 8.102670311927795e-02, 7.763514667749405e-02, 7.308149337768555e-02, 6.923269480466843e-02, 6.355920433998108e-02, 5.887430533766747e-02, 5.338294431567192e-02, 4.731149971485138e-02, 4.246982932090759e-02, 3.621638938784599e-02, 3.136907890439034e-02, 2.627437375485897e-02, 2.090518921613693e-02, 1.717980951070786e-02, 1.241517998278141e-02, 9.384605102241039e-03, 6.232105195522308e-03, 3.499709535390139e-03, 1.885778736323118e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.277503027580678e-04]
-dooAC.vBA=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 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.596125910416582e-11, 4.596126951250668e-11, -4.596125910416582e-11, 4.596126951250668e-11, -0e+00, 1.451439810700874e-24, 2.298064794015132e-10, 9.192255290280116e-11, -9.192250433054383e-11, -0e+00, -0e+00, 1.424799861426962e-10, 9.192255290280116e-11, 0e+00, 4.596126951250668e-11, 9.192255290280116e-11, -0e+00, 0e+00, 9.192255290280116e-11, -4.596125910416582e-11, 9.192255290280116e-11, -1.378837322096871e-10, -0e+00, 4.596126951250668e-11, -1.378837322096871e-10, 4.596126951250668e-11, -0e+00, 1.378838432319895e-10, -2.29806160212398e-10, -1.838449531499364e-10, -9.192250433054383e-11, -9.192250433054383e-11, 4.596126951249796e-11, -4.596125910416002e-11, -2.298061602123864e-10, -9.192250433054383e-11, -4.596125910416582e-11, -4.596125910416582e-11, 9.192255290280116e-11, 2.298064794015175e-10, -9.192250433054383e-11, 2.298064794015175e-10, -2.29806160212398e-10, 1.378838432319895e-10, -1.378837322096871e-10, 4.596126951250668e-11, 4.596126951250668e-11, -4.596125910416582e-11, 9.192255290280116e-11, -1.838449531499364e-10, 0e+00, 0e+00, 1.378838432319895e-10, 1.838451613167535e-10, -1.378837322096871e-10, -4.596125910416582e-11, -1.378837322096871e-10, 2.298064794015175e-10, 0e+00, -1.378837322096871e-10, -9.192250433054383e-11, -9.192250433054383e-11, 4.596126951250668e-11, 9.192255290280116e-11, -1.378837322096871e-10, -0e+00, 0e+00, 4.596126951250668e-11, 9.192255290280116e-11, -1.378837322096871e-10, -0e+00, -4.596125910416582e-11, 1.378838432319895e-10, -4.596125910416582e-11, -4.596125910416582e-11, 9.192255290280116e-11, -1.838449531499364e-10, 1.378838432319895e-10, 4.596126951250668e-11]
-dooAB.vAB=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.378360120947747e-18, 2.019850304350257e-03, 3.577487077564001e-03, 6.410186178982258e-03, 9.511936455965042e-03, 1.285687368363142e-02, 1.728462427854538e-02, 2.115861512720585e-02, 2.640935219824314e-02, 3.148017078638077e-02, 3.63229513168335e-02, 4.257218539714813e-02, 4.740496724843979e-02, 5.346630513668062e-02, 5.89517578482628e-02, 6.361221522092819e-02, 6.928510218858719e-02, 7.311081886291504e-02, 7.765247672796249e-02, 8.107529580593109e-02, 8.364997804164886e-02, 8.617282658815384e-02, 8.698724210262299e-02, 8.839554339647293e-02, 8.840800821781158e-02, 8.702822029590607e-02, 8.427982032299042e-02, 8.019156754016876e-02, 7.483980059623718e-02, 6.831251084804535e-02, 6.069490313529968e-02, 5.212191119790077e-02, 4.27246019244194e-02, 3.269142657518387e-02, 2.200645953416824e-02, 1.120353769510984e-02, 3.541953628882766e-04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.939297188073397e-03, 3.531292313709855e-03, 6.294694729149342e-03, 9.4153992831707e-03, 1.243612542748451e-02, 1.721038110554218e-02, 2.092814259231091e-02, 2.629474923014641e-02, 3.138145059347153e-02, 3.621384873986244e-02, 4.246686026453972e-02, 4.72959466278553e-02, 5.336294695734978e-02, 5.884481221437454e-02, 6.352465599775314e-02, 6.918458640575409e-02, 7.299412786960602e-02, 7.756888121366501e-02, 8.096687495708466e-02, 8.362295478582382e-02, 8.608730137348175e-02, 8.697465062141418e-02, 8.83963406085968e-02, 8.841246366500854e-02, 8.702812343835831e-02, 8.427732437849045e-02, 8.019533008337021e-02, 7.484503835439682e-02, 6.830890476703644e-02, 6.069515272974968e-02, 5.212198570370674e-02, 4.272559285163879e-02, 3.266570344567299e-02, 2.205637656152248e-02, 1.118932850658894e-02, 7.816462893970311e-04]
+dooAB.vBA=[-0e+00, 1.111134886741638e-02, 2.211078628897667e-02, 3.27298566699028e-02, 4.302025958895683e-02, 5.219392850995064e-02, 6.068937107920647e-02, 6.840763986110687e-02, 7.489723712205887e-02, 8.018204569816589e-02, 8.438211679458618e-02, 8.701556175947189e-02, 8.833125233650208e-02, 8.839000761508942e-02, 8.699604868888855e-02, 8.623015880584717e-02, 8.368469774723053e-02, 8.114312589168549e-02, 7.769934087991714e-02, 7.317290455102921e-02, 6.933209300041199e-02, 6.365078687667847e-02, 5.898626521229744e-02, 5.34910261631012e-02, 4.742438718676567e-02, 4.257954657077789e-02, 3.632545098662376e-02, 3.147174045443533e-02, 2.637578919529913e-02, 2.099823579192162e-02, 1.727937161922455e-02, 1.253495458513498e-02, 9.461328387260437e-03, 6.340759806334972e-03, 3.549095476046205e-03, 1.964997500181198e-03, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 3.627704281825572e-04, 1.111537870019674e-02, 2.20524575561285e-02, 3.267598897218704e-02, 4.292038083076483e-02, 5.203856900334364e-02, 6.089561060070996e-02, 6.826315820217133e-02, 7.491514086723328e-02, 8.037503063678741e-02, 8.41025710105896e-02, 8.69152694940567e-02, 8.893116563558578e-02, 8.904299885034561e-02, 8.69859904050827e-02, 8.614907413721085e-02, 8.363795280456543e-02, 8.103173971176147e-02, 7.761936634778976e-02, 7.304877787828445e-02, 6.923060119152069e-02, 6.356171518564224e-02, 5.887269601225853e-02, 5.338898673653603e-02, 4.731112346053123e-02, 4.247176647186279e-02, 3.621504828333855e-02, 3.136847913265228e-02, 2.627623453736305e-02, 2.09041815251112e-02, 1.71774085611105e-02, 1.241464633494616e-02, 9.381895884871483e-03, 6.230061408132315e-03, 3.501568222418427e-03, 1.882714685052633e-03, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 7.612275658175349e-04]
+dooAC.vAB=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 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.596125563471887e-11, -4.596125563471887e-11, 9.192255984169506e-11, 0e+00, -2.298061185790345e-10, 9.192255984169506e-11, -1.378837183318993e-10, 4.596127298195363e-11, 1.378838571097774e-10, -1.838449253943586e-10, 4.59612729819529e-11, -4.596125563471887e-11, -1.378837183318993e-10, 1.378838571097774e-10, 2.29806521034881e-10, 1.838451890723292e-10, 0e+00, 1.378838571097774e-10, 9.192255984169506e-11, 1.838451890723292e-10, -4.596125563471887e-11, 0e+00, 0e+00, 1.838451890723292e-10, -4.596125563471887e-11, 1.838451890723292e-10, 1.378838571097774e-10, -4.596125563471887e-11, 0e+00, -2.298061185790345e-10, 9.192255984169506e-11, 4.596127298195363e-11, -4.596125563471887e-11, 4.596127298195363e-11, 4.596127298195363e-11, 4.596127298195363e-11, 9.192255984169506e-11, -1.378837183318978e-10, 4.354357220894191e-24, 4.596127298195363e-11, -9.192249739164993e-11, -4.596125563471887e-11, 0e+00, 4.596127298195363e-11, -9.192249739164993e-11, -1.378837183318993e-10, -9.192249739164993e-11, 1.378838571097774e-10, 4.596127298195363e-11, -1.838449253943608e-10, -9.192249739164993e-11, -9.192249739164993e-11, -9.192249739164993e-11, -2.298061185790345e-10, 9.192255984169506e-11, 9.192255984169506e-11, -9.192249739164993e-11, 0e+00, 4.596127298195363e-11, 2.29806521034881e-10, 2.757678807530084e-10, -4.596125563471887e-11, 4.596127298195363e-11, 4.596127298195363e-11, 9.192255984169506e-11, 0e+00, 0e+00, 0e+00, -4.596125563471887e-11, 2.29806521034881e-10, -9.192249739164993e-11, 4.596127298195363e-11, -4.596125563471887e-11, 4.596127298195363e-11, 0e+00, -1.378837183318993e-10, -4.596125563471887e-11, -1.378837183318993e-10, 0e+00, 1.838451890723292e-10, 4.596127298195363e-11, 8.273053353491377e-10, 4.596127298195363e-11]
+dooBC.vAB=[0e+00, 1.111134886741638e-02, 2.211078628897667e-02, 3.27298566699028e-02, 4.302025958895683e-02, 5.219392850995064e-02, 6.068937107920647e-02, 6.840763986110687e-02, 7.489723712205887e-02, 8.018204569816589e-02, 8.438211679458618e-02, 8.701556175947189e-02, 8.833125233650208e-02, 8.839000761508942e-02, 8.699604868888855e-02, 8.623015880584717e-02, 8.368469774723053e-02, 8.114312589168549e-02, 7.769934087991714e-02, 7.317290455102921e-02, 6.933209300041199e-02, 6.365078687667847e-02, 5.898626148700714e-02, 5.34910261631012e-02, 4.742438718676567e-02, 4.257954657077789e-02, 3.632545098662376e-02, 3.147174045443533e-02, 2.637578919529913e-02, 2.099823579192162e-02, 1.727937161922455e-02, 1.253495458513498e-02, 9.461328387260437e-03, 6.340759806334972e-03, 3.549095476046205e-03, 1.964997500181198e-03, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 3.627703990787268e-04, 1.111537870019674e-02, 2.20524575561285e-02, 3.267598897218704e-02, 4.292038083076483e-02, 5.203856900334364e-02, 6.089561060070996e-02, 6.826315820217133e-02, 7.491514086723328e-02, 8.037503063678741e-02, 8.41025710105896e-02, 8.69152694940567e-02, 8.893116563558578e-02, 8.904299885034561e-02, 8.69859904050827e-02, 8.614907413721085e-02, 8.363795280456543e-02, 8.103173971176147e-02, 7.761936634778976e-02, 7.304877787828445e-02, 6.923060119152069e-02, 6.356171518564224e-02, 5.887269601225853e-02, 5.338898673653603e-02, 4.731112346053123e-02, 4.247176647186279e-02, 3.621504828333855e-02, 3.136847913265228e-02, 2.627623453736305e-02, 2.09041815251112e-02, 1.71774085611105e-02, 1.241464633494616e-02, 9.381895884871483e-03, 6.230061408132315e-03, 3.501568222418427e-03, 1.882714685052633e-03, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 7.612276240251958e-04]
+dooAC.vBA=[-0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -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.596127298195363e-11, 4.596127298195363e-11, -9.192249739164993e-11, -0e+00, 2.29806521034881e-10, -9.192249739164993e-11, 1.378838571097774e-10, -4.596125563471887e-11, -1.378837183318993e-10, 1.83845189072327e-10, -4.596125563471814e-11, 4.596127298195363e-11, 1.378838571097774e-10, -1.378837183318993e-10, -2.298061185790345e-10, -1.838449253943608e-10, -0e+00, -1.378837183318993e-10, -9.192249739164993e-11, -1.838449253943608e-10, 4.596127298195363e-11, -0e+00, -0e+00, -1.838449253943608e-10, 4.596127298195363e-11, -1.838449253943608e-10, -1.378837183318993e-10, 4.596127298195363e-11, -0e+00, 2.29806521034881e-10, -9.192249739164993e-11, -4.596125563471887e-11, 4.596127298195363e-11, -4.596125563471887e-11, -4.596125563471887e-11, -4.596125563471887e-11, -9.192249739164993e-11, 1.378838571097759e-10, -4.354352838303885e-24, -4.596125563471887e-11, 9.192255984169506e-11, 4.596127298195363e-11, -0e+00, -4.596125563471887e-11, 9.192255984169506e-11, 1.378838571097774e-10, 9.192255984169506e-11, -1.378837183318993e-10, -4.596125563471887e-11, 1.838451890723292e-10, 9.192255984169506e-11, 9.192255984169506e-11, 9.192255984169506e-11, 2.29806521034881e-10, -9.192249739164993e-11, -9.192249739164993e-11, 9.192255984169506e-11, -0e+00, -4.596125563471887e-11, -2.298061185790345e-10, -2.757672978859205e-10, 4.596127298195363e-11, -4.596125563471887e-11, -4.596125563471887e-11, -9.192249739164993e-11, -0e+00, -0e+00, -0e+00, 4.596127298195363e-11, -2.298061185790345e-10, 9.192255984169506e-11, -4.596125563471887e-11, 4.596127298195363e-11, -4.596125563471887e-11, -0e+00, 1.378838571097774e-10, 4.596127298195363e-11, 1.378838571097774e-10, -0e+00, -1.838449253943608e-10, -4.596125563471887e-11, -8.273001728120732e-10, -4.596125563471887e-11]
+dooAB.vAB=[0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 2.364511762338053e-18, 2.019202802330256e-03, 3.577036084607244e-03, 6.399570498615503e-03, 9.497184306383133e-03, 1.25785619020462e-02, 1.731187850236893e-02, 2.1015839651227e-02, 2.640571631491184e-02, 3.148000314831734e-02, 3.631710633635521e-02, 4.257141053676605e-02, 4.740476608276367e-02, 5.346372723579409e-02, 5.89660592377186e-02, 6.360135972499847e-02, 6.928648799657822e-02, 7.311075925827026e-02, 7.764910906553268e-02, 8.107572048902512e-02, 8.364769816398621e-02, 8.617383986711502e-02, 8.698797971010208e-02, 8.839406818151474e-02, 8.841007202863693e-02, 8.703199774026871e-02, 8.427642285823822e-02, 8.01934078335762e-02, 7.484212517738342e-02, 6.830832362174988e-02, 6.069562211632729e-02, 5.212859809398651e-02, 4.272805526852608e-02, 3.253687545657158e-02, 2.23284475505352e-02, 1.124265510588884e-02, 3.661357914097607e-04, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1.938274712301791e-03, 3.530164947733283e-03, 6.290168035775423e-03, 9.419101290404797e-03, 1.246192306280136e-02, 1.720992475748062e-02, 2.092587202787399e-02, 2.629397250711918e-02, 3.137604519724846e-02, 3.621141985058784e-02, 4.24625352025032e-02, 4.729479551315308e-02, 5.336077883839607e-02, 5.884015560150146e-02, 6.35233148932457e-02, 6.918527185916901e-02, 7.299146801233292e-02, 7.757354527711868e-02, 8.096665143966675e-02, 8.360476791858673e-02, 8.609335869550705e-02, 8.698907494544983e-02, 8.839675784111023e-02, 8.840988576412201e-02, 8.702767640352249e-02, 8.427999168634415e-02, 8.01912397146225e-02, 7.484626024961472e-02, 6.831908226013184e-02, 6.069524586200714e-02, 5.212065950036049e-02, 4.272400587797165e-02, 3.262576833367348e-02, 2.193364873528481e-02, 1.249312236905098e-02, 7.642266573384404e-04]
 time=[0e+00, 7.2e+03]
-dooBC.vBA=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.378360120947747e-18, 2.019850304350257e-03, 3.577487077564001e-03, 6.410186178982258e-03, 9.511936455965042e-03, 1.285687368363142e-02, 1.728462427854538e-02, 2.115861512720585e-02, 2.640935033559799e-02, 3.148017078638077e-02, 3.63229513168335e-02, 4.257218539714813e-02, 4.740496724843979e-02, 5.346630513668062e-02, 5.89517578482628e-02, 6.361221522092819e-02, 6.928510218858719e-02, 7.311081886291504e-02, 7.765247672796249e-02, 8.107529580593109e-02, 8.364997804164886e-02, 8.617282658815384e-02, 8.698724210262299e-02, 8.839554339647293e-02, 8.840800821781158e-02, 8.702822029590607e-02, 8.427982032299042e-02, 8.019156754016876e-02, 7.483980059623718e-02, 6.831251084804535e-02, 6.069490313529968e-02, 5.212191119790077e-02, 4.27246019244194e-02, 3.269142657518387e-02, 2.200645953416824e-02, 1.120353862643242e-02, 3.541951300576329e-04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.939297188073397e-03, 3.531292313709855e-03, 6.294694729149342e-03, 9.4153992831707e-03, 1.243612542748451e-02, 1.721038110554218e-02, 2.092814259231091e-02, 2.629474923014641e-02, 3.138145059347153e-02, 3.621384873986244e-02, 4.246686026453972e-02, 4.72959466278553e-02, 5.336294695734978e-02, 5.884481221437454e-02, 6.352465599775314e-02, 6.918458640575409e-02, 7.299412786960602e-02, 7.756888121366501e-02, 8.096687495708466e-02, 8.362295478582382e-02, 8.608730137348175e-02, 8.697465062141418e-02, 8.83963406085968e-02, 8.841246366500854e-02, 8.702812343835831e-02, 8.427732437849045e-02, 8.019533008337021e-02, 7.484503835439682e-02, 6.830890476703644e-02, 6.069515272974968e-02, 5.212198570370674e-02, 4.272559285163879e-02, 3.266570344567299e-02, 2.205637656152248e-02, 1.118932850658894e-02, 7.81646347604692e-04]
+dooBC.vBA=[-0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 2.364511762338053e-18, 2.019202802330256e-03, 3.577036084607244e-03, 6.399570498615503e-03, 9.497184306383133e-03, 1.25785619020462e-02, 1.731187850236893e-02, 2.1015839651227e-02, 2.640571631491184e-02, 3.148000314831734e-02, 3.631710633635521e-02, 4.257141053676605e-02, 4.740476608276367e-02, 5.346372723579409e-02, 5.89660592377186e-02, 6.360135972499847e-02, 6.928648799657822e-02, 7.311075925827026e-02, 7.764910906553268e-02, 8.107572048902512e-02, 8.364769816398621e-02, 8.617383986711502e-02, 8.698797971010208e-02, 8.839406818151474e-02, 8.841007202863693e-02, 8.703199774026871e-02, 8.427642285823822e-02, 8.01934078335762e-02, 7.484212517738342e-02, 6.830832362174988e-02, 6.069562211632729e-02, 5.212859809398651e-02, 4.272805526852608e-02, 3.253687545657158e-02, 2.23284475505352e-02, 1.124265510588884e-02, 3.661358496174216e-04, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1.938274712301791e-03, 3.530164947733283e-03, 6.290168035775423e-03, 9.419101290404797e-03, 1.246192306280136e-02, 1.720992475748062e-02, 2.092587202787399e-02, 2.629397250711918e-02, 3.137604519724846e-02, 3.621141985058784e-02, 4.24625352025032e-02, 4.729479551315308e-02, 5.336077883839607e-02, 5.884015560150146e-02, 6.35233148932457e-02, 6.918527185916901e-02, 7.299146801233292e-02, 7.757354527711868e-02, 8.096665143966675e-02, 8.360476791858673e-02, 8.609335869550705e-02, 8.698907494544983e-02, 8.839675784111023e-02, 8.840988576412201e-02, 8.702767640352249e-02, 8.427999168634415e-02, 8.01912397146225e-02, 7.484626024961472e-02, 6.831908226013184e-02, 6.069524586200714e-02, 5.212065950036049e-02, 4.272400587797165e-02, 3.262576833367348e-02, 2.193364873528481e-02, 1.249312050640583e-02, 7.642266573384404e-04]
diff --git a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Controls_Continuous_Examples_PIDHysteresisTimer.txt b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Controls_Continuous_Examples_PIDHysteresisTimer.txt
index bfdf3f0fd0..719f2eb49c 100644
--- a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Controls_Continuous_Examples_PIDHysteresisTimer.txt
+++ b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Controls_Continuous_Examples_PIDHysteresisTimer.txt
@@ -1,4 +1,4 @@
-last-generated=2018-06-22
+last-generated=2019-11-09
 statistics-simulation=
 {
   "linear": " ",
@@ -6,7 +6,7 @@ statistics-simulation=
   "number of continuous time states": "2",
   "numerical Jacobians": "0"
 }
-con.u_m=[2.931499938964844e+02, 2.898402099609375e+02, 2.868109436035156e+02, 2.840455017089844e+02, 2.815281677246094e+02, 2.792446899414062e+02, 2.771823425292969e+02, 2.753295288085938e+02, 2.736747131347656e+02, 2.722072448730469e+02, 2.709170227050781e+02, 2.697947387695312e+02, 2.717220458984375e+02, 2.772921752929688e+02, 2.824770812988281e+02, 2.873129577636719e+02, 2.918327026367188e+02, 2.96066162109375e+02, 3.000403747558594e+02, 3.037797546386719e+02, 3.073062744140625e+02, 3.106398315429688e+02, 3.132925109863281e+02, 3.131466674804688e+02, 3.131512145996094e+02, 3.131510925292969e+02, 3.131510925292969e+02, 3.131510925292969e+02, 3.131510620117188e+02, 3.131510620117188e+02, 3.131510314941406e+02, 3.131510009765625e+02, 3.131510009765625e+02, 3.131509704589844e+02, 3.131509094238281e+02, 3.1315087890625e+02, 3.131508483886719e+02, 3.131507873535156e+02, 3.131507568359375e+02, 3.131506958007812e+02, 3.131525268554688e+02, 3.131973266601562e+02, 3.132941284179688e+02, 3.134329528808594e+02, 3.136045227050781e+02, 3.138001098632812e+02, 3.140115966796875e+02, 3.134809265136719e+02, 3.117776794433594e+02, 3.102276611328125e+02, 3.088117065429688e+02, 3.075130310058594e+02, 3.063161315917969e+02, 3.052058715820312e+02, 3.041682739257812e+02, 3.031909484863281e+02, 3.022622680664062e+02, 3.013719482421875e+02, 3.005109252929688e+02, 3.049744567871094e+02, 3.103306274414062e+02, 3.134226379394531e+02, 3.133167724609375e+02, 3.131485900878906e+02, 3.131491394042969e+02, 3.131491088867188e+02, 3.131490783691406e+02, 3.131490478515625e+02, 3.131490173339844e+02, 3.131489868164062e+02, 3.131489562988281e+02, 3.131489562988281e+02, 3.1314892578125e+02, 3.1314892578125e+02, 3.1314892578125e+02, 3.131488952636719e+02, 3.1314892578125e+02, 3.1314892578125e+02, 3.1314892578125e+02, 3.131489562988281e+02, 3.131489562988281e+02, 3.131489868164062e+02, 3.131490173339844e+02, 3.131490478515625e+02, 3.131490783691406e+02, 3.131491088867188e+02, 3.13149169921875e+02, 3.131492004394531e+02, 3.131492614746094e+02, 3.131492919921875e+02, 3.131493530273438e+02, 3.131494140625e+02, 3.131494750976562e+02, 3.131495361328125e+02, 3.131495971679688e+02, 3.13149658203125e+02, 3.131497192382812e+02, 3.131497802734375e+02, 3.131498718261719e+02, 3.131499328613281e+02, 3.131499938964844e+02]
+con.u_m=[2.931499938964844e+02, 2.898402099609375e+02, 2.868109436035156e+02, 2.840455017089844e+02, 2.815281677246094e+02, 2.792446899414062e+02, 2.771823425292969e+02, 2.753295288085938e+02, 2.736747131347656e+02, 2.722072448730469e+02, 2.709170227050781e+02, 2.697947387695312e+02, 2.717220458984375e+02, 2.772921752929688e+02, 2.824770812988281e+02, 2.873129577636719e+02, 2.918327026367188e+02, 2.96066162109375e+02, 3.000403747558594e+02, 3.037797546386719e+02, 3.073062744140625e+02, 3.106398315429688e+02, 3.132925109863281e+02, 3.131466674804688e+02, 3.131512145996094e+02, 3.131510925292969e+02, 3.131510925292969e+02, 3.131510925292969e+02, 3.131510620117188e+02, 3.131510620117188e+02, 3.131510314941406e+02, 3.131510009765625e+02, 3.131510009765625e+02, 3.131509704589844e+02, 3.131509094238281e+02, 3.1315087890625e+02, 3.131508483886719e+02, 3.131507873535156e+02, 3.131507568359375e+02, 3.131506958007812e+02, 3.131525268554688e+02, 3.131973266601562e+02, 3.132941284179688e+02, 3.134329528808594e+02, 3.136045227050781e+02, 3.138001403808594e+02, 3.140116577148438e+02, 3.134803466796875e+02, 3.117771301269531e+02, 3.102271728515625e+02, 3.088112487792969e+02, 3.075126037597656e+02, 3.063157653808594e+02, 3.052055358886719e+02, 3.041679382324219e+02, 3.03190673828125e+02, 3.022620239257812e+02, 3.013717346191406e+02, 3.005107116699219e+02, 3.049763488769531e+02, 3.103323669433594e+02, 3.134226379394531e+02, 3.133167724609375e+02, 3.131486206054688e+02, 3.131491394042969e+02, 3.131491394042969e+02, 3.131490783691406e+02, 3.131490478515625e+02, 3.131490173339844e+02, 3.131489868164062e+02, 3.131489562988281e+02, 3.131489562988281e+02, 3.1314892578125e+02, 3.1314892578125e+02, 3.131488952636719e+02, 3.131488952636719e+02, 3.1314892578125e+02, 3.1314892578125e+02, 3.1314892578125e+02, 3.1314892578125e+02, 3.131489562988281e+02, 3.131489868164062e+02, 3.131490173339844e+02, 3.131490478515625e+02, 3.131490783691406e+02, 3.131491088867188e+02, 3.13149169921875e+02, 3.131492004394531e+02, 3.131492614746094e+02, 3.131492919921875e+02, 3.131493530273438e+02, 3.131494140625e+02, 3.131494750976562e+02, 3.131495361328125e+02, 3.131495971679688e+02, 3.13149658203125e+02, 3.131497192382812e+02, 3.131497802734375e+02, 3.131498413085938e+02, 3.131499328613281e+02, 3.131499938964844e+02]
 con.u_s=[3.131499938964844e+02, 3.131499938964844e+02]
 time=[0e+00, 8.64e+04]
-con.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, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.000964462757111e-01, 5.353429913520813e-01, 5.156108736991882e-01, 5.000187754631042e-01, 4.843146800994873e-01, 4.686800539493561e-01, 4.53165590763092e-01, 4.378383457660675e-01, 4.227559566497803e-01, 4.07978892326355e-01, 3.9356330037117e-01, 3.795678317546844e-01, 3.660500049591064e-01, 3.530589044094086e-01, 3.406482636928558e-01, 3.288666605949402e-01, 3.177599310874939e-01, 3.073725998401642e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-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, 1e+00, 1e+00, 3.00000011920929e-01, 3.00000011920929e-01, 3.027593493461609e-01, 3.414360582828522e-01, 3.530188202857971e-01, 3.660250306129456e-01, 3.795422911643982e-01, 3.93537998199463e-01, 4.079533219337462e-01, 4.227307140827178e-01, 4.378128945827484e-01, 4.531392753124237e-01, 4.686513245105743e-01, 4.842873513698578e-01, 4.99985545873642e-01, 5.156839489936829e-01, 5.313203930854797e-01, 5.468342900276184e-01, 5.621618628501892e-01, 5.77243983745575e-01, 5.920221209526062e-01, 6.064366698265076e-01, 6.204313039779663e-01, 6.339501738548279e-01, 6.46941602230072e-01, 6.593520045280457e-01, 6.711337566375732e-01, 6.822402477264404e-01, 6.926271915435791e-01, 7.022541165351868e-01, 7.110830545425415e-01, 7.190787792205811e-01, 7.262097597122192e-01, 7.324482798576355e-01, 7.37769603729248e-01, 7.421529293060303e-01, 7.455797791481018e-01, 7.480376958847046e-01, 7.495173811912537e-01, 7.500106692314148e-01]
+con.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, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.00081992149353e-01, 5.35348653793335e-01, 5.156134963035583e-01, 5.000161528587341e-01, 4.843102991580963e-01, 4.686746001243591e-01, 4.53165054321289e-01, 4.378353655338287e-01, 4.227547347545624e-01, 4.079819321632385e-01, 3.935560584068298e-01, 3.795717358589172e-01, 3.660544455051422e-01, 3.530621230602265e-01, 3.406396806240082e-01, 3.288702964782715e-01, 3.177606463432312e-01, 3.07371973991394e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-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, 1e+00, 1e+00, 3.00000011920929e-01, 3.00000011920929e-01, 3.027577102184296e-01, 3.414410054683685e-01, 3.530088365077972e-01, 3.660304546356201e-01, 3.795446455478668e-01, 3.935376703739167e-01, 4.079526066780089e-01, 4.227280616760253e-01, 4.378052353858948e-01, 4.531471133232117e-01, 4.68649297952652e-01, 4.842866957187653e-01, 4.999865591526031e-01, 5.156813263893127e-01, 5.313149690628052e-01, 5.468428730964661e-01, 5.621551275253296e-01, 5.772404074668884e-01, 5.920273065567017e-01, 6.064383387565613e-01, 6.204272508621216e-01, 6.339491009712219e-01, 6.469439268112183e-01, 6.593599319458008e-01, 6.711235046386719e-01, 6.822413206100464e-01, 6.92631721496582e-01, 7.022591829299927e-01, 7.110856771469116e-01, 7.190799713134766e-01, 7.262053489685059e-01, 7.324503064155579e-01, 7.377764582633972e-01, 7.421417236328125e-01, 7.455839514732361e-01, 7.480451464653015e-01, 7.495126128196716e-01, 7.499999403953552e-01]
diff --git a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Controls_SetPoints_Examples_SupplyReturnTemperatureReset.txt b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Controls_SetPoints_Examples_SupplyReturnTemperatureReset.txt
new file mode 100644
index 0000000000..3162e01165
--- /dev/null
+++ b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Controls_SetPoints_Examples_SupplyReturnTemperatureReset.txt
@@ -0,0 +1,9 @@
+last-generated=2015-05-08
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
+heaCur.TRet=[313.149993896484375, 312.78637694499411736615, 312.42272947593255594256, 312.05908200686758391385, 311.69546505538073688513, 311.33181765404469842906, 310.96817011725079282769, 310.60455323349287937162, 310.24090569669908745709, 309.87725843087508792451, 309.51364141160490817128, 309.14999387481117310017, 308.78637685555457892406, 308.42272931880177111452, 308.05908205292320189983, 307.69546530462275768514, 307.3318174969138567576, 306.96817023106257238396, 306.60455348273484332822, 306.24090567502588555726, 305.87725840919279107766, 305.51364111901654041503, 305.14999385313797120034, 304.78637710483752698565, 304.42272929712856921469, 304.05908203125, 303.69546474111916722904, 303.33181801707098657062, 302.9681702093802186937, 302.60455291923125287212, 302.24090619518307221369, 301.87725838751049423081, 301.51364109734328167178, 301.14999437329510101335, 300.7863770831642682424, 300.42272927545536731486, 300.05908255140712981301, 299.69546526127635388548, 299.33181745356739611452, 298.96816964585849518699, 298.60455343938838268514, 298.2409056316794817576, 297.87725782397052398665, 297.51364161750046832822, 297.14999380979151055726, 296.78637651947877884595, 296.42272979561249712788, 296.05908198790359620034, 295.69546469777276342938, 295.33181797372458277096, 294.968170166015625, 294.60455287588996498016, 294.24090506818623680374, 293.8772572604824517839, 293.51364213764600208378, 293.14999432994221706394, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375]
+heaCur.TSup=[333.149993896484375, 332.42272947593255594256, 331.69546505537391567486, 330.96817011725084967111, 330.24090569669897377025, 329.51364141160502185812, 328.78637685557487202459, 328.05908205292786306018, 327.3318174969138567576, 326.60455348273484332822, 325.87725840917005371011, 325.14999385313797120034, 324.42272929712856921469, 323.6954647410464076529, 322.96817020937112374668, 322.24090619518307221369, 321.51364109734328167178, 320.7863770831642682424, 320.05908255151626917723, 319.33181745356739611452, 318.60455343938838268514, 317.87725782397052398665, 317.14999380979151055726, 316.42272979561249712788, 315.69546469769090890622, 314.968170166015625, 314.24090506817589130151, 313.51364213765759814123, 312.78637703981786444274, 312.05908142440000574425, 311.33181849388171258397, 310.60455339604197888548, 309.87725778062412018699, 309.14999485010582702671, 308.42272975226609332822, 307.69546465433535331613, 306.96817120654822019787, 306.24090610849020777096, 305.51364101065041722904, 304.78637591259240480213, 304.05908246480527168387, 303.33181736687453167178, 302.6045522688347091389, 301.87725882104751917723, 301.14999372309864611452, 300.42272862525891241603, 299.69546569474061925575, 298.96817007932276055726, 298.24090498148302685877, 297.51364205096473369849, 296.786376953125, 296.05908133771748680374, 295.33181623988804176406, 294.60455114162209611095, 293.87725986155686541679, 293.14999476340005912789, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375]
+heaCur.TOut=[263.149993896484375, 263.54998780191135665518, 263.9500122249096421001, 264.35000613033315630673, 264.7500000357567842002, 265.14999386668705483316, 265.54998784662438993109, 265.95001219510777445976, 266.35000617502902287015, 266.74999985697314741628, 267.14999383688984835317, 267.54998781681564423707, 267.95001231430137522693, 268.35000629421807616382, 268.74999997616220070995, 269.14999365810626841267, 269.54998793605017226582, 269.9500121354905672888, 270.35000581735278046835, 270.75000009535125400362, 271.14999377729532170633, 271.54998805528470029458, 271.9500122547068485801, 272.35000593658730849711, 272.75000021454025045387, 273.149993896484375, 273.54998817451917147991, 273.95001177778698320253, 274.35000605582183652587, 274.75000033372930374753, 275.14999341972821866875, 275.54998769761749599638, 275.95001249308495516743, 276.35000557888378125426, 276.74999985697314741628, 277.14999413495337421409, 277.54998722086133966513, 277.95001201625603926004, 278.35000629421807616382, 278.75000057210741033487, 279.14999365810632525609, 279.54998793605017226582, 279.95001273146300491135, 280.35000581735278046835, 280.75000009535125400362, 281.1499943734224302716, 281.54998745923944625247, 281.9500122547068485801, 282.35000653259618275115, 282.74999961859509767237, 283.149993896484375, 283.54998817451348713803, 283.95001296982974281491, 284.35000724771333580065, 284.74999914185173111036, 285.14999341973532409611, 285.54998769761607491091, 285.95001249308069191102, 286.35000677096428489676, 286.75000104884793472593, 287.14999294298627319222, 287.54998722086986617796, 287.95001201625888143099, 288.35000629421523399287, 288.75000057209888382204, 289.14999485034627468849, 289.54998674412081527407, 289.95001153932793158674, 290.35000581735704372477, 290.75000009535267508909, 291.14999437341532484425, 291.54998865144443698227, 291.95001106239698174249, 292.35000534042609388052, 292.74999961860078201425, 293.149993896484375, 293.54998817451348713803, 293.95001296982974281491, 294.35000724771333580065, 294.74999914185173111036, 295.14999341973532409611, 295.54998769761607491091, 295.95001249308069191102, 296.35000677096428489676, 296.75000104884793472593, 297.14999294298627319222, 297.54998722086986617796, 297.95001201625888143099, 298.35000629421523399287, 298.75000057209888382204, 299.14999485034627468849, 299.54998674412081527407, 299.95001153932793158674, 300.35000581735704372477, 300.75000009535267508909, 301.14999437341532484425, 301.54998865144443698227, 301.95001106239698174249, 302.35000534042609388052, 302.74999961860078201425, 303.149993896484375]
+time=[0., 1.]
+heaCur1.TRoo_in=[293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 293.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375, 288.149993896484375]
+heaCur1.TRet=[313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 313.149993896484375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375, 301.48333740234375]
+heaCur1.TSup=[333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 333.149993896484375, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125, 314.816680908203125]
diff --git a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_Geothermal_Borefields_BaseClasses_HeatTransfer_ThermalResponseFactors_Validation_ShaGFunction.txt b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_Geothermal_Borefields_BaseClasses_HeatTransfer_ThermalResponseFactors_Validation_ShaGFunction.txt
index 82d6011f11..7c76883323 100644
--- a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_Geothermal_Borefields_BaseClasses_HeatTransfer_ThermalResponseFactors_Validation_ShaGFunction.txt
+++ b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_Geothermal_Borefields_BaseClasses_HeatTransfer_ThermalResponseFactors_Validation_ShaGFunction.txt
@@ -1,9 +1,9 @@
-last-generated=2018-08-24
+last-generated=2019-11-01
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
-cmp=[0e+00, 0e+00]
+cmp=[1e+00, 1e+00]
 time=[0e+00, 1e+00]
diff --git a/AixLib/Resources/Scripts/Dymola/Controls/SetPoints/Examples/HotWaterTemperatureReset.mos b/AixLib/Resources/Scripts/Dymola/Controls/SetPoints/Examples/SupplyReturnTemperatureReset.mos
similarity index 79%
rename from AixLib/Resources/Scripts/Dymola/Controls/SetPoints/Examples/HotWaterTemperatureReset.mos
rename to AixLib/Resources/Scripts/Dymola/Controls/SetPoints/Examples/SupplyReturnTemperatureReset.mos
index 906b85f2e5..275ace5a26 100644
--- a/AixLib/Resources/Scripts/Dymola/Controls/SetPoints/Examples/HotWaterTemperatureReset.mos
+++ b/AixLib/Resources/Scripts/Dymola/Controls/SetPoints/Examples/SupplyReturnTemperatureReset.mos
@@ -1,4 +1,4 @@
-simulateModel("AixLib.Controls.SetPoints.Examples.HotWaterTemperatureReset", method="Cvode", tolerance=1e-6, stopTime=1.0, resultFile="HotWaterTemperatureReset");
+simulateModel("AixLib.Controls.SetPoints.Examples.SupplyReturnTemperatureReset", method="Cvode", tolerance=1e-6, stopTime=1.0, resultFile="SupplyReturnTemperatureReset");
 createPlot(id = 17,
  position = {35, 20, 789, 637},
  x = "heaCur.TOut",
diff --git a/AixLib/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/CheckValve.mos b/AixLib/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/CheckValve.mos
new file mode 100644
index 0000000000..38fa4ff048
--- /dev/null
+++ b/AixLib/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/CheckValve.mos
@@ -0,0 +1,4 @@
+simulateModel("AixLib.Fluid.FixedResistances.Examples.CheckValve", method="Cvode", tolerance=1e-06, stopTime=1, resultFile="CheckValve");
+createPlot(id=1, position={0, 0, 988, 599}, y={"checkValve.dp", "checkValve_m_flow.dp"}, range={0.0, 1.0, -20000.0, 40000.0}, grid=true, colors={{28,108,200}, {238,46,47}});
+createPlot(id=1, position={0, 0, 988, 197}, y={"checkValve.m_flow", "checkValveDpFix.m_flow", "checkValve_m_flow.m_flow"}, range={0.0, 1.0, -2.0, 6.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
+createPlot(id=1, position={0, 0, 988, 197}, y={"checkValve.k", "checkValveDpFix.k", "checkValve_m_flow.k"}, range={0.0, 1.0, -0.02, 0.06}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}, {0,140,72}});
diff --git a/AixLib/Resources/Scripts/Dymola/Fluid/Sources/Validation/Boundary.mos b/AixLib/Resources/Scripts/Dymola/Fluid/Sources/Validation/Boundary.mos
new file mode 100644
index 0000000000..1ab8413b7d
--- /dev/null
+++ b/AixLib/Resources/Scripts/Dymola/Fluid/Sources/Validation/Boundary.mos
@@ -0,0 +1,7 @@
+simulateModel("AixLib.Fluid.Sources.Validation.Boundary", stopTime=1, method="Cvode", tolerance=1e-06, resultFile="Boundary");
+createPlot(id=1, position={15, 10, 592, 1411}, y={"bouWat.p", "bouProGly.p", "bouMoiAir.p", "bouMoiAirCO2.p", "bouProFluGas.p", "bouNatGas.p", "bouNatGasFix.p"}, range={0.0, 1.2000000000000002E-05, 0.0, 4.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}, {162,29,33}, {244,125,35}}, displayUnits={"bar", "bar", "bar", "bar", "bar", "bar", "bar"});
+createPlot(id=1, position={15, 10, 592, 173}, y={"bouWat.T", "bouProGly.T", "bouMoiAir.T", "bouMoiAirCO2.T", "bouProFluGas.T", "bouNatGas.T", "bouNatGasFix.T"}, range={0.0, 1.2000000000000002E-05, -20.0, 40.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}, {162,29,33}, {244,125,35}}, displayUnits={"degC", "degC", "degC", "degC", "degC", "degC", "degC"});
+createPlot(id=1, position={15, 10, 592, 173}, y={"bouMoiAir.Xi[1]"}, range={0.0, 1.2000000000000002E-05, -1.0, 2.0}, grid=true, subPlot=3, colors={{28,108,200}});
+createPlot(id=1, position={15, 10, 592, 172}, y={"bouMoiAirCO2.Xi[1]"}, range={0.0, 1.2000000000000002E-05, -1.0, 2.0}, grid=true, subPlot=4, colors={{28,108,200}});
+createPlot(id=1, position={15, 10, 592, 173}, y={"bouProFluGas.Xi[1]", "bouProFluGas.Xi[2]", "bouProFluGas.Xi[3]", "bouProFluGas.Xi[4]", "bouProFluGas.Xi[5]"}, range={0.0, 1.2000000000000002E-05, -1.0, 1.0}, grid=true, subPlot=5, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}});
+createPlot(id=1, position={15, 10, 592, 173}, y={"bouNatGas.Xi[1]", "bouNatGas.Xi[2]", "bouNatGas.Xi[3]", "bouNatGas.Xi[4]", "bouNatGas.Xi[5]"}, range={0.0, 1.2000000000000002E-05, -1.0, 1.0}, grid=true, subPlot=6, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0});
diff --git a/AixLib/Resources/Scripts/Dymola/Fluid/Sources/Validation/BoundaryWithX_in.mos b/AixLib/Resources/Scripts/Dymola/Fluid/Sources/Validation/BoundaryWithX_in.mos
new file mode 100644
index 0000000000..dbe6ec72d8
--- /dev/null
+++ b/AixLib/Resources/Scripts/Dymola/Fluid/Sources/Validation/BoundaryWithX_in.mos
@@ -0,0 +1,5 @@
+simulateModel("AixLib.Fluid.Sources.Validation.BoundaryWithX_in", stopTime=1, method="Cvode", tolerance=1e-06, resultFile="BoundaryWithX_in");
+createPlot(id=1, position={15, 10, 592, 173}, y={"bouMoiAir.Xi[1]"}, range={0.0, 1.2000000000000002E-05, -1.0, 2.0}, grid=true, subPlot=1, colors={{28,108,200}});
+createPlot(id=1, position={15, 10, 592, 172}, y={"bouMoiAirCO2.Xi[1]"}, range={0.0, 1.2000000000000002E-05, -1.0, 2.0}, grid=true, subPlot=2, colors={{28,108,200}});
+createPlot(id=1, position={15, 10, 592, 173}, y={"bouProFluGas.Xi[1]", "bouProFluGas.Xi[2]", "bouProFluGas.Xi[3]", "bouProFluGas.Xi[4]", "bouProFluGas.Xi[5]"}, range={0.0, 1.2000000000000002E-05, -1.0, 1.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}});
+createPlot(id=1, position={15, 10, 592, 173}, y={"bouNatGas.Xi[1]", "bouNatGas.Xi[2]", "bouNatGas.Xi[3]", "bouNatGas.Xi[4]", "bouNatGas.Xi[5]"}, range={0.0, 1.2000000000000002E-05, -1.0, 1.0}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0});
diff --git a/AixLib/Resources/Scripts/Dymola/Fluid/Sources/Validation/BoundaryWithXi_in.mos b/AixLib/Resources/Scripts/Dymola/Fluid/Sources/Validation/BoundaryWithXi_in.mos
new file mode 100644
index 0000000000..58524b16d1
--- /dev/null
+++ b/AixLib/Resources/Scripts/Dymola/Fluid/Sources/Validation/BoundaryWithXi_in.mos
@@ -0,0 +1,5 @@
+simulateModel("AixLib.Fluid.Sources.Validation.BoundaryWithXi_in", stopTime=1, method="Cvode", tolerance=1e-06, resultFile="BoundaryWithXi_in");
+createPlot(id=1, position={15, 10, 592, 173}, y={"bouMoiAir.Xi[1]"}, range={0.0, 1.2000000000000002E-05, -1.0, 2.0}, grid=true, subPlot=1, colors={{28,108,200}});
+createPlot(id=1, position={15, 10, 592, 172}, y={"bouMoiAirCO2.Xi[1]"}, range={0.0, 1.2000000000000002E-05, -1.0, 2.0}, grid=true, subPlot=2, colors={{28,108,200}});
+createPlot(id=1, position={15, 10, 592, 173}, y={"bouProFluGas.Xi[1]", "bouProFluGas.Xi[2]", "bouProFluGas.Xi[3]", "bouProFluGas.Xi[4]", "bouProFluGas.Xi[5]"}, range={0.0, 1.2000000000000002E-05, -1.0, 1.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}});
+createPlot(id=1, position={15, 10, 592, 173}, y={"bouNatGas.Xi[1]", "bouNatGas.Xi[2]", "bouNatGas.Xi[3]", "bouNatGas.Xi[4]", "bouNatGas.Xi[5]"}, range={0.0, 1.2000000000000002E-05, -1.0, 1.0}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0});
diff --git a/AixLib/Resources/Scripts/Dymola/Fluid/Storage/Validation/StratifiedNonUniformInitial.mos b/AixLib/Resources/Scripts/Dymola/Fluid/Storage/Validation/StratifiedNonUniformInitial.mos
new file mode 100644
index 0000000000..b79f04792e
--- /dev/null
+++ b/AixLib/Resources/Scripts/Dymola/Fluid/Storage/Validation/StratifiedNonUniformInitial.mos
@@ -0,0 +1,37 @@
+simulateModel("AixLib.Fluid.Storage.Validation.StratifiedNonUniformInitial", tolerance=1e-6, stopTime=3600, method="dassl", resultFile="StratifiedNonUniformInitial");
+createPlot(id = 1,
+ position = {10, 30, 719, 600},
+ filename = "StratifiedNonUniformInitial.mat",
+ y = {"heaTan.vol[1].T", "heaTan.vol[2].T", "heaTan.vol[3].T", "heaTan.vol[4].T", "heaTan.vol[5].T", "heaTan.vol[6].T", "heaTan.vol[7].T"},
+ range = {0, 15000.0, 55.0, 15.0},
+ autoscale = true,
+ autoerase = true,
+ autoreplot = true,
+ grid = true,
+ color = true,
+ leftTitleType = 1,
+ bottomTitleType = 1);
+createPlot(id = 1,
+  position = {10, 30, 719, 200},
+ y = {"cooTan.vol[1].T", "cooTan.vol[2].T", "cooTan.vol[3].T", "cooTan.vol[4].T", "cooTan.vol[5].T", "cooTan.vol[6].T", "cooTan.vol[7].T"},
+ range = {0, 14500.0, 60.0, 10.0},
+ autoscale = true,
+ autoerase = true,
+ autoreplot = true,
+ grid = true,
+ color = true,
+ subPlot = 2,
+ leftTitleType = 1,
+ bottomTitleType = 1);
+createPlot(id = 1,
+ position = {10, 30, 719, 200},
+ y = {"dHTan.y", "dHTanEnh.y"},
+ range = {0, 14500.0, 60.0, 10.0},
+ autoscale = true,
+ autoerase = true,
+ autoreplot = true,
+ grid = true,
+ color = true,
+ subPlot = 3,
+ leftTitleType = 1,
+ bottomTitleType = 1);
diff --git a/AixLib/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Validation/RoomWithLatentGain.mos b/AixLib/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Validation/RoomWithLatentGain.mos
new file mode 100644
index 0000000000..f1a5432caa
--- /dev/null
+++ b/AixLib/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Validation/RoomWithLatentGain.mos
@@ -0,0 +1,5 @@
+simulateModel("AixLib.ThermalZones.ReducedOrder.Validation.RoomWithLatentGain", stopTime=604800, method="Cvode", tolerance=1e-06, resultFile="RoomWithLatentGain");
+createPlot(id=1, position={75, 70, 968, 1004}, y={"thermalZoneTwoElements.TAir"}, range={0.0, 800000.0, 20.0, 35.0}, grid=true, colors={{28,108,200}}, displayUnits={"degC"});
+createPlot(id=1, position={75, 70, 968, 332}, y={"senMasFra.X"}, range={0.0, 800000.0, -0.01, 0.02}, grid=true, subPlot=2, colors={{28,108,200}});
+createPlot(id=1, position={75, 70, 968, 331}, y={"senRelHum.phi"}, range={0.0, 800000.0, -0.5, 1.0}, grid=true, subPlot=3, colors={{28,108,200}});
+
diff --git a/AixLib/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Validation/RoomWithoutLatentGain.mos b/AixLib/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Validation/RoomWithoutLatentGain.mos
new file mode 100644
index 0000000000..51fa8dea79
--- /dev/null
+++ b/AixLib/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Validation/RoomWithoutLatentGain.mos
@@ -0,0 +1,5 @@
+simulateModel("AixLib.ThermalZones.ReducedOrder.Validation.RoomWithoutLatentGain", stopTime=604800, method="Cvode", tolerance=1e-06, resultFile="RoomWithoutLatentGain");
+createPlot(id=1, position={75, 70, 968, 1004}, y={"thermalZoneTwoElements.TAir"}, range={0.0, 800000.0, 20.0, 35.0}, grid=true, colors={{28,108,200}}, displayUnits={"degC"});
+createPlot(id=1, position={75, 70, 968, 332}, y={"senMasFra.X"}, range={0.0, 800000.0, -0.01, 0.02}, grid=true, subPlot=2, colors={{28,108,200}});
+createPlot(id=1, position={75, 70, 968, 331}, y={"senRelHum.phi"}, range={0.0, 800000.0, -0.5, 1.0}, grid=true, subPlot=3, colors={{28,108,200}});
+
diff --git a/AixLib/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/SmoothHeavisideDerivatives.mos b/AixLib/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/SmoothHeavisideDerivatives.mos
new file mode 100644
index 0000000000..37e8e718e6
--- /dev/null
+++ b/AixLib/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/SmoothHeavisideDerivatives.mos
@@ -0,0 +1,4 @@
+simulateModel("AixLib.Utilities.Math.Functions.Examples.SmoothHeavisideDerivatives", startTime=-1, method="CVode", tolerance=1e-06, resultFile="SmoothHeavisideDerivatives");
+createPlot(id=1, position={15, 10, 761, 918}, y={"y"}, range={-1.2000000000000002E-05, 1.2E-05, -0.5, 1.5}, grid=true, colors={{28,108,200}}, timeUnit="d");
+createPlot(id=1, position={15, 10, 761, 304}, y={"der(y)"}, range={-1.6000000000000003E-05, 1.6E-05, -2.0, 6.0}, grid=true, subPlot=2, colors={{28,108,200}}, timeUnit="d");
+createPlot(id=1, position={15, 10, 761, 303}, y={"der2_y"}, range={-1.6000000000000003E-05, 1.6E-05, -40.0, 40.0}, grid=true, subPlot=3, colors={{28,108,200}}, timeUnit="d");
diff --git a/AixLib/Resources/Scripts/travis/bin/dymola b/AixLib/Resources/Scripts/travis/bin/dymola
index deb8cd31f7..811cfbf249 100644
--- a/AixLib/Resources/Scripts/travis/bin/dymola
+++ b/AixLib/Resources/Scripts/travis/bin/dymola
@@ -13,7 +13,7 @@ docker run \
   --detach=false \
   --rm \
   -v ${sha_dir}:/mnt/shared \
-  ${DOCKER_USERNAME}/travis_ubuntu-1804_dymola-2020-x86_64 /bin/bash -c \
+  ${DOCKER_USERNAME}/travis_ubuntu-1804_dymola-2020x-x86_64 /bin/bash -c \
   "Xvfb :77  -extension RANDR -extension GLX & \
   export DISPLAY=:77.0 && \
   cd /mnt/shared/${bas_nam} && \
diff --git a/AixLib/Systems/HydraulicModules/BaseClasses/package.order b/AixLib/Systems/HydraulicModules/BaseClasses/package.order
index ac6024afd1..cbc1ad24c6 100644
--- a/AixLib/Systems/HydraulicModules/BaseClasses/package.order
+++ b/AixLib/Systems/HydraulicModules/BaseClasses/package.order
@@ -1,6 +1,6 @@
 BasicPumpInterface
 HydraulicBus
 PartialHydraulicModule
-PumpInterface_SpeedControlledNrpm
-PumpInterface_PumpSpeedControlled
 PumpInterface_PumpHeadControlled
+PumpInterface_PumpSpeedControlled
+PumpInterface_SpeedControlledNrpm
diff --git a/AixLib/ThermalZones/ReducedOrder/Examples/package.mo b/AixLib/ThermalZones/ReducedOrder/Examples/package.mo
index e5180cd8a7..0b196329b2 100644
--- a/AixLib/ThermalZones/ReducedOrder/Examples/package.mo
+++ b/AixLib/ThermalZones/ReducedOrder/Examples/package.mo
@@ -1,5 +1,6 @@
 within AixLib.ThermalZones.ReducedOrder;
-package Examples "Collection of models that illustrate model use and test models"
+package Examples
+  "Collection of models that illustrate model use and test models"
   extends Modelica.Icons.ExamplesPackage;
 
 
diff --git a/AixLib/ThermalZones/ReducedOrder/Multizone/BaseClasses/package.order b/AixLib/ThermalZones/ReducedOrder/Multizone/BaseClasses/package.order
index 3235814e10..1109e05f7f 100644
--- a/AixLib/ThermalZones/ReducedOrder/Multizone/BaseClasses/package.order
+++ b/AixLib/ThermalZones/ReducedOrder/Multizone/BaseClasses/package.order
@@ -1,7 +1,7 @@
+AbsToRelHum
 AirFlowRateSplit
 AirFlowRateSum
+MoistSplitter
 PartialMultizone
 RelToAbsHum
 SumCondition
-AbsToRelHum
-MoistSplitter
diff --git a/AixLib/ThermalZones/ReducedOrder/RC/FourElements.mo b/AixLib/ThermalZones/ReducedOrder/RC/FourElements.mo
index 5a66999b7a..7d89390f38 100644
--- a/AixLib/ThermalZones/ReducedOrder/RC/FourElements.mo
+++ b/AixLib/ThermalZones/ReducedOrder/RC/FourElements.mo
@@ -10,7 +10,7 @@ model FourElements "Thermal Zone with four elements for exterior walls,
     annotation(Dialog(group="Roof"));
   parameter Integer nRoof(min = 1) "Number of RC-elements of roof"
     annotation(Dialog(group="Roof"));
-  parameter Modelica.SIunits.ThermalResistance RRoof[nExt](
+  parameter Modelica.SIunits.ThermalResistance RRoof[nRoof](
     each min=Modelica.Constants.small)
     "Vector of resistances of roof, from inside to outside"
     annotation(Dialog(group="Roof"));
@@ -18,7 +18,7 @@ model FourElements "Thermal Zone with four elements for exterior walls,
     min=Modelica.Constants.small)
     "Resistance of remaining resistor RRoofRem between capacity n and outside"
     annotation(Dialog(group="Roof"));
-  parameter Modelica.SIunits.HeatCapacity CRoof[nExt](
+  parameter Modelica.SIunits.HeatCapacity CRoof[nRoof](
     each min=Modelica.Constants.small)
     "Vector of heat capacities of roof, from inside to outside"
     annotation(Dialog(group="Roof"));
@@ -198,6 +198,11 @@ equation
   Documentation(revisions="<html>
   <ul>
   <li>
+  December 9, 2019, by Moritz Lauster:<br/>
+  Changes <code>nExt</code> to <code>nRoof</code> for
+  <code>RRoof</code> and <code>CRoof</code>
+  </li>
+  <li>
   July 11, 2019, by Katharina Brinkmann:<br/>
   Renamed <code>alphaRoof</code> to <code>hConRoof</code>,
   <code>alphaRoofConst</code> to <code>hConRoof_const</code>
diff --git a/AixLib/ThermalZones/ReducedOrder/RC/OneElement.mo b/AixLib/ThermalZones/ReducedOrder/RC/OneElement.mo
index ef277fb560..103af30e18 100644
--- a/AixLib/ThermalZones/ReducedOrder/RC/OneElement.mo
+++ b/AixLib/ThermalZones/ReducedOrder/RC/OneElement.mo
@@ -126,7 +126,7 @@ model OneElement "Thermal Zone with one element for exterior walls"
     transformation(extent={{-170,-190},{-150,-170}}), iconTransformation(
     extent={{-170,-190},{-150,-170}})));
 
-  AixLib.Fluid.MixingVolumes.MixingVolume volAir(
+  Fluid.MixingVolumes.MixingVolume volAir(
     redeclare final package Medium = Medium,
     final nPorts=nPorts,
     m_flow_nominal=VAir*6/3600*1.2,
@@ -142,7 +142,7 @@ model OneElement "Thermal Zone with one element for exterior walls"
     final use_C_flow=false) if VAir > 0 and not use_moisture_balance
     "Indoor air volume"
     annotation (Placement(transformation(extent={{42,-26},{22,-6}})));
-  AixLib.Fluid.MixingVolumes.MixingVolumeMoistAir volMoiAir(
+  Fluid.MixingVolumes.MixingVolumeMoistAir volMoiAir(
     redeclare final package Medium = Medium,
     final nPorts=nPorts,
     m_flow_nominal=VAir*6/3600*1.2,
@@ -194,7 +194,7 @@ model OneElement "Thermal Zone with one element for exterior walls"
 
 protected
   constant Modelica.SIunits.SpecificEnergy h_fg=
-    Media.Air.enthalpyOfCondensingGas(273.15+37) "Latent heat of water vapor";
+    AixLib.Media.Air.enthalpyOfCondensingGas(273.15+37) "Latent heat of water vapor";
   parameter Modelica.SIunits.Area ATot=sum(AArray) "Sum of wall surface areas";
   parameter Modelica.SIunits.Area ATotExt=sum(AExt)
     "Sum of exterior wall surface areas";
@@ -528,7 +528,6 @@ using the parameter <code>mSenFac</code>.
 The image below shows the RC-network of this model.
 </p>
 <p align=\"center\">
-<img src=\"modelica://IBPSA/Resources/Images/ThermalZones/ReducedOrder/RC/OneElement.png\" alt=\"image\"/>
 <img src=\"modelica://AixLib/Resources/Images/ThermalZones/ReducedOrder/RC/OneElement.png\" alt=\"image\"/>
 </p>
   </html>",
@@ -538,13 +537,13 @@ revisions="<html>
 October 9, 2019, by Michael Wetter:<br/>
 Refactored addition of moisture to also account for the energy content of the
 water vapor.<br/>
-This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1209\">IBPSA, issue 1209</a>.
-</li>
-<li>
-September 24, 2019, by Martin Kremer:<br/>
-Added possibility to consider moisture balance. <br/>
-Defined <code>volAir</code> conditional. Added conditional <code>volMoistAir</code> and corresponding in- and output connectors.
+This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1209\">AixLib, issue 1209</a>.
 </li>
+  <li>
+  September 24, 2019, by Martin Kremer:<br/>
+  Added possibility to consider moisture balance. <br/>
+  Defined <code>volAir</code> conditional. Added conditional <code>volMoistAir</code> and corresponding in- and output connectors.
+  </li>
   <li>
   July 11, 2019, by Katharina Brinkmann:<br/>
   Renamed <code>alphaRad</code> to <code>hRad</code>,
diff --git a/AixLib/ThermalZones/ReducedOrder/RC/ThreeElements.mo b/AixLib/ThermalZones/ReducedOrder/RC/ThreeElements.mo
index ed1b475e40..f2d95b8980 100644
--- a/AixLib/ThermalZones/ReducedOrder/RC/ThreeElements.mo
+++ b/AixLib/ThermalZones/ReducedOrder/RC/ThreeElements.mo
@@ -10,7 +10,7 @@ model ThreeElements "Thermal Zone with three elements for exterior walls,
     annotation(Dialog(group="Floor plate"));
   parameter Integer nFloor(min = 1) "Number of RC-elements of floor plate"
     annotation(Dialog(group="Floor plate"));
-  parameter Modelica.SIunits.ThermalResistance RFloor[nExt](
+  parameter Modelica.SIunits.ThermalResistance RFloor[nFloor](
     each min=Modelica.Constants.small)
     "Vector of resistances of floor plate, from inside to outside"
     annotation(Dialog(group="Floor plate"));
@@ -18,7 +18,7 @@ model ThreeElements "Thermal Zone with three elements for exterior walls,
     min=Modelica.Constants.small)
     "Resistance of remaining resistor RFloorRem between capacity n and outside"
     annotation(Dialog(group="Floor plate"));
-  parameter Modelica.SIunits.HeatCapacity CFloor[nExt](
+  parameter Modelica.SIunits.HeatCapacity CFloor[nFloor](
     each min=Modelica.Constants.small)
     "Vector of heat capacities of floor plate, from inside to outside"
     annotation(Dialog(group="Floor plate"));
@@ -182,8 +182,13 @@ equation
     Documentation(revisions="<html>
   <ul>
   <li>
+  December 9, 2019, by Moritz Lauster:<br/>
+  Changes <code>nExt</code> to <code>nFloor</code> for
+  <code>RFloor</code> and <code>CFloor</code>
+  </li>
+  <li>
   July 11, 2019, by Katharina Brinkmann:<br/>
-  Renamed <code>alphaFloor</code> to <code>hConFloor</code>, 
+  Renamed <code>alphaFloor</code> to <code>hConFloor</code>,
   <code>alphaFloorConst</code> to <code>hConFloor_const</code>
   </li>
   <li>
diff --git a/AixLib/ThermalZones/ReducedOrder/RC/package.mo b/AixLib/ThermalZones/ReducedOrder/RC/package.mo
index 62035ce212..89cfafca56 100644
--- a/AixLib/ThermalZones/ReducedOrder/RC/package.mo
+++ b/AixLib/ThermalZones/ReducedOrder/RC/package.mo
@@ -169,6 +169,17 @@ package RC "Package with reduced order thermal zones based on VDI 6007 Part 1"
   </p>
   </li>
   </ul>
+  <h4>Modeling of latent heat gains</h4>
+  <p>
+  All zone models in <a href=\"modelica://AixLib.ThermalZones.ReducedOrder.RC\">
+  AixLib.ThermalZones.ReducedOrder.RC</a> have a parameter <code>use_moisture_balance</code>.
+  If set to <code>true</code>, the input connector <code>QLat_flow</code> is enabled.
+  This input connector can be used to set the latent heat gain of the zone. The model assumes this
+  latent heat gain to be at <i>37</i>&circ;C, e.g., near the skin temperature.
+  For other latent sources that are near <i>20</i>&circ;C, this assumption of the temperature
+  leads to an error of around <i>2</i>%, which in most cases is considerably smaller than
+  the uncertainty of <code>QLat_flow</code>.
+  </p>
   <h4>Typical use and important parameter</h4>
   <p>
   The models in this package are typically used in combination with models from
diff --git a/AixLib/ThermalZones/ReducedOrder/ThermalZone/ThermalZone.mo b/AixLib/ThermalZones/ReducedOrder/ThermalZone/ThermalZone.mo
index 41f71c869b..fbcfde9b4f 100644
--- a/AixLib/ThermalZones/ReducedOrder/ThermalZone/ThermalZone.mo
+++ b/AixLib/ThermalZones/ReducedOrder/ThermalZone/ThermalZone.mo
@@ -9,7 +9,7 @@ model ThermalZone
     AixLib.ThermalZones.ReducedOrder.SolarGain.BaseClasses.PartialCorrectionG
     "Model for correction of solar transmission"
     annotation(choicesAllMatching=true);
-  parameter Integer internalGainsMode
+  parameter Integer internalGainsMode = 1
      "decides which internal gains model for persons is used";
   parameter Boolean recOrSep=true "Use record or seperate parameters"
     annotation (Dialog(tab="IdealHeaterCooler", group="Modes"), choices(choice =  false
diff --git a/AixLib/ThermalZones/ReducedOrder/Validation/RoomWithLatentGain.mo b/AixLib/ThermalZones/ReducedOrder/Validation/RoomWithLatentGain.mo
new file mode 100644
index 0000000000..f11801c6a4
--- /dev/null
+++ b/AixLib/ThermalZones/ReducedOrder/Validation/RoomWithLatentGain.mo
@@ -0,0 +1,57 @@
+within AixLib.ThermalZones.ReducedOrder.Validation;
+model RoomWithLatentGain
+  "Test case based on VDI 6007 Case 12, with latent heat gain added"
+  extends VDI6007.TestCase12(
+    redeclare package Medium = AixLib.Media.Air,
+    thermalZoneTwoElements(use_moisture_balance=true,
+    nPorts=4,
+    VAir=52.5),
+    assEqu(
+      startTime=0,
+      endTime=0,
+      startTime2=0,
+      endTime2=0,
+      startTime3=0,
+      endTime3=0));
+  Fluid.Sensors.RelativeHumidity senRelHum(
+    redeclare package Medium = Medium)
+    "Relative humidity of room air"
+    annotation (Placement(transformation(extent={{110,-20},{130,0}})));
+  Fluid.Sensors.MassFraction senMasFra(
+    redeclare package Medium = Medium)
+    "Absolute humidity of room air in kg/kg total air"
+    annotation (Placement(transformation(extent={{110,-50},{130,-30}})));
+equation
+  connect(senRelHum.port, thermalZoneTwoElements.ports[3]) annotation (Line(
+        points={{120,-20},{83,-20},{83,-1.95}}, color={0,127,255}));
+  connect(senMasFra.port, thermalZoneTwoElements.ports[4]) annotation (Line(
+        points={{120,-50},{83,-50},{83,-1.95}}, color={0,127,255}));
+  connect(intGai.y[2], thermalZoneTwoElements.QLat_flow) annotation (Line(
+        points={{22.8,-52},{32,-52},{32,4},{43,4},{43,4}}, color={0,0,127}));
+  annotation (Documentation(info="<html>
+<p>
+Test Case 12 of the VDI 6007 Part 1: Calculation of indoor air temperature
+excited by a radiative and convective heat source for room version S.</p>
+<h4>Boundary conditions</h4>
+<p>
+This test case changes the medium to moist air, and adds latent heat gain.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+October 9, 2019, by Michael Wetter:<br/>
+First implementation.<br/>
+This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1209\">AixLib, issue 1209</a>.
+</li>
+</ul>
+</html>"),
+experiment(
+      StopTime=604800,
+      Tolerance=1e-06,
+      __Dymola_Algorithm="Cvode"),
+  __Dymola_Commands(file=
+  "modelica://AixLib/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Validation/RoomWithLatentGain.mos"
+  "Simulate and plot"),
+    Diagram(coordinateSystem(extent={{-140,-100},{140,100}})),
+    Icon(coordinateSystem(extent={{-100,-100},{100,100}})));
+end RoomWithLatentGain;
diff --git a/AixLib/ThermalZones/ReducedOrder/Validation/RoomWithoutLatentGain.mo b/AixLib/ThermalZones/ReducedOrder/Validation/RoomWithoutLatentGain.mo
new file mode 100644
index 0000000000..9214db9a9e
--- /dev/null
+++ b/AixLib/ThermalZones/ReducedOrder/Validation/RoomWithoutLatentGain.mo
@@ -0,0 +1,64 @@
+within AixLib.ThermalZones.ReducedOrder.Validation;
+model RoomWithoutLatentGain
+  "Test case based on VDI 6007 Case 12, with zero latent heat gain added"
+  extends VDI6007.TestCase12(
+    redeclare package Medium = AixLib.Media.Air,
+    thermalZoneTwoElements(
+      use_moisture_balance=true,
+      nPorts=4,
+      VAir=52.5),
+    assEqu(
+      startTime=0,
+      endTime=0,
+      startTime2=0,
+      endTime2=0,
+      startTime3=0,
+      endTime3=0));
+  Modelica.Blocks.Sources.Constant QLat_flow(k=0) "Zero latent heat gain"
+    annotation (Placement(
+    transformation(
+    extent={{-5,-5},{5,5}},
+    rotation=0,
+    origin={23,3})));
+  Fluid.Sensors.RelativeHumidity senRelHum(
+    redeclare package Medium = Medium)
+    "Relative humidity of room air"
+    annotation (Placement(transformation(extent={{110,-20},{130,0}})));
+  Fluid.Sensors.MassFraction senMasFra(
+    redeclare package Medium = Medium)
+    "Absolute humidity of room air in kg/kg total air"
+    annotation (Placement(transformation(extent={{110,-50},{130,-30}})));
+equation
+  connect(QLat_flow.y, thermalZoneTwoElements.QLat_flow) annotation (Line(
+        points={{28.5,3},{34,3},{34,4},{43,4}},   color={0,0,127}));
+  connect(senRelHum.port, thermalZoneTwoElements.ports[3]) annotation (Line(
+        points={{120,-20},{83,-20},{83,-1.95}}, color={0,127,255}));
+  connect(senMasFra.port, thermalZoneTwoElements.ports[4]) annotation (Line(
+        points={{120,-50},{83,-50},{83,-1.95}}, color={0,127,255}));
+  annotation (Documentation(info="<html>
+<p>
+Test Case 12 of the VDI 6007 Part 1: Calculation of indoor air temperature
+excited by a radiative and convective heat source for room version S.</p>
+<h4>Boundary conditions</h4>
+<p>
+This test case changes the medium to moist air, and adds zero latent heat gain.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+October 9, 2019, by Michael Wetter:<br/>
+First implementation.<br/>
+This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1209\">AixLib, issue 1209</a>.
+</li>
+</ul>
+</html>"),
+experiment(
+      StopTime=604800,
+      Tolerance=1e-06,
+      __Dymola_Algorithm="Cvode"),
+  __Dymola_Commands(file=
+  "modelica://AixLib/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Validation/RoomWithoutLatentGain.mos"
+  "Simulate and plot"),
+    Diagram(coordinateSystem(extent={{-140,-100},{140,100}})),
+    Icon(coordinateSystem(extent={{-100,-100},{100,100}})));
+end RoomWithoutLatentGain;
diff --git a/AixLib/ThermalZones/ReducedOrder/Validation/VDI6007/TestCase12.mo b/AixLib/ThermalZones/ReducedOrder/Validation/VDI6007/TestCase12.mo
index 14a019f373..8ad19a90f0 100644
--- a/AixLib/ThermalZones/ReducedOrder/Validation/VDI6007/TestCase12.mo
+++ b/AixLib/ThermalZones/ReducedOrder/Validation/VDI6007/TestCase12.mo
@@ -2,9 +2,11 @@ within AixLib.ThermalZones.ReducedOrder.Validation.VDI6007;
 model TestCase12 "VDI 6007 Test Case 12 model"
   extends Modelica.Icons.Example;
 
-  package Medium = Modelica.Media.Air.SimpleAir "Medium model";
+  replaceable package Medium = Modelica.Media.Air.SimpleAir
+   constrainedby Modelica.Media.Interfaces.PartialMedium "Medium model";
 
   RC.TwoElements thermalZoneTwoElements(
+    redeclare final package Medium = Medium,
     hConExt=2.7,
     hConWin=2.7,
     gWin=1,
@@ -23,7 +25,6 @@ model TestCase12 "VDI 6007 Test Case 12 model"
     nPorts=2,
     nOrientations=1,
     VAir=0.1,
-    redeclare final package Medium = Modelica.Media.Air.SimpleAir,
     AWin={0},
     ATransparent={7},
     AExt={10.5},
@@ -36,10 +37,10 @@ model TestCase12 "VDI 6007 Test Case 12 model"
   Modelica.Thermal.HeatTransfer.Sources.PrescribedTemperature preTem(port(T(
     start=300)))
     "Outdoor air temperature"
-    annotation (Placement(transformation(extent={{8,-6},{20,6}})));
+    annotation (Placement(transformation(extent={{-30,6},{-18,18}})));
   Modelica.Thermal.HeatTransfer.Components.Convection theConWall
     "Outdoor convective heat transfer"
-    annotation (Placement(transformation(extent={{36,6},{26,-4}})));
+    annotation (Placement(transformation(extent={{4,18},{-8,6}})));
   Modelica.Blocks.Sources.CombiTimeTable intGai(
     extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
     table=[0,0,0,0; 3600,0,0,0; 7200,0,0,0; 10800,0,0,0; 14400,0,0,0; 18000,0,0,
@@ -82,7 +83,7 @@ model TestCase12 "VDI 6007 Test Case 12 model"
     transformation(
     extent={{-4,-4},{4,4}},
     rotation=90,
-    origin={30,-18})));
+    origin={-2,-4})));
   Modelica.Blocks.Sources.CombiTimeTable outdoorTemp(
     extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
     columns={2},
@@ -97,7 +98,7 @@ model TestCase12 "VDI 6007 Test Case 12 model"
         297.85; 75600,297.85; 75600,296.05; 79200,296.05; 79200,295.05; 82800,
         295.05; 82800,294.05; 86400,294.05])
     "Outdoor air temperature"
-    annotation (Placement(transformation(extent={{-28,-8},{-12,8}})));
+    annotation (Placement(transformation(extent={{-60,4},{-44,20}})));
   Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow perRad
     "Radiative heat flow persons"
     annotation (Placement(transformation(extent={{48,-102},{68,-82}})));
@@ -191,13 +192,14 @@ model TestCase12 "VDI 6007 Test Case 12 model"
     annotation (Placement(transformation(extent={{62,46},{72,56}})));
 equation
   connect(theConWall.fluid, preTem.port)
-    annotation (Line(points={{26,1},{24,1},{24,0},{20,0}}, color={191,0,0}));
+    annotation (Line(points={{-8,12},{-18,12}},            color={191,0,0}));
   connect(thermalZoneTwoElements.extWall, theConWall.solid)
-    annotation (Line(points={{44,12},{40,12},{40,1},{36,1}}, color={191,0,0}));
+    annotation (Line(points={{44,12},{4,12}},                color={191,0,0}));
   connect(hConWall.y, theConWall.Gc)
-    annotation (Line(points={{30,-13.6},{31,-13.6},{31,-4}}, color={0,0,127}));
+    annotation (Line(points={{-2,0.4},{-2,6}},               color={0,0,127}));
   connect(outdoorTemp.y[1], preTem.T)
-    annotation (Line(points={{-11.2,0},{6.8,0}}, color={0,0,127}));
+    annotation (Line(points={{-43.2,12},{-31.2,12}},
+                                                 color={0,0,127}));
   connect(perRad.port, thermalZoneTwoElements.intGainsRad)
     annotation (Line(
     points={{68,-92},{68,-92},{98,-92},{98,24},{92,24}}, color={191,0,0}));
@@ -237,8 +239,8 @@ equation
   connect(gain.y, ventilationIn.m_flow_in)
     annotation (Line(points={{-47.3,-22},{-32,-22}}, color={0,0,127}));
   connect(outdoorTemp.y[1], ventilationIn.T_in)
-    annotation (Line(points={{-11.2,
-    0},{-4,0},{-4,-12},{-42,-12},{-42,-26},{-32,-26}}, color={0,0,127}));
+    annotation (Line(points={{-43.2,12},{-40,12},{-40,-26},{-32,-26}},
+                                                       color={0,0,127}));
   connect(gain.y, gain1.u)
     annotation (Line(points={{-47.3,-22},{-44,-22},{-44,
     -38},{-70,-38},{-70,-54},{-63.4,-54}}, color={0,0,127}));
diff --git a/AixLib/ThermalZones/ReducedOrder/Validation/VDI6007/package.mo b/AixLib/ThermalZones/ReducedOrder/Validation/VDI6007/package.mo
index acda919165..5da84f16b9 100644
--- a/AixLib/ThermalZones/ReducedOrder/Validation/VDI6007/package.mo
+++ b/AixLib/ThermalZones/ReducedOrder/Validation/VDI6007/package.mo
@@ -1,5 +1,6 @@
 within AixLib.ThermalZones.ReducedOrder.Validation;
-package VDI6007 "Validation according to VDI 6007-1"
+package VDI6007
+  "Validation according to VDI 6007-1"
   extends Modelica.Icons.ExamplesPackage;
 
 annotation (Documentation(info="<html>
diff --git a/AixLib/ThermalZones/ReducedOrder/Validation/package.mo b/AixLib/ThermalZones/ReducedOrder/Validation/package.mo
index 292ad9910b..ec77e51d94 100644
--- a/AixLib/ThermalZones/ReducedOrder/Validation/package.mo
+++ b/AixLib/ThermalZones/ReducedOrder/Validation/package.mo
@@ -1,5 +1,6 @@
 within AixLib.ThermalZones.ReducedOrder;
-package Validation "Collection of validation models"
+package Validation
+  "Collection of validation models"
   extends Modelica.Icons.ExamplesPackage;
 
 
diff --git a/AixLib/ThermalZones/ReducedOrder/Validation/package.order b/AixLib/ThermalZones/ReducedOrder/Validation/package.order
index fc8b04fdbd..fa158ce1fb 100644
--- a/AixLib/ThermalZones/ReducedOrder/Validation/package.order
+++ b/AixLib/ThermalZones/ReducedOrder/Validation/package.order
@@ -1,2 +1,4 @@
+RoomWithLatentGain
+RoomWithoutLatentGain
 ASHRAE140
 VDI6007
diff --git a/AixLib/ThermalZones/ReducedOrder/package.mo b/AixLib/ThermalZones/ReducedOrder/package.mo
index d4f72bfd7e..eac3e66d40 100644
--- a/AixLib/ThermalZones/ReducedOrder/package.mo
+++ b/AixLib/ThermalZones/ReducedOrder/package.mo
@@ -1,5 +1,6 @@
 within AixLib.ThermalZones;
-package ReducedOrder "Reduced order models based on VDI 6007"
+package ReducedOrder
+  "Reduced order models based on VDI 6007"
   extends Modelica.Icons.Package;
 
 
diff --git a/AixLib/Utilities/IO/Files/BaseClasses/FileWriter.mo b/AixLib/Utilities/IO/Files/BaseClasses/FileWriter.mo
index 3da1f7d8cc..4924a8f751 100644
--- a/AixLib/Utilities/IO/Files/BaseClasses/FileWriter.mo
+++ b/AixLib/Utilities/IO/Files/BaseClasses/FileWriter.mo
@@ -67,6 +67,10 @@ algorithm
     str :=String(time,significantDigits=significantDigits) + delimiter;
     for i in 1:nin-1 loop
       str :=str + String(u[i],significantDigits=significantDigits) + delimiter;
+      if mod(i+1,10)==0 then // write out buffer every 10 entries to avoid overflow
+        writeLine(filWri, str, 1); // not adding this one to row count
+        str:="";
+      end if;
     end for;
     str :=str + String(u[nin],significantDigits=significantDigits) + "\n";
     writeLine(filWri, str, 0);
@@ -91,6 +95,11 @@ algorithm
     Documentation(revisions="<html>
 <ul>
 <li>
+October 17, 2019 by Filip Jorissen:<br/>
+Avoiding overflow of string buffer in dymola.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1219\">#1219</a>.
+</li>
+<li>
 October 8, 2018 by Filip Jorissen:<br/>
 Added implementation for the parameter <code>significantDigits</code>.
 See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1041\">#1041</a>.
diff --git a/AixLib/Utilities/IO/Files/CSVWriter.mo b/AixLib/Utilities/IO/Files/CSVWriter.mo
index f6a3b2cfd6..c18c63ef44 100644
--- a/AixLib/Utilities/IO/Files/CSVWriter.mo
+++ b/AixLib/Utilities/IO/Files/CSVWriter.mo
@@ -9,6 +9,10 @@ initial algorithm
     str := str + "time" + delimiter;
     for i in 1:nin-1 loop
       str := str + headerNames[i] + delimiter;
+      if mod(i+1,10)==0 then // write out buffer every 10 entries to avoid overflow
+        writeLine(filWri, str, 1);
+        str:="";
+      end if;
     end for;
     str := str + headerNames[nin] + "\n";
     writeLine(filWri, str, 1);
@@ -51,6 +55,11 @@ hence disregards the simulation tool output interval settings.
 </html>", revisions="<html>
 <ul>
 <li>
+October 17, 2019 by Filip Jorissen:<br/>
+Avoiding overflow of string buffer in dymola.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1219\">#1219</a>.
+</li>
+<li>
 July 7, 2018 by Filip Jorissen:<br/>
 First implementation.
 See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/924\">#924</a>.
diff --git a/AixLib/Utilities/IO/Files/CombiTimeTableWriter.mo b/AixLib/Utilities/IO/Files/CombiTimeTableWriter.mo
index 95355c84d7..d41fed822d 100644
--- a/AixLib/Utilities/IO/Files/CombiTimeTableWriter.mo
+++ b/AixLib/Utilities/IO/Files/CombiTimeTableWriter.mo
@@ -10,6 +10,10 @@ initial algorithm
     str :="# time" + delimiter;
     for i in 1:nin-1 loop
       str :=str + headerNames[i] + delimiter;
+      if mod(i+1,10)==0 then // write out buffer every 10 entries to avoid overflow
+        writeLine(filWri, str, 1);
+        str:="";
+      end if;
     end for;
     str :=str + headerNames[nin] + "\n";
     writeLine(filWri, str, 1);
@@ -56,6 +60,11 @@ hence disregards the simulation tool output interval settings.
 </html>", revisions="<html>
 <ul>
 <li>
+October 17, 2019 by Filip Jorissen:<br/>
+Avoiding overflow of string buffer in dymola.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1219\">#1219</a>.
+</li>
+<li>
 July 7, 2018 by Filip Jorissen:<br/>
 First implementation.
 See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/924\">#924</a>.
diff --git a/AixLib/Utilities/IO/SignalExchange/Examples/BaseClasses/ExportedModel.mo b/AixLib/Utilities/IO/SignalExchange/Examples/BaseClasses/ExportedModel.mo
index 010998ae14..4e20b31bca 100644
--- a/AixLib/Utilities/IO/SignalExchange/Examples/BaseClasses/ExportedModel.mo
+++ b/AixLib/Utilities/IO/SignalExchange/Examples/BaseClasses/ExportedModel.mo
@@ -20,7 +20,8 @@ model ExportedModel "Model to be exported as an FMU"
         uExt(
           y=oveWriSet_u),
         activate(
-          y=oveWriSet_activate)),
+          y=oveWriSet_activate)
+      ),
       oveWriAct(
         uExt(
           y=oveWriAct_u),
diff --git a/AixLib/Utilities/IO/SignalExchange/Examples/BaseClasses/OriginalModel.mo b/AixLib/Utilities/IO/SignalExchange/Examples/BaseClasses/OriginalModel.mo
index 47e921101f..1606ee1f5d 100644
--- a/AixLib/Utilities/IO/SignalExchange/Examples/BaseClasses/OriginalModel.mo
+++ b/AixLib/Utilities/IO/SignalExchange/Examples/BaseClasses/OriginalModel.mo
@@ -18,13 +18,15 @@ model OriginalModel "Original model"
 
   Overwrite oveWriSet(
     description="First order system control setpoint",
-    u(min=-10,
+    u(
+      min=-10,
       max=10,
       unit="1")) "Overwrite block for setpoint"
     annotation (Placement(transformation(extent={{-40,20},{-20,40}})));
 
   Overwrite oveWriAct(description="First order system input",
-    u(min=-10,
+    u(
+      min=-10,
       max=10,
       unit="1")) "Overwrite block for actuator signal"
     annotation (Placement(transformation(extent={{20,20},{40,40}})));
@@ -47,8 +49,8 @@ equation
   connect(firOrd.y, rea.u) annotation (Line(points={{71,30},{80,30},{80,-20},{52,
           -20}}, color={0,0,127}));
   connect(rea.y, conPI.u_m)
-    annotation (Line(points={{29,-20},{0,-20},{0,18}}, color={0,0,127}));
 
+    annotation (Line(points={{29,-20},{0,-20},{0,18}}, color={0,0,127}));
   annotation (Documentation(info="<html>
 <p>
 This is a model of a first order dynamic system with feedback control.
diff --git a/AixLib/Utilities/IO/SignalExchange/Read.mo b/AixLib/Utilities/IO/SignalExchange/Read.mo
index 09994954ab..8e905e3abe 100644
--- a/AixLib/Utilities/IO/SignalExchange/Read.mo
+++ b/AixLib/Utilities/IO/SignalExchange/Read.mo
@@ -32,13 +32,19 @@ also be directed to an external program as an output.
 </p>
 <p>
 It is important to add a brief description of the signal using the
-<code>description</code> parameter and assign a type if needed for KPI
+<code>description</code> parameter, assign a <code>unit</code> to the output 
+variable <code>y</code>, and assign a type if needed for KPI
 calculation using the <code>KPIs</code> parameter.
 </p>
 </html>",
 revisions="<html>
 <ul>
 <li>
+January 9, 2020 by David Blum:<br/>
+Updated documentation to prompt user to add unit to output.  
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1276\">#1276</a>.
+</li>
+<li>
 July 17, 2019 by Michael Wetter:<br/>
 Changed parameter name from <code>Description</code> to <code>description</code>.
 </li>
diff --git a/AixLib/Utilities/Math/Examples/SmoothHeaviside.mo b/AixLib/Utilities/Math/Examples/SmoothHeaviside.mo
index cc3348830c..9b3e890af0 100644
--- a/AixLib/Utilities/Math/Examples/SmoothHeaviside.mo
+++ b/AixLib/Utilities/Math/Examples/SmoothHeaviside.mo
@@ -1,11 +1,14 @@
 within AixLib.Utilities.Math.Examples;
 model SmoothHeaviside "Test model for smoothHeavisidefunction "
   extends Modelica.Icons.Example;
-  Modelica.Blocks.Sources.Ramp x1(duration=1,
+  Modelica.Blocks.Sources.Ramp x1(
+    duration=1,
     height=2,
     offset=-1)
+    "Ramp input signal"
     annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
   AixLib.Utilities.Math.SmoothHeaviside smoothHeaviside(delta=0.1)
+  "Smooth approximation to Heaviside function"
     annotation (Placement(transformation(extent={{-8,-10},{12,10}})));
 equation
   connect(x1.y, smoothHeaviside.u) annotation (Line(
diff --git a/AixLib/Utilities/Math/Functions/Examples/InverseXDerivativeCheck.mo b/AixLib/Utilities/Math/Functions/Examples/InverseXDerivativeCheck.mo
index 0e9295bb62..e1db7884ca 100644
--- a/AixLib/Utilities/Math/Functions/Examples/InverseXDerivativeCheck.mo
+++ b/AixLib/Utilities/Math/Functions/Examples/InverseXDerivativeCheck.mo
@@ -17,8 +17,8 @@ initial equation
 equation
   x = time^3*gain;
   y = AixLib.Utilities.Math.Functions.inverseXRegularized(
-    x = x,
-    delta = delta);
+    x=  x,
+    delta=  delta);
   der(y_comp) = AixLib.Utilities.Math.Functions.BaseClasses.der_inverseXRegularized(x=x,delta=delta,x_der=der(x));
   err = y-y_comp;
   assert(abs(err) < 1E-3, "Error in implementation.");
diff --git a/AixLib/Utilities/Math/Functions/Examples/RegNonZeroPowerDerivative_2_Check.mo b/AixLib/Utilities/Math/Functions/Examples/RegNonZeroPowerDerivative_2_Check.mo
index 0cc44c6bc2..8022eb612f 100644
--- a/AixLib/Utilities/Math/Functions/Examples/RegNonZeroPowerDerivative_2_Check.mo
+++ b/AixLib/Utilities/Math/Functions/Examples/RegNonZeroPowerDerivative_2_Check.mo
@@ -22,9 +22,9 @@ initial equation
 equation
   x = time^3*gain;
   y = AixLib.Utilities.Math.Functions.regNonZeroPower(
-       x =     x,
-       n =     n,
-       delta = delta);
+       x=      x,
+       n=      n,
+       delta=  delta);
 
   der_y = der(y);
   der_y_comp = der(y_comp);
diff --git a/AixLib/Utilities/Math/Functions/Examples/SmoothHeavisideDerivatives.mo b/AixLib/Utilities/Math/Functions/Examples/SmoothHeavisideDerivatives.mo
new file mode 100644
index 0000000000..8546768d22
--- /dev/null
+++ b/AixLib/Utilities/Math/Functions/Examples/SmoothHeavisideDerivatives.mo
@@ -0,0 +1,28 @@
+within AixLib.Utilities.Math.Functions.Examples;
+model SmoothHeavisideDerivatives
+  "Test model for the derivatives of the smoothHeavisidefunction"
+  extends Modelica.Icons.Example;
+  Real y = AixLib.Utilities.Math.Functions.smoothHeaviside(x=time, delta=0.2) "Function value";
+  Real der_y = der(y) "First derivative";
+  Real der2_y = der(der_y) "Second derivative";
+equation
+
+  annotation (experiment(Tolerance=1e-6, StartTime=-1, StopTime=1.0),
+__Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/SmoothHeavisideDerivatives.mos"
+        "Simulate and plot"), Documentation(info="<html>
+<p>
+This model tests the first and second derivative of the twice Lipschitz continuously differentiable function
+<a href=\"modelica://AixLib.Utilities.Math.Functions.smoothHeaviside\">
+AixLib.Utilities.Math.Functions.smoothHeaviside</a>.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+October 21, 2019, by Michael Wetter:<br/>
+First implementation.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1202\">issue 1202</a>.
+</li>
+</ul>
+</html>"));
+end SmoothHeavisideDerivatives;
diff --git a/AixLib/Utilities/Math/Functions/Examples/package.order b/AixLib/Utilities/Math/Functions/Examples/package.order
index 2e68e3bde8..09732daa89 100644
--- a/AixLib/Utilities/Math/Functions/Examples/package.order
+++ b/AixLib/Utilities/Math/Functions/Examples/package.order
@@ -19,6 +19,7 @@ RegNonZeroPowerDerivativeCheck
 RegNonZeroPowerDerivative_2_Check
 RegStep
 SmoothExponentialDerivativeCheck
+SmoothHeavisideDerivatives
 SpliceFunction
 SpliceFunctionDerivativeCheck
 TrapezoidalIntegration
diff --git a/AixLib/Utilities/Math/Functions/package.mo b/AixLib/Utilities/Math/Functions/package.mo
index c13f1e9ae1..b6d217ce44 100644
--- a/AixLib/Utilities/Math/Functions/package.mo
+++ b/AixLib/Utilities/Math/Functions/package.mo
@@ -1,7 +1,6 @@
 within AixLib.Utilities.Math;
 package Functions "Package with mathematical functions"
   extends Modelica.Icons.VariantsPackage;
-
 annotation (preferredView="info", Documentation(info="<html>
 <p>
 This package contains functions for commonly used
diff --git a/AixLib/Utilities/Math/Functions/smoothHeaviside.mo b/AixLib/Utilities/Math/Functions/smoothHeaviside.mo
index 981691df79..c2b37eb4bf 100644
--- a/AixLib/Utilities/Math/Functions/smoothHeaviside.mo
+++ b/AixLib/Utilities/Math/Functions/smoothHeaviside.mo
@@ -1,27 +1,40 @@
 within AixLib.Utilities.Math.Functions;
 function smoothHeaviside
-  "Once continuously differentiable approximation to the Heaviside function"
+  "Twice continuously differentiable approximation to the Heaviside function"
   extends Modelica.Icons.Function;
   input Real x "Argument";
-  input Real delta "Parameter used for scaling";
+  input Real delta(min=Modelica.Constants.eps) "Parameter used for scaling";
   output Real y "Result";
+protected
+  Real dx=0.5*x/delta "Scaled input argument";
+  Real xpow2=dx*dx "=dx*dx";
 algorithm
- y := AixLib.Utilities.Math.Functions.regStep(
-   y1 = 1,
-   y2 = 0,
-   x = x,
-   x_small = delta);
- annotation (smoothOrder = 1,
+  y := smooth(2, max(0, min(1, 0.5+dx*(1.875+xpow2*(-5+6*xpow2)))));
+
+ annotation (smoothOrder = 2,
  Documentation(info="<html>
 <p>
-Once Lipschitz continuously differentiable approximation to the
-<code>Heaviside(.,.)</code> function.
+Twice Lipschitz continuously differentiable approximation to the
+<code>Heaviside(.,.)</code> function.<br/>
+Function is derived from a quintic polynomial going through <i>(0,0)</i> and <i>(1,1)</i>,
+with zero first and second order derivatives at those points.<br/>
 See Example <a href=\"modelica://AixLib.Utilities.Math.Examples.SmoothHeaviside\">
 AixLib.Utilities.Math.Examples.SmoothHeaviside</a>.
 </p>
 </html>", revisions="<html>
 <ul>
 <li>
+October 21, 2019:<br/>
+Added <code>delta.min</code> attribute to guard against division by zero.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1202\">issue 1202</a>.
+</li>
+<li>
+September 13, 2019, by Kristoff Six and Filip Jorissen:<br/>
+Once continuously differentiable replaced by twice continuously differentiable implementation. This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1202\">issue 1202</a>.
+</li>
+<li>
 March 15, 2016, by Michael Wetter:<br/>
 Replaced <code>spliceFunction</code> with <code>regStep</code>.
 This is for
diff --git a/AixLib/Utilities/Math/SmoothHeaviside.mo b/AixLib/Utilities/Math/SmoothHeaviside.mo
index 11d614b47d..844f2c4ea2 100644
--- a/AixLib/Utilities/Math/SmoothHeaviside.mo
+++ b/AixLib/Utilities/Math/SmoothHeaviside.mo
@@ -1,8 +1,8 @@
 within AixLib.Utilities.Math;
 block SmoothHeaviside
-  "Once continuously differentiable approximation to the Heaviside function"
+  "Twice continuously differentiable approximation to the Heaviside function"
   extends Modelica.Blocks.Interfaces.SISO;
- parameter Real delta "Width of transition interval";
+ parameter Real delta(min=Modelica.Constants.eps) "Width of transition interval";
 equation
   y = AixLib.Utilities.Math.Functions.smoothHeaviside(x=u, delta=delta);
   annotation (Icon(graphics={
@@ -48,7 +48,7 @@ equation
                                   color={192,192,192})}),
 Documentation(info="<html>
 <p>
-Once Lipschitz continuously differentiable approximation to the <i>Heaviside(.,.)</i> function.
+Twice Lipschitz continuously differentiable approximation to the <i>Heaviside(.,.)</i> function.
 See Example <a href=\"modelica://AixLib.Utilities.Math.Examples.SmoothHeaviside\">
 AixLib.Utilities.Math.Examples.SmoothHeaviside</a>.
 </p>
@@ -56,6 +56,12 @@ AixLib.Utilities.Math.Examples.SmoothHeaviside</a>.
 revisions="<html>
 <ul>
 <li>
+October 21, 2019:<br/>
+Added <code>delta.min</code> attribute to guard against division by zero.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1202\">issue 1202</a>.
+</li>
+<li>
 July 17, 2015, by Marcus Fuchs:<br/>
 Add link to example.
 </li>
diff --git a/AixLib/Utilities/Math/package.mo b/AixLib/Utilities/Math/package.mo
index ccc1ea23e2..4700db280e 100644
--- a/AixLib/Utilities/Math/package.mo
+++ b/AixLib/Utilities/Math/package.mo
@@ -1,7 +1,6 @@
 within AixLib.Utilities;
 package Math "Library with functions such as for smoothing"
   extends Modelica.Icons.Package;
-
 annotation (preferredView="info", Documentation(info="<html>
 <p>
 This package contains blocks and functions for commonly used
@@ -18,4 +17,5 @@ Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},
             -50.2},{23.7,-64.2},{29.3,-73.1},{35,-78.4},{40.6,-80},{46.2,-77.6},
             {51.9,-71.5},{57.5,-61.9},{63.9,-47.2},{72,-24.8},{80,0}}, color={
             0,0,0}, smooth=Smooth.Bezier)}));
+
 end Math;
diff --git a/AixLib/Utilities/Psychrometrics/Examples/TWetBul_TDryBulXi.mo b/AixLib/Utilities/Psychrometrics/Examples/TWetBul_TDryBulXi.mo
index 5a9a8e5d09..97631fbb51 100644
--- a/AixLib/Utilities/Psychrometrics/Examples/TWetBul_TDryBulXi.mo
+++ b/AixLib/Utilities/Psychrometrics/Examples/TWetBul_TDryBulXi.mo
@@ -21,8 +21,8 @@ model TWetBul_TDryBulXi
     height=(0.0133 - 0.0175),
     offset=0.0175) "Humidity concentration"
                  annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
-  AixLib.Utilities.Psychrometrics.TWetBul_TDryBulXi wetBulApp(redeclare package
-              Medium = Medium, approximateWetBulb=true)
+  AixLib.Utilities.Psychrometrics.TWetBul_TDryBulXi wetBulApp(redeclare
+      package Medium = Medium, approximateWetBulb=true)
     "Model for wet bulb temperature"
     annotation (Placement(transformation(extent={{0,-20},{20,0}})));
 equation
diff --git a/AixLib/Utilities/Psychrometrics/Functions/TDewPoi_pW.mo b/AixLib/Utilities/Psychrometrics/Functions/TDewPoi_pW.mo
index 289f968a27..534c01efac 100644
--- a/AixLib/Utilities/Psychrometrics/Functions/TDewPoi_pW.mo
+++ b/AixLib/Utilities/Psychrometrics/Functions/TDewPoi_pW.mo
@@ -15,7 +15,7 @@ algorithm
     y_zero=p_w,
     x_min=200,
     x_max=400,
-    f_nonlinear_data = dummy);
+    f_nonlinear_data=  dummy);
   annotation (
     Documentation(info="<html>
 <p>
diff --git a/AixLib/Utilities/Psychrometrics/X_pTphi.mo b/AixLib/Utilities/Psychrometrics/X_pTphi.mo
index 39303a1844..ee50d28580 100644
--- a/AixLib/Utilities/Psychrometrics/X_pTphi.mo
+++ b/AixLib/Utilities/Psychrometrics/X_pTphi.mo
@@ -17,7 +17,7 @@ block X_pTphi
     annotation (Placement(transformation(extent={{100,-10},{120,10}})));
 protected
   Modelica.SIunits.AbsolutePressure pSat "Saturation pressure";
-  parameter Integer i_w=
+  parameter Integer i_w =
    sum({(
      if Modelica.Utilities.Strings.isEqual(
        string1=Medium.substanceNames[i],
diff --git a/AixLib/Utilities/Sources/HeaterCooler/package.order b/AixLib/Utilities/Sources/HeaterCooler/package.order
index 00433fcd8e..3c9ea2c0eb 100644
--- a/AixLib/Utilities/Sources/HeaterCooler/package.order
+++ b/AixLib/Utilities/Sources/HeaterCooler/package.order
@@ -1,4 +1,4 @@
+HeaterCoolerController
 HeaterCoolerPI
 PartialHeaterCooler
 PartialHeaterCoolerPI
-HeaterCoolerController
diff --git a/AixLib/Utilities/Sources/InternalGains/Examples/InternalGains/package.order b/AixLib/Utilities/Sources/InternalGains/Examples/InternalGains/package.order
index 39f12ebcd0..44eb938356 100644
--- a/AixLib/Utilities/Sources/InternalGains/Examples/InternalGains/package.order
+++ b/AixLib/Utilities/Sources/InternalGains/Examples/InternalGains/package.order
@@ -1,5 +1,5 @@
 Humans
+HumansTotalHeat
 Lights
 Machines
 OneOffice
-HumansTotalHeat
diff --git a/AixLib/Utilities/Sources/InternalGains/Humans/Obsolete/package.order b/AixLib/Utilities/Sources/InternalGains/Humans/Obsolete/package.order
index 02691d79a1..d94c08020a 100644
--- a/AixLib/Utilities/Sources/InternalGains/Humans/Obsolete/package.order
+++ b/AixLib/Utilities/Sources/InternalGains/Humans/Obsolete/package.order
@@ -1,3 +1,3 @@
+HumanSensibleHeatAreaSpecific
 HumanSensibleHeat_VDI2078
 HumanTotalHeat_VDI2078
-HumanSensibleHeatAreaSpecific
diff --git a/AixLib/Utilities/Sources/InternalGains/Humans/package.order b/AixLib/Utilities/Sources/InternalGains/Humans/package.order
index d9545149f4..96685aa472 100644
--- a/AixLib/Utilities/Sources/InternalGains/Humans/package.order
+++ b/AixLib/Utilities/Sources/InternalGains/Humans/package.order
@@ -1,5 +1,5 @@
-HumanSensibleHeatTemperatureIndependent
 HumanSensibleHeatTemperatureDependent
+HumanSensibleHeatTemperatureIndependent
 HumanTotalHeatTemperatureDependent
 BaseClasses
 Obsolete
diff --git a/AixLib/Utilities/Time/CalendarTime.mo b/AixLib/Utilities/Time/CalendarTime.mo
index b8734fe1ff..bbb94d02b2 100644
--- a/AixLib/Utilities/Time/CalendarTime.mo
+++ b/AixLib/Utilities/Time/CalendarTime.mo
@@ -7,49 +7,66 @@ model CalendarTime
   parameter Integer yearRef(min=firstYear, max=lastYear) = 2016
     "Year when time = 0, used if zerTim=Custom"
     annotation(Dialog(enable=zerTim==AixLib.Utilities.Time.Types.ZeroTime.Custom));
-  parameter Modelica.SIunits.Time offset = 0
-    "Offset that is added to 'time', may be used for computing time in different time zone"
+  parameter Boolean outputUnixTimeStamp = false
+    "= true, to output the unix time stamp (using GMT reference)"
+    annotation(Dialog(group="Unix time stamp"));
+  parameter Modelica.SIunits.Time timZon(displayUnit="h") = 0
+    "The local time zone, for computing the unix time stamp only"
+    annotation(Dialog(enable=outputUnixTimeStamp,group="Unix time stamp"));
+  parameter Modelica.SIunits.Time offset(displayUnit="h") = 0
+    "Offset that is added to 'time', may be used for computing time in different time zones"
     annotation(Dialog(tab="Advanced"));
 
-  Modelica.Blocks.Interfaces.RealOutput unixTimeStamp(final unit="s")
+  Modelica.Blocks.Interfaces.RealOutput unixTimeStampLocal(final unit="s")
     "Unix time stamp at local time"
-        annotation (Placement(transformation(extent={{100,-90},{120,-70}}),
-        iconTransformation(extent={{100,-90},{120,-70}})));
-  discrete Modelica.Blocks.Interfaces.IntegerOutput year(start=2010) "Year"
-    annotation (Placement(transformation(extent={{100,-32},{120,-12}}),
-        iconTransformation(extent={{100,-32},{120,-12}})));
-  discrete Modelica.Blocks.Interfaces.IntegerOutput month(start=1) "Month of the year"
-    annotation (Placement(transformation(extent={{100,-4},{120,16}}),
-        iconTransformation(extent={{100,-4},{120,16}})));
+        annotation (Placement(transformation(extent={{100,-78},{120,-58}}),
+        iconTransformation(extent={{100,-78},{120,-58}})));
+  Modelica.Blocks.Interfaces.RealOutput unixTimeStamp(final unit="s") = unixTimeStampLocal - timZon if outputUnixTimeStamp
+    "Unix time stamp"
+        annotation (Placement(transformation(extent={{100,-100},{120,-80}}),
+        iconTransformation(extent={{100,-100},{120,-80}})));
+  discrete Modelica.Blocks.Interfaces.IntegerOutput year "Year"
+    annotation (Placement(transformation(extent={{100,-24},{120,-4}}),
+        iconTransformation(extent={{100,-24},{120,-4}})));
+  discrete Modelica.Blocks.Interfaces.IntegerOutput month "Month of the year"
+    annotation (Placement(transformation(extent={{100,2},{120,22}}),
+        iconTransformation(extent={{100,2},{120,22}})));
   Modelica.Blocks.Interfaces.IntegerOutput day(fixed=false) "Day of the month"
-    annotation (Placement(transformation(extent={{100,24},{120,44}}),
-        iconTransformation(extent={{100,24},{120,44}})));
+    annotation (Placement(transformation(extent={{100,28},{120,48}}),
+        iconTransformation(extent={{100,28},{120,48}})));
   Modelica.Blocks.Interfaces.IntegerOutput hour(fixed=false) "Hour of the day"
-    annotation (Placement(transformation(extent={{100,52},{120,72}}),
-        iconTransformation(extent={{100,52},{120,72}})));
+    annotation (Placement(transformation(extent={{100,54},{120,74}}),
+        iconTransformation(extent={{100,54},{120,74}})));
   Modelica.Blocks.Interfaces.RealOutput minute "Minute of the hour"
     annotation (Placement(transformation(extent={{100,80},{120,100}}),
         iconTransformation(extent={{100,80},{120,100}})));
   Modelica.Blocks.Interfaces.IntegerOutput weekDay(fixed=false)
     "Integer output representing week day (monday = 1, sunday = 7)"
-    annotation (Placement(transformation(extent={{100,-60},{120,-40}}),
-        iconTransformation(extent={{100,-60},{120,-40}})));
+    annotation (Placement(transformation(extent={{100,-50},{120,-30}}),
+        iconTransformation(extent={{100,-50},{120,-30}})));
 
 protected
   final constant Integer firstYear = 2010
     "First year that is supported, i.e. the first year in timeStampsNewYear[:]";
   final constant Integer lastYear = firstYear + size(timeStampsNewYear,1) - 1;
-  constant Modelica.SIunits.Time timeStampsNewYear[12] = {
+  constant Modelica.SIunits.Time timeStampsNewYear[22] = {
     1262304000.0, 1293840000.0, 1325376000.0,
     1356998400.0, 1388534400.0, 1420070400.0,
     1451606400.0, 1483228800.0, 1514764800.0,
-    1546300800.0, 1577836800.0, 1609459200.0}
-    "Epoch time stamps for new years day 2010 to 2021";
-  constant Boolean isLeapYear[11] = {
+    1546300800.0, 1577836800.0, 1609459200.0,
+    1640995200.0, 1672531200.0, 1704067200.0,
+    1735689600.0, 1767225600.0, 1798761600.0,
+    1830297600.0, 1861920000.0, 1893456000.0,
+    1924992000.0}
+    "Epoch time stamps for new years day 2010 to 2031";
+  constant Boolean isLeapYear[21] = {
     false, false, true, false,
     false, false, true, false,
-    false, false, true}
-    "List of leap years starting from firstYear (2010), up to and including 2020";
+    false, false, true, false,
+    false, false, true, false,
+    false, false, true, false,
+    false}
+    "List of leap years starting from firstYear (2010), up to and including 2030";
   final constant Integer dayInMonth[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}
     "Number of days in each month";
   parameter Modelica.SIunits.Time timOff(fixed=false) "Time offset";
@@ -81,10 +98,10 @@ initial equation
   hourSampleStart = integer(time/3600)*3600 - offset;
   daySampleStart  = integer(time/(3600*24))*3600*24 - offset;
 
-  hour = integer(floor(rem(unixTimeStamp,3600*24)/3600));
-  daysSinceEpoch = integer(floor(unixTimeStamp/3600/24));
+  hour = integer(floor(rem(unixTimeStampLocal,3600*24)/3600));
+  daysSinceEpoch = integer(floor(unixTimeStampLocal/3600/24));
 
-  day = integer(1+floor((unixTimeStamp-epochLastMonth)/3600/24));
+  day = integer(1+floor((unixTimeStampLocal-epochLastMonth)/3600/24));
   weekDay = integer(rem(4+daysSinceEpoch-1,7)+1);
 initial algorithm
   // check if yearRef is in the valid range
@@ -101,6 +118,8 @@ initial algorithm
   // compute the offset to be added to time based on the parameters specified by the user
   if zerTim == AixLib.Utilities.Time.Types.ZeroTime.UnixTimeStamp then
     timOff :=0;
+  elseif zerTim == AixLib.Utilities.Time.Types.ZeroTime.UnixTimeStampGMT then
+    timOff :=timZon;
   elseif zerTim == AixLib.Utilities.Time.Types.ZeroTime.NY2010 or
     zerTim == AixLib.Utilities.Time.Types.ZeroTime.Custom and yearRef == 2010 then
       timOff :=timeStampsNewYear[1];
@@ -181,8 +200,8 @@ initial algorithm
   year :=0;
   for i in 1:size(timeStampsNewYear,1) loop
     // may be reformulated using break if JModelica fixes bug
-    if unixTimeStamp < timeStampsNewYear[i]
-      and (if i == 1 then true else unixTimeStamp >= timeStampsNewYear[i-1]) then
+    if unixTimeStampLocal < timeStampsNewYear[i]
+      and (if i == 1 then true else unixTimeStampLocal >= timeStampsNewYear[i-1]) then
       yearIndex :=i - 1;
       year :=firstYear + i - 2;
     end if;
@@ -192,7 +211,7 @@ initial algorithm
   epochLastMonth := timeStampsNewYear[yearIndex];
   month:=13;
   for i in 1:12 loop
-    if (unixTimeStamp-epochLastMonth)/3600/24 <
+    if (unixTimeStampLocal-epochLastMonth)/3600/24 <
       (if i==2 and isLeapYear[yearIndex] then 1 + dayInMonth[i] else dayInMonth[i]) then
       // construction below avoids the need of a break, which bugs out JModelica
       month :=min(i,month);
@@ -204,10 +223,10 @@ initial algorithm
 
 equation
   // compute unix time step based on found offset
-  unixTimeStamp = time + offset + timOff;
+  unixTimeStampLocal = time + offset + timOff;
 
   // update the year when passing the epoch time stamp of the next year
-  when unixTimeStamp >= timeStampsNewYear[pre(yearIndex)+1] then
+  when unixTimeStampLocal >= timeStampsNewYear[pre(yearIndex)+1] then
     yearIndex=pre(yearIndex)+1;
     assert(yearIndex<=size(timeStampsNewYear,1),
       "Index out of range for epoch vector: timeStampsNewYear needs to be extended beyond the year "
@@ -216,7 +235,7 @@ equation
   end when;
 
   // update the month when passing the last day of the current month
-  when unixTimeStamp >= pre(epochLastMonth) +
+  when unixTimeStampLocal >= pre(epochLastMonth) +
       (if pre(month)==2 and isLeapYear[yearIndex]
         then 1 + dayInMonth[pre(month)] else dayInMonth[pre(month)])*3600*24 then
     month = if pre(month) == 12 then 1 else pre(month) + 1;
@@ -229,7 +248,7 @@ equation
   hourSampleTrigger =sample(hourSampleStart, 3600);
   when hourSampleTrigger then
     if pre(firstHourSampling) then
-      hour = integer(floor(rem(unixTimeStamp,3600*24)/3600));
+      hour = integer(floor(rem(unixTimeStampLocal,3600*24)/3600));
     else
       hour = if (pre(hour) == 23) then 0 else (pre(hour) + 1);
     end if;
@@ -239,26 +258,36 @@ equation
   daySampleTrigger =sample(daySampleStart, 86400);
   when daySampleTrigger then
     if pre(firstDaySampling) then
-      daysSinceEpoch = integer(floor(unixTimeStamp/3600/24));
+      daysSinceEpoch = integer(floor(unixTimeStampLocal/3600/24));
       weekDay=integer(rem(4+daysSinceEpoch-1,7)+1);
 
     else
       daysSinceEpoch = pre(daysSinceEpoch) + 1;
       weekDay = if (pre(weekDay) == 7) then 1 else (pre(weekDay) + 1);
     end if;
-    day = integer(1+floor((unixTimeStamp-epochLastMonth)/3600/24));
+    day = integer(1+floor((unixTimeStampLocal-epochLastMonth)/3600/24));
 
     firstDaySampling = false;
   end when;
 
   // using Real variables and operations for minutes since otherwise too many events are generated
-  minute = (unixTimeStamp/60-daysSinceEpoch*60*24-hour*60);
+  minute = (unixTimeStampLocal/60-daysSinceEpoch*60*24-hour*60);
 
   annotation (
     defaultComponentName="calTim",
   Documentation(revisions="<html>
 <ul>
 <li>
+November 6, 2019, by Milica Grahovac:<br/>
+Extended functionality to year 2030.
+</li>
+<li>
+August 20, 2019, by Filip Jorissen:<br/>
+Revised implementation such that the meaning of <code>time</code> is better explained
+and unix time stamps are correctly defined with respect to GMT.
+(see <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1192\">#1192</a>).
+</li>
+<li>
 February 14, 2019, by Damien Picard:<br/>
 Fix bug when non-zero offset by substracting the offset from hourSampleStart and daySampleStart
 (see <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1099\">#1099</a>).
@@ -273,17 +302,25 @@ First implementation.
 This blocks computes the unix time stamp, date and time
 and the day of the week based on the Modelica
 variable <code>time</code>.
+As for the weather data reader
+<a href=\"modelica://AixLib.BoundaryConditions.WeatherData.ReaderTMY3\">
+AixLib.BoundaryConditions.WeatherData.ReaderTMY3</a>,
+<code>time=0</code> corresponds to January 1st at midnight
+in the <em>local time zone</em>.
+The computed outputs are thus also for the local time zone.
+The year for which <code>time=0</code> is determined by
+the parameter <code>zerTim</code>.
 </p>
 <h4>Main equations</h4>
 <p>
-First the unix time stamp corresponding to the current time is computed.
+The unix time stamp corresponding to the current time is computed.
 From this variables the corresponding, year, date and time are computed using functions
 such as <code>floor()</code> and <code>ceil()</code>.
 </p>
 <h4>Assumption and limitations</h4>
 <p>
 The implementation only supports date computations from year 2010 up to and including 2020.
-Daylight saving and time zones are not supported.
+Daylight saving is not supported.
 </p>
 <h4>Typical use and important parameters</h4>
 <p>
@@ -291,16 +328,36 @@ The user must define which time and date correspond to <code>time = 0</code>
 using the model parameters <code>zerTim</code>, and, if
 <code>zerTim==AixLib.Utilities.Time.Types.ZeroTime.Custom</code>,
 the parameter <code>yearRef</code>.
+When <code>zerTim==AixLib.Utilities.Time.Types.ZeroTime.UnixTimeStampGMT</code>,
+<code>time</code> is defined with respect to GMT. This is different from the use
+of <code>time</code> in the weather data reader
+<a href=\"modelica://AixLib.BoundaryConditions.WeatherData.ReaderTMY3\">
+AixLib.BoundaryConditions.WeatherData.ReaderTMY3</a>, as the weather data files
+used with this reader are generally defined with <code>time</code> being local time.
+If  <code>zerTim==AixLib.Utilities.Time.Types.ZeroTime.UnixTimeStampGMT</code> is used,
+then the weather data files read by
+<a href=\"modelica://AixLib.BoundaryConditions.WeatherData.ReaderTMY3\">
+AixLib.BoundaryConditions.WeatherData.ReaderTMY3</a>
+must also be defined with GMT as the time stamp.
 
 The user can choose from new year, midnight for a number of years:
-2010 to 2020 and also 1970.
+2010 to 2030 and also 1970.
 The latter corresponds to a unix stamp of <i>0</i>.
 (Note that when choosing the reference time equal to 0 at 1970,
-the actual simulation time must be within the 2010-2020 range.
+the actual simulation time must be within the 2010-2030 range.
 For instance <code>startTime = 1262304000</code> corresponds
 to the simulation starting on the 1st of January 2010
 when setting <code>zerTim = ZeroTime.UnixTimeStamp</code>.
 This is within the 2010-2020 range and is therefore allowed.)
+The unix time stamp is formally defined as the number of
+seconds since midnight of new year in 1970 GMT.
+To output the correct unix time stamp, set <code>outputUnixTimeStamp=true</code>
+We then require the local time zone <code>timZon</code>
+(see <a href=\"modelica://AixLib.BoundaryConditions.WeatherData.ReaderTMY3\">
+AixLib.BoundaryConditions.WeatherData.ReaderTMY3</a>)
+since <code>time</code> uses the local time zone instead of GMT.
+We always output <code>unixTimeStampLocal</code>, which is a time stamp
+that uses the local time zone reference instead of GMT.
 </p>
 <h4>Implementation</h4>
 <p>
@@ -318,35 +375,35 @@ that it changes the time based on which the solar position is computed and TMY3
           horizontalAlignment=TextAlignment.Right,
           textString="Minute"),
         Text(
-          extent={{-28,66},{96,56}},
+          extent={{-28,68},{96,58}},
           lineColor={28,108,200},
           horizontalAlignment=TextAlignment.Right,
           textString="Hour"),
         Text(
-          extent={{-38,40},{96,28}},
+          extent={{-38,44},{96,32}},
           lineColor={28,108,200},
           horizontalAlignment=TextAlignment.Right,
           textString="Day"),
         Text(
-          extent={{-50,12},{96,2}},
+          extent={{-50,18},{96,8}},
           lineColor={28,108,200},
           horizontalAlignment=TextAlignment.Right,
           textString="Month"),
         Text(
-          extent={{-70,-16},{96,-26}},
+          extent={{-70,-8},{96,-18}},
           lineColor={28,108,200},
           horizontalAlignment=TextAlignment.Right,
           textString="Year"),
         Text(
-          extent={{-68,-40},{96,-52}},
+          extent={{-68,-30},{96,-42}},
           lineColor={28,108,200},
           horizontalAlignment=TextAlignment.Right,
           textString="Weekday"),
         Text(
-          extent={{-102,-72},{94,-84}},
+          extent={{-102,-60},{94,-72}},
           lineColor={28,108,200},
           horizontalAlignment=TextAlignment.Right,
-          textString="Unix timestamp"),
+          textString="Unix time stamp (local)"),
         Ellipse(
           extent={{-94,94},{16,-16}},
           lineColor={160,160,164},
@@ -357,5 +414,11 @@ that it changes the time based on which the solar position is computed and TMY3
           thickness=0.5),
         Line(
           points={{-40,38},{-14,38}},
-          thickness=0.5)}));
+          thickness=0.5),
+        Text(
+          extent={{-102,-82},{94,-94}},
+          lineColor={28,108,200},
+          horizontalAlignment=TextAlignment.Right,
+          visible=outputUnixTimeStamp,
+          textString="Unix time stamp (GMT)")}));
 end CalendarTime;
diff --git a/AixLib/Utilities/Time/Types/ZeroTime.mo b/AixLib/Utilities/Time/Types/ZeroTime.mo
index d2dc661884..8afb015212 100644
--- a/AixLib/Utilities/Time/Types/ZeroTime.mo
+++ b/AixLib/Utilities/Time/Types/ZeroTime.mo
@@ -1,6 +1,7 @@
 within AixLib.Utilities.Time.Types;
 type ZeroTime = enumeration(
     UnixTimeStamp "Thu, 01 Jan 1970 00:00:00 local time",
+    UnixTimeStampGMT "Thu, 01 Jan 1970 00:00:00 GMT",
     Custom "User specified local time",
     NY2010 "New year 2010, 00:00:00 local time",
     NY2011 "New year 2011, 00:00:00 local time",
@@ -25,6 +26,14 @@ For example, <code>AixLib.Utilities.Time.Types.TimeReference.NY2016</code>
 means that if the Modelica built-in variable <code>time=0</code>, it is
 January 1, 2016, 0:00:00 local time.
 </p>
+<p>
+When using <code>AixLib.Utilities.Time.Types.ZeroTime.UnixTimeStampGMT</code>,
+<code>time</code> is defined with respect to GMT. This is different from the use
+of <code>time</code> in the weather data reader
+<a href=\"modelica://AixLib.BoundaryConditions.WeatherData.ReaderTMY3\">
+AixLib.BoundaryConditions.WeatherData.ReaderTMY3</a>, as the weather data reader assumes
+that <code>time</code> is expressed in local time.
+</p>
 </html>", revisions="<html>
 <ul>
 <li>