diff --git a/IDEAS/Airflow/Multizone/BaseClasses/DoorDiscretized.mo b/IDEAS/Airflow/Multizone/BaseClasses/DoorDiscretized.mo
index b0b0e4bdcd..d6a29efe78 100644
--- a/IDEAS/Airflow/Multizone/BaseClasses/DoorDiscretized.mo
+++ b/IDEAS/Airflow/Multizone/BaseClasses/DoorDiscretized.mo
@@ -17,9 +17,9 @@ partial model DoorDiscretized
   Modelica.Units.SI.Velocity vTop "Velocity at top of opening from A to B";
   Modelica.Units.SI.Velocity vBot "Velocity at bottom of opening from A to B";
 
-protected
-  parameter Modelica.Units.SI.Length dh=hOpe/nCom "Height of each compartment";
 
+  input Modelica.Units.SI.Length dh=hOpe/nCom "Height of each compartment";
+protected
   parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX(
       T=Medium.T_default,
       p=Medium.p_default,
@@ -28,11 +28,11 @@ protected
   parameter Modelica.Units.SI.Density rho_default=Medium.density(sta_default)
     "Density, used to compute fluid volume";
 
-  parameter Real hAg[nCom](each unit="m2/s2")=
+  input Real hAg[nCom](each unit="m2/s2")=
     {Modelica.Constants.g_n*(hA - (i - 0.5)*dh) for i in 1:nCom}
     "Product g*h_i for each compartment";
 
-  parameter Real hBg[nCom](each unit="m2/s2")=
+  input Real hBg[nCom](each unit="m2/s2")=
     {Modelica.Constants.g_n*(hB - (i - 0.5)*dh) for i in 1:nCom}
     "Product g*h_i for each compartment";
   Modelica.Units.SI.AbsolutePressure pA[nCom](each nominal=101325)
@@ -118,6 +118,10 @@ using the model for a door that can be open or closed.
 revisions="<html>
 <ul>
 <li>
+October 29, 2024, by Klaas De Jonge:<br/>
+Unprotected <code>dh</code> and changed prefixes of <code>dh</code>,<code>hAg</code> and <code>hBg</code> to <code>input</code>. This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1935\">#1935</a>.
+</li>
+<li>
 January 8, 2019, by Michael Wetter:<br/>
 Moved parameter <code>CD</code> from
 <a href=\"modelica://IDEAS.Airflow.Multizone.BaseClasses.DoorDiscretized\">
diff --git a/IDEAS/Airflow/Multizone/CrackOrOperableDoor.mo b/IDEAS/Airflow/Multizone/CrackOrOperableDoor.mo
new file mode 100644
index 0000000000..9a0b7d28e0
--- /dev/null
+++ b/IDEAS/Airflow/Multizone/CrackOrOperableDoor.mo
@@ -0,0 +1,237 @@
+within IDEAS.Airflow.Multizone;
+model CrackOrOperableDoor
+  "Infiltration or large opening model used for the embeded airflow implementation in IDEAS.Buildings.Components"
+  extends IDEAS.Fluid.Interfaces.PartialFourPortInterface(
+    redeclare final package Medium1 = Medium,
+    redeclare final package Medium2 = Medium,
+    final allowFlowReversal1=true,
+    final allowFlowReversal2=true,
+    final m1_flow_nominal=10/3600*rho_default,
+    final m2_flow_nominal=m1_flow_nominal,
+    final m1_flow_small=1E-4*abs(m1_flow_nominal),
+    final m2_flow_small=1E-4*abs(m2_flow_nominal));
+  extends IDEAS.Airflow.Multizone.BaseClasses.ErrorControl(forceErrorControlOnFlow=true); //force error control on flow rates
+
+  replaceable package Medium =
+    Modelica.Media.Interfaces.PartialMedium "Medium in the component"
+      annotation (choices(
+        choice(redeclare package Medium = IDEAS.Media.Air "Moist air")));
+
+  parameter Modelica.Units.SI.Velocity vZer=0.001
+    "Minimum velocity to prevent zero flow. Recommended: 0.001";
+  parameter Modelica.Units.SI.Length wOpe=0.9 "Width of opening"
+    annotation (Dialog(group="Geometry"));
+  parameter Modelica.Units.SI.Length hOpe=2.1 "Height of opening"
+    annotation (Dialog(group="Geometry"));
+
+  parameter BoundaryConditions.Types.InterZonalAirFlow interZonalAirFlowType
+    "Interzonal air flow type";
+  final parameter Modelica.Units.SI.PressureDifference dpCloRat(displayUnit="Pa")=50
+                           "Pressure drop at rating condition of closed door"
+    annotation (Dialog(group="Rating conditions"));
+
+  parameter Modelica.Units.SI.Length h_b1 "Height at port b1 (hasCavity=false)";
+  parameter Modelica.Units.SI.Length h_b2 = 0 "Height at port b2(hasCavity=false)";
+  parameter Modelica.Units.SI.Length h_a1 = 0 "Height at port a1(hasCavity=false)";
+  parameter Modelica.Units.SI.Length h_a2  "Height at port a2(hasCavity=false)";
+
+  parameter SI.Length hA=(h_a1 + h_b2)/2
+    "Height of reference pressure at port a1 for opening (hasCavity=true) model";
+  parameter SI.Length hB=(h_a2 + h_b1)/2
+    "Height of reference pressure at port b1 for opening (hasCavity=true) model";
+
+  final parameter Real CDCloRat(min=0, max=1)=1
+    "Discharge coefficient at rating conditions of closed door"
+      annotation (Dialog(group="Rating conditions"));
+   parameter Modelica.Units.SI.Area A_q50 "Surface area for leakage computation (closed door)";
+   parameter Real q50(unit="m3/(h.m2)") "Surface air tightness";
+
+  final parameter Modelica.Units.SI.Area LClo(min=0) = ((q50*A_q50/3600)/(dpCloRat)^mClo)/(((dpCloRat)^(0.5-mClo))*sqrt(2/rho_default))
+    "Effective leakage area of internal wall (when door is fully closed)"
+    annotation (Dialog(group="Crack or Closed door"));
+
+  parameter Real CDOpe=0.78 "Discharge coefficient of open door"
+    annotation (Dialog(group="Open door"));
+
+
+  parameter Real mOpe = 0.5 "Flow exponent for door of open door"
+    annotation (Dialog(group="Open door"));
+  parameter Real mClo= 0.65 "Flow exponent for crack or crack of closed door"
+    annotation (Dialog(group="Crack or Closed door"));
+
+  parameter Integer nCom=if abs(hOpe*sin(inc)) < 0.01 then 2 else max(2,integer(abs(hOpe*sin(inc))/4)) "Number of compartments for the discretization";
+
+  parameter Boolean useDoor = false  "=true, to use operable door instead of a crack";
+  parameter Boolean use_y = true "=true, to use control input";
+  parameter Boolean openDoorOnePort = false "Sets whether a door is open or closed in one port configuration";
+
+  parameter Modelica.Units.SI.PressureDifference dp_turbulent(
+    min=0,
+    displayUnit="Pa") = 0.01
+    "Pressure difference where laminar and turbulent flow relation coincide. Recommended: 0.01";
+
+   parameter Modelica.Units.SI.PressureDifference dp_turbulent_ope(min=0,displayUnit="Pa") = (MFtrans/(rho_default*(CDOpe * hOpe*wOpe * sqrt(2/rho_default))))^(1/mOpe)
+   if useDoor and interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts "Pressure difference where laminar and turbulent flow relation coincide for large cavities";
+   parameter Modelica.Units.SI.MassFlowRate MFtrans=(hOpe*wOpe)*VItrans*REtrans/DOpe if useDoor and interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts "Recommended massflowrate used for reguralisation";
+   parameter Modelica.Units.SI.Length DOpe=4*hOpe*wOpe/(2*hOpe+2*wOpe) if useDoor and interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts "Estimated hydraulic diameter of the opening - 4*A/Perimeter";
+   constant Modelica.Units.SI.ReynoldsNumber REtrans=30 if useDoor and interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts "Assumed Reynolds number at transition";
+   constant Modelica.Units.SI.DynamicViscosity VItrans=0.0000181625  if useDoor and interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts "Assumed dynamic viscosity of air at transition";
+
+   final parameter Medium.ThermodynamicState state_default=Medium.setState_pTX(
+      T=Medium.T_default,
+      p=Medium.p_default,
+      X=Medium.X_default[1:Medium.nXi]) "Medium state at default values";
+  final parameter Modelica.Units.SI.Density rho_default=Medium.density(state=state_default) "Medium default density";
+
+
+
+  Modelica.Blocks.Interfaces.RealInput y(min=0, max=1, unit="1") if useDoor and use_y
+    "Opening signal, 0=closed, 1=open"
+    annotation (Placement(transformation(extent={{-120,-10},{-100,10}}), iconTransformation(extent={{-120,-10},{-100,10}})));
+ IDEAS.Airflow.Multizone.Point_m_flow point_m_flow1(
+  redeclare package Medium = Medium,
+  dpMea_nominal = dpCloRat,
+    forceErrorControlOnFlow=true,
+    mMea_flow_nominal=if openDoorOnePort and interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.OnePort
+         then wOpe*hOpe*rho_default*CDCloRat*(2*dpCloRat/rho_default)^mClo else (if
+        interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts
+         then 0.5 else 1)*(q50/3600*rho_default)*A_q50,
+  m = if openDoorOnePort and interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.OnePort then mOpe else mClo,
+  useDefaultProperties = false) if not useDoor or (useDoor and interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.OnePort) "Pressure drop equation" annotation (
+    Placement(visible = true, transformation(origin = {0, 60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+  IDEAS.Airflow.Multizone.MediumColumnReversible col_b1(redeclare package
+      Medium = Medium, h=h_b1) if interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts
+     and not useDoor "Column for port b1" annotation (Placement(visible=true,
+        transformation(
+        origin={0,70},
+        extent={{50,-10},{70,10}},
+        rotation=0)));
+  IDEAS.Airflow.Multizone.MediumColumnReversible col_a1(redeclare package
+      Medium = Medium, h=h_a1) if interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts
+     and not useDoor "Column for port a1" annotation (Placement(visible=true,
+        transformation(
+        origin={0,70},
+        extent={{-70,-10},{-50,10}},
+        rotation=0)));
+  IDEAS.Airflow.Multizone.MediumColumnReversible col_b2(redeclare package
+      Medium = Medium, h=h_b2) if interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts
+     and not useDoor "Column for port b2" annotation (Placement(visible=true,
+        transformation(
+        origin={0,-50},
+        extent={{-70,-10},{-50,10}},
+        rotation=0)));
+  IDEAS.Airflow.Multizone.MediumColumnReversible col_a2(redeclare package
+      Medium = Medium, h=h_a2) if interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts
+     and not useDoor "Column for port a2" annotation (Placement(visible=true,
+        transformation(
+        origin={0,-50},
+        extent={{50,-10},{70,10}},
+        rotation=0)));
+ IDEAS.Airflow.Multizone.Point_m_flow point_m_flow2(
+   redeclare package Medium = Medium,
+   dpMea_nominal = dpCloRat,
+   forceErrorControlOnFlow=true,
+   m = mClo,
+   mMea_flow_nominal = (q50/3600*rho_default)*A_q50*0.5,
+   useDefaultProperties = false) if not useDoor and interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts "Pressure drop equation" annotation (
+    Placement(visible = true, transformation(origin = {0, -60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+ IDEAS.Airflow.Multizone.DoorDiscretizedOperable doo(
+   final dh=doo.hOpe*sin(inc)/nCom,
+   redeclare package Medium = Medium,
+   final hA=hA,
+   final hB=hB,
+   dp_turbulent=dp_turbulent_ope,
+   nCom=nCom,
+   CDOpe=CDOpe,
+   CDClo=CDCloRat,
+   mOpe=mOpe,
+   mClo=mClo,
+   CDCloRat=CDCloRat,
+   wOpe=wOpe,
+   hOpe=hOpe,
+   dpCloRat=dpCloRat,
+   LClo=LClo,
+   vZer=vZer*MFtrans*rho_default)
+   if useDoor and interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts annotation (
+    Placement(visible = true, transformation(origin={-2,0},   extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+ IDEAS.Fluid.Sources.Boundary_pT bou(
+   redeclare package Medium = Medium,
+   nPorts = 2)
+   if interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts
+   "Sets absolute pressure when the ports are not connected externally" annotation (
+    Placement(visible = true, transformation(origin = {0, -90}, extent = {{-10, 10}, {10, -10}}, rotation = 90)));
+ Modelica.Blocks.Sources.Constant constOne(final k=1)
+   if not use_y
+   "Door constantly opened" annotation (
+    Placement(visible = true, transformation(origin = {-54, -14}, extent = {{-6, -6}, {6, 6}}, rotation = 0)));
+
+  parameter SI.Angle inc=Modelica.Constants.pi/2
+    "inclination angle (vertical=pi/2)";
+initial equation
+  assert( not (interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts and useDoor and use_y),
+  "In " +getInstanceName() + ": Cannot use a controllable door unless interZonalAirFlowType == TwoPorts.");
+
+equation
+  connect(col_a1.port_a, point_m_flow1.port_a) annotation (
+    Line(points = {{-60, 80}, {-60, 84}, {-20, 84}, {-20, 60}, {-10, 60}}, color = {0, 127, 255}));
+  connect(col_b1.port_a, point_m_flow1.port_b) annotation (
+    Line(points = {{60, 80}, {60, 84}, {20, 84}, {20, 60}, {10, 60}}, color = {0, 127, 255}));
+  connect(col_b2.port_a, point_m_flow2.port_a) annotation (
+    Line(points = {{-60, -40}, {-60, -36}, {-20, -36}, {-20, -60}, {-10, -60}}, color = {0, 127, 255}));
+  connect(col_a2.port_a, point_m_flow2.port_b) annotation (
+    Line(points = {{60, -40}, {60, -36}, {20, -36}, {20, -60}, {10, -60}}, color = {0, 127, 255}));
+ connect(col_b2.port_b, port_b2) annotation (
+    Line(points = {{-60, -60}, {-100, -60}}, color = {0, 127, 255}));
+ connect(col_a2.port_b, port_a2) annotation (
+    Line(points = {{60, -60}, {100, -60}}, color = {0, 127, 255}));
+ connect(col_b1.port_b, port_b1) annotation (
+    Line(points = {{60, 60}, {100, 60}}, color = {0, 127, 255}));
+ connect(col_a1.port_b, port_a1) annotation (
+    Line(points = {{-60, 60}, {-100, 60}}, color = {0, 127, 255}));
+ connect(y, doo.y) annotation (
+    Line(points={{-110,0},{-13,0}},      color = {0, 0, 127}));
+ connect(bou.ports[1], port_a2) annotation (
+    Line(points={{-1,-80},{100,-80},{100,-60}},       color = {0, 127, 255}));
+ if  interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts then
+    connect(point_m_flow1.port_a, port_a1) annotation (
+    Line(points = {{-10, 60}, {-100, 60}}, color = {0, 127, 255}));
+    connect(point_m_flow1.port_b, port_b1) annotation (
+    Line(points = {{10, 60}, {100, 60}}, color = {0, 127, 255}));
+ end if;
+ connect(constOne.y, doo.y) annotation (
+    Line(points={{-47.4,-14},{-32,-14},{-32,0},{-13,0}},        color = {0, 0, 127}));
+ connect(bou.ports[2], port_b2) annotation (
+    Line(points={{1,-80},{-100,-80},{-100,-60}},        color = {0, 127, 255}));
+ connect(doo.port_a1, port_a1) annotation (
+    Line(points={{-12,6},{-30,6},{-30,60},{-100,60}},          color = {0, 127, 255}));
+ connect(doo.port_b1, port_b1) annotation (
+    Line(points={{8,6},{30,6},{30,60},{100,60}},           color = {0, 127, 255}));
+ connect(doo.port_b2, port_b2) annotation (
+    Line(points={{-12,-6},{-20,-6},{-20,-34},{-100,-34},{-100,-60}},            color = {0, 127, 255}));
+ connect(doo.port_a2, port_a2) annotation (
+    Line(points={{8,-6},{20,-6},{20,-34},{100,-34},{100,-60}},             color = {0, 127, 255}));
+
+annotation(Documentation(info="<html>
+<p>
+This models an open/closed door depending on the number of available fluid ports.
+</p>
+<p>
+When only one port is available then an orrifice equation is used to approximate the closed door.
+There is no support for open doors when using only a single fluid port.
+</p>
+</html>",
+revisions="<html>
+<ul>
+<li>
+October 30, 2024, by Klaas De Jonge:<br/>
+Changes for column heights,used default density and transition point to laminar flow at low dp.
+</li>
+<li>
+October 20, 2023 by Filip Jorissen:<br/>
+First documented version.
+</li>
+</ul>
+</html>"),
+    Diagram,
+ Icon(graphics={  Polygon(lineColor = {0, 0, 255}, pattern = LinePattern.None, fillPattern = FillPattern.Solid, points = {{-30, -10}, {-16, -8}, {-16, -14}, {-30, -16}, {-30, -10}}), Line(points = {{-54, 48}, {-36, 48}}), Line(points = {{-54, 20}, {-36, 20}}), Rectangle(fillColor = {255, 255, 255}, pattern = LinePattern.None, fillPattern = FillPattern.Solid, extent = {{-100, 100}, {100, -100}}), Line(points = {{-54, -58}, {-36, -58}}), Rectangle(lineColor = {0, 0, 255}, fillColor = {255, 128, 0}, pattern = LinePattern.None, fillPattern = FillPattern.Solid, extent = {{-46, -16}, {-20, -20}}), Rectangle(lineColor = {0, 0, 255}, fillColor = {85, 75, 55}, pattern = LinePattern.None, fillPattern = FillPattern.Solid, extent = {{-60, 80}, {60, -84}}), Rectangle(fillColor = {215, 215, 215}, fillPattern = FillPattern.Solid, extent = {{-54, 72}, {56, -84}}), Polygon(fillColor = {95, 95, 95}, fillPattern = FillPattern.Solid, points = {{56, 72}, {-36, 66}, {-36, -90}, {56, -84}, {56, 72}}), Rectangle(lineColor = {0, 0, 255}, fillColor = {255, 128, 0}, pattern = LinePattern.None, fillPattern = FillPattern.Solid, extent = {{-100, 2}, {-46, -2}}), Polygon(visible = false, origin = {75, 50}, rotation = 360, lineColor = {0, 128, 255}, fillColor = {0, 128, 255}, fillPattern = FillPattern.Solid, points = {{-5, 10}, {25, 10}, {-5, -10}, {-5, 10}}), Text(textColor = {0, 0, 127}, extent = {{-118, 34}, {-98, 16}}, textString = "y"), Line(points = {{-54, -6}, {-36, -6}}), Line(points = {{-54, -32}, {-36, -32}}), Polygon(visible = false, origin = {-79, -50}, rotation = 360, lineColor = {0, 128, 255}, fillColor = {0, 128, 255}, fillPattern = FillPattern.Solid, points = {{10, 10}, {-20, -10}, {10, -10}, {10, 10}}), Rectangle(lineColor = {0, 0, 255}, fillColor = {255, 128, 0}, pattern = LinePattern.None, fillPattern = FillPattern.Solid, extent = {{-46, 2}, {-40, -16}})}, coordinateSystem(extent = {{-100, -100}, {100, 100}})));
+end CrackOrOperableDoor;
diff --git a/IDEAS/Airflow/Multizone/Examples/TrickleVentIDEAS.mo b/IDEAS/Airflow/Multizone/Examples/TrickleVentIDEAS.mo
new file mode 100644
index 0000000000..8d9850e881
--- /dev/null
+++ b/IDEAS/Airflow/Multizone/Examples/TrickleVentIDEAS.mo
@@ -0,0 +1,51 @@
+within IDEAS.Airflow.Multizone.Examples;
+model TrickleVentIDEAS
+  "Model with a trickle vent modelled using the models with flow based on tabulated data"
+  extends IDEAS.Airflow.Multizone.Examples.TrickleVent(west(nPorts=2), east(nPorts=2));
+
+  IDEAS.Airflow.Multizone.TrickleVent vent(
+    redeclare package Medium = Medium,
+    dp_nominal = 10,
+    m_flow_nominal = 0.02614,
+    use_y = true)
+    "Analytic trickle vent implementation"  annotation (
+    Placement(visible = true, transformation(origin = {20, -70}, extent = {{-10, 10}, {10, -10}}, rotation = 0)));
+  Modelica.Blocks.Sources.Ramp ramp(
+    duration = 1e6,
+    height = -1,
+    offset = 1,
+    startTime = 1592000)
+    "Step control signal" annotation (
+    Placement(visible = true, transformation(origin = {-90, -88}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+equation
+   connect(vent.port_a, east.ports[2]) annotation (
+    Line(points = {{10, -70}, {-25, -70}, {-25, -30}, {-30, -30}}, color = {0, 127, 255}));
+  connect(vent.port_b, west.ports[2]) annotation (
+    Line(points = {{30, -70}, {65, -70}, {65, -30}, {70, -30}}, color = {0, 127, 255}));
+  connect(ramp.y, vent.y) annotation (
+    Line(points = {{-79, -88}, {20.5, -88}, {20.5, -82}, {20, -82}}, color = {0, 0, 127}));
+  annotation (__Dymola_Commands(file="modelica://IDEAS/Resources/Scripts/Dymola/Airflow/Multizone/Examples/TrickleVentIDEAS.mos"
+        "Simulate and plot"),
+        experiment(
+      StopTime=2592000,
+      Interval=600,
+      Tolerance=1e-06),
+    Documentation(info="<html>
+<p>
+This model illustrates the use of the models
+<a href=\"modelica://IDEAS.Airflow.Multizone.TrickleVent\">
+IDEAS.Airflow.Multizone.Table_V_flow</a>, 
+which is an analytic alternative to the table implementation of
+<a href=\"modelica://IDEAS.Airflow.Multizone.Table_m_flow\">
+IDEAS.Airflow.Multizone.Table_m_flow</a> for modelling self regulating inlet vents.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+July 9, 2023 by Filip Jorissen:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+ Diagram);
+end TrickleVentIDEAS;
diff --git a/IDEAS/Airflow/Multizone/Examples/package.order b/IDEAS/Airflow/Multizone/Examples/package.order
index 162a3ed47f..9940a37007 100644
--- a/IDEAS/Airflow/Multizone/Examples/package.order
+++ b/IDEAS/Airflow/Multizone/Examples/package.order
@@ -12,4 +12,5 @@ PressurizationData
 ReverseBuoyancy
 ReverseBuoyancy3Zones
 TrickleVent
+TrickleVentIDEAS
 ZonalFlow
diff --git a/IDEAS/Airflow/Multizone/MediumColumnReversible.mo b/IDEAS/Airflow/Multizone/MediumColumnReversible.mo
new file mode 100644
index 0000000000..6da0ffca15
--- /dev/null
+++ b/IDEAS/Airflow/Multizone/MediumColumnReversible.mo
@@ -0,0 +1,42 @@
+within IDEAS.Airflow.Multizone;
+model MediumColumnReversible
+  "Vertical shaft with no friction and no storage of heat and mass, reversible because it can handle negative column heights"
+
+  extends IDEAS.Airflow.Multizone.MediumColumn(
+    h(min=-Modelica.Constants.inf),
+    final densitySelection = IDEAS.Airflow.Multizone.Types.densitySelection.fromBottom);
+    // by convention, port_b must be connected to a zone instead of a flow element
+    // h is allowed to be negative to accomodate for this convention
+
+  annotation (
+Icon(graphics={
+    Line(
+      points={{0,100},{0,-100},{0,-98}}),
+    Text(origin = {-126, 2},lineColor = {0, 0, 127}, extent = {{24, -78}, {106, -100}}, textString = "Zone/Amb"),
+    Text(origin = {-130, 4}, lineColor = {0, 0, 127}, extent = {{32, 104}, {98, 70}}, textString = "FlowElem"),
+    Text(lineColor = {0, 0, 127}, extent = {{36, 26}, {88, -10}}, textString = "h=%h"),
+    Rectangle(fillColor = {255, 0, 0}, pattern = LinePattern.None, fillPattern = FillPattern.Solid, extent = {{-16, 80}, {16, -80}}),
+    Rectangle(visible = false, fillColor = {85, 170, 255}, pattern = LinePattern.None, fillPattern = FillPattern.Solid, extent = {{-16, 80}, {16, 0}}),
+    Rectangle(visible = false, fillColor = {85, 170, 255}, pattern = LinePattern.None, fillPattern = FillPattern.Solid, extent = {{-16, 80}, {16, 54}}),
+    Rectangle(fillColor = {85, 170, 255}, pattern = LinePattern.None, fillPattern = FillPattern.Solid, extent = {{-16, 0}, {16, -82}}),
+    Rectangle(visible = false, fillColor = {85, 170, 255}, pattern = LinePattern.None, fillPattern = FillPattern.Solid, extent = {{-16, -55}, {16, -80}})}),
+  defaultComponentName="col",
+  Documentation(info="<html>
+<p>
+This model describes the pressure difference of a vertical medium
+column. It can be used to model the pressure difference caused by
+stack effect.
+It is a variation on IDEAS.Airflow.Multizone.MediumColumn.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+January 19, 2022, by Klaas De Jonge:<br/>
+Adapted IDEAS.Airflow.Multizone.MediumColumn to obtain the current model where input of
+ h can be negative and cleaned out the model as the density should always be set by port_b. 
+This makes port_a not nececarilly always the top port.
+</li>
+</ul>
+</html>"));
+end MediumColumnReversible;
diff --git a/IDEAS/Airflow/Multizone/TrickleVent.mo b/IDEAS/Airflow/Multizone/TrickleVent.mo
index 0a7ba4b9eb..74bcaa31e8 100644
--- a/IDEAS/Airflow/Multizone/TrickleVent.mo
+++ b/IDEAS/Airflow/Multizone/TrickleVent.mo
@@ -5,15 +5,21 @@ model TrickleVent "Self regulating trickle vent"
     final from_dp=true,
     final homotopyInitialization=true);
 
+  parameter Real l(min=1e-10, max=1) = 0.0001
+    "Valve leakage, l=Kv(y=0)/Kv(y=1)";
   parameter Real deltaM(min=1E-6) = 0.3
     "Fraction of nominal mass flow rate where transition to turbulent occurs"
        annotation(Evaluate=true,
                   Dialog(group = "Transition to laminar",
                          enable = not linearized));
-
+  parameter Boolean use_y = false 
+    "=true, to enable control input"
+    annotation(Evaluate=true, Dialog(group="Control"));
   final parameter Real k = if computeFlowResistance then
         m_flow_nominal_pos / sqrt(dp_nominal_pos) else 0
     "Flow coefficient, k=m_flow/sqrt(dp), with unit=(kg.m)^(1/2)";
+  Modelica.Blocks.Interfaces.RealInput y(min=0,max=1) if use_y "Control input for trickle vent Kv value" annotation(
+    Placement(visible = true, transformation(origin = {0, 120}, extent = {{-20, -20}, {20, 20}}, rotation = -90), iconTransformation(origin = {0, 120}, extent = {{-20, -20}, {20, 20}}, rotation = -90)));
 protected
   final parameter Boolean computeFlowResistance=(dp_nominal_pos > Modelica.Constants.eps)
     "Flag to enable/disable computation of flow resistance"
@@ -23,6 +29,7 @@ protected
     then if from_dp then k^2/m_flow_nominal_pos else m_flow_nominal_pos/k^2
     else 0
     "Precomputed coefficient to avoid division by parameter";
+    Modelica.Blocks.Interfaces.RealInput y_internal "Internal variable for conditional variables";
 initial equation
  if computeFlowResistance then
    assert(m_flow_turbulent > 0, "m_flow_turbulent must be bigger than zero.");
@@ -30,6 +37,10 @@ initial equation
 
  assert(m_flow_nominal_pos > 0, "m_flow_nominal_pos must be non-zero. Check parameters.");
 equation
+  connect(y, y_internal);
+  if not use_y then
+    y_internal = 1;
+  end if;
   // Pressure drop calculation
   if computeFlowResistance then
     if linearized then
@@ -40,7 +51,7 @@ equation
             m_flow_nominal,
             IDEAS.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp(
               dp=dp,
-              k=k,
+              k=k*(l + (1-l)*y_internal),
               m_flow_turbulent=m_flow_turbulent),
             m_flow_nominal/10);
     end if; // linearized
@@ -56,12 +67,20 @@ The positive mass flow rate is limited to <code>m_flow_nominal</code>
 at a pressure difference of <code>dp_nominal</code>.
 For negative pressure differences the mass flow rate is not limited.
 </p>
+<p>
+An optional control input can be enabled, which reduces the flow rate for the same
+pressure difference, but which does not affect the maximum flow rate.
+</p>
 </html>", revisions="<html>
 <ul>
 <li>
+July 9, 2023, by Filip Jorissen:<br/>
+Add control input.
+</li>
+<li>
 September 21, 2021, by Filip Jorissen:<br/>
 First implementation.
 </li>
 </ul>
 </html>"));
-end TrickleVent;
+end TrickleVent;
\ No newline at end of file
diff --git a/IDEAS/Airflow/Multizone/Validation/LargeHorizontalOpening.mo b/IDEAS/Airflow/Multizone/Validation/LargeHorizontalOpening.mo
new file mode 100644
index 0000000000..e9066bc13e
--- /dev/null
+++ b/IDEAS/Airflow/Multizone/Validation/LargeHorizontalOpening.mo
@@ -0,0 +1,225 @@
+within IDEAS.Airflow.Multizone.Validation;
+model LargeHorizontalOpening
+  "Model to verify the flow when a cavity is horizontal and a small pressure difference exists"
+  extends Modelica.Icons.Example;
+  package Medium = IDEAS.Media.Specialized.Air.PerfectGas;
+
+  Orifice Opening_Orifice(
+    redeclare package Medium = Medium,
+    useDefaultProperties=false,
+    dp_turbulent=Opening_CrackOrOperableDoor.dp_turbulent_ope,
+    A=2,
+    CD=0.78) annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=270,
+        origin={-118,-24})));
+
+   CrackOrOperableDoor Opening_CrackOrOperableDoor(
+    redeclare package Medium = Medium,
+    wOpe=1,
+    hOpe=2,
+    interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts,
+    h_b1=0,
+    h_b2=0,
+    h_a1=0,
+    h_a2=0,
+    hA=-1.5,
+    hB=1.5,
+    A_q50=0,
+    q50=0,
+    useDoor=true,
+    use_y=false,
+    inc=0) annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={60,-20})));
+  Modelica.Blocks.Math.Sum MF_Doormodel(nin=2, k={3600,3600})
+    annotation (Placement(transformation(extent={{4,14},{-16,34}})));
+  Modelica.Blocks.Math.Sum MF_Orifice(nin=1, k={3600})
+    annotation (Placement(transformation(extent={{-180,28},{-200,48}})));
+  Modelica.Units.SI.MassFlowRate OpeningflowDiff=abs(MF_Doormodel.y)-abs(MF_Orifice.y);
+
+protected
+  Fluid.Sensors.MassFlowRate MFsensor_Orifice(
+    redeclare package Medium = Medium) "Mass flow rate sensor" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={-118,36})));
+
+  Fluid.Sensors.MassFlowRate Ori_Mixingvol_MF2(
+    redeclare package Medium = Medium) "Mass flow rate sensor" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={40,24})));
+  Fluid.MixingVolumes.MixingVolume vol1(
+    redeclare package Medium = Medium,
+    massDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    T_start=293.15,
+    m_flow_nominal=1e-12,
+    allowFlowReversal=true,
+    V=15,
+    nPorts=4) "Pressure boundary" annotation (Placement(transformation(extent={{-10,10},
+            {10,-10}},
+        rotation=0,
+        origin={-18,-102})));
+  Fluid.MixingVolumes.MixingVolume vol(
+    redeclare package Medium = Medium,
+    massDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    T_start=293.15,
+    m_flow_nominal=1e-12,
+    allowFlowReversal=true,
+    V=15,
+    nPorts=4) "Pressure boundary" annotation (Placement(transformation(extent={{-10,-10},
+            {10,10}},
+        rotation=0,
+        origin={-20,68})));
+  MediumColumn col2(
+    redeclare package Medium = Medium,
+    h=1.5,
+    densitySelection=IDEAS.Airflow.Multizone.Types.densitySelection.fromTop)
+    annotation (Placement(transformation(extent={{-128,-4},{-108,16}})));
+  MediumColumn col3(
+    redeclare package Medium = Medium,
+    h=1.5,
+    densitySelection=IDEAS.Airflow.Multizone.Types.densitySelection.fromBottom)
+    annotation (Placement(transformation(extent={{-128,-64},{-108,-44}})));
+
+  Orifice ori2(
+    redeclare package Medium = Medium,
+    useDefaultProperties=false,
+    A=0.5,
+    CD=0.6) annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={90,-148})));
+  MediumColumn col4(
+    redeclare package Medium = Medium,
+    h=1.5,
+    densitySelection=IDEAS.Airflow.Multizone.Types.densitySelection.fromBottom)
+    annotation (Placement(transformation(extent={{-60,80},{-40,100}})));
+  MediumColumn col5(
+    redeclare package Medium = Medium,
+    h=1.5,
+    densitySelection=IDEAS.Airflow.Multizone.Types.densitySelection.fromTop)
+    annotation (Placement(transformation(extent={{-4,-142},{16,-122}})));
+  Orifice ori3(
+    redeclare package Medium = Medium,
+    useDefaultProperties=false,
+    A=0.5,
+    CD=0.6) annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={50,116})));
+  Modelica.Thermal.HeatTransfer.Sources.FixedTemperature fixedTemperature(T=293.15)
+    annotation (Placement(transformation(extent={{-172,58},{-152,78}})));
+  Fluid.Sensors.MassFlowRate Ori_Mixingvol_MF1(
+    redeclare package Medium = Medium) "Mass flow rate sensor" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={72,24})));
+  Fluid.Sources.Boundary_pT bouA1(
+    redeclare package Medium = Medium,
+    X={0,1},
+    p(displayUnit="Pa") = 101325,
+    T=278.15,
+    nPorts=2) "Pressure boundary" annotation (Placement(transformation(extent={{10,10},
+            {-10,-10}},
+        rotation=0,
+        origin={198,172})));
+  MediumColumn col11(
+    redeclare package Medium = Medium,
+    h=10,
+    densitySelection=IDEAS.Airflow.Multizone.Types.densitySelection.fromTop)
+    annotation (Placement(transformation(extent={{144,-80},{172,-52}})));
+  MediumColumn col12(
+    redeclare package Medium = Medium,
+    h=4,
+    densitySelection=IDEAS.Airflow.Multizone.Types.densitySelection.fromTop)
+    annotation (Placement(transformation(extent={{128,122},{156,150}})));
+
+initial equation
+  for i in 1:vol.nPorts loop
+    vol.ports[i].Xi_outflow = {0};
+  end for;
+  for i in 1:vol1.nPorts loop
+    vol1.ports[i].Xi_outflow = {0};
+  end for;
+
+equation
+
+  connect(col3.port_b, vol1.ports[1]) annotation (Line(points={{-118,-64},{-118,
+          -82},{-19.5,-82},{-19.5,-92}},
+                           color={0,127,255}));
+  connect(col2.port_a, MFsensor_Orifice.port_a) annotation (Line(points={{-118,16},
+          {-118,26}},                     color={0,127,255}));
+  connect(MFsensor_Orifice.port_b, vol.ports[1]) annotation (Line(points={{-118,46},
+          {-118,50},{-21.5,50},{-21.5,58}},
+                                    color={0,127,255}));
+  connect(vol.ports[2], col4.port_b)
+    annotation (Line(points={{-20.5,58},{-20.5,56},{-22,56},{-22,52},{-50,52},{-50,
+          80}},                                           color={0,127,255}));
+  connect(vol1.ports[2], col5.port_a) annotation (Line(points={{-18.5,-92},{-18.5,
+          -90},{-16,-90},{-16,-82},{6,-82},{6,-122}},
+                           color={0,127,255}));
+  connect(col5.port_b, ori2.port_b) annotation (Line(points={{6,-142},{6,-148},{
+          80,-148}},         color={0,127,255}));
+  connect(col4.port_a, ori3.port_a) annotation (Line(points={{-50,100},{-50,116},
+          {40,116}},  color={0,127,255}));
+  connect(fixedTemperature.port, vol.heatPort)
+    annotation (Line(points={{-152,68},{-30,68}},color={191,0,0}));
+  connect(col11.port_a, bouA1.ports[1]) annotation (Line(points={{158,-52},{158,
+          173},{188,173}},                     color={0,127,255}));
+  connect(col12.port_a, bouA1.ports[2]) annotation (Line(points={{142,150},{142,
+          171},{188,171}}, color={0,127,255}));
+  connect(Opening_CrackOrOperableDoor.port_a2, Ori_Mixingvol_MF1.port_a)
+    annotation (Line(points={{66,-10},{66,8},{72,8},{72,14}}, color={0,127,255}));
+  connect(Opening_CrackOrOperableDoor.port_b1, Ori_Mixingvol_MF2.port_a)
+    annotation (Line(points={{54,-10},{54,8},{40,8},{40,14}}, color={0,127,255}));
+  connect(Ori_Mixingvol_MF2.m_flow, MF_Doormodel.u[1]) annotation (Line(points={{29,24},
+          {18,24},{18,23.5},{6,23.5}},          color={0,0,127}));
+  connect(Ori_Mixingvol_MF1.m_flow, MF_Doormodel.u[2]) annotation (Line(points={{61,24},
+          {56,24},{56,40},{22,40},{22,24},{18,24},{18,24.5},{6,24.5}},
+        color={0,0,127}));
+  connect(MF_Orifice.u[1], MFsensor_Orifice.m_flow)
+    annotation (Line(points={{-178,38},{-154,38},{-154,36},{-129,36}},
+                                                   color={0,0,127}));
+  connect(col3.port_a, Opening_Orifice.port_a) annotation (Line(points={{-118,-44},
+          {-118,-34}},                       color={0,127,255}));
+  connect(Opening_Orifice.port_b, col2.port_b) annotation (Line(points={{-118,-14},
+          {-118,-4}},                    color={0,127,255}));
+  connect(col12.port_b, ori3.port_b) annotation (Line(points={{142,122},{142,116},
+          {60,116}},                                          color={0,127,255}));
+  connect(col11.port_b, ori2.port_a) annotation (Line(points={{158,-80},{158,-148},
+          {100,-148}},                          color={0,127,255}));
+  connect(fixedTemperature.port, vol1.heatPort) annotation (Line(points={{-152,68},
+          {-76,68},{-76,-102},{-28,-102}}, color={191,0,0}));
+  connect(Opening_CrackOrOperableDoor.port_a1, vol1.ports[3]) annotation (Line(
+        points={{54,-30},{54,-82},{-17.5,-82},{-17.5,-92}}, color={0,127,255}));
+  connect(Opening_CrackOrOperableDoor.port_b2, vol1.ports[4]) annotation (Line(
+        points={{66,-30},{66,-82},{-16.5,-82},{-16.5,-92}}, color={0,127,255}));
+  connect(Ori_Mixingvol_MF2.port_b, vol.ports[3]) annotation (Line(points={{40,34},
+          {40,52},{-19.5,52},{-19.5,58}}, color={0,127,255}));
+  connect(Ori_Mixingvol_MF1.port_b, vol.ports[4]) annotation (Line(points={{72,34},
+          {72,52},{-22,52},{-22,58},{-18.5,58}}, color={0,127,255}));
+  annotation (Diagram(
+        coordinateSystem(preserveAspectRatio=false, extent={{-200,-160},{220,200}})),
+    experiment(
+      StopTime=300,
+      Interval=10,
+      Tolerance=1e-09,
+      __Dymola_Algorithm="Cvode"),
+      __Dymola_Commands(file="modelica://IDEAS/Resources/Scripts/Dymola/Airflow/Multizone/Validation/LargeHorizontalOpening.mos"
+        "Simulate and Plot"),
+    Documentation(revisions="<html>
+<ul>
+<li>
+October 30, 2024, by Klaas De Jonge:<br/>
+First implementation.
+</li>
+</ul>
+</html>
+", info="<html>
+<p>Differences in assumptions for density calculations linked to stack-effect airflow (internally for door component, external via density columns for orifice) can result in different pressure differences over the opening (10e-3). However, for large horizontal openings this can result in important differences in volume flow results. This example shows how two similar openings with other underlying modelling assumptions lead to noticeable differences in massflowrate.</p>
+</html>"),
+    Icon(coordinateSystem(extent={{-100,-100},{100,100}})));
+end LargeHorizontalOpening;
diff --git a/IDEAS/Airflow/Multizone/Validation/package.order b/IDEAS/Airflow/Multizone/Validation/package.order
index 3b0f6df5f3..afb70eafd3 100644
--- a/IDEAS/Airflow/Multizone/Validation/package.order
+++ b/IDEAS/Airflow/Multizone/Validation/package.order
@@ -1,4 +1,5 @@
 DoorOpenClosed
+LargeHorizontalOpening
 OneWayFlow
 OpenDoorBuoyancyDynamic
 OpenDoorBuoyancyPressureDynamic
diff --git a/IDEAS/Airflow/Multizone/package.order b/IDEAS/Airflow/Multizone/package.order
index cc28cc1a97..07a26438fe 100644
--- a/IDEAS/Airflow/Multizone/package.order
+++ b/IDEAS/Airflow/Multizone/package.order
@@ -1,6 +1,7 @@
 UsersGuide
 Coefficient_V_flow
 Coefficient_m_flow
+CrackOrOperableDoor
 DoorDiscretizedOpen
 DoorDiscretizedOperable
 DoorOpen
@@ -8,15 +9,16 @@ DoorOperable
 EffectiveAirLeakageArea
 MediumColumn
 MediumColumnDynamic
+MediumColumnReversible
 Orifice
 Point_m_flow
 Points_m_flow
 Table_V_flow
 Table_m_flow
+TrickleVent
 ZonalFlow_ACS
 ZonalFlow_m_flow
 Types
 Examples
 Validation
 BaseClasses
-TrickleVent
diff --git a/IDEAS/BoundaryConditions/Interfaces/PartialSimInfoManager.mo b/IDEAS/BoundaryConditions/Interfaces/PartialSimInfoManager.mo
index c39f8a65f0..aa0fd11797 100644
--- a/IDEAS/BoundaryConditions/Interfaces/PartialSimInfoManager.mo
+++ b/IDEAS/BoundaryConditions/Interfaces/PartialSimInfoManager.mo
@@ -43,7 +43,10 @@ partial model PartialSimInfoManager
   parameter Boolean openSystemConservationOfEnergy=false
     "Compute conservation of energy for open system" annotation (Evaluate=true,
       Dialog(tab="Conservation of energy", enable=computeConservationOfEnergy));
-
+  final parameter Boolean use_port_1 = interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None
+    "Whether port_1 of the propsbus connector should be used";
+  final parameter Boolean use_port_2 = interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts
+    "Whether port_2 of the propsbus connector should be used";
   parameter Boolean lineariseDymola=false "Linearises building model equations for Dymola linearisation approach"
     annotation (Dialog(tab="Linearisation"));
   parameter Boolean lineariseJModelica=false "Linearises building model equations for optimisations in JModelica"
@@ -101,18 +104,23 @@ partial model PartialSimInfoManager
     annotation(Dialog(enable=interZonalAirFlowType<>
     IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None or unify_n50,group="Interzonal airflow"));
 
+  parameter Boolean  use_sim_Cs =true "if checked, the default Cs of each surface in the building is sim.Cs"
+  annotation(choices(checkBox=true),Dialog(group="Wind"));
+
   parameter Modelica.Units.SI.Length H=10 "Building or roof height"
     annotation (Dialog(group="Wind"));
-  parameter Real A0=0.6 "Local terrain constant. 0.6 for Suburban,0.35 for Urban and 1 for Unshielded (Ashrae 1993) " annotation(Dialog(group="Wind"));
+  parameter Real A0=0.6 "Local terrain constant. 0.6 for Suburban,0.35 for Urban and 1 for Unshielded (Ashrae 1993) "
+    annotation(Dialog(group="Wind"));
   parameter Real a=0.28 "Velocity profile exponent. 0.28 for Suburban, 0.4 for Urban and 0.15 for Unshielded (Ashrae 1993) "
-                                                                                                                            annotation(Dialog(group="Wind"));
-  parameter Modelica.Units.SI.Length Hwin=10
+    annotation(Dialog(group="Wind"));
+  parameter Modelica.Units.SI.Length Hwind=10
     "Height above ground of meteorological wind speed measurement"
     annotation (Dialog(group="Wind"));
+  parameter Modelica.Units.SI.Length  HPres=1 "Height above ground of meteorological atmospheric pressure measurement" annotation (Dialog(group="Wind"));
+  parameter Real Cs_coeff = (A0*A0)*((1/Hwind)^(2*a)) "Multiplication factor for Habs"
+    annotation(Dialog(group="Wind"));
 
-  parameter Real Cs= (A0*A0)*((H/Hwin)^(2*a)) "Wind speed modifier"
-                                                                   annotation(Dialog(group="Wind"));
-
+  parameter Real Cs= Cs_coeff*(H^(2*a)) "Wind speed modifier"              annotation(Dialog(group="Wind"));
 
   final parameter Integer numIncAndAziInBus = size(incAndAziInBus,1)
     "Number of pre-computed azimuth";
@@ -576,6 +584,18 @@ equation
 </html>", revisions="<html>
 <ul>
 <li>
+October 30, 2024, by Klaas De Jonge:<br/>
+Modifications for wind pressure,ambient pressure and wind speed modifiers used in interzonal airflow.
+</li>
+<li>
+October 18, 2023 by Filip Jorissen:<br/>
+Added use_port_1 and use_port_2 for convenience.
+</li>
+<li>
+December 18, 2022 by Filip Jorissen:<br/>
+parameter revisions  for #1244
+</li>
+<li>
 April 28, 2022 by Filip Jorissen:<br/>
 Changed the default weather file to BEL_VLG_Uccle.064470_TMYx.2007-2021.mos.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1239\">
diff --git a/IDEAS/BoundaryConditions/Validation/BESTEST/WD100.mo b/IDEAS/BoundaryConditions/Validation/BESTEST/WD100.mo
index 09dbd84572..d350dd5e83 100644
--- a/IDEAS/BoundaryConditions/Validation/BESTEST/WD100.mo
+++ b/IDEAS/BoundaryConditions/Validation/BESTEST/WD100.mo
@@ -1,4 +1,4 @@
-within IDEAS.BoundaryConditions.Validation.BESTEST;
+﻿within IDEAS.BoundaryConditions.Validation.BESTEST;
 model WD100
   "Test model for BESTEST weather data: base case"
   extends Modelica.Icons.Example;
diff --git a/IDEAS/Buildings/Components/BaseClasses/ConvectiveHeatTransfer/MonoLayerAir.mo b/IDEAS/Buildings/Components/BaseClasses/ConvectiveHeatTransfer/MonoLayerAir.mo
index 9b3f8682ae..9a428e9026 100644
--- a/IDEAS/Buildings/Components/BaseClasses/ConvectiveHeatTransfer/MonoLayerAir.mo
+++ b/IDEAS/Buildings/Components/BaseClasses/ConvectiveHeatTransfer/MonoLayerAir.mo
@@ -64,7 +64,9 @@ model MonoLayerAir
         then 0.028154*Ra^0.41399
       else 1+1.75967e-10*Ra^2.2984755)
     else 1 "Correlations from Hollands et al. and Wright et al.";
-
+  Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port_emb "Internal port"
+    annotation (Placement(transformation(extent={{-10,90},{10,110}})));
+    
 protected
   final parameter Boolean ceiling=
      IDEAS.Utilities.Math.Functions.isAngle(inc,IDEAS.Types.Tilt.Ceiling)
@@ -83,16 +85,9 @@ protected
     abs(port_a.T-port_b.T))*coeffRa);
   Modelica.Units.SI.CoefficientOfHeatTransfer h=Nu*k/d;
 
-public
-  Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port_emb "Internal port"
-    annotation (Placement(transformation(extent={{-10,90},{10,110}})));
-
 equation
-  if not (ceiling or floor or vertical) then
-    assert(false, "Could not find suitable correlation for air cavity! Please 
-      change the inclination to wall, ceiling or floor or remove the air layer.",
+    assert(ceiling or floor or vertical, "In  " + getInstanceName() +": Could not find suitable correlation for air cavity in a wall. Results may be less accurate than expected.",
       level=AssertionLevel.warning);
-  end if;
 
   if checkCoating then
     assert(abs(epsLw_a - IDEAS.Buildings.Data.Constants.epsLw_glass) > 1e-5
diff --git a/IDEAS/Buildings/Components/BaseClasses/RadiativeHeatTransfer/SwWindowResponse.mo b/IDEAS/Buildings/Components/BaseClasses/RadiativeHeatTransfer/SwWindowResponse.mo
index 16a482364b..27b8476182 100644
--- a/IDEAS/Buildings/Components/BaseClasses/RadiativeHeatTransfer/SwWindowResponse.mo
+++ b/IDEAS/Buildings/Components/BaseClasses/RadiativeHeatTransfer/SwWindowResponse.mo
@@ -40,23 +40,17 @@ model SwWindowResponse "Shortwave window respone"
     annotation (Placement(transformation(extent={{10,-110},{30,-90}})));
   Modelica.Blocks.Math.Gain radToDeg(final k=180/Modelica.Constants.pi)
     "Conversion of radians to degrees"
-    annotation (Placement(transformation(extent={{-60,-50},{-40,-30}})));
+    annotation (Placement(visible = true, transformation(origin = {-20, 0}, extent = {{-60, -50}, {-40, -30}}, rotation = 0)));
   Modelica.Blocks.Tables.CombiTable1Ds SwAbsDir(
     final table=SwAbs,
     final smoothness=Modelica.Blocks.Types.Smoothness.LinearSegments,
     final columns=columns) "lookup table for AOI dependent absorptance"
-    annotation (Placement(transformation(
-        extent={{-9,-9},{9,9}},
-        rotation=90,
-        origin={-29,-11})));
+    annotation (Placement(visible = true, transformation(origin = {-39, -29}, extent = {{-9, -9}, {9, 9}}, rotation = 0)));
   Modelica.Blocks.Tables.CombiTable1Ds SwTransDir(
     final table=SwTrans,
     final smoothness=Modelica.Blocks.Types.Smoothness.LinearSegments,
     final columns={2}) "lookup table for AOI dependent transmittance"
-    annotation (Placement(transformation(
-        extent={{-9,-9},{9,9}},
-        rotation=90,
-        origin={-3,-11})));
+    annotation (Placement(visible = true, transformation(origin = {-39, -61}, extent = {{-9, -9}, {9, 9}}, rotation = 0)));
   Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow[nLay] Abs_flow
     "Solar absorptance in the panes source" annotation (Placement(
         transformation(
@@ -76,154 +70,75 @@ model SwWindowResponse "Shortwave window respone"
         rotation=-90,
         origin={20,-78})));
   Modelica.Blocks.Math.Product[nLay] SwAbsDirProd annotation (Placement(
-        transformation(
-        extent={{-7,-7},{7,7}},
-        rotation=90,
-        origin={-33,19})));
+        visible = true, transformation(origin = {-9, 31}, extent = {{-7, -7}, {7, 7}}, rotation = 90)));
   Modelica.Blocks.Math.Product SwTransDirProd annotation (Placement(
-        transformation(
-        extent={{-7,-7},{7,7}},
-        rotation=90,
-        origin={-7,19})));
-  Modelica.Blocks.Math.Add[nLay] add annotation (Placement(transformation(
-        extent={{8,-8},{-8,8}},
-        rotation=-90,
-        origin={-32,48})));
-
-  Modelica.Blocks.Math.Gain[nLay] SwAbsDifProd(k=SwAbsDif)  annotation (Placement(
-        transformation(
-        extent={{-7,-7},{7,7}},
-        rotation=90,
-        origin={25,21})));
-  Modelica.Blocks.Math.Gain SwTransDifProd(k=SwTransDif)  annotation (Placement(
-        transformation(
-        extent={{-7,-7},{7,7}},
-        rotation=90,
-        origin={51,21})));
+        visible = true, transformation(origin = {-20, -28}, extent = {{-6, -6}, {6, 6}}, rotation = -90)));
+  Modelica.Blocks.Math.Add[nLay] add annotation (Placement(visible = true, transformation(origin = {4.44089e-16, 54}, extent = {{6, -6}, {-6, 6}}, rotation = -90)));
+  Modelica.Blocks.Interfaces.RealInput y
+    "Window opening, y=0 is closed" annotation(
+    Placement(visible = true, transformation(origin = {0, -40}, extent = {{-120, -60}, {-80, -20}}, rotation = 0), iconTransformation(origin = {0, -40}, extent = {{-120, -60}, {-80, -20}}, rotation = 0)));
+  Modelica.Blocks.Sources.RealExpression[nLay] SwAbsDirExp(y = { (1 - y)*SwAbsDir.y[i]  for i in 1:nLay})  
+    "Shortwave direct absorptance only when window is not fully open" annotation(
+    Placement(visible = true, transformation(origin = {-70, -2}, extent = {{-30, -10}, {30, 10}}, rotation = 0)));
+  Modelica.Blocks.Sources.RealExpression SwTransDirExp(y = (1 - y)*SwTransDir.y[1] + y )  
+    "Shortwave transmission increases when window is open" annotation(
+    Placement(visible = true, transformation(origin = {-70, -10}, extent = {{-30, 10}, {30, -10}}, rotation = 0)));
+  Modelica.Blocks.Math.Product[nLay] SwAbsDifProd annotation(
+    Placement(visible = true, transformation(origin = {11, 31}, extent = {{-7, -7}, {7, 7}}, rotation = 90)));
+  Modelica.Blocks.Sources.RealExpression[nLay] SwAbsDifExp(y = {(1 - y)*SwAbsDif[i] for i in 1:nLay})
+    "Shortwave diffuse absorption" annotation(
+    Placement(visible = true, transformation(origin = {70, 16}, extent = {{30, -10}, {-30, 10}}, rotation = 0)));
+  Modelica.Blocks.Sources.RealExpression SwTransDifExp(y = (1 - y)*SwTransDif + y)
+    "Shortwave diffuse transmission increases when window is open" annotation(
+    Placement(visible = true, transformation(origin = {70, -16}, extent = {{30, 10}, {-30, -10}}, rotation = 0)));
+  Modelica.Blocks.Math.Product SwTransDifProd
+    "Shortwave transmission product" annotation(
+    Placement(visible = true, transformation(origin = {20, -28}, extent = {{6, 6}, {-6, -6}}, rotation = 90)));
 equation
-
-  connect(Abs_flow.port, iSolAbs) annotation (Line(
-      points={{4.89859e-016,86},{0,86},{0,100}},
-      color={191,0,0},
-      smooth=Smooth.None));
-  connect(Dir_flow.port, iSolDir) annotation (Line(
-      points={{-20,-86},{-20,-100}},
-      color={191,0,0},
-      smooth=Smooth.None));
-  connect(Dif_flow.port, iSolDif) annotation (Line(
-      points={{20,-86},{20,-100}},
-      color={191,0,0},
-      smooth=Smooth.None));
-  connect(solDir, SwTransDirProd.u1) annotation (Line(
-      points={{-100,60},{-60,60},{-60,4},{-11.2,4},{-11.2,10.6}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(SwAbsDir.y, SwAbsDirProd.u2) annotation (Line(
-      points={{-29,-1.1},{-29,13.45},{-28.8,13.45},{-28.8,10.6}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(SwTransDir.y[1], SwTransDirProd.u2) annotation (Line(
-      points={{-3,-1.1},{-3,13.45},{-2.8,13.45},{-2.8,10.6}},
-      color={0,0,127},
-      smooth=Smooth.None));
-
+  connect(Abs_flow.port, iSolAbs) annotation(
+    Line(points = {{4.89859e-016, 86}, {0, 86}, {0, 100}}, color = {191, 0, 0}, smooth = Smooth.None));
+  connect(Dir_flow.port, iSolDir) annotation(
+    Line(points = {{-20, -86}, {-20, -100}}, color = {191, 0, 0}, smooth = Smooth.None));
+  connect(Dif_flow.port, iSolDif) annotation(
+    Line(points = {{20, -86}, {20, -100}}, color = {191, 0, 0}, smooth = Smooth.None));
+  connect(solDir, SwTransDirProd.u1) annotation(
+    Line(points = {{-100, 60}, {-60, 60}, {-60, 13}, {-17.5, 13}, {-17.5, -21}, {-16, -21}}, color = {0, 0, 127}));
   for i in 1:nLay loop
-    connect(solDir, SwAbsDirProd[i].u1) annotation (Line(
-        points={{-100,60},{-60,60},{-60,4},{-37.2,4},{-37.2,10.6}},
-        color={0,0,127},
-        smooth=Smooth.None));
-    connect(SwAbsDifProd[i].u, solDif) annotation (Line(points={{25,12.6},{25,2},{
-          -64,2},{-64,20},{-100,20}}, color={0,0,127}));
+   connect(SwAbsDirProd[i].u1, solDir) annotation(
+    Line(points = {{-38, 18}, {-38, 14}, {-60, 14}, {-60, 60}, {-100, 60}}, color = {0, 0, 127}));
+    connect(SwAbsDifProd[i].u1, solDif) annotation(
+      Line(points = {{14, 18}, {16, 18}, {16, 8}, {-62, 8}, {-62, 20}, {-100, 20}}, color = {0, 0, 127}));
   end for;
-
-  connect(SwTransDirProd.y, Dir_flow.Q_flow) annotation (Line(
-      points={{-7,26.7},{-7,50},{80,50},{80,-54},{-20,-54},{-20,-70}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(SwAbsDirProd.y, add.u2) annotation (Line(
-      points={{-33,26.7},{-33,31.35},{-36.8,31.35},{-36.8,38.4}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(add.y, Abs_flow.Q_flow) annotation (Line(
-      points={{-32,56.8},{-32,62},{-4.89859e-016,62},{-4.89859e-016,70}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(radToDeg.u, angInc) annotation (Line(points={{-62,-40},{-76,-40},{
-          -100,-40}},           color={0,0,127}));
-  connect(radToDeg.y, SwAbsDir.u) annotation (Line(points={{-39,-40},{-29,-40},
-          {-29,-21.8}}, color={0,0,127}));
-  connect(radToDeg.y, SwTransDir.u) annotation (Line(points={{-39,-40},{-3,-40},
-          {-3,-21.8}},      color={0,0,127}));
-  connect(SwAbsDifProd.y, add.u1) annotation (Line(points={{25,28.7},{25,34},{-27.2,
-          34},{-27.2,38.4}}, color={0,0,127}));
-  connect(SwTransDifProd.y, Dif_flow.Q_flow) annotation (Line(points={{51,28.7},
-          {51,34},{38,34},{38,-60},{20,-60},{20,-70}}, color={0,0,127}));
-
-   connect(SwTransDifProd.u, solDif) annotation (Line(points={{51,12.6},{51,2},{-64,
-          2},{-64,20},{-100,20}}, color={0,0,127}));
-  annotation (
-    Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,
-            100}})),
-    Icon(graphics={
-        Rectangle(
-          extent={{-80,90},{80,70}},
-          fillColor={192,192,192},
-          fillPattern=FillPattern.Backward,
-          pattern=LinePattern.None),
-        Line(
-          points={{-80,70},{80,70}},
-          pattern=LinePattern.None,
-          thickness=0.5,
-          smooth=Smooth.None),
-        Line(
-          points={{44,40},{44,-50}},
-          smooth=Smooth.None,
-          color={127,0,0}),
-        Line(
-          points={{44,40},{38,30}},
-          smooth=Smooth.None,
-          color={127,0,0}),
-        Line(
-          points={{44,40},{50,30}},
-          smooth=Smooth.None,
-          color={127,0,0}),
-        Line(
-          points={{14,40},{14,-50}},
-          smooth=Smooth.None,
-          color={127,0,0}),
-        Line(
-          points={{14,40},{8,30}},
-          smooth=Smooth.None,
-          color={127,0,0}),
-        Line(
-          points={{14,40},{20,30}},
-          smooth=Smooth.None,
-          color={127,0,0}),
-        Line(
-          points={{-16,40},{-16,-50}},
-          smooth=Smooth.None,
-          color={127,0,0}),
-        Line(
-          points={{-16,40},{-22,30}},
-          smooth=Smooth.None,
-          color={127,0,0}),
-        Line(
-          points={{-16,40},{-10,30}},
-          smooth=Smooth.None,
-          color={127,0,0}),
-        Line(
-          points={{-46,40},{-46,-50}},
-          smooth=Smooth.None,
-          color={127,0,0}),
-        Line(
-          points={{-46,40},{-52,30}},
-          smooth=Smooth.None,
-          color={127,0,0}),
-        Line(
-          points={{-46,40},{-40,30}},
-          smooth=Smooth.None,
-          color={127,0,0})}),
-    Documentation(info="<html>
+  connect(SwTransDirProd.y, Dir_flow.Q_flow) annotation(
+    Line(points = {{-20, -35}, {-20, -70}}, color = {0, 0, 127}));
+  connect(SwAbsDirProd.y, add.u2) annotation(
+    Line(points = {{-9, 39}, {-9, 38.5}, {-4, 38.5}, {-4, 47}}, color = {0, 0, 127}));
+  connect(add.y, Abs_flow.Q_flow) annotation(
+    Line(points = {{0, 61}, {0, 70}}, color = {0, 0, 127}));
+  connect(radToDeg.u, angInc) annotation(
+    Line(points = {{-82, -40}, {-100, -40}}, color = {0, 0, 127}));
+  connect(radToDeg.y, SwAbsDir.u) annotation(
+    Line(points = {{-59, -40}, {-50, -40}, {-50, -29}}, color = {0, 0, 127}));
+  connect(radToDeg.y, SwTransDir.u) annotation(
+    Line(points = {{-59, -40}, {-50, -40}, {-50, -61}}, color = {0, 0, 127}));
+  connect(SwAbsDirExp.y, SwAbsDirProd.u2) annotation(
+    Line(points = {{-37, -2}, {-37, -1.5}, {-4, -1.5}, {-4, 21}, {-5.5, 21}, {-5.5, 23}, {-5, 23}}, color = {0, 0, 127}));
+  connect(SwTransDirExp.y, SwTransDirProd.u2) annotation(
+    Line(points = {{-37, -10}, {-37, -15.5}, {-24, -15.5}, {-24, -21}}, color = {0, 0, 127}));
+  connect(SwAbsDifProd.y, add.u1) annotation(
+    Line(points = {{11, 39}, {11, 47}, {4, 47}}, color = {0, 0, 127}, thickness = 0.5));
+  connect(SwAbsDifExp.y, SwAbsDifProd.u2) annotation(
+    Line(points = {{37, 16}, {37, 15.5}, {15, 15.5}, {15, 23}}, color = {0, 0, 127}));
+  connect(SwTransDifExp.y, SwTransDifProd.u1) annotation(
+    Line(points = {{37, -16}, {24, -16}, {24, -21}}, color = {0, 0, 127}));
+  connect(SwTransDifProd.u2, solDif) annotation(
+    Line(points = {{16, -21}, {16, 8}, {-62, 8}, {-62, 20}, {-100, 20}}, color = {0, 0, 127}));
+  connect(Dif_flow.Q_flow, SwTransDifProd.y) annotation(
+    Line(points = {{20, -70}, {20, -35}}, color = {0, 0, 127}));
+   annotation(
+    Diagram(coordinateSystem(preserveAspectRatio = false, extent = {{-100, -100}, {100, 100}})),
+    Icon(graphics = {Rectangle(fillColor = {192, 192, 192}, pattern = LinePattern.None, fillPattern = FillPattern.Backward, extent = {{-80, 90}, {80, 70}}), Line(points = {{-80, 70}, {80, 70}}, pattern = LinePattern.None, thickness = 0.5), Line(points = {{44, 40}, {44, -50}}, color = {127, 0, 0}), Line(points = {{44, 40}, {38, 30}}, color = {127, 0, 0}), Line(points = {{44, 40}, {50, 30}}, color = {127, 0, 0}), Line(points = {{14, 40}, {14, -50}}, color = {127, 0, 0}), Line(points = {{14, 40}, {8, 30}}, color = {127, 0, 0}), Line(points = {{14, 40}, {20, 30}}, color = {127, 0, 0}), Line(points = {{-16, 40}, {-16, -50}}, color = {127, 0, 0}), Line(points = {{-16, 40}, {-22, 30}}, color = {127, 0, 0}), Line(points = {{-16, 40}, {-10, 30}}, color = {127, 0, 0}), Line(points = {{-46, 40}, {-46, -50}}, color = {127, 0, 0}), Line(points = {{-46, 40}, {-52, 30}}, color = {127, 0, 0}), Line(points = {{-46, 40}, {-40, 30}}, color = {127, 0, 0})}, coordinateSystem(extent = {{-100, -100}, {100, 100}})),
+    Documentation(info = "<html>
 <p>The properties for absorption by and transmission through the glazingare taken into account depending on the angle of incidence of solar irradiation and are based on the output of the <a href=\"IDEAS.Buildings.UsersGuide.References\">[WINDOW 6.3]</a> software, i.e. the shortwave properties itselves based on the layers in the window are not calculated in the model but are input parameters. </p>
 </html>"));
-end SwWindowResponse;
+end SwWindowResponse;
\ No newline at end of file
diff --git a/IDEAS/Buildings/Components/BoundaryWall.mo b/IDEAS/Buildings/Components/BoundaryWall.mo
index 1ae6169c2f..3a84fe5e9c 100644
--- a/IDEAS/Buildings/Components/BoundaryWall.mo
+++ b/IDEAS/Buildings/Components/BoundaryWall.mo
@@ -5,7 +5,7 @@ model BoundaryWall "Opaque wall with optional prescribed heat flow rate or tempe
     final use_custom_q50=true,
     final nWin=1,
     dT_nominal_a=-1,
-    add_cracks=false,
+    add_door=false,
     final QTra_design(fixed=false),
     layMul(disableInitPortB=use_T_in or use_T_fixed, monLay(monLayDyn(each
             addRes_b=(sim.lineariseDymola and (use_T_in or use_T_fixed))))));
@@ -45,18 +45,24 @@ model BoundaryWall "Opaque wall with optional prescribed heat flow rate or tempe
     "Constant block for temperature"
     annotation (Placement(transformation(extent={{-110,32},{-100,42}})));
 
-  Fluid.Sources.MassFlowSource_T       boundary1(
+  IDEAS.Fluid.Sources.MassFlowSource_T boundary1(
     redeclare package Medium = Medium,
     nPorts=1,
     final m_flow=1e-10)
     if sim.interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None
     annotation (Placement(transformation(extent={{-28,-40},{-8,-20}})));
-  Fluid.Sources.MassFlowSource_T       boundary2(
+  IDEAS.Fluid.Sources.MassFlowSource_T boundary2(
     redeclare package Medium = Medium,
     nPorts=1,
-    final m_flow=0)
+    final m_flow=1e-10)
     if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts
     annotation (Placement(transformation(extent={{-28,-76},{-8,-56}})));
+  IDEAS.Fluid.Sources.MassFlowSource_T boundary3(
+    redeclare package Medium = Medium, 
+    m_flow = 1e-10, 
+    nPorts = 1)
+    if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts annotation(
+    Placement(transformation(origin = {0, -14}, extent = {{-28, -76}, {-8, -56}})));
 protected
   final parameter Real U_value=1/(1/8 + sum(constructionType.mats.R) + 1/8)
     "Wall U-value";
@@ -114,50 +120,12 @@ equation
           {42,-30},{42,19.91},{56.09,19.91}}, color={0,127,255}));
   connect(boundary2.ports[1], propsBusInt.port_2) annotation (Line(points={{-8,-66},
           {44,-66},{44,19.91},{56.09,19.91}},                   color={0,127,255}));
-  annotation (
-    Diagram(coordinateSystem(preserveAspectRatio=false,extent={{-100,-100},{100,
-            100}})),
-    Icon(coordinateSystem(preserveAspectRatio=false,extent={{-60,-100},{60,100}}),
-        graphics={
-        Rectangle(
-          extent={{-50,-90},{50,-70}},
-          pattern=LinePattern.None,
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-50,80},{50,100}},
-          pattern=LinePattern.None,
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Line(
-          points={{-50,80},{50,80}},
-          color={175,175,175}),
-        Line(
-          points={{-50,-70},{50,-70}},
-          color={175,175,175}),
-        Line(
-          points={{-50,-90},{50,-90}},
-          color={175,175,175}),
-        Line(
-          points={{-50,100},{50,100}},
-          color={175,175,175}),
-        Rectangle(
-          extent={{-10,80},{10,-70}},
-          fillColor={175,175,175},
-          fillPattern=FillPattern.Backward,
-          pattern=LinePattern.None),
-        Line(
-          points={{-10,80},{-10,-70}},
-          smooth=Smooth.None,
-          color={175,175,175}),
-        Line(
-          points={{10,80},{10,-70}},
-          smooth=Smooth.None,
-          color={0,0,0},
-          thickness=0.5)}),
-    Documentation(info="<html>
+  connect(boundary3.ports[1], propsBusInt.port_3) annotation(
+    Line(points = {{-8, -80}, {56, -80}, {56, 20}}, color = {0, 127, 255}));
+  annotation(
+    Diagram(coordinateSystem(preserveAspectRatio = false, extent = {{-100, -100}, {100, 100}})),
+    Icon(coordinateSystem(preserveAspectRatio = false, extent = {{-60, -100}, {60, 100}}), graphics = {Rectangle(fillColor = {255, 255, 255}, pattern = LinePattern.None, fillPattern = FillPattern.Solid, extent = {{-50, -90}, {50, -70}}), Rectangle(fillColor = {255, 255, 255}, pattern = LinePattern.None, fillPattern = FillPattern.Solid, extent = {{-50, 80}, {50, 100}}), Line(points = {{-50, 80}, {50, 80}}, color = {175, 175, 175}), Line(points = {{-50, -70}, {50, -70}}, color = {175, 175, 175}), Line(points = {{-50, -90}, {50, -90}}, color = {175, 175, 175}), Line(points = {{-50, 100}, {50, 100}}, color = {175, 175, 175}), Rectangle(fillColor = {175, 175, 175}, pattern = LinePattern.None, fillPattern = FillPattern.Backward, extent = {{-10, 80}, {10, -70}}), Line(points = {{-10, 80}, {-10, -70}}, color = {175, 175, 175}), Line(points = {{10, 80}, {10, -70}}, thickness = 0.5)}),
+    Documentation(info = "<html>
 <p>
 This is a wall model that should be used
 to simulate a wall between a zone and a prescribed temperature or prescribed heat flow rate boundary condition.
@@ -180,7 +148,7 @@ If all are disabled, an adiabatic boundary (<code>Q_flow=0</code>) is used.</p>
 Parameters <code>T_in_nom</code> and <code>Q_in_nom</code> are used for the calculation 
 of heat losses, when the temperature boundary condition and heat flow boundary condition are applied, respectively.  
 </p>
-</html>", revisions="<html>
+</html>", revisions = "<html>
 <ul>
 <li>
 November 7, 2024, by Anna Dell'Isola and Jelger Jansen:<br/>
@@ -188,6 +156,10 @@ Update calculation of transmission design losses.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1337\">#1337</a>
 </li>
 <li>
+Februari 18, 2024, by Filip Jorissen:<br/>
+Modifications for supporting trickle vents and interzonal airflow.
+</li>
+<li>
 April 26, 2020, by Filip Jorissen:<br/>
 Refactored <code>SolBus</code> to avoid many instances in <code>PropsBus</code>.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1131\">
@@ -244,4 +216,4 @@ Adjusted implementation for computing conservation of energy.
 </li>
 </ul>
 </html>"));
-end BoundaryWall;
+end BoundaryWall;
\ No newline at end of file
diff --git a/IDEAS/Buildings/Components/Examples/AirflowBoxModel.mo b/IDEAS/Buildings/Components/Examples/AirflowBoxModel.mo
new file mode 100644
index 0000000000..9fb212a6c7
--- /dev/null
+++ b/IDEAS/Buildings/Components/Examples/AirflowBoxModel.mo
@@ -0,0 +1,149 @@
+within IDEAS.Buildings.Components.Examples;
+model AirflowBoxModel
+  extends Modelica.Icons.Example;
+
+  Box_Sim Energy_Only(sim(interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None))
+    "Model not including a pressure network or n50 correction, the default IDEAS implementation."
+                                                                                                        annotation (Placement(transformation(rotation=0, extent={{-110,30},
+            {-50,90}})));
+  Box_Sim Energy_n50Corr(sim(interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None, unify_n50=true))
+    "Model not including a pressure network with n50 correction on building level."
+                                                                                                                           annotation (Placement(transformation(rotation=0,
+          extent={{-30,30},{30,90}})));
+  Box_Sim IAQ_1port(sim(interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.OnePort))
+    "Model including a 1-port pressure network."
+    annotation (Placement(transformation(rotation=0, extent={{-110,-90},{-50,
+            -30}})));
+  Box_Sim IAQ_1port_trickle(sim(interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.OnePort),
+      winD(
+      use_trickle_vent=true,
+      m_flow_nominal=0.0192656,
+      dp_nominal=2))
+    "Model including a 1-port pressure network and a tricklevent in the window"
+                     annotation (Placement(transformation(rotation=0, extent={{-30,-90},
+            {30,-30}})));
+  Box_Sim IAQ_2Port(
+    PerfectRad(G=10000000),
+    sim(interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts),
+    use_operable_window=true,
+    winD(
+      crackOrOperableDoor(nCom=2),
+      use_trickle_vent=false,
+      m_flow_nominal=0.0192656,
+      dp_nominal=2),
+    winD_position(y=0)) "Model including a 2-port pressure network."
+                        annotation (Placement(transformation(rotation=0, extent
+          ={{50,-90},{110,-30}})));
+
+protected
+  model Box_Sim
+    inner BoundaryConditions.SimInfoManager sim(interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts,
+        n50=1,
+      HPres=10)
+      annotation (Placement(transformation(extent={{-100,80},{-80,100}})));
+      parameter Boolean use_operable_window=false
+      "= true, to enable window control input";
+
+    IDEAS.Buildings.Components.RectangularZoneTemplate BoxModel(
+      T_start=291.15,
+      bouTypA=IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall,
+      bouTypB=IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall,
+      bouTypC=IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall,
+      bouTypD=IDEAS.Buildings.Components.Interfaces.BoundaryType.External,
+      bouTypFlo=IDEAS.Buildings.Components.Interfaces.BoundaryType.BoundaryWall,
+      bouTypCei=IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall,
+      nExtD=2,
+      hasWinC=true,
+      aziOpt=3,
+      l=5,
+      w=5,
+      h=5,
+      A_winA=2,
+      A_winB=2,
+      A_winC=2,
+      A_winD=2,
+      h_winA=2,
+      h_winB=2,
+      h_winC=2,
+      h_winD=2,
+      redeclare IDEAS.Buildings.Validation.Data.Constructions.LightRoof
+        conTypCei,
+      redeclare IDEAS.Buildings.Data.Constructions.FloorOnGround conTypFlo,
+      redeclare IDEAS.Buildings.Data.Glazing.Ins2Ar2020 glazingC,
+      redeclare IDEAS.Buildings.Data.Frames.AluminumInsulated fraTypC)
+      annotation (Placement(transformation(extent={{-80,40},{-60,60}})));
+
+    Modelica.Thermal.HeatTransfer.Celsius.FixedTemperature Tfix(T=18)
+      annotation (Placement(transformation(extent={{20,40},{0,60}})));
+    Modelica.Thermal.HeatTransfer.Components.ThermalConductor PerfectRad(G=1e6)
+      annotation (Placement(transformation(extent={{-40,26},{-20,46}})));
+    OuterWall outD(
+      redeclare IDEAS.Buildings.Data.Constructions.CavityWall constructionType,
+      incOpt=1,
+      aziOpt=2,
+      A=23) annotation (Placement(transformation(extent={{-106,46},{-94,66}})));
+    Window winD(
+      redeclare IDEAS.Buildings.Data.Glazing.Ins2Ar2020 glazing,
+      A=2,
+      hWin=2,
+      redeclare IDEAS.Buildings.Data.Frames.AluminumInsulated fraType,
+      use_operable_window=use_operable_window)
+      annotation (Placement(transformation(extent={{-106,22},{-94,42}})));
+    Modelica.Blocks.Sources.RealExpression winD_position(y=0) if use_operable_window
+      annotation (Placement(transformation(extent={{-140,0},{-120,20}})));
+
+  initial equation
+    BoxModel.gainCon.T=Tfix.port.T;
+
+  equation
+    connect(BoxModel.gainRad, PerfectRad.port_a) annotation (Line(points={{-60,
+            44},{-46,44},{-46,36},{-40,36}}, color={191,0,0}));
+    connect(PerfectRad.port_b, Tfix.port) annotation (Line(points={{-20,36},{-14,
+            36},{-14,50},{0,50}}, color={191,0,0}));
+    connect(outD.propsBus_a, BoxModel.proBusD[1]) annotation (Line(
+        points={{-95,58},{-88,58},{-88,42.5},{-79.6,42.5}},
+        color={255,204,51},
+        thickness=0.5));
+    connect(winD.propsBus_a, BoxModel.proBusD[2]) annotation (Line(
+        points={{-95,34},{-88,34},{-88,43.5},{-79.6,43.5}},
+        color={255,204,51},
+        thickness=0.5));
+    connect(winD_position.y, winD.y_window)
+      annotation (Line(points={{-119,10},{-102,10},{-102,22}}, color={0,0,127}));
+    connect(Tfix.port, BoxModel.gainCon) annotation (Line(points={{0,50},{-56,
+            50},{-56,47},{-60,47}}, color={191,0,0}));
+    annotation (Icon(graphics={Rectangle(
+            extent={{-60,60},{60,-60}},
+            lineColor={28,108,200},
+            fillColor={215,215,215},
+            fillPattern=FillPattern.Solid), Text(
+            extent={{-100,-60},{98,-100}},
+            textColor={28,108,200},
+            textString="%name"),
+          Rectangle(
+            extent={{-48,48},{48,-48}},
+            lineColor={28,108,200},
+            fillColor={255,255,255},
+            fillPattern=FillPattern.Solid)}));
+  end Box_Sim;
+  annotation (experiment(
+      StopTime=1209600,
+      Interval=3600.00288,
+      Tolerance=1e-07,
+      __Dymola_fixedstepsize=15,
+      __Dymola_Algorithm="Dassl"), Documentation(info="<html>
+<p>This model runs 5 possible interzonal airflow configurations of a simple box model. Temperature is kept constant at 18&deg; degrees </p>
+</html>", revisions="<html>
+<ul>
+<li>
+October 30, 2024 by Klaas De Jonge:<br/>
+First documented implementation.
+</li>
+</ul>
+</html>"),
+    Diagram(coordinateSystem(extent={{-120,-100},{120,100}})),
+    Icon(coordinateSystem(extent={{-100,-100},{100,100}})),
+        __Dymola_Commands(file=
+          "Resources/Scripts/Dymola/Buildings/Components/Examples/AirflowOptions.mos"
+        "Simulate and plot"));
+end AirflowBoxModel;
diff --git a/IDEAS/Buildings/Components/Examples/BuildingShadeExample.mo b/IDEAS/Buildings/Components/Examples/BuildingShadeExample.mo
index 21ba4fa51c..ae6c49ceb7 100644
--- a/IDEAS/Buildings/Components/Examples/BuildingShadeExample.mo
+++ b/IDEAS/Buildings/Components/Examples/BuildingShadeExample.mo
@@ -17,10 +17,6 @@ model BuildingShadeExample
     annotation (Placement(transformation(extent={{-24,20},{-14,40}})));
   inner BoundaryConditions.SimInfoManager sim
     annotation (Placement(transformation(extent={{-100,-12},{-80,8}})));
-protected
-  Interfaces.WeaBus                  weaBus(numSolBus=sim.numIncAndAziInBus)
-    annotation (Placement(transformation(extent={{-64,24},{-44,44}})));
-public
   Shading.None none(
     A_glazing=0,
     A_frame=0,
@@ -102,6 +98,10 @@ public
     azi=azi.k,
     t=0.02) "Horizontal fin model"
     annotation (Placement(transformation(extent={{14,20},{24,40}})));
+  Modelica.Blocks.Sources.Constant m_flow(k=0) "Mass flow rate" annotation (Placement(visible = true, transformation(origin = {0, -60}, extent = {{-100, 20}, {-80, 40}}, rotation = 0)));
+protected
+  Interfaces.WeaBus weaBus(numSolBus=sim.numIncAndAziInBus)
+    annotation (Placement(transformation(extent={{-64,24},{-44,44}})));
 equation
   connect(sim.weaBus, weaBus) annotation (Line(
       points={{-81,1},{-81,34},{-54,34}},
@@ -214,6 +214,18 @@ equation
   connect(buildingShade.angZen, horizontalFins.angZen)
     annotation (Line(points={{-21.5,22.6667},{-12,22.6667},{-12,22},{-1.5,22},{
           -1.5,22.6667},{16.5,22.6667}},        color={0,0,127}));
+  connect(m_flow.y, overhang.m_flow) annotation(
+    Line(points = {{-78, -30}, {-16, -30}, {-16, -20}, {-18, -20}}, color = {0, 0, 127}));
+  connect(m_flow.y, screen.m_flow) annotation(
+    Line(points = {{-78, -30}, {-18, -30}, {-18, -60}}, color = {0, 0, 127}));
+  connect(m_flow.y, sideFins.m_flow) annotation(
+    Line(points = {{-78, -30}, {-18, -30}, {-18, -100}}, color = {0, 0, 127}));
+  connect(m_flow.y, buildingShade.m_flow) annotation(
+    Line(points = {{-78, -30}, {-18, -30}, {-18, 20}}, color = {0, 0, 127}));
+  connect(m_flow.y, horizontalFins.m_flow) annotation(
+    Line(points = {{-78, -30}, {20, -30}, {20, 20}}, color = {0, 0, 127}));
+  connect(m_flow.y, none.m_flow) annotation(
+    Line(points = {{-78, -30}, {-16, -30}, {-16, 60}, {-18, 60}}, color = {0, 0, 127}));
   annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,
             -100},{100,100}})),
     experiment(
@@ -265,4 +277,4 @@ First implementation.
 This model demonstrates the impact of the BuildingShade component on the solar radiation.
 </p>
 </html>"));
-end BuildingShadeExample;
+end BuildingShadeExample;
\ No newline at end of file
diff --git a/IDEAS/Buildings/Components/Examples/CavityInternalWall.mo b/IDEAS/Buildings/Components/Examples/CavityInternalWall.mo
new file mode 100644
index 0000000000..cee13bee0f
--- /dev/null
+++ b/IDEAS/Buildings/Components/Examples/CavityInternalWall.mo
@@ -0,0 +1,30 @@
+within IDEAS.Buildings.Components.Examples;
+model CavityInternalWall
+  "Illustration of an internal wall with an operable cavity"
+  extends IDEAS.Buildings.Examples.ZoneExample(sim.interZonalAirFlowType = IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts, internalWall(hasCavity = true, use_y_doo = true));
+  Modelica.Blocks.Sources.Sine sine(amplitude = 0.5, f = 1 / 7200, offset = 0.5)  annotation(
+    Placement(visible = true, transformation(origin = {-90, 10}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));equation
+  connect(internalWall.y_doo, sine.y) annotation(
+    Line(points = {{-16, 6}, {-16, 10}, {-78, 10}}, color = {0, 0, 127}));
+
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+        coordinateSystem(preserveAspectRatio=false)),
+    experiment(
+      StopTime=1000000,
+      Tolerance=1e-06,
+      __Dymola_Algorithm="Lsodar"),
+    __Dymola_Commands(file="Resources/Scripts/Dymola/Buildings/Components/Examples/CavityInternalWall.mos"
+        "Simulate and plot"),
+    Documentation(info="<html>
+<p>
+This example contains an example use of a controllable cavity in an internal wall. Note that it requires TwoPorts interzonal air flow.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+July 9, 2023, by Filip Jorissen:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end CavityInternalWall;
\ No newline at end of file
diff --git a/IDEAS/Buildings/Components/Examples/RectangularZoneTemplate.mo b/IDEAS/Buildings/Components/Examples/RectangularZoneTemplate.mo
new file mode 100644
index 0000000000..ec8751a918
--- /dev/null
+++ b/IDEAS/Buildings/Components/Examples/RectangularZoneTemplate.mo
@@ -0,0 +1,59 @@
+within IDEAS.Buildings.Components.Examples;
+model RectangularZoneTemplate
+  "This example illustrates the use of the RectangularZoneTemplate to model a room or building"
+  extends Modelica.Icons.Example;
+  inner BoundaryConditions.SimInfoManager sim "Simulation information manager for climate data" annotation (Placement(transformation(extent={{-100,80},{-80,100}})));
+
+  IDEAS.Buildings.Components.RectangularZoneTemplate Zone(
+    h=2.7,
+    redeclare replaceable package Medium = IDEAS.Media.Air,
+    T_start=293.15,
+    bouTypA=IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall,
+    bouTypB=IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall,
+    bouTypC=IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall,
+    bouTypCei=IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall,
+    hasWinCei=false,
+    redeclare IDEAS.Buildings.Validation.Data.Constructions.LightRoof conTypCei,
+    bouTypFlo=IDEAS.Buildings.Components.Interfaces.BoundaryType.BoundaryWall,
+    redeclare IDEAS.Buildings.Validation.Data.Constructions.HeavyFloor
+      conTypFlo,
+    redeclare IDEAS.Buildings.Validation.Data.Constructions.HeavyWall conTypA,
+    redeclare IDEAS.Buildings.Validation.Data.Constructions.HeavyWall conTypB,
+    redeclare IDEAS.Buildings.Validation.Data.Constructions.HeavyWall conTypC,
+    redeclare IDEAS.Buildings.Validation.Data.Constructions.HeavyWall conTypD,
+    hasWinA=true,
+    fracA=0,
+    redeclare IDEAS.Buildings.Validation.Data.Glazing.GlaBesTest glazingA,
+    redeclare IDEAS.Buildings.Components.Shading.Interfaces.ShadingProperties
+      shaTypA,
+    hasWinB=false,
+    hasWinC=false,
+    hasWinD=false,
+    bouTypD=IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall,
+    aziA=IDEAS.Types.Azimuth.S,
+    l=8,
+    w=6,
+    A_winA=12)
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+        coordinateSystem(preserveAspectRatio=false)),
+    experiment(
+      StopTime=604800,
+      Tolerance=1e-006,
+      __Dymola_Algorithm="Lsodar"),
+    Documentation(info="<html>
+<p>
+This example illustrates the use of the RectangularZoneTemplate to model a room or building.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+January 2022 by Klaas De Jonge:<br/>
+First implementation
+</li>
+</ul>
+</html>"),
+    __Dymola_Commands(file(inherit=true) = "Resources/Scripts/Dymola/Buildings/Components/Examples/RectangularZoneTemplate.mos"
+        "Simulate and Plot"));
+end RectangularZoneTemplate;
diff --git a/IDEAS/Buildings/Components/Examples/RectangularZoneTemplateOnePort.mo b/IDEAS/Buildings/Components/Examples/RectangularZoneTemplateOnePort.mo
new file mode 100644
index 0000000000..d1026eb9b1
--- /dev/null
+++ b/IDEAS/Buildings/Components/Examples/RectangularZoneTemplateOnePort.mo
@@ -0,0 +1,27 @@
+within IDEAS.Buildings.Components.Examples;
+model RectangularZoneTemplateOnePort
+  "Example that compares a zone with internal wall and without internal wall"
+  extends Modelica.Icons.Example;
+  extends IDEAS.Buildings.Components.Examples.RectangularZoneTemplate(sim(
+        interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.OnePort));
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+        coordinateSystem(preserveAspectRatio=false)),
+    experiment(
+      StopTime=604800,
+      Tolerance=1e-006,
+      __Dymola_Algorithm="Lsodar"),
+    Documentation(info="<html>
+<p>
+This example illustrates the use of the RectangularZoneTemplate to model a room or building with the OnePort interzonal airflow implementation activated
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+2021 by Klaas de Jonge:<br/>
+First implementation
+</li>
+</ul>
+</html>"),
+    __Dymola_Commands(file(inherit=true) = "Resources/Scripts/Dymola/Buildings/Components/Examples/RectangularZoneTemplateOnePort.mos"
+        "Simulate and Plot"));
+end RectangularZoneTemplateOnePort;
diff --git a/IDEAS/Buildings/Components/Examples/RectangularZoneTemplateTwoPort.mo b/IDEAS/Buildings/Components/Examples/RectangularZoneTemplateTwoPort.mo
new file mode 100644
index 0000000000..6f767b745b
--- /dev/null
+++ b/IDEAS/Buildings/Components/Examples/RectangularZoneTemplateTwoPort.mo
@@ -0,0 +1,27 @@
+within IDEAS.Buildings.Components.Examples;
+model RectangularZoneTemplateTwoPort
+  "Example that compares a zone with internal wall and without internal wall"
+  extends Modelica.Icons.Example;
+  extends IDEAS.Buildings.Components.Examples.RectangularZoneTemplate(  sim(
+        interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts));
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+        coordinateSystem(preserveAspectRatio=false)),
+    experiment(
+      StopTime=604800,
+      Tolerance=1e-006,
+      __Dymola_Algorithm="Lsodar"),
+    Documentation(info="<html>
+<p>
+This example illustrates the use of the RectangularZoneTemplate to model a room or building with the TwoPort interzonal airflow implementation activated
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+2021 by Klaas de Jonge:<br/>
+First implementation
+</li>
+</ul>
+</html>"),
+    __Dymola_Commands(file(inherit=true) = "Resources/Scripts/Dymola/Buildings/Components/Examples/RectangularZoneTemplateTwoPort.mos"
+        "Simulate and Plot"));
+end RectangularZoneTemplateTwoPort;
diff --git a/IDEAS/Buildings/Components/Examples/TwoStoreyBoxes.mo b/IDEAS/Buildings/Components/Examples/TwoStoreyBoxes.mo
new file mode 100644
index 0000000000..3eda9a495e
--- /dev/null
+++ b/IDEAS/Buildings/Components/Examples/TwoStoreyBoxes.mo
@@ -0,0 +1,94 @@
+within IDEAS.Buildings.Components.Examples;
+model TwoStoreyBoxes "Model with two zones on different floors, one zone above the other, with a large opening between these zones and stack-effect airflow enabled."
+  extends Modelica.Icons.Example;
+
+  inner BoundaryConditions.SimInfoManager sim(interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts,n50=1) annotation (Placement(transformation(extent={{-100,80},{-80,100}})));
+
+  IDEAS.Buildings.Components.RectangularZoneTemplate Level(
+    hFloor=5,
+    T_start=291.15,
+    bouTypA=IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall,
+    bouTypB=IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall,
+    bouTypC=IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall,
+    bouTypD=IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall,
+    bouTypFlo=IDEAS.Buildings.Components.Interfaces.BoundaryType.InternalWall,
+    bouTypCei=IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall,
+    aziOpt=3,
+    l=5,
+    w=5,
+    h=5,
+    A_winA=2,
+    h_winA=2,
+    redeclare Validation.Data.Constructions.LightRoof conTypCei,
+    redeclare IDEAS.Buildings.Data.Constructions.ConcreteSlab conTypFlo,
+    hasCavityFlo=true)
+    annotation (Placement(transformation(extent={{-40,20},{-20,40}})));
+
+  IDEAS.Buildings.Components.RectangularZoneTemplate Groundfloor(
+    T_start=291.15,
+    bouTypA=IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall,
+    bouTypB=IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall,
+    bouTypC=IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall,
+    bouTypD=IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall,
+    bouTypFlo=IDEAS.Buildings.Components.Interfaces.BoundaryType.BoundaryWall,
+    bouTypCei=IDEAS.Buildings.Components.Interfaces.BoundaryType.External,
+    aziOpt=3,
+    l=5,
+    w=5,
+    h=5,
+    A_winA=2,
+    h_winA=2,
+    redeclare Validation.Data.Constructions.LightRoof conTypCei,
+    redeclare Data.Constructions.FloorOnGround conTypFlo)
+    annotation (Placement(transformation(extent={{-40,-40},{-20,-20}})));
+
+  Modelica.Thermal.HeatTransfer.Celsius.FixedTemperature Tfix(T=18)
+    annotation (Placement(transformation(extent={{62,20},{42,40}})));
+
+  Modelica.Thermal.HeatTransfer.Components.ThermalConductor PerfectRadLevel(G=1e6)
+    annotation (Placement(transformation(extent={{0,6},{20,26}})));
+  Modelica.Thermal.HeatTransfer.Components.ThermalConductor PerfectRadGround(G=1e6)
+    annotation (Placement(transformation(extent={{0,-52},{20,-32}})));
+initial equation
+  Level.gainCon.T=Tfix.port.T;
+  Groundfloor.gainCon.T=Tfix.port.T;
+
+equation
+  connect(Groundfloor.proBusCei, Level.proBusFlo) annotation (Line(
+      points={{-30.2,-24},{-30,-22},{-30,24}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(Tfix.port, Level.gainCon) annotation (Line(points={{42,30},{-16,30},{-16,
+          27},{-20,27}}, color={191,0,0}));
+  connect(PerfectRadLevel.port_a, Level.gainRad) annotation (Line(points={{0,16},
+          {-14,16},{-14,24},{-20,24}}, color={191,0,0}));
+  connect(PerfectRadLevel.port_b, Tfix.port) annotation (Line(points={{20,16},{32,
+          16},{32,30},{42,30}}, color={191,0,0}));
+  connect(PerfectRadGround.port_a, Groundfloor.gainRad) annotation (Line(points
+        ={{0,-42},{-14,-42},{-14,-36},{-20,-36}}, color={191,0,0}));
+  connect(Tfix.port, PerfectRadGround.port_b) annotation (Line(points={{42,30},{
+          38,30},{38,-42},{20,-42}}, color={191,0,0}));
+  connect(Tfix.port, Groundfloor.gainCon) annotation (Line(points={{42,30},{38,30},
+          {38,-26},{-14,-26},{-14,-33},{-20,-33}}, color={191,0,0}));
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+        coordinateSystem(preserveAspectRatio=false)),
+    experiment(
+      StopTime=1209600,
+      Interval=3600.00288,
+      Tolerance=1e-12,
+      __Dymola_fixedstepsize=15,
+      __Dymola_Algorithm="Dassl"),
+    Documentation(revisions="<html>
+<ul>
+<li>
+October 30, 2024, by Klaas De Jonge:<br/>
+First implementation
+</li>
+</ul>
+</html>", info="<html>
+<p>Model with two zones on different floors, one zone above the other, with a large opening between these zones and stack-effect airflow enabled.</p>
+</html>"),
+    __Dymola_Commands(file=
+          "Resources/Scripts/Dymola/Buildings/Examples/TwoStoreyBoxes.mos"
+        "Simulate and Plot"));
+end TwoStoreyBoxes;
diff --git a/IDEAS/Buildings/Components/Examples/WallUnitTest.mo b/IDEAS/Buildings/Components/Examples/WallUnitTest.mo
index b9e3747d81..94f3331763 100644
--- a/IDEAS/Buildings/Components/Examples/WallUnitTest.mo
+++ b/IDEAS/Buildings/Components/Examples/WallUnitTest.mo
@@ -1,7 +1,9 @@
 within IDEAS.Buildings.Components.Examples;
 model WallUnitTest "Unit test for verifying results for all wall components"
+  package Medium = IDEAS.Media.Air;
   extends Modelica.Icons.Example;
   BoundaryWall boundaryWall(
+    redeclare package Medium=Medium,
     redeclare Data.Constructions.CavityWall constructionType,
     inc=IDEAS.Types.Tilt.Wall,
     azi=IDEAS.Types.Azimuth.S,
@@ -9,6 +11,7 @@ model WallUnitTest "Unit test for verifying results for all wall components"
     use_T_in=true) "Boundary wall example"
     annotation (Placement(transformation(extent={{-36,60},{-26,80}})));
   InternalWall internalWall(
+    redeclare package Medium=Medium,
     inc=IDEAS.Types.Tilt.Wall,
     azi=IDEAS.Types.Azimuth.S,
     A=2,
@@ -17,6 +20,7 @@ model WallUnitTest "Unit test for verifying results for all wall components"
     "Internal wall example"
     annotation (Placement(transformation(extent={{-36,20},{-24,40}})));
   OuterWall outerWall(
+    redeclare package Medium=Medium,
     inc=IDEAS.Types.Tilt.Wall,
     azi=IDEAS.Types.Azimuth.S,
     A=2,
@@ -24,28 +28,27 @@ model WallUnitTest "Unit test for verifying results for all wall components"
     "Outer wall example"
     annotation (Placement(transformation(extent={{-36,-20},{-26,0}})));
   SlabOnGround slabOnGround(
+    redeclare package Medium=Medium,
     inc=IDEAS.Types.Tilt.Floor,
     azi=IDEAS.Types.Azimuth.S,
     A=2,
     redeclare Validation.Data.Constructions.HeavyFloor constructionType)
     "Slab on ground example"
     annotation (Placement(transformation(extent={{-36,-60},{-26,-40}})));
-public
-  inner BoundaryConditions.SimInfoManager sim
-    annotation (Placement(transformation(extent={{-100,80},{-80,100}})));
-public
+  inner BoundaryConditions.SimInfoManager sim(interZonalAirFlowType = IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts) annotation(
+    Placement(transformation(extent = {{-100, 80}, {-80, 100}})));
   Modelica.Blocks.Sources.Constant Tconst(k=300)
     "Constant temperature boundary condition"
     annotation (Placement(transformation(extent={{-80,60},{-60,80}})));
-  Interfaces.DummyConnection dummyConnection(isZone=true)
+  Interfaces.DummyConnection dummyConnection(redeclare package Medium=Medium, isZone=true)
     annotation (Placement(transformation(extent={{20,60},{0,80}})));
-  Interfaces.DummyConnection dummyConnection1(isZone=true)
+  Interfaces.DummyConnection dummyConnection1(redeclare package Medium=Medium, isZone=true)
     annotation (Placement(transformation(extent={{20,20},{0,40}})));
-  Interfaces.DummyConnection dummyConnection2(isZone=true)
+  Interfaces.DummyConnection dummyConnection2(redeclare package Medium=Medium, isZone=true)
     annotation (Placement(transformation(extent={{20,-20},{0,0}})));
-  Interfaces.DummyConnection dummyConnection3(isZone=true)
+  Interfaces.DummyConnection dummyConnection3(redeclare package Medium=Medium, isZone=true)
     annotation (Placement(transformation(extent={{20,-60},{0,-40}})));
-  Interfaces.DummyConnection dummyConnection4(isZone=true)
+  Interfaces.DummyConnection dummyConnection4(redeclare package Medium=Medium, isZone=true)
     annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
 equation
   connect(Tconst.y, boundaryWall.T) annotation (Line(points={{-59,70},{-48,70},
@@ -89,6 +92,10 @@ For windows see other examples.
 </html>", revisions="<html>
 <ul>
 <li>
+January 2, 2023, by Filip Jorissen:<br/>
+Added support for stack effect airflow.
+</li>
+<li>
 July 19, 2016, by Filip Jorissen:<br/>
 Revised implementation that uses <code>DummyConnections</code>.
 </li>
diff --git a/IDEAS/Buildings/Components/Examples/WindowThermalBridge.mo b/IDEAS/Buildings/Components/Examples/WindowThermalBridge.mo
index 9810166a4f..bd26fb8c34 100644
--- a/IDEAS/Buildings/Components/Examples/WindowThermalBridge.mo
+++ b/IDEAS/Buildings/Components/Examples/WindowThermalBridge.mo
@@ -39,7 +39,8 @@ model WindowThermalBridge "Comparison of three window thermal bridge options"
     redeclare parameter IDEAS.Buildings.Data.Glazing.Ins2 glazing,
     inc=IDEAS.Types.Tilt.Wall,
     azi=IDEAS.Types.Azimuth.S,
-    redeclare IDEAS.Buildings.Data.Frames.PvcLineLoss fraType(briTyp(len=4)))
+    briLen=4,
+    redeclare IDEAS.Buildings.Data.Frames.PvcLineLoss fraType)
     "Window with line losses"
     annotation (Placement(transformation(extent={{-54,-60},{-44,-40}})));
 equation
diff --git a/IDEAS/Buildings/Components/Examples/package.order b/IDEAS/Buildings/Components/Examples/package.order
index 156f08f61f..55cd027391 100644
--- a/IDEAS/Buildings/Components/Examples/package.order
+++ b/IDEAS/Buildings/Components/Examples/package.order
@@ -1,5 +1,7 @@
+AirflowBoxModel
 BeamRadiationOnFloor
 BuildingShadeExample
+CavityInternalWall
 CavityWalls
 FacadeShadeExample
 HorizontalFinExample
@@ -9,7 +11,11 @@ RectangularZone
 RectangularZoneEmbedded
 RectangularZoneExternalSurfaces
 RectangularZoneRedeclarationWindows
+RectangularZoneTemplate
+RectangularZoneTemplateOnePort
+RectangularZoneTemplateTwoPort
 ScalingWindow
+TwoStoreyBoxes
 WallUnitTest
 WindowDynamics
 WindowLinearisation
diff --git a/IDEAS/Buildings/Components/Interfaces/DummyConnection.mo b/IDEAS/Buildings/Components/Interfaces/DummyConnection.mo
index 742bf741e1..b4659cc376 100644
--- a/IDEAS/Buildings/Components/Interfaces/DummyConnection.mo
+++ b/IDEAS/Buildings/Components/Interfaces/DummyConnection.mo
@@ -3,6 +3,8 @@ model DummyConnection "Source generator/sink for propsbus"
   parameter Boolean isZone = false "Set to true when connecting to a surface";
   parameter Real A=1 "Surface area"
     annotation(Dialog(enable=not isZone));
+  replaceable package Medium =
+    Modelica.Media.Interfaces.PartialMedium "Medium in the component";
   parameter Modelica.Units.SI.HeatFlowRate surfCon=0
     "Fixed heat flow rate for surfCon" annotation (Dialog(enable=not isZone));
   parameter Modelica.Units.SI.HeatFlowRate iSolDir=0
@@ -12,12 +14,13 @@ model DummyConnection "Source generator/sink for propsbus"
   parameter Modelica.Units.SI.Temperature T=293.15
     "Fixed temperature for surfRad, or zone when isZone";
 
-  outer IDEAS.BoundaryConditions.SimInfoManager sim
-    annotation (Placement(transformation(extent={{-100,20},{-80,40}})));
+  outer IDEAS.BoundaryConditions.SimInfoManager sim annotation (Placement(transformation(extent={{-100,20},{-80,40}})));
   IDEAS.Buildings.Components.Interfaces.ZoneBus zoneBus(
-    redeclare package Medium = IDEAS.Media.Air,
+    redeclare package Medium = Medium,
+    numIncAndAziInBus=sim.numIncAndAziInBus,
     outputAngles=sim.outputAngles,
-    numIncAndAziInBus=sim.numIncAndAziInBus)
+    use_port_1 = sim.interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None,
+    use_port_2 = sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts)
     annotation (Placement(transformation(extent={{80,-22},{120,18}})));
   Modelica.Thermal.HeatTransfer.Sources.FixedHeatFlow prescribedHeatFlow[3](
       Q_flow={surfCon,iSolDif,iSolDir})
@@ -26,7 +29,7 @@ model DummyConnection "Source generator/sink for propsbus"
   Modelica.Blocks.Sources.Constant area(k=A) if not isZone
     annotation (Placement(transformation(extent={{0,40},{20,60}})));
   Modelica.Blocks.Sources.Constant eps(k=0.88) if not isZone
-    annotation (Placement(transformation(extent={{0,80},{20,100}})));
+    annotation (Placement(visible = true, transformation(origin = {0, 0}, extent = {{0, 80}, {20, 100}}, rotation = 0)));
 
   Modelica.Blocks.Sources.Constant QTra(k=A) if not isZone
     annotation (Placement(transformation(extent={{0,0},{20,20}})));
@@ -54,8 +57,13 @@ model DummyConnection "Source generator/sink for propsbus"
     annotation (Placement(transformation(extent={{-80,-100},{-60,-80}})));
   Modelica.Blocks.Sources.BooleanConstant custom_q50(k=false) if not isZone
     annotation (Placement(transformation(extent={{-80,-130},{-60,-110}})));
+  Modelica.Blocks.Sources.Constant hZone(k = 0.88) if isZone "Zone height" annotation(
+    Placement(visible = true, transformation(origin = {-42, -16}, extent = {{0, 80}, {20, 100}}, rotation = 0)));
+  IDEAS.Fluid.Sources.Boundary_pT bou(redeclare package Medium= IDEAS.Media.Air, nPorts = 3) if isZone  annotation(
+    Placement(visible = true, transformation(origin = {-30, 40}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   Modelica.Blocks.Sources.Constant TRefZon(k=T)      if isZone
     annotation (Placement(transformation(extent={{-40,60},{-20,80}})));
+
 equation
   connect(prescribedHeatFlow[1].port, zoneBus.surfCon) annotation (Line(
       points={{-50,20},{62,20},{62,-1.9},{100.1,-1.9}},
@@ -70,13 +78,11 @@ equation
       color={191,0,0},
       smooth=Smooth.None));
   connect(eps.y, zoneBus.epsLw) annotation (Line(
-      points={{21,90},{100.1,90},{100.1,-1.9}},
-      color={0,0,127},
-      smooth=Smooth.None));
+      points = {{21, 90}, {100.1, 90}, {100.1, -1.9}},
+      color={0,0,127}));
   connect(eps.y, zoneBus.epsSw) annotation (Line(
-      points={{21,90},{100,90},{100,34},{100.1,34},{100.1,-1.9}},
-      color={0,0,127},
-      smooth=Smooth.None));
+      points = {{21, 90}, {100, 90}, {100, 34}, {100.1, 34}, {100.1, -1.9}},
+      color={0,0,127}));
   connect(area.y, zoneBus.area) annotation (Line(
       points={{21,50},{100.1,50},{100.1,-1.9}},
       color={0,0,127},
@@ -134,6 +140,16 @@ equation
   connect(custom_q50.y, zoneBus.use_custom_q50) annotation (Line(points={{-59,
           -120},{100.1,-120},{100.1,-1.9}},
                                      color={255,0,255}));
+  connect(hZone.y, zoneBus.hzone) annotation(
+    Line(points = {{-20, 74}, {100, 74}, {100, -2}}, color = {0, 0, 127}));
+  connect(hZone.y, zoneBus.hfloor) annotation(
+    Line(points = {{-20, 74}, {100, 74}, {100, -2}}, color = {0, 0, 127}));
+  connect(bou.ports[3], zoneBus.port_3) annotation(
+    Line(points = {{-20, 40}, {100, 40}, {100, -2}}, color = {255, 204, 51}));
+  connect(bou.ports[2], zoneBus.port_2) annotation(
+    Line(points = {{-20, 40}, {100, 40}, {100, -2}}, color = {255, 204, 51}));
+  connect(bou.ports[1], zoneBus.port_1) annotation(
+    Line(points = {{-20, 40}, {100, 40}, {100, -2}}, color = {255, 204, 51}));
   connect(TRefZon.y, zoneBus.TRefZon) annotation (Line(points={{-19,70},{100.1,70},
           {100.1,-1.9}}, color={0,0,127}));
    annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,
@@ -154,6 +170,10 @@ Assign value for <code>TRefZon</code> in the bus connector.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1337\">#1337</a>
 </li>
 <li>
+January 2, 2023, by Filip Jorissen:<br/>
+Added support for stack effect airflow.
+</li>
+<li>
 May 23, 2022, by Filip Jorissen:<br/>
 Added missing medium declaration.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1254\">
diff --git a/IDEAS/Buildings/Components/Interfaces/IntegerConnector.mo b/IDEAS/Buildings/Components/Interfaces/IntegerConnector.mo
new file mode 100644
index 0000000000..c252b46381
--- /dev/null
+++ b/IDEAS/Buildings/Components/Interfaces/IntegerConnector.mo
@@ -0,0 +1,5 @@
+within IDEAS.Buildings.Components.Interfaces;
+connector IntegerConnector =
+                    Integer "Integer connector without input/output specifier"
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+        coordinateSystem(preserveAspectRatio=false)));
\ No newline at end of file
diff --git a/IDEAS/Buildings/Components/Interfaces/PartialSurface.mo b/IDEAS/Buildings/Components/Interfaces/PartialSurface.mo
index 32877ce922..fab853534d 100644
--- a/IDEAS/Buildings/Components/Interfaces/PartialSurface.mo
+++ b/IDEAS/Buildings/Components/Interfaces/PartialSurface.mo
@@ -1,31 +1,32 @@
 within IDEAS.Buildings.Components.Interfaces;
 partial model PartialSurface "Partial model for building envelope component"
-
+  
   outer IDEAS.BoundaryConditions.SimInfoManager sim
     "Simulation information manager for climate data"
-    annotation (Placement(transformation(extent={{30,-100},{50,-80}})));
+    annotation (Placement(visible = true, transformation(origin = {50, 180}, extent = {{30, -100}, {50, -80}}, rotation = 0)));
   parameter Integer incOpt = 4
     "Tilt angle option from simInfoManager, or custom using inc"
     annotation(choices(__Dymola_radioButtons=true, choice=1 "Wall", choice=2 "Floor", choice=3 "Ceiling", choice=4 "Custom"));
-  parameter Modelica.Units.SI.Angle inc=sim.incOpts[incOpt]
+  parameter Modelica.Units.SI.Angle inc = sim.incOpts[incOpt]
     "Custom inclination (tilt) angle of the wall, default wall"
-    annotation (Dialog(enable=incOpt == 4));
+    annotation(Dialog(enable=incOpt==4));
   parameter Integer aziOpt = 5
     "Azimuth angle option from simInfoManager, or custom using azi"
     annotation(choices(__Dymola_radioButtons=true, choice=1 "South", choice=2 "West", choice=3 "North", choice=4 "East", choice=5 "Custom"));
   parameter Modelica.Units.SI.Angle azi=sim.aziOpts[aziOpt]
     "Custom azimuth angle of the wall, default south"
-    annotation (Dialog(enable=aziOpt == 5));
-  parameter Modelica.Units.SI.Area A "Component surface area";
+    annotation(Dialog(enable=aziOpt==5));
+  parameter Modelica.Units.SI.Area A
+    "Component surface area";
   parameter Real nWin = 1
     "Use this factor to scale the component to nWin identical components"
     annotation(Evaluate=true);
   parameter Modelica.Units.SI.Power QTra_design
     "Design heat losses at reference temperature of the boundary space"
-    annotation (Dialog(group="Design power", tab="Advanced"));
+    annotation (Dialog(group="Design power",tab="Advanced"));
   parameter Modelica.Units.SI.Temperature T_start=293.15
     "Start temperature for each of the layers"
-    annotation (Dialog(tab="Dynamics", group="Initial condition"));
+	annotation (Dialog(tab="Dynamics", group="Initial condition"));
   parameter Boolean linIntCon_a=sim.linIntCon
     "= true, if convective heat transfer should be linearised"
     annotation (Dialog(tab="Convection"));
@@ -40,19 +41,25 @@ partial model PartialSurface "Partial model for building envelope component"
     "Medium in the component"
     annotation(Dialog(enable=use_custom_q50,tab="Airflow", group="Airtightness"));
   parameter Boolean use_custom_q50=false
-    "set to true to disable the default q50 computation and to assign a custom q50 value"
-    annotation (Dialog(tab="Airflow", group="Airtightness"), Evaluate=true);
-  parameter Real custom_q50 = 2
-    "Envelope air tightness"
+    "check to disable the default q50 computation and to assign a custom q50 value"
+    annotation (choices(checkBox=true),Dialog(tab="Airflow", group="Airtightness"), Evaluate=true);
+  parameter Real custom_q50(unit="m3/(h.m2)") = 2
+    "Surface air tightness"
     annotation (Dialog(enable=use_custom_q50,tab="Airflow", group="Airtightness"));
-  final parameter Real q50_internal(fixed=false)
-    "Envelope air tightness";
+  final parameter Real q50_internal(unit="m3/(h.m2)",fixed=false)
+    "Surface air tightness";
+
+  final parameter Modelica.Units.SI.Length hzone_a( fixed=false);//connected with propsbus in inital equation
+  final parameter Modelica.Units.SI.Length hAbs_floor_a( fixed=false);
+  parameter Modelica.Units.SI.Length hVertical=if IDEAS.Utilities.Math.Functions.isAngle(inc,IDEAS.Types.Tilt.Floor) or IDEAS.Utilities.Math.Functions.isAngle(inc,IDEAS.Types.Tilt.Ceiling) then 0 else hzone_a "Vertical surface height, height of the surface projected to the vertical, 0 for floors and ceilings" annotation(Evaluate=true);
+  parameter Modelica.Units.SI.Length hRelSurfBot_a= if IDEAS.Utilities.Math.Functions.isAngle(inc,IDEAS.Types.Tilt.Ceiling) then hzone_a else 0  "Height between the lowest point of the surface (bottom) and the floor level of the zone connected at propsBus_a"annotation(Evaluate=true);
+  final parameter Modelica.Units.SI.Length Habs_surf=hAbs_floor_a+hRelSurfBot_a+(hVertical/2)  "Absolute height of the middle of the surface, can be used to check the heights after initialisation";
 
   IDEAS.Buildings.Components.Interfaces.ZoneBus propsBus_a(
     redeclare final package Medium = Medium,
     numIncAndAziInBus=sim.numIncAndAziInBus, outputAngles=sim.outputAngles,
-    final use_port_1=sim.interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None,
-    final use_port_2=sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts)
+    final use_port_1=sim.use_port_1,
+    final use_port_2=sim.use_port_2)
                                              "If inc = Floor, then propsbus_a should be connected to the zone above this floor.
     If inc = ceiling, then propsbus_a should be connected to the zone below this ceiling.
     If component is an outerWall, porpsBus_a should be connect to the zone."
@@ -81,44 +88,36 @@ partial model PartialSurface "Partial model for building envelope component"
     "Multilayer component for simulating walls, windows and other surfaces"
     annotation (Placement(transformation(extent={{10,-10},{-10,10}})));
 
-  PowerLaw_q50 res1(
-  redeclare package Medium = Medium,
-    final forceErrorControlOnFlow=false,
-    m=0.65,
-    A=if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts
-         then A/2 else A,
-    final q50=q50_internal)
-               if add_cracks and
-       sim.interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None
-    "Middle or bottom crack "
-    annotation (Placement(transformation(extent={{20,-50},{40,-30}})));
-  PowerLaw_q50 res2(
-  redeclare package Medium = Medium,
-    final forceErrorControlOnFlow=false,
-    m=0.65,
-    A=A/2,
-    final q50=q50_internal)
-               if add_cracks and
-       sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts
-    "Top crack"
-    annotation (Placement(transformation(extent={{20,-70},{40,-50}})));
-
-
   Q50_parameterToConnector q50_zone(
     q50_inp=q50_internal,
     v50_surf=q50_internal*A,
     use_custom_q50=use_custom_q50)
     annotation (Placement(transformation(extent={{80,-60},{100,-40}})));
-
-
-
+  IDEAS.Airflow.Multizone.CrackOrOperableDoor crackOrOperableDoor(
+    A_q50 = A,
+    q50=q50_internal,
+    redeclare package Medium = Medium,
+    h_a1=0.25*hVertical,
+    h_b2=- 0.25*hVertical,
+    h_b1=-0.5*hzone_a + 0.75*hVertical + hRelSurfBot_a,
+    h_a2=-0.5*hzone_a + 0.25*hVertical + hRelSurfBot_a,
+    interZonalAirFlowType = sim.interZonalAirFlowType,
+    inc=inc)                                           if add_door and sim.interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None annotation (
+    Placement(visible = true, transformation(origin = {30, -52}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+  Modelica.Blocks.Sources.RealExpression AExp(y = A) "Area expression" annotation(
+    Placement(transformation(origin = {0, 20}, extent = {{-10, -10}, {10, 10}})));
 protected
-  parameter Boolean add_cracks = true
-    "Add cracks";
-  final parameter Modelica.Units.SI.Angle aziInt=if aziOpt == 5 then azi else
-      sim.aziOpts[aziOpt] "Azimuth angle";
-  final parameter Modelica.Units.SI.Angle incInt=if incOpt == 4 then inc else
-      sim.incOpts[incOpt] "Inclination angle";
+  parameter Boolean add_door = true "Option to disable crackOrOperableDoor";
+  final parameter Modelica.Units.SI.Angle aziInt=
+    if aziOpt==5
+    then azi
+    else sim.aziOpts[aziOpt]
+      "Azimuth angle";
+  final parameter Modelica.Units.SI.Angle incInt=
+    if incOpt==4
+    then inc
+    else sim.incOpts[incOpt]
+      "Inclination angle";
   Modelica.Blocks.Sources.RealExpression QDesign(y=QTra_design);
 
   Modelica.Blocks.Sources.RealExpression aziExp(y=aziInt)
@@ -142,6 +141,8 @@ protected
     "Gain for all propsBus variable to represent nWin surfaces instead of 1"
     annotation (Placement(transformation(extent={{70,6},{88,36}})));
   IDEAS.Buildings.Components.Interfaces.ZoneBus propsBusInt(
+    port_1(m_flow(final min=0, final max=0)),
+    port_2(m_flow(final min=0, final max=0)),
     redeclare final package Medium = Medium,
     numIncAndAziInBus=sim.numIncAndAziInBus,
     outputAngles=sim.outputAngles,
@@ -159,86 +160,6 @@ protected
     "Block that contributes surface area to the siminfomanager"
     annotation (Placement(transformation(extent={{80,-100},{100,-80}})));
 
-model PowerLaw_q50
-
-    extends IDEAS.Airflow.Multizone.Coefficient_V_flow(
-      m=0.5,
-      C=A*coeff); //mass flow form of orifice equation
-
-    parameter Modelica.Units.SI.Area A "Surface area";
-  parameter Real q50(unit="m3/(h.m2)")
-    "Leaked volume flow rate per unit A at 50Pa";
-  final parameter Real coeff = (q50/3600)/(50^m)
-    "Conversion coefficient";
-
-  annotation (Icon(graphics={
-        Text(
-          extent={{-100,100},{-40,60}},
-          lineColor={28,108,200},
-          fillColor={215,215,215},
-          fillPattern=FillPattern.None,
-          textString="q50"),
-        Rectangle(
-          extent={{-20,80},{20,-80}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={0,0,0},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-60,58},{64,46}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-94,4},{-58,-8}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={0,127,0},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{54,6},{106,-8}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={0,127,0},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-64,2},{-46,-6}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={0,127,0},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-82,4},{-46,-8}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={0,127,0},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-58,36},{66,24}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-58,-54},{66,-66}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-56,-24},{68,-36}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-38,4},{40,-8}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid)}));
-end PowerLaw_q50;
 
 model Q50_parameterToConnector "Converts parameter values into connectors for propsBus"
   extends Modelica.Blocks.Icons.Block;
@@ -259,15 +180,20 @@ model Q50_parameterToConnector "Converts parameter values into connectors for pr
   Modelica.Blocks.Interfaces.BooleanOutput using_custom_q50 = use_custom_q50
     "Output indicating whether a custom q50 value should be considered by the zone"
    annotation (Placement(transformation(extent={{-100,-30},{-120,-10}})));
+  Modelica.Blocks.Interfaces.RealInput dummy_h[2]
+      "Dummy connectors for hzone and hfloor"
+      annotation (Placement(transformation(extent={{-126,14},{-86,54}})));
   annotation (Icon(graphics={Rectangle(
           extent={{-82,80},{78,-80}},
           lineColor={28,108,200},
           fillColor={145,167,175},
           fillPattern=FillPattern.Forward)}));
 end Q50_parameterToConnector;
+
 initial equation
   q50_internal=if use_custom_q50 then custom_q50 else q50_zone.q50_zone;
-
+  hzone_a=propsBusInt.hzone;
+  hAbs_floor_a=propsBusInt.hfloor;
 equation
   connect(prescribedHeatFlowE.port, propsBusInt.E);
   connect(Qgai.y,prescribedHeatFlowQgai. Q_flow);
@@ -300,13 +226,6 @@ equation
       string="%second",
       index=1,
       extent={{6,3},{6,3}}));
-  connect(layMul.area, propsBusInt.area) annotation (Line(
-      points={{0,10},{0,19.91},{56.09,19.91}},
-      color={0,0,127},
-      smooth=Smooth.None), Text(
-      string="%second",
-      index=1,
-      extent={{6,3},{6,3}}));
   connect(incExp.y, propsBusInt.inc);
   connect(aziExp.y, propsBusInt.azi);
   connect(propsBus_a, gain.propsBus_b) annotation (Line(
@@ -317,11 +236,7 @@ equation
       points={{70,20.2105},{60,20.2105},{60,20},{56,20}},
       color={255,204,51},
       thickness=0.5));
-  connect(res1.port_b, propsBusInt.port_1) annotation (Line(points={{40,-40},{50,
-          -40},{50,19.91},{56.09,19.91}}, color={0,127,255}));
-  connect(res2.port_b, propsBusInt.port_2) annotation (Line(points={{40,-60},{50,
-          -60},{50,19.91},{56.09,19.91}}, color={0,127,255}));
-  connect(setArea.areaPort, sim.areaPort);
+   connect(setArea.areaPort, sim.areaPort);
   connect(q50_zone.v50, propsBusInt.v50) annotation (Line(points={{79,-58},{56,-58},
           {56,-20},{56.09,-20},{56.09,19.91}},               color={0,0,127}));
   connect(q50_zone.q50_zone, propsBusInt.q50_zone) annotation (Line(points={{79.4,
@@ -332,11 +247,24 @@ equation
           -91},{79.4,-90.5},{56.09,-90.5},{56.09,19.91}},      color={255,0,255}));
   connect(setArea.v50, propsBus_a.v50) annotation (Line(points={{79.4,-83.2},{
           79.4,-82},{56,-82},{56,0},{100.1,0},{100.1,19.9}}, color={0,0,127}));
+  connect(q50_zone.dummy_h[1], propsBusInt.hzone) annotation (Line(points={{79.4,
+          -47.6},{80,-47.6},{80,-48},{56.09,-48},{56.09,19.91}}, color={0,0,127}));
+  connect(q50_zone.dummy_h[2], propsBusInt.hfloor) annotation (Line(points={{79.4,
+          -45.6},{80,-45.6},{80,-46},{56.09,-46},{56.09,19.91}}, color={0,0,127}));
+  if sim.use_port_1 then
+    connect(crackOrOperableDoor.port_b1, propsBusInt.port_1) annotation(
+    Line(points = {{40, -46}, {56, -46}, {56, 20}}, color = {0, 127, 255}));
+  end if;
+  if sim.use_port_2 then
+    connect(crackOrOperableDoor.port_a2, propsBusInt.port_2) annotation(
+    Line(points = {{40, -58}, {56, -58}, {56, 20}}, color = {0, 127, 255}));
+  end if;
+  connect(AExp.y, propsBusInt.area) annotation(
+    Line(points = {{12, 20}, {56, 20}}, color = {0, 0, 127}));
   annotation (
     Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{
             100,100}})),
-    Icon(graphics,
-         coordinateSystem(preserveAspectRatio=false, extent={{-50,-100},{50,100}})),
+    Icon(coordinateSystem(preserveAspectRatio = false, extent = {{-50, -100}, {50, 100}})),
     Documentation(revisions="<html>
 <ul>
 <li>
@@ -344,6 +272,13 @@ November 7, 2024, by Anna Dell'Isola and Jelger Jansen:<br/>
 Add variable <code>TRefZon</code> to be used when calculating <code>QTra_design</code>.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1337\">#1337</a>
 </li>
+October 30, 2024, by Klaas De Jonge and Filip Jorissen:<br/>
+Additions for supporting interzonal airflow: use of crackoroperabledoor model, default column height implementation for stack-effect.
+</li>
+<li>
+October 23, 2023, by Filip Jorissen:<br/>
+Using real expression to set area of propsBusInt. To add some flexibility for ensuring n50 computation is correct.
+</li>
 <li>
 August 10, 2020, by Filip Jorissen:<br/>
 Modifications for supporting interzonal airflow.
diff --git a/IDEAS/Buildings/Components/Interfaces/PartialZone.mo b/IDEAS/Buildings/Components/Interfaces/PartialZone.mo
index fcd38bc3be..734b69c61a 100644
--- a/IDEAS/Buildings/Components/Interfaces/PartialZone.mo
+++ b/IDEAS/Buildings/Components/Interfaces/PartialZone.mo
@@ -7,9 +7,9 @@ model PartialZone "Building zone model"
     useOccNumInput=occNum.useInput,
     useLigCtrInput=ligCtr.useCtrInput);
 
-    replaceable package Medium = IDEAS.Media.Air constrainedby
-      Modelica.Media.Interfaces.PartialMedium "Medium in the component"
-      annotation (choicesAllMatching = true);
+  replaceable package Medium = IDEAS.Media.Air constrainedby
+    Modelica.Media.Interfaces.PartialMedium "Medium in the component"
+    annotation (choicesAllMatching = true);
   parameter Boolean use_custom_n50=
     sim.interZonalAirFlowType==IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None
     and not sim.unify_n50
@@ -107,7 +107,8 @@ model PartialZone "Building zone model"
     Dialog(group="Occupants (optional)"),
     Placement(transformation(extent={{80,22},{60,42}})));
 
-  replaceable parameter IDEAS.Buildings.Components.OccupancyType.OfficeWork occTyp
+  replaceable parameter IDEAS.Buildings.Components.OccupancyType.OfficeWork occTyp annotation(
+    Placement(visible = true, transformation(origin = {0, 0}, extent = {{80, 82}, {100, 102}}, rotation = 0)))
     constrainedby
     IDEAS.Buildings.Components.OccupancyType.BaseClasses.PartialOccupancyType
     "Occupancy type, only used for evaluating occupancy model and comfort model"
@@ -191,9 +192,10 @@ model PartialZone "Building zone model"
         extent={{-10,10},{10,-10}},
         rotation=270,
         origin={-30,-10})));
-
-
-
+  Modelica.Blocks.Math.Add addmWatFlow "Add medium substance mass flow rates, typically moisture" annotation (
+    Placement(visible = true, transformation(origin = {-6, 40}, extent = {{4, -4}, {-4, 4}}, rotation = 0)));
+  Modelica.Blocks.Math.Add addCFlow[max(Medium.nC,1)](k2 = intGaiOcc.s_co2) "Add tracer mass flow rates"  annotation (
+    Placement(visible = true, transformation(origin = {-6, 34}, extent = {{4, -4}, {-4, 4}}, rotation = 0)));
 protected
   Modelica.Blocks.Sources.RealExpression TRefZon[nSurf](each y=TZon_design)
     "Reference zone temperature for the surfaces connected to this zone, for calculation of design heat load";
@@ -204,7 +206,7 @@ protected
   parameter Integer n_ports_interzonal=
     if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None then 0
     elseif sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.OnePort then nSurf
-    else nSurf*2
+    else nSurf*3
       "Number of fluid ports for interzonal air flow modelling"
       annotation(Evaluate=true);
   IDEAS.Buildings.Components.Interfaces.ZoneBus[nSurf] propsBusInt(
@@ -240,7 +242,9 @@ protected
     n50=n50_int,
     V=V,
     q50_corr=sim.q50_def,
-    use_custom_n50=use_custom_n50)
+    use_custom_n50=use_custom_n50,
+    hZone=hZone,
+    hFloor=hFloor)
     annotation (Placement(transformation(extent={{-60,-100},{-40,-80}})));
 
 model Setq50 "q50 computation for zones"
@@ -263,6 +267,9 @@ model Setq50 "q50 computation for zones"
   parameter Real v50_custom[nSurf](each fixed=false)
     "custom assigned v50 value, else zero";
 
+  parameter Modelica.Units.SI.Length hZone "Zone height: distance between floor and ceiling";
+  parameter Modelica.Units.SI.Length hFloor = 0  "Absolute height of zone floor. Relative to the height at which the atmospheric pressure is defined.";
+
   Modelica.Blocks.Interfaces.RealInput v50_surf[nSurf]
    annotation (Placement(transformation(extent={{-126,28},{-86,68}})));
   Modelica.Blocks.Interfaces.BooleanInput use_custom_q50[nSurf]
@@ -276,13 +283,19 @@ model Setq50 "q50 computation for zones"
    annotation (Placement(transformation(extent={{-98,-38},{-118,-18}})));
   Modelica.Blocks.Interfaces.RealOutput q50_zone[nSurf]
     "Custom q50 value for the surfaces connected to this zone"
-   annotation (Placement(transformation(extent={{-98,-70},
-              {-118,-50}})));
+   annotation (Placement(transformation(extent={{-98,-60},{-118,-40}})));
+  Modelica.Blocks.Interfaces.RealOutput hzone[nSurf]
+    "Custom q50 value for the surfaces connected to this zone"
+    annotation (Placement(transformation(extent={{-96,-82},{-116,-62}})));
+  Modelica.Blocks.Interfaces.RealOutput hfloor[nSurf]
+    "Custom q50 value for the surfaces connected to this zone"
+    annotation (Placement(transformation(extent={{-96,-106},{-116,-86}})));
 initial equation
 
   for i in 1:nSurf loop
     defaultArea[i] = if use_custom_q50[i] then 0 else Area[i];
     v50_custom[i] = if use_custom_q50[i] then v50_surf[i] else 0;
+
   end for;
   allSurfacesCustom = max(Modelica.Constants.small, sum(defaultArea)) <= Modelica.Constants.small;
 
@@ -294,6 +307,9 @@ equation
   else
     q50_zone=fill(q50_corr,nSurf);
   end if;
+
+    hzone=fill(hZone,nSurf);
+    hfloor=fill(hFloor,nSurf);
     annotation (Icon(graphics={Rectangle(
             extent={{-84,80},{82,-80}},
             lineColor={28,108,200},
@@ -451,10 +467,6 @@ end for;
     annotation (Line(points={{20,30},{-20,30}}, color={191,0,0}));
   connect(intGaiOcc.portRad, radDistr.radGain) annotation (Line(points={{20,26},
           {4,26},{4,-60},{-46.2,-60}}, color={191,0,0}));
-  connect(intGaiOcc.mWat_flow, airModel.mWat_flow)
-    annotation (Line(points={{19.4,38},{-19.2,38}}, color={0,0,127}));
-  connect(intGaiOcc.C_flow, airModel.C_flow)
-    annotation (Line(points={{19.4,34},{-19.2,34}}, color={0,0,127}));
   connect(comfort.TAir, airModel.TAir) annotation (Line(points={{19,0},{-10,0},{
           -10,24},{-19,24}},   color={0,0,127}));
   connect(comfort.TRad, radDistr.TRad) annotation (Line(points={{19,-4},{-6,-4},
@@ -497,9 +509,10 @@ end for;
   if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts then
     connect(airModel.ports[interzonalAirFlow.nPorts + 1 + nSurf:interzonalAirFlow.nPorts + nSurf*2], propsBusInt[1:nSurf].port_2) annotation (Line(points={{-30,
           40},{-30,39.9},{-80.1,39.9}}, color={0,127,255}));
+    connect(airModel.ports[interzonalAirFlow.nPorts + 1 + nSurf*2:interzonalAirFlow.nPorts + nSurf*3], propsBusInt[1:nSurf].port_3) annotation (Line(points={{-30,
+          40},{-30,39.9},{-80.1,39.9}}, color={0,127,255}));
+
   end if;
-  connect(setq50.q50_zone, propsBusInt.q50_zone) annotation (Line(points={{-60.8,
-          -96},{-60.8,-96},{-80.1,-96},{-80.1,39.9}}, color={0,0,127}));
   connect(setq50.Area, propsBusInt.area) annotation (Line(points={{-60.6,-88.6},
           {-60.6,-89.3},{-80.1,-89.3},{-80.1,39.9}}, color={0,0,127}));
   connect(setq50.v50_surf, propsBusInt.v50) annotation (Line(points={{-60.6,-85.2},
@@ -510,8 +523,37 @@ end for;
   connect(setq50.use_custom_n50s, propsBusInt.use_custom_n50) annotation (Line(points={{-60.8,
           -92.8},{-60,-92.8},{-60,-92},{-80.1,-92},{-80.1,39.9}},       color={
           255,0,255}));
+  connect(setq50.q50_zone, propsBusInt.q50_zone) annotation (Line(points={{
+          -60.8,-95},{-80.1,-95},{-80.1,39.9}}, color={0,0,127}));
+  connect(setq50.hzone, propsBusInt.hzone) annotation (Line(points={{-60.6,
+          -97.2},{-60.6,-97.8},{-80.1,-97.8},{-80.1,39.9}}, color={0,0,127}));
+  connect(setq50.hfloor, propsBusInt.hfloor) annotation (Line(points={{-60.6,
+          -99.6},{-60.6,-99.8},{-80.1,-99.8},{-80.1,39.9}}, color={0,0,127}));
+  connect(intGaiOcc.mWat_flow, addmWatFlow.u2) annotation(
+    Line(points = {{20, 38}, {-2, 38}}, color = {0, 0, 127}));
+  connect(addmWatFlow.y, airModel.mWat_flow) annotation(
+    Line(points = {{-10, 40}, {-20, 40}, {-20, 38}}, color = {0, 0, 127}));
+  connect(addCFlow.y, airModel.C_flow) annotation(
+    Line(points = {{-10, 34}, {-20, 34}}, color = {0, 0, 127}, thickness = 0.5));
+  connect(addCFlow.u1, intGaiOcc.C_flow) annotation(
+    Line(points = {{-2, 36}, {14, 36}, {14, 34}, {20, 34}}, color = {0, 0, 127}, thickness = 0.5));
+  for i in 1:max(Medium.nC,1) loop
+    connect(addCFlow[i].u2, C_flow) annotation(
+    Line(points = {{-2, 32}, {8, 32}, {8, -100}, {120, -100}}, color = {0, 0, 127}));
+    if not useCFlowInput then
+      addCFlow[i].u2=0;
+    end if;
+  end for;
+  if not useWatFlowInput then
+    addmWatFlow.u1=0;
+  end if;
+  connect(airModel.phi, phi) annotation(
+    Line(points = {{-18, 26}, {-12, 26}, {-12, 10}, {110, 10}}, color = {0, 0, 127}));
+  connect(addmWatFlow.u1, mWat_flow) annotation(
+    Line(points = {{-2, 42}, {10, 42}, {10, -80}, {120, -80}}, color = {0, 0, 127}));
   connect(TRefZon.y, propsBusInt.TRefZon);
-    annotation (Placement(transformation(extent={{140,48},{100,88}})),
+
+  annotation (Placement(transformation(extent={{140,48},{100,88}})),
     Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}),
          graphics),
     Documentation(info="<html>
@@ -529,17 +571,30 @@ Add parameter <code>TZon_design</code> to be used when calculating <code>Q_desig
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1337\">#1337</a>
 </li>
 <li>
+October 30, 2024, by Klaas De Jonge:<br/>
+Modifications for interzonal airflow and stack-effect input. 
+</li>
+<li>
 April 26, 2024 by Jelger Jansen:<br/>
 Added parameter <code>ignAss</code> to ignore view factor asserts for non-physical unit test models.
 This is for <a href=https://github.com/open-ideas/IDEAS/issues/1272>#1272</a>.
 </li> 
 <li>
+Februari 18, 2024, by Filip Jorissen:<br/>
+Modifications for supporting trickle vents and interzonal airflow.
+</li>
+<li>
 January 8, 2024, by Jelger Jansen:<br/>
 Added min attribute to <code>mSenFac</code>.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1343\">
 #1343</a>
 </li>
 <li>
+July 25, 2023, by Filip Jorissen:<br/>
+Added conditional inputs for injecting water or CO2.
+Added output phi for the relative humidity.
+</li>
+<li>
 May 29, 2022, by Filip Jorissen:<br/>
 Unprotected component for OM compatibility.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1254\">
@@ -571,12 +626,11 @@ See <a href=\"https://github.com/open-ideas/IDEAS/issues/1158\">
 March 17, 2020, Filip Jorissen:<br/>
 Added support for vector fluidport.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1029\">#1029</a>.
-April 26, 2020, by Filip Jorissen:<br/>
 </li>
 <li>
+April 26, 2020, by Filip Jorissen:<br/>
 Refactored <code>SolBus</code> to avoid many instances in <code>PropsBus</code>.
-See <a href=\"https://github.com/open-ideas/IDEAS/issues/1131\">
-#1131</a>
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1131\">#1131</a>
 </li>
 <li>
 April 26, 2019 by Filip Jorissen:<br/>
diff --git a/IDEAS/Buildings/Components/Interfaces/RectangularZoneTemplateInterface.mo b/IDEAS/Buildings/Components/Interfaces/RectangularZoneTemplateInterface.mo
index 294564e00f..ef030fe994 100644
--- a/IDEAS/Buildings/Components/Interfaces/RectangularZoneTemplateInterface.mo
+++ b/IDEAS/Buildings/Components/Interfaces/RectangularZoneTemplateInterface.mo
@@ -2,6 +2,7 @@ within IDEAS.Buildings.Components.Interfaces;
 partial model RectangularZoneTemplateInterface
   "Rectangular zone including walls, floor and ceiling"
   extends IDEAS.Buildings.Components.Interfaces.PartialZone(
+    redeclare replaceable package Medium = IDEAS.Media.Air,
     calculateViewFactor=false,
     final nSurf=indWinCei+nSurfExt,
     final V=A*h,
@@ -124,6 +125,36 @@ partial model RectangularZoneTemplateInterface
       group="Window details",
       enable=hasWinCei));
 
+  parameter Modelica.Units.SI.Length h_winA(min=0.1) = max(0.1,sqrt(A_winA))
+    "Window A height, including frame"
+    annotation (Dialog(
+      tab="Face A",
+      group="Window details",
+      enable=hasWinA));
+  parameter Modelica.Units.SI.Length h_winB(min=0.1) = max(0.1,sqrt(A_winB))
+    "Window B height, including frame"
+    annotation (Dialog(
+      tab="Face B",
+      group="Window details",
+      enable=hasWinB));
+  parameter Modelica.Units.SI.Length h_winC(min=0.1) = max(0.1,sqrt(A_winC))
+    "Window C height, including frame"
+    annotation (Dialog(
+      tab="Face C",
+      group="Window details",
+      enable=hasWinC));
+  parameter Modelica.Units.SI.Length h_winD(min=0.1) = max(0.1,sqrt(A_winD))
+    "Window D height, including frame"
+    annotation (Dialog(
+      tab="Face D",
+      group="Window details",
+      enable=hasWinD));
+  parameter Modelica.Units.SI.Length h_winCei(min=0.1) = max(0.1,sqrt(A_winCei))
+    "Ceiling window height, including frame"
+    annotation (Dialog(
+      tab="Ceiling",
+      group="Window details",
+      enable=hasWinCei));
   parameter Real fracA=0.15
     "Area fraction of the window frame of face A"
     annotation(Dialog(tab="Face A", group="Window details",
@@ -1527,6 +1558,10 @@ See <a href=\"https://github.com/open-ideas/IDEAS/issues/1343\">
 #1343</a>
 </li>
 <li>
+October 18, 2023, by Filip Jorissen:<br/>
+Added window height parameters.
+</li>
+<li>
 August 2, 2022, by Filip Jorissen:<br/>
 Added cavity support for horizontal internal walls (floor/ceiling)
 for supporting staircases.
diff --git a/IDEAS/Buildings/Components/Interfaces/ZoneBus.mo b/IDEAS/Buildings/Components/Interfaces/ZoneBus.mo
index b490cf1ad1..aa4cc471c5 100644
--- a/IDEAS/Buildings/Components/Interfaces/ZoneBus.mo
+++ b/IDEAS/Buildings/Components/Interfaces/ZoneBus.mo
@@ -29,11 +29,15 @@ expandable connector ZoneBus
   Modelica.Fluid.Interfaces.FluidPort_a port_1(
     redeclare package Medium = Medium)
     if use_port_1
-    "Port for interzonal air flow: middle or bottom port";
+    "Port for interzonal air flow";
   Modelica.Fluid.Interfaces.FluidPort_a port_2(
     redeclare package Medium = Medium)
     if use_port_2
-    "Port for detailed interzonal air flow: top port";
+    "Port for detailed interzonal air flow";
+  Modelica.Fluid.Interfaces.FluidPort_a port_3(
+    redeclare package Medium = Medium)
+    if use_port_2
+    "Port for trickle vents etc. when using detailed interzonal air flow";
   IDEAS.Buildings.Components.BaseClasses.ConservationOfEnergy.EnergyPort E
     "Internal energy in model" annotation ();
   IDEAS.Buildings.Components.Interfaces.RealConnector inc(
@@ -48,9 +52,11 @@ expandable connector ZoneBus
   IDEAS.Buildings.Components.Interfaces.RealConnector q50_zone(final unit="m3/(h.m2)") "v50 of the surface" annotation ();
   IDEAS.Buildings.Components.Interfaces.BooleanConnector use_custom_q50 "true if custome q50 value is assigned to surface" annotation ();
   IDEAS.Buildings.Components.Interfaces.BooleanConnector use_custom_n50 "true if the zone n50 is a custom value";
+  IDEAS.Buildings.Components.Interfaces.RealConnector hzone(final unit="m") "Zone height: distance between floor and ceiling";
+  IDEAS.Buildings.Components.Interfaces.RealConnector hfloor(final unit="m") "Absolute height of zone floor";
   IDEAS.Buildings.Components.Interfaces.RealConnector TRefZon(
     final quantity="Temperature",
-    final unit="K") annotation ();
+    final unit="K") "Reference zone temperature";
   annotation (Documentation(info="<html>
 <p>
 Connector that contains a weather bus and further
@@ -65,6 +71,10 @@ Add connector <code>TRefZon</code> to be used when calculating <code>QTra_design
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1337\">#1337</a>
 </li>
 <li>
+Februari 18, 2024, by Filip Jorissen:<br/>
+Modifications for supporting trickle vents and interzonal airflow.
+</li>
+<li>
 April 20, 2023 by Jelger Jansen:<br/>
 Make the connector expandable to avoid (pedantic check) warnings in Dymola 2022x.
 See issue <a href=https://github.com/open-ideas/IDEAS/issues/1317>#1317</a>
diff --git a/IDEAS/Buildings/Components/Interfaces/ZoneBusVarMultiplicator.mo b/IDEAS/Buildings/Components/Interfaces/ZoneBusVarMultiplicator.mo
index c4f9412f84..61b2492767 100644
--- a/IDEAS/Buildings/Components/Interfaces/ZoneBusVarMultiplicator.mo
+++ b/IDEAS/Buildings/Components/Interfaces/ZoneBusVarMultiplicator.mo
@@ -32,15 +32,17 @@ model ZoneBusVarMultiplicator "Component to scale all flows from the zone propsB
     annotation (Placement(transformation(extent={{8,-324},{-12,-304}})));
 protected
   IDEAS.Fluid.BaseClasses.MassFlowRateMultiplier massFlowRateMultiplier2(
-      redeclare package Medium = Medium,                                 final k=k)
-    if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts
+      redeclare package Medium = Medium,final k=k) if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts
     "Mass flow rate multiplier for port 2"
     annotation (Placement(transformation(extent={{-10,-200},{10,-180}})));
   IDEAS.Fluid.BaseClasses.MassFlowRateMultiplier massFlowRateMultiplier1(
-      redeclare package Medium = Medium,                                 final k=k)
-     if sim.interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None
+      redeclare package Medium = Medium,final k=k) if sim.interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None
     "Mass flow rate multiplier for port 1"
     annotation (Placement(transformation(extent={{-10,-170},{10,-150}})));
+  IDEAS.Fluid.BaseClasses.MassFlowRateMultiplier massFlowRateMultiplier3(
+      redeclare package Medium = Medium,final k=k) if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts
+    "Mass flow rate multiplier for port 3"
+    annotation (Placement(transformation(origin = {0, -208}, extent = {{-10, -200}, {10, -180}})));
   Modelica.Blocks.Math.Gain QTra_design(k=k) "Design heat flow rate"
     annotation (Placement(transformation(extent={{-10,178},{10,198}})));
   Modelica.Blocks.Math.Gain area(k=k) "Heat exchange surface area"
@@ -80,9 +82,15 @@ protected
   Modelica.Blocks.Routing.BooleanPassThrough use_custom_q50
     "0 if the surface has a custom q50"
     annotation (Placement(transformation(extent={{-12,-296},{8,-276}})));
+  Modelica.Blocks.Routing.RealPassThrough hzone "zone height"
+    annotation (Placement(transformation(extent={{8,-356},{-12,-336}})));
+  Modelica.Blocks.Routing.RealPassThrough hFloor
+    "Absolute height of the zone floor"
+    annotation (Placement(transformation(extent={{8,-384},{-12,-364}})));
   Modelica.Blocks.Routing.RealPassThrough TRefZon
     "Reference zone temperature for calculation of design heat load"
     annotation (Placement(transformation(extent={{8,-356},{-12,-336}})));
+
 equation
   connect(QTra_design.u, propsBus_a.QTra_design) annotation (Line(points={{-12,188},
           {-100.1,188},{-100.1,0.1}},         color={0,0,127}));
@@ -165,6 +173,18 @@ equation
   connect(use_custom_n50.y, propsBus_a.use_custom_n50) annotation (Line(points={{-13,
           -314},{-100,-314},{-100,0.1},{-100.1,0.1}},
                                                 color={255,0,255}));
+  connect(hzone.u, propsBus_b.hzone) annotation (Line(points={{10,-346},{100,
+          -346},{100,-0.1},{100.1,-0.1}}, color={0,0,127}));
+  connect(hzone.y, propsBus_a.hzone) annotation (Line(points={{-13,-346},{-100,
+          -346},{-100,0.1},{-100.1,0.1}}, color={0,0,127}));
+  connect(hFloor.u, propsBus_b.hfloor) annotation (Line(points={{10,-374},{100,
+          -374},{100,-0.1},{100.1,-0.1}}, color={0,0,127}));
+  connect(hFloor.y, propsBus_a.hfloor) annotation (Line(points={{-13,-374},{
+          -100,-374},{-100,0.1},{-100.1,0.1}}, color={0,0,127}));
+  connect(massFlowRateMultiplier3.port_a, propsBus_a.port_3) annotation(
+    Line(points = {{-10, -398}, {-100, -398}, {-100, 0}}, color = {0, 127, 255}));
+  connect(massFlowRateMultiplier3.port_b, propsBus_b.port_3) annotation(
+    Line(points = {{10, -398}, {100, -398}, {100, 0}}, color = {0, 127, 255}));
   connect(TRefZon.u, propsBus_b.TRefZon) annotation (Line(points={{10,-346},{
           100.1,-346},{100.1,-0.1}},  color={0,0,127}));
   connect(TRefZon.y, propsBus_a.TRefZon) annotation (Line(points={{-13,-346},{
@@ -189,7 +209,7 @@ equation
           fillColor={255,255,255},
           fillPattern=FillPattern.Solid,
           textString="%name")}),                                 Diagram(
-        coordinateSystem(preserveAspectRatio=false, extent={{-100,-180},{100,200}})),
+        coordinateSystem(preserveAspectRatio=false, extent={{-120,200},{120,-380}})),
     Documentation(revisions="<html>
 <ul>
 <li>
@@ -198,6 +218,10 @@ Add connector <code>TRefZon</code> to be used when calculating <code>QTra_design
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1337\">#1337</a>
 </li>
 <li>
+Februari 18, 2024, by Filip Jorissen:<br/>
+Modifications for supporting trickle vents and interzonal airflow.
+</li>
+<li>
 August 10, 2020, by Filip Jorissen:<br/>
 Modifications for supporting interzonal airflow.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1066\">
@@ -215,4 +239,4 @@ First implementation.
 </li>
 </ul>
 </html>"));
-end ZoneBusVarMultiplicator;
+end ZoneBusVarMultiplicator;
\ No newline at end of file
diff --git a/IDEAS/Buildings/Components/Interfaces/ZoneInterface.mo b/IDEAS/Buildings/Components/Interfaces/ZoneInterface.mo
index bfba43f380..2ac9c54c58 100644
--- a/IDEAS/Buildings/Components/Interfaces/ZoneInterface.mo
+++ b/IDEAS/Buildings/Components/Interfaces/ZoneInterface.mo
@@ -13,22 +13,31 @@ partial model ZoneInterface "Partial model for thermal building zones"
   parameter Integer nPorts(min=0)=2
     "Number of ports for ventilation connections";
   parameter Modelica.Units.SI.Volume V "Total zone air volume"
-    annotation (Dialog(group="Building physics"));
-  parameter Modelica.Units.SI.Length hZone=2.8
+    annotation(Dialog(group="Building physics"));
+  parameter Modelica.Units.SI.Length hZone = 2.8
     "Zone height: distance between floor and ceiling"
-    annotation (Dialog(group="Building physics"));
-  parameter Modelica.Units.SI.Area A=V/hZone "Total conditioned floor area"
-    annotation (Dialog(group="Building physics"));
+    annotation(Dialog(group="Building physics"));
+      parameter Modelica.Units.SI.Length hFloor = 0
+    "Absolute height of zone floor"
+    annotation(Dialog(group="Building physics"));
+  parameter Modelica.Units.SI.Area A = V/hZone "Total conditioned floor area"
+    annotation(Dialog(group="Building physics"));
   parameter Boolean useOccNumInput
     "=false, to remove icon of yOcc"
     annotation(Dialog(tab="Advanced",group="Occupants"));
+  parameter Boolean useWatFlowInput = false
+    "=true, to enable an input for injecting water vapor into a zone"
+    annotation(Dialog(tab="Advanced",group="Sources"));
+  parameter Boolean useCFlowInput = false
+    "=true, to enable an input for injecting CO2 into a zone"
+    annotation(Dialog(tab="Advanced",group="Sources"));
   parameter Boolean useLigCtrInput
     "=false, to remove icon of lightCtrl"
     annotation(Dialog(tab="Advanced",group="Lighting"));
   //default ACH=2 for ventilation
-  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=V*1.2*2/3600
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = V * 1.2*2/3600
     "Nominal flow rate of the air flow system fluid ports"
-    annotation (Dialog(tab="Airflow", group="Air model"));
+    annotation(Dialog(tab="Airflow",group="Air model"));
 
   Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_b gainRad
     "Internal zone node for radiative heat gains"
@@ -54,14 +63,25 @@ partial model ZoneInterface "Partial model for thermal building zones"
     "Port for ventilation connections, deprecated, use 'ports' instead";
   Modelica.Blocks.Interfaces.RealInput yOcc if useOccNumInput
     "Control input for number of occupants, used by Occupants.Input and Occupants.AreaWeightedInput"
-    annotation (Placement(transformation(extent={{140,20},{100,60}})));
+    annotation (Placement(transformation(extent={{140,20},{100,60}}), iconTransformation(extent={{-130,60},{-90,100}})));
+  Modelica.Blocks.Interfaces.RealInput mWat_flow(unit = "kg/s")
+    if useWatFlowInput
+    "Input for injecting water vapor into a zone" annotation (
+    Placement(transformation(extent={{140,-100},{100,-60}}), iconTransformation(extent={{-130,-60},{-90,-20}})));
+  Modelica.Blocks.Interfaces.RealInput C_flow
+    if useCFlowInput
+    "Input for injecting CO2 into a zone" annotation (
+    Placement(transformation(extent={{140,-120},{100,-80}}), iconTransformation(extent={{-130,20},{-90,-20}})));
   Modelica.Blocks.Interfaces.RealInput uLig if useLigCtrInput
     "Lighting control input (1 corresponds to 100%), only used when using LightingControl.Input"
     annotation (Placement(transformation(extent={{140,50},{100,90}}),
-        iconTransformation(extent={{-130,-40},{-90,0}})));
-  Modelica.Blocks.Interfaces.RealOutput ppm(unit="1")
+        iconTransformation(extent={{-130,-100},{-90,-60}})));
+  Modelica.Blocks.Interfaces.RealOutput ppm(unit="1",min=0)
     "CO2 concentration in the zone" annotation (Placement(transformation(extent={{100,-10},
             {120,10}}),           iconTransformation(extent={{100,-10},{120,10}})));
+  Modelica.Blocks.Interfaces.RealOutput phi(unit="1",min=0,max=1)
+    "Relative humidity in the zone [0-1]" annotation (Placement(transformation(extent={{100,0},
+            {120,20}}),           iconTransformation(extent={{100,30},{120,50}})));
   Modelica.Fluid.Interfaces.FluidPorts_a ports[nPorts](redeclare package Medium =
         Medium) "Ports for ventilation connetions" annotation (Placement(
         transformation(
@@ -95,11 +115,13 @@ initial equation
   for i in 1:nPorts loop
     assert(cardinality(ports[i])<=2,
       "Each element of ports should have zero or one external connections but " +
-      getInstanceName() +".ports[" + String(i) + "] has a different number." +
+      getInstanceName() +".ports[" + String(i) + "] has less." +
       " This can cause air to mix at the fluid port, without entering the zone, which is usually unintended.
       Instead, increase nPorts and create a separate connection.",
       level=AssertionLevel.warning);
   end for;
+initial equation
+  assert(not useCFlowInput or Medium.nC>0, "In " + getInstanceName() + ": using useCFlowInput=true but the used medium has no trace substances");
 equation
   connect(sim.Qgai, dummy1);
   connect(sim.E, dummy2);
@@ -107,8 +129,8 @@ equation
   connect(prescribedHeatFlowE.port, sim.E);
   connect(Qgai.y,prescribedHeatFlowQgai. Q_flow);
   connect(prescribedHeatFlowQgai.port, sim.Qgai);
-
   connect(setVolume.volumePort, sim.volumePort);
+
   annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,
             -100},{100,100}})),           Icon(coordinateSystem(
           preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={
@@ -160,7 +182,11 @@ equation
     Documentation(revisions="<html>
 <ul>
 <li>
-April 1, 2022, Filip Jorissen:<br/>
+July 25, 2023, by Filip Jorissen:<br/>
+Added conditional inputs for injecting water or CO2.
+</li>
+<li>
+April 1, 2022, by Filip Jorissen:<br/>
 Removed cardinality operator from error message.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1253\">#1253</a>.
 </li>
@@ -175,11 +201,6 @@ Added support for vector fluidport.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1029\">#1029</a>.
 </li>
 <li>
-Revised implementation of icon for
-<a href=\"https://github.com/open-ideas/IDEAS/issues/996\">#996</a>
-and for <a href=\"https://github.com/open-ideas/IDEAS/pull/976\">#976</a>.
-</li>
-<li>
 May 2, 2019 by Filip Jorissen:<br/>
 Moved location of <code>ppm</code> in the icon layer such that it
 does not overlap with <code>TSensor</code>.
@@ -191,6 +212,12 @@ Renamed <code>nOcc</code> to <code>yOcc</code>
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/998\">#998</a>.
 </li>
 <li>
+March 21, 2019 by Filip Jorissen:<br/>
+Revised implementation of icon for
+<a href=\"https://github.com/open-ideas/IDEAS/issues/996\">#996</a>
+and for <a href=\"https://github.com/open-ideas/IDEAS/pull/976\">#976</a>.
+</li>
+<li>
 September 5, 2018 by Iago Cupeiro:<br/>
 Added uLig input for controlling lighting
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/879\">#879</a>.
diff --git a/IDEAS/Buildings/Components/Interfaces/package.order b/IDEAS/Buildings/Components/Interfaces/package.order
index 624d9839c3..0688d3b11e 100644
--- a/IDEAS/Buildings/Components/Interfaces/package.order
+++ b/IDEAS/Buildings/Components/Interfaces/package.order
@@ -5,6 +5,7 @@ PartialSurface
 PartialZone
 RealConnector
 BooleanConnector
+IntegerConnector
 RectangularZoneTemplateInterface
 SolBus
 WeaBus
diff --git a/IDEAS/Buildings/Components/InternalGains/BaseClasses/PartialOccupancyGains.mo b/IDEAS/Buildings/Components/InternalGains/BaseClasses/PartialOccupancyGains.mo
index e17f957946..50dcf4d5c8 100644
--- a/IDEAS/Buildings/Components/InternalGains/BaseClasses/PartialOccupancyGains.mo
+++ b/IDEAS/Buildings/Components/InternalGains/BaseClasses/PartialOccupancyGains.mo
@@ -1,6 +1,5 @@
 within IDEAS.Buildings.Components.InternalGains.BaseClasses;
 partial model PartialOccupancyGains "Partial model for occupant internal gains"
-  import IDEAS;
   extends Modelica.Blocks.Icons.Block;
   outer IDEAS.BoundaryConditions.SimInfoManager sim "Simulation information manager";
   replaceable package Medium =
@@ -18,7 +17,14 @@ This is for <a href=\"https://github.com/open-ideas/IDEAS/issues/760\">#760</a>.
 </html>"));
   parameter IDEAS.Buildings.Components.OccupancyType.OfficeWork occupancyType
     annotation (Placement(transformation(extent={{-60,80},{-40,100}})));
-
+  final parameter Real s_co2[max(Medium.nC,1)] = {if Modelica.Utilities.Strings.isEqual(string1=if Medium.nC>0 then Medium.extraPropertiesNames[i] else "",
+                                             string2="CO2",
+                                             caseSensitive=false)
+                                             then 1 else 0 for i in 1:max(Medium.nC,1)}
+                                             "Array with 1 on the position where CO2 is situated in the Medium.extraPropertiesNames";
+  constant Modelica.Units.SI.SpecificEnthalpy lambdaWater=if (Medium.nX) > 1
+       then Medium.enthalpyOfCondensingGas(T=273.15 + 35) else 2566120
+    "Latent heat of evaporation of water at 35 degrees Celsius";
   Modelica.Blocks.Interfaces.RealOutput mWat_flow
     "Water vapor mass flow rate due to occupants"
     annotation (Placement(transformation(extent={{96,50},{116,70}})));
diff --git a/IDEAS/Buildings/Components/InternalGains/Occupants.mo b/IDEAS/Buildings/Components/InternalGains/Occupants.mo
index ffcfc945a3..72d190718c 100644
--- a/IDEAS/Buildings/Components/InternalGains/Occupants.mo
+++ b/IDEAS/Buildings/Components/InternalGains/Occupants.mo
@@ -8,9 +8,6 @@ model Occupants "Constant sensible, latent and CO2 heat production per person"
   parameter Real radFra(min=0,max=1) = occupancyType.radFra
     "Radiant fraction of sensible heat exchange, default based on Ashrae fundamentals chap 18.4 for low air velocity";
 protected
-  constant Modelica.Units.SI.SpecificEnthalpy lambdaWater=if (Medium.nX) > 1
-       then Medium.enthalpyOfCondensingGas(T=273.15 + 35) else 2566120
-    "Latent heat of evaporation of water at 35 degrees Celsius";
   constant Modelica.Units.SI.SpecificEnthalpy E_glu=16e6
     "Calorific value of glucose";
   constant Real MM_glu = 180
@@ -21,10 +18,6 @@ protected
     "CO2 production per person, based on oxidation of suger with calorific value of 16 kJ/g";
   final parameter Modelica.Units.SI.MassFlowRate m_flow_h2o_pp=QlatPp/
       lambdaWater "Vapor production per person";
-  final parameter Real s_co2[max(Medium.nC,1)] = {if Modelica.Utilities.Strings.isEqual(string1=if Medium.nC>0 then Medium.extraPropertiesNames[i] else "",
-                                             string2="CO2",
-                                             caseSensitive=false)
-                                             then 1 else 0 for i in 1:max(Medium.nC,1)};
   Modelica.Blocks.Math.Gain gaiHea(k=QsenPp)
                 "Gain for computing heat flow rate"
     annotation (Placement(transformation(extent={{-60,-50},{-40,-30}})));
diff --git a/IDEAS/Buildings/Components/InternalWall.mo b/IDEAS/Buildings/Components/InternalWall.mo
index fcfc5be08e..d43ae43e3f 100644
--- a/IDEAS/Buildings/Components/InternalWall.mo
+++ b/IDEAS/Buildings/Components/InternalWall.mo
@@ -1,15 +1,27 @@
 within IDEAS.Buildings.Components;
+
 model InternalWall "interior opaque wall between two zones"
   extends IDEAS.Buildings.Components.Interfaces.PartialOpaqueSurface(
     final use_custom_q50=true,
-    custom_q50=2,
+    custom_q50=if IDEAS.Utilities.Math.Functions.isAngle(inc, 0) or IDEAS.Utilities.Math.Functions.isAngle(inc, Modelica.Constants.pi) then 0 else 2,
     final nWin=1,
     dT_nominal_a=1,
     E(y=if sim.computeConservationOfEnergy then layMul.E else 0),
     Qgai(y=(if sim.openSystemConservationOfEnergy or not sim.computeConservationOfEnergy
            then 0 else sum(port_emb.Q_flow))),
-    q50_zone(v50_surf=0),
-    final QTra_design(fixed=false));
+	final QTra_design(fixed=false),
+    q50_zone(v50_surf = 0),
+    crackOrOperableDoor(
+      h_a1=-0.5*hzone_b + 0.75*hVertical + hRelSurfBot_b,
+      h_b2=-0.5*hzone_b + 0.25*hVertical + hRelSurfBot_b,
+      hA=0.5*hzone_b - hRelSurfBot_b - hRelOpeBot_b,
+      hB=0.5*hzone_a - hRelSurfBot_a - hRelOpeBot_a,
+      openDoorOnePort=true,
+      useDoor=hasCavity,
+      use_y=use_y_doo,
+      wOpe=w,
+      hOpe=h,
+      CDOpe=CD));
   //using custom q50 since this model is not an external component
 
   parameter Boolean linIntCon_b=sim.linIntCon
@@ -20,75 +32,84 @@ model InternalWall "interior opaque wall between two zones"
     annotation (Dialog(tab="Convection"));
   Modelica.Units.SI.Temperature TRef_b = propsBus_b.TRefZon
     "Reference temperature of zone on side of propsBus_b, for calculation of design heat loss";
+
   // open door modelling
   parameter Boolean hasCavity = false
     "=true, to model open door or cavity in wall"
     annotation(Dialog(group="Cavity or open door"));
-  parameter Modelica.Units.SI.Length h=2
+  parameter Modelica.Units.SI.Length h = 2
     "Height of (rectangular) cavity in wall"
-    annotation (Dialog(enable=hasCavity, group="Cavity or open door"));
-  parameter Modelica.Units.SI.Length w=1
+    annotation(Dialog(enable=hasCavity,group="Cavity or open door"));
+  parameter Modelica.Units.SI.Length w = 1
     "Width of (rectangular) cavity in wall"
-    annotation (Dialog(enable=hasCavity, group="Cavity or open door"));
-  parameter Modelica.Units.SI.Acceleration g=Modelica.Constants.g_n
-    "Gravity, for computation of buoyancy" annotation (Dialog(
-      enable=hasCavity,
-      group="Cavity or open door",
-      tab="Advanced"));
+    annotation(Dialog(enable=hasCavity,group="Cavity or open door"));
+
+  parameter  Modelica.Units.SI.Length hRelOpeBot_a=0 "Vertical distance at propsbus a between the bottom of the surface that contains an (operable) opening and the bottom of the opening" annotation(Dialog(group="Cavity or open door"));
+  parameter  Modelica.Units.SI.Length hRelOpeBot_b=0 "Vertical distance at propsbus b between the bottom of the surface that contains an (operable) opening and the bottom of the opening" annotation(Dialog(group="Cavity or open door"));
+  parameter Modelica.Units.SI.Acceleration g = Modelica.Constants.g_n
+    "Gravity, for computation of buoyancy"
+    annotation(Dialog(enable=hasCavity,group="Cavity or open door",tab="Advanced"));
   parameter Modelica.Units.SI.Pressure p=101300
-    "Absolute pressure for computation of buoyancy" annotation (Dialog(
-      enable=hasCavity,
-      group="Cavity or open door",
-      tab="Advanced"));
-  parameter Modelica.Units.SI.Density rho=p/r/T
-    "Nominal density for computation of buoyancy mass flow rate" annotation (
-      Dialog(
-      enable=hasCavity,
-      group="Cavity or open door",
-      tab="Advanced"));
-  parameter Modelica.Units.SI.SpecificHeatCapacity c_p=1013
+    "Absolute pressure for computation of buoyancy"
+    annotation(Dialog(enable=hasCavity,group="Cavity or open door",tab="Advanced"));
+  parameter Modelica.Units.SI.Density rho = p/r/T
+    "Nominal density for computation of buoyancy mass flow rate"
+    annotation(Dialog(enable=hasCavity,group="Cavity or open door",tab="Advanced"));
+  parameter Modelica.Units.SI.SpecificHeatCapacity c_p = 1013
     "Nominal heat capacity for computation of buoyancy heat flow rate"
-    annotation (Dialog(
-      enable=hasCavity,
-      group="Cavity or open door",
-      tab="Advanced"));
+    annotation(Dialog(enable=hasCavity,group="Cavity or open door",tab="Advanced"));
   parameter Modelica.Units.SI.Temperature T=293
-    "Nominal temperature for linearising heat flow rate" annotation (Dialog(
-      enable=hasCavity,
-      group="Cavity or open door",
-      tab="Advanced"));
-  parameter Modelica.Units.SI.TemperatureDifference dT=1
+    "Nominal temperature for linearising heat flow rate"
+    annotation(Dialog(enable=hasCavity,group="Cavity or open door",tab="Advanced"));
+  parameter Modelica.Units.SI.TemperatureDifference dT = 1
     "Nominal temperature difference when linearising heat flow rate"
-    annotation (Dialog(
-      enable=hasCavity,
-      group="Cavity or open door",
-      tab="Advanced"));
-
+    annotation(Dialog(enable=hasCavity,group="Cavity or open door",tab="Advanced"));
+  parameter Boolean use_y_doo = false
+    "=true, to enable controllable cavity (door) input"
+    annotation(Dialog(enable=hasCavity,group="Cavity or open door",tab="Advanced"));
   IDEAS.Buildings.Components.Interfaces.ZoneBus propsBus_b(
     redeclare final package Medium = Medium,
     numIncAndAziInBus=sim.numIncAndAziInBus,
     outputAngles=sim.outputAngles,
-    final use_port_1=sim.interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None,
-    final use_port_2=sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts)
-                                   "If inc = Floor, then propsbus_b should be connected to the zone below this floor.
-    If inc = Ceiling, then propsbus_b should be connected to the zone above this ceiling."
-        annotation (Placement(transformation(extent={{-20,-20},{20,20}},
-        rotation=90,
-        origin={-100,20}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=90,
-        origin={-50,20})));
+    final use_port_1=sim.use_port_1,
+    final use_port_2=sim.use_port_2)
+    "If inc = Floor, then propsbus_b should be connected to the zone below this floor.
+      If inc = Ceiling, then propsbus_b should be connected to the zone above this ceiling." 
+      annotation(
+    Placement(transformation(extent = {{-20, -20}, {20, 20}}, rotation = 90, origin = {-100, 20}), iconTransformation(extent = {{-20, -20}, {20, 20}}, rotation = 90, origin = {-50, 20})));
+  parameter Real CD = 0.78
+    "Discharge coefficient of cavity" 
+    annotation(Dialog(group="Cavity or open door",tab="Advanced"));
+  final parameter Real hzone_b(fixed=false);
+  final parameter Real hfloor_b(fixed=false);
 
 
-  parameter Real CD=0.78 "Discharge coefficient of cavity"
-    annotation (Dialog(tab="Airflow"));
+  parameter Modelica.Units.SI.Length hRelSurfBot_b=if
+      IDEAS.Utilities.Math.Functions.isAngle(inc, IDEAS.Types.Tilt.Floor)
+       then hzone_b else 0
+    "Height above the zone floor at propsbus_b. Height where the surface starts. e.g. 0 for walls at floor level and floors.  ";
+  Modelica.Blocks.Interfaces.RealInput y_doo(min = 0, max = 1) if use_y_doo and useDooOpe 
+    "Control input for the door" annotation(
+    Placement(visible = true, transformation(origin = {-80, 90}, extent = {{-20, -20}, {20, 20}}, rotation = 0), iconTransformation(origin = {-64, 88}, extent = {{-20, -20}, {20, 20}}, rotation = 0)));
+  IDEAS.Fluid.Sources.MassFlowSource_T boundary3_a(
+    redeclare package Medium = Medium, 
+    m_flow = 1e-10, 
+    nPorts = 1)  if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts
+     "Boundary for bus a" annotation(
+    Placement(transformation(origin = {48, -4}, extent = {{-28, -76}, {-8, -56}})));
+  IDEAS.Fluid.Sources.MassFlowSource_T boundary3_b(
+    redeclare package Medium = Medium, 
+    m_flow = 1e-10, 
+    nPorts = 1)  if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts 
+    "Boundary for bus b" annotation(
+    Placement(transformation(origin = {-48, -4}, extent = {{28, -76}, {8, -56}}, rotation = -0)));
 protected
-  final parameter Real U_value=1/(1/8 + sum(constructionType.mats.R) + 1/8)
-    "Wall U-value";
+  parameter Real Ope_hvert = sin(inc)*h "Vertical opening height, height of the surface projected to the vertical, 0 for openings in horizontal floors and ceilings" annotation (
+    Dialog(enable=hasCavity,group="Cavity or open door"));
+  final parameter Real U_value = 1/(1/8 + sum(constructionType.mats.R) + 1/8) "Wall U-value";
   constant Real r = 287 "Gas constant";
-
-  IDEAS.Buildings.Components.BaseClasses.ConvectiveHeatTransfer.InteriorConvection
-    intCon_b(
+  Modelica.Blocks.Sources.Constant constOne(final k = 1) if useDooOpe and not use_y_doo "Constant value of one";
+  IDEAS.Buildings.Components.BaseClasses.ConvectiveHeatTransfer.InteriorConvection intCon_b(
     linearise=linIntCon_b or sim.linearise,
     dT_nominal=dT_nominal_b,
     final inc=incInt + Modelica.Constants.pi,
@@ -105,13 +126,10 @@ protected
   Modelica.Thermal.HeatTransfer.Sources.FixedHeatFlow iSolDif1(final Q_flow=0);
   Modelica.Thermal.HeatTransfer.Sources.FixedHeatFlow iSolDir1(final Q_flow=0);
   Modelica.Thermal.HeatTransfer.Sources.FixedHeatFlow Qgai_b(final Q_flow=0);
-  IDEAS.Buildings.Components.BaseClasses.ConservationOfEnergy.PrescribedEnergy
-    E_b;
+  IDEAS.Buildings.Components.BaseClasses.ConservationOfEnergy.PrescribedEnergy E_b;
   Modelica.Blocks.Sources.Constant E0(final k=0)
-    "All internal energy is assigned to right side";
-
-  IDEAS.Buildings.Components.BaseClasses.ConvectiveHeatTransfer.CavityAirflow
-                                        theConDoor(
+    "All internal energy is assigned to right side"; 
+  IDEAS.Buildings.Components.BaseClasses.ConvectiveHeatTransfer.CavityAirflow theConDoor(
     linearise=sim.linearise or linIntCon_a or linIntCon_b,
     h=h,
     w=w,
@@ -124,53 +142,32 @@ protected
     if hasCavity and sim.interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts
     "Thermal-only model for open door"
     annotation (Placement(transformation(extent={{-10,30},{10,50}})));
-public
-  IDEAS.Airflow.Multizone.DoorDiscretizedOpen dooOpe(
-    redeclare package Medium = Medium,
-    wOpe=w,
-    hOpe=h)
-    if hasCavity and sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts
-    "2-port model for open door"
-    annotation (Placement(transformation(extent={{-10,80},{10,100}})));
-  Airflow.Multizone.Orifice resDoor(
-    redeclare package Medium = Medium,
-    A=w*h,
-    CD=CD)
-    if hasCavity and sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.OnePort
-    "1-port model for open door"
-    annotation (Placement(transformation(extent={{-10,58},{10,78}})));
+  final parameter Boolean useDooOpe = hasCavity and sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts;
+
 initial equation
+  hzone_b = propsBus_b.hzone;
+  hfloor_b = propsBus_b.hfloor;
   QTra_design=U_value*A*(TRefZon - TRef_b)
     "TRefZon is the reference temperature for heat loss calculations of the zone connected to propsbus_a,
      TRef_b is the reference temperature for heat loss calculations of the zone connected to propsBus_b";
+
 equation
-  assert(hasCavity == false or IDEAS.Utilities.Math.Functions.isAngle(incInt, IDEAS.Types.Tilt.Wall),
-    "In " + getInstanceName() + ": Cavities are only supported for vertical walls, but inc=" + String(incInt) + ". The model is not accurate.",
-    level=AssertionLevel.warning);
-  connect(layMul.port_b, propsBus_b.surfRad) annotation (Line(
-      points={{-10,0},{-18,0},{-18,20.1},{-100.1,20.1}},
-      color={191,0,0},
-      smooth=Smooth.None));
-  connect(propsBus_b.surfCon, intCon_b.port_b) annotation (Line(
-      points={{-100.1,20.1},{-48,20.1},{-48,0},{-42,0}},
-      color={191,0,0},
-      smooth=Smooth.None));
-  connect(layMul.port_b, intCon_b.port_a) annotation (Line(
-      points={{-10,0},{-22,0}},
-      color={191,0,0},
-      smooth=Smooth.None));
-  connect(layMul.iEpsSw_b, propsBus_b.epsSw) annotation (Line(
-      points={{-10,4},{-22,4},{-22,20.1},{-100.1,20.1}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(layMul.iEpsLw_b, propsBus_b.epsLw) annotation (Line(
-      points={{-10,8},{-20,8},{-20,20.1},{-100.1,20.1}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(layMul.area, propsBus_b.area) annotation (Line(
-      points={{0,10},{0,20.1},{-100.1,20.1}},
-      color={0,0,127},
-      smooth=Smooth.None));
+  connect(constOne.y, crackOrOperableDoor.y);
+//assert(IDEAS.Utilities.Math.Functions.isAngle(inc,0) and hAbs_floor_a>hfloor_b, getInstanceName()+ "is a ceiling, but the floor of the zone at probsbus_b lies above the floor of zone at probsbus_a, this is probably a mistake",level=AssertionLevel.warning);
+//assert(IDEAS.Utilities.Math.Functions.isAngle(inc,Modelica.Constants.pi) and hAbs_floor_a<hfloor_b, getInstanceName()+ "is a floor, but the floor of the zone at probsbus_b lies above the floor of zone at probsbus_a, this is probably a mistake",level=AssertionLevel.warning);
+  assert(hasCavity == false or IDEAS.Utilities.Math.Functions.isAngle(incInt, IDEAS.Types.Tilt.Wall), "In " + getInstanceName() + ": Cavities are only supported for vertical walls, but inc=" + String(incInt) + ". The model is not accurate.", level = AssertionLevel.warning);
+  connect(layMul.port_b, propsBus_b.surfRad) annotation(
+    Line(points = {{-10, 0}, {-18, 0}, {-18, 20.1}, {-100.1, 20.1}}, color = {191, 0, 0}, smooth = Smooth.None));
+  connect(propsBus_b.surfCon, intCon_b.port_b) annotation(
+    Line(points = {{-100.1, 20.1}, {-48, 20.1}, {-48, 0}, {-42, 0}}, color = {191, 0, 0}, smooth = Smooth.None));
+  connect(layMul.port_b, intCon_b.port_a) annotation(
+    Line(points = {{-10, 0}, {-22, 0}}, color = {191, 0, 0}, smooth = Smooth.None));
+  connect(layMul.iEpsSw_b, propsBus_b.epsSw) annotation(
+    Line(points = {{-10, 4}, {-22, 4}, {-22, 20.1}, {-100.1, 20.1}}, color = {0, 0, 127}, smooth = Smooth.None));
+  connect(layMul.iEpsLw_b, propsBus_b.epsLw) annotation(
+    Line(points = {{-10, 8}, {-20, 8}, {-20, 20.1}, {-100.1, 20.1}}, color = {0, 0, 127}, smooth = Smooth.None));
+  connect(layMul.area, propsBus_b.area) annotation(
+    Line(points = {{0, 10}, {0, 20.1}, {-100.1, 20.1}}, color = {0, 0, 127}, smooth = Smooth.None));
   connect(iSolDif1.port, propsBus_b.iSolDif);
   connect(iSolDir1.port, propsBus_b.iSolDir);
   connect(QDesign_b.y, propsBus_b.QTra_design);
@@ -179,32 +176,28 @@ equation
   connect(Qgai_b.port, propsBus_b.Qgai);
   connect(E_b.port, propsBus_b.E);
   connect(E_b.E, E0.y);
-
-  connect(theConDoor.port_a, propsBus_b.surfCon) annotation (Line(points={{-10,40},
-          {-48,40},{-48,20.1},{-100.1,20.1}}, color={191,0,0}));
-  connect(theConDoor.port_b, propsBusInt.surfCon) annotation (Line(points={{10,40},
-          {46,40},{46,19.91},{56.09,19.91}},
-                                           color={191,0,0}));
-  connect(dooOpe.port_a2, propsBusInt.port_1) annotation (Line(points={{10,84},{
-          38,84},{38,19.91},{56.09,19.91}}, color={0,127,255}));
-  connect(dooOpe.port_b1, propsBusInt.port_2) annotation (Line(points={{10,96},{
-          42,96},{42,19.91},{56.09,19.91}}, color={0,127,255}));
-  connect(dooOpe.port_a1, propsBus_b.port_2) annotation (Line(points={{-10,96},{
-          -42,96},{-42,20.1},{-100.1,20.1}}, color={0,127,255}));
-  connect(dooOpe.port_b2, propsBus_b.port_1) annotation (Line(points={{-10,84},{
-          -38,84},{-38,20.1},{-100.1,20.1}}, color={0,127,255}));
-  connect(resDoor.port_a, propsBus_b.port_1) annotation (Line(points={{-10,68},{
-          -38,68},{-38,20.1},{-100.1,20.1}}, color={0,127,255}));
-  connect(resDoor.port_b, propsBusInt.port_1) annotation (Line(points={{10,68},{
-          38,68},{38,19.91},{56.09,19.91}}, color={0,127,255}));
-  connect(res1.port_a, propsBus_b.port_1) annotation (Line(points={{20,-40},{-60,
-          -40},{-60,20.1},{-100.1,20.1}}, color={0,127,255}));
-  connect(res2.port_a, propsBus_b.port_2) annotation (Line(points={{20,-60},{-60,
-          -60},{-60,20.1},{-100.1,20.1}}, color={0,127,255}));
-  connect(q50_zone.v50, propsBus_b.v50) annotation (Line(points={{79,-58},{56,
-          -58},{56,20.1},{-100.1,20.1}},   color={0,0,127}));
-  connect(q50_zone.using_custom_q50, propsBus_b.use_custom_q50) annotation (Line(points={{79,-52},
-          {56,-52},{56,20.1},{-100.1,20.1}},      color={0,0,127}));
+  connect(theConDoor.port_a, propsBus_b.surfCon) annotation(
+    Line(points = {{-10, 40}, {-48, 40}, {-48, 20.1}, {-100.1, 20.1}}, color = {191, 0, 0}));
+  connect(theConDoor.port_b, propsBusInt.surfCon) annotation(
+    Line(points = {{10, 40}, {46, 40}, {46, 19.91}, {56.09, 19.91}}, color = {191, 0, 0}));
+  connect(q50_zone.v50, propsBus_b.v50) annotation(
+    Line(points = {{79, -58}, {56, -58}, {56, 20.1}, {-100.1, 20.1}}, color = {0, 0, 127}));
+  connect(q50_zone.using_custom_q50, propsBus_b.use_custom_q50) annotation(
+    Line(points = {{79, -52}, {56, -52}, {56, 20.1}, {-100.1, 20.1}}, color = {0, 0, 127}));
+   if sim.use_port_1 then
+    connect(crackOrOperableDoor.port_a1, propsBus_b.port_1) annotation(
+      Line(points = {{20, -46}, {-60, -46}, {-60, 20}, {-100, 20}}, color = {0, 127, 255}));
+  end if;
+  if sim.use_port_2 then
+    connect(crackOrOperableDoor.port_b2, propsBus_b.port_2) annotation(
+      Line(points = {{20, -58}, {-58, -58}, {-58, 20}, {-100, 20}}));
+  end if;
+  connect(y_doo, crackOrOperableDoor.y) annotation(
+    Line(points = {{-80, 90}, {-52, 90}, {-52, -52}, {20, -52}}, color = {0, 0, 127}));
+  connect(boundary3_b.ports[1], propsBus_b.port_3) annotation(
+    Line(points = {{-40, -70}, {-52, -70}, {-52, 20}, {-100, 20}}, color = {0, 127, 255}));
+  connect(boundary3_a.ports[1], propsBusInt.port_3) annotation(
+    Line(points = {{40, -70}, {56, -70}, {56, 20}}, color = {0, 127, 255}));
   annotation (
     Icon(coordinateSystem(preserveAspectRatio=false,extent={{-60,-100},{60,100}}),
         graphics={
@@ -254,7 +247,7 @@ Each propsbus needs to be connected to a zone, which may be the same zone.
 </p>
 <p>
 Note that this model is not symmetric: the convection equations depend on the inclination <code>inc</code>,
-which is turned 180 degrees between both side. The value of <code>inc</code> is applied to the right side of the model.
+which is turned 180 degrees between both side. The value of <code>inc</code> is applied to the right side of the model (propsBus_a).
 </p>
 <p>
 Parameter <code>hasCavity</code> can be set to <code>true</code> to simulate heat transfer
@@ -262,7 +255,7 @@ through a cavity such as an open door in a simplified way.
 The cavity height <code>h</code> and width <code>w</code> then have to be specified.
 We assume that the value of <code>A</code> excludes the surface area of the cavity.
 </p>
-</html>", revisions="<html>
+</html>", revisions = "<html>
 <ul>
 <li>
 November 7, 2024, by Anna Dell'Isola and Jelger Jansen:<br/>
@@ -270,6 +263,18 @@ Update calculation of transmission design losses.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1337\">#1337</a>
 </li>
 <li>
+October 30, 2024, by Klaas De Jonge:<br/>
+Modifications for stack-effect interzonal airflow heights.
+</li>
+<li>
+Februari 18, 2024, by Filip Jorissen:<br/>
+Modifications for supporting trickle vents and interzonal airflow.
+</li>
+<li>
+July 9, 2023, by Filip Jorissen:<br/>
+Replaced door by operable door.
+</li>
+<li>
 August 2, 2022, by Filip Jorissen:<br/>
 Activating thermal model when using OnePorts.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1291\">
@@ -323,4 +328,4 @@ Adjusted implementation for computing conservation of energy.
 </li>
 </ul>
 </html>"));
-end InternalWall;
+end InternalWall;
\ No newline at end of file
diff --git a/IDEAS/Buildings/Components/OuterWall.mo b/IDEAS/Buildings/Components/OuterWall.mo
index 54114e40f1..fec84e9629 100644
--- a/IDEAS/Buildings/Components/OuterWall.mo
+++ b/IDEAS/Buildings/Components/OuterWall.mo
@@ -26,8 +26,17 @@ model OuterWall "Opaque building envelope construction"
   final parameter Real U_value=1/(1/8 + sum(constructionType.mats.R) + 1/25)
     "Wall U-value";
 
-  parameter Real coeffsCp[:,:]=[0,0.4; 45,0.1; 90,-0.3; 135,-0.35; 180,-0.2; 225,
-      -0.35; 270,-0.3; 315,0.1; 360,0.4]
+
+  replaceable parameter
+    IDEAS.Buildings.Data.WindPressureCoeff.Lowrise_Square_Exposed Cp_table
+    constrainedby IDEAS.Buildings.Data.Interfaces.WindPressureCoeff
+    "Table with default table for wind pressure coefficients for walls, floors and roofs"
+    annotation (
+    __Dymola_choicesAllMatching=true,
+    HideResult=true,
+    Placement(transformation(extent={{-34,78},{-30,82}})),
+    Dialog(tab="Airflow", group="Wind Pressure"));
+  parameter Real coeffsCp[:,:]= if inc<=Modelica.Constants.pi/18 then Cp_table.Cp_Roof_0_10 elseif inc<=Modelica.Constants.pi/6  then  Cp_table.Cp_Roof_11_30 elseif inc<=Modelica.Constants.pi/4 then Cp_table.Cp_Roof_30_45 elseif  IDEAS.Utilities.Math.Functions.isAngle(inc,Modelica.Constants.pi) then Cp_table.Cp_Floor else Cp_table.Cp_Wall
       "Cp at different angles of attack"
       annotation(Dialog(tab="Airflow", group="Wind Pressure"));
 
@@ -51,17 +60,27 @@ model OuterWall "Opaque building envelope construction"
       choicesAllMatching=true,
       Dialog(tab="Advanced",group="Shading"));
 
+
+  parameter Boolean use_custom_Cs = false
+    "if checked, Cs will be used instead of the default related to the interzonal airflow type "
+    annotation(Evaluate=true, choices(checkBox=true),Dialog(enable=true,tab="Airflow", group="Wind Pressure"));
+
+  parameter Boolean  use_sim_Cs =sim.use_sim_Cs "if checked, the default Cs of each surface in the building is sim.Cs"
+  annotation(choices(checkBox=true),Dialog(enable=not use_custom_Cs,tab="Airflow", group="Wind Pressure"));
+
   parameter Real Cs=sim.Cs
                        "Wind speed modifier"
-    annotation (Dialog(tab="Airflow", group="Wind Pressure"));
-  parameter Real Habs=1
-    "Absolute height of boundary for correcting the wind speed"
-    annotation (Dialog(tab="Airflow", group="Wind Pressure"));
+    annotation (Dialog(enable=use_custom_Cs,tab="Airflow", group="Wind Pressure"));
+  final parameter Real Habs=hAbs_floor_a + hRelSurfBot_a + (hVertical/2)
+    "Absolute height of the center of the surface for correcting the wind speed, used in TwoPort implementation"
+    annotation (Dialog(tab="Airflow", group="Wind"));
+
   IDEAS.BoundaryConditions.SolarIrradiation.RadSolData radSolData(
     inc=incInt,
     azi=aziInt,
     useLinearisation=sim.lineariseDymola)
     annotation (Placement(transformation(extent={{-100,-6},{-80,14}})));
+
 protected
   IDEAS.Buildings.Components.BaseClasses.ConvectiveHeatTransfer.ExteriorConvection
     extCon(
@@ -88,13 +107,24 @@ protected
     redeclare package Medium = Medium,
     final table=coeffsCp,
     final azi=aziInt,
-    Cs=Cs,
-    Habs=Habs,
+    Cs=if not use_custom_Cs and sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts
+         and not use_sim_Cs then sim.Cs_coeff*(Habs^(2*sim.a)) elseif not
+        use_custom_Cs then sim.Cs else Cs,
+    Habs=if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts
+         then Habs else sim.HPres,
     nPorts=if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.OnePort
          then 1 else 2)
  if sim.interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None
     "Outside air model"
     annotation (Placement(transformation(extent={{-100,-60},{-80,-40}})));
+    
+  IDEAS.Fluid.Sources.MassFlowSource_T boundary3(
+    redeclare package Medium = Medium, 
+    m_flow = 1e-10, 
+    nPorts = 1)  if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts
+     "Boundary for bus a" annotation(
+    Placement(transformation(origin = {48, -4}, extent = {{-28, -76}, {-8, -56}})));
+
 initial equation
   QTra_design =U_value*A*(TRefZon - Tdes.y);
 
@@ -170,11 +200,17 @@ equation
   connect(shaType.HShaGroDifTil, solDif.u2) annotation (Line(points={{-64.5,36},
           {-56,36},{-56,1.6},{-54.8,1.6}}, color={0,0,127}));
   connect(radSolData.hForcedConExt, extCon.hForcedConExt) annotation (Line(points={{-79.4,
-          -8.2},{-46,-8.2},{-46,-22},{-44,-22}},           color={0,0,127}));
-  connect(res1.port_a, outsideAir.ports[1]) annotation (Line(points={{20,-40},{16,
-          -40},{16,-50},{-80,-50}}, color={0,127,255}));
-  connect(res2.port_a, outsideAir.ports[2]) annotation (Line(points={{20,-60},{16,
+          -8.2},{-46,-8.2},{-46,-34},{-16,-34},{-16,-27},{-22,-27}},color={0,0,127}));
+  if sim.interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None then
+    connect(crackOrOperableDoor.port_a1, outsideAir.ports[1]) annotation (Line(points={{20,-36},{
+          16,-36},{16,-50},{-80,-50}},color={0,127,255}));
+  end if;
+  if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts then
+    connect(crackOrOperableDoor.port_b2, outsideAir.ports[2]) annotation (Line(points={{20,-60},{16,
           -60},{16,-50},{-80,-50}}, color={0,127,255}));
+  end if;
+  connect(boundary3.ports[1], propsBusInt.port_3) annotation(
+    Line(points = {{40, -70}, {56, -70}, {56, 20}}, color = {0, 127, 255}));
   annotation (
     Icon(coordinateSystem(preserveAspectRatio=true, extent={{-60,-100},{60,100}}),
         graphics={
@@ -273,6 +309,14 @@ Update calculation of transmission design losses.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1337\">#1337</a>
 </li>
 <li>
+October 30, 2024, by Klaas De Jonge:<br/>
+Modifications for stack-effect interzonal airflow heights and wind pressure profiles.
+</li>
+<li>
+Februari 18, 2024, by Filip Jorissen:<br/>
+Modifications for supporting trickle vents and interzonal airflow.
+</li>
+<li>
 July 18, 2022, by Filip Jorissen:<br/>
 Revised code for supporting new shading model.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1270\">
@@ -338,4 +382,4 @@ Adjusted implementation for grouping of solar calculations.
 </li>
 </ul>
 </html>"));
-end OuterWall;
+end OuterWall;
\ No newline at end of file
diff --git a/IDEAS/Buildings/Components/RectangularZoneTemplate.mo b/IDEAS/Buildings/Components/RectangularZoneTemplate.mo
index 452a886478..27da5d63ab 100644
--- a/IDEAS/Buildings/Components/RectangularZoneTemplate.mo
+++ b/IDEAS/Buildings/Components/RectangularZoneTemplate.mo
@@ -1,7 +1,13 @@
 within IDEAS.Buildings.Components;
 model RectangularZoneTemplate
   "Rectangular zone including walls, floor and ceiling"
-  extends IDEAS.Buildings.Components.Interfaces.RectangularZoneTemplateInterface;
+  extends IDEAS.Buildings.Components.Interfaces.RectangularZoneTemplateInterface(
+    fraTypA(briTyp(len=2*h_winA + 2*A_winA/h_winA)),
+    fraTypB(briTyp(len=2*h_winB + 2*A_winB/h_winB)),
+    fraTypC(briTyp(len=2*h_winC + 2*A_winC/h_winC)),
+    fraTypD(briTyp(len=2*h_winD + 2*A_winD/h_winD)),
+    fraTypCei(briTyp(len=2*h_winCei + 2*A_winCei/h_winCei)));
+
 
   Modelica.Blocks.Interfaces.RealInput ctrlA
                                             if shaTypA.controlled
@@ -53,7 +59,7 @@ model RectangularZoneTemplate
 
 
 replaceable
-  IDEAS.Buildings.Components.Window winA(azi=aziAInt, inc=IDEAS.Types.Tilt.Wall,
+  IDEAS.Buildings.Components.Window winA(azi=aziAInt, inc=IDEAS.Types.Tilt.Wall, 
     glazing(
       checkLowPerformanceGlazing=glazingA.checkLowPerformanceGlazing,
       nLay=glazingA.nLay,
@@ -65,6 +71,7 @@ replaceable
       U_value=glazingA.U_value,
       g_value=glazingA.g_value),
     A=A_winA,
+    hWin=h_winA,
     redeclare package Medium = Medium,
     frac=fracA,
     T_start=T_start,
@@ -87,13 +94,13 @@ replaceable
   L=shaTypA.L,
   dh=shaTypA.dh,
   shaCorr=shaTypA.shaCorr)),
-    fraType(present=fraTypA.present,
-            U_value=fraTypA.U_value),
+    fraType(present=fraTypA.present, U_value=fraTypA.U_value),
     linExtRad=linExtRadWin,
     nWin=nWinA)
     if hasWinA constrainedby Window(
        azi=aziAInt,
        inc=IDEAS.Types.Tilt.Wall,
+       hWin=h_winA,
        T_start=T_start,
        linIntCon_a=linIntCon,
        dT_nominal_a=dT_nominal_win,
@@ -120,6 +127,7 @@ replaceable
       U_value=glazingB.U_value,
       g_value=glazingB.g_value),
     A=A_winB,
+    hWin=h_winB,
     redeclare package Medium = Medium,
     frac=fracB,
     azi=aziB,
@@ -143,11 +151,12 @@ replaceable
   L=shaTypB.L,
   dh=shaTypB.dh,
   shaCorr=shaTypB.shaCorr)),
-    fraType(present=fraTypB.present, U_value=fraTypB.U_value),
+    fraType(present=fraTypB.present,  U_value=fraTypB.U_value),
     linExtRad=linExtRadWin,
     nWin=nWinB)
     if hasWinB constrainedby Window(
        azi=aziB,
+       hWin=h_winB,
        inc=IDEAS.Types.Tilt.Wall,
        T_start=T_start,
        linIntCon_a=linIntCon,
@@ -177,6 +186,7 @@ replaceable
       U_value=glazingC.U_value,
       g_value=glazingC.g_value),
     A=A_winC,
+    hWin=h_winC,
     redeclare package Medium = Medium,
     frac=fracC,
     azi=aziC,
@@ -200,7 +210,7 @@ replaceable
   L=shaTypC.L,
   dh=shaTypC.dh,
   shaCorr=shaTypC.shaCorr)),
-    fraType(present=fraTypC.present, U_value=fraTypC.U_value),
+    fraType(present=fraTypC.present,  U_value=fraTypC.U_value),
     linExtRad=linExtRadWin,
     nWin=nWinC)
     if hasWinC constrainedby Window(
@@ -208,6 +218,7 @@ replaceable
        inc=IDEAS.Types.Tilt.Wall,
        T_start=T_start,
        linIntCon_a=linIntCon,
+       hWin=h_winC,
        dT_nominal_a=dT_nominal_win,
        linExtCon=linExtCon,
        windowDynamicsType=windowDynamicsType,
@@ -234,6 +245,7 @@ replaceable
       U_value=glazingD.U_value,
       g_value=glazingD.g_value),
     A=A_winD,
+    hWin=h_winD,
     redeclare package Medium = Medium,
     frac=fracD,
     T_start=T_start,
@@ -256,11 +268,12 @@ replaceable
   L=shaTypD.L,
   dh=shaTypD.dh,
   shaCorr=shaTypD.shaCorr)),
-    fraType(present=fraTypD.present, U_value=fraTypD.U_value),
+    fraType(present=fraTypD.present,  U_value=fraTypD.U_value),
     linExtRad=linExtRadWin,
     nWin=nWinD)
     if hasWinD constrainedby Window(
        azi=aziD,
+       hWin=h_winD,
        inc=IDEAS.Types.Tilt.Wall,
        T_start=T_start,
        linIntCon_a=linIntCon,
@@ -290,6 +303,7 @@ replaceable
       U_value=glazingCei.U_value,
       g_value=glazingCei.g_value),
     A=A_winCei,
+    hWin=h_winCei,
     redeclare package Medium = Medium,
     frac=fracCei,
     T_start=T_start,
@@ -312,13 +326,14 @@ replaceable
   L=shaTypCei.L,
   dh=shaTypCei.dh,
   shaCorr=shaTypCei.shaCorr)),
-    fraType(present=fraTypCei.present, U_value=fraTypCei.U_value),
+    fraType(present=fraTypCei.present,  U_value=fraTypCei.U_value),
     linExtRad=linExtRadWin,
     nWin=nWinCei)
     if hasWinCei constrainedby Window(
        azi=aziAInt,
        inc=IDEAS.Types.Tilt.Wall,
        T_start=T_start,
+       hWin=h_winCei,
        linIntCon_a=linIntCon,
        dT_nominal_a=dT_nominal_win,
        linExtCon=linExtCon,
diff --git a/IDEAS/Buildings/Components/Shading/BoxAndScreen.mo b/IDEAS/Buildings/Components/Shading/BoxAndScreen.mo
index 94252ce185..e751677a38 100644
--- a/IDEAS/Buildings/Components/Shading/BoxAndScreen.mo
+++ b/IDEAS/Buildings/Components/Shading/BoxAndScreen.mo
@@ -36,6 +36,8 @@ model BoxAndScreen "Box and screen shading"
       redeclare IDEAS.Buildings.Components.Shading.Screen stateShading1(
         azi=azi,
         shaCorr=shaCorr,
+        epsSw_shading=epsSw_shading,
+        refSw_shading=1-epsSw_shading-shaCorr,
         haveBoundaryPorts=false),
       redeclare IDEAS.Buildings.Components.Shading.Box stateShading2(
         azi=azi,
diff --git a/IDEAS/Buildings/Components/Shading/Interfaces/DoubleShading.mo b/IDEAS/Buildings/Components/Shading/Interfaces/DoubleShading.mo
index 5b1baa2227..2fff4d0d47 100644
--- a/IDEAS/Buildings/Components/Shading/Interfaces/DoubleShading.mo
+++ b/IDEAS/Buildings/Components/Shading/Interfaces/DoubleShading.mo
@@ -114,7 +114,11 @@ equation
   connect(hForcedConExt, stateShading1.hForcedConExt) annotation (Line(points={{-60,110},
           {-8,110},{-8,-3.33333},{-25.5,-3.33333}},          color={0,0,127}));
   connect(TEnv, stateShading1.TEnv) annotation (Line(points={{-60,90},{-10,90},
-          {-10,-4.66667},{-25.5,-4.66667}},color={0,0,127}));
+          {-10,-4.66667},{-25.5,-4.66667}},color={0,0,127}));  
+  connect(stateShading2.m_flow, m_flow) annotation(
+    Line(points = {{2, -18}, {40, -18}, {40, -90}}, color = {0, 0, 127}));
+  connect(stateShading1.m_flow, m_flow) annotation(
+    Line(points = {{-22, -18}, {40, -18}, {40, -90}}, color = {0, 0, 127}));
   annotation (Diagram(coordinateSystem(preserveAspectRatio = false, extent = {{-100, -100}, {100, 200}})), Documentation(revisions="<html>
 <ul>
 <li>
@@ -140,4 +144,4 @@ First implementation.
 <p>This model can be extended or used if two shading models need to be combined.</p>
 </html>"),
     Icon(coordinateSystem(extent = {{-100, -100}, {100, 200}}, preserveAspectRatio = false)));
-end DoubleShading;
+end DoubleShading;
\ No newline at end of file
diff --git a/IDEAS/Buildings/Components/Shading/Interfaces/PartialShading.mo b/IDEAS/Buildings/Components/Shading/Interfaces/PartialShading.mo
index 068abef99c..01c3bfde21 100644
--- a/IDEAS/Buildings/Components/Shading/Interfaces/PartialShading.mo
+++ b/IDEAS/Buildings/Components/Shading/Interfaces/PartialShading.mo
@@ -97,6 +97,8 @@ partial model PartialShading "Window shading partial"
     Placement(visible = true, transformation(extent = {{-80, 90}, {-40, 130}}, rotation = 0), iconTransformation(origin = {-50, 120}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   Modelica.Blocks.Interfaces.RealOutput TDryBul if haveBoundaryPorts "Exterior surface air temperature" annotation (
     Placement(visible = true, transformation(extent = {{20, -30}, {60, 10}}, rotation = 0), iconTransformation(extent = {{40, -10}, {60, 10}}, rotation = 0)));
+  Modelica.Blocks.Interfaces.RealInput m_flow annotation(
+    Placement(visible = true, transformation(origin = {-20, 0}, extent = {{80, -110}, {40, -70}}, rotation = 0), iconTransformation(origin = {30, -100}, extent = {{10, -10}, {-10, 10}}, rotation = -90)));
 protected
   Modelica.Blocks.Interfaces.RealInput Te_internal(unit="K");
   Modelica.Blocks.Interfaces.RealInput Ctrl_internal
diff --git a/IDEAS/Buildings/Components/Shading/OverhangAndScreen.mo b/IDEAS/Buildings/Components/Shading/OverhangAndScreen.mo
index 59404a0364..614fe66163 100644
--- a/IDEAS/Buildings/Components/Shading/OverhangAndScreen.mo
+++ b/IDEAS/Buildings/Components/Shading/OverhangAndScreen.mo
@@ -24,6 +24,8 @@ model OverhangAndScreen "Roof overhangs and screen shading"
   extends IDEAS.Buildings.Components.Shading.Interfaces.DoubleShading(
       redeclare IDEAS.Buildings.Components.Shading.Screen stateShading1(
         azi=azi,
+        epsSw_shading=epsSw_shading,
+        refSw_shading=1-epsSw_shading-shaCorr,
         shaCorr=shaCorr),
       redeclare IDEAS.Buildings.Components.Shading.Overhang stateShading2(
         azi=azi,
@@ -32,7 +34,8 @@ model OverhangAndScreen "Roof overhangs and screen shading"
         wLeft=wLeft,
         wRight=wRight,
         dep=dep,
-        gap=gap));
+        gap=gap,
+        haveBoundaryPorts=false));
 
 initial equation
 
diff --git a/IDEAS/Buildings/Components/Shading/Screen.mo b/IDEAS/Buildings/Components/Shading/Screen.mo
index f2e77a8fbe..cfa84a2adf 100644
--- a/IDEAS/Buildings/Components/Shading/Screen.mo
+++ b/IDEAS/Buildings/Components/Shading/Screen.mo
@@ -3,27 +3,30 @@ model Screen "Controllable exterior screen"
   extends IDEAS.Buildings.Components.Shading.Interfaces.PartialShadingDevice(
     TSha = TShaScreen,
     TDryBul_internal = Ctrl_internal*TSha + (1-Ctrl_internal)*Te_internal,
-    epsSw_shading = 1 - shaCorr,
+    epsSw_shading = 1 - shaCorr - refSw_shading,
     final controlled = true,
     TEnvExpr(y = TEnv_screen),
     TeExpr(y = TDryBul_internal));
 
   parameter Real shaCorr(min=0, max=1) = 0.24
     "Shortwave transmittance of the screen";
-
+  parameter Real refSw_shading(min=0, max=1) = 0
+    "Shortwave reflectance of the screen";
+    
 protected
+  constant Modelica.Units.SI.SpecificHeatCapacity cp_air = 1004 "Specific heat capacity";
   Modelica.Units.SI.Temperature TEnv_screen = Ctrl_internal*TSha + (1-Ctrl_internal)*TEnv_internal
     "Assuming the environment temperature is a weighted average of the shading device temperature and the ambient temperature";
   // This assumes that the window rejects 1-g_glazing of the incoming solar irradation is entirely converted into sensible heat
-  Modelica.Units.SI.Temperature TShaScreen = Te_internal + (HSha*(1-g_glazing) + (H - HSha) * epsSw_shading) /hSha
+  Modelica.Units.SI.Temperature TShaScreen = Te_internal + (HSha*(1-g_glazing) + (H - HSha) * epsSw_shading) /(hSha + abs(m_flow)*cp_air)
     "Modified shading device heat balance";
 initial equation
-  assert(shaCorr + epsSw_shading <= 1, "In " + getInstanceName() +
-    ": The sum of the screen transmittance 'shaCorr' and absorptance 'epsSw_shading' is larger than one. This is non-physical.");
+  assert( abs(shaCorr + refSw_shading + epsSw_shading - 1) < 1e-3, "In " + getInstanceName() +
+    ": The sum of the screen transmittance 'shaCorr', reflectance 'refSw_shading' and absorptance 'epsSw_shading' does not equal one. This is non-physical.");
 equation
-  HShaDirTil = HDirTil*(1 - Ctrl_internal);
-  HShaSkyDifTil = HSkyDifTil*(1 - Ctrl_internal) + HSkyDifTil*Ctrl_internal*shaCorr + HDirTil*Ctrl_internal*shaCorr;
-  HShaGroDifTil = HGroDifTil*(1 - Ctrl_internal) + HGroDifTil*Ctrl_internal*shaCorr;
+  HShaDirTil = HDirTil*((1 - Ctrl_internal) + Ctrl_internal*shaCorr);
+  HShaSkyDifTil = HSkyDifTil*((1 - Ctrl_internal) + Ctrl_internal*shaCorr);
+  HShaGroDifTil = HGroDifTil*((1 - Ctrl_internal) + Ctrl_internal*shaCorr);
 
   connect(angInc, iAngInc) annotation (Line(points={{-60,-50},{-14,-50},{-14,
           -50},{40,-50}}, color={0,0,127}));
@@ -41,11 +44,21 @@ A fraction <code>shaCorr</code> is converted into diffuse light that enters the
 July 26, 2024 by Jelger Jansen:<br/>
 Replace <code>Ctrl</code> by <code>Ctrl_internal</code> to avoid using a conditional component in a connect statement.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1367\">#1367</a>.
+</li>
 <li>
 June 12, 2024 by Lucas Verleyen:<br/>
 Remove limiter block. See <a href=\"https://github.com/open-ideas/IDEAS/issues/1290\">#1290</a>.
 </li>
 <li>
+September 7, 2023 by Filip Jorissen:<br/>
+Created flow rate dependency for screen surface temperature.
+</li>
+<li>
+July 9, 2023 by Filip Jorissen:<br/>
+Added reflectance coefficient parameter. 
+No longer converting transmitted direct solar irradiation into diffuse solar irradiation.
+</li>
+<li>
 July 18, 2022 by Filip Jorissen:<br/>
 Refactored for <a href=\"https://github.com/open-ideas/IDEAS/issues/1270\">#1270</a> for including thermal effect of screens.
 </li>
diff --git a/IDEAS/Buildings/Components/Shading/Shading.mo b/IDEAS/Buildings/Components/Shading/Shading.mo
index 39823668fe..8ce4bdfd3b 100644
--- a/IDEAS/Buildings/Components/Shading/Shading.mo
+++ b/IDEAS/Buildings/Components/Shading/Shading.mo
@@ -117,6 +117,7 @@ protected
     epsLw_frame=epsLw_frame,
     epsLw_glazing=epsLw_glazing,
     epsSw_shading=epsSw_shading,
+    refSw_shading=1-epsSw_shading-shaPro.shaCorr,
     g_glazing=g_glazing,
     linCon=linCon,
     linRad=linRad,
@@ -700,7 +701,28 @@ equation
   connect(boxAndScreen.TDryBul, TDryBul) annotation (Line(points={{-8.5,
           -55.3333},{40,-55.3333},{40,-10}},
                                    color={0,0,127}));
-
+  
+  
+  connect(m_flow, boxAndScreen.m_flow) annotation(
+    Line(points = {{40, -90}, {-12, -90}, {-12, -62}, {-10, -62}}, color = {0, 0, 127}));
+  connect(m_flow, none.m_flow) annotation(
+    Line(points = {{40, -90}, {-10, -90}, {-10, -40}}, color = {0, 0, 127}));
+  connect(m_flow, sideFins.m_flow) annotation(
+    Line(points = {{40, -90}, {-10, -90}, {-10, -20}}, color = {0, 0, 127}));
+  connect(m_flow, screen.m_flow) annotation(
+    Line(points = {{40, -90}, {-10, -90}, {-10, 0}}, color = {0, 0, 127}));
+  connect(m_flow, overhangAndScreen.m_flow) annotation(
+    Line(points = {{40, -90}, {-10, -90}, {-10, 20}}, color = {0, 0, 127}));
+  connect(m_flow, overhang.m_flow) annotation(
+    Line(points = {{40, -90}, {-10, -90}, {-10, 40}}, color = {0, 0, 127}));
+  connect(m_flow, buildingShade.m_flow) annotation(
+    Line(points = {{40, -90}, {-10, -90}, {-10, 60}}, color = {0, 0, 127}));
+  connect(m_flow, box.m_flow) annotation(
+    Line(points = {{40, -90}, {-10, -90}, {-10, 80}}, color = {0, 0, 127}));
+  connect(m_flow, horizontalFins.m_flow) annotation(
+    Line(points = {{40, -90}, {-10, -90}, {-10, 100}}, color = {0, 0, 127}));
+  connect(m_flow, overhangAndHorizontalFins.m_flow) annotation(
+    Line(points = {{40, -90}, {-10, -90}, {-10, 120}}, color = {0, 0, 127}));
   annotation (Documentation(revisions="<html>
 <ul>
 <li>
@@ -732,4 +754,4 @@ See <a href=\"https://github.com/open-ideas/IDEAS/issues/735\">
 </html>"),
     Diagram(coordinateSystem(extent={{-100,-100},{100,200}})),
     Icon(coordinateSystem(extent={{-100,-100},{100,200}})));
-end Shading;
+end Shading;
\ No newline at end of file
diff --git a/IDEAS/Buildings/Components/SlabOnGround.mo b/IDEAS/Buildings/Components/SlabOnGround.mo
index f86676fd37..857dbdddc7 100644
--- a/IDEAS/Buildings/Components/SlabOnGround.mo
+++ b/IDEAS/Buildings/Components/SlabOnGround.mo
@@ -4,9 +4,9 @@ model SlabOnGround "opaque floor on ground slab"
     custom_q50=0,
     final use_custom_q50=true,
     final nWin=1,
-    add_cracks=false,
-    dT_nominal_a=-3,
     final QTra_design(fixed=false),
+    add_door=false,
+    dT_nominal_a=-3,
     inc=IDEAS.Types.Tilt.Floor,
     azi=0,
     redeclare replaceable Data.Constructions.FloorOnGround constructionType,
@@ -47,9 +47,9 @@ model SlabOnGround "opaque floor on ground slab"
   IDEAS.Fluid.Sources.MassFlowSource_T boundary2(
     redeclare package Medium = Medium,
     nPorts=1,
-    final m_flow=0)
+    final m_flow=1e-10)
     if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts
-    annotation (Placement(transformation(extent={{-28,-76},{-8,-56}})));
+    annotation (Placement(transformation(origin = {0, 16}, extent = {{-28, -76}, {-8, -56}})));
 protected
   final parameter IDEAS.Buildings.Data.Materials.Ground ground1(final d=0.50);
   final parameter IDEAS.Buildings.Data.Materials.Ground ground2(final d=0.33);
@@ -97,6 +97,12 @@ protected
       outputAngles=sim.outputAngles)
     "Weather data bus connectable to weaBus connector from Buildings Library"
     annotation (Placement(transformation(extent={{46,-90},{66,-70}})));
+  IDEAS.Fluid.Sources.MassFlowSource_T boundary3(
+    redeclare package Medium = Medium, 
+    m_flow = 1e-10, 
+    nPorts = 1)  if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts
+     "Boundary for bus a" annotation(
+    Placement(transformation(origin = {0, -4}, extent = {{-28, -76}, {-8, -56}})));
 
 initial equation
     QTra_design=UEqui*A*(TRefZon - weaBus.TGroundDes);
@@ -124,8 +130,10 @@ equation
       horizontalAlignment=TextAlignment.Left));
   connect(boundary1.ports[1], propsBusInt.port_1) annotation (Line(points={{-8,-30},
           {42,-30},{42,19.91},{56.09,19.91}}, color={0,127,255}));
-  connect(boundary2.ports[1], propsBusInt.port_2) annotation (Line(points={{-8,-66},
-          {44,-66},{44,19.91},{56.09,19.91}},                   color={0,127,255}));
+  connect(boundary2.ports[1], propsBusInt.port_2) annotation (Line(points={{-8,-50},
+          {44,-50},{44,19.91},{56.09,19.91}},                   color={0,127,255}));
+  connect(boundary3.ports[1], propsBusInt.port_3) annotation(
+    Line(points = {{-8, -70}, {56, -70}, {56, 20}}, color = {0, 127, 255}));
   annotation (
     Icon(coordinateSystem(preserveAspectRatio=true, extent={{-60,-100},{60,100}}),
         graphics={
@@ -195,6 +203,10 @@ Created final and protected parameter <code>T_start_gro</code> for initial tempe
 See <a href=https://github.com/open-ideas/IDEAS/issues/1292>#1292</a> for more information.
 </li>
 <li>
+Februari 18, 2024, by Filip Jorissen:<br/>
+Modifications for supporting trickle vents and interzonal airflow.
+</li>
+<li>
 April 26, 2020, by Filip Jorissen:<br/>
 Refactored <code>SolBus</code> to avoid many instances in <code>PropsBus</code>.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1131\">
@@ -256,4 +268,4 @@ Adjusted implementation for computing conservation of energy.
 </li>
 </ul>
 </html>"));
-end SlabOnGround;
+end SlabOnGround;
\ No newline at end of file
diff --git a/IDEAS/Buildings/Components/ThermalBridges/BaseClasses/ThermalBridge.mo b/IDEAS/Buildings/Components/ThermalBridges/BaseClasses/ThermalBridge.mo
index a30997949c..16ea85f907 100644
--- a/IDEAS/Buildings/Components/ThermalBridges/BaseClasses/ThermalBridge.mo
+++ b/IDEAS/Buildings/Components/ThermalBridges/BaseClasses/ThermalBridge.mo
@@ -2,9 +2,10 @@ within IDEAS.Buildings.Components.ThermalBridges.BaseClasses;
 record ThermalBridge "Record data for thermal bridges"
 
   parameter Modelica.Units.SI.ThermalConductance G "Effective thermal loss";
-  parameter Boolean present = true
-    annotation(Evaluate=true);
-
+    
+  // this parameter is set by the window model and should not be modified when extending:
+  parameter Modelica.Units.SI.Length len "Perimeter of the thermal bridge";
+  
   annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
         coordinateSystem(preserveAspectRatio=false)));
 end ThermalBridge;
diff --git a/IDEAS/Buildings/Components/ThermalBridges/LineLosses.mo b/IDEAS/Buildings/Components/ThermalBridges/LineLosses.mo
index 79207108b1..ccf02f5a17 100644
--- a/IDEAS/Buildings/Components/ThermalBridges/LineLosses.mo
+++ b/IDEAS/Buildings/Components/ThermalBridges/LineLosses.mo
@@ -2,10 +2,9 @@ within IDEAS.Buildings.Components.ThermalBridges;
 record LineLosses "Line loss caused by thermal bridges "
 
   extends IDEAS.Buildings.Components.ThermalBridges.BaseClasses.ThermalBridge(
-                                                              final G=psi*len, final present=true);
+    final G=psi*len);
 
   parameter Real psi(unit="W/(m.K)") = 0.15 "Linear heat loss coefficient";
-  parameter Modelica.Units.SI.Length len=1 "Perimeter of the thermal bridge";
 
   annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
         coordinateSystem(preserveAspectRatio=false)));
diff --git a/IDEAS/Buildings/Components/ThermalBridges/None.mo b/IDEAS/Buildings/Components/ThermalBridges/None.mo
index ac5232ddd6..a717011398 100644
--- a/IDEAS/Buildings/Components/ThermalBridges/None.mo
+++ b/IDEAS/Buildings/Components/ThermalBridges/None.mo
@@ -2,8 +2,7 @@ within IDEAS.Buildings.Components.ThermalBridges;
 record None "No thermal bridge included"
 
   extends IDEAS.Buildings.Components.ThermalBridges.BaseClasses.ThermalBridge(
-    final G=0,
-    final present=false);
+    final G=0);
 
   annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
         coordinateSystem(preserveAspectRatio=false)));
diff --git a/IDEAS/Buildings/Components/Validations/WindowEN673.mo b/IDEAS/Buildings/Components/Validations/WindowEN673.mo
index 3c16afa2ac..87d6115b43 100644
--- a/IDEAS/Buildings/Components/Validations/WindowEN673.mo
+++ b/IDEAS/Buildings/Components/Validations/WindowEN673.mo
@@ -92,6 +92,7 @@ model WindowEN673 "Verifies U value of a glazing record"
     inc=IDEAS.Types.Tilt.Wall,
     azi=IDEAS.Types.Azimuth.S,
     A=1,
+    frac=0,
     gainDir(k=0),
     gainDif(k=0),
     redeclare Data.Glazing.Ins2Ar2020 glazing,
@@ -147,6 +148,10 @@ equation
       __Dymola_Algorithm="Lsodar"),        Documentation(revisions="<html>
 <ul>
 <li>
+November 6, 2023, by Filip Jorissen:<br/>
+Set frame fraction to zero in normal window.
+</li>
+<li>
 July 20, 2020, by Filip Jorissen:<br/>
 Updated glazing type.
 </li>
diff --git a/IDEAS/Buildings/Components/Window.mo b/IDEAS/Buildings/Components/Window.mo
index e9d75baba0..ae6744b172 100644
--- a/IDEAS/Buildings/Components/Window.mo
+++ b/IDEAS/Buildings/Components/Window.mo
@@ -25,10 +25,21 @@ model Window "Multipane window"
       dT_nom_air=5,
       linIntCon=true,
       checkCoatings=glazing.checkLowPerformanceGlazing),
-    setArea(A=A_glass*nWin),
-    q50_zone(v50_surf=q50_internal*A_glass),
-    res1(A=if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts then A_glass/2 else A_glass),
-    res2(A=A_glass/2));
+    setArea(A=A*nWin),
+    hRelSurfBot_a=if IDEAS.Utilities.Math.Functions.isAngle(inc, IDEAS.Types.Tilt.Ceiling) then hzone_a elseif IDEAS.Utilities.Math.Functions.isAngle(inc, IDEAS.Types.Tilt.Floor) then 0 else
+                                                                                                                                                                                              (hzone_a - hVertical)/2,
+    hVertical=if IDEAS.Utilities.Math.Functions.isAngle(inc, IDEAS.Types.Tilt.Floor) or IDEAS.Utilities.Math.Functions.isAngle(inc, IDEAS.Types.Tilt.Ceiling) then 0 else hWin,
+    q50_zone(v50_surf=q50_internal*A),
+    crackOrOperableDoor(
+      wOpe=A/hWin,
+      hOpe=hWin,
+      hA=0.5*hVertical,
+      hB=0.5*hzone_a - hRelSurfBot_a,
+          openDoorOnePort=false,
+          useDoor = use_operable_window));
+  parameter Modelica.Units.SI.Length hWin(min=0.1) = max(0.1,sqrt(A))
+    "Window height, including frame"
+    annotation ();
   parameter Boolean linExtCon=sim.linExtCon
     "= true, if exterior convective heat transfer should be linearised (uses average wind speed)"
     annotation(Dialog(tab="Convection"));
@@ -51,7 +62,8 @@ model Window "Multipane window"
     annotation(Dialog(tab="Advanced",group="Icon"));
 
   replaceable parameter IDEAS.Buildings.Data.Frames.None fraType
-    constrainedby IDEAS.Buildings.Data.Interfaces.Frame "Window frame type"
+    constrainedby IDEAS.Buildings.Data.Interfaces.Frame(briTyp(final len=briLen))
+    "Window frame type"
     annotation (choicesAllMatching=true, Dialog(group=
           "Construction details"));
   replaceable IDEAS.Buildings.Components.Shading.None shaType
@@ -72,28 +84,43 @@ model Window "Multipane window"
       choicesAllMatching=true, Dialog(group="Construction details"));
 
   Modelica.Blocks.Interfaces.RealInput Ctrl if controlled
-    "Control signal between 0 and 1, i.e. 1 is fully closed" annotation (
+    "Control signal for screen between 0 and 1, 1 is fully closed" annotation (
       Placement(visible = true,transformation(
         origin={-50,-110},extent={{20,-20},{-20,20}},
         rotation=-90), iconTransformation(
         origin={-40,-100},extent={{10,-10},{-10,10}},
         rotation=-90)));
 
+  replaceable parameter IDEAS.Buildings.Data.WindPressureCoeff.Lowrise_Square_Exposed Cp_table
+    constrainedby IDEAS.Buildings.Data.Interfaces.WindPressureCoeff
+    "Tables with wind pressure coefficients for walls, floors and roofs"
+    annotation (
+    HideResult=true,
+    __Dymola_choicesAllMatching=true,
+    Placement(transformation(extent={{-34,78},{-30,82}})),
+    Dialog(tab="Airflow", group="Wind Pressure"));
 
+  parameter Real coeffsCp[:,:]= if inc<=Modelica.Constants.pi/18 then Cp_table.Cp_Roof_0_10 elseif inc<=Modelica.Constants.pi/6  then  Cp_table.Cp_Roof_11_30 elseif inc<=Modelica.Constants.pi/4 then Cp_table.Cp_Roof_30_45 elseif  IDEAS.Utilities.Math.Functions.isAngle(inc,Modelica.Constants.pi) then Cp_table.Cp_Floor else Cp_table.Cp_Wall
+      "Cp at different angles of attack, default the correct table will be selected from Cp_table based on the surface tilt"
+      annotation(Dialog(tab="Airflow", group="Wind Pressure"));
+
+  parameter Boolean use_custom_Cs = false
+    "if checked, Cs will be used in stead of the default related to the interzonal airflow type "
+    annotation(choices(checkBox=true),Dialog(enable=true,tab="Airflow", group="Wind Pressure"));
+
+  parameter Boolean  use_sim_Cs =sim.use_sim_Cs "if checked, the default Cs of each surface in the building is sim.Cs"
+  annotation(choices(checkBox=true),Dialog(enable=not use_custom_Cs,tab="Airflow", group="Wind Pressure"));
 
-  parameter Real coeffsCp[:,:]=[0,0.4; 45,0.1; 90,-0.3; 135,-0.35; 180,-0.2; 225,
-      -0.35; 270,-0.3; 315,0.1; 360,0.4]
-      "Cp at different angles of attack"
-      annotation(Dialog(tab="Airflow",group="Wind"));
   parameter Real Cs=sim.Cs
                        "Wind speed modifier"
-    annotation (Dialog(tab="Airflow", group="Wind"));
+        annotation (Dialog(enable=use_custom_Cs,tab="Airflow", group="Wind Pressure"));
 
-  parameter Real Habs=1
-    "Absolute height of boundary for correcting the wind speed"
+  final parameter Real Habs(fixed=false)
+    "Absolute height at the middle of the window"
     annotation (Dialog(tab="Airflow", group="Wind"));
-
-
+  parameter Boolean use_operable_window = false
+    "= true, to enable window control input"
+    annotation(Dialog(group="Operable window", tab="Airflow"));
   parameter Boolean use_trickle_vent = false
     "= true, to enable trickle vent"
     annotation(Dialog(group="Trickle vent", tab="Airflow"));
@@ -103,19 +130,32 @@ model Window "Multipane window"
   parameter SI.PressureDifference dp_nominal(displayUnit="Pa") = 5
     "Pressure drop at nominal mass flow rate of trickle vent"
     annotation(Dialog(group="Trickle vent", tab="Airflow", enable=use_trickle_vent));
+  parameter Boolean use_trickle_vent_control = false
+    "=true, to enable trickle vent control input"
+    annotation(Dialog(group="Trickle vent", tab="Airflow", enable=use_trickle_vent));
+  parameter SI.Length hTrickleVent= hVertical+hRelSurfBot_a
+    "vertical distance between the floor of the zone (top) and the trickle vent"
+    annotation(Dialog(group="Trickle vent", tab="Airflow", enable=use_trickle_vent));
+
+  parameter Modelica.Units.SI.Length briLen = 2*hWin + 2*A/hWin
+    "Thermal bridge length, if present"
+    annotation(Dialog(tab="Advanced",group="Frame"));
   Modelica.Blocks.Math.Gain gainDir(k=A*(1 - frac))
     "Gain for direct solar irradiation"
-    annotation (Placement(visible = true, transformation(extent = {{-30, -46}, {-26, -42}}, rotation = 0)));
+    annotation (Placement(visible = true, transformation(origin = {0, 0},extent = {{-30, -46}, {-26, -42}}, rotation = 0)));
   Modelica.Blocks.Math.Gain gainDif(k=A*(1 - frac))
     "Gain for diffuse solar irradiation"
     annotation (Placement(transformation(extent={{-36,-50},{-32,-46}})));
 
   IDEAS.Airflow.Multizone.TrickleVent trickleVent(
     redeclare package Medium = Medium,
-    final allowFlowReversal=true,
+    allowFlowReversal = true,
+    dp_nominal=dp_nominal,
     m_flow_nominal=m_flow_nominal,
-    dp_nominal=dp_nominal) if use_trickle_vent and sim.interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None "Trickle vent"
-    annotation (Placement(transformation(extent={{20,-88},{40,-68}})));
+    use_y = use_trickle_vent_control)
+    if use_trickle_vent and sim.interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None
+      "Trickle vent. Height assumed at the top of the window but adaptable"
+    annotation (Placement(visible = true, transformation(origin={6,-158},    extent = {{20, 88}, {40, 68}}, rotation = 0)));
   replaceable
   IDEAS.Buildings.Components.BaseClasses.RadiativeHeatTransfer.SwWindowResponse
     solWin(
@@ -132,16 +172,43 @@ model Window "Multipane window"
                      if fraType.present
     "convective surface heat transimission on the interior side of the wall"
     annotation (Placement(transformation(extent={{20,60},{40,80}})));
-  Modelica.Thermal.HeatTransfer.Components.ThermalConductor layFra(final G=(if
-        fraType.briTyp.present then fraType.briTyp.G else 0) + (fraType.U_value)
-        *A*frac)                if fraType.present  annotation (Placement(transformation(extent={{10,60},
+  Modelica.Thermal.HeatTransfer.Components.ThermalConductor layFra(
+    final G=fraType.briTyp.G + fraType.U_value*A*frac)
+    if fraType.present  annotation (Placement(transformation(extent={{10,60},
             {-10,80}})));
 
   BoundaryConditions.SolarIrradiation.RadSolData radSolData(
     inc=incInt,
     azi=aziInt)
     annotation (Placement(transformation(extent={{-100,-60},{-80,-40}})));
+  Modelica.Blocks.Interfaces.RealInput y_trickleVent
+    if use_trickle_vent_control and use_trickle_vent
+    "Control signal for trickle vent between 0 and 1, 1 is fully opened" annotation (
+    Placement(visible = true, transformation(origin = {30, -120}, extent = {{20, -20}, {-20, 20}}, rotation = -90), iconTransformation(origin = {0, -100}, extent = {{10, -10}, {-10, 10}}, rotation = -90)));
+  Modelica.Blocks.Interfaces.RealInput y_window
+    if use_operable_window
+    "Control signal for window opening between 0 and 1, i.e. 1 is fully opened" annotation (
+    Placement(visible = true, transformation(origin = {-10, -120}, extent = {{20, -20}, {-20, 20}}, rotation = -90), iconTransformation(origin = {-20, -100}, extent = {{10, -10}, {-10, 10}}, rotation = -90)));
+  Modelica.Blocks.Sources.RealExpression y_window_trunc(y = max(0, min(1, y_window_internal)))
+    "Truncated control signal" annotation (
+    Placement(visible = true, transformation(origin = {-10, -90}, extent = {{-10, 10}, {10, -10}}, rotation = 90)));
+  Airflow.Multizone.MediumColumnReversible col_trickle(redeclare package Medium
+      = Medium, h=hTrickleVent - (hzone_a/2)) if use_trickle_vent and sim.interZonalAirFlowType
+     == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts
+    "Column for port trickle vent" annotation (Placement(transformation(
+        origin={112,-40},
+        extent={{50,-10},{70,10}},
+        rotation=180)));
+  Airflow.Multizone.MediumColumnReversible outside_trickleCol(redeclare package
+      Medium = Medium, h=hTrickleVent - (Habs_surf - hAbs_floor_a)) if
+    use_trickle_vent and sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts
+                                                                                                                 "Column for connecting outside side of trickle vent"
+    annotation (Placement(visible=true, transformation(
+        origin={78,-92},
+        extent={{-70,-10},{-50,10}},
+        rotation=0)));
 protected
+  Modelica.Blocks.Interfaces.RealInput y_window_internal;
   final parameter Real U_value=glazing.U_value*(1-frac)+fraType.U_value*frac
     "Average window U-value";
   final parameter Boolean addCapGla =  windowDynamicsType == IDEAS.Buildings.Components.Interfaces.WindowDynamicsType.Two and not energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState
@@ -178,17 +245,33 @@ protected
         start=T_start))                                                                             if addCapGla
     "Heat capacitor for glazing at exterior"
     annotation (Placement(transformation(extent={{-20,-12},{0,-32}})));
-  Fluid.Sources.OutsideAir       outsideAir(
+  IDEAS.Fluid.Sources.OutsideAir outsideAir(
     redeclare package Medium = Medium,
-    Cs=Cs,
-    Habs=Habs, azi = aziInt,
+    Cs=if not use_custom_Cs and sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts
+         and not use_sim_Cs then sim.Cs_coeff*(Habs^(2*sim.a)) elseif not
+        use_custom_Cs then sim.Cs else Cs,
+    Habs=if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts
+         then Habs else sim.HPres,
+    final azi = aziInt,
     nPorts=if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.OnePort
-         then (if use_trickle_vent then 2 else 1) else (if use_trickle_vent then 3 else 2), table = coeffsCp, use_TDryBul_in = true)
+         then (if use_trickle_vent then 2 else 1) else (if use_trickle_vent then 3 else 2),
+    table = coeffsCp,
+    use_TDryBul_in = true)
  if sim.interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None
     "Outside air model"
-    annotation (Placement(transformation(extent={{-40,-100},{-20,-80}})));
+    annotation (Placement(visible = true, transformation(origin = {0, 10}, extent = {{-40, -100}, {-20, -80}}, rotation = 0)));
+
+  IDEAS.Fluid.Sources.MassFlowSource_T boundary3(
+    redeclare package Medium = Medium, 
+    m_flow = 1e-10, 
+    nPorts = 1)  if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts and not use_trickle_vent
+     "Boundary for bus a" annotation(
+    Placement(transformation(origin = {-14, -76}, extent = {{-28, -76}, {-8, -56}}, rotation = 90)));
+
+
 initial equation
-  QTra_design = (U_value*A + (if fraType.briTyp.present then fraType.briTyp.G else 0)) *(TRefZon - Tdes.y);
+  QTra_design = (U_value*A + fraType.briTyp.G) *(TRefZon - Tdes.y);
+  Habs =hAbs_floor_a + hRelSurfBot_a + (hVertical/2);
 
   assert(not use_trickle_vent or sim.interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None,
     "In " + getInstanceName() + ": Trickle vents can only be enabled when sim.interZonalAirFlowType is not None.");
@@ -197,6 +280,18 @@ initial equation
     ": You may have intended to model a frame since the parameter 'frac' is larger than zero. However, no frame type is configured such that no frame will be modelled. This may be a mistake. Set frac=0 to avoid this warning if this is intentional.",
     level=AssertionLevel.warning);
 equation
+  if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None then
+    shaType.m_flow = 0;
+  else
+    connect(outsideAir.m_flow, shaType.m_flow) annotation (
+      Line(points={{-41,-86},{-59.7,-86},{-59.7,-63.4772}},
+                                                          color = {0, 0, 127}));
+  end if;
+  if use_operable_window then
+    connect(y_window_internal, y_window);
+  else
+    y_window_internal = 0;
+  end if;
   connect(solWin.iSolDir, propsBusInt.iSolDir) annotation (
     Line(points = {{-2, -60}, {-2, -70}, {56.09, -70}, {56.09, 19.91}}, color = {191, 0, 0}, smooth = Smooth.None));
   connect(solWin.iSolDif, propsBusInt.iSolDif) annotation (
@@ -204,7 +299,7 @@ equation
   connect(solWin.iSolAbs, layMul.port_gain) annotation (
     Line(points = {{0, -40}, {0, -10}}, color = {191, 0, 0}, smooth = Smooth.None));
   connect(shaType.Ctrl, Ctrl) annotation (
-    Line(points={{-63,-63.4772},{-50, -63.4772},{-50, -110}},
+    Line(points={{-63,-63.4772},{-50, -63.4772},{-50, -120}},
                                                          color = {0, 0, 127}));
   connect(iConFra.port_b, propsBusInt.surfCon) annotation (
     Line(points = {{40, 70}, {46, 70}, {46, 19.91}, {56.09, 19.91}}, color = {191, 0, 0}, smooth = Smooth.None));
@@ -225,7 +320,7 @@ equation
   connect(heaCapFraIn.port, layFra.port_a) annotation (
     Line(points = {{14, 100}, {14, 70}, {10, 70}}, color = {191, 0, 0}));
   connect(gainDir.y, solWin.solDir) annotation (
-    Line(points={{-25.8,-44},{-10,-44}},    color = {0, 0, 127}));
+    Line(points={{-25.8,-44},{-10,-44}},  color = {0, 0, 127}));
   connect(gainDif.y, solWin.solDif) annotation (
     Line(points = {{-31.8, -48}, {-22, -48}, {-10, -48}}, color = {0, 0, 127}));
   connect(radSolData.HDirTil, shaType.HDirTil) annotation (
@@ -249,14 +344,6 @@ equation
     Line(points = {{-10, 70}, {-10, 100}}, color = {191, 0, 0}));
   connect(heaCapGlaExt.port, layMul.port_b) annotation (
     Line(points = {{-10, -12}, {-10, 0}}, color = {191, 0, 0}));
-  connect(res1.port_a, outsideAir.ports[1]) annotation (
-    Line(points = {{20, -40}, {16, -40}, {16, -90}, {-20, -90}}, color = {0, 127, 255}));
-  connect(res2.port_a, outsideAir.ports[2]) annotation (
-    Line(points = {{20, -60}, {16, -60}, {16, -90}, {-20, -90}}, color = {0, 127, 255}));
-  connect(trickleVent.port_a, outsideAir.ports[if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.OnePort then 2 else 3]) annotation (
-    Line(points = {{20, -78}, {16, -78}, {16, -92}, {-2, -92}, {-2, -90}, {-20, -90}}, color = {0, 127, 255}));
-  connect(trickleVent.port_b, propsBusInt.port_1) annotation (
-    Line(points = {{40, -78}, {50, -78}, {50, 19.91}, {56.09, 19.91}}, color = {0, 127, 255}));
   connect(radSolData.Te, shaType.Te) annotation (
     Line(points={{-79.4,-64},{-68.5,-64},{-68.5,-29.9067}}, color = {0, 0, 127}));
   connect(shaType.port_frame, layFra.port_b) annotation (
@@ -272,10 +359,46 @@ equation
   connect(outsideAir.TDryBul_in, shaType.TDryBul) annotation (
     Line(points={{-42,-90},{-46,-90},{-46,-49.4895},{-57.5,-49.4895}},
                                                                     color = {0, 0, 127}));
+  connect(trickleVent.y, y_trickleVent) annotation (
+    Line(points={{36,-92},{36,-106},{30,-106},{30,-120}},
+                                           color = {0, 0, 127}));
+  if sim.interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None then
+    connect(crackOrOperableDoor.port_a1, outsideAir.ports[1]) annotation (
+    Line(points={{20,-46},{16,-46},{16,-80},{-20,-80}},          color = {0, 127, 255}));
+  end if;
+  if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts then
+    connect(crackOrOperableDoor.port_b2, outsideAir.ports[2]) annotation (
+    Line(points={{20,-58},{16,-58},{16,-80},{-20,-80}},          color = {0, 127, 255}));
+  end if;
+ connect(outside_trickleCol.port_b, outsideAir.ports[if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts then 3 else 2]) annotation (
+    Line(points={{18,-102},{18,-110},{6,-110},{6,-80},{-20,-80}},
+                                           color = {0, 127, 255}));
+  connect(outside_trickleCol.port_a, trickleVent.port_a)
+    annotation (Line(points={{18,-82},{18,-80},{26,-80}}, color={0,127,255}));
+ if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.OnePort and use_trickle_vent then
+ connect(outsideAir.ports[2], trickleVent.port_a) annotation (Line(points={{-20,-80},
+            {-20,-80},{26,-80}},                                                                        color={0,127,255}));
+   end if;
+ connect(y_window_trunc.y, solWin.y) annotation (
+    Line(points={{-10,-79},{-10,-58}},      color = {0, 0, 127}));
+ connect(y_window_trunc.y, crackOrOperableDoor.y) annotation (
+    Line(points={{-10,-79},{-10,-68},{19,-68},{19,-52}},          color = {0, 0, 127}));
+ if sim.interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts then
+   connect(trickleVent.port_b, propsBusInt.port_1) annotation (
+    Line(points={{46,-80},{50,-80},{50,19.91},{56.09,19.91}},          color = {0, 127, 255}));
+ end if;
+ connect(trickleVent.port_b, col_trickle.port_a) annotation(
+    Line(points = {{40, -80}, {52, -80}, {52, -50}}, color = {0, 127, 255}));
+ connect(col_trickle.port_b, propsBusInt.port_3) annotation(
+    Line(points = {{52, -30}, {52, 20}, {56, 20}}, color = {0, 127, 255}));
+ connect(boundary3.ports[1], propsBusInt.port_3) annotation(
+    Line(points = {{52, -84}, {52, -30}, {56, -30}, {56, 20}}));
   annotation (
     Icon(coordinateSystem(preserveAspectRatio=true, extent={{-60,-100},{60,100}}),
-        graphics={Rectangle(fillColor = {255, 255, 255}, pattern = LinePattern.None, fillPattern = FillPattern.Solid, extent = {{-50, -90}, {50, 100}}),
-        Polygon(fillColor = {255, 255, 170}, pattern = LinePattern.None, fillPattern = FillPattern.Solid, points = {{-46, 60}, {50, 24}, {50, -50}, {-30, -20}, {-46, -20}, {-46, 60}}),
+        graphics={Rectangle(fillColor = {255, 255, 255}, pattern = LinePattern.None,
+            fillPattern =                                                                          FillPattern.Solid, extent = {{-50, -90}, {50, 100}}),
+        Polygon(fillColor = {255, 255, 170}, pattern = LinePattern.None,
+            fillPattern =                                                              FillPattern.Solid, points = {{-46, 60}, {50, 24}, {50, -50}, {-30, -20}, {-46, -20}, {-46, 60}}),
         Line(
           points={{-50,60},{-30,60},{-30,80},{50,80}},
           color={175,175,175}),
@@ -330,6 +453,11 @@ can be used to simulate 10 windows by scaling the model of a single window.
 <p>
 The parameter tab Airflow lists optional parameters for adding a self regulating trickle vent.
 </p>
+<p>
+The RealExpression <code>AExp</code>, which is connected to <code>propsBusInt</code>, outputs the total window area <code>A</code>
+instead of only the area of glass <code>A_glass</code>. This partially compensates for the fact that 
+radiation from/to the frame is not included seperately in the current model implementation.
+</p>
 <h4>Validation</h4>
 <p>
 To verify the U-value of your glazing system implementation,
@@ -344,6 +472,23 @@ Update calculation of transmission design losses.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1337\">#1337</a>
 </li>
 <li>
+October 30, 2024, by Klaas De Jonge:<br/>
+Modifications for stack-effect interzonal airflow heights and wind pressure profiles.
+</li>
+<li>
+Februari 18, 2024, by Filip Jorissen:<br/>
+Modifications for supporting trickle vents and interzonal airflow.
+</li>
+<li>
+September 7, 2023, by Filip Jorissen:<br/>
+Created shading surface temperature dependency on mass flow rate.
+</li>
+<li>
+July 17, 2023, by Filip Jorissen:<br/>
+Using A instead of A_glass to compute air tightness parameters.
+Added controllable trickle vent and operable window.
+</li>
+<li>
 May 22, 2022, by Filip Jorissen:<br/>
 Fixed Modelica specification compatibility issue.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1254\">
diff --git a/IDEAS/Buildings/Data/Interfaces/WindPressureCoeff.mo b/IDEAS/Buildings/Data/Interfaces/WindPressureCoeff.mo
new file mode 100644
index 0000000000..6b810c60e2
--- /dev/null
+++ b/IDEAS/Buildings/Data/Interfaces/WindPressureCoeff.mo
@@ -0,0 +1,30 @@
+﻿within IDEAS.Buildings.Data.Interfaces;
+record WindPressureCoeff
+  "Record for storing tables for wind pressure coeff"
+  extends Modelica.Icons.Record;
+
+  parameter Real Cp_Wall [:,:] "Face 1";
+  parameter Real Cp_Roof_0_10[:,:] "Roof (<10° pitch, Average)";
+  parameter Real Cp_Roof_11_30[:,:] "Roof (11-30° pitch, Front)";
+  parameter Real Cp_Roof_30_45[:,:] "Roof (>30° pitch, Front)";
+
+  parameter Real Cp_Floor[:,:];
+
+  annotation (Documentation(info="<html>
+<p>
+
+M. W. Liddament, <i>A guide to energy efficient ventilation</i>. Coventry: Annex V Air Infiltration and Ventilation Centre, 1996.<br>
+<br>
+Appendix 2 - Wind Pressure Coefficient Data
+
+
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+October 30, 2024, by Klaas De Jonge:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end WindPressureCoeff;
diff --git a/IDEAS/Buildings/Data/Interfaces/package.order b/IDEAS/Buildings/Data/Interfaces/package.order
index ab13b29a1c..44dd5c8518 100644
--- a/IDEAS/Buildings/Data/Interfaces/package.order
+++ b/IDEAS/Buildings/Data/Interfaces/package.order
@@ -6,3 +6,4 @@ Insulation
 Material
 PartialGlazing
 OldGlazing
+WindPressureCoeff
diff --git a/IDEAS/Buildings/Data/WindPressureCoeff/Lowrise_Square_Exposed.mo b/IDEAS/Buildings/Data/WindPressureCoeff/Lowrise_Square_Exposed.mo
new file mode 100644
index 0000000000..ab87f7c713
--- /dev/null
+++ b/IDEAS/Buildings/Data/WindPressureCoeff/Lowrise_Square_Exposed.mo
@@ -0,0 +1,31 @@
+within IDEAS.Buildings.Data.WindPressureCoeff;
+record Lowrise_Square_Exposed
+  extends Interfaces.WindPressureCoeff(
+    Cp_Wall=[0,0.4; 45,0.1; 90,-0.3; 135,-0.35; 180,-0.2; 225,
+      -0.35; 270,-0.3; 315,0.1; 360,0.4],
+    Cp_Roof_0_10=[0,-0.6; 45,-0.6; 90,-0.6; 135,-0.6],
+    Cp_Roof_11_30=[0,-0.4; 45,-0.5; 90,-0.6; 135,-0.5; 180,-0.4; 225,-0.5; 270,
+        -0.6; 315,-0.5; 360,-0.4],
+    Cp_Roof_30_45=[0,0.3; 45,-0.4; 90,-0.6; 135,-0.4; 180,-0.5; 225,-0.4; 270,
+        -0.6; 315,-0.4; 360,0.3],
+    Cp_Floor=[0,0; 45,0; 90,0; 135,0; 180,0; 225,0; 270,0; 315,0; 360,0])
+  annotation (Documentation(info="<html>
+<p>
+M. W. Liddament, <i>A guide to energy efficient ventilation</i>. Coventry: Annex V Air Infiltration and Ventilation Centre, 1996.<br>
+<br>
+Table A2.1 Wind Pressure Coefficient Data<br>
+Low-rise buildings (up to 3 storeys)<br>
+Length to width ratio: 1:1<br>
+Shielding condition: Exposed<br>
+Wind speed reference level: Building height<br>
+</p>
+</html>"));
+annotation (Documentation(revisions="<html>
+<ul>
+<li>
+October 30, 2024, by Klaas De Jonge:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end Lowrise_Square_Exposed;
diff --git a/IDEAS/Buildings/Data/WindPressureCoeff/package.mo b/IDEAS/Buildings/Data/WindPressureCoeff/package.mo
new file mode 100644
index 0000000000..423d69c6da
--- /dev/null
+++ b/IDEAS/Buildings/Data/WindPressureCoeff/package.mo
@@ -0,0 +1,4 @@
+within IDEAS.Buildings.Data;
+package WindPressureCoeff
+
+end WindPressureCoeff;
diff --git a/IDEAS/Buildings/Data/WindPressureCoeff/package.order b/IDEAS/Buildings/Data/WindPressureCoeff/package.order
new file mode 100644
index 0000000000..333467cbbf
--- /dev/null
+++ b/IDEAS/Buildings/Data/WindPressureCoeff/package.order
@@ -0,0 +1 @@
+Lowrise_Square_Exposed
diff --git a/IDEAS/Buildings/Data/package.order b/IDEAS/Buildings/Data/package.order
index 365259e89e..10c9b981e7 100644
--- a/IDEAS/Buildings/Data/package.order
+++ b/IDEAS/Buildings/Data/package.order
@@ -4,4 +4,5 @@ Frames
 Glazing
 Insulation
 Materials
+WindPressureCoeff
 Interfaces
diff --git a/IDEAS/Buildings/Examples/ZoneExample.mo b/IDEAS/Buildings/Examples/ZoneExample.mo
index 25f971ed59..1fe293427c 100644
--- a/IDEAS/Buildings/Examples/ZoneExample.mo
+++ b/IDEAS/Buildings/Examples/ZoneExample.mo
@@ -1,7 +1,7 @@
 within IDEAS.Buildings.Examples;
 model ZoneExample
   "Example model demonstrating how zones may be connected to surfaces"
-  package Medium = IDEAS.Media.Air;
+  replaceable package Medium = IDEAS.Media.Air;
   extends Modelica.Icons.Example;
   parameter Modelica.Units.SI.Length l=4 "Room length";
   parameter Modelica.Units.SI.Length w=4 "Room width";
@@ -23,13 +23,16 @@ model ZoneExample
       constructionType,
     azi=0,
     inc=IDEAS.Types.Tilt.Wall,
-    A=l*w)                 "Internal wall model" annotation (Placement(
+    A=l*w,
+    redeclare package Medium = Medium)
+                           "Internal wall model" annotation (Placement(
         transformation(
         extent={{6,-10},{-6,10}},
         rotation=90,
         origin={-8,0})));
 
   IDEAS.Buildings.Components.Window window(
+    redeclare package Medium = Medium,
     redeclare Data.Glazing.Ins2Ar2020 glazing
       "Insulating double glazing (6/16/6 AR Planitherm one) with clear glass",
     redeclare IDEAS.Buildings.Data.Frames.Pvc fraType,
@@ -38,6 +41,7 @@ model ZoneExample
     A=2)                       "Window model"
     annotation (Placement(transformation(extent={{-56,40},{-44,60}})));
   IDEAS.Buildings.Components.SlabOnGround slabOnGround(
+    redeclare package Medium = Medium,
     redeclare parameter IDEAS.Buildings.Validation.Data.Constructions.LightWall
       constructionType,
     A=l*w,
@@ -46,6 +50,7 @@ model ZoneExample
     annotation (Placement(transformation(extent={{-56,-40},{-44,-20}})));
   IDEAS.Buildings.Components.OuterWall outerWall(
     azi=IDEAS.Types.Azimuth.N,
+    redeclare package Medium = Medium,
     redeclare parameter IDEAS.Buildings.Validation.Data.Constructions.HeavyWall constructionType,
     inc=IDEAS.Types.Tilt.Wall,
     A=(l + w)*2*h)         "Outer wall model"
@@ -60,6 +65,7 @@ model ZoneExample
           "Second zone"
     annotation (Placement(transformation(extent={{0,20},{20,40}})));
   IDEAS.Buildings.Components.OuterWall outerWall1(
+    redeclare package Medium = Medium,
     redeclare parameter IDEAS.Buildings.Validation.Data.Constructions.HeavyWall constructionType,
     inc=IDEAS.Types.Tilt.Wall,
     azi=IDEAS.Types.Azimuth.S,
@@ -68,6 +74,7 @@ model ZoneExample
   IDEAS.Buildings.Components.OuterWall Roof(
     azi=0,
     A=10,
+    redeclare package Medium = Medium,
     redeclare Validation.Data.Constructions.LightRoof constructionType,
     incOpt=3)                     "Roof model"
     annotation (Placement(transformation(extent={{-56,60},{-44,80}})));
@@ -107,6 +114,10 @@ equation
     Documentation(revisions="<html>
 <ul>
 <li>
+October 30, 2024, by Klaas De Jonge:<br/>
+Medium declaration in surfaces and replaceable medium
+</li>
+<li>
 April 26, 2024 by Jelger Jansen:<br/>
 Set parameter <code>ignAss</code> to ignore view factor assert.
 This is for <a href=https://github.com/open-ideas/IDEAS/issues/1272>#1272</a>.
@@ -129,4 +140,4 @@ First implementation.
       StopTime=1000000,
       Tolerance=1e-06,
       __Dymola_Algorithm="Lsodar"));
-end ZoneExample;
+end ZoneExample;
\ No newline at end of file
diff --git a/IDEAS/Buildings/Examples/ZoneWithSources.mo b/IDEAS/Buildings/Examples/ZoneWithSources.mo
new file mode 100644
index 0000000000..0f144cab38
--- /dev/null
+++ b/IDEAS/Buildings/Examples/ZoneWithSources.mo
@@ -0,0 +1,42 @@
+within IDEAS.Buildings.Examples;
+model ZoneWithSources "Zone with CO2 concentration model"
+  extends Modelica.Icons.Example;
+  replaceable package Medium = IDEAS.Media.Air(extraPropertiesNames={"test", "CO2"});
+  inner BoundaryConditions.SimInfoManager sim "Simulation information manager for climate data" annotation (Placement(transformation(extent={{-100,80},{-80,100}})));
+
+  IDEAS.Buildings.Components.Examples.BaseClasses.SimpleZone zone(
+    redeclare package Medium = Medium, 
+    useCFlowInput = true, 
+    useWatFlowInput = true,
+    n50=40)
+    "Zone with latent heat"
+    annotation (Placement(visible = true, transformation(origin = {0, 0}, extent = {{-40, 0}, {-20, 20}}, rotation = 0)));
+  Modelica.Blocks.Sources.Pulse pulse(
+    amplitude = 0.0005, 
+    period = 3600)  
+    "Pulse for both mWat and C_flow" 
+    annotation(
+    Placement(visible = true, transformation(origin = {30, 10}, extent = {{10, -10}, {-10, 10}}, rotation = 0)));
+equation
+  connect(pulse.y, zone.mWat_flow) annotation(
+    Line(points = {{20, 10}, {0, 10}, {0, 18}, {-18, 18}}, color = {0, 0, 127}));
+  connect(pulse.y, zone.C_flow) annotation(
+    Line(points = {{20, 10}, {0, 10}, {0, 22}, {-18, 22}}, color = {0, 0, 127}));
+  annotation (experiment(
+      StopTime=100000,
+      Tolerance=1e-06,
+      __Dymola_Algorithm="Lsodar"), Documentation(info="<html>
+<p>
+This model demonstrates how to use the zone model for
+simulating the CO2 generation caused by occupants.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+July 25, 2023 by Filip Jorissen:<br/>
+First implemmentation
+</ul>
+</html>"),
+    __Dymola_Commands(file="Resources/Scripts/Dymola/Buildings/Examples/ZoneWithSources.mos"
+        "Simulate and plot"));
+end ZoneWithSources;
\ No newline at end of file
diff --git a/IDEAS/Buildings/Examples/package.order b/IDEAS/Buildings/Examples/package.order
index 51b6598bbe..51bb2e134f 100644
--- a/IDEAS/Buildings/Examples/package.order
+++ b/IDEAS/Buildings/Examples/package.order
@@ -5,3 +5,4 @@ ScreenComparison
 Structure
 ZoneCO2
 ZoneExample
+ZoneWithSources
diff --git a/IDEAS/Buildings/Validation/Tests/n50Test.mo b/IDEAS/Buildings/Validation/Tests/n50Test.mo
index 78c1d93470..4f86ef1f0a 100644
--- a/IDEAS/Buildings/Validation/Tests/n50Test.mo
+++ b/IDEAS/Buildings/Validation/Tests/n50Test.mo
@@ -1,27 +1,23 @@
 within IDEAS.Buildings.Validation.Tests;
 model n50Test "n50 consistency check for OnePort"
   extends Modelica.Icons.Example;
-  package Medium = IDEAS.Media.Air
+  package Medium = IDEAS.Media.Air(dStp=1.2041)
     "Air medium"
     annotation (choicesAllMatching=true);
-  inner BoundaryConditions.SimInfoManager sim(Va=0,interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.OnePort)
+  inner BoundaryConditions.SimInfoManager sim(HPres=simpleZone.hZone/2, Va=0,
+    interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.OnePort)
     annotation (Placement(transformation(extent={{-100,80},{-80,100}})));
 
-  parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX(
-      T=Medium.T_default,
-      p=Medium.p_default,
-      X=Medium.X_default)
-    "State of the medium at the medium default properties";
-  parameter Modelica.Units.SI.Density rho_default=Medium.density(sta_default)
-    "Density at the medium default properties";
-
-  Real ach = -bou.ports[1].m_flow/rho_default/simpleZone.V*3600 "Effective air change rate";
+  Real ach = abs(bou.ports[1].m_flow)/rho_default/simpleZone.V*3600 "Effective air change rate";
 
   IDEAS.Buildings.Components.Examples.BaseClasses.SimpleZone simpleZone(
     redeclare package Medium = Medium,
     n50=3,
-    airModel(massDynamics=Modelica.Fluid.Types.Dynamics.SteadyState),
-    hasWinA=true)
+    energyDynamicsAir=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial,
+    hasWinA=true,
+    l=5,
+    w=5,
+    h=5)
     annotation (Placement(transformation(extent={{-10,-60},{10,-40}})));
 
   IDEAS.Fluid.Sources.Boundary_pT bou(
@@ -36,7 +32,7 @@ model n50Test "n50 consistency check for OnePort"
     "Weather data bus connectable to weaBus connector from Buildings Library"
     annotation (Placement(transformation(extent={{-40,80},{-20,100}})));
   Modelica.Blocks.Sources.Ramp ramp(
-    height=50,
+    height=-50,
     duration=1,
     offset=0,
     startTime=1)
@@ -46,9 +42,21 @@ model n50Test "n50 consistency check for OnePort"
         rotation=270,
         origin={0,50})));
 
+  Modelica.Thermal.HeatTransfer.Sources.PrescribedTemperature prescribedTemperature annotation (Placement(transformation(extent={{60,-40},
+            {40,-20}})));
+protected
+  final parameter Medium.ThermodynamicState state_default=Medium.setState_pTX(
+      T=Medium.T_default,
+      p=Medium.p_default,
+      X=Medium.X_default[1:Medium.nXi]) "Medium state at default values";
+  final parameter Modelica.Units.SI.Density rho_default=Medium.density(state=state_default) "Medium default density";
+
+initial equation
+  simpleZone.port_b.Xi_outflow = {0.00590700766936828};
 
 equation
-  assert(abs(ach-simpleZone.n50) < 1e-6 or time < 2, "n50 computation consistency check failed");
+  assert(abs(ach-simpleZone.n50) < 1e-3 or time < 2, "n50 computation consistency check failed");
+  //The relatively high margin of error of 1e-3 is nececearry as the air density used during the simulation are calculated based on the medium state. Whearas for the calculation of ach, the medium default density is assumed.
   connect(sim.weaDatBus, weaDatBus1) annotation (Line(
       points={{-80.1,90},{-30,90}},
       color={255,204,51},
@@ -67,6 +75,14 @@ equation
       index=1,
       extent={{-3,6},{-3,6}},
       horizontalAlignment=TextAlignment.Right));
+  connect(prescribedTemperature.T, weaDatBus1.TDryBul) annotation (Line(points={{62,-30},
+          {70,-30},{70,106},{-30,106},{-30,90}},                                                                                color={0,0,127}), Text(
+      string="%second",
+      index=1,
+      extent={{6,3},{6,3}},
+      horizontalAlignment=TextAlignment.Left));
+  connect(prescribedTemperature.port, simpleZone.gainCon) annotation (Line(
+        points={{40,-30},{16,-30},{16,-53},{10,-53}}, color={191,0,0}));
   connect(simpleZone.ports[1], bou.ports[1])
     annotation (Line(points={{0,-40},{-1.77636e-15,-40},{-1.77636e-15,-10}},
                                                          color={0,127,255}));
@@ -76,6 +92,16 @@ equation
     Documentation(revisions="<html>
 <ul>
 <li>
+October 30, 2024, by Jelger Jansen:<br/>
+Use initial equation to use the same air humidity in the zones compared to the outdoor environment.
+This is for issue <a href=\"https://github.com/open-ideas/IDEAS/issues/1244\">#1244</a>.
+</li>
+<li>
+October 29, 2024, by Klaas De Jonge:<br/>
+rho_default coupled to medium and new initial zone moisture content,outside pressure reference height at zone reference height.
+This is for issue <a href=\"https://github.com/open-ideas/IDEAS/issues/1244\">#1244</a>.
+</li>
+<li>
 June 3, 2021, by Filip Jorissen:<br/>
 First implementation.
 </li>
diff --git a/IDEAS/Buildings/Validation/Tests/n50Test2.mo b/IDEAS/Buildings/Validation/Tests/n50Test2.mo
index a55f46461d..d26ecd5b9b 100644
--- a/IDEAS/Buildings/Validation/Tests/n50Test2.mo
+++ b/IDEAS/Buildings/Validation/Tests/n50Test2.mo
@@ -1,21 +1,25 @@
 within IDEAS.Buildings.Validation.Tests;
 model n50Test2 "n50 consistency check for interzonalAirFlowType=OnePort"
   extends IDEAS.Buildings.Examples.ZoneExample(
-    zone1(use_custom_n50=true, n50=2),
-    zone(use_custom_n50=true, n50=3),
-    sim(Va=0, interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.OnePort),
+    redeclare package Medium = IDEAS.Media.Air (dStp=1.2041),
+    zone1(use_custom_n50=true, n50=2,
+      energyDynamicsAir=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial),
+    zone(use_custom_n50=true, n50=3,
+      energyDynamicsAir=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial),
+    sim(HPres=zone.hZone/2, Va=0,
+      interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.OnePort),
     window(A=2, nWin=2));
 
-  parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX(
-      T=Medium.T_default,
-      p=Medium.p_default,
-      X=Medium.X_default)
-    "State of the medium at the medium default properties";
-  parameter Modelica.Units.SI.Density rho_default=Medium.density(sta_default)
-    "Density at the medium default properties";
   parameter Boolean disableAssert = false;
 
+protected
+  final parameter Medium.ThermodynamicState state_default=Medium.setState_pTX(
+      T=Medium.T_default,
+      p=Medium.p_default,
+      X=Medium.X_default[1:Medium.nXi]) "Medium state at default values";
+  final parameter Modelica.Units.SI.Density rho_default=Medium.density(state=state_default) "Medium default density";
 
+public
   IDEAS.Fluid.Sources.Boundary_pT bou(
     redeclare package Medium = Medium,
     use_p_in=true,
@@ -24,7 +28,7 @@ model n50Test2 "n50 consistency check for interzonalAirFlowType=OnePort"
         rotation=270,
         origin={40,0})));
   Modelica.Blocks.Sources.Ramp ramp(
-    height=50,
+    height=-50,
     duration=1,
     offset=0,
     startTime=1)
@@ -36,14 +40,20 @@ model n50Test2 "n50 consistency check for interzonalAirFlowType=OnePort"
   IDEAS.BoundaryConditions.WeatherData.Bus       weaDatBus1
     "Weather data bus connectable to weaBus connector from Buildings Library"
     annotation (Placement(transformation(extent={{0,80},{20,100}})));
-  Real ach = -bou.ports[1].m_flow/rho_default/zone.V*3600;
-  Real ach1 = -bou.ports[2].m_flow/rho_default/zone1.V*3600;
+  Real ach = abs(bou.ports[1].m_flow)/rho_default/zone.V*3600;
+  Real ach1 = abs(bou.ports[2].m_flow)/rho_default/zone1.V*3600;
 
 
+  Modelica.Thermal.HeatTransfer.Sources.PrescribedTemperature prescribedTemperature annotation (Placement(transformation(extent={{90,-10},
+            {70,10}})));
+initial equation
+  zone.port_b.Xi_outflow = {0.00590700766936828};
+  zone1.port_b.Xi_outflow = {0.00590700766936828};
+
 equation
   if not disableAssert then
-    assert(abs(ach-zone.n50) < 1e-6 or time < 2, "n50 computation consistency check failed");
-    assert(abs(ach1-zone1.n50) < 1e-6 or time < 2, "n50 computation consistency check failed");
+    assert(abs(ach-zone.n50) < 1e-3 or time < 2, "n50 computation consistency check failed");
+    assert(abs(ach1-zone1.n50) < 1e-3 or time < 2, "n50 computation consistency check failed");
   end if;
 
   connect(sim.weaDatBus,weaDatBus1)  annotation (Line(
@@ -66,14 +76,34 @@ equation
       index=1,
       extent={{-3,6},{-3,6}},
       horizontalAlignment=TextAlignment.Right));
-  connect(bou.ports[1], zone.ports[1]) annotation (Line(points={{42,-10},{28,-10},
+  connect(bou.ports[1], zone.ports[1]) annotation (Line(points={{39,-10},{28,-10},
           {28,-20},{10,-20}}, color={0,127,255}));
-  connect(bou.ports[2], zone1.ports[1]) annotation (Line(points={{38,-10},{24,-10},
+  connect(bou.ports[2], zone1.ports[1]) annotation (Line(points={{41,-10},{24,-10},
           {24,40},{10,40}}, color={0,127,255}));
+  connect(prescribedTemperature.T, weaDatBus1.TDryBul) annotation (Line(points={{92,0},{
+          104,0},{104,104},{10,104},{10,90}},                                                                                   color={0,0,127}), Text(
+      string="%second",
+      index=1,
+      extent={{6,3},{6,3}},
+      horizontalAlignment=TextAlignment.Left));
+  connect(prescribedTemperature.port, zone1.gainCon) annotation (Line(points={{
+          70,0},{56,0},{56,20},{26,20},{26,27},{20,27}}, color={191,0,0}));
+  connect(prescribedTemperature.port, zone.gainCon) annotation (Line(points={{
+          70,0},{56,0},{56,-33},{20,-33}}, color={191,0,0}));
   annotation (experiment(StopTime=3, Tolerance=1e-06),
                                       Documentation(revisions="<html>
 <ul>
 <li>
+October 30, 2024, by Jelger Jansen:<br/>
+Use initial equation to use the same air humidity in the zones compared to the outdoor environment.
+This is for issue <a href=\"https://github.com/open-ideas/IDEAS/issues/1244\">#1244</a>.
+</li>
+<li>
+October 29, 2024, by Klaas De Jonge:<br/>
+rho_default coupled to medium and new initial zone moisture content,outside pressure reference height at zone reference height.
+This is for issue <a href=\"https://github.com/open-ideas/IDEAS/issues/1244\">#1244</a>.
+</li>
+<li>
 June 3, 2021, by Filip Jorissen:<br/>
 First implementation.
 </li>
diff --git a/IDEAS/Buildings/Validation/Tests/n50Test2TwoPort.mo b/IDEAS/Buildings/Validation/Tests/n50Test2TwoPort.mo
new file mode 100644
index 0000000000..a980795943
--- /dev/null
+++ b/IDEAS/Buildings/Validation/Tests/n50Test2TwoPort.mo
@@ -0,0 +1,18 @@
+within IDEAS.Buildings.Validation.Tests;
+model n50Test2TwoPort
+  extends n50Test2(sim(interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts));
+  annotation (__Dymola_Commands(file=
+          "Resources/Scripts/Dymola/Buildings/Validation/Tests/n50Test2TwoPort.mos"
+        "Simulate and plot"),experiment(
+      StopTime=3,
+      Tolerance=1e-06,
+      __Dymola_Algorithm="Dassl"),
+    Documentation(revisions="<html>
+<ul>
+<li>
+October 30, 2024, by Klaas De Jonge:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end n50Test2TwoPort;
diff --git a/IDEAS/Buildings/Validation/Tests/n50Test3.mo b/IDEAS/Buildings/Validation/Tests/n50Test3.mo
index fb7324ffbd..e798ae6e56 100644
--- a/IDEAS/Buildings/Validation/Tests/n50Test3.mo
+++ b/IDEAS/Buildings/Validation/Tests/n50Test3.mo
@@ -2,10 +2,10 @@ within IDEAS.Buildings.Validation.Tests;
 model n50Test3
   extends n50Test2(disableAssert=true,zone1(use_custom_n50=false), zone(use_custom_n50=false));
 
-  Real flowDelta = sum(bou.ports.m_flow) + rho_default*(zone1.V+zone.V)*sim.n50/3600;
+  Real flowDelta = -sum(bou.ports.m_flow) + rho_default*(zone1.V+zone.V)*sim.n50/3600;
 
 equation
-  assert(abs(flowDelta)< 1e-6 or time<2, "Flow rate consistency check failed");
+  assert(abs(flowDelta)< 1e-5 or time<2, "Flow rate consistency check failed");
   annotation (Documentation(revisions="<html>
 <ul>
 <li>
diff --git a/IDEAS/Buildings/Validation/Tests/n50Test3TwoPort.mo b/IDEAS/Buildings/Validation/Tests/n50Test3TwoPort.mo
new file mode 100644
index 0000000000..d234eea841
--- /dev/null
+++ b/IDEAS/Buildings/Validation/Tests/n50Test3TwoPort.mo
@@ -0,0 +1,18 @@
+within IDEAS.Buildings.Validation.Tests;
+model n50Test3TwoPort
+  extends n50Test3(sim(interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts));
+  annotation (__Dymola_Commands(file=
+          "Resources/Scripts/Dymola/Buildings/Validation/Tests/n50Test3TwoPort.mos"
+        "Simulate and plot"),experiment(
+      StopTime=3,
+      Tolerance=1e-06,
+      __Dymola_Algorithm="Dassl"),
+    Documentation(revisions="<html>
+<ul>
+<li>
+October 30, 2024, by Klaas De Jonge:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end n50Test3TwoPort;
diff --git a/IDEAS/Buildings/Validation/Tests/n50TestTwoPort.mo b/IDEAS/Buildings/Validation/Tests/n50TestTwoPort.mo
new file mode 100644
index 0000000000..3aa4996246
--- /dev/null
+++ b/IDEAS/Buildings/Validation/Tests/n50TestTwoPort.mo
@@ -0,0 +1,24 @@
+within IDEAS.Buildings.Validation.Tests;
+model n50TestTwoPort
+  extends n50Test(
+    sim(interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts));
+
+  annotation (
+    Documentation(revisions="<html>
+<ul>
+<li>
+October 11, 2024, by Jelger Jansen:<br/>
+First implementation.
+</li>
+</ul>
+</html>", info="<html>
+<p>This model verifies the n50 recomputation implementation that is used for the interzonal airflow two-port implementation.</p>
+</html>"),
+    __Dymola_Commands(file=
+          "Resources/Scripts/Dymola/Buildings/Validation/Tests/n50TestTwoPort.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=3,
+      Tolerance=1e-06,
+      __Dymola_Algorithm="Dassl"));
+end n50TestTwoPort;
diff --git a/IDEAS/Buildings/Validation/Tests/package.order b/IDEAS/Buildings/Validation/Tests/package.order
index 5be94f089f..8ce5de828b 100644
--- a/IDEAS/Buildings/Validation/Tests/package.order
+++ b/IDEAS/Buildings/Validation/Tests/package.order
@@ -23,3 +23,6 @@ ZoneTemplateVerification2
 n50Test
 n50Test2
 n50Test3
+n50TestTwoPort
+n50Test2TwoPort
+n50Test3TwoPort
diff --git a/IDEAS/Examples/IBPSA/SingleZoneResidentialHydronicHeatPump.mo b/IDEAS/Examples/IBPSA/SingleZoneResidentialHydronicHeatPump.mo
index 0b8d09dd36..b528ebfdad 100644
--- a/IDEAS/Examples/IBPSA/SingleZoneResidentialHydronicHeatPump.mo
+++ b/IDEAS/Examples/IBPSA/SingleZoneResidentialHydronicHeatPump.mo
@@ -151,9 +151,7 @@ model SingleZoneResidentialHydronicHeatPump
     m2_flow_nominal=fan.m_flow_nominal,
     enable_variable_speed=true,
     m1_flow_nominal=pum.m_flow_nominal,
-    T1_start=293.15,
-    T2_start=278.15,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial,
     TEvaMin=253.15,
     dTHys=3,
     dp1_nominal=pum.dp_nominal/2,
@@ -273,13 +271,19 @@ model SingleZoneResidentialHydronicHeatPump
         extent={{10,10},{-10,-10}},
         rotation=180,
         origin={30,150})));
+
+initial equation
+  heaPum.con.T=293.15;
+  heaPum.eva.T=278.15;
+  heaPum.eva.port_a.C_outflow=outAir.Medium.C_default;
+  heaPum.eva.port_a.Xi_outflow={0.01};
+
 equation
   connect(case900Template.ppm, reaCO2RooAir.u) annotation (Line(points={{-59,10},
           {-54,10},{-54,-50},{-58,-50}},
                                     color={0,0,127}));
-  connect(yOcc.y, case900Template.yOcc) annotation (Line(points={{-59,40},{-52,
-          40},{-52,14},{-58,14}},
-                              color={0,0,127}));
+  connect(yOcc.y, case900Template.yOcc) annotation (Line(points={{-59,40},{-52,40},
+          {-52,18},{-81,18}}, color={0,0,127}));
   connect(senTemSup.port_b, pum.port_a)
     annotation (Line(points={{60,40},{40,40}}, color={0,127,255}));
   connect(bouWat.ports[1], pum.port_a)
diff --git a/IDEAS/Examples/PPD12/Structure.mo b/IDEAS/Examples/PPD12/Structure.mo
index d5a44cfcc9..ea2c4eca8f 100644
--- a/IDEAS/Examples/PPD12/Structure.mo
+++ b/IDEAS/Examples/PPD12/Structure.mo
@@ -74,6 +74,8 @@ model Structure "Ppd 12 example model"
     inc=IDEAS.Types.Tilt.Floor) "Floor between hallway and bedroom 1"
     annotation (Placement(transformation(extent={{70,68},{80,88}})));
   IDEAS.Buildings.Components.Window winBed3(
+    hVertical=1.2*sin(winBed3.inc),
+    hRelSurfBot_a=winBed3.hzone_a + 1,
     frac=0.1,
     azi=east,
     redeclare IDEAS.Examples.PPD12.Data.PvcInsulated fraType,
@@ -88,7 +90,9 @@ model Structure "Ppd 12 example model"
     azi=east,
     inc=(IDEAS.Types.Tilt.Wall + IDEAS.Types.Tilt.Ceiling)/2,
     A=wBedroom*lHalfBuilding*sqrt(2)/2,
-    redeclare IDEAS.Examples.PPD12.Data.Roof constructionType)
+    redeclare IDEAS.Examples.PPD12.Data.Roof constructionType,
+    hVertical=lHalfBuilding*tan(Roof2.inc),
+    hRelSurfBot_a=Roof2.hzone_a)
     "Roof, east side"
     annotation (Placement(transformation(
         extent={{-5,-10},{5,10}},
@@ -98,7 +102,8 @@ model Structure "Ppd 12 example model"
     inc=IDEAS.Types.Tilt.Wall,
     redeclare IDEAS.Examples.PPD12.Data.OuterWall constructionType,
     azi=east,
-    A=0.5*wBedroom)
+    A=0.5*wBedroom,
+    hVertical=0.5)
     "Outer wall of top floor on east facade" annotation (
       Placement(transformation(
         extent={{-5,-10},{5,10}},
@@ -118,6 +123,7 @@ model Structure "Ppd 12 example model"
     redeclare package Medium = MediumAir,
     bouTypFlo=IDEAS.Buildings.Components.Interfaces.BoundaryType.SlabOnGround,
     bouTypCei=IDEAS.Buildings.Components.Interfaces.BoundaryType.External,
+    h_winC=1.74,
     redeclare IDEAS.Examples.PPD12.Data.TripleGlazing glazingC,
     A_winC=2.55*1.74,
     fracC=0.1,
@@ -187,6 +193,7 @@ model Structure "Ppd 12 example model"
     aziA=east,
     redeclare package Medium = MediumAir,
     bouTypFlo=IDEAS.Buildings.Components.Interfaces.BoundaryType.SlabOnGround,
+    h_winA=2.3,
     redeclare IDEAS.Examples.PPD12.Data.TripleGlazing glazingC,
     A_winC=2.55*1.74,
     fracC=0.1,
@@ -216,12 +223,14 @@ model Structure "Ppd 12 example model"
     annotation (Placement(transformation(extent={{-44,-66},{-24,-86}})));
 
   IDEAS.Buildings.Components.RectangularZoneTemplate bedRoom1(
+    hFloor=hFloor0,
     aziA=east,
     bouTypC=IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall,
     bouTypD=IDEAS.Buildings.Components.Interfaces.BoundaryType.BoundaryWall,
     hasWinC=true,
     redeclare package Medium = MediumAir,
     bouTypCei=IDEAS.Buildings.Components.Interfaces.BoundaryType.External,
+    h_winC=1.9,
     redeclare IDEAS.Examples.PPD12.Data.TripleGlazing glazingC,
     redeclare IDEAS.Examples.PPD12.Data.OuterWall conTypC,
     redeclare IDEAS.Examples.PPD12.Data.CommonWall conTypD,
@@ -242,10 +251,12 @@ model Structure "Ppd 12 example model"
     annotation (Placement(transformation(extent={{140,80},{120,60}})));
 
   IDEAS.Buildings.Components.RectangularZoneTemplate bathRoom(
+    hFloor=hFloor0,
     aziA=east,
     bouTypD=IDEAS.Buildings.Components.Interfaces.BoundaryType.BoundaryWall,
     redeclare package Medium = MediumAir,
     bouTypCei=IDEAS.Buildings.Components.Interfaces.BoundaryType.External,
+    h_winA=1.99,
     redeclare IDEAS.Examples.PPD12.Data.CommonWall conTypD,
     bouTypA=IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall,
     hasWinA=true,
@@ -269,6 +280,8 @@ model Structure "Ppd 12 example model"
 
   IDEAS.Buildings.Components.RectangularZoneTemplate stairWay(
     redeclare package Medium = MediumAir,
+    hFloor=hFloor0,
+    h_winA=1.69,
     redeclare IDEAS.Examples.PPD12.Data.OuterWall conTypA,
     redeclare IDEAS.Examples.PPD12.Data.TripleGlazing glazingA,
     redeclare IDEAS.Examples.PPD12.Data.CommonWall conTypB,
@@ -294,6 +307,7 @@ model Structure "Ppd 12 example model"
     annotation (Placement(transformation(extent={{86,26},{66,6}})));
 
   IDEAS.Buildings.Components.RectangularZoneTemplate bedRoom2(
+    hFloor=hFloor0 + hFloor1,
     aziA=east,
     bouTypC=IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall,
     bouTypD=IDEAS.Buildings.Components.Interfaces.BoundaryType.BoundaryWall,
@@ -323,6 +337,8 @@ model Structure "Ppd 12 example model"
     annotation (Placement(transformation(extent={{276,82},{256,62}})));
   IDEAS.Buildings.Components.RectangularZoneTemplate bedRoom3(
     redeclare package Medium = MediumAir,
+    hFloor=hFloor0 + hFloor1,
+    h_winA=1.1,
     redeclare IDEAS.Examples.PPD12.Data.CommonWall conTypD,
     redeclare IDEAS.Examples.PPD12.Data.CommonWall conTypB,
     redeclare IDEAS.Examples.PPD12.Data.InteriorWall10 conTypA,
@@ -352,7 +368,9 @@ model Structure "Ppd 12 example model"
     inc=(IDEAS.Types.Tilt.Wall + IDEAS.Types.Tilt.Ceiling)/2,
     azi=west,
     A=wBedroom*lHalfBuilding*sqrt(2),
-    redeclare IDEAS.Examples.PPD12.Data.Roof constructionType)
+    redeclare IDEAS.Examples.PPD12.Data.Roof constructionType,
+    hVertical=lHalfBuilding*tan(Roof1.inc),
+    hRelSurfBot_a=Roof1.hzone_a)
     "Roof, west side"                     annotation (Placement(transformation(
         extent={{-5,-10},{5,10}},
         rotation=90,
@@ -514,6 +532,11 @@ Use hFloor2 for second floor rooms and use outer wall construction type for bedr
 This is for <a href=\"https://github.com/open-ideas/IDEAS/issues/1177\">#1177</a>.
 </li>
 <li>
+August 26, 2022, by Klaas De Jonge:<br/>
+Assigned correct vertical heights for sloped surfaces in the roof.
+commit <a href=\\\"https://github.com/open-ideas/IDEAS/commit/e25590cf60a1ef31c4d15274f30aa798c6c6479e\">\e25590c\</a>.
+</li>
+<li>
 August 2, 2022, by Filip Jorissen:<br/>
 Added cavity in internal floors to represent staircases.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1293\">#1293</a>.
diff --git a/IDEAS/Examples/PPD12/StructureExt_2Port.mo b/IDEAS/Examples/PPD12/StructureExt_2Port.mo
new file mode 100644
index 0000000000..1261643eba
--- /dev/null
+++ b/IDEAS/Examples/PPD12/StructureExt_2Port.mo
@@ -0,0 +1,5 @@
+within IDEAS.Examples.PPD12;
+model StructureExt_2Port "Extended the structure but with 2-port option ON"
+  extends Structure(sim(interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts,
+        n50=3));
+end StructureExt_2Port;
diff --git a/IDEAS/Examples/PPD12/StructureExt_2Port_NoFlowTest.mo b/IDEAS/Examples/PPD12/StructureExt_2Port_NoFlowTest.mo
new file mode 100644
index 0000000000..ddbcd16947
--- /dev/null
+++ b/IDEAS/Examples/PPD12/StructureExt_2Port_NoFlowTest.mo
@@ -0,0 +1,25 @@
+within IDEAS.Examples.PPD12;
+model StructureExt_2Port_NoFlowTest "Constant temperature, no wind boundary conditions"
+  parameter Modelica.Units.SI.Temperature T_start = 283.15 "10 degrees";
+  extends IDEAS.Examples.PPD12.StructureExt_2Port(
+hallway(T_start=T_start, TeAvg=T_start, TiAvg=T_start, dTeAvg=0, dTiAvg=0),
+living(T_start=T_start, TeAvg=T_start, TiAvg=T_start, dTeAvg=0, dTiAvg=0),
+Diner(T_start=T_start, TeAvg=T_start, TiAvg=T_start, dTeAvg=0, dTiAvg=0),
+Porch(T_start=T_start, TeAvg=T_start, TiAvg=T_start, dTeAvg=0, dTiAvg=0),
+bedRoom1(T_start=T_start, TeAvg=T_start, TiAvg=T_start, dTeAvg=0, dTiAvg=0),
+bathRoom(T_start=T_start, TeAvg=T_start, TiAvg=T_start, dTeAvg=0, dTiAvg=0),
+stairWay(T_start=T_start, TeAvg=T_start, TiAvg=T_start, dTeAvg=0, dTiAvg=0),
+bedRoom2(T_start=T_start, TeAvg=T_start, TiAvg=T_start, dTeAvg=0, dTiAvg=0),
+bedRoom3(T_start=T_start, TeAvg=T_start, TiAvg=T_start, dTeAvg=0, dTiAvg=0),
+Roof1(T_start=T_start),
+out1(T_start=T_start),
+Roof2(T_start=T_start),
+out2(T_start=T_start),
+com1(T_start=T_start),
+cei1(T_start=T_start),
+cei2(T_start=T_start),
+cei3(T_start=T_start),
+winBed3(T_start=T_start),
+sim(filNam=
+    Modelica.Utilities.Files.loadResource("modelica://IDEAS/Resources/weatherdata/IdealBoundaryConditions.mos")));
+end StructureExt_2Port_NoFlowTest;
\ No newline at end of file
diff --git a/IDEAS/Examples/PPD12/package.order b/IDEAS/Examples/PPD12/package.order
index a4436f1ce9..5789add207 100644
--- a/IDEAS/Examples/PPD12/package.order
+++ b/IDEAS/Examples/PPD12/package.order
@@ -1,5 +1,7 @@
 Heating
 Structure
+StructureExt_2Port
+StructureExt_2Port_NoFlowTest
 VentilationMPC
 VentilationRBC
 Data
diff --git a/IDEAS/Examples/TwinHouses/BaseClasses/Structures/TwinhouseN2.mo b/IDEAS/Examples/TwinHouses/BaseClasses/Structures/TwinhouseN2.mo
index 0e8d34f769..22e8725fc6 100644
--- a/IDEAS/Examples/TwinHouses/BaseClasses/Structures/TwinhouseN2.mo
+++ b/IDEAS/Examples/TwinHouses/BaseClasses/Structures/TwinhouseN2.mo
@@ -315,8 +315,8 @@ model TwinhouseN2 "Twinhouse N2 - Model Based on Excel autogenerated"
     inc=incWall,
     azi=aziNorth,
     redeclare BaseClasses.Data.Constructions.PvcInsulated fraType(redeclare
-        IDEAS.Buildings.Components.ThermalBridges.LineLosses briTyp(psi=0.05,
-          len=4.62)),
+        IDEAS.Buildings.Components.ThermalBridges.LineLosses briTyp(psi=0.05)),
+    briLen=4.62,
     redeclare BaseClasses.Data.Materials.Glazing glazing,
     frac=0.397,
     redeclare Buildings.Components.Shading.Shading shaType(redeclare
@@ -327,8 +327,8 @@ model TwinhouseN2 "Twinhouse N2 - Model Based on Excel autogenerated"
 
   IDEAS.Buildings.Components.Window W28(
     redeclare BaseClasses.Data.Constructions.PvcInsulated fraType(redeclare
-        IDEAS.Buildings.Components.ThermalBridges.LineLosses briTyp(psi=0.05,
-          len=4.62)),
+        IDEAS.Buildings.Components.ThermalBridges.LineLosses briTyp(psi=0.05)),
+    briLen=4.62,
     redeclare BaseClasses.Data.Materials.Glazing glazing,
     A=2.1402,
     inc=incWall,
@@ -342,8 +342,8 @@ model TwinhouseN2 "Twinhouse N2 - Model Based on Excel autogenerated"
 
   IDEAS.Buildings.Components.Window W29(
     redeclare BaseClasses.Data.Constructions.PvcInsulated fraType(redeclare
-        IDEAS.Buildings.Components.ThermalBridges.LineLosses briTyp(psi=0.05,
-          len=4.62)),
+        IDEAS.Buildings.Components.ThermalBridges.LineLosses briTyp(psi=0.05)),
+    briLen=4.62,
     redeclare BaseClasses.Data.Materials.Glazing glazing,
     A=2.1402,
     inc=incWall,
@@ -357,8 +357,8 @@ model TwinhouseN2 "Twinhouse N2 - Model Based on Excel autogenerated"
 
   IDEAS.Buildings.Components.Window W30(
     redeclare BaseClasses.Data.Constructions.PvcInsulated fraType(redeclare
-        IDEAS.Buildings.Components.ThermalBridges.LineLosses briTyp(psi=0.05,
-          len=6.04)),
+        IDEAS.Buildings.Components.ThermalBridges.LineLosses briTyp(psi=0.05)),
+    briLen=6.04,
     redeclare BaseClasses.Data.Materials.Glazing glazing,
     A=2.8527,
     inc=incWall,
@@ -372,8 +372,8 @@ model TwinhouseN2 "Twinhouse N2 - Model Based on Excel autogenerated"
 
   IDEAS.Buildings.Components.Window W31(
     redeclare BaseClasses.Data.Constructions.PvcInsulated fraType(redeclare
-        IDEAS.Buildings.Components.ThermalBridges.LineLosses briTyp(psi=0.05,
-          len=14.4)),
+        IDEAS.Buildings.Components.ThermalBridges.LineLosses briTyp(psi=0.05)),
+    briLen=14.4,
     redeclare BaseClasses.Data.Materials.Glazing glazing,
     A=5.8116,
     inc=incWall,
@@ -387,8 +387,8 @@ model TwinhouseN2 "Twinhouse N2 - Model Based on Excel autogenerated"
 
   IDEAS.Buildings.Components.Window W32(
     redeclare BaseClasses.Data.Constructions.PvcInsulated fraType(redeclare
-        IDEAS.Buildings.Components.ThermalBridges.LineLosses briTyp(psi=0.05,
-          len=4.62)),
+        IDEAS.Buildings.Components.ThermalBridges.LineLosses briTyp(psi=0.05)),
+    briLen=4.62,
     redeclare BaseClasses.Data.Materials.Glazing glazing,
     A=2.1402,
     inc=incWall,
@@ -402,8 +402,8 @@ model TwinhouseN2 "Twinhouse N2 - Model Based on Excel autogenerated"
 
   IDEAS.Buildings.Components.Window W33(
     redeclare BaseClasses.Data.Constructions.PvcInsulated fraType(redeclare
-        IDEAS.Buildings.Components.ThermalBridges.LineLosses briTyp(psi=0.05,
-          len=4.62)),
+        IDEAS.Buildings.Components.ThermalBridges.LineLosses briTyp(psi=0.05)),
+    briLen=4.62,
     redeclare BaseClasses.Data.Materials.Glazing glazing,
     A=2.1402,
     inc=incWall,
diff --git a/IDEAS/Examples/TwinHouses/BaseClasses/Structures/TwinhouseO5.mo b/IDEAS/Examples/TwinHouses/BaseClasses/Structures/TwinhouseO5.mo
index 1396ce958e..972086d097 100644
--- a/IDEAS/Examples/TwinHouses/BaseClasses/Structures/TwinhouseO5.mo
+++ b/IDEAS/Examples/TwinHouses/BaseClasses/Structures/TwinhouseO5.mo
@@ -292,8 +292,8 @@ model TwinhouseO5 "Twinhouse O5 - Model Based on Excel autogenerated"
     azi=aziNorth,
     windowDynamicsType=IDEAS.Buildings.Components.Interfaces.WindowDynamicsType.Two,
     redeclare BaseClasses.Data.Constructions.PvcInsulated fraType(redeclare
-        IDEAS.Buildings.Components.ThermalBridges.LineLosses briTyp(psi=0.05,
-          len=4.62)),
+        IDEAS.Buildings.Components.ThermalBridges.LineLosses briTyp(psi=0.05)),
+    briLen=4.62,
     redeclare BaseClasses.Data.Materials.Glazing glazing,
     frac=0.397,
     redeclare Buildings.Components.Shading.Shading shaType(redeclare
@@ -303,8 +303,8 @@ model TwinhouseO5 "Twinhouse O5 - Model Based on Excel autogenerated"
   IDEAS.Buildings.Components.Window W28(
     windowDynamicsType=IDEAS.Buildings.Components.Interfaces.WindowDynamicsType.Two,
     redeclare BaseClasses.Data.Constructions.PvcInsulated fraType(redeclare
-        IDEAS.Buildings.Components.ThermalBridges.LineLosses briTyp(psi=0.05,
-          len=4.62)),
+        IDEAS.Buildings.Components.ThermalBridges.LineLosses briTyp(psi=0.05)),
+    briLen=4.62,
     redeclare BaseClasses.Data.Materials.Glazing glazing,
     A=2.1402,
     inc=incWall,
@@ -317,8 +317,8 @@ model TwinhouseO5 "Twinhouse O5 - Model Based on Excel autogenerated"
   IDEAS.Buildings.Components.Window W29(
     windowDynamicsType=IDEAS.Buildings.Components.Interfaces.WindowDynamicsType.Two,
     redeclare BaseClasses.Data.Constructions.PvcInsulated fraType(redeclare
-        IDEAS.Buildings.Components.ThermalBridges.LineLosses briTyp(psi=0.05,
-          len=4.62)),
+        IDEAS.Buildings.Components.ThermalBridges.LineLosses briTyp(psi=0.05)),
+    briLen=4.62,
     redeclare BaseClasses.Data.Materials.Glazing glazing,
     A=2.1402,
     inc=incWall,
@@ -331,8 +331,8 @@ model TwinhouseO5 "Twinhouse O5 - Model Based on Excel autogenerated"
   IDEAS.Buildings.Components.Window W30(
     windowDynamicsType=IDEAS.Buildings.Components.Interfaces.WindowDynamicsType.Two,
     redeclare BaseClasses.Data.Constructions.PvcInsulated fraType(redeclare
-        IDEAS.Buildings.Components.ThermalBridges.LineLosses briTyp(psi=0.05,
-          len=6.04)),
+        IDEAS.Buildings.Components.ThermalBridges.LineLosses briTyp(psi=0.05)),
+    briLen=6.04,
     redeclare BaseClasses.Data.Materials.Glazing glazing,
     A=2.8527,
     inc=incWall,
@@ -345,8 +345,8 @@ model TwinhouseO5 "Twinhouse O5 - Model Based on Excel autogenerated"
   IDEAS.Buildings.Components.Window W31(
     windowDynamicsType=IDEAS.Buildings.Components.Interfaces.WindowDynamicsType.Two,
     redeclare BaseClasses.Data.Constructions.PvcInsulated fraType(redeclare
-        IDEAS.Buildings.Components.ThermalBridges.LineLosses briTyp(psi=0.05,
-          len=14.4)),
+        IDEAS.Buildings.Components.ThermalBridges.LineLosses briTyp(psi=0.05)),
+    briLen=14.4,
     redeclare BaseClasses.Data.Materials.Glazing glazing,
     A=5.8116,
     inc=incWall,
@@ -359,8 +359,8 @@ model TwinhouseO5 "Twinhouse O5 - Model Based on Excel autogenerated"
   IDEAS.Buildings.Components.Window W32(
     windowDynamicsType=IDEAS.Buildings.Components.Interfaces.WindowDynamicsType.Two,
     redeclare BaseClasses.Data.Constructions.PvcInsulated fraType(redeclare
-        IDEAS.Buildings.Components.ThermalBridges.LineLosses briTyp(psi=0.05,
-          len=4.62)),
+        IDEAS.Buildings.Components.ThermalBridges.LineLosses briTyp(psi=0.05)),
+    briLen=4.62,
     redeclare BaseClasses.Data.Materials.Glazing glazing,
     A=2.1402,
     inc=incWall,
@@ -373,8 +373,8 @@ model TwinhouseO5 "Twinhouse O5 - Model Based on Excel autogenerated"
   IDEAS.Buildings.Components.Window W33(
     windowDynamicsType=IDEAS.Buildings.Components.Interfaces.WindowDynamicsType.Two,
     redeclare BaseClasses.Data.Constructions.PvcInsulated fraType(redeclare
-        IDEAS.Buildings.Components.ThermalBridges.LineLosses briTyp(psi=0.05,
-          len=4.62)),
+        IDEAS.Buildings.Components.ThermalBridges.LineLosses briTyp(psi=0.05)),
+    briLen=4.62,
     redeclare BaseClasses.Data.Materials.Glazing glazing,
     A=2.1402,
     inc=incWall,
@@ -666,19 +666,19 @@ equation
           -28,6},{-28,-86},{-31.8,-86}},
                                   color={0,0,127}));
   connect(W28.Ctrl, controlBlind1.y[3]) annotation (Line(points={{-10.3333,6},{
-          -20,6},{-20,-85.3333},{-31.8,-85.3333}},
+          -20,6},{-20,-85.6667},{-31.8,-85.6667}},
                                             color={0,0,127}));
   connect(W29.Ctrl, controlBlind1.y[1]) annotation (Line(points={{6.66667,6},{
-          -14,6},{-14,-86.6667},{-31.8,-86.6667}},
+          -14,6},{-14,-86.3333},{-31.8,-86.3333}},
                                             color={0,0,127}));
   connect(W30.Ctrl, controlBlind1.y[1]) annotation (Line(points={{21.6667,4},{
-          -4,4},{-4,-86.6667},{-31.8,-86.6667}},
+          -4,4},{-4,-86.3333},{-31.8,-86.3333}},
                                            color={0,0,127}));
   connect(W31.Ctrl, controlBlind1.y[1]) annotation (Line(points={{36.6667,6},{
-          14,6},{14,-86.6667},{-31.8,-86.6667}},
+          14,6},{14,-86.3333},{-31.8,-86.3333}},
                                            color={0,0,127}));
   connect(W32.Ctrl, controlBlind1.y[3]) annotation (Line(points={{51.6667,6},{
-          10,6},{10,-85.3333},{-31.8,-85.3333}},
+          10,6},{10,-85.6667},{-31.8,-85.6667}},
                                            color={0,0,127}));
   connect(W33.Ctrl, controlBlind1.y[2]) annotation (Line(points={{64.6667,6},{
           18,6},{18,-86},{-31.8,-86}},
diff --git a/IDEAS/Examples/TwinHouses/BuildingO5_Exp1_1Port.mo b/IDEAS/Examples/TwinHouses/BuildingO5_Exp1_1Port.mo
index 564136294f..c3fc9876ac 100644
--- a/IDEAS/Examples/TwinHouses/BuildingO5_Exp1_1Port.mo
+++ b/IDEAS/Examples/TwinHouses/BuildingO5_Exp1_1Port.mo
@@ -1,6 +1,6 @@
 within IDEAS.Examples.TwinHouses;
 model BuildingO5_Exp1_1Port
-  "Model for simulation of experiment 1 for the O5 building with 1-port pressure drive airflow"
+  "Model for simulation of experiment 1 for the O5 building with 1-port pressure driven airflow"
  extends BuildingN2_Exp1(
    bui=2,
    exp=1,
@@ -13,15 +13,12 @@ model BuildingO5_Exp1_1Port
       A0=1,
       a=0.15));
 
-  Real comparison_W40[2] = {struct.W40.resDoor.m_flow, validationDataO5Exp1_Airflow.W40_resDoor};
+  Real comparison_W40[2] = {struct.W40.crackOrOperableDoor.m1_flow, validationDataO5Exp1_Airflow.W40_resDoor};
   Real comparison_W1[2] = {struct.W1.propsBus_a.port_1.m_flow, -validationDataO5Exp1_Airflow.W1_FlowRate};
   Real comparison_W7[2] = {struct.W7.propsBus_a.port_1.m_flow, -validationDataO5Exp1_Airflow.W7_FlowRate};
   Real comparison_W10[2] = {struct.W10.propsBus_a.port_1.m_flow, -validationDataO5Exp1_Airflow.W10_FlowRate};
   Real comparison_W37[2] = {struct.W37.propsBus_a.port_1.m_flow, validationDataO5Exp1_Airflow.W37_FlowRate};
 
-
-
-
   IDEAS.Examples.TwinHouses.BaseClasses.Data.ValidationDataO5Exp1_Airflow validationDataO5Exp1_Airflow
     annotation (Placement(transformation(extent={{40,-80},{60,-60}})));
   annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
diff --git a/IDEAS/Examples/TwinHouses/BuildingO5_Exp1_2Port.mo b/IDEAS/Examples/TwinHouses/BuildingO5_Exp1_2Port.mo
new file mode 100644
index 0000000000..f95937aafb
--- /dev/null
+++ b/IDEAS/Examples/TwinHouses/BuildingO5_Exp1_2Port.mo
@@ -0,0 +1,43 @@
+within IDEAS.Examples.TwinHouses;
+model BuildingO5_Exp1_2Port
+  "Model for simulation of experiment 1 for the O5 building with 2-port pressure driven airflow"
+ extends BuildingN2_Exp1(
+   bui=2,
+   exp=1,
+   redeclare BaseClasses.Structures.TwinhouseO5 struct,
+   redeclare BaseClasses.Ventilation.Vent_TTH_pressureNetwork vent,
+    sim(
+      interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts,
+      unify_n50=true,
+        n50=1.64,
+      A0=1,
+      a=0.15));
+
+  //Real comparison_W40[2] = {struct.W40.resDoor.m_flow, validationDataO5Exp1_Airflow.W40_resDoor};
+  //Real comparison_W1[2] = {struct.W1.propsBus_a.port_1.m_flow, -validationDataO5Exp1_Airflow.W1_FlowRate};
+  //Real comparison_W7[2] = {struct.W7.propsBus_a.port_1.m_flow, -validationDataO5Exp1_Airflow.W7_FlowRate};
+  //Real comparison_W10[2] = {struct.W10.propsBus_a.port_1.m_flow, -validationDataO5Exp1_Airflow.W10_FlowRate};
+  //Real comparison_W37[2] = {struct.W37.propsBus_a.port_1.m_flow, validationDataO5Exp1_Airflow.W37_FlowRate};
+
+  IDEAS.Examples.TwinHouses.BaseClasses.Data.ValidationDataO5Exp1_Airflow validationDataO5Exp1_Airflow
+    annotation (Placement(transformation(extent={{40,-80},{60,-60}})));
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+        coordinateSystem(preserveAspectRatio=false)),
+    experiment(
+      StartTime=1.5e+007,
+      StopTime=2.35872e+007,
+      Interval=900,
+      Tolerance=1e-006),
+    __Dymola_experimentSetupOutput,
+    __Dymola_experimentFlags(
+      Advanced(GenerateVariableDependencies=false, OutputModelicaCode=false),
+      Evaluate=true,
+      OutputCPUtime=true,
+      OutputFlatModelica=false),
+      __Dymola_Commands(file=
+          "modelica://IDEAS/Resources/Scripts/Dymola/Examples/TwinHouses/BuildingO5_Exp1_2Port.mos"
+        "Simulate and plot"),
+    Documentation(info="<html>
+<p>Similar to IDEAS.Examples.TwinHouses.BuildingO5_Exp1 but using the 2-port pressure driven interzonal airflow implementation.</p>
+</html>"));
+end BuildingO5_Exp1_2Port;
diff --git a/IDEAS/Examples/TwinHouses/package.order b/IDEAS/Examples/TwinHouses/package.order
index 884fec6d83..ee61594a77 100644
--- a/IDEAS/Examples/TwinHouses/package.order
+++ b/IDEAS/Examples/TwinHouses/package.order
@@ -3,5 +3,6 @@ BuildingN2_Exp2
 BuildingN2_Exp2_Tset
 BuildingO5_Exp1
 BuildingO5_Exp1_1Port
+BuildingO5_Exp1_2Port
 Interfaces
 BaseClasses
diff --git a/IDEAS/Fluid/Sources/BaseClasses/PartialSource.mo b/IDEAS/Fluid/Sources/BaseClasses/PartialSource.mo
index 33215ac1ab..0947ea8a1e 100644
--- a/IDEAS/Fluid/Sources/BaseClasses/PartialSource.mo
+++ b/IDEAS/Fluid/Sources/BaseClasses/PartialSource.mo
@@ -49,12 +49,11 @@ protected
 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,"
+    assert(cardinality(ports[i]) <= 1,"In " + getInstanceName() + "
 Each ports[i] of boundary shall at most be connected to one component.
 If two or more connections are present, ideal mixing takes
 place in these connections, which is usually not the intention
-of the modeller. Increase nPorts to add an additional port.
-");
+of the modeller. Increase nPorts to add an additional port and/or fix the number of connections to port" + String(i) + ".");
   end for;
 
 equation
diff --git a/IDEAS/Fluid/Sources/OutsideAir.mo b/IDEAS/Fluid/Sources/OutsideAir.mo
index 5eef7c7a40..12fa447d2b 100644
--- a/IDEAS/Fluid/Sources/OutsideAir.mo
+++ b/IDEAS/Fluid/Sources/OutsideAir.mo
@@ -9,13 +9,19 @@ model OutsideAir
   parameter Modelica.Units.SI.Angle azi "Surface azimuth (South:0, West:pi/2)"
     annotation (choicesAllMatching=true);
 
-  parameter Real Cs = (A0*A0)*((Habs/Hwin)^(2*a)) "Wind speed modifier" annotation(Dialog(group="Wind"));
+  parameter Real Cs = (A0*A0)*((Habs/sim.Hwind)^(2*a)) "Wind speed modifier" annotation(Dialog(group="Wind"));
   parameter Modelica.Units.SI.Length Habs=10
     "Absolute height of boundary for correcting the wind speed"
     annotation (Dialog(group="Wind"));
-
-
-  constant Modelica.Units.SI.Density rho=1.2 "Air density";
+  parameter Real A0=sim.A0 "Local terrain constant. 0.6 for Suburban,0.35 for Urban and 1 for Unshielded (Ashrae 1993) " 
+    annotation(Dialog(tab="Overwrite",group="Effect of surroundings on wind"));
+  parameter Real a=sim.a "Velocity profile exponent. 0.28 for Suburban, 0.4 for Urban and 0.15 for Unshielded (Ashrae 1993) "
+    annotation(Dialog(tab="Overwrite",group="Effect of surroundings on wind"));
+  Modelica.Units.SI.Density rho = IDEAS.Utilities.Psychrometrics.Functions.density_pTX(
+        p=Medium.p_default,
+        T= sim.Te,
+        X_w=sim.XiEnv.X[1]);
+  
   Modelica.Units.SI.Angle alpha "Wind incidence angle (0: normal to wall)";
   Real CpAct(final unit="1") = windPressureProfile(u=alpha, table=table[:, :]) "Actual wind pressure coefficient";
 
@@ -25,18 +31,13 @@ model OutsideAir
 
   Modelica.Blocks.Interfaces.RealOutput pTot(min=0, nominal=1E5, final unit="Pa")
     "Sum of atmospheric pressure and wind pressure";
+
   Modelica.Blocks.Interfaces.RealInput TDryBul_in if use_TDryBul_in 
     "Optional override input for the dry bulb temperature" annotation(
     Placement(visible = true, transformation(origin = {-120, 0}, extent = {{-20, -20}, {20, 20}}, rotation = 0), iconTransformation(origin = {-120, 0}, extent = {{-20, -20}, {20, 20}}, rotation = 0)));
+  Modelica.Blocks.Interfaces.RealOutput m_flow = sum(ports.m_flow) "Total mass flow rate" annotation(
+    Placement(visible = true, transformation(origin = {-110, -40}, extent = {{-10, -10}, {10, 10}}, rotation = 180), iconTransformation(origin = {-110, -60}, extent = {{10, -10}, {-10, 10}}, rotation = 0)));
 protected
-  parameter Real A0=sim.A0 "Local terrain constant. 0.6 for Suburban,0.35 for Urban and 1 for Unshielded (Ashrae 1993) " annotation(Dialog(group="Wind"));
-  parameter Real a=sim.a "Velocity profile exponent. 0.28 for Suburban, 0.4 for Urban and 0.15 for Unshielded (Ashrae 1993) "
-                                                                                                                             annotation(Dialog(group="Wind"));
-  parameter Modelica.Units.SI.Length Hwin=sim.Hwin
-    "Height above ground of meteorological wind speed measurement"
-    annotation (Dialog(group="Wind"));
-
-
   constant Integer s[:]= {
     if ( Modelica.Utilities.Strings.isEqual(string1=Medium.extraPropertiesNames[i],
                                             string2="CO2",
@@ -118,6 +119,8 @@ end windPressureProfile;
     "Angle of surface that is used to compute angle of attack of wind";
   Modelica.Blocks.Interfaces.RealInput vWin(final unit="m/s") = sim.Va   "Wind speed from weather bus";
   Modelica.Blocks.Interfaces.RealInput winDir( final unit="rad",displayUnit="deg") = sim.Vdir "Wind direction from weather bus";
+  Modelica.Blocks.Math.Add adder;
+  Modelica.Blocks.Sources.RealExpression dpStack(y=-(Habs-sim.HPres)*Modelica.Constants.g_n*rho);
 equation
 
   alpha = winDir-surOut;
@@ -129,7 +132,9 @@ equation
   connect(bus,sim.weaDatBus);
 
   connect(p_link.u, bus.pAtm);
-  connect(p_link.y,p_in_internal);
+  connect(p_link.y,adder.u1);
+  connect(adder.u2, dpStack.y);
+  connect(p_in_internal, adder.y);
 
   // must use sim.weaBus.Te for linearisation
   if (use_TDryBul_in) then
@@ -210,6 +215,14 @@ with exception of boundary pressure, do not have an effect.
 revisions="<html>
 <ul>
 <li>
+October 30, 2024, by Klaas De Jonge:<br/>
+Modifications for wind pressure,ambient pressure and wind speed modifiers used in interzonal airflow.
+</li>
+<li>
+November 13, 2023 by Filip Jorissen:<br/>
+Computing stack height.
+</li>
+<li>
 July 21, 2022 by Filip Jorissen:<br/>
 Added optional dry bulb temperature input for #1270.
 </li>
@@ -219,4 +232,4 @@ First implementation.
 </li>
 </ul>
 </html>"));
-end OutsideAir;
\ No newline at end of file
+end OutsideAir;
diff --git a/IDEAS/LIDEAS/Components/LinRectangularZoneTemplate.mo b/IDEAS/LIDEAS/Components/LinRectangularZoneTemplate.mo
index 162dbf4604..35ae90864c 100644
--- a/IDEAS/LIDEAS/Components/LinRectangularZoneTemplate.mo
+++ b/IDEAS/LIDEAS/Components/LinRectangularZoneTemplate.mo
@@ -1,6 +1,11 @@
 within IDEAS.LIDEAS.Components;
 model LinRectangularZoneTemplate
   extends IDEAS.Buildings.Components.Interfaces.RectangularZoneTemplateInterface(
+    fraTypA(briTyp(len=2*h_winA + 2*A_winA/h_winA)),
+    fraTypB(briTyp(len=2*h_winB + 2*A_winB/h_winB)),
+    fraTypC(briTyp(len=2*h_winC + 2*A_winC/h_winC)),
+    fraTypD(briTyp(len=2*h_winD + 2*A_winD/h_winD)),
+    fraTypCei(briTyp(len=2*h_winCei + 2*A_winCei/h_winCei)),
     redeclare IDEAS.Buildings.Components.ZoneAirModels.WellMixedAir
       airModel(stateSelectTVol=StateSelect.prefer),
     redeclare IDEAS.Buildings.Components.InterzonalAirFlow.n50FixedPressure interzonalAirFlow);
@@ -106,8 +111,7 @@ replaceable
   L=shaTypA.L,
   dh=shaTypA.dh,
   shaCorr=shaTypA.shaCorr)),
-    fraType(present=fraTypA.present,
-            U_value=fraTypA.U_value),
+    fraType(present=fraTypA.present, U_value=fraTypA.U_value),
     linExtRad=linExtRadWin,
     nWin=nWinA,
     indexWindow=indexWinA)
@@ -278,7 +282,7 @@ replaceable
   L=shaTypD.L,
   dh=shaTypD.dh,
   shaCorr=shaTypD.shaCorr)),
-    fraType(present=fraTypD.present, U_value=fraTypD.U_value),
+    fraType(present=fraTypD.present,  U_value=fraTypD.U_value),
     linExtRad=linExtRadWin,
     nWin=nWinD,
     indexWindow=indexWinD)
@@ -335,7 +339,7 @@ replaceable
   L=shaTypCei.L,
   dh=shaTypCei.dh,
   shaCorr=shaTypCei.shaCorr)),
-    fraType(present=fraTypCei.present, U_value=fraTypCei.U_value),
+    fraType(present=fraTypCei.present,  U_value=fraTypCei.U_value),
     linExtRad=linExtRadWin,
     nWin=nWinCei,
     indexWindow=indexWinCei)
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Airflow_Multizone_Examples_TrickleVentIDEAS.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Airflow_Multizone_Examples_TrickleVentIDEAS.txt
new file mode 100644
index 0000000000..b8bf2ea182
--- /dev/null
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Airflow_Multizone_Examples_TrickleVentIDEAS.txt
@@ -0,0 +1,11 @@
+last-generated=2023-10-17
+statistics-simulation=
+{
+  "linear": "0, 0",
+  "nonlinear": "1",
+  "number of continuous time states": "5",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 2.592e+06]
+tabDat_m_flow.m_flow=[0e+00, -3.585591730210363e-13, 1.545497765631813e-09, -1.263835076242685e-02, 1.027141138911247e-03, 2.613018453121185e-02, 2.265342918690294e-04, 2.463220134377461e-02, 1.960152126848698e-02, 1.282212164369412e-04, -2.367552406212781e-05, 1.018871873384341e-04, 3.608825805713423e-04, 5.729315616190433e-03, 1.669873250647894e-04, 1.214023027569056e-02, 1.573281204980681e-07, -7.296178902034753e-07, -9.385136887431141e-03, 2.291605109348893e-03, -2.771934866905212e-02, 2.800786396619515e-05, -6.605447828769683e-03, 1.418348820880056e-03, 6.655970215797424e-03, 2.130263485014439e-03, 2.245613150298596e-02, 9.235867857933044e-03, 7.31030777096701e-03, -1.985556669533253e-02, -1.642508432269096e-02, -3.869912362119976e-07, -7.171183677261161e-13, 1.169666722416878e-02, 8.696214572401944e-05, 1.154111046344042e-02, -2.982368171215057e-02, -1.472259862348437e-02, -1.710264608263969e-02, -6.746132522821427e-02, -1.993360742926598e-02, 2.313500307500362e-02, -1.526199525869743e-07, 4.173964262008667e-04, -1.442361724457441e-06, -1.097211770684225e-05, 9.891139343380928e-03, 5.710984207689762e-03, 2.60169979184866e-02, -1.649192795157433e-02, -3.411753848195076e-02, -1.723379008471966e-02, -3.323269933462143e-02, 2.568549010902643e-03, 1.92524965852499e-02, 2.19076294451952e-02, 2.398935109377011e-02, 2.613058723509312e-02, 1.275332421064377e-02, 1.148789618164301e-02, -1.902770782180596e-05, 1.915394961833954e-02, 8.004490984603763e-03, -4.015685394406319e-02, -5.30242808163166e-02, -2.762791141867638e-02, -4.626048728823662e-02, -4.853703230619431e-02, -8.366094343363925e-03, -2.103196941316223e-02, 4.769401159137487e-03, 4.384300578385592e-03, 2.613346241414547e-02, 2.579243257641792e-02, -3.671462461352348e-02, -2.434408292174339e-02, -4.298727586865425e-02, -9.122197236865758e-03, -1.415678076446056e-02, -5.234676077961922e-02, 9.366396814584732e-03, 2.468988113105297e-02, -2.581160739064216e-02, -3.391172885894776e-02, 2.243781462311745e-03, 2.613210864365101e-02, -1.346612274646759e-02, -2.11707204580307e-03, -1.570288389921188e-02, -4.688171073794365e-02, -7.819885388016701e-03, -1.650314442813396e-02, -4.24651637673378e-02, -1.861149482429027e-02, 5.601682141423226e-03, 1.371272373944521e-02, 5.522747617214918e-03, 2.1067711757496e-03, 2.97045037150383e-03, 2.613424845039845e-02, -2.439741045236588e-02]
+vent.m_flow=[0e+00, 0e+00, 0e+00, -1.081065200269222e-02, 1.665490632876754e-03, 2.264363877475262e-02, 3.776046214625239e-04, 2.190898768603771e-02, 1.590455137193203e-02, 2.125639555742964e-04, 0e+00, 1.713571575237438e-04, 5.994727020151913e-04, 7.064211834222078e-03, 2.787405974230856e-04, 1.055100932717323e-02, 0e+00, 0e+00, -7.639854401350021e-03, 3.552789613604545e-03, -2.264363877475262e-02, 4.559125827654497e-05, -7.566315680742263e-03, 2.064750017598271e-03, 7.640336081385613e-03, 3.332765074446797e-03, 1.816984489560127e-02, 8.85543916374445e-03, 7.98635743558381e-03, -1.611444279551506e-02, -1.348158903419971e-02, 0e+00, 0e+00, 1.073909439146519e-02, 1.460695857530028e-04, 1.020685397088528e-02, -2.437886521220207e-02, -1.274400781840086e-02, -1.396725289523601e-02, -5.562293529510498e-02, -1.614744402468204e-02, 1.870052665472031e-02, 0e+00, 6.965792621485889e-04, 0e+00, 0e+00, 9.359495528042317e-03, 6.692512519657611e-03, 2.186321318149567e-02, -1.379607748240233e-02, -2.787046134471893e-02, -1.412174236029387e-02, -2.71531593054533e-02, 3.893864527344704e-03, 1.561593078076839e-02, 1.775112003087997e-02, 1.964106559753556e-02, 2.536601610481798e-02, 1.087790075689554e-02, 1.01782413199544e-02, 0e+00, 1.555364225059748e-02, 7.40972701460123e-03, -3.148411512374878e-02, -4.04558964073658e-02, -2.047119103372097e-02, -3.335212394595146e-02, -3.395665511488914e-02, -7.071108557283723e-03, -1.370752695947951e-02, 4.273977130651474e-03, 4.320803191512823e-03, 2.617930583655834e-02, 1.469452697783709e-02, -2.02039074152708e-02, -1.288431510329247e-02, -2.187861204147339e-02, -4.693724121898413e-03, -6.572130229324102e-03, -2.329962775111198e-02, 3.784074215218425e-03, 9.77493654936552e-03, -9.835878014564514e-03, -1.220834627747536e-02, 6.214669672772288e-04, 1.296276226639748e-02, -2.936162473633886e-03, -3.765926114283501e-04, -2.880594972521066e-03, -1.093727331608534e-02, -8.254068088717759e-04, -1.774383499287069e-03, -7.182541117072105e-03, -1.354029099456966e-03, 2.141246426617727e-04, 3.942309995181859e-04, 9.398359252372756e-05, 2.056870071101003e-05, 1.288845614908496e-05, 2.157237904611975e-04, -7.121112588492906e-10]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Airflow_Multizone_Validation_LargeHorizontalOpening.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Airflow_Multizone_Validation_LargeHorizontalOpening.txt
new file mode 100644
index 0000000000..01d8b916e4
--- /dev/null
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Airflow_Multizone_Validation_LargeHorizontalOpening.txt
@@ -0,0 +1,19 @@
+last-generated=2024-10-31
+statistics-initialization=
+{
+  "nonlinear": "2, 2, 1",
+  "numerical Jacobians": "0"
+}
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": "1, 1, 1",
+  "number of continuous time states": "9",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 3e+02]
+OpeningflowDiff=[9.095129013061523e+00, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02, -9.830330200195312e+02]
+MF_Orifice.y=[-5.20199921875e+04, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03, 1.67862939453125e+03]
+MF_Doormodel.y=[-5.202908984375e+04, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02, 6.955963134765625e+02]
+Opening_Orifice.dp=[-3.542494964599609e+01, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02, 3.681111335754395e-02]
+Opening_CrackOrOperableDoor.doo.dpAB[1]=[-3.542494964599609e+01, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03, 6.318764761090279e-03]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_AirflowOptions.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_AirflowOptions.txt
new file mode 100644
index 0000000000..34ca4d9129
--- /dev/null
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_AirflowOptions.txt
@@ -0,0 +1,19 @@
+last-generated=2024-11-04
+statistics-initialization=
+{
+  "nonlinear": "8, 8, 8, 8, 8, 1, 1, 1",
+  "numerical Jacobians": "0"
+}
+statistics-simulation=
+{
+  "linear": "0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0,   0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 4, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0",
+  "nonlinear": "1, 1, 1, 1, 1, 1, 1, 1",
+  "number of continuous time states": "275",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 3e+06]
+Energy_Only.BoxModel.airModel.ACH=[5.000000074505806e-02, 5.000000074505806e-02]
+Energy_n50Corr.BoxModel.airModel.ACH=[5.000000074505806e-02, 5.000000074505806e-02]
+IAQ_1port.BoxModel.airModel.ACH=[3.10519989579916e-02, 2.87510734051466e-02, 3.185813874006271e-02, 3.428845107555389e-02, 2.420403622090816e-02, 3.178483992815018e-02, 1.436753198504448e-02, 1.429393794387579e-02, 2.036718092858791e-02, 5.567135754972696e-03, 2.758531644940376e-02, 1.938669569790363e-02, 2.132634073495865e-02, 3.149599209427834e-02, 2.555416151881214e-02, 1.107475161552429e-02, 1.255190465599298e-02, 5.812013521790504e-03, 1.462079584598541e-02, 2.444652281701565e-02, 3.553354740142822e-02, 3.005150333046913e-02, 8.15022885799408e-02, 4.794127494096756e-02, 2.441266179084778e-02, 5.179888755083084e-02, 3.407102823257446e-02, 2.164919674396515e-02, 1.661740615963915e-02, 3.360852971672995e-02, 1.459905784577131e-02, 4.591472819447517e-02, 1.477295160293579e-02, 3.419966250658035e-02, 2.766492776572728e-02, 2.787128649652004e-02, 3.616029396653175e-02, 5.296425148844719e-02, 5.384308099746704e-02, 3.50341908633709e-02, 9.799592196941376e-03, 1.447791140526533e-02, 4.565519094467163e-02, 5.677500739693642e-02, 4.256006330251694e-02, 3.613485768437386e-02, 6.033733487129211e-02, 4.841165244579315e-02, 5.271943658590317e-02, 1.937347091734409e-02, 1.238330360502005e-02, 1.501012779772282e-02, 2.09919847548008e-02, 2.457526326179504e-02, 1.148330420255661e-02, 1.294454280287062e-02, 1.451470144093028e-02, 3.273779898881855e-02, 1.937195099890203e-02, 5.801267456263304e-03, 1.363798417150974e-02, 4.504559189081192e-02, 3.807644546031952e-02, 2.99950148910284e-02, 3.25038954615593e-02, 2.366030775010586e-02, 1.313138380646706e-02, 1.283604279160504e-02, 1.473879627883431e-02, 1.493508089333762e-02, 1.217212621122599e-02, 4.152758792042732e-02, 3.626059740781784e-02, 2.351965755224228e-02, 6.092352420091629e-02, 6.799665838479996e-02, 6.046304106712341e-02, 3.346924483776093e-02, 7.728297263383865e-02, 5.896076560020447e-02, 2.949630282819271e-02, 1.112191472202539e-02, 2.568310312926769e-02, 4.966992884874344e-02, 2.427212707698345e-02, 1.389316935092211e-02, 2.602547779679298e-02, 1.464989315718412e-02, 2.178134955465794e-02, 4.62290458381176e-02, 5.052433907985687e-02, 6.004394218325615e-02, 8.724498748779297e-02, 4.541996493935585e-02, 3.568749874830246e-02, 2.469607442617416e-02, 2.843115665018559e-02, 3.945166617631912e-02, 1.435885857790709e-02, 6.136580184102058e-02, 4.554446786642075e-02]
+IAQ_1port_trickle.BoxModel.airModel.ACH=[4.353448376059532e-02, 4.027604311704636e-02, 3.622004017233849e-02, 3.814568743109703e-02, 2.766926027834415e-02, 3.428065031766891e-02, 1.650677993893623e-02, 1.712401397526264e-02, 2.187751792371273e-02, 9.229773655533791e-03, 3.489074483513832e-02, 2.284146100282669e-02, 3.195297345519066e-02, 4.042819514870644e-02, 4.016912728548042e-02, 1.119235251098871e-02, 1.872591488063335e-02, 1.045040041208267e-02, 2.699369937181473e-02, 4.216262698173523e-02, 5.887070298194885e-02, 3.440092504024506e-02, 1.004392802715302e-01, 6.052859127521515e-02, 2.814602106809616e-02, 5.886510759592056e-02, 3.868579119443893e-02, 2.45046466588974e-02, 1.693299226462821e-02, 7.495645433664283e-02, 2.695283852517605e-02, 5.296842381358147e-02, 1.623247750103474e-02, 5.664152652025223e-02, 4.351580888032917e-02, 3.293809294700623e-02, 3.63309271633625e-02, 7.667556405067444e-02, 7.351472228765488e-02, 4.264137148857117e-02, 1.361977402120829e-02, 2.592956274747849e-02, 7.579199969768524e-02, 1.155383959412575e-01, 1.281542330980301e-01, 7.942702621221542e-02, 1.534190773963928e-01, 1.327613741159439e-01, 7.958263158798218e-02, 2.365320920944214e-02, 3.223345428705215e-02, 2.653184533119202e-02, 3.135937452316284e-02, 3.824959322810173e-02, 1.156870927661657e-02, 1.488455757498782e-02, 2.081343904137599e-02, 4.885077476501359e-02, 2.30073127895592e-02, 1.005581580102444e-02, 4.277239739894867e-02, 1.629672348499298e-01, 1.35962650179863e-01, 1.135211810469627e-01, 4.87617515027523e-02, 2.630777657032013e-02, 1.404126547276974e-02, 1.454522646963612e-02, 2.753334492444969e-02, 3.223375231027558e-02, 4.47470098733902e-02, 1.3165183365345e-01, 7.970710843801498e-02, 4.241811111569405e-02, 1.366479843854904e-01, 2.141154706478119e-01, 1.322289854288101e-01, 4.020079597830772e-02, 1.089882552623749e-01, 8.318625390529633e-02, 4.084185138344765e-02, 1.123963668942451e-02, 9.097480028867722e-02, 9.163505584001541e-02, 3.296882659196854e-02, 1.883185096085072e-02, 6.377068907022476e-02, 3.828202933073044e-02, 7.921095937490463e-02, 7.100784033536911e-02, 8.155747503042221e-02, 9.985372424125671e-02, 1.633830815553665e-01, 7.539866119623184e-02, 4.457569122314453e-02, 4.610468074679375e-02, 3.822497650980949e-02, 5.485855787992477e-02, 2.491196244955063e-02, 1.352294087409973e-01, 6.139024347066879e-02]
+IAQ_2Port.BoxModel.airModel.ACH=[4.246703162789345e-02, 4.173914343118668e-02, 3.996537625789642e-02, 4.477600753307343e-02, 3.77570278942585e-02, 4.337332770228386e-02, 3.396248444914818e-02, 3.446902334690093e-02, 3.760899230837822e-02, 3.661106899380684e-02, 4.065492004156113e-02, 4.247376695275307e-02, 3.932803124189377e-02, 4.119399562478065e-02, 4.48931865394115e-02, 3.664142638444901e-02, 3.367903083562851e-02, 3.331917524337769e-02, 3.601560369133949e-02, 3.489545732736588e-02, 4.11863848567009e-02, 4.534092918038368e-02, 8.319129049777985e-02, 5.378416553139687e-02, 3.937537968158722e-02, 5.917416512966156e-02, 5.104038864374161e-02, 4.342637956142426e-02, 3.959959372878066e-02, 4.69691678881644e-02, 3.477324545383453e-02, 4.991838708519936e-02, 3.524339199066162e-02, 4.280957207083702e-02, 4.155166447162642e-02, 4.183049127459526e-02, 4.510622471570969e-02, 5.746207758784294e-02, 5.777369067072868e-02, 4.279718548059464e-02, 3.34152840077877e-02, 3.504617512226105e-02, 5.003508180379868e-02, 5.832742527127266e-02, 4.899267107248306e-02, 4.480027034878731e-02, 6.364580243825912e-02, 5.339682102203369e-02, 6.040214747190475e-02, 4.390432313084602e-02, 4.302066937088966e-02, 3.930755332112312e-02, 4.668338969349861e-02, 4.759865626692772e-02, 4.225815460085869e-02, 4.577042907476448e-02, 4.422971606254558e-02, 5.26210665702815e-02, 4.724465683102606e-02, 4.260256513953209e-02, 4.542634263634682e-02, 6.654039770364761e-02, 5.993549153208733e-02, 5.463841184973717e-02, 5.087827518582344e-02, 4.468100890517235e-02, 4.216482862830162e-02, 4.168245941400529e-02, 3.922789543867113e-02, 4.409970715641968e-02, 4.202964901924133e-02, 5.564770847558975e-02, 4.63305227458477e-02, 3.599466010928154e-02, 6.269728392362595e-02, 7.242739945650101e-02, 6.222204864025116e-02, 5.001629516482353e-02, 8.436398208141327e-02, 6.554590910673141e-02, 4.432576894760132e-02, 3.872337564826012e-02, 4.709075391292572e-02, 5.792031437158585e-02, 4.398714751005173e-02, 4.187367111444473e-02, 4.530180245637894e-02, 4.667980223894119e-02, 5.098000541329384e-02, 5.612162128090858e-02, 5.267802998423576e-02, 6.129417940974236e-02, 8.880175650119781e-02, 4.893527925014496e-02, 4.683088138699532e-02, 3.777006641030312e-02, 4.488867893815041e-02, 5.426096543669701e-02, 3.665747120976448e-02, 6.318503618240356e-02, 4.903232678771019e-02]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_BuildingShadeExample.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_BuildingShadeExample.txt
index 2fd9123a47..707a0cc798 100644
--- a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_BuildingShadeExample.txt
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_BuildingShadeExample.txt
@@ -1,4 +1,4 @@
-last-generated=2023-05-02
+last-generated=2023-10-23
 statistics-simulation=
 {
   "linear": " ",
@@ -9,13 +9,13 @@ time=[2e+06, 3e+06]
 buildingShade.HShaDirTil=[-0e+00, -0e+00, 0e+00, 0e+00, 5.008573913574219e+01, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 3.223678350448608e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 2.398211002349854e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 1.082118892669678e+01, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 1.443160095214844e+02, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 5.816702651977539e+01, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 1.108326077461243e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 5.083983612060547e+01, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 2.276163291931152e+01, 0e+00]
 none.HShaDirTil=[-0e+00, -0e+00, 0e+00, 0e+00, 5.008573913574219e+01, 1.5274378657341e-01, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 3.223678350448608e+00, 1.841542625427246e+01, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 7.140533924102783e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 1.082118892669678e+01, 8.296540832519531e+01, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 1.443160095214844e+02, 7.137851715087891e+01, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 2.399608421325684e+01, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 5.816702651977539e+01, 1.838981628417969e+02, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 1.108326077461243e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 5.653552627563477e+01, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 5.083983612060547e+01, 7.67037353515625e+01, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 2.276163291931152e+01, 2.788668394088745e+00]
 overhang.HShaDirTil=[-0e+00, -0e+00, 0e+00, 0e+00, 4.111887359619141e+01, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 2.434096813201904e+00, 1.841542625427246e+01, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 5.99504566192627e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 7.859745979309082e+00, 8.296540832519531e+01, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 1.070749893188477e+02, 7.137851715087891e+01, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 2.071455955505371e+01, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 4.109440994262695e+01, 1.838981628417969e+02, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 8.074685335159302e-01, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 5.028044891357422e+01, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 3.489313125610352e+01, 7.67037353515625e+01, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 1.648202323913574e+01, 2.788668394088745e+00]
-screen.HShaDirTil=[-0e+00, -0e+00, 0e+00, 0e+00, 5.858918190002441e+00, 4.612253233790398e-02, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 2.717950344085693e+00, 1.786013221740723e+01, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 9.623701125383377e-02, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 9.123569488525391e+00, 5.338007736206055e+01, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 9.285315704345703e+01, 6.018071746826172e+01, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 3.234087824821472e-01, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 5.64130744934082e+01, 1.550483703613281e+02, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 4.57933634519577e-01, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 6.613400459289551e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 5.06679573059082e+01, 7.439083099365234e+01, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 4.584663867950439e+00, 1.152210593223572e+00]
+screen.HShaDirTil=[-0e+00, -0e+00, 0e+00, 0e+00, 1.647335433959961e+01, 7.171163707971573e-02, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 2.839325189590454e+00, 1.79934024810791e+01, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 1.786868333816528e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 9.530998229980469e+00, 6.048055267333984e+01, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 1.052042388916016e+02, 6.286818695068359e+01, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 6.0048508644104e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 5.683402633666992e+01, 1.619723205566406e+02, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 6.140278577804565e-01, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 1.859471130371094e+01, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 5.070920944213867e+01, 7.494593048095703e+01, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 8.947135925292969e+00, 1.544960498809814e+00]
 sideFins.HShaDirTil=[-0e+00, -0e+00, 0e+00, 0e+00, 2.933425712585449e+01, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 1.819856643676758e+00, 1.75841121673584e+01, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 4.926275253295898e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 1.082118892669678e+01, 7.274260711669922e+01, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 5.833586883544922e+01, 6.95792236328125e+01, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1.806171035766602e+01, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 5.753116607666016e+01, 1.664013366699219e+02, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 4.47523295879364e-01, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 4.515874862670898e+01, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 4.549911499023438e+01, 7.136063385009766e+01, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 1.20641040802002e+01, 2.788668394088745e+00]
 horizontalFins.HShaDirTil=[-0e+00, -0e+00, 0e+00, 0e+00, 1.910530281066895e+01, 8.795729279518127e-02, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 5.297706127166748e-01, 1.006861686706543e+01, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 2.886569023132324e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 4.122011566162109e+01, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 3.386688232421875e+01, 3.953476333618164e+01, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1.015810871124268e+01, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 9.3146240234375e+01, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 3.157832324504852e-01, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 2.485636138916016e+01, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 3.95340690612793e+01, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 7.351512432098389e+00, 1.581846237182617e+00]
 buildingShade.HShaSkyDifTil=[0e+00, 0e+00, 9.376106262207031e+00, 3.04037036895752e+01, 3.661954498291016e+01, 3.000022768974304e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.928069686889648e+01, 1.412471389770508e+01, 3.941596746444702e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.077058553695679e+00, 1.622628402709961e+01, 1.523675632476807e+01, 6.685359001159668e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.386701583862305e+00, 1.224931621551514e+01, 1.041926193237305e+01, 1.298773735761642e-01, 0e+00, 0e+00, 0e+00, 0e+00, 1.048361323773861e-02, 1.938933181762695e+01, 3.375141525268555e+01, 3.137067985534668e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.466521263122559e+00, 2.980622863769531e+01, 5.138078308105469e+01, 2.650667572021484e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.050936698913574e+00, 2.870361328125e+01, 3.134441566467285e+01, 2.226479798555374e-01, 0e+00, 0e+00, 0e+00, 0e+00, 9.711657762527466e-01, 3.161493682861328e+01, 3.911034774780273e+01, 5.115594863891602e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.614765644073486e+00, 2.830543899536133e+01, 2.183073997497559e+01, 4.94625061750412e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.690371751785278e+00, 1.301171875e+01, 2.559369659423828e+01, 3.745245561003685e-02, 0e+00, 0e+00, 0e+00, 0e+00, 3.022166728973389e+00, 2.569992637634277e+01, 4.851198959350586e+01, 3.51219367980957e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.141406536102295e+00, 1.235270690917969e+01, 2.16496639251709e+01, 1.355929493904114e+00]
 none.HShaSkyDifTil=[0e+00, 0e+00, 1.423011207580566e+01, 4.614368438720703e+01, 5.557746505737305e+01, 4.553132951259613e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.926230430603027e+01, 2.143707084655762e+01, 5.98215913772583e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.152350664138794e+00, 2.462662315368652e+01, 2.312481689453125e+01, 1.014636516571045e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.121079254150391e+01, 1.859078025817871e+01, 1.5813307762146e+01, 1.971148252487183e-01, 0e+00, 0e+00, 0e+00, 0e+00, 1.591097377240658e-02, 2.942717933654785e+01, 5.122450256347656e+01, 4.761126327514648e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.133193492889404e+01, 4.523689651489258e+01, 7.798058319091797e+01, 4.022916793823242e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.221890258789062e+01, 4.356346130371094e+01, 4.757140350341797e+01, 3.379127383232117e-01, 0e+00, 0e+00, 0e+00, 0e+00, 1.473937749862671e+00, 4.798197174072266e+01, 5.935775375366211e+01, 7.763935852050781e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.521527290344238e+00, 4.295915222167969e+01, 3.313250350952148e+01, 7.506921887397766e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.600874900817871e+00, 1.974787902832031e+01, 3.884354019165039e+01, 5.684157088398933e-02, 0e+00, 0e+00, 0e+00, 0e+00, 4.586740970611572e+00, 3.900476455688477e+01, 7.362661743164062e+01, 5.330454635620117e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.767711162567139e+00, 1.874769592285156e+01, 3.285768508911133e+01, 2.057893514633179e+00]
 overhang.HShaSkyDifTil=[0e+00, 0e+00, 6.112593173980713e+00, 1.98211784362793e+01, 2.387349128723145e+01, 1.955813765525818e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.256972312927246e+01, 9.208367347717285e+00, 2.56965708732605e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.354102969169617e+00, 1.057845115661621e+01, 9.933343887329102e+00, 4.358406066894531e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.815634727478027e+00, 7.985733509063721e+00, 6.792660713195801e+00, 8.467134833335876e-02, 0e+00, 0e+00, 0e+00, 0e+00, 6.834613159298897e-03, 1.264054489135742e+01, 2.200366020202637e+01, 2.045158195495605e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.867671489715576e+00, 1.943166351318359e+01, 3.3496826171875e+01, 1.728057670593262e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.248671531677246e+00, 1.871283340454102e+01, 2.04344596862793e+01, 1.451515704393387e-01, 0e+00, 0e+00, 0e+00, 0e+00, 6.331350207328796e-01, 2.061082077026367e+01, 2.54973258972168e+01, 3.335025024414062e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.660451173782349e+00, 1.845325088500977e+01, 1.423218059539795e+01, 3.22462409734726e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.405875205993652e+00, 8.482769012451172e+00, 1.668537521362305e+01, 2.44164913892746e-02, 0e+00, 0e+00, 0e+00, 0e+00, 1.970250248908997e+00, 1.675463104248047e+01, 3.162656593322754e+01, 2.289715003967285e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.047986507415771e+00, 8.053136825561523e+00, 1.411413097381592e+01, 8.839752078056335e-01]
-screen.HShaSkyDifTil=[0e+00, 0e+00, 3.560985326766968e+00, 1.154713153839111e+01, 2.88940372467041e+01, 2.393539994955063e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.577341270446777e+01, 1.56273078918457e+01, 3.31419825553894e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.746445417404175e+00, 1.795244598388672e+01, 2.048906135559082e+01, 1.00471134185791e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.687264680862427e+00, 4.652212142944336e+00, 5.647799968719482e+00, 6.48316815495491e-02, 0e+00, 0e+00, 0e+00, 0e+00, 1.587009243667126e-02, 2.87528018951416e+01, 4.552452850341797e+01, 4.180838775634766e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.454353809356689e+00, 2.506185913085938e+01, 6.919777679443359e+01, 3.812018966674805e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.736648559570312e+00, 1.432815742492676e+01, 1.758584976196289e+01, 8.456027507781982e-02, 0e+00, 0e+00, 0e+00, 0e+00, 1.381795048713684e+00, 4.785868835449219e+01, 5.841841125488281e+01, 7.530650329589844e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.389603137969971e+00, 1.688637161254883e+01, 1.851195526123047e+01, 5.472435355186462e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.596294164657593e+00, 9.271425247192383e+00, 2.475707244873047e+01, 1.422420237213373e-02, 0e+00, 0e+00, 0e+00, 0e+00, 3.71526026725769e+00, 3.656639862060547e+01, 7.347869110107422e+01, 5.26380729675293e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.144250631332397e+00, 5.257221698760986e+00, 1.727816200256348e+01, 1.532851099967957e+00]
+screen.HShaSkyDifTil=[0e+00, 0e+00, 3.560985326766968e+00, 1.154713153839111e+01, 1.827960205078125e+01, 2.137648910284042e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.577341270446777e+01, 1.56273078918457e+01, 3.31419825553894e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.746445417404175e+00, 1.795244598388672e+01, 2.03676872253418e+01, 9.913843154907227e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.687264680862427e+00, 4.652212142944336e+00, 3.957168817520142e+00, 6.48316815495491e-02, 0e+00, 0e+00, 0e+00, 0e+00, 1.587009243667126e-02, 2.87528018951416e+01, 4.511709976196289e+01, 3.470790863037109e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.454353809356689e+00, 2.506185913085938e+01, 5.684669494628906e+01, 3.543271636962891e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.736648559570312e+00, 1.432815742492676e+01, 1.190440845489502e+01, 8.456027507781982e-02, 0e+00, 0e+00, 0e+00, 0e+00, 1.381795048713684e+00, 4.785868835449219e+01, 5.799746322631836e+01, 6.838255310058594e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.389603137969971e+00, 1.688637161254883e+01, 1.835585975646973e+01, 5.472435355186462e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.596294164657593e+00, 9.271425247192383e+00, 1.277576065063477e+01, 1.422420237213373e-02, 0e+00, 0e+00, 0e+00, 0e+00, 3.71526026725769e+00, 3.656639862060547e+01, 7.343743896484375e+01, 5.208297729492188e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.144250631332397e+00, 5.257221698760986e+00, 1.291568946838379e+01, 1.140101194381714e+00]
 sideFins.HShaSkyDifTil=[0e+00, 0e+00, 1.090382194519043e+01, 3.535759353637695e+01, 4.258622741699219e+01, 3.488837480545044e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.242223739624023e+01, 1.64261531829834e+01, 4.583828926086426e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.415488243103027e+00, 1.887014770507812e+01, 1.771938896179199e+01, 7.774651527404785e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.590269088745117e+00, 1.424518394470215e+01, 1.211694526672363e+01, 1.510392129421234e-01, 0e+00, 0e+00, 0e+00, 0e+00, 1.219178177416325e-02, 2.25485725402832e+01, 3.925077056884766e+01, 3.648212432861328e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.683094024658203e+00, 3.466276550292969e+01, 5.975261306762695e+01, 3.082559585571289e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.362732887268066e+00, 3.338049697875977e+01, 3.645158386230469e+01, 2.58925586938858e-01, 0e+00, 0e+00, 0e+00, 0e+00, 1.129404664039612e+00, 3.676618194580078e+01, 4.548287200927734e+01, 5.949114608764648e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.529618740081787e+00, 3.291744232177734e+01, 2.538777732849121e+01, 5.752177834510803e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.291669845581055e+00, 1.513180923461914e+01, 2.976385688781738e+01, 4.355484619736671e-02, 0e+00, 0e+00, 0e+00, 0e+00, 3.514589786529541e+00, 2.988739776611328e+01, 5.641638946533203e+01, 4.084460067749023e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.653258085250854e+00, 1.43654203414917e+01, 2.517719650268555e+01, 1.576860666275024e+00]
 horizontalFins.HShaSkyDifTil=[0e+00, 0e+00, 5.50953197479248e+00, 1.786564254760742e+01, 2.151815986633301e+01, 1.762855499982834e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.132960891723633e+01, 8.299880027770996e+00, 2.316137552261353e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.220508694648743e+00, 9.534792900085449e+00, 8.95333194732666e+00, 3.928410768508911e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.340529441833496e+00, 7.197870254516602e+00, 6.122504234313965e+00, 7.631777226924896e-02, 0e+00, 0e+00, 0e+00, 0e+00, 6.160317920148373e-03, 1.139344310760498e+01, 1.983280372619629e+01, 1.843385124206543e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.38743257522583e+00, 1.751455879211426e+01, 3.019206809997559e+01, 1.55756950378418e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.730843544006348e+00, 1.686664581298828e+01, 1.841841888427734e+01, 1.308310776948929e-01, 0e+00, 0e+00, 0e+00, 0e+00, 5.706706643104553e-01, 1.85773811340332e+01, 2.298178863525391e+01, 3.00599536895752e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.299315214157104e+00, 1.66326732635498e+01, 1.2828049659729e+01, 2.906486392021179e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.168514251708984e+00, 7.645868301391602e+00, 1.503921508789062e+01, 2.200758829712868e-02, 0e+00, 0e+00, 0e+00, 0e+00, 1.775867581367493e+00, 1.5101637840271e+01, 2.850632476806641e+01, 2.063814353942871e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.845934629440308e+00, 7.258623600006104e+00, 1.272164630889893e+01, 7.967632412910461e-01]
 buildingShade.HShaGroDifTil=[0e+00, 0e+00, 4.405555725097656e+00, 1.514677238464355e+01, 1.109161186218262e+01, 1.109507605433464e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.659523010253906e+00, 5.048976421356201e+00, 1.445717573165894e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.275462985038757e-01, 6.093732357025146e+00, 5.512828826904297e+00, 8.324429988861084e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.706995964050293e+00, 4.418904304504395e+00, 3.776004076004028e+00, 5.20833320915699e-02, 0e+00, 0e+00, 0e+00, 0e+00, 3.812901675701141e-03, 7.865843772888184e+00, 1.924170684814453e+01, 5.935146331787109e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.43974494934082e+00, 2.942499160766602e+01, 2.464447975158691e+01, 1.579637169837952e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.916539907455444e+00, 1.068875694274902e+01, 9.356404304504395e+00, 8.467613905668259e-02, 0e+00, 0e+00, 0e+00, 0e+00, 4.814038276672363e-01, 2.050595283508301e+01, 3.034319877624512e+01, 7.799302101135254e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.153697967529297e+00, 1.118266201019287e+01, 7.702850818634033e+00, 1.838271617889404e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.362248539924622e+00, 5.24133825302124e+00, 6.196576118469238e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.262500047683716e+00, 2.799267387390137e+01, 2.457201766967773e+01, 4.207704067230225e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.152281761169434e+00, 4.46795654296875e+00, 7.093942165374756e+00, 5.175763368606567e-01]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_CavityInternalWall.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_CavityInternalWall.txt
new file mode 100644
index 0000000000..1c7a0b3cce
--- /dev/null
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_CavityInternalWall.txt
@@ -0,0 +1,18 @@
+last-generated=2024-12-03
+statistics-initialization=
+{
+  "nonlinear": "2",
+  "numerical Jacobians": "0"
+}
+statistics-simulation=
+{
+  "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0",
+  "nonlinear": "2, 1",
+  "number of continuous time states": "53",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 1e+06]
+zone1.TSensor=[2.931499938964844e+02, 2.925952453613281e+02, 2.919923706054688e+02, 2.914320678710938e+02, 2.909762878417969e+02, 2.90524658203125e+02, 2.901611938476562e+02, 2.896863403320312e+02, 2.891748657226562e+02, 2.886797485351562e+02, 2.881556396484375e+02, 2.877175903320312e+02, 2.872381591796875e+02, 2.871629028320312e+02, 2.874560546875e+02, 2.874835815429688e+02, 2.870610961914062e+02, 2.866139221191406e+02, 2.861643981933594e+02, 2.85720458984375e+02, 2.852701416015625e+02, 2.849440307617188e+02, 2.8502783203125e+02, 2.852385559082031e+02, 2.849817504882812e+02, 2.846410827636719e+02, 2.84196533203125e+02, 2.837686157226562e+02, 2.833543090820312e+02, 2.830357055664062e+02, 2.828579711914062e+02, 2.82947021484375e+02, 2.828289794921875e+02, 2.824901123046875e+02, 2.821963500976562e+02, 2.819315795898438e+02, 2.816903076171875e+02, 2.815327453613281e+02, 2.813721313476562e+02, 2.814109802246094e+02, 2.814635009765625e+02, 2.813795776367188e+02, 2.812240600585938e+02, 2.810315551757812e+02, 2.8081787109375e+02, 2.806154479980469e+02, 2.803824462890625e+02, 2.803044128417969e+02, 2.804788208007812e+02, 2.806336059570312e+02, 2.805353698730469e+02, 2.80361083984375e+02, 2.802029113769531e+02, 2.800515441894531e+02, 2.798260192871094e+02, 2.79725341796875e+02, 2.796937255859375e+02, 2.797514953613281e+02, 2.797854614257812e+02, 2.798094177246094e+02, 2.798564147949219e+02, 2.799014892578125e+02, 2.799378356933594e+02, 2.798992309570312e+02, 2.798338623046875e+02, 2.801336975097656e+02, 2.805684509277344e+02, 2.806973571777344e+02, 2.805543518066406e+02, 2.804464721679688e+02, 2.802464294433594e+02, 2.800467529296875e+02, 2.798687438964844e+02, 2.797793579101562e+02, 2.80135498046875e+02, 2.805111999511719e+02, 2.804981079101562e+02, 2.80352783203125e+02, 2.800522766113281e+02, 2.798515014648438e+02, 2.796124572753906e+02, 2.793713073730469e+02, 2.793205261230469e+02, 2.794188537597656e+02, 2.793956604003906e+02, 2.792092895507812e+02, 2.789703063964844e+02, 2.787109985351562e+02, 2.785564270019531e+02, 2.784049072265625e+02, 2.782853393554688e+02, 2.784617309570312e+02, 2.787063293457031e+02, 2.788251953125e+02, 2.788516540527344e+02, 2.788295593261719e+02, 2.787979736328125e+02, 2.787529907226562e+02, 2.787052612304688e+02, 2.787495727539062e+02, 2.788833923339844e+02]
+zone.TSensor=[2.931499938964844e+02, 2.926999206542969e+02, 2.922445068359375e+02, 2.917460632324219e+02, 2.912753601074219e+02, 2.908990173339844e+02, 2.904216613769531e+02, 2.89990478515625e+02, 2.895257873535156e+02, 2.890595397949219e+02, 2.886679382324219e+02, 2.882170715332031e+02, 2.878166809082031e+02, 2.874800720214844e+02, 2.872220458984375e+02, 2.869885559082031e+02, 2.867673034667969e+02, 2.864473876953125e+02, 2.861249694824219e+02, 2.858100891113281e+02, 2.854950561523438e+02, 2.851728820800781e+02, 2.849535217285156e+02, 2.847809143066406e+02, 2.846450805664062e+02, 2.843946533203125e+02, 2.84126953125e+02, 2.838424377441406e+02, 2.835666198730469e+02, 2.832707824707031e+02, 2.83027099609375e+02, 2.828335876464844e+02, 2.827119140625e+02, 2.825606384277344e+02, 2.823295288085938e+02, 2.821295166015625e+02, 2.819603271484375e+02, 2.817825317382812e+02, 2.816460876464844e+02, 2.815696105957031e+02, 2.815206909179688e+02, 2.8147265625e+02, 2.813694458007812e+02, 2.812383117675781e+02, 2.810901184082031e+02, 2.809276428222656e+02, 2.808061218261719e+02, 2.806304016113281e+02, 2.8059033203125e+02, 2.805955200195312e+02, 2.805326843261719e+02, 2.804366455078125e+02, 2.803308715820312e+02, 2.8023193359375e+02, 2.801300964355469e+02, 2.799819946289062e+02, 2.799410095214844e+02, 2.799443359375e+02, 2.799684143066406e+02, 2.800029907226562e+02, 2.800159606933594e+02, 2.800635070800781e+02, 2.801144714355469e+02, 2.800892639160156e+02, 2.800481872558594e+02, 2.800560913085938e+02, 2.801470031738281e+02, 2.801758117675781e+02, 2.80180908203125e+02, 2.800930480957031e+02, 2.800314331054688e+02, 2.799037475585938e+02, 2.798087158203125e+02, 2.796700744628906e+02, 2.796793823242188e+02, 2.798084411621094e+02, 2.798428649902344e+02, 2.796986083984375e+02, 2.796549987792969e+02, 2.795201416015625e+02, 2.794114990234375e+02, 2.792799377441406e+02, 2.79182373046875e+02, 2.791936340332031e+02, 2.791882019042969e+02, 2.791157531738281e+02, 2.790021362304688e+02, 2.788760070800781e+02, 2.787360534667969e+02, 2.786292419433594e+02, 2.785581970214844e+02, 2.785295104980469e+02, 2.786560668945312e+02, 2.787375183105469e+02, 2.787743530273438e+02, 2.787899780273438e+02, 2.787959289550781e+02, 2.787927551269531e+02, 2.787826232910156e+02, 2.787654418945312e+02, 2.788059997558594e+02]
+zone.airModel.phi=[6.919873952865601e-01, 6.569905281066895e-01, 6.29794180393219e-01, 6.052594184875488e-01, 5.898301601409912e-01, 5.805140733718872e-01, 5.873125791549683e-01, 5.687047243118286e-01, 5.317956805229187e-01, 5.029979944229126e-01, 4.694504737854004e-01, 4.679054617881775e-01, 4.560427069664001e-01, 4.535030126571655e-01, 4.490879476070404e-01, 4.428291022777557e-01, 4.428592324256897e-01, 4.486857056617737e-01, 4.574441611766815e-01, 4.666106700897217e-01, 4.765667915344238e-01, 4.888355731964111e-01, 4.982454180717468e-01, 5.05883514881134e-01, 5.075547695159912e-01, 5.173188447952271e-01, 5.23974597454071e-01, 5.331707000732422e-01, 5.428186058998108e-01, 5.592078566551208e-01, 5.788772106170654e-01, 5.692751407623291e-01, 5.591893792152405e-01, 5.570325255393982e-01, 5.659471750259399e-01, 5.80519437789917e-01, 6.006613969802856e-01, 6.247342824935913e-01, 6.827542781829834e-01, 7.151523232460022e-01, 7.447251081466675e-01, 7.555827498435974e-01, 7.609860897064209e-01, 7.661503553390503e-01, 7.668323516845703e-01, 7.684221863746643e-01, 7.667705416679382e-01, 7.729498147964478e-01, 7.694385647773743e-01, 7.64801025390625e-01, 7.632497549057007e-01, 7.669160962104797e-01, 7.733671069145203e-01, 7.795771956443787e-01, 7.798453569412231e-01, 7.924993634223938e-01, 8.025606274604797e-01, 8.267460465431213e-01, 8.76791775226593e-01, 9.055498838424683e-01, 9.434438347816467e-01, 9.747087955474854e-01, 9.623086452484131e-01, 9.471375346183777e-01, 9.278746843338013e-01, 8.658116459846497e-01, 8.216235637664795e-01, 8.034761548042297e-01, 7.809041738510132e-01, 7.673010230064392e-01, 7.495731711387634e-01, 7.426764965057373e-01, 7.41580605506897e-01, 7.432451844215393e-01, 7.305730581283569e-01, 6.95443332195282e-01, 6.558732986450195e-01, 6.252598166465759e-01, 6.113229393959045e-01, 6.131174564361572e-01, 6.138532757759094e-01, 6.176589727401733e-01, 6.221441030502319e-01, 6.183875799179077e-01, 6.079532504081726e-01, 6.096433997154236e-01, 6.165189743041992e-01, 6.281903982162476e-01, 6.523142457008362e-01, 6.687359213829041e-01, 6.861083507537842e-01, 7.060089707374573e-01, 7.982528805732727e-01, 8.712195158004761e-01, 9.156528115272522e-01, 9.096249938011169e-01, 9.108882546424866e-01, 9.120802283287048e-01, 9.155471324920654e-01, 9.0667724609375e-01, 9.043282270431519e-01]
+zone1.airModel.phi=[6.919873952865601e-01, 6.622512340545654e-01, 6.368540525436401e-01, 6.156658530235291e-01, 5.988980531692505e-01, 5.940888524055481e-01, 5.935357809066772e-01, 5.882573127746582e-01, 5.489433407783508e-01, 5.141035318374634e-01, 4.963021278381348e-01, 4.765447080135345e-01, 4.708317220211029e-01, 4.630492627620697e-01, 4.44907158613205e-01, 4.328126609325409e-01, 4.376636147499084e-01, 4.456640183925629e-01, 4.572290778160095e-01, 4.693464934825897e-01, 4.830944240093231e-01, 4.947359263896942e-01, 4.977977871894836e-01, 4.926576614379883e-01, 5.008406639099121e-01, 5.112447142601013e-01, 5.230693817138672e-01, 5.363429188728333e-01, 5.508751273155212e-01, 5.649994611740112e-01, 5.802399516105652e-01, 5.700725317001343e-01, 5.564216375350952e-01, 5.597764849662781e-01, 5.705074071884155e-01, 5.874742865562439e-01, 6.066775918006897e-01, 6.288825273513794e-01, 6.712904572486877e-01, 7.150668501853943e-01, 7.387681007385254e-01, 7.536982893943787e-01, 7.652812004089355e-01, 7.740157246589661e-01, 7.775141596794128e-01, 7.782762050628662e-01, 7.845874428749084e-01, 7.831899523735046e-01, 7.760225534439087e-01, 7.614996433258057e-01, 7.628588080406189e-01, 7.708395719528198e-01, 7.785606384277344e-01, 7.86590039730072e-01, 7.92582631111145e-01, 8.009728789329529e-01, 8.199073076248169e-01, 8.389462828636169e-01, 8.953123092651367e-01, 9.305005073547363e-01, 9.529156684875488e-01, 9.808123111724854e-01, 9.781458973884583e-01, 9.546136260032654e-01, 9.495323300361633e-01, 8.868644237518311e-01, 8.161593675613403e-01, 7.850581407546997e-01, 7.705008387565613e-01, 7.605926394462585e-01, 7.42881715297699e-01, 7.375636696815491e-01, 7.396829724311829e-01, 7.390197515487671e-01, 7.162278890609741e-01, 6.791009306907654e-01, 6.422451138496399e-01, 6.101471781730652e-01, 6.021746397018433e-01, 6.020421385765076e-01, 6.071295142173767e-01, 6.143121719360352e-01, 6.163503527641296e-01, 6.133642792701721e-01, 6.051993370056152e-01, 6.066964268684387e-01, 6.190552711486816e-01, 6.444016098976135e-01, 6.59614086151123e-01, 6.789892315864563e-01, 7.057965397834778e-01, 7.081205248832703e-01, 7.494281530380249e-01, 8.189424276351929e-01, 8.689200282096863e-01, 9.007329940795898e-01, 9.089131355285645e-01, 9.177844524383545e-01, 9.185097217559814e-01, 9.069960713386536e-01, 9.093928337097168e-01]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_RectangularZoneTemplate.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_RectangularZoneTemplate.txt
new file mode 100644
index 0000000000..d36af301af
--- /dev/null
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_RectangularZoneTemplate.txt
@@ -0,0 +1,15 @@
+last-generated=2023-09-21
+statistics-initialization=
+{
+  "nonlinear": "7",
+  "numerical Jacobians": "0"
+}
+statistics-simulation=
+{
+  "linear": "0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0",
+  "nonlinear": "1",
+  "number of continuous time states": "32",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 6.048e+05]
+Zone.TSensor=[2.931499938964844e+02, 2.920835876464844e+02, 2.915396423339844e+02, 2.910886535644531e+02, 2.906692199707031e+02, 2.902604064941406e+02, 2.901122131347656e+02, 2.899202575683594e+02, 2.896233825683594e+02, 2.893373107910156e+02, 2.890292358398438e+02, 2.886701354980469e+02, 2.88281982421875e+02, 2.87865234375e+02, 2.874775390625e+02, 2.870838317871094e+02, 2.867032165527344e+02, 2.863457336425781e+02, 2.859839172363281e+02, 2.856553344726562e+02, 2.858819885253906e+02, 2.878375244140625e+02, 2.89998291015625e+02, 2.915741271972656e+02, 2.911492919921875e+02, 2.900740356445312e+02, 2.894339294433594e+02, 2.888988342285156e+02, 2.884122009277344e+02, 2.879504699707031e+02, 2.875205078125e+02, 2.871021118164062e+02, 2.866971130371094e+02, 2.862882995605469e+02, 2.859939575195312e+02, 2.86768310546875e+02, 2.885063171386719e+02, 2.8946728515625e+02, 2.893148193359375e+02, 2.884397888183594e+02, 2.878923645019531e+02, 2.874140319824219e+02, 2.868952331542969e+02, 2.86443359375e+02, 2.860198669433594e+02, 2.856124267578125e+02, 2.852413024902344e+02, 2.8490185546875e+02, 2.845851440429688e+02, 2.847218017578125e+02, 2.858356323242188e+02, 2.869347229003906e+02, 2.865310363769531e+02, 2.858154296875e+02, 2.852948303222656e+02, 2.848879089355469e+02, 2.845575256347656e+02, 2.842493286132812e+02, 2.839821472167969e+02, 2.837236328125e+02, 2.835140991210938e+02, 2.833189392089844e+02, 2.831463928222656e+02, 2.832523498535156e+02, 2.835974731445312e+02, 2.840306701660156e+02, 2.841548767089844e+02, 2.837952575683594e+02, 2.834761657714844e+02, 2.832033081054688e+02, 2.82948486328125e+02, 2.827042541503906e+02, 2.824461364746094e+02, 2.821814575195312e+02, 2.819437255859375e+02, 2.817244567871094e+02, 2.815263366699219e+02, 2.814876403808594e+02, 2.822291564941406e+02, 2.831376953125e+02, 2.8373095703125e+02, 2.83414306640625e+02, 2.829779968261719e+02, 2.826695556640625e+02, 2.824320068359375e+02, 2.822185668945312e+02, 2.820139770507812e+02, 2.818233947753906e+02, 2.816090393066406e+02, 2.812972412109375e+02, 2.811602478027344e+02, 2.810617065429688e+02, 2.811272583007812e+02, 2.812081909179688e+02, 2.812805786132812e+02, 2.812587280273438e+02, 2.812162475585938e+02, 2.81191650390625e+02, 2.811491088867188e+02, 2.811337585449219e+02, 2.811432189941406e+02]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_RectangularZoneTemplateOnePort.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_RectangularZoneTemplateOnePort.txt
new file mode 100644
index 0000000000..be56f8d7fa
--- /dev/null
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_RectangularZoneTemplateOnePort.txt
@@ -0,0 +1,16 @@
+last-generated=2024-10-29
+statistics-initialization=
+{
+  "nonlinear": "7, 1",
+  "numerical Jacobians": "0"
+}
+statistics-simulation=
+{
+  "linear": "0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0",
+  "nonlinear": "1, 1",
+  "number of continuous time states": "37",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 6.048e+05]
+Zone.TSensor=[2.931499938964844e+02, 2.921410827636719e+02, 2.916368713378906e+02, 2.91199462890625e+02, 2.907905883789062e+02, 2.903746643066406e+02, 2.902494201660156e+02, 2.900580749511719e+02, 2.897626953125e+02, 2.894813537597656e+02, 2.891777954101562e+02, 2.888265380859375e+02, 2.884180603027344e+02, 2.880067443847656e+02, 2.876251525878906e+02, 2.8723388671875e+02, 2.868690795898438e+02, 2.865237731933594e+02, 2.861727294921875e+02, 2.858469848632812e+02, 2.860798950195312e+02, 2.880439453125e+02, 2.902119140625e+02, 2.917859802246094e+02, 2.913692932128906e+02, 2.90299072265625e+02, 2.896849060058594e+02, 2.891688232421875e+02, 2.887095642089844e+02, 2.882580871582031e+02, 2.878361511230469e+02, 2.874247436523438e+02, 2.870458374023438e+02, 2.866359252929688e+02, 2.863400573730469e+02, 2.871263732910156e+02, 2.888761901855469e+02, 2.898481750488281e+02, 2.897021484375e+02, 2.888095092773438e+02, 2.882689208984375e+02, 2.878150024414062e+02, 2.873133850097656e+02, 2.868882446289062e+02, 2.864649353027344e+02, 2.86073486328125e+02, 2.85710693359375e+02, 2.853745727539062e+02, 2.850428466796875e+02, 2.851764831542969e+02, 2.862651062011719e+02, 2.873290405273438e+02, 2.869341735839844e+02, 2.86224609375e+02, 2.857164611816406e+02, 2.853041076660156e+02, 2.849602355957031e+02, 2.8466064453125e+02, 2.843810729980469e+02, 2.841360168457031e+02, 2.839119262695312e+02, 2.837063903808594e+02, 2.835128479003906e+02, 2.836040649414062e+02, 2.839518432617188e+02, 2.843829956054688e+02, 2.844980773925781e+02, 2.841419372558594e+02, 2.838221740722656e+02, 2.835468139648438e+02, 2.832788391113281e+02, 2.830376281738281e+02, 2.827721557617188e+02, 2.825094909667969e+02, 2.822822875976562e+02, 2.82065673828125e+02, 2.818647155761719e+02, 2.818294067382812e+02, 2.825751342773438e+02, 2.834794616699219e+02, 2.8407958984375e+02, 2.837640075683594e+02, 2.833319396972656e+02, 2.830284729003906e+02, 2.827944946289062e+02, 2.82579345703125e+02, 2.823714904785156e+02, 2.821771240234375e+02, 2.819656372070312e+02, 2.81656982421875e+02, 2.815023498535156e+02, 2.813941650390625e+02, 2.814497375488281e+02, 2.815188598632812e+02, 2.815767822265625e+02, 2.815404357910156e+02, 2.814782104492188e+02, 2.814413146972656e+02, 2.813902587890625e+02, 2.813652038574219e+02, 2.813652038574219e+02]
+Zone.airModel.ACH=[9.895813465118408e-02, 7.459614425897598e-02, 6.301883608102798e-02, 6.824941188097e-02, 6.595325469970703e-02, 8.893157541751862e-02, 6.931084394454956e-02, 6.963981688022611e-02, 8.038201183080673e-02, 9.782703220844269e-02, 9.742789715528488e-02, 8.121851831674576e-02, 1.317422837018967e-01, 9.782528132200241e-02, 1.02315291762352e-01, 9.87095832824707e-02, 1.01896233856678e-01, 6.748770177364349e-02, 6.745440512895584e-02, 6.746475398540497e-02, 6.864345073699951e-02, 6.727682799100876e-02, 9.710941463708878e-02, 8.217767626047134e-02, 9.627119451761246e-02, 1.058935970067978e-01, 4.810301214456558e-02, 6.237379088997841e-02, 4.121184349060059e-02, 4.123584926128387e-02, 3.946689888834953e-02, 4.042151942849159e-02, 1.310306414961815e-02, 3.970133513212204e-02, 3.978205099701881e-02, 3.916117176413536e-02, 3.959980979561806e-02, 6.908389925956726e-02, 6.721723824739456e-02, 5.591299012303352e-02, 6.80520310997963e-02, 3.978885337710381e-02, 2.685818262398243e-02, 2.017650380730629e-02, 1.5409791842103e-02, 1.5469616279006e-02, 1.607930287718773e-02, 1.502749044448137e-02, 3.921641036868095e-02, 4.729731380939484e-02, 9.979096055030823e-02, 1.101348549127579e-01, 1.002982780337334e-01, 6.904250383377075e-02, 6.829814612865448e-02, 7.884355634450912e-02, 6.157140433788255e-02, 8.759768307208865e-02, 5.379657074809074e-02, 3.897379338741302e-02, 4.072781652212143e-02, 6.682983040809631e-02, 9.881164878606796e-02, 9.70582440495491e-02, 8.059638738632202e-02, 7.126782834529877e-02, 9.848204255104065e-02, 6.873937696218491e-02, 6.879867613315578e-02, 6.547260284423828e-02, 7.853253185749054e-02, 6.865542382001877e-02, 9.978999197483063e-02, 6.482280790805817e-02, 3.742918372154236e-02, 3.863580897450447e-02, 4.000164940953255e-02, 2.126280590891838e-02, 1.631868630647659e-02, 4.045885056257248e-02, 4.045014455914497e-02, 3.953144699335052e-02, 1.606380753219127e-02, 1.595970615744591e-02, 1.600413583219051e-02, 1.602238044142723e-02, 1.602254994213581e-02, 1.588619127869606e-02, 1.588535867631435e-02, 3.94711010158062e-02, 4.034211486577988e-02, 1.662344112992287e-02, 3.953312709927559e-02, 3.907583653926849e-02, 6.639903783798218e-02, 1.059689372777939e-01, 1.209637299180031e-01, 1.285678893327713e-01, 9.596489369869232e-02, 1.230944693088531e-01, 1.317845433950424e-01]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_RectangularZoneTemplateTwoPort.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_RectangularZoneTemplateTwoPort.txt
new file mode 100644
index 0000000000..284f72ff32
--- /dev/null
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_RectangularZoneTemplateTwoPort.txt
@@ -0,0 +1,16 @@
+last-generated=2024-10-29
+statistics-initialization=
+{
+  "nonlinear": "7, 1",
+  "numerical Jacobians": "0"
+}
+statistics-simulation=
+{
+  "linear": "0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0",
+  "nonlinear": "1, 1",
+  "number of continuous time states": "43",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 6.048e+05]
+Zone.TSensor=[2.931499938964844e+02, 2.921130676269531e+02, 2.915968322753906e+02, 2.911562194824219e+02, 2.907448425292969e+02, 2.903289184570312e+02, 2.901995239257812e+02, 2.900058898925781e+02, 2.897098999023438e+02, 2.894281311035156e+02, 2.891239318847656e+02, 2.887693176269531e+02, 2.883604736328125e+02, 2.879484252929688e+02, 2.875639953613281e+02, 2.871717834472656e+02, 2.868025817871094e+02, 2.864545288085938e+02, 2.861007995605469e+02, 2.857759094238281e+02, 2.860075073242188e+02, 2.879686584472656e+02, 2.901304931640625e+02, 2.9169970703125e+02, 2.912782592773438e+02, 2.902046203613281e+02, 2.895836181640625e+02, 2.890643005371094e+02, 2.885978088378906e+02, 2.881432495117188e+02, 2.8771923828125e+02, 2.873067932128906e+02, 2.869211120605469e+02, 2.865122985839844e+02, 2.862178344726562e+02, 2.870008850097656e+02, 2.887463073730469e+02, 2.897114868164062e+02, 2.895629272460938e+02, 2.886771240234375e+02, 2.881357421875e+02, 2.876732788085938e+02, 2.871646118164062e+02, 2.867306823730469e+02, 2.8630908203125e+02, 2.859132690429688e+02, 2.855488586425781e+02, 2.852134704589844e+02, 2.848890686035156e+02, 2.850256652832031e+02, 2.861190490722656e+02, 2.871866455078125e+02, 2.867873840332031e+02, 2.860770568847656e+02, 2.855680847167969e+02, 2.851594543457031e+02, 2.848203430175781e+02, 2.845211791992188e+02, 2.842464294433594e+02, 2.84001220703125e+02, 2.837831115722656e+02, 2.835819091796875e+02, 2.833948059082031e+02, 2.834896545410156e+02, 2.838380432128906e+02, 2.842707214355469e+02, 2.843865966796875e+02, 2.840328369140625e+02, 2.837151489257812e+02, 2.834407653808594e+02, 2.831754760742188e+02, 2.829355773925781e+02, 2.826719055175781e+02, 2.824089965820312e+02, 2.821816711425781e+02, 2.819664306640625e+02, 2.817678833007812e+02, 2.817334289550781e+02, 2.824792175292969e+02, 2.833854370117188e+02, 2.83985107421875e+02, 2.836697692871094e+02, 2.832369689941406e+02, 2.829336242675781e+02, 2.8269970703125e+02, 2.824855041503906e+02, 2.822794494628906e+02, 2.820872192382812e+02, 2.81875732421875e+02, 2.815646362304688e+02, 2.814164733886719e+02, 2.813125915527344e+02, 2.813714294433594e+02, 2.814439697265625e+02, 2.815053100585938e+02, 2.814722900390625e+02, 2.814136047363281e+02, 2.813792419433594e+02, 2.813303527832031e+02, 2.813074035644531e+02, 2.813093566894531e+02]
+Zone.airModel.ACH=[1.27307116985321e-01, 1.045469790697098e-01, 9.708240628242493e-02, 9.746719151735306e-02, 9.534446150064468e-02, 1.133223623037338e-01, 9.558688104152679e-02, 9.591872245073316e-02, 1.050575822591782e-01, 1.172644942998886e-01, 1.184776723384857e-01, 1.068646535277367e-01, 1.541225910186768e-01, 1.23947486281395e-01, 1.244157403707504e-01, 1.212667748332024e-01, 1.230432763695717e-01, 9.576659649610519e-02, 9.526059776544571e-02, 9.367668628692627e-02, 9.296504408121109e-02, 9.525571763515472e-02, 1.247830241918564e-01, 1.103265956044197e-01, 1.240726038813591e-01, 1.289435476064682e-01, 8.621374517679214e-02, 9.14553701877594e-02, 7.705310732126236e-02, 7.65279084444046e-02, 7.550234347581863e-02, 7.475303113460541e-02, 5.538245290517807e-02, 7.355635613203049e-02, 7.277404516935349e-02, 7.22106471657753e-02, 7.510200887918472e-02, 1.000088527798653e-01, 9.887442737817764e-02, 8.702046424150467e-02, 9.412339329719543e-02, 7.751608639955519e-02, 6.935308873653412e-02, 6.233447790145874e-02, 5.838463827967644e-02, 5.782968923449516e-02, 5.612562224268913e-02, 5.373235419392586e-02, 7.049576193094254e-02, 7.28827640414238e-02, 1.182453781366348e-01, 1.310582906007767e-01, 1.240328401327133e-01, 9.745825827121735e-02, 9.390369802713394e-02, 1.028144955635071e-01, 8.502022922038999e-02, 1.091508194804178e-01, 7.59514644742012e-02, 6.244524568319321e-02, 6.137166172266006e-02, 8.199633657932281e-02, 1.083182469010353e-01, 1.097728684544563e-01, 9.58142876625061e-02, 8.819485455751419e-02, 1.146080121397972e-01, 8.419866114854813e-02, 8.445223420858383e-02, 8.377443999052048e-02, 9.443293511867523e-02, 8.545380830764771e-02, 1.142775863409042e-01, 8.440462499856949e-02, 6.00019097328186e-02, 5.850674584507942e-02, 5.812740325927734e-02, 4.299337789416313e-02, 3.893035277724266e-02, 5.782452598214149e-02, 5.989908799529076e-02, 6.048723682761159e-02, 4.21503484249115e-02, 4.094546660780907e-02, 4.018658772110939e-02, 3.928770497441292e-02, 3.886840492486954e-02, 3.680011630058289e-02, 4.152351245284081e-02, 6.295759975910187e-02, 5.419623479247093e-02, 3.356046602129936e-02, 4.840826615691185e-02, 4.677339643239975e-02, 6.785689294338226e-02, 1.063414216041565e-01, 1.217814907431602e-01, 1.288191080093384e-01, 9.663998335599899e-02, 1.230117306113243e-01, 1.31174236536026e-01]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_WallUnitTest.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_WallUnitTest.txt
index aec097d9b3..1cd4010ffa 100644
--- a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_WallUnitTest.txt
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_WallUnitTest.txt
@@ -1,9 +1,9 @@
-last-generated=2023-05-02
+last-generated=2023-09-20
 statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0",
   "nonlinear": "1",
-  "number of continuous time states": "37",
+  "number of continuous time states": "41",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1e+06]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_WindowDynamics.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_WindowDynamics.txt
index 8ec501dce7..f44afcd691 100644
--- a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_WindowDynamics.txt
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_WindowDynamics.txt
@@ -1,4 +1,4 @@
-last-generated=2023-05-02
+last-generated=2023-10-23
 statistics-initialization=
 {
   "nonlinear": "3",
@@ -12,9 +12,9 @@ statistics-simulation=
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1e+06]
-windowTwo.propsBus_a.surfRad.Q_flow=[-4.777146339416504e+00, -3.957793414592743e-01, -2.463122506936391e-01, -1.728788018226624e-01, 1.300181833902995e+01, 5.096647262573242e+00, -1.370593905448914e-01, -1.998742123444875e-01, -1.502863963445028e-01, -1.007114872336388e-01, -1.028804033994675e-01, -3.185549999276797e-02, 8.236695861816406e+01, 2.244911244710287e+02, 1.440074818929037e+02, -1.660434722900391e+00, -1.125284751256307e+00, -8.132323026657104e-01, -5.810092091560364e-01, -4.38445121049881e-01, -2.541664143403371e-01, 9.089518737792969e+01, 1.48325449625651e+02, 9.356577237447103e+00, -9.419880509376526e-01, -8.135643005371094e-01, -5.289579629898071e-01, -4.212667346000671e-01, -2.455834547678629e-01, 1.158707141876221e-01, 1.138681640625e+02, 6.168895467122396e+01, -6.65348211924235e-01, -5.467557311058044e-01, -3.637935817241669e-01, -2.487048953771591e-01, -9.084037691354752e-02, -6.294558197259903e-02, 3.403312683105469e+01, 5.648152160644531e+01, 1.176340707143148e+01, -3.833326200644175e-01, -2.899780869483948e-01, -2.351696640253067e-01, -1.771942029396693e-01, -1.060342863202095e-01, -5.98777544995149e-02, 7.109262084960938e+01, 9.384154510498047e+01, 2.599792232116063e-01, -5.268250306447347e-01, -3.51845920085907e-01, -2.606402138868968e-01, -3.16658228635788e-01, 5.344300717115402e-02, 1.395981560150782e+00, 9.596016565958658e+00, 6.920230865478516e+00, 1.868389546871185e-03, -6.765685478846233e-02, 3.871253132820129e-02, 3.176662946740786e-02, -2.748200794061025e-01, -1.233698204159737e-01, 1.232068176269531e+02, 1.917559865315755e+02, 6.645679473876953e+01, -1.19204040368398e+00, -8.338014682133993e-01, -6.291767358779907e-01, -5.486774444580078e-01, -3.081738452116649e-01, -3.127745389938354e-01, 1.34339604695638e+02, 1.892753346761068e+02, -3.4328293800354e+00, -1.220662554105123e+00, -8.566747903823853e-01, -6.835284829139709e-01, -4.599328835805257e-01, -3.486899634202321e-01, 7.022477626800537e+00, 5.517316818237305e+01, 4.248204549153646e+01, -6.336552500724792e-01, -3.93919716278712e-01, -2.839868068695068e-01, -1.705358922481537e-01, -1.109696974356969e-01, -1.289057079702616e-02, 2.24296932220459e+01, 5.575171534220377e+01, 2.957962989807129e+01, -3.259519338607788e-01, -2.750428815682729e-01, -1.947660992542903e-01, -1.729489713907242e-01, -1.025084132949511e-01, -1.298910900950432e-01, 4.594795989990234e+01, 2.320608615875244e+00]
-windowNone.propsBus_a.surfRad.Q_flow=[9.554292678833008e+00, 7.868504722913107e-01, 4.880061348279317e-01, 3.42333972454071e-01, 1.541951433817546e+01, 5.767962455749512e+00, 1.058681488037109e+00, 3.994808991750081e-01, 2.987115283807119e-01, 1.989529728889465e-01, 2.045203397671382e-01, 6.172930325071017e-02, 5.769981002807617e+01, 2.131333414713542e+02, 1.531042277018229e+02, 3.295672416687012e+00, 2.230681260426839e+00, 1.612615704536438e+00, 1.15175461769104e+00, 8.696905573209127e-01, 5.01663347085317e-01, 7.828610992431641e+01, 1.49020014444987e+02, 2.932179387410482e+01, 1.868013620376587e+00, 1.617892305056254e+00, 1.048866748809814e+00, 8.367776274681091e-01, 4.860987663269043e-01, 3.806142608324687e-01, 9.940048217773438e+01, 7.273722839355469e+01, 2.305332581202189e+00, 1.082637548446655e+00, 7.199045618375143e-01, 4.925137360890706e-01, 1.770772486925125e-01, 1.234328200419744e-01, 2.497254244486491e+01, 5.255393981933594e+01, 1.927896372477214e+01, 7.614174286524454e-01, 5.759516954421997e-01, 4.674095014731089e-01, 3.515884876251221e-01, 2.095303237438202e-01, 1.179910202821096e-01, 6.309068298339844e+01, 9.161344146728516e+01, 7.575695037841797e+00, 1.045629461606344e+00, 6.97426438331604e-01, 5.168474515279134e-01, 6.319125890731812e-01, -1.155027523636818e-01, 7.080669105052948e-01, 8.781026522318522e+00, 7.46537971496582e+00, 4.692978858947754e-01, 1.360173126061757e-01, -7.782263308763504e-02, -6.30826825896899e-02, 5.52972654501597e-01, 2.464425265789032e-01, 1.063324381510417e+02, 1.831372884114583e+02, 8.101072692871094e+01, 2.361993153889974e+00, 1.65069317817688e+00, 1.246877312660217e+00, 1.090550422668457e+00, 6.095236738522848e-01, 6.222686171531677e-01, 1.232003784179688e+02, 1.854351094563802e+02, 1.899701309204102e+01, 2.421138525009155e+00, 1.697253108024597e+00, 1.35720157623291e+00, 9.119279384613037e-01, 6.912955641746521e-01, 4.075955390930176e+00, 4.950585174560547e+01, 4.506343714396159e+01, 1.362825989723206e+00, 7.830754121144613e-01, 5.639155705769857e-01, 3.370555937290192e-01, 2.192405611276627e-01, 2.339093945920467e-02, 1.553720664978027e+01, 5.517727406819662e+01, 3.153503608703613e+01, 6.465080976486206e-01, 5.473010540008545e-01, 3.86743684609731e-01, 3.442527651786804e-01, 2.034391860167185e-01, 2.591641545295715e-01, 4.476011276245117e+01, 4.197741508483887e+00]
-windowNormal.propsBus_a.surfRad.Q_flow=[-4.777146339416504e+00, -3.910711208979289e-01, -2.416938742001851e-01, -1.694551557302475e-01, 1.30096337000529e+01, 5.09704065322876e+00, -1.352225989103317e-01, -1.996066868305206e-01, -1.484251469373703e-01, -9.824148565530777e-02, -1.016399413347244e-01, -2.987380387882392e-02, 8.215923309326172e+01, 2.243387298583984e+02, 1.440077972412109e+02, -1.635237693786621e+00, -1.105396588643392e+00, -7.993833820025126e-01, -5.707454681396484e-01, -4.312454561392466e-01, -2.474969377120336e-01, 9.079106903076172e+01, 1.482742106119792e+02, 9.463868459065756e+00, -9.260255694389343e-01, -8.043280045191447e-01, -5.199087460835775e-01, -4.15510892868042e-01, -2.405153264602025e-01, 1.182986299196879e-01, 1.137347183227539e+02, 6.172205607096354e+01, -6.517146031061808e-01, -5.358817577362061e-01, -3.561109602451324e-01, -2.438088357448578e-01, -8.62368643283844e-02, -6.048723558584849e-02, 3.396336873372396e+01, 5.643560791015625e+01, 1.179307492574056e+01, -3.780848383903503e-01, -2.859736382961273e-01, -2.32239842414856e-01, -1.743942946195602e-01, -1.034960374236107e-01, -5.811326578259468e-02, 7.102345530192058e+01, 9.379252624511719e+01, 2.883598233262697e-01, -5.188044309616089e-01, -3.455805480480194e-01, -2.562072475751241e-01, -3.152543703715007e-01, 6.205974519252777e-02, 1.390492816766103e+00, 9.587747891743978e+00, 6.919413566589355e+00, 6.017625331878662e-03, -6.836045036713283e-02, 3.911009803414345e-02, 3.131605188051859e-02, -2.781525651613871e-01, -1.230727061629295e-01, 1.230770212809245e+02, 1.916222635904948e+02, 6.650691986083984e+01, -1.169952670733134e+00, -8.168917099634806e-01, -6.177005767822266e-01, -5.41873037815094e-01, -3.013498286406199e-01, -3.094940483570099e-01, 1.342082010904948e+02, 1.891735483805338e+02, -3.302121639251709e+00, -1.200475931167603e+00, -8.40578297773997e-01, -6.73673152923584e-01, -4.519950250784556e-01, -3.426055908203125e-01, 6.995784282684326e+00, 5.512167104085287e+01, 4.247446060180664e+01, -6.27377986907959e-01, -3.891556958357493e-01, -2.799287537733714e-01, -1.665197014808655e-01, -1.082708711425463e-01, -1.050036773085594e-02, 2.237844085693359e+01, 5.573024749755859e+01, 2.957717259724935e+01, -3.205561935901642e-01, -2.722581426302592e-01, -1.919775853554408e-01, -1.713038086891174e-01, -1.009307727217674e-01, -1.292730545004209e-01, 4.592152404785156e+01, 2.327502727508545e+00]
-windowTwo.propsBus_a.surfCon.Q_flow=[-0e+00, 9.930012067159018e+00, 7.355747858683269e+00, 5.272689819335938e+00, -5.725931008656819e+00, 8.532588481903076e-01, 2.764081001281738e+00, 3.512075901031494e+00, 3.742621024449666e+00, 3.406523466110229e+00, 2.790356556574503e+00, 2.363970200220744e+00, -2.598689842224121e+01, -1.386061503092448e+02, -7.081404876708984e+01, 4.761742782592773e+01, 3.348815536499023e+01, 2.376365725199382e+01, 1.706718826293945e+01, 1.242055384318034e+01, 9.203520456949869e+00, -4.344674682617188e+01, -9.164161173502605e+01, 8.694107055664062e+00, 2.765694046020508e+01, 2.068107096354167e+01, 1.518498261769613e+01, 1.110929012298584e+01, 7.8410538037618e+00, 5.160070419311523e+00, -5.961572265625e+01, -3.437046432495117e+01, 2.279849815368652e+01, 1.683297538757324e+01, 1.124735514322917e+01, 7.542687892913818e+00, 4.912684440612793e+00, 2.986208041508993e+00, -1.106598472595215e+01, -3.034984397888184e+01, -3.373592853546143e+00, 9.80171267191569e+00, 7.638988971710205e+00, 5.89600928624471e+00, 4.964560190836589e+00, 3.689793348312378e+00, 2.449356635411581e+00, -4.034967931111654e+01, -5.458266067504883e+01, 1.231797091166178e+01, 1.452517604827881e+01, 1.034351348876953e+01, 7.484984238942464e+00, 5.547587712605794e+00, 5.32947826385498e+00, 2.220924615859985e+00, -4.249227364857991e+00, -3.639914989471436e+00, 5.737822850545248e-01, 6.130226254463196e-01, 2.461344301700592e-01, -2.014862398306529e-01, 1.048484325408936e+00, 2.179489374160767e+00, -6.728310267130534e+01, -1.098108571370443e+02, -1.976617431640625e+01, 3.623820622762045e+01, 2.592852401733398e+01, 1.875539016723633e+01, 1.406543318430583e+01, 9.912931124369303e+00, 7.670669078826904e+00, -7.472674560546875e+01, -1.056317138671875e+02, 2.540282440185547e+01, 3.590349578857422e+01, 2.602849260965983e+01, 1.873094940185547e+01, 1.332338937123617e+01, 1.039459196726481e+01, 5.988767623901367e+00, -2.638408788045247e+01, -2.129085795084636e+01, 1.24600248336792e+01, 1.018591562906901e+01, 7.759501775105794e+00, 5.678817272186279e+00, 3.883328914642334e+00, 2.296477238337199e+00, -6.640992641448975e+00, -3.787201817830404e+01, -1.332376670837402e+01, 8.851852416992188e+00, 6.612276871999105e+00, 5.197159767150879e+00, 3.953826189041138e+00, 2.860662937164307e+00, 2.648539225260417e+00, -2.731292533874512e+01, 2.989161252975464e+00]
-windowNone.propsBus_a.surfCon.Q_flow=[7.99315071105957e+00, 1.079651069641113e+01, 7.860846201578776e+00, 5.603541851043701e+00, -4.446482022603353e+00, 1.035356521606445e+00, 3.38194465637207e+00, 3.868829488754272e+00, 4.012182633082072e+00, 3.581407070159912e+00, 2.96470308303833e+00, 2.41278068224589e+00, -4.628570938110352e+01, -1.519769185384115e+02, -6.299121729532877e+01, 5.258135604858398e+01, 3.665069961547852e+01, 2.589143562316895e+01, 1.848692512512207e+01, 1.342193794250488e+01, 9.746686617533365e+00, -5.48536262512207e+01, -9.146018981933594e+01, 2.020555305480957e+01, 3.020528411865234e+01, 2.275763575236003e+01, 1.645476849873861e+01, 1.205806732177734e+01, 8.353503863016764e+00, 5.347756544748942e+00, -7.352848052978516e+01, -2.585907618204753e+01, 2.52670841217041e+01, 1.815958595275879e+01, 1.205935541788737e+01, 8.053873380025228e+00, 5.081720352172852e+00, 3.092456897099813e+00, -1.703234354654948e+01, -3.360113143920898e+01, 1.795078913370769e-01, 1.06300303141276e+01, 8.241880416870117e+00, 6.360594113667806e+00, 5.300174077351888e+00, 3.877742767333984e+00, 2.547281980514526e+00, -4.778474426269531e+01, -5.684370040893555e+01, 1.708896636962891e+01, 1.577527236938477e+01, 1.112149715423584e+01, 8.025744120279947e+00, 6.177396456400554e+00, 5.209499359130859e+00, 1.936935265858968e+00, -4.703598181406657e+00, -3.384291648864746e+00, 7.053689757982889e-01, 6.991142630577087e-01, 2.070816159248352e-01, -2.320792078971863e-01, 1.444122036298116e+00, 2.377980947494507e+00, -8.39226582845052e+01, -1.197240091959635e+02, -9.55919075012207e+00, 3.961719640096029e+01, 2.813209788004557e+01, 2.031704902648926e+01, 1.535626093546549e+01, 1.058285522460938e+01, 8.322988510131836e+00, -8.607192230224609e+01, -1.106240081787109e+02, 4.226296234130859e+01, 3.937180964152018e+01, 2.830044809977214e+01, 2.043301773071289e+01, 1.43969472249349e+01, 1.116074466705322e+01, 4.5411696434021e+00, -3.097964731852214e+01, -1.950216356913249e+01, 1.390777969360352e+01, 1.105858325958252e+01, 8.356664339701334e+00, 6.009332656860352e+00, 4.082922299702962e+00, 2.315686623255412e+00, -1.082436943054199e+01, -3.869533411661784e+01, -1.21573216120402e+01, 9.533010482788086e+00, 7.167131741841634e+00, 5.571858247121175e+00, 4.269126415252686e+00, 3.037006934483846e+00, 2.865876436233521e+00, -2.836579322814941e+01, 3.832658052444458e+00]
-windowNormal.propsBus_a.surfCon.Q_flow=[-0e+00, 9.932546297709147e+00, 7.358070850372314e+00, 5.274286270141602e+00, -5.721940040588379e+00, 8.533425728480021e-01, 2.764814376831055e+00, 3.512189706166585e+00, 3.743424336115519e+00, 3.407567024230957e+00, 2.790857553482056e+00, 2.364740689595541e+00, -2.613218688964844e+01, -1.387620086669922e+02, -7.081387710571289e+01, 4.763677215576172e+01, 3.350225957234701e+01, 2.377274449666341e+01, 1.707343673706055e+01, 1.242463239034017e+01, 9.207050641377768e+00, -4.352862167358398e+01, -9.168931070963542e+01, 8.735505739847818e+00, 2.766777992248535e+01, 2.068694305419922e+01, 1.519034894307454e+01, 1.111247062683105e+01, 7.84364128112793e+00, 5.161201635996501e+00, -5.972832870483398e+01, -3.434522247314453e+01, 2.280734316507975e+01, 1.683957290649414e+01, 1.125161043802897e+01, 7.545164426167806e+00, 4.914798259735107e+00, 2.987216313680013e+00, -1.110594463348389e+01, -3.038315200805664e+01, -3.359460353851318e+00, 9.804529190063477e+00, 7.64102029800415e+00, 5.897410869598389e+00, 4.965848128000895e+00, 3.690885543823242e+00, 2.450048526128133e+00, -4.040297190348307e+01, -5.462329483032227e+01, 1.233348719278971e+01, 1.452988433837891e+01, 1.034691905975342e+01, 7.487223943074544e+00, 5.548250516255696e+00, 5.333508491516113e+00, 2.218843301137289e+00, -4.253070036570231e+00, -3.640282392501831e+00, 5.749115347862244e-01, 6.128212610880533e-01, 2.462271153926849e-01, -2.01586643854777e-01, 1.047410726547241e+00, 2.17960262298584e+00, -6.739543279012044e+01, -1.099411544799805e+02, -1.973091125488281e+01, 3.625414657592773e+01, 2.593983713785807e+01, 1.876252365112305e+01, 1.406939729054769e+01, 9.916604042053223e+00, 7.672334671020508e+00, -7.484371439615886e+01, -1.057301991780599e+02, 2.548591232299805e+01, 3.591803614298502e+01, 2.603927230834961e+01, 1.873707580566406e+01, 1.332795715332031e+01, 1.039790121714274e+01, 5.976069450378418e+00, -2.642029825846354e+01, -2.129601224263509e+01, 1.246357536315918e+01, 1.018849627176921e+01, 7.761568228403728e+00, 5.680722236633301e+00, 3.884503682454427e+00, 2.297401110331217e+00, -6.6673264503479e+00, -3.788832728068034e+01, -1.332531261444092e+01, 8.854681968688965e+00, 6.613643964131673e+00, 5.198456128438314e+00, 3.954545259475708e+00, 2.861303806304932e+00, 2.648785750071208e+00, -2.733165168762207e+01, 2.991846323013306e+00]
+windowTwo.propsBus_a.surfRad.Q_flow=[-5.18228816986084e+00, -4.233476618925731e-01, -2.629493574301402e-01, -1.843236833810806e-01, 1.293943881988525e+01, 5.086790402730306e+00, -1.620610356330872e-01, -2.124049812555313e-01, -1.599031885464986e-01, -1.065469607710838e-01, -1.093078181147575e-01, -3.320310016473135e-02, 8.307546234130859e+01, 2.248386637369792e+02, 1.437242329915365e+02, -1.790010571479797e+00, -1.213651458422343e+00, -8.746881484985352e-01, -6.233832836151123e-01, -4.694137573242188e-01, -2.710449000199636e-01, 9.124123382568359e+01, 1.482903086344401e+02, 8.858943144480387e+00, -1.014410018920898e+00, -8.742526769638062e-01, -5.672346154848734e-01, -4.506880640983582e-01, -2.618071933587392e-01, 1.106886466344198e-01, 1.142842636108398e+02, 6.137660217285156e+01, -7.351331909497579e-01, -5.867686867713928e-01, -3.897716104984283e-01, -2.656774322191874e-01, -9.652859717607498e-02, -6.675960868597031e-02, 3.425978088378906e+01, 5.658152008056641e+01, 1.160165150960287e+01, -4.091153144836426e-01, -3.097127974033356e-01, -2.508864353100459e-01, -1.883269101381302e-01, -1.124219745397568e-01, -6.340757509072621e-02, 7.130950927734375e+01, 9.389762115478516e+01, 1.037868062655131e-01, -5.643103321393331e-01, -3.759972751140594e-01, -2.780478497346242e-01, -3.384361167748769e-01, 5.915061011910439e-02, 1.413299441337585e+00, 9.613351504007975e+00, 6.905852794647217e+00, -5.367050568262741e-03, -7.16656818985939e-02, 4.05067652463913e-02, 3.270576025048892e-02, -2.905092636744182e-01, -1.305954903364182e-01, 1.236704305013021e+02, 1.920144755045573e+02, 6.606632232666016e+01, -1.285306294759115e+00, -8.974981506665548e-01, -6.756941676139832e-01, -5.886301596959432e-01, -3.296217918395996e-01, -3.338542580604553e-01, 1.346740468343099e+02, 1.893899383544922e+02, -4.004320621490479e+00, -1.316978971163432e+00, -9.222251574198405e-01, -7.345390915870667e-01, -4.932998319466909e-01, -3.725044826666514e-01, 7.101500034332275e+00, 5.531954828898112e+01, 4.240889231363932e+01, -6.751217842102051e-01, -4.210493365923564e-01, -3.031632701555888e-01, -1.814892888069153e-01, -1.178999071319898e-01, -1.356980421890815e-02, 2.260039138793945e+01, 5.576077397664388e+01, 2.952594439188639e+01, -3.465456366539001e-01, -2.935055991013845e-01, -2.073639382918676e-01, -1.843351721763611e-01, -1.093460023403168e-01, -1.377547283967336e-01, 4.597376251220703e+01, 2.29015588760376e+00]
+windowNone.propsBus_a.surfRad.Q_flow=[1.036457633972168e+01, 8.416789571444193e-01, 5.209811528523763e-01, 3.650301694869995e-01, 1.554354286193848e+01, 5.787810166676839e+00, 1.108783960342407e+00, 4.245008528232574e-01, 3.178501824537913e-01, 2.104418575763702e-01, 2.173033008972804e-01, 6.427885591983795e-02, 5.630064392089844e+01, 2.124520721435547e+02, 1.536687469482422e+02, 3.552718162536621e+00, 2.40595269203186e+00, 1.734522819519043e+00, 1.235777854919434e+00, 9.311644037564596e-01, 5.349448124567667e-01, 7.760271453857422e+01, 1.490938720703125e+02, 3.030710474650065e+01, 2.01172399520874e+00, 1.738593022028605e+00, 1.124809185663859e+00, 8.952518701553345e-01, 5.18215000629425e-01, 3.9098326365153e-01, 9.857891845703125e+01, 7.335811360677083e+01, 2.443979740142822e+00, 1.161890745162964e+00, 7.713857690493265e-01, 5.261481404304504e-01, 1.881697922945023e-01, 1.309053202470144e-01, 2.452281824747721e+01, 5.235641479492188e+01, 1.959998893737793e+01, 8.126229643821716e-01, 6.151596903800964e-01, 4.986696938673655e-01, 3.736708263556163e-01, 2.221782952547073e-01, 1.249474932750066e-01, 6.26626230875651e+01, 9.150466918945312e+01, 7.888240496317545e+00, 1.120046536127726e+00, 7.453094124794006e-01, 5.513840516408285e-01, 6.75429622332255e-01, -1.275931000709534e-01, 6.744142472743988e-01, 8.746806462605795e+00, 7.494048595428467e+00, 4.836403926213582e-01, 1.440758009751638e-01, -8.140181005001068e-02, -6.496814390023549e-02, 5.844781796137491e-01, 2.60861724615097e-01, 1.054126942952474e+02, 1.82631846110026e+02, 8.178617095947266e+01, 2.546815633773804e+00, 1.776814699172974e+00, 1.339064002037048e+00, 1.169999480247498e+00, 6.519704461097717e-01, 6.641900539398193e-01, 1.225440979003906e+02, 1.852153065999349e+02, 2.013371658325195e+01, 2.61221726735433e+00, 1.827160318692525e+00, 1.458505868911743e+00, 9.781411488850912e-01, 7.384693622589111e-01, 3.921830177307129e+00, 4.92162348429362e+01, 4.520953241984049e+01, 1.445490121841431e+00, 8.370045224825541e-01, 6.020012696584066e-01, 3.586662411689758e-01, 2.329381952683131e-01, 2.461691883703073e-02, 1.519962501525879e+01, 5.516066233317057e+01, 3.164180119832357e+01, 6.873228549957275e-01, 5.840467214584351e-01, 4.117556313673655e-01, 3.66949588060379e-01, 2.170684138933817e-01, 2.748290598392487e-01, 4.470966720581055e+01, 4.258951663970947e+00]
+windowNormal.propsBus_a.surfRad.Q_flow=[-5.18228816986084e+00, -4.183313151200612e-01, -2.58031815290451e-01, -1.807064861059189e-01, 1.294798437754313e+01, 5.087049802144368e+00, -1.603234708309174e-01, -2.120958715677261e-01, -1.57946988940239e-01, -1.03894904255867e-01, -1.079954852660497e-01, -3.107575389246146e-02, 8.284989929199219e+01, 2.246724599202474e+02, 1.437265268961588e+02, -1.762707591056824e+00, -1.192301313082377e+00, -8.598346511522929e-01, -6.123946309089661e-01, -4.617506663004557e-01, -2.638999025026957e-01, 9.112842559814453e+01, 1.482354990641276e+02, 8.976193904876709e+00, -9.973140358924866e-01, -8.643403251965841e-01, -5.575745701789856e-01, -4.445638060569763e-01, -2.564077973365784e-01, 1.131116946538289e-01, 1.141401901245117e+02, 6.141352335611979e+01, -7.205767830212911e-01, -5.75122058391571e-01, -3.816141386826833e-01, -2.60470708211263e-01, -9.164119511842728e-02, -6.414570411046346e-02, 3.41864382425944e+01, 5.653313446044922e+01, 1.163380495707194e+01, -4.035076797008514e-01, -3.054468631744385e-01, -2.477832486232122e-01, -1.853439211845398e-01, -1.097563281655312e-01, -6.153991570075353e-02, 7.123462168375652e+01, 9.384522247314453e+01, 1.320064862569172e-01, -5.557361642519633e-01, -3.693121075630188e-01, -2.733362118403117e-01, -3.369935154914856e-01, 6.844249367713928e-02, 1.406827569007874e+00, 9.604632377624512e+00, 6.905122756958008e+00, -1.089448730150863e-03, -7.241011410951614e-02, 4.089504480361938e-02, 3.226238489151001e-02, -2.939688861370087e-01, -1.302662491798401e-01, 1.235331573486328e+02, 1.918692220052083e+02, 6.61219482421875e+01, -1.261509378751119e+00, -8.79316528638204e-01, -6.633698344230652e-01, -5.813693006833395e-01, -3.223486443360646e-01, -3.30335795879364e-01, 1.345300445556641e+02, 1.892787424723307e+02, -3.867333889007568e+00, -1.295238335927327e+00, -9.049351215362549e-01, -7.239668369293213e-01, -4.848413368066152e-01, -3.659648497899373e-01, 7.070887088775635e+00, 5.52649065653483e+01, 4.240151850382487e+01, -6.685755848884583e-01, -4.159552057584127e-01, -2.988379895687103e-01, -1.771769523620605e-01, -1.150382881363233e-01, -1.104711399724086e-02, 2.254532432556152e+01, 5.573780314127604e+01, 2.952409362792969e+01, -3.407772183418274e-01, -2.905411223570506e-01, -2.04391693075498e-01, -1.826144307851791e-01, -1.07722411553065e-01, -1.37074331442515e-01, 4.59461669921875e+01, 2.296745538711548e+00]
+windowTwo.propsBus_a.surfCon.Q_flow=[-0e+00, 9.95034376780192e+00, 7.367663701375325e+00, 5.280166149139404e+00, -5.708190282185872e+00, 8.613484899202982e-01, 2.780001878738403e+00, 3.521045287450155e+00, 3.748717069625854e+00, 3.411959648132324e+00, 2.794317960739136e+00, 2.366462151209513e+00, -2.637125587463379e+01, -1.389100545247396e+02, -7.0689390818278e+01, 4.774417114257812e+01, 3.355644353230795e+01, 2.381115786234538e+01, 1.70996150970459e+01, 1.244338099161784e+01, 9.217638651529947e+00, -4.374080657958984e+01, -9.168839009602864e+01, 8.918920834859213e+00, 2.771343803405762e+01, 2.072778256734212e+01, 1.521311601003011e+01, 1.113072395324707e+01, 7.853598912556966e+00, 5.165168603261312e+00, -5.994305419921875e+01, -3.420313517252604e+01, 2.287348047892253e+01, 1.68636360168457e+01, 1.126507027943929e+01, 7.554300944010417e+00, 4.917022705078125e+00, 2.988789478937785e+00, -1.122172514597575e+01, -3.044837379455566e+01, -3.281190554300944e+00, 9.823603312174479e+00, 7.653076171875e+00, 5.906484603881836e+00, 4.973568121592204e+00, 3.694906234741211e+00, 2.45181401570638e+00, -4.053211975097656e+01, -5.465887451171875e+01, 1.249913946787516e+01, 1.455458641052246e+01, 1.036204051971436e+01, 7.497628847757976e+00, 5.559192021687825e+00, 5.332496166229248e+00, 2.219855070114136e+00, -4.263448874155681e+00, -3.638562917709351e+00, 5.807334780693054e-01, 6.145502726236979e-01, 2.448358237743378e-01, -2.033088604609171e-01, 1.058303912480672e+00, 2.184882879257202e+00, -6.777047348022461e+01, -1.100402348836263e+02, -1.953984069824219e+01, 3.631654993693034e+01, 2.597837257385254e+01, 1.879121589660645e+01, 1.409344514211019e+01, 9.92823855082194e+00, 7.686094284057617e+00, -7.496071624755859e+01, -1.057377548217773e+02, 2.589041328430176e+01, 3.597997538248698e+01, 2.607912190755208e+01, 1.876837158203125e+01, 1.334664789835612e+01, 1.041372553507487e+01, 5.980579376220703e+00, -2.650989023844401e+01, -2.126464970906575e+01, 1.251330089569092e+01, 1.020660082499186e+01, 7.773577690124512e+00, 5.687560081481934e+00, 3.888241529464722e+00, 2.297047694524129e+00, -6.734585762023926e+00, -3.790776570638021e+01, -1.330527909596761e+01, 8.873626708984375e+00, 6.625359217325847e+00, 5.206395626068115e+00, 3.960356712341309e+00, 2.863639036814372e+00, 2.654092709223429e+00, -2.735579490661621e+01, 3.033967018127441e+00]
+windowNone.propsBus_a.surfCon.Q_flow=[7.451458930969238e+00, 1.075844446818034e+01, 7.83828083674113e+00, 5.588356018066406e+00, -4.528865973154704e+00, 1.025388757387797e+00, 3.350308656692505e+00, 3.852845191955566e+00, 3.999709288279215e+00, 3.573935270309448e+00, 2.956501960754395e+00, 2.411125659942627e+00, -4.5214599609375e+01, -1.514236907958984e+02, -6.343055852254232e+01, 5.238626861572266e+01, 3.651868438720703e+01, 2.580094337463379e+01, 1.842554664611816e+01, 1.337740008036296e+01, 9.723097483317057e+00, -5.432479095458984e+01, -9.151827494303386e+01, 1.950784873962402e+01, 3.009845924377441e+01, 2.266879463195801e+01, 1.639925702412923e+01, 1.201584434509277e+01, 8.330669720967611e+00, 5.3404541015625e+00, -7.288556671142578e+01, -2.632120513916016e+01, 2.516605059305827e+01, 1.810262107849121e+01, 1.202299690246582e+01, 8.030703862508139e+00, 5.074122905731201e+00, 3.087465445200602e+00, -1.670922152201335e+01, -3.345272827148438e+01, -1.386054356892918e-02, 1.059442329406738e+01, 8.215114593505859e+00, 6.339436213175456e+00, 5.28548018137614e+00, 3.869382381439209e+00, 2.542719046274821e+00, -4.745434951782227e+01, -5.675850296020508e+01, 1.686833985646566e+01, 1.572119394938151e+01, 1.108727169036865e+01, 8.001450538635254e+00, 6.147404034932454e+00, 5.217342853546143e+00, 1.957652012507121e+00, -4.680983384450276e+00, -3.402936458587646e+00, 6.977750658988953e-01, 6.947117646535238e-01, 2.087439149618149e-01, -2.312610695759455e-01, 1.425690094629924e+00, 2.369074821472168e+00, -8.320518493652344e+01, -1.193200403849284e+02, -1.011374187469482e+01, 3.947903951009115e+01, 2.803905614217122e+01, 2.025011444091797e+01, 1.529920514424642e+01, 1.055290444691976e+01, 8.293942451477051e+00, -8.555404154459636e+01, -1.10446787516276e+02, 4.142023468017578e+01, 3.922816721598307e+01, 2.820424016316732e+01, 2.035923385620117e+01, 1.434978898366292e+01, 1.112737115224203e+01, 4.641596794128418e+00, -3.076157760620117e+01, -1.960936800638835e+01, 1.385029220581055e+01, 1.102039400736491e+01, 8.330385526021322e+00, 5.9949049949646e+00, 4.073820273081462e+00, 2.314779758453369e+00, -1.058656787872314e+01, -3.868229675292969e+01, -1.223275947570801e+01, 9.505393028259277e+00, 7.142297426859538e+00, 5.555199940999349e+00, 4.254237651824951e+00, 3.02833366394043e+00, 2.855988025665283e+00, -2.83282585144043e+01, 3.795528650283813e+00]
+windowNormal.propsBus_a.surfCon.Q_flow=[-0e+00, 9.952640215555826e+00, 7.36976687113444e+00, 5.281600475311279e+00, -5.704480012257894e+00, 8.613952199618021e-01, 2.780592679977417e+00, 3.521157105763753e+00, 3.749435027440389e+00, 3.412912368774414e+00, 2.794768571853638e+00, 2.367165406545003e+00, -2.650579833984375e+01, -1.390546010335287e+02, -7.068774668375652e+01, 4.776200103759766e+01, 3.356932322184245e+01, 2.381944719950358e+01, 1.710530471801758e+01, 1.244707266489665e+01, 9.220854759216309e+00, -4.381632232666016e+01, -9.173174794514973e+01, 8.958272616068523e+00, 2.772331237792969e+01, 2.07331428527832e+01, 1.521798865000407e+01, 1.113360118865967e+01, 7.855943361918132e+00, 5.166128794352214e+00, -6.004651641845703e+01, -3.417920939127604e+01, 2.288151550292969e+01, 1.686964416503906e+01, 1.126891199747721e+01, 7.556540807088216e+00, 4.918930530548096e+00, 2.98970095316569e+00, -1.125753625233968e+01, -3.047823143005371e+01, -3.268229007720947e+00, 9.826163609822592e+00, 7.654916763305664e+00, 5.907747268676758e+00, 4.974735101064046e+00, 3.695881605148315e+00, 2.452436685562134e+00, -4.058121490478516e+01, -5.46958122253418e+01, 1.251231161753337e+01, 1.455886745452881e+01, 1.036513137817383e+01, 7.499653339385986e+00, 5.559771219889323e+00, 5.336190700531006e+00, 2.217768669128418e+00, -4.266895612080892e+00, -3.638841867446899e+00, 5.817269285519918e-01, 6.143690943717957e-01, 2.449126541614532e-01, -2.033931612968445e-01, 1.057354052861532e+00, 2.18498969078064e+00, -6.78716303507487e+01, -1.101605885823568e+02, -1.950664138793945e+01, 3.633115641276041e+01, 2.598871866861979e+01, 1.879773139953613e+01, 1.409704271952311e+01, 9.931567192077637e+00, 7.687613487243652e+00, -7.506974538167317e+01, -1.058292338053385e+02, 2.596489715576172e+01, 3.599329376220703e+01, 2.608896891276042e+01, 1.877396011352539e+01, 1.335078779856364e+01, 1.041675027211507e+01, 5.96820592880249e+00, -2.654258282979329e+01, -2.126891136169434e+01, 1.251645278930664e+01, 1.020894718170166e+01, 7.775451024373372e+00, 5.689299583435059e+00, 3.88930074373881e+00, 2.297876596450806e+00, -6.758709907531738e+00, -3.792260487874349e+01, -1.330628204345703e+01, 8.876199722290039e+00, 6.626596927642822e+00, 5.207570711771647e+00, 3.960996150970459e+00, 2.864199797312418e+00, 2.654323577880859e+00, -2.737241554260254e+01, 3.036159515380859e+00]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_WindowLinearisation.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_WindowLinearisation.txt
index 6da6b28c8b..5f4ee6099e 100644
--- a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_WindowLinearisation.txt
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_WindowLinearisation.txt
@@ -1,4 +1,4 @@
-last-generated=2023-05-02
+last-generated=2023-10-23
 statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 4",
@@ -7,5 +7,5 @@ statistics-simulation=
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1e+06]
-winNonLin.propsBus_a.surfRad.Q_flow=[2.507984596909762e-13, 1.569106451670329e+01, 1.509578800201416e+01, 1.431663608551025e+01, 1.302360375722249e+01, 1.191919549306234e+01, 1.066716194152832e+01, 1.166721566518148e+01, 1.254096508026123e+01, 1.271797752380371e+01, 1.233387660980225e+01, 1.19321772257487e+01, 1.59351053237915e+01, 1.888468805948893e+01, 1.255336093902588e+01, 1.365387153625488e+01, 1.445039367675781e+01, 1.403352228800456e+01, 1.347050380706787e+01, 1.297633457183838e+01, 1.256217734018962e+01, 1.440953063964844e+01, 1.331542555491129e+01, 1.006659889221191e+01, 1.26602668762207e+01, 1.383718713124593e+01, 1.368786938985189e+01, 1.315466690063477e+01, 1.20493688583374e+01, 1.08141934076945e+01, 1.352863502502441e+01, 9.671514828999838e+00, 1.250424226125081e+01, 1.222510719299316e+01, 1.06498171488444e+01, 9.435025850931803e+00, 8.045751571655273e+00, 6.777972221374512e+00, 6.405964056650798e+00, 6.19475793838501e+00, 5.334778149922689e+00, 6.897908687591553e+00, 7.409462928771973e+00, 7.550663948059082e+00, 8.124140421549479e+00, 7.635891914367676e+00, 6.794418493906657e+00, 7.170276959737142e+00, 6.932947158813477e+00, 6.250902970631917e+00, 7.077019214630127e+00, 6.64026403427124e+00, 6.257697582244873e+00, 6.095166842142741e+00, 7.328435897827148e+00, 4.953091303507487e+00, 2.711152950922648e+00, 1.641457200050354e+00, 1.180171012878418e+00, 1.013895829518636e+00, 4.266950190067291e-01, -4.101968010266622e-01, 2.123748620351156e+00, 3.833256483078003e+00, 8.361958185831705e+00, 1.172908814748128e+01, 3.760655641555786e+00, 6.965868314107259e+00, 8.113979975382486e+00, 8.71512508392334e+00, 9.45783805847168e+00, 8.736010233561197e+00, 9.067614555358887e+00, 1.327202351888021e+01, 1.351670519510905e+01, 7.189218044281006e+00, 1.092914263407389e+01, 1.198073641459147e+01, 1.197196292877197e+01, 1.13595069249471e+01, 1.193697357177734e+01, 1.114667129516602e+01, 9.763923327128092e+00, 7.815403938293457e+00, 9.447892189025879e+00, 1.017247454325358e+01, 1.014709345499674e+01, 9.819493293762207e+00, 8.73565928141276e+00, 7.372474670410156e+00, 6.395885467529297e+00, 2.521536111831665e+00, 2.479782501856486e+00, 3.469006538391113e+00, 3.859410365422567e+00, 4.237369219462077e+00, 4.267059803009033e+00, 3.982587575912476e+00, 4.648508230845134e+00, 3.749221324920654e+00, 2.625717163085938e+00]
-winLin.propsBus_a.surfRad.Q_flow=[2.507984596909762e-13, 1.551368395487467e+01, 1.494145933787028e+01, 1.418850898742676e+01, 1.290849367777506e+01, 1.185245513916016e+01, 1.063060760498047e+01, 1.16135368347168e+01, 1.246607271830241e+01, 1.263813972473145e+01, 1.226431274414062e+01, 1.187182299296061e+01, 1.58918342590332e+01, 1.881689580281575e+01, 1.239073276519775e+01, 1.34909610748291e+01, 1.431395403544108e+01, 1.391931120554606e+01, 1.33736629486084e+01, 1.289368311564128e+01, 1.248850123087565e+01, 1.436031246185303e+01, 1.324816449483236e+01, 9.950246810913086e+00, 1.257330799102783e+01, 1.373104095458984e+01, 1.358719285329183e+01, 1.306996726989746e+01, 1.198956425984701e+01, 1.077673085530599e+01, 1.350670623779297e+01, 9.587930043538412e+00, 1.241362190246582e+01, 1.21549072265625e+01, 1.061275132497152e+01, 9.416088104248047e+00, 8.04047679901123e+00, 6.780734380086263e+00, 6.412041823069255e+00, 6.199559688568115e+00, 5.336285909016927e+00, 6.89924685160319e+00, 7.408883571624756e+00, 7.549400329589844e+00, 8.118734041849772e+00, 7.633920192718506e+00, 6.797135988871257e+00, 7.175264994303386e+00, 6.935619354248047e+00, 6.24882984161377e+00, 7.077001889546712e+00, 6.643299579620361e+00, 6.262315273284912e+00, 6.100500106811523e+00, 7.326990604400635e+00, 4.96073579788208e+00, 2.717777490615845e+00, 1.646196126937866e+00, 1.183836857477824e+00, 1.016580820083618e+00, 4.28059995174408e-01, -4.113692939281464e-01, 2.128591458002726e+00, 3.841081857681274e+00, 8.368632316589355e+00, 1.172959009806315e+01, 3.751568078994751e+00, 6.959450880686442e+00, 8.105738957722982e+00, 8.703670501708984e+00, 9.439539273579916e+00, 8.724689165751139e+00, 9.054038047790527e+00, 1.325545279184977e+01, 1.347591686248779e+01, 7.124289989471436e+00, 1.087449582417806e+01, 1.191610749562581e+01, 1.191092014312744e+01, 1.131046358744303e+01, 1.187705485026042e+01, 1.110864067077637e+01, 9.746144612630209e+00, 7.802141666412354e+00, 9.425577163696289e+00, 1.01453529993693e+01, 1.012055110931396e+01, 9.795669555664062e+00, 8.72478993733724e+00, 7.372008800506592e+00, 6.401902198791504e+00, 2.527307669321696e+00, 2.486376047134399e+00, 3.476453304290771e+00, 3.867026090621948e+00, 4.245140075683594e+00, 4.27501106262207e+00, 3.990559498469035e+00, 4.656471570332845e+00, 3.756244659423828e+00, 2.632902860641479e+00]
+winNonLin.propsBus_a.surfRad.Q_flow=[0e+00, 1.59146671295166e+01, 1.529851309458415e+01, 1.450577354431152e+01, 1.316128317515055e+01, 1.205671278635661e+01, 1.080230903625488e+01, 1.181599140167236e+01, 1.269827397664388e+01, 1.287388801574707e+01, 1.248336791992188e+01, 1.207232888539632e+01, 1.565500831604004e+01, 1.79624506632487e+01, 1.226497681935628e+01, 1.389265537261963e+01, 1.46496696472168e+01, 1.421545282999674e+01, 1.363951778411865e+01, 1.313596248626709e+01, 1.271119944254557e+01, 1.419943237304688e+01, 1.288728364308675e+01, 1.023922379811605e+01, 1.283251953125e+01, 1.402481905619303e+01, 1.385643132527669e+01, 1.331576442718506e+01, 1.218847211201986e+01, 1.093552811940511e+01, 1.321318626403809e+01, 9.721373240152994e+00, 1.26842835744222e+01, 1.237858486175537e+01, 1.077327473958333e+01, 9.540137608846029e+00, 8.126278877258301e+00, 6.843349615732829e+00, 6.371090094248454e+00, 6.120113372802734e+00, 5.422784646352132e+00, 6.978193442026774e+00, 7.492419719696045e+00, 7.632987022399902e+00, 8.213916142781576e+00, 7.714733600616455e+00, 6.861473560333252e+00, 7.007879098256429e+00, 6.675531387329102e+00, 6.360355854034424e+00, 7.159833113352458e+00, 6.708195209503174e+00, 6.319673697153728e+00, 6.160863399505615e+00, 7.390084266662598e+00, 4.992855230967204e+00, 2.735379139582316e+00, 1.650366187095642e+00, 1.181512991587321e+00, 1.01979657014211e+00, 4.223807156085968e-01, -4.20488178730011e-01, 2.153138399124146e+00, 3.874483823776245e+00, 7.838516076405843e+00, 1.091718769073486e+01, 3.758217811584473e+00, 7.092511336008708e+00, 8.225767771402994e+00, 8.825133323669434e+00, 9.579932530721029e+00, 8.837862014770508e+00, 9.179095268249512e+00, 1.283499240875244e+01, 1.287567361195882e+01, 7.458138465881348e+00, 1.110494995117188e+01, 1.214362716674805e+01, 1.21336612701416e+01, 1.150412209828695e+01, 1.208865070343018e+01, 1.129499816894531e+01, 9.758928934733072e+00, 7.844618320465088e+00, 9.573450088500977e+00, 1.029689788818359e+01, 1.02683531443278e+01, 9.934970855712891e+00, 8.831682523091635e+00, 7.44666862487793e+00, 6.387030124664307e+00, 2.411378781000773e+00, 2.417722384134928e+00, 3.508409976959229e+00, 3.902272462844849e+00, 4.279349803924561e+00, 4.310853004455566e+00, 4.020757834116618e+00, 4.696887334187825e+00, 3.689751863479614e+00, 2.654892683029175e+00]
+winLin.propsBus_a.surfRad.Q_flow=[0e+00, 1.57187557220459e+01, 1.512848567962646e+01, 1.436447715759277e+01, 1.303978888193766e+01, 1.198325792948405e+01, 1.076193714141846e+01, 1.17564640045166e+01, 1.26158062616984e+01, 1.278611755371094e+01, 1.240691502888997e+01, 1.200605042775472e+01, 1.560868740081787e+01, 1.78936767578125e+01, 1.209551779429118e+01, 1.371379852294922e+01, 1.449970690409342e+01, 1.408983771006266e+01, 1.35330696105957e+01, 1.304517364501953e+01, 1.263036410013835e+01, 1.41469144821167e+01, 1.281718095143636e+01, 1.011380004882812e+01, 1.273714828491211e+01, 1.39073600769043e+01, 1.374607372283936e+01, 1.3222731590271e+01, 1.212294514973958e+01, 1.089438947041829e+01, 1.318995952606201e+01, 9.632226626078287e+00, 1.258472951253255e+01, 1.230145835876465e+01, 1.07326332728068e+01, 9.519226710001627e+00, 8.120433807373047e+00, 6.846212069193522e+00, 6.377543608347575e+00, 6.125321865081787e+00, 5.424410343170166e+00, 6.979443550109863e+00, 7.491543292999268e+00, 7.631377538045247e+00, 8.207753499348959e+00, 7.712405681610107e+00, 6.864272117614746e+00, 7.013359546661377e+00, 6.678765296936035e+00, 6.358022848765056e+00, 7.15963872273763e+00, 6.711338996887207e+00, 6.324538071950276e+00, 6.166469097137451e+00, 7.388524055480957e+00, 5.001030604044597e+00, 2.742376406987508e+00, 1.655392050743103e+00, 1.185390631357829e+00, 1.022660374641418e+00, 4.23785537481308e-01, -4.21771228313446e-01, 2.158414920171102e+00, 3.882867813110352e+00, 7.845715999603271e+00, 1.091869354248047e+01, 3.749527931213379e+00, 7.085285663604736e+00, 8.216439247131348e+00, 8.812255859375e+00, 9.559410095214844e+00, 8.82525634765625e+00, 9.163818359375e+00, 1.281793371836344e+01, 1.283485126495361e+01, 7.388693332672119e+00, 1.104432010650635e+01, 1.207221603393555e+01, 1.20660514831543e+01, 1.144998200734456e+01, 1.202246952056885e+01, 1.125308513641357e+01, 9.73983351389567e+00, 7.830295880635579e+00, 9.548666000366211e+00, 1.02668981552124e+01, 1.023897870381673e+01, 9.908596992492676e+00, 8.819610595703125e+00, 7.446028709411621e+00, 6.3934006690979e+00, 2.417530059814453e+00, 2.42478076616923e+00, 3.516389846801758e+00, 3.910422960917155e+00, 4.28765869140625e+00, 4.319355010986328e+00, 4.029293060302734e+00, 4.705388863881429e+00, 3.697312831878662e+00, 2.662561655044556e+00]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_WindowThermalBridge.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_WindowThermalBridge.txt
index 50208313b9..4d81f15544 100644
--- a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_WindowThermalBridge.txt
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Examples_WindowThermalBridge.txt
@@ -1,4 +1,4 @@
-last-generated=2023-05-02
+last-generated=2023-10-23
 statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 4, 4",
@@ -7,5 +7,5 @@ statistics-simulation=
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1e+06]
-win.propsBus_a.surfCon.Q_flow=[-0e+00, 2.904059886932373e+00, 2.684100151062012e+00, 2.505217552185059e+00, 1.424232840538025e+00, 1.783398747444153e+00, 1.763200759887695e+00, 2.00791072845459e+00, 2.187560558319092e+00, 2.21970796585083e+00, 2.136372804641724e+00, 2.060112476348877e+00, -1.356491446495056e+00, -1.643722534179688e+01, -9.104218482971191e+00, 4.43016242980957e+00, 2.971645355224609e+00, 2.544418573379517e+00, 2.371715784072876e+00, 2.267123699188232e+00, 2.183230638504028e+00, -3.363568544387817e+00, -1.056460094451904e+01, 6.25741720199585e-01, 2.754196405410767e+00, 2.541459798812866e+00, 2.425434589385986e+00, 2.298592329025269e+00, 2.061850070953369e+00, 1.800559878349304e+00, -5.231210231781006e+00, -2.738290548324585e+00, 2.813957691192627e+00, 2.24515175819397e+00, 1.797220706939697e+00, 1.534471869468689e+00, 1.280046224594116e+00, 1.043574094772339e+00, -4.454465806484222e-01, -2.346940517425537e+00, -7.240049540996552e-02, 1.278422594070435e+00, 1.221348762512207e+00, 1.212231993675232e+00, 1.317069411277771e+00, 1.221529126167297e+00, 1.059499144554138e+00, -3.64718770980835e+00, -6.165599346160889e+00, 1.070621490478516e+00, 1.435253620147705e+00, 1.103699564933777e+00, 9.90074098110199e-01, 9.430765509605408e-01, 1.208365082740784e+00, 6.880870461463928e-01, -5.770222097635269e-02, -1.400847733020782e-01, 1.289919465780258e-01, 1.107342690229416e-01, 4.571992158889771e-02, -4.788466915488243e-02, 3.248608708381653e-01, 6.078843474388123e-01, -7.109638214111328e+00, -1.334958362579346e+01, -3.341576814651489e+00, 2.550530433654785e+00, 1.713889837265015e+00, 1.513007164001465e+00, 1.59864866733551e+00, 1.430983304977417e+00, 1.504856705665588e+00, -7.623073101043701e+00, -1.320788669586182e+01, 1.447333216667175e+00, 2.938455104827881e+00, 2.262398481369019e+00, 2.09585976600647e+00, 1.945768237113953e+00, 2.076062440872192e+00, 1.724062919616699e+00, -1.522823572158813e+00, -1.532589316368103e+00, 1.873423337936401e+00, 1.833154797554016e+00, 1.737688302993774e+00, 1.62990665435791e+00, 1.417561650276184e+00, 1.160301566123962e+00, 8.260622620582581e-02, -3.875817060470581e+00, -1.445692658424377e+00, 7.653996348381042e-01, 6.340936422348022e-01, 6.486573815345764e-01, 6.278401613235474e-01, 5.709248185157776e-01, 6.945775747299194e-01, -2.251992464065552e+00, 3.251179158687592e-01]
-winLinLos.propsBus_a.surfCon.Q_flow=[-0e+00, 4.538900375366211e+00, 4.216922283172607e+00, 3.971499681472778e+00, 2.453849792480469e+00, 2.838366508483887e+00, 2.756828784942627e+00, 3.140934467315674e+00, 3.411903858184814e+00, 3.460556268692017e+00, 3.320630311965942e+00, 3.185789108276367e+00, -1.356054186820984e+00, -1.996274566650391e+01, -1.083486366271973e+01, 6.169116020202637e+00, 4.445199012756348e+00, 3.896520853042603e+00, 3.646254062652588e+00, 3.46994948387146e+00, 3.346754312515259e+00, -3.910362005233765e+00, -1.293808364868164e+01, 1.387555480003357e+00, 4.054457187652588e+00, 3.89436674118042e+00, 3.673664808273315e+00, 3.484048366546631e+00, 3.121483087539673e+00, 2.765778303146362e+00, -6.218029975891113e+00, -2.891727685928345e+00, 4.168728828430176e+00, 3.459734439849854e+00, 2.793800115585327e+00, 2.395997762680054e+00, 1.962382674217224e+00, 1.599998712539673e+00, -4.49120819568634e-01, -2.745603322982788e+00, 1.899637430906296e-01, 1.899630188941956e+00, 1.873780727386475e+00, 1.860775351524353e+00, 2.033643960952759e+00, 1.864943742752075e+00, 1.613474369049072e+00, -4.532926559448242e+00, -7.650280475616455e+00, 1.696157097816467e+00, 2.045492172241211e+00, 1.62723171710968e+00, 1.469671726226807e+00, 1.411229014396667e+00, 1.813757061958313e+00, 1.033754229545593e+00, -4.414540901780128e-02, -1.366487145423889e-01, 1.888172328472137e-01, 1.631654053926468e-01, 5.451200157403946e-02, -7.457341998815536e-02, 4.926591813564301e-01, 9.125788807868958e-01, -8.808102607727051e+00, -1.598602390289307e+01, -3.725881576538086e+00, 3.418667793273926e+00, 2.531842947006226e+00, 2.328668355941772e+00, 2.477938890457153e+00, 2.21605658531189e+00, 2.316506147384644e+00, -8.98448657989502e+00, -1.600957107543945e+01, 2.4543137550354e+00, 4.185026168823242e+00, 3.471793413162231e+00, 3.274375438690186e+00, 3.034475326538086e+00, 3.217498540878296e+00, 2.662304401397705e+00, -1.715527653694153e+00, -1.682127594947815e+00, 2.806748628616333e+00, 2.726801633834839e+00, 2.632183790206909e+00, 2.545453786849976e+00, 2.174654245376587e+00, 1.769474267959595e+00, 2.041259258985519e-01, -4.928690433502197e+00, -1.685163259506226e+00, 1.07167661190033e+00, 9.3575519323349e-01, 9.680843949317932e-01, 9.510853886604309e-01, 8.631877899169922e-01, 1.062429070472717e+00, -2.621780633926392e+00, 5.135914087295532e-01]
+win.propsBus_a.surfCon.Q_flow=[-0e+00, 2.796275854110718e+00, 2.585426568984985e+00, 2.4133460521698e+00, 1.379509210586548e+00, 1.7153639793396e+00, 1.699419140815735e+00, 1.934814453125e+00, 2.107941865921021e+00, 2.138834476470947e+00, 2.058907508850098e+00, 1.985729694366455e+00, -1.349355816841125e+00, -1.585526561737061e+01, -8.787398338317871e+00, 4.282360076904297e+00, 2.867397308349609e+00, 2.452533006668091e+00, 2.285964965820312e+00, 2.185288429260254e+00, 2.104734897613525e+00, -3.315770626068115e+00, -1.025738620758057e+01, 5.786882638931274e-01, 2.66139030456543e+00, 2.449128389358521e+00, 2.337955474853516e+00, 2.215547800064087e+00, 1.988516807556152e+00, 1.737382888793945e+00, -5.129061698913574e+00, -2.693580865859985e+00, 2.715311050415039e+00, 2.165435314178467e+00, 1.734227776527405e+00, 1.481043219566345e+00, 1.237235546112061e+00, 1.00916600227356e+00, -4.574984908103943e-01, -2.325604915618896e+00, -8.668616414070129e-02, 1.235236763954163e+00, 1.179649949073792e+00, 1.170896649360657e+00, 1.27146589756012e+00, 1.180187225341797e+00, 1.024305462837219e+00, -3.580408573150635e+00, -5.996860027313232e+00, 1.020158886909485e+00, 1.389595150947571e+00, 1.067844867706299e+00, 9.581040740013123e-01, 9.12312924861908e-01, 1.168449401855469e+00, 6.680908799171448e-01, -7.559444010257721e-02, -1.482227146625519e-01, 1.255368143320084e-01, 1.069850772619247e-01, 4.444348439574242e-02, -4.68423143029213e-02, 3.139406740665436e-01, 5.881654620170593e-01, -6.869454860687256e+00, -1.284570980072021e+01, -3.23354697227478e+00, 2.470043182373047e+00, 1.65795624256134e+00, 1.462061285972595e+00, 1.543461322784424e+00, 1.383020043373108e+00, 1.453011870384216e+00, -7.411198616027832e+00, -1.275623989105225e+01, 1.370782136917114e+00, 2.845079183578491e+00, 2.184041738510132e+00, 2.021851778030396e+00, 1.877686738967896e+00, 2.001978158950806e+00, 1.662461996078491e+00, -1.547904968261719e+00, -1.53857147693634e+00, 1.808664917945862e+00, 1.769729375839233e+00, 1.677230715751648e+00, 1.572868943214417e+00, 1.369304776191711e+00, 1.122183203697205e+00, 6.103764846920967e-02, -3.811636447906494e+00, -1.407140016555786e+00, 7.415241599082947e-01, 6.140316128730774e-01, 6.281518936157227e-01, 6.079017519950867e-01, 5.535199046134949e-01, 6.717641949653625e-01, -2.21286416053772e+00, 3.104977309703827e-01]
+winLinLos.propsBus_a.surfCon.Q_flow=[-0e+00, 4.431951999664307e+00, 4.11899995803833e+00, 3.880224704742432e+00, 2.409238815307617e+00, 2.770284652709961e+00, 2.692946434020996e+00, 3.067718267440796e+00, 3.332171678543091e+00, 3.379507780075073e+00, 3.243080854415894e+00, 3.111069679260254e+00, -1.349260330200195e+00, -1.938527679443359e+01, -1.052327919006348e+01, 6.019598484039307e+00, 4.341575145721436e+00, 3.805138111114502e+00, 3.560828447341919e+00, 3.388409852981567e+00, 3.268351316452026e+00, -3.862934112548828e+00, -1.263379096984863e+01, 1.338336825370789e+00, 3.961886167526245e+00, 3.802397966384888e+00, 3.586361408233643e+00, 3.400989294052124e+00, 3.048069000244141e+00, 2.70247483253479e+00, -6.116658687591553e+00, -2.84867262840271e+00, 4.06966495513916e+00, 3.380102634429932e+00, 2.730663061141968e+00, 2.342247486114502e+00, 1.919210076332092e+00, 1.564967155456543e+00, -4.615017175674438e-01, -2.725078344345093e+00, 1.746353805065155e-01, 1.855947494506836e+00, 1.831653952598572e+00, 1.819067120552063e+00, 1.987701177597046e+00, 1.823139429092407e+00, 1.577806830406189e+00, -4.467174530029297e+00, -7.483489036560059e+00, 1.644454717636108e+00, 1.999613523483276e+00, 1.591216564178467e+00, 1.437442421913147e+00, 1.380259275436401e+00, 1.77357029914856e+00, 1.013464689254761e+00, -6.229988485574722e-02, -1.44978940486908e-01, 1.849677264690399e-01, 1.590180099010468e-01, 5.29489628970623e-02, -7.382168620824814e-02, 4.813804924488068e-01, 8.925150632858276e-01, -8.569114685058594e+00, -1.548622989654541e+01, -3.621237516403198e+00, 3.336796283721924e+00, 2.476259708404541e+00, 2.278383016586304e+00, 2.423282384872437e+00, 2.168563842773438e+00, 2.264942407608032e+00, -8.773343086242676e+00, -1.556175518035889e+01, 2.375077247619629e+00, 4.09179162979126e+00, 3.394498825073242e+00, 3.201271533966064e+00, 2.967162132263184e+00, 3.143967151641846e+00, 2.600918292999268e+00, -1.74047839641571e+00, -1.68831467628479e+00, 2.741994857788086e+00, 2.663589954376221e+00, 2.571794748306274e+00, 2.488460063934326e+00, 2.126237154006958e+00, 1.731091618537903e+00, 1.822763532400131e-01, -4.865447521209717e+00, -1.647562503814697e+00, 1.047218918800354e+00, 9.154149889945984e-01, 9.473519921302795e-01, 9.309032559394836e-01, 8.454732894897461e-01, 1.039300203323364e+00, -2.583199501037598e+00, 4.985190629959106e-01]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Validations_WindowEN673.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Validations_WindowEN673.txt
index e0f2625b70..19c4930117 100644
--- a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Validations_WindowEN673.txt
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Components_Validations_WindowEN673.txt
@@ -1,4 +1,4 @@
-last-generated=2023-05-02
+last-generated=2024-10-29
 statistics-initialization=
 {
   "nonlinear": "6",
@@ -12,5 +12,5 @@ statistics-simulation=
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1e+06]
-U_EN673=[9.958564043045044e-01, 9.95191216468811e-01, 9.948973059654236e-01, 9.946639537811279e-01, 9.944645166397095e-01, 9.942895770072937e-01, 9.941309094429016e-01, 9.939878582954407e-01, 9.938579201698303e-01, 9.93740439414978e-01, 9.936359524726868e-01, 9.935402274131775e-01, 9.934508800506592e-01, 9.933704733848572e-01, 9.932985305786133e-01, 9.932320713996887e-01, 9.931788444519043e-01, 9.931299686431885e-01, 9.930828213691711e-01, 9.930442571640015e-01, 9.930037260055542e-01, 9.929685592651367e-01, 9.929368495941162e-01, 9.929062128067017e-01, 9.928826093673706e-01, 9.928646087646484e-01, 9.928516745567322e-01, 9.928357005119324e-01, 9.928193092346191e-01, 9.927989840507507e-01, 9.927813410758972e-01, 9.927670955657959e-01, 9.927572011947632e-01, 9.927445650100708e-01, 9.927371740341187e-01, 9.927287697792053e-01, 9.927216768264771e-01, 9.927151203155518e-01, 9.927063584327698e-01, 9.927021861076355e-01, 9.926979541778564e-01, 9.926959872245789e-01, 9.926890134811401e-01, 9.926882386207581e-01, 9.926890730857849e-01, 9.926897287368774e-01, 9.92686927318573e-01, 9.926883578300476e-01, 9.926841259002686e-01, 9.926809668540955e-01, 9.92684006690979e-01, 9.926808476448059e-01, 9.926778674125671e-01, 9.926749467849731e-01, 9.92665708065033e-01, 9.926685094833374e-01, 9.926605224609375e-01, 9.926538467407227e-01, 9.926469922065735e-01, 9.926465749740601e-01, 9.926446080207825e-01, 9.926403760910034e-01, 9.926438331604004e-01, 9.92641270160675e-01, 9.926410317420959e-01, 9.926392436027527e-01, 9.926382303237915e-01, 9.926395416259766e-01, 9.92640495300293e-01, 9.926407337188721e-01, 9.926435351371765e-01, 9.926431775093079e-01, 9.926456809043884e-01, 9.926438927650452e-01, 9.926453828811646e-01, 9.926436543464661e-01, 9.926474690437317e-01, 9.926487803459167e-01, 9.92650032043457e-01, 9.926489591598511e-01, 9.926560521125793e-01, 9.926576614379883e-01, 9.926611185073853e-01, 9.926617741584778e-01, 9.92658257484436e-01, 9.926673173904419e-01, 9.92662787437439e-01, 9.92656409740448e-01, 9.926630854606628e-01, 9.926634430885315e-01, 9.926638007164001e-01, 9.926652312278748e-01, 9.926618337631226e-01, 9.926595091819763e-01, 9.926633834838867e-01, 9.926623702049255e-01, 9.926609396934509e-01, 9.926551580429077e-01, 9.926545023918152e-01, 9.92648720741272e-01, 9.926453232765198e-01]
-U_default=[8.268908858299255e-01, 8.165158033370972e-01, 8.162752985954285e-01, 8.238929510116577e-01, 8.256984353065491e-01, 8.161759972572327e-01, 8.125401735305786e-01, 8.166230916976929e-01, 8.139572143554688e-01, 8.138612508773804e-01, 8.076155185699463e-01, 8.066211938858032e-01, 8.065487146377563e-01, 8.067196607589722e-01, 8.069136142730713e-01, 8.127580881118774e-01, 7.999555468559265e-01, 7.963387370109558e-01, 7.963009476661682e-01, 7.843146324157715e-01, 7.962375283241272e-01, 7.962093353271484e-01, 7.965517640113831e-01, 8.056091666221619e-01, 8.04077684879303e-01, 7.961259484291077e-01, 7.837496995925903e-01, 7.77620792388916e-01, 7.776079177856445e-01, 7.96073317527771e-01, 8.086056113243103e-01, 8.130662441253662e-01, 8.062671422958374e-01, 8.1451416015625e-01, 8.088487982749939e-01, 8.117958307266235e-01, 8.059576749801636e-01, 8.055003881454468e-01, 8.130166530609131e-01, 8.11212956905365e-01, 8.125280737876892e-01, 8.059368133544922e-01, 8.168088793754578e-01, 8.059305548667908e-01, 8.141237497329712e-01, 8.000937104225159e-01, 8.000915050506592e-01, 7.871572375297546e-01, 7.959811687469482e-01, 7.994751334190369e-01, 7.775014042854309e-01, 7.774989604949951e-01, 7.774965763092041e-01, 7.774942517280579e-01, 8.000743985176086e-01, 7.809544205665588e-01, 8.000701665878296e-01, 8.150104284286499e-01, 8.308900594711304e-01, 8.247259259223938e-01, 8.253310322761536e-01, 8.352380394935608e-01, 8.186491727828979e-01, 8.242324590682983e-01, 8.219717144966125e-01, 8.26143205165863e-01, 8.281681537628174e-01, 8.226253986358643e-01, 8.192111253738403e-01, 8.188090324401855e-01, 8.102234601974487e-01, 8.127533197402954e-01, 8.058960437774658e-01, 8.145990967750549e-01, 8.125448226928711e-01, 8.222925662994385e-01, 8.131544589996338e-01, 8.134084343910217e-01, 8.144975900650024e-01, 8.242388367652893e-01, 8.059044480323792e-01, 8.059057593345642e-01, 7.959627509117126e-01, 7.959632277488708e-01, 8.102945685386658e-01, 7.802628874778748e-01, 7.979530096054077e-01, 8.221816420555115e-01, 8.000722527503967e-01, 8.000725507736206e-01, 8.000728487968445e-01, 7.961869239807129e-01, 8.089206218719482e-01, 8.179439306259155e-01, 8.049785494804382e-01, 8.056713342666626e-01, 8.055495023727417e-01, 8.192208409309387e-01, 8.134160041809082e-01, 8.24238657951355e-01, 8.251540064811707e-01]
+U_EN673=[9.958090782165527e-01, 9.950910210609436e-01, 9.947746396064758e-01, 9.945240616798401e-01, 9.943094849586487e-01, 9.941218495368958e-01, 9.93952214717865e-01, 9.937998056411743e-01, 9.936612248420715e-01, 9.935363531112671e-01, 9.934252500534058e-01, 9.933248162269592e-01, 9.932306408882141e-01, 9.931460022926331e-01, 9.93070662021637e-01, 9.930005073547363e-01, 9.929449558258057e-01, 9.928938746452332e-01, 9.928445816040039e-01, 9.928048849105835e-01, 9.927620887756348e-01, 9.9272620677948e-01, 9.926943182945251e-01, 9.926635026931763e-01, 9.926401972770691e-01, 9.926230311393738e-01, 9.926099181175232e-01, 9.925940632820129e-01, 9.925774335861206e-01, 9.925554990768433e-01, 9.925356507301331e-01, 9.925191402435303e-01, 9.925073385238647e-01, 9.924930334091187e-01, 9.924849271774292e-01, 9.924755692481995e-01, 9.924690127372742e-01, 9.924612641334534e-01, 9.92451548576355e-01, 9.924458861351013e-01, 9.924400448799133e-01, 9.924376606941223e-01, 9.924302101135254e-01, 9.924309253692627e-01, 9.924255609512329e-01, 9.92428183555603e-01, 9.924266934394836e-01, 9.924301505088806e-01, 9.924269318580627e-01, 9.924260973930359e-01, 9.924343824386597e-01, 9.924358725547791e-01, 9.924379587173462e-01, 9.924393892288208e-01, 9.924277663230896e-01, 9.924315810203552e-01, 9.924234747886658e-01, 9.924134016036987e-01, 9.924030303955078e-01, 9.92400050163269e-01, 9.923959970474243e-01, 9.923890829086304e-01, 9.92391049861908e-01, 9.923880696296692e-01, 9.923889636993408e-01, 9.923877120018005e-01, 9.923871755599976e-01, 9.923891425132751e-01, 9.923904538154602e-01, 9.923906922340393e-01, 9.923936128616333e-01, 9.923925995826721e-01, 9.923946857452393e-01, 9.923915863037109e-01, 9.923921227455139e-01, 9.923886656761169e-01, 9.923915266990662e-01, 9.923912882804871e-01, 9.923908114433289e-01, 9.923875331878662e-01, 9.923936128616333e-01, 9.923935532569885e-01, 9.923968315124512e-01, 9.923967719078064e-01, 9.923918843269348e-01, 9.924019575119019e-01, 9.923959374427795e-01, 9.923877716064453e-01, 9.923951029777527e-01, 9.923950433731079e-01, 9.923949837684631e-01, 9.923962354660034e-01, 9.923918843269348e-01, 9.923888444900513e-01, 9.923931360244751e-01, 9.923928380012512e-01, 9.923928380012512e-01, 9.923877120018005e-01, 9.923874139785767e-01, 9.923815131187439e-01, 9.923789501190186e-01]
+U_default=[9.720930457115173e-01, 9.59848940372467e-01, 9.595426321029663e-01, 9.684721827507019e-01, 9.705767035484314e-01, 9.593778848648071e-01, 9.550953507423401e-01, 9.598811268806458e-01, 9.567404985427856e-01, 9.566197991371155e-01, 9.49276328086853e-01, 9.481031894683838e-01, 9.480128884315491e-01, 9.482089877128601e-01, 9.48432981967926e-01, 9.552937150001526e-01, 9.402534961700439e-01, 9.360026717185974e-01, 9.359559416770935e-01, 9.218747615814209e-01, 9.358776211738586e-01, 9.358435869216919e-01, 9.362453818321228e-01, 9.468837380409241e-01, 9.450849890708923e-01, 9.357456564903259e-01, 9.2120760679245e-01, 9.14007842540741e-01, 9.139924049377441e-01, 9.356815218925476e-01, 9.503995180130005e-01, 9.556364417076111e-01, 9.476486444473267e-01, 9.573333859443665e-01, 9.506784677505493e-01, 9.541389346122742e-01, 9.472821950912476e-01, 9.46743905544281e-01, 9.555710554122925e-01, 9.534511566162109e-01, 9.549941420555115e-01, 9.47252094745636e-01, 9.600211381912231e-01, 9.472456574440002e-01, 9.568628668785095e-01, 9.403858780860901e-01, 9.403844475746155e-01, 9.25193727016449e-01, 9.355595111846924e-01, 9.396656155586243e-01, 9.138591289520264e-01, 9.138604998588562e-01, 9.138624668121338e-01, 9.138637781143188e-01, 9.403855204582214e-01, 9.179272055625916e-01, 9.403814077377319e-01, 9.579263925552368e-01, 9.765735268592834e-01, 9.693313837051392e-01, 9.70039963722229e-01, 9.816728234291077e-01, 9.621880054473877e-01, 9.68745231628418e-01, 9.660910367965698e-01, 9.709909558296204e-01, 9.733696579933167e-01, 9.668604731559753e-01, 9.628506898880005e-01, 9.623785018920898e-01, 9.52294647693634e-01, 9.552654027938843e-01, 9.472109079360962e-01, 9.574316740036011e-01, 9.550179839134216e-01, 9.664650559425354e-01, 9.557314515113831e-01, 9.56028163433075e-01, 9.573058485984802e-01, 9.68744695186615e-01, 9.472098350524902e-01, 9.472097754478455e-01, 9.355309009552002e-01, 9.355308413505554e-01, 9.523624777793884e-01, 9.170882701873779e-01, 9.378662109375e-01, 9.66321587562561e-01, 9.403543472290039e-01, 9.403542876243591e-01, 9.403542280197144e-01, 9.357898235321045e-01, 9.507452845573425e-01, 9.613425135612488e-01, 9.461148381233215e-01, 9.469292759895325e-01, 9.467875361442566e-01, 9.628452658653259e-01, 9.560278058052063e-01, 9.687387943267822e-01, 9.69814658164978e-01]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Examples_ScreenComparison.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Examples_ScreenComparison.txt
index b6b61f8e17..87a548cf7f 100644
--- a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Examples_ScreenComparison.txt
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Examples_ScreenComparison.txt
@@ -1,4 +1,4 @@
-last-generated=2023-05-02
+last-generated=2023-10-23
 statistics-initialization=
 {
   "nonlinear": "7, 7, 1, 1",
@@ -13,5 +13,5 @@ statistics-simulation=
 }
 time=[1e+07, 1.2e+07]
 sim.Te=[2.894833374023438e+02, 2.836236267089844e+02, 2.827462768554688e+02, 2.831058654785156e+02, 2.841499938964844e+02, 2.826997985839844e+02, 2.80917724609375e+02, 2.799411010742188e+02, 2.830309143066406e+02, 2.829553527832031e+02, 2.790854797363281e+02, 2.783362731933594e+02, 2.867833251953125e+02, 2.880499877929688e+02, 2.830696105957031e+02, 2.826581420898438e+02, 2.851524658203125e+02, 2.879353637695312e+02, 2.818515014648438e+02, 2.783740844726562e+02, 2.799701538085938e+02, 2.832342834472656e+02, 2.815499877929688e+02, 2.784277648925781e+02, 2.782693176269531e+02, 2.843285522460938e+02, 2.860570373535156e+02, 2.802997436523438e+02, 2.757696533203125e+02, 2.86727783203125e+02, 2.896944580078125e+02, 2.853500061035156e+02, 2.81735107421875e+02, 2.828349914550781e+02, 2.85615966796875e+02, 2.832833862304688e+02, 2.778554992675781e+02, 2.807515869140625e+02, 2.869569396972656e+02, 2.876581115722656e+02, 2.823500061035156e+02, 2.799300231933594e+02, 2.894803466796875e+02, 2.923829345703125e+02, 2.867941284179688e+02, 2.833397827148438e+02, 2.895361938476562e+02, 2.958777160644531e+02, 2.918222045898438e+02, 2.886499938964844e+02, 2.895815124511719e+02, 2.979793090820312e+02, 2.9614599609375e+02, 2.877467041015625e+02, 2.861664123535156e+02, 2.963166809082031e+02, 2.982222290039062e+02, 2.913555603027344e+02, 2.879500122070312e+02, 2.927388916015625e+02, 2.967602844238281e+02, 2.933236694335938e+02, 2.883746948242188e+02, 2.889084777832031e+02, 2.9175e+02, 2.901076965332031e+02, 2.865220947265625e+02, 2.8625e+02, 2.936611022949219e+02, 2.953222351074219e+02, 2.908167724609375e+02, 2.861244506835938e+02, 2.914611206054688e+02, 2.939833374023438e+02, 2.911222534179688e+02, 2.867625427246094e+02, 2.886499938964844e+02, 2.9525e+02, 2.927764282226562e+02, 2.834524841308594e+02, 2.814558410644531e+02, 2.829728088378906e+02, 2.839065551757812e+02, 2.796821899414062e+02, 2.77479248046875e+02, 2.823500061035156e+02, 2.849210815429688e+02, 2.827760314941406e+02, 2.812789306640625e+02, 2.818450927734375e+02, 2.857754211425781e+02, 2.857527770996094e+02, 2.801278076171875e+02, 2.823516540527344e+02, 2.880499877929688e+02, 2.890447998046875e+02, 2.859559326171875e+02, 2.827870483398438e+02, 2.891370849609375e+02, 2.911576843261719e+02, 2.853500061035156e+02]
-zoneWithScreen.TSensor=[2.931499938964844e+02, 2.913906860351562e+02, 2.901635131835938e+02, 2.917936401367188e+02, 2.928052978515625e+02, 2.902510375976562e+02, 2.889658203125e+02, 2.883655700683594e+02, 2.909561157226562e+02, 2.890434265136719e+02, 2.876649475097656e+02, 2.865906982421875e+02, 2.915933532714844e+02, 2.898634948730469e+02, 2.884522399902344e+02, 2.876368408203125e+02, 2.884960021972656e+02, 2.901082153320312e+02, 2.879631958007812e+02, 2.865140380859375e+02, 2.872427368164062e+02, 2.905940551757812e+02, 2.876935424804688e+02, 2.863750305175781e+02, 2.855754089355469e+02, 2.906812133789062e+02, 2.893330688476562e+02, 2.87566650390625e+02, 2.858589172363281e+02, 2.90615966796875e+02, 2.918694152832031e+02, 2.895126342773438e+02, 2.884813537597656e+02, 2.896007995605469e+02, 2.933072814941406e+02, 2.9026123046875e+02, 2.883627624511719e+02, 2.875880737304688e+02, 2.930995178222656e+02, 2.913090515136719e+02, 2.894996643066406e+02, 2.881521606445312e+02, 2.930164489746094e+02, 2.944349975585938e+02, 2.918708801269531e+02, 2.905616149902344e+02, 2.929258728027344e+02, 2.97906494140625e+02, 2.949132385253906e+02, 2.935966796875e+02, 2.934780883789062e+02, 2.996322326660156e+02, 2.977121276855469e+02, 2.957479858398438e+02, 2.945444641113281e+02, 2.995765380859375e+02, 3.004359130859375e+02, 2.978151550292969e+02, 2.964163818359375e+02, 2.984566650390625e+02, 3.0128173828125e+02, 2.9853857421875e+02, 2.971196899414062e+02, 2.962365417480469e+02, 2.982859191894531e+02, 2.969176025390625e+02, 2.953922424316406e+02, 2.944091796875e+02, 2.983029479980469e+02, 2.986557312011719e+02, 2.966844787597656e+02, 2.9510205078125e+02, 2.972977294921875e+02, 2.990795593261719e+02, 2.968892822265625e+02, 2.95470458984375e+02, 2.952413635253906e+02, 3.0054736328125e+02, 2.977515869140625e+02, 2.95409912109375e+02, 2.936783447265625e+02, 2.94498779296875e+02, 2.935875244140625e+02, 2.913189697265625e+02, 2.894578552246094e+02, 2.9068115234375e+02, 2.918833923339844e+02, 2.896559143066406e+02, 2.884255065917969e+02, 2.883589782714844e+02, 2.914624938964844e+02, 2.899005737304688e+02, 2.882876892089844e+02, 2.8779150390625e+02, 2.914073181152344e+02, 2.909418029785156e+02, 2.896611938476562e+02, 2.885347595214844e+02, 2.910348815917969e+02, 2.921618957519531e+02, 2.902590637207031e+02]
-zoneWithoutScreen.TSensor=[2.931499938964844e+02, 2.913681945800781e+02, 2.901399841308594e+02, 2.908549499511719e+02, 2.933149719238281e+02, 2.913895263671875e+02, 2.899142761230469e+02, 2.889652099609375e+02, 2.915052185058594e+02, 2.907099304199219e+02, 2.890852661132812e+02, 2.877384643554688e+02, 2.924494323730469e+02, 2.918767700195312e+02, 2.903587036132812e+02, 2.892683715820312e+02, 2.895800170898438e+02, 2.913155822753906e+02, 2.896542053222656e+02, 2.879731140136719e+02, 2.879728088378906e+02, 2.918409729003906e+02, 2.900568542480469e+02, 2.883790588378906e+02, 2.87209716796875e+02, 2.917917175292969e+02, 2.923365173339844e+02, 2.903059387207031e+02, 2.881853942871094e+02, 2.91759033203125e+02, 2.944648742675781e+02, 2.92530029296875e+02, 2.910846252441406e+02, 2.91116943359375e+02, 2.957196044921875e+02, 2.937398681640625e+02, 2.913278503417969e+02, 2.900348510742188e+02, 2.949871215820312e+02, 2.946300354003906e+02, 2.924880065917969e+02, 2.906891479492188e+02, 2.942564392089844e+02, 2.973282775878906e+02, 2.951513061523438e+02, 2.933725280761719e+02, 2.942438049316406e+02, 2.997330932617188e+02, 2.981937561035156e+02, 2.964107055664062e+02, 2.956700439453125e+02, 3.010768432617188e+02, 3.006628112792969e+02, 2.985116271972656e+02, 2.968709106445312e+02, 3.007672424316406e+02, 3.030657043457031e+02, 3.007939758300781e+02, 2.989676513671875e+02, 2.9966064453125e+02, 3.035135192871094e+02, 3.015198669433594e+02, 2.996868591308594e+02, 2.983795471191406e+02, 3.001410522460938e+02, 2.994173889160156e+02, 2.975840148925781e+02, 2.962481994628906e+02, 2.992713623046875e+02, 3.008948669433594e+02, 2.991310729980469e+02, 2.972178955078125e+02, 2.981937866210938e+02, 3.009935913085938e+02, 2.994423828125e+02, 2.97666015625e+02, 2.969495544433594e+02, 3.018522033691406e+02, 3.006771240234375e+02, 2.979482116699219e+02, 2.958141479492188e+02, 2.961104431152344e+02, 2.959367065429688e+02, 2.934937133789062e+02, 2.913343505859375e+02, 2.9170947265625e+02, 2.936469116210938e+02, 2.918936767578125e+02, 2.903349609375e+02, 2.897818603515625e+02, 2.927784729003906e+02, 2.922147827148438e+02, 2.9030078125e+02, 2.89430419921875e+02, 2.924107055664062e+02, 2.928812255859375e+02, 2.916456909179688e+02, 2.902484741210938e+02, 2.915888671875e+02, 2.935437622070312e+02, 2.92154541015625e+02]
+zoneWithScreen.TSensor=[2.931499938964844e+02, 2.913551025390625e+02, 2.900983276367188e+02, 2.900747375488281e+02, 2.902665405273438e+02, 2.89041259765625e+02, 2.878999328613281e+02, 2.870299987792969e+02, 2.88114501953125e+02, 2.874865112304688e+02, 2.863155212402344e+02, 2.85250732421875e+02, 2.882527465820312e+02, 2.879102172851562e+02, 2.868385009765625e+02, 2.862133483886719e+02, 2.865663757324219e+02, 2.878465576171875e+02, 2.865013122558594e+02, 2.852174682617188e+02, 2.852121887207031e+02, 2.871755981445312e+02, 2.858012084960938e+02, 2.847240600585938e+02, 2.839297790527344e+02, 2.865912475585938e+02, 2.866297912597656e+02, 2.853551330566406e+02, 2.838696594238281e+02, 2.867777709960938e+02, 2.88173095703125e+02, 2.870049438476562e+02, 2.862478942871094e+02, 2.865761413574219e+02, 2.887893371582031e+02, 2.874914855957031e+02, 2.859219665527344e+02, 2.85232666015625e+02, 2.885101013183594e+02, 2.8831689453125e+02, 2.869335021972656e+02, 2.858430786132812e+02, 2.887198486328125e+02, 2.902669067382812e+02, 2.890131530761719e+02, 2.880223388671875e+02, 2.894163818359375e+02, 2.925482177734375e+02, 2.91850830078125e+02, 2.907710266113281e+02, 2.906898803710938e+02, 2.944369812011719e+02, 2.944036254882812e+02, 2.928509521484375e+02, 2.919285583496094e+02, 2.950626525878906e+02, 2.963143920898438e+02, 2.948367919921875e+02, 2.937838745117188e+02, 2.948280944824219e+02, 2.968594665527344e+02, 2.956129760742188e+02, 2.9453173828125e+02, 2.938221435546875e+02, 2.948782348632812e+02, 2.943406066894531e+02, 2.931994018554688e+02, 2.923965454101562e+02, 2.947112121582031e+02, 2.9556005859375e+02, 2.944171752929688e+02, 2.930841979980469e+02, 2.941650695800781e+02, 2.956091003417969e+02, 2.945768432617188e+02, 2.93426025390625e+02, 2.930983276367188e+02, 2.961491088867188e+02, 2.950888671875e+02, 2.931100463867188e+02, 2.915750732421875e+02, 2.914429931640625e+02, 2.909699401855469e+02, 2.892829284667969e+02, 2.876692810058594e+02, 2.879421081542969e+02, 2.887464904785156e+02, 2.87677734375e+02, 2.866891479492188e+02, 2.864053649902344e+02, 2.882437438964844e+02, 2.878002624511719e+02, 2.864857482910156e+02, 2.860766296386719e+02, 2.883455200195312e+02, 2.886477966308594e+02, 2.878554077148438e+02, 2.869261169433594e+02, 2.883588256835938e+02, 2.893837585449219e+02, 2.883031311035156e+02]
+zoneWithoutScreen.TSensor=[2.931499938964844e+02, 2.913478088378906e+02, 2.900880737304688e+02, 2.90846435546875e+02, 2.932588500976562e+02, 2.913624877929688e+02, 2.898760986328125e+02, 2.889335021972656e+02, 2.915129089355469e+02, 2.906990051269531e+02, 2.890626831054688e+02, 2.877119445800781e+02, 2.924709167480469e+02, 2.918962097167969e+02, 2.9036083984375e+02, 2.892620239257812e+02, 2.895874633789062e+02, 2.913380737304688e+02, 2.896568603515625e+02, 2.879618835449219e+02, 2.879784851074219e+02, 2.918841247558594e+02, 2.900653076171875e+02, 2.8837451171875e+02, 2.872019958496094e+02, 2.918430480957031e+02, 2.923820190429688e+02, 2.903289184570312e+02, 2.881883850097656e+02, 2.918041381835938e+02, 2.945379638671875e+02, 2.925769348144531e+02, 2.9111279296875e+02, 2.911604614257812e+02, 2.958059387207031e+02, 2.937931823730469e+02, 2.913547973632812e+02, 2.90054931640625e+02, 2.950626525878906e+02, 2.946931762695312e+02, 2.925245666503906e+02, 2.907071228027344e+02, 2.943108215332031e+02, 2.974178771972656e+02, 2.952130737304688e+02, 2.93411865234375e+02, 2.943057250976562e+02, 2.998128356933594e+02, 2.982699890136719e+02, 2.964412536621094e+02, 2.956788940429688e+02, 3.011383361816406e+02, 3.007363586425781e+02, 2.985564270019531e+02, 2.968976440429688e+02, 3.0083349609375e+02, 3.031480407714844e+02, 3.008549194335938e+02, 2.99005859375e+02, 2.997218627929688e+02, 3.036027526855469e+02, 3.015797729492188e+02, 2.997238159179688e+02, 2.984058227539062e+02, 3.001913757324219e+02, 2.994470825195312e+02, 2.975950012207031e+02, 2.962493286132812e+02, 2.993129577636719e+02, 3.009458923339844e+02, 2.991602172851562e+02, 2.972271423339844e+02, 2.982314453125e+02, 3.010531311035156e+02, 2.994761962890625e+02, 2.976810607910156e+02, 2.969655151367188e+02, 3.019089660644531e+02, 3.006395568847656e+02, 2.9793115234375e+02, 2.957809753417969e+02, 2.961029968261719e+02, 2.959110412597656e+02, 2.934484252929688e+02, 2.912784729003906e+02, 2.916854858398438e+02, 2.936461791992188e+02, 2.918714599609375e+02, 2.903034973144531e+02, 2.897592468261719e+02, 2.927948913574219e+02, 2.92219482421875e+02, 2.902874450683594e+02, 2.894164123535156e+02, 2.924329223632812e+02, 2.929079895019531e+02, 2.916580505371094e+02, 2.90247802734375e+02, 2.916048889160156e+02, 2.935689392089844e+02, 2.921666870117188e+02]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Examples_TwoStoreyBoxes.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Examples_TwoStoreyBoxes.txt
new file mode 100644
index 0000000000..85ec0f1f55
--- /dev/null
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Examples_TwoStoreyBoxes.txt
@@ -0,0 +1,17 @@
+last-generated=2024-10-31
+statistics-initialization=
+{
+  "nonlinear": "6, 6, 2",
+  "numerical Jacobians": "0"
+}
+statistics-simulation=
+{
+  "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0",
+  "nonlinear": "2, 1",
+  "number of continuous time states": "95",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 1.2096e+06]
+Level.intFlo.crackOrOperableDoor.m1_flow=[3.783491207286716e-03, 3.959342837333679e-03, 3.920897375792265e-03, 3.873995272442698e-03, 3.697631880640984e-03, 3.621370298787951e-03, 3.619430121034384e-03, 4.193410277366638e-03, 4.256962798535824e-03, 4.312292207032442e-03, 4.227468278259039e-03, 3.895093221217394e-03, 4.077249672263861e-03, 4.189037252217531e-03, 4.222196992486715e-03, 4.306842107325792e-03, 4.398344084620476e-03, 4.391392227262259e-03, 4.206197336316109e-03, 4.11379337310791e-03, 4.16896166279912e-03, 4.674090538173914e-03, 4.634863696992397e-03, 4.662801977247e-03, 4.515168722718954e-03, 4.327825736254454e-03, 4.560051951557398e-03, 4.633331205695868e-03, 4.467888735234737e-03, 4.385368898510933e-03, 4.139994271099567e-03, 3.941576927900314e-03, 3.9113056845963e-03, 3.944769967347383e-03, 4.169368650764228e-03, 4.348461981862783e-03, 4.546116571873426e-03, 4.553741775453091e-03, 4.464069381356239e-03, 4.323814064264297e-03, 4.186330828815699e-03, 4.238001070916653e-03, 4.277748987078667e-03, 4.253322724252939e-03, 4.500214010477066e-03, 4.281080327928066e-03, 3.933493979275227e-03, 3.66243883036077e-03, 3.247204702347517e-03, 3.460903419181705e-03, 3.204640001058578e-03, 3.380896290764213e-03, 3.990174271166325e-03, 3.830460133031011e-03, 3.122616792097688e-03, 3.380138194188476e-03, 3.502855775877847e-03, 3.948514815419914e-03, 4.530078265815973e-03, 4.408042412251234e-03, 4.299526568502188e-03, 4.108399152755737e-03, 3.844933351501822e-03, 4.223435651510954e-03, 4.461073316633701e-03, 4.536966327577829e-03, 4.727533087134361e-03, 4.640602506697178e-03, 4.40489640459418e-03, 4.276796709746124e-03, 4.511919803917408e-03, 4.717337433248758e-03, 4.764487501233816e-03, 4.723569843918085e-03, 4.457225557416677e-03, 3.892287844792008e-03, 3.626729128882289e-03, 3.683932358399034e-03, 3.876821603626013e-03, 3.99297010153532e-03, 3.999225795269012e-03, 4.155152477324007e-03, 3.688538912683734e-03, 3.602256532758474e-03, 3.486208384856582e-03, 3.51065187714994e-03, 3.658462548628449e-03, 3.524582134559751e-03, 3.36641538888216e-03, 3.185047535225749e-03, 3.211149945855141e-03, 3.072999184951186e-03, 3.01080197095871e-03, 2.998616313561797e-03, 3.433660604059696e-03, 3.547423984855413e-03, 3.838467644527555e-03, 3.600175492465496e-03, 3.734363941475749e-03, 4.232125822454691e-03, 4.380417987704277e-03]
+Level.intFlo.crackOrOperableDoor.doo.dpAB[1]=[2.431348548270762e-06, 2.65920243691653e-06, 2.604574547149241e-06, 2.540502464398742e-06, 2.31330341193825e-06, 2.218788722530007e-06, 2.215412678197026e-06, 2.971908543258906e-06, 3.0607043299824e-06, 3.139124601148069e-06, 3.015651600435376e-06, 2.559725544415414e-06, 2.804386895149946e-06, 2.959874109365046e-06, 3.006716724485159e-06, 3.128108801320195e-06, 3.262597601860762e-06, 3.252556780353189e-06, 2.984117600135505e-06, 2.854663762263954e-06, 2.931221388280392e-06, 3.684996045194566e-06, 3.621069481596351e-06, 3.666937118396163e-06, 3.438777639530599e-06, 3.159759216941893e-06, 3.507142537273467e-06, 3.618944901973009e-06, 3.366309101693333e-06, 3.239285433664918e-06, 2.89078161586076e-06, 2.621862222440541e-06, 2.582411980256438e-06, 2.627159119583666e-06, 2.935164957307281e-06, 3.173670847900212e-06, 3.489854861982167e-06, 3.500623279251158e-06, 3.363486030139029e-06, 3.155219019390643e-06, 2.957414835691452e-06, 3.030902007594704e-06, 3.088338417001069e-06, 3.052889951504767e-06, 3.417313564568758e-06, 3.093053237535059e-06, 2.611777745187283e-06, 2.265427610836923e-06, 1.781008904799819e-06, 2.01952934730798e-06, 1.735330442897975e-06, 1.931693986989558e-06, 2.690765541046858e-06, 2.479806425981224e-06, 1.646651071496308e-06, 1.929307472892106e-06, 2.071974449791031e-06, 2.631757524795833e-06, 3.460343577899039e-06, 3.278924850746989e-06, 3.119072061963379e-06, 2.842949470505118e-06, 2.493819920346141e-06, 3.008448402397335e-06, 3.355075023137033e-06, 3.470020601525903e-06, 3.767258021980524e-06, 3.629887942224741e-06, 3.270281013101335e-06, 3.082546754740181e-06, 3.43039573635906e-06, 3.749926690943539e-06, 3.825887688435614e-06, 3.761218977160752e-06, 3.350054612383246e-06, 2.555403625592589e-06, 2.219981979578733e-06, 2.290806150995195e-06, 2.538086846470833e-06, 2.692671841941774e-06, 2.701155608519912e-06, 2.915345248766241e-06, 2.297310857102286e-06, 2.191474777646363e-06, 2.052838681265712e-06, 2.083514118567109e-06, 2.261484041810036e-06, 2.099375706166029e-06, 1.915308530442417e-06, 1.714841346256435e-06, 1.743421307764947e-06, 1.596185029484332e-06, 1.533451722934842e-06, 1.521257217973471e-06, 1.992419129237533e-06, 2.126049366779625e-06, 2.488595782779157e-06, 2.189044607803226e-06, 2.354950993321836e-06, 3.023262252099812e-06, 3.238426870666444e-06]
+Level.intFlo.crackOrOperableDoor.doo.dpAB[2]=[2.431348548270762e-06, 2.65920243691653e-06, 2.604574547149241e-06, 2.540502464398742e-06, 2.31330341193825e-06, 2.218788722530007e-06, 2.215412678197026e-06, 2.971908543258906e-06, 3.0607043299824e-06, 3.139124601148069e-06, 3.015651600435376e-06, 2.559725544415414e-06, 2.804386895149946e-06, 2.959874109365046e-06, 3.006716724485159e-06, 3.128108801320195e-06, 3.262597601860762e-06, 3.252556780353189e-06, 2.984117600135505e-06, 2.854663762263954e-06, 2.931221388280392e-06, 3.684996045194566e-06, 3.621069481596351e-06, 3.666937118396163e-06, 3.438777639530599e-06, 3.159759216941893e-06, 3.507142537273467e-06, 3.618944901973009e-06, 3.366309101693333e-06, 3.239285433664918e-06, 2.89078161586076e-06, 2.621862222440541e-06, 2.582411980256438e-06, 2.627159119583666e-06, 2.935164957307281e-06, 3.173670847900212e-06, 3.489854861982167e-06, 3.500623279251158e-06, 3.363486030139029e-06, 3.155219019390643e-06, 2.957414835691452e-06, 3.030902007594704e-06, 3.088338417001069e-06, 3.052889951504767e-06, 3.417313564568758e-06, 3.093053237535059e-06, 2.611777745187283e-06, 2.265427610836923e-06, 1.781008904799819e-06, 2.01952934730798e-06, 1.735330442897975e-06, 1.931693986989558e-06, 2.690765541046858e-06, 2.479806425981224e-06, 1.646651071496308e-06, 1.929307472892106e-06, 2.071974449791031e-06, 2.631757524795833e-06, 3.460343577899039e-06, 3.278924850746989e-06, 3.119072061963379e-06, 2.842949470505118e-06, 2.493819920346141e-06, 3.008448402397335e-06, 3.355075023137033e-06, 3.470020601525903e-06, 3.767258021980524e-06, 3.629887942224741e-06, 3.270281013101335e-06, 3.082546754740181e-06, 3.43039573635906e-06, 3.749926690943539e-06, 3.825887688435614e-06, 3.761218977160752e-06, 3.350054612383246e-06, 2.555403625592589e-06, 2.219981979578733e-06, 2.290806150995195e-06, 2.538086846470833e-06, 2.692671841941774e-06, 2.701155608519912e-06, 2.915345248766241e-06, 2.297310857102286e-06, 2.191474777646363e-06, 2.052838681265712e-06, 2.083514118567109e-06, 2.261484041810036e-06, 2.099375706166029e-06, 1.915308530442417e-06, 1.714841346256435e-06, 1.743421307764947e-06, 1.596185029484332e-06, 1.533451722934842e-06, 1.521257217973471e-06, 1.992419129237533e-06, 2.126049366779625e-06, 2.488595782779157e-06, 2.189044607803226e-06, 2.354950993321836e-06, 3.023262252099812e-06, 3.238426870666444e-06]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Examples_ZoneExample.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Examples_ZoneExample.txt
index e1f1f8901a..e5ede4804e 100644
--- a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Examples_ZoneExample.txt
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Examples_ZoneExample.txt
@@ -1,4 +1,9 @@
-last-generated=2022-07-20
+last-generated=2024-10-29
+statistics-initialization=
+{
+  "nonlinear": "2",
+  "numerical Jacobians": "0"
+}
 statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0",
@@ -7,7 +12,7 @@ statistics-simulation=
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1e+06]
-zone1.TSensor=[2.931499938964844e+02, 2.926357727050781e+02, 2.9204541015625e+02, 2.9144677734375e+02, 2.909494934082031e+02, 2.905351867675781e+02, 2.901136779785156e+02, 2.896556396484375e+02, 2.891547546386719e+02, 2.886327819824219e+02, 2.881076965332031e+02, 2.875937194824219e+02, 2.8711181640625e+02, 2.870603332519531e+02, 2.874476623535156e+02, 2.87525390625e+02, 2.871597900390625e+02, 2.866962890625e+02, 2.862309875488281e+02, 2.857792053222656e+02, 2.853225402832031e+02, 2.849634094238281e+02, 2.850666809082031e+02, 2.853187866210938e+02, 2.851424560546875e+02, 2.847821960449219e+02, 2.843394165039062e+02, 2.83899658203125e+02, 2.834770202636719e+02, 2.831058044433594e+02, 2.829106750488281e+02, 2.830348815917969e+02, 2.829591674804688e+02, 2.826184997558594e+02, 2.822948608398438e+02, 2.820089416503906e+02, 2.817559509277344e+02, 2.815546264648438e+02, 2.814063110351562e+02, 2.814411315917969e+02, 2.815127258300781e+02, 2.814356689453125e+02, 2.812643127441406e+02, 2.810641479492188e+02, 2.808414916992188e+02, 2.806032104492188e+02, 2.803764953613281e+02, 2.802396850585938e+02, 2.80445068359375e+02, 2.806529846191406e+02, 2.805625610351562e+02, 2.803875122070312e+02, 2.8021240234375e+02, 2.80046875e+02, 2.798306274414062e+02, 2.796745910644531e+02, 2.79656005859375e+02, 2.79709716796875e+02, 2.797376403808594e+02, 2.79767578125e+02, 2.7979931640625e+02, 2.798530883789062e+02, 2.798922119140625e+02, 2.798432312011719e+02, 2.797851867675781e+02, 2.801021423339844e+02, 2.805902709960938e+02, 2.807755126953125e+02, 2.806982421875e+02, 2.805471801757812e+02, 2.803618469238281e+02, 2.80150146484375e+02, 2.799497985839844e+02, 2.798728332519531e+02, 2.80236572265625e+02, 2.807250366210938e+02, 2.807767028808594e+02, 2.805851745605469e+02, 2.803441162109375e+02, 2.800933837890625e+02, 2.798278198242188e+02, 2.795648498535156e+02, 2.794905395507812e+02, 2.796096496582031e+02, 2.795847778320312e+02, 2.793809814453125e+02, 2.791261291503906e+02, 2.788756408691406e+02, 2.786706848144531e+02, 2.784887390136719e+02, 2.783630981445312e+02, 2.78514404296875e+02, 2.78786865234375e+02, 2.789100952148438e+02, 2.789342651367188e+02, 2.789111938476562e+02, 2.788742065429688e+02, 2.7882177734375e+02, 2.787685241699219e+02, 2.787967224121094e+02, 2.789240417480469e+02]
-zone.TSensor=[2.931499938964844e+02, 2.928257446289062e+02, 2.923843688964844e+02, 2.919277038574219e+02, 2.914904174804688e+02, 2.910907897949219e+02, 2.906775512695312e+02, 2.902849426269531e+02, 2.89873291015625e+02, 2.894593200683594e+02, 2.890547485351562e+02, 2.886575622558594e+02, 2.882585754394531e+02, 2.878972778320312e+02, 2.875932922363281e+02, 2.873125610351562e+02, 2.870208129882812e+02, 2.867125549316406e+02, 2.864028625488281e+02, 2.860992736816406e+02, 2.857974548339844e+02, 2.854899597167969e+02, 2.852440795898438e+02, 2.850442504882812e+02, 2.84833251953125e+02, 2.846059875488281e+02, 2.843602905273438e+02, 2.840987243652344e+02, 2.838299255371094e+02, 2.8356787109375e+02, 2.833273010253906e+02, 2.831388549804688e+02, 2.829736022949219e+02, 2.827964172363281e+02, 2.825874633789062e+02, 2.823914184570312e+02, 2.822178039550781e+02, 2.820665893554688e+02, 2.819278564453125e+02, 2.818400268554688e+02, 2.817769470214844e+02, 2.817094116210938e+02, 2.816118774414062e+02, 2.81486572265625e+02, 2.813494567871094e+02, 2.81217041015625e+02, 2.810709228515625e+02, 2.809357604980469e+02, 2.808488464355469e+02, 2.808033142089844e+02, 2.807286987304688e+02, 2.806297912597656e+02, 2.805320129394531e+02, 2.804390869140625e+02, 2.803360290527344e+02, 2.802218627929688e+02, 2.801532897949219e+02, 2.801476135253906e+02, 2.8016357421875e+02, 2.801803283691406e+02, 2.801977233886719e+02, 2.802253723144531e+02, 2.802687683105469e+02, 2.802688903808594e+02, 2.802240600585938e+02, 2.802016296386719e+02, 2.802281188964844e+02, 2.802328796386719e+02, 2.802015991210938e+02, 2.801591186523438e+02, 2.800929260253906e+02, 2.799961547851562e+02, 2.79910888671875e+02, 2.79797119140625e+02, 2.797619323730469e+02, 2.797669372558594e+02, 2.797542114257812e+02, 2.796939392089844e+02, 2.796128234863281e+02, 2.795272827148438e+02, 2.794376525878906e+02, 2.793202514648438e+02, 2.792280578613281e+02, 2.792032775878906e+02, 2.791935119628906e+02, 2.791349182128906e+02, 2.790357971191406e+02, 2.789230041503906e+02, 2.788135070800781e+02, 2.787146911621094e+02, 2.786372985839844e+02, 2.786150512695312e+02, 2.78693359375e+02, 2.787642211914062e+02, 2.788048400878906e+02, 2.788260498046875e+02, 2.788347473144531e+02, 2.788341674804688e+02, 2.788280639648438e+02, 2.788161315917969e+02, 2.788432312011719e+02]
-zone.airModel.phi=[6.920202970504761e-01, 6.993346214294434e-01, 7.161426544189453e-01, 7.323188781738281e-01, 7.464445233345032e-01, 7.60425865650177e-01, 7.585435509681702e-01, 7.311546802520752e-01, 6.817448139190674e-01, 6.401548981666565e-01, 6.077494025230408e-01, 5.899150967597961e-01, 5.736714601516724e-01, 5.622949004173279e-01, 5.456655621528625e-01, 5.312579274177551e-01, 5.242466330528259e-01, 5.233279466629028e-01, 5.265612602233887e-01, 5.312744975090027e-01, 5.398489832878113e-01, 5.46386182308197e-01, 5.521466732025146e-01, 5.542235374450684e-01, 5.546424388885498e-01, 5.58117687702179e-01, 5.629739761352539e-01, 5.725609660148621e-01, 5.839369297027588e-01, 5.944905877113342e-01, 6.057980060577393e-01, 5.998626947402954e-01, 5.920535922050476e-01, 5.973972082138062e-01, 6.085525155067444e-01, 6.183027625083923e-01, 6.281070113182068e-01, 6.406419277191162e-01, 6.691098809242249e-01, 6.935923099517822e-01, 7.135341763496399e-01, 7.236859202384949e-01, 7.302443385124207e-01, 7.368480563163757e-01, 7.407801151275635e-01, 7.462741136550903e-01, 7.534089684486389e-01, 7.600834369659424e-01, 7.641843557357788e-01, 7.657577395439148e-01, 7.687583565711975e-01, 7.734499573707581e-01, 7.782934904098511e-01, 7.829872369766235e-01, 7.87511944770813e-01, 7.929112911224365e-01, 7.966142892837524e-01, 7.976352572441101e-01, 8.026792407035828e-01, 8.128358721733093e-01, 8.239954113960266e-01, 8.341794610023499e-01, 8.446409106254578e-01, 8.413032293319702e-01, 8.410287499427795e-01, 8.277576565742493e-01, 8.118442893028259e-01, 8.03017795085907e-01, 7.909961342811584e-01, 7.815315127372742e-01, 7.679132223129272e-01, 7.60472297668457e-01, 7.580735683441162e-01, 7.551810145378113e-01, 7.469576001167297e-01, 7.274278998374939e-01, 6.985648274421692e-01, 6.691871881484985e-01, 6.52763843536377e-01, 6.457080245018005e-01, 6.46909773349762e-01, 6.48196816444397e-01, 6.490979194641113e-01, 6.481066942214966e-01, 6.435787081718445e-01, 6.446836590766907e-01, 6.497892737388611e-01, 6.586076021194458e-01, 6.664754152297974e-01, 6.72824501991272e-01, 6.786242723464966e-01, 6.854469180107117e-01, 7.315397262573242e-01, 7.816905379295349e-01, 8.176168203353882e-01, 8.281907439231873e-01, 8.333826661109924e-01, 8.292340636253357e-01, 8.254241347312927e-01, 8.221918940544128e-01, 8.192102313041687e-01]
-zone1.airModel.phi=[6.920243501663208e-01, 6.828522682189941e-01, 6.908682584762573e-01, 6.906660199165344e-01, 6.872920989990234e-01, 6.902993321418762e-01, 7.138498425483704e-01, 7.371947765350342e-01, 7.484429478645325e-01, 7.50770092010498e-01, 7.503276467323303e-01, 7.52566933631897e-01, 7.513190507888794e-01, 7.324008345603943e-01, 6.837195158004761e-01, 6.488237977027893e-01, 6.396947503089905e-01, 6.42486572265625e-01, 6.497238874435425e-01, 6.589250564575195e-01, 6.744592785835266e-01, 6.804909706115723e-01, 6.696169972419739e-01, 6.441464424133301e-01, 6.346299648284912e-01, 6.380473375320435e-01, 6.508324146270752e-01, 6.684905886650085e-01, 6.856938600540161e-01, 7.014093995094299e-01, 7.047704458236694e-01, 6.837446093559265e-01, 6.71125590801239e-01, 6.765611171722412e-01, 6.847921013832092e-01, 6.956057548522949e-01, 7.063582539558411e-01, 7.139362096786499e-01, 7.183325290679932e-01, 7.189833521842957e-01, 7.1840900182724e-01, 7.234711647033691e-01, 7.328154444694519e-01, 7.440564036369324e-01, 7.561153769493103e-01, 7.681138515472412e-01, 7.783352136611938e-01, 7.84909725189209e-01, 7.765890955924988e-01, 7.614458799362183e-01, 7.623934149742126e-01, 7.70704984664917e-01, 7.799498438835144e-01, 7.889701128005981e-01, 7.97390341758728e-01, 8.085986971855164e-01, 8.190625309944153e-01, 8.33320677280426e-01, 8.743141293525696e-01, 9.021058082580566e-01, 9.286037683486938e-01, 9.490792751312256e-01, 9.366925358772278e-01, 9.345054030418396e-01, 9.361032843589783e-01, 8.993551731109619e-01, 8.448733687400818e-01, 8.131793737411499e-01, 8.000479340553284e-01, 7.982574701309204e-01, 7.97357439994812e-01, 7.974737286567688e-01, 7.997568845748901e-01, 7.928491234779358e-01, 7.669156789779663e-01, 7.256379127502441e-01, 7.003223896026611e-01, 6.863623857498169e-01, 6.777593493461609e-01, 6.735265254974365e-01, 6.745032668113708e-01, 6.792100667953491e-01, 6.786834597587585e-01, 6.702389121055603e-01, 6.637668013572693e-01, 6.684563755989075e-01, 6.791540384292603e-01, 6.893067359924316e-01, 7.021089196205139e-01, 7.164458036422729e-01, 7.32753574848175e-01, 7.305527925491333e-01, 7.222737073898315e-01, 7.293556928634644e-01, 7.447224259376526e-01, 7.523428797721863e-01, 7.592635750770569e-01, 7.750154137611389e-01, 7.919338345527649e-01, 8.021607995033264e-01, 8.153865933418274e-01]
+zone1.TSensor=[2.931499938964844e+02, 2.92541748046875e+02, 2.919468383789062e+02, 2.913206787109375e+02, 2.90820556640625e+02, 2.904146423339844e+02, 2.900479125976562e+02, 2.89601318359375e+02, 2.891037902832031e+02, 2.885853881835938e+02, 2.880639953613281e+02, 2.875528259277344e+02, 2.870740356445312e+02, 2.870212097167969e+02, 2.874006042480469e+02, 2.874701538085938e+02, 2.871037902832031e+02, 2.866417236328125e+02, 2.861782531738281e+02, 2.857279357910156e+02, 2.852706604003906e+02, 2.849146423339844e+02, 2.850157470703125e+02, 2.852626647949219e+02, 2.850832214355469e+02, 2.847233581542969e+02, 2.842835998535156e+02, 2.838350219726562e+02, 2.834090270996094e+02, 2.830477905273438e+02, 2.828573913574219e+02, 2.829772338867188e+02, 2.828991088867188e+02, 2.825277404785156e+02, 2.822052917480469e+02, 2.819257202148438e+02, 2.816820678710938e+02, 2.814903869628906e+02, 2.813482666015625e+02, 2.813842468261719e+02, 2.814542846679688e+02, 2.813778991699219e+02, 2.812086791992188e+02, 2.810106811523438e+02, 2.807899169921875e+02, 2.805416870117188e+02, 2.803069458007812e+02, 2.801685180664062e+02, 2.803865966796875e+02, 2.805846252441406e+02, 2.804979248046875e+02, 2.803233947753906e+02, 2.801484375e+02, 2.799849243164062e+02, 2.797523498535156e+02, 2.7960498046875e+02, 2.795936889648438e+02, 2.796568298339844e+02, 2.797039794921875e+02, 2.797449340820312e+02, 2.797828674316406e+02, 2.798381042480469e+02, 2.798691101074219e+02, 2.798134460449219e+02, 2.797567749023438e+02, 2.80079345703125e+02, 2.805574951171875e+02, 2.807327270507812e+02, 2.806481628417969e+02, 2.805018920898438e+02, 2.803193969726562e+02, 2.801084594726562e+02, 2.79911376953125e+02, 2.798323974609375e+02, 2.801946716308594e+02, 2.806660766601562e+02, 2.80710693359375e+02, 2.805126647949219e+02, 2.802711486816406e+02, 2.800227355957031e+02, 2.797549743652344e+02, 2.795021667480469e+02, 2.7943310546875e+02, 2.795518493652344e+02, 2.795258178710938e+02, 2.793240966796875e+02, 2.790618591308594e+02, 2.787767944335938e+02, 2.785822448730469e+02, 2.784092712402344e+02, 2.782895202636719e+02, 2.784523620605469e+02, 2.787283020019531e+02, 2.788526611328125e+02, 2.788786010742188e+02, 2.788584289550781e+02, 2.788239135742188e+02, 2.787731323242188e+02, 2.787173767089844e+02, 2.787529907226562e+02, 2.7889990234375e+02]
+zone.TSensor=[2.931499938964844e+02, 2.928238525390625e+02, 2.923810119628906e+02, 2.919231872558594e+02, 2.914851989746094e+02, 2.910855712890625e+02, 2.905766296386719e+02, 2.901065368652344e+02, 2.896258239746094e+02, 2.891802978515625e+02, 2.887806091308594e+02, 2.884016723632812e+02, 2.879998474121094e+02, 2.876358337402344e+02, 2.872998657226562e+02, 2.870097351074219e+02, 2.867450866699219e+02, 2.864555053710938e+02, 2.861566772460938e+02, 2.858648376464844e+02, 2.855794982910156e+02, 2.852584533691406e+02, 2.850166015625e+02, 2.847960815429688e+02, 2.845765075683594e+02, 2.8435986328125e+02, 2.841419067382812e+02, 2.8391357421875e+02, 2.836560668945312e+02, 2.833845825195312e+02, 2.831150817871094e+02, 2.82877685546875e+02, 2.827144165039062e+02, 2.826089477539062e+02, 2.824179077148438e+02, 2.822220458984375e+02, 2.820503234863281e+02, 2.818960266113281e+02, 2.8173046875e+02, 2.8164892578125e+02, 2.815836486816406e+02, 2.815293884277344e+02, 2.814411926269531e+02, 2.813108520507812e+02, 2.811683654785156e+02, 2.81071044921875e+02, 2.809373168945312e+02, 2.80807373046875e+02, 2.8071826171875e+02, 2.806842041015625e+02, 2.806155090332031e+02, 2.805210266113281e+02, 2.804273376464844e+02, 2.803385314941406e+02, 2.802382202148438e+02, 2.801276245117188e+02, 2.80062255859375e+02, 2.800594482421875e+02, 2.800762939453125e+02, 2.800965270996094e+02, 2.801173400878906e+02, 2.801540222167969e+02, 2.802092895507812e+02, 2.801986694335938e+02, 2.801482543945312e+02, 2.801368408203125e+02, 2.801799926757812e+02, 2.801573181152344e+02, 2.801026000976562e+02, 2.800565490722656e+02, 2.799843139648438e+02, 2.798719177246094e+02, 2.797975769042969e+02, 2.79649658203125e+02, 2.79644287109375e+02, 2.796615905761719e+02, 2.796391906738281e+02, 2.795519409179688e+02, 2.794564514160156e+02, 2.793768920898438e+02, 2.793042297363281e+02, 2.791853637695312e+02, 2.791047668457031e+02, 2.790943603515625e+02, 2.790881652832031e+02, 2.790386962890625e+02, 2.789476318359375e+02, 2.788377990722656e+02, 2.787311401367188e+02, 2.786352844238281e+02, 2.785603942871094e+02, 2.785428161621094e+02, 2.786457214355469e+02, 2.787208251953125e+02, 2.787575378417969e+02, 2.787719421386719e+02, 2.787802734375e+02, 2.787811279296875e+02, 2.787765502929688e+02, 2.787659301757812e+02, 2.787956848144531e+02]
+zone.airModel.phi=[6.920209527015686e-01, 6.93135678768158e-01, 7.020993828773499e-01, 7.036702036857605e-01, 6.997281908988953e-01, 7.033212780952454e-01, 6.759542226791382e-01, 6.090021133422852e-01, 5.207710862159729e-01, 4.647369980812073e-01, 4.259979426860809e-01, 4.117811322212219e-01, 4.023879766464233e-01, 4.084990322589874e-01, 4.172874987125397e-01, 4.199861586093903e-01, 4.260756075382233e-01, 4.325954616069794e-01, 4.429129958152771e-01, 4.526368677616119e-01, 4.622751474380493e-01, 4.773323237895966e-01, 4.912079572677612e-01, 5.04034698009491e-01, 5.114661455154419e-01, 5.196136236190796e-01, 5.222505331039429e-01, 5.288160443305969e-01, 5.378671288490295e-01, 5.508870482444763e-01, 5.767918229103088e-01, 5.638676285743713e-01, 5.456739068031311e-01, 5.426390171051025e-01, 5.506312847137451e-01, 5.640624761581421e-01, 5.79599142074585e-01, 6.146442890167236e-01, 6.964432001113892e-01, 7.492691874504089e-01, 7.799514532089233e-01, 7.878127694129944e-01, 7.884203791618347e-01, 7.855840921401978e-01, 7.746062278747559e-01, 7.739033699035645e-01, 7.80462920665741e-01, 7.864931225776672e-01, 7.871080636978149e-01, 7.861106991767883e-01, 7.877402901649475e-01, 7.913945317268372e-01, 7.951899170875549e-01, 7.990517020225525e-01, 8.015459179878235e-01, 8.048126101493835e-01, 8.079443573951721e-01, 8.122698664665222e-01, 8.407384157180786e-01, 8.767176866531372e-01, 9.051060080528259e-01, 9.296218752861023e-01, 9.289816617965698e-01, 9.026600122451782e-01, 8.86502742767334e-01, 8.271357417106628e-01, 7.942579984664917e-01, 7.878656387329102e-01, 7.713983654975891e-01, 7.540320754051208e-01, 7.261433601379395e-01, 7.210148572921753e-01, 7.233579158782959e-01, 7.317886352539062e-01, 7.215743660926819e-01, 6.893965601921082e-01, 6.440913081169128e-01, 6.057714819908142e-01, 5.992171168327332e-01, 6.055210828781128e-01, 6.072995066642761e-01, 6.127851009368896e-01, 6.181312799453735e-01, 6.16887629032135e-01, 6.059359908103943e-01, 6.055052280426025e-01, 6.093716621398926e-01, 6.180635094642639e-01, 6.29380464553833e-01, 6.390762329101562e-01, 6.501946449279785e-01, 6.730166077613831e-01, 8.108062148094177e-01, 9.102718830108643e-01, 9.546781778335571e-01, 9.646012783050537e-01, 9.617045521736145e-01, 9.539431929588318e-01, 9.469942450523376e-01, 9.357873201370239e-01, 9.24174964427948e-01]
+zone1.airModel.phi=[6.920209527015686e-01, 6.379501819610596e-01, 6.196626424789429e-01, 5.904563069343567e-01, 5.667068362236023e-01, 5.61394214630127e-01, 6.11766517162323e-01, 6.420011520385742e-01, 6.149278283119202e-01, 5.711559057235718e-01, 5.341481566429138e-01, 5.124272704124451e-01, 4.937307238578796e-01, 4.717724025249481e-01, 4.407075643539429e-01, 4.243422746658325e-01, 4.262641668319702e-01, 4.352933466434479e-01, 4.467834532260895e-01, 4.59293931722641e-01, 4.732514321804047e-01, 4.855339825153351e-01, 4.865491688251495e-01, 4.812310636043549e-01, 4.879502058029175e-01, 5.010138154029846e-01, 5.159438252449036e-01, 5.316625833511353e-01, 5.47027587890625e-01, 5.603951811790466e-01, 5.720980167388916e-01, 5.693243145942688e-01, 5.617870688438416e-01, 5.675468444824219e-01, 5.77435314655304e-01, 5.913846492767334e-01, 6.0595703125e-01, 6.154034733772278e-01, 6.47503674030304e-01, 6.866524815559387e-01, 7.219480276107788e-01, 7.444203495979309e-01, 7.622503042221069e-01, 7.79704749584198e-01, 7.93414294719696e-01, 8.03134560585022e-01, 8.069757223129272e-01, 8.06729793548584e-01, 7.963200807571411e-01, 7.743493318557739e-01, 7.712490558624268e-01, 7.784522175788879e-01, 7.875924706459045e-01, 7.965591549873352e-01, 7.996034026145935e-01, 8.152868747711182e-01, 8.389966487884521e-01, 8.761551976203918e-01, 9.534496665000916e-01, 9.82323169708252e-01, 1.01438570022583e+00, 1.043608903884888e+00, 1.012682437896729e+00, 9.938395023345947e-01, 9.811246991157532e-01, 8.999398350715637e-01, 8.130817413330078e-01, 7.759407162666321e-01, 7.595207095146179e-01, 7.534307837486267e-01, 7.435310482978821e-01, 7.336528301239014e-01, 7.328835725784302e-01, 7.29662299156189e-01, 7.084329724311829e-01, 6.722261905670166e-01, 6.354666352272034e-01, 6.035203337669373e-01, 5.872130393981934e-01, 5.856589078903198e-01, 5.930854678153992e-01, 6.011964678764343e-01, 6.045432090759277e-01, 6.009278297424316e-01, 5.953071117401123e-01, 5.994234085083008e-01, 6.140156388282776e-01, 6.455670595169067e-01, 6.765406131744385e-01, 7.050857543945312e-01, 7.405527830123901e-01, 7.382432818412781e-01, 7.37743079662323e-01, 7.973827719688416e-01, 8.556099534034729e-01, 8.759859204292297e-01, 8.920528888702393e-01, 9.051824808120728e-01, 9.116382002830505e-01, 8.955357074737549e-01, 9.015911221504211e-01]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Examples_ZoneWithSources.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Examples_ZoneWithSources.txt
new file mode 100644
index 0000000000..1d95665a86
--- /dev/null
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Examples_ZoneWithSources.txt
@@ -0,0 +1,17 @@
+last-generated=2023-10-23
+statistics-initialization=
+{
+  "nonlinear": "7",
+  "numerical Jacobians": "0"
+}
+statistics-simulation=
+{
+  "linear": "0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0",
+  "nonlinear": "1",
+  "number of continuous time states": "34",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 1e+05]
+zone.phi=[6.920281648635864e-01, 8.936625719070435e-01, 8.980380892753601e-01, 7.404765486717224e-01, 7.47746467590332e-01, 8.698103427886963e-01, 8.022670745849609e-01, 6.904754638671874e-01, 8.111217617988586e-01, 9.199087619781494e-01, 7.642720341682434e-01, 7.284107804298401e-01, 8.782082796096802e-01, 8.564345836639404e-01, 7.150739431381223e-01, 7.831100225448608e-01, 9.025760889053345e-01, 7.795826196670532e-01, 6.703190207481384e-01, 8.419638276100159e-01, 8.860036730766296e-01, 7.319273352622986e-01, 7.531827688217163e-01, 8.96027684211731e-01, 8.220463395118713e-01, 6.975732445716858e-01, 8.322925567626953e-01, 9.532004594802856e-01, 7.809040546417232e-01, 7.417629361152641e-01, 9.094092845916748e-01, 8.936424255371094e-01, 7.498011589050293e-01, 8.336911201477051e-01, 9.680477976799011e-01, 8.343870639801025e-01, 7.163875102996826e-01, 9.036638140678406e-01, 9.541295170783997e-01, 7.934482097625732e-01, 8.220661282539368e-01, 9.798967242240906e-01, 9.058496356010437e-01, 7.78039813041687e-01, 9.250069856643677e-01, 1.056650400161743e+00, 8.782552480697632e-01, 8.406873345375061e-01, 1.021425604820251e+00, 1.009944200515747e+00, 8.647173643112183e-01, 9.591692686080933e-01, 1.108185768127441e+00, 9.767794609069824e-01, 8.602568507194519e-01, 1.062148690223695e+00, 1.118724465370177e+00, 9.519877433776865e-01, 9.814884066581711e-01, 1.143873572349548e+00, 1.058340668678284e+00, 9.091445803642273e-01, 1.047892332077026e+00, 1.171280026435852e+00, 9.664226174354553e-01, 9.110651612281799e-01, 1.087196588516235e+00, 1.057358264923096e+00, 8.823985457420349e-01, 9.634761214256287e-01, 1.102740406990051e+00, 9.383018016815186e-01, 7.896915674209595e-01, 9.916803240776062e-01, 1.043615579605103e+00, 8.536068201065063e-01, 8.803049325942993e-01, 1.055731892585754e+00, 9.595397710800171e-01, 8.000049591064453e-01, 9.623390436172485e-01, 1.106472015380859e+00, 8.854146003723145e-01, 8.295660614967346e-01, 1.031178116798401e+00, 1.004669904708862e+00, 8.181602358818054e-01, 9.164129495620728e-01, 1.079178094863892e+00, 9.05985414981842e-01, 7.510930299758911e-01, 9.802011251449585e-01, 1.034974575042725e+00, 8.19908082485199e-01, 8.440647721290588e-01, 1.033660292625427e+00, 9.291709065437317e-01, 7.574803829193115e-01, 9.381123185157776e-01, 1.099662303924561e+00, 8.649568557739258e-01]
+zone.TSensor=[2.931499938964844e+02, 2.91441650390625e+02, 2.910733947753906e+02, 2.908383178710938e+02, 2.906797790527344e+02, 2.905310363769531e+02, 2.903650817871094e+02, 2.902267761230469e+02, 2.901231689453125e+02, 2.899968566894531e+02, 2.898415222167969e+02, 2.897307434082031e+02, 2.896333312988281e+02, 2.895128479003906e+02, 2.894080200195312e+02, 2.893318481445312e+02, 2.892355346679688e+02, 2.89109130859375e+02, 2.890072937011719e+02, 2.889382019042969e+02, 2.88829833984375e+02, 2.887198791503906e+02, 2.886460266113281e+02, 2.88561279296875e+02, 2.884446105957031e+02, 2.883484802246094e+02, 2.882855529785156e+02, 2.881989135742188e+02, 2.880801086425781e+02, 2.880039367675781e+02, 2.87932861328125e+02, 2.878281555175781e+02, 2.877474060058594e+02, 2.877306823730469e+02, 2.877218322753906e+02, 2.876847534179688e+02, 2.876630554199219e+02, 2.876675415039062e+02, 2.876222534179688e+02, 2.875639038085938e+02, 2.875169677734375e+02, 2.874617919921875e+02, 2.873760681152344e+02, 2.873098449707031e+02, 2.872737121582031e+02, 2.872122192382812e+02, 2.871198120117188e+02, 2.870733032226562e+02, 2.870314636230469e+02, 2.869522399902344e+02, 2.868860778808594e+02, 2.868564453125e+02, 2.868093566894531e+02, 2.867327270507812e+02, 2.866833801269531e+02, 2.866687927246094e+02, 2.866131896972656e+02, 2.865534973144531e+02, 2.865283508300781e+02, 2.864679565429688e+02, 2.863465881347656e+02, 2.862420043945312e+02, 2.861904907226562e+02, 2.861287231445312e+02, 2.860374450683594e+02, 2.859861755371094e+02, 2.859284362792969e+02, 2.858233642578125e+02, 2.857271118164062e+02, 2.856701965332031e+02, 2.85598876953125e+02, 2.8549560546875e+02, 2.854172058105469e+02, 2.853621520996094e+02, 2.852408752441406e+02, 2.851086120605469e+02, 2.850301513671875e+02, 2.849592895507812e+02, 2.848619995117188e+02, 2.847873229980469e+02, 2.847425537109375e+02, 2.846688537597656e+02, 2.845580749511719e+02, 2.844914855957031e+02, 2.844266662597656e+02, 2.843187255859375e+02, 2.842222290039062e+02, 2.841666564941406e+02, 2.841013488769531e+02, 2.840088195800781e+02, 2.839432983398438e+02, 2.839071655273438e+02, 2.838202209472656e+02, 2.837271118164062e+02, 2.836769714355469e+02, 2.836184997558594e+02, 2.835249633789062e+02, 2.834547424316406e+02, 2.834218139648438e+02, 2.833621215820312e+02, 2.832649230957031e+02]
+zone.ppm=[4e+02, 2.013668823242188e+03, 2.541400634765625e+03, 1.628641357421875e+03, 1.859295288085938e+03, 2.850941162109375e+03, 2.34676611328125e+03, 1.51696923828125e+03, 2.399267578125e+03, 3.160751708984375e+03, 1.98399951171875e+03, 1.706935302734375e+03, 2.763529541015625e+03, 2.61539306640625e+03, 1.671092773437499e+03, 2.202438232421875e+03, 3.04781982421875e+03, 2.174468505859375e+03, 1.4181083984375e+03, 2.5978095703125e+03, 2.876562744140625e+03, 1.820940795898438e+03, 1.96962890625e+03, 2.914245849609375e+03, 2.383087890625e+03, 1.53780908203125e+03, 2.411225830078125e+03, 3.167612060546875e+03, 1.987936767578122e+03, 1.709196289062495e+03, 2.764825927734375e+03, 2.616137451171875e+03, 1.671519653320312e+03, 2.202681640625e+03, 3.04795947265625e+03, 2.17453955078125e+03, 1.418150268554688e+03, 2.597833251953125e+03, 2.876572509765625e+03, 1.820942016601562e+03, 1.969624389648438e+03, 2.91424658203125e+03, 2.383083251953125e+03, 1.537802001953125e+03, 2.411221923828125e+03, 3.16761083984375e+03, 1.987935180664062e+03, 1.709197509765625e+03, 2.76482373046875e+03, 2.616138916015625e+03, 1.6715234375e+03, 2.202684326171875e+03, 3.0479619140625e+03, 2.1745478515625e+03, 1.418156860351562e+03, 2.597836914062506e+03, 2.876574951171865e+03, 1.820941894531256e+03, 1.969630737304678e+03, 2.914246337890625e+03, 2.383087646484375e+03, 1.537806640625e+03, 2.411224609375e+03, 3.167607666015625e+03, 1.987929443359375e+03, 1.709192138671875e+03, 2.764816650390625e+03, 2.616134033203125e+03, 1.671517333984375e+03, 2.2026796875e+03, 3.047958984375e+03, 2.1745439453125e+03, 1.41815380859375e+03, 2.597830322265625e+03, 2.876573974609375e+03, 1.820943359375e+03, 1.969630981445312e+03, 2.914243896484375e+03, 2.38308447265625e+03, 1.537804809570312e+03, 2.41122265625e+03, 3.167611083984375e+03, 1.987931030273438e+03, 1.709193359375e+03, 2.764819091796875e+03, 2.616137939453125e+03, 1.671519653320312e+03, 2.2026806640625e+03, 3.04796044921875e+03, 2.174542724609375e+03, 1.418154541015625e+03, 2.597837158203125e+03, 2.8765751953125e+03, 1.820942260742188e+03, 1.969630737304688e+03, 2.91424560546875e+03, 2.383087646484375e+03, 1.537807006835938e+03, 2.411223388671875e+03, 3.167612060546875e+03, 1.98793212890625e+03]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Validation_Tests_EnergyConservationValidation.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Validation_Tests_EnergyConservationValidation.txt
index 51fa0f7e71..44cb0fe721 100644
--- a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Validation_Tests_EnergyConservationValidation.txt
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Validation_Tests_EnergyConservationValidation.txt
@@ -1,4 +1,4 @@
-last-generated=2024-10-29
+last-generated=2024-12-03
 statistics-simulation=
 {
   "linear": "0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0",
@@ -7,4 +7,4 @@ statistics-simulation=
   "numerical Jacobians": "0"
 }
 time=[0e+00, 5e+06]
-sim.Qgai.Q_flow=[-2.1608162109375e+04, -5.789797973632812e+02, -6.855635375976562e+02, -5.305656127929688e+02, -4.478626403808594e+02, -5.958802490234375e+02, 3.385300903320312e+02, -3.256716308593742e+02, -2.992178649902344e+02, -2.601005859375e+02, -2.347081604003906e+02, -5.932051849365234e+01, 6.344309234619141e+01, 4.343632507324219e+02, -3.369846496582013e+02, -5.029036865234375e+02, -2.700015258789062e+02, -2.825492858886714e+02, 3.164777526855469e+02, -1.596900463104248e+01, 2.97398853302002e+01, 1.007755126953125e+02, 1.840629730224609e+02, -1.050754241943359e+02, -2.583647155761719e+02, 7.6012451171875e+02, -6.00819206237793e+01, -1.481606292724609e+02, -1.007116699218757e+02, -4.781516723632812e+02, 2.08485595703125e+02, -4.689908142089844e+02, 1.126690673828125e+03, -5.228682861328125e+02, -7.190706787109299e+02, -4.150263977050781e+02, -4.542318420410156e+02, -9.332122802734375e+01, -1.943986358642578e+02, 4.689587097167969e+02, -2.068251037597656e+02, -2.096918182373106e+02, -8.309522247314453e+01, 1.011955642700195e+02, 4.066315612792969e+02, 2.156721801757812e+02, -4.008085250854492e+01, 2.047609519958496e+01, -5.357101440429688e+01, 2.805241394042969e+02, -2.742185363769531e+02, 8.436524200439453e+01, -4.1937353515625e+02, -5.55220947265625e+02, 3.276069641113281e+02, 1.858350830078125e+02, 1.674509582519533e+02, -8.729992675781421e+01, 2.625489807128906e+02, -2.204503479003906e+02, -1.319042510986328e+02, 1.474738311767578e+02, 2.071198654174805e+01, 1.424358673095703e+02, 7.396396636962891e+01, 1.153817520141602e+02, -3.335150527954102e+01, -2.794346618652344e+01, -1.17874183654792e+02, -2.51200866699216e+02, 4.366451721191406e+02, -2.345491485595703e+02, -5.414119873046875e+02, -2.127656555175781e+02, -3.973984680175781e+02, 4.354295654296875e+02, -2.288591156005859e+02, 3.231215209960938e+02, -1.548631591796875e+02, -7.020730590820312e+02, -3.84541015625e+02, -4.748434448242185e+02, 1.536105468749976e+03, -2.301994781494141e+02, -3.487812194824219e+02, -2.120375823974609e+02, -2.031172637939453e+02, 1.644438934326172e+02, 2.063049621582031e+02, 4.288848266601562e+02, 6.30833740234375e+01, -1.89173095703125e+02, -2.958744812011719e+02, -3.80747802734375e+02, 8.842011108398438e+02, -6.253258056640625e+02, 6.220889892578125e+02, -3.797797546386719e+02, -4.640577697753906e+02, -1.722315826416016e+02, -4.01463134765625e+02]
+sim.Qgai.Q_flow=[-2.1608205078125e+04, -5.79138916015625e+02, -6.8570458984375e+02, -5.305924682617188e+02, -4.47918212890625e+02, -5.959075927734375e+02, 3.386192932128906e+02, -3.255955200195305e+02, -2.992395935058594e+02, -2.600789184570312e+02, -2.346949310302734e+02, -5.910554122924805e+01, 6.331652450561523e+01, 4.349131774902344e+02, -3.369971923828107e+02, -5.028463439941406e+02, -2.699374694824219e+02, -2.825955200195307e+02, 3.164438781738281e+02, -1.593221855163574e+01, 2.976176643371582e+01, 1.007901763916016e+02, 1.841197052001953e+02, -1.050200119018555e+02, -2.584303894042969e+02, 7.602517700195312e+02, -6.007204437255859e+01, -1.481463470458984e+02, -1.007743225097663e+02, -4.78249755859375e+02, 2.082814025878906e+02, -4.68964111328125e+02, 1.1270283203125e+03, -5.23068359375e+02, -7.192152709960861e+02, -4.149082946777344e+02, -4.550202026367188e+02, -9.324655914306641e+01, -1.943041381835938e+02, 4.687711791992188e+02, -2.068866729736328e+02, -2.097785186767637e+02, -8.308692169189453e+01, 1.013663940429688e+02, 4.068848266601562e+02, 2.157801055908203e+02, -4.011146545410156e+01, 2.044625282287598e+01, -5.354515075683594e+01, 2.804994201660156e+02, -2.744164428710938e+02, 8.425340270996094e+01, -4.194351806640625e+02, -5.553380126953125e+02, 3.284554138183594e+02, 1.859154510498047e+02, 1.674899749755861e+02, -8.739493560791185e+01, 2.626167602539062e+02, -2.208419494628906e+02, -1.318844604492188e+02, 1.474424133300781e+02, 2.058977317810059e+01, 1.426952362060547e+02, 7.400039672851562e+01, 1.160879745483398e+02, -3.32797966003418e+01, -2.773342132568359e+01, -1.170241165161202e+02, -2.513390350341769e+02, 4.368333129882812e+02, -2.346597595214844e+02, -5.417007446289062e+02, -2.128026275634766e+02, -3.976040344238281e+02, 4.355499267578125e+02, -2.289246978759766e+02, 3.229099731445312e+02, -1.549765319824219e+02, -7.022692260742188e+02, -3.845693359375e+02, -4.749623413085935e+02, 1.536267822265601e+03, -2.302461090087891e+02, -3.488357543945312e+02, -2.119725341796875e+02, -2.032692413330078e+02, 1.648345794677734e+02, 2.058068695068359e+02, 4.2916748046875e+02, 6.303401947021484e+01, -1.892865295410156e+02, -2.959634399414062e+02, -3.807427673339844e+02, 8.843436279296875e+02, -6.254176025390625e+02, 6.222653198242188e+02, -3.80153076171875e+02, -4.641961059570312e+02, -1.724091796875e+02, -4.015645751953125e+02]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Validation_Tests_n50Test.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Validation_Tests_n50Test.txt
index d74fea521a..d815ef13c5 100644
--- a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Validation_Tests_n50Test.txt
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Validation_Tests_n50Test.txt
@@ -1,4 +1,4 @@
-last-generated=2023-05-02
+last-generated=2024-10-30
 statistics-initialization=
 {
   "nonlinear": "7",
@@ -6,10 +6,10 @@ statistics-initialization=
 }
 statistics-simulation=
 {
-  "linear": "0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0",
+  "linear": "0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0",
   "nonlinear": "1",
-  "number of continuous time states": "37",
+  "number of continuous time states": "36",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 3e+00]
-ach=[-2.314814784298846e-09, -2.314814784298846e-09, -2.314814784298846e-09, -2.314814784298846e-09, -2.314814784298846e-09, -2.314814784298846e-09, -2.314814784298846e-09, -2.314814784298846e-09, -2.314814784298846e-09, -2.314814784298846e-09, -2.314814784298846e-09, -2.314814784298846e-09, -2.314814784298846e-09, -2.314814784298846e-09, -2.314814784298846e-09, -2.314814784298846e-09, -2.314814784298846e-09, -2.314814784298846e-09, -2.314814784298846e-09, -2.314814784298846e-09, -2.314814784298846e-09, -2.314814784298846e-09, -2.314814784298846e-09, -2.314814784298846e-09, -2.314814784298846e-09, -2.314814784298846e-09, -2.314814784298846e-09, -2.314814784298846e-09, -2.314814784298846e-09, -2.314814784298846e-09, -2.314814784298846e-09, -2.314814784298846e-09, -2.314814784298846e-09, -2.314814784298846e-09, 2.359342628544526e-01, 4.280081309373993e-01, 5.809377166843187e-01, 7.145398841345806e-01, 8.358041003028364e-01, 9.482287522869779e-01, 1.053878858408148e+00, 1.154102382151736e+00, 1.249838620301016e+00, 1.341775889267823e+00, 1.430436815897005e+00, 1.516231350317807e+00, 1.599486602441899e+00, 1.680470078475409e+00, 1.759403556518142e+00, 1.836474226603568e+00, 1.911840915679932e+00, 1.985640356933086e+00, 2.05799116425983e+00, 2.128997009049669e+00, 2.198750008062993e+00, 2.267331177321658e+00, 2.334812758026125e+00, 2.401259815155735e+00, 2.466731527616571e+00, 2.531280319859907e+00, 2.594954591065344e+00, 2.657798200815308e+00, 2.719851702811617e+00, 2.781152277404342e+00, 2.841733541722272e+00, 2.901626968978746e+00, 2.960862122232315e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00]
+ach=[2.391827846892625e-09, 2.391827846892625e-09, 2.391827846892625e-09, 2.391827846892625e-09, 2.391827846892625e-09, 2.391827846892625e-09, 2.391827846892625e-09, 2.391827846892625e-09, 2.391827846892625e-09, 2.391827846892625e-09, 2.391827846892625e-09, 2.391827846892625e-09, 2.391827846892625e-09, 2.391827846892625e-09, 2.391827846892625e-09, 2.391827846892625e-09, 2.391827846892625e-09, 2.391827846892625e-09, 2.391827846892625e-09, 2.391827846892625e-09, 2.391827846892625e-09, 2.391827846892625e-09, 2.391827846892625e-09, 2.391827846892625e-09, 2.391827846892625e-09, 2.391827846892625e-09, 2.391827846892625e-09, 2.391827846892625e-09, 2.391827846892625e-09, 2.391827846892625e-09, 2.391827846892625e-09, 2.391827846892625e-09, 2.391827846892625e-09, 2.391827846892625e-09, 2.359342628545474e-01, 4.280081309373993e-01, 5.809377166843187e-01, 7.145398841345806e-01, 8.358041003028364e-01, 9.482287522869779e-01, 1.053878858408148e+00, 1.154102382151736e+00, 1.249838620301206e+00, 1.341775889267823e+00, 1.430436815897005e+00, 1.516231350318281e+00, 1.599486602441899e+00, 1.680470078475409e+00, 1.759403556518142e+00, 1.836474226603568e+00, 1.911840915679932e+00, 1.985640356933086e+00, 2.05799116425983e+00, 2.128997009049669e+00, 2.198750008062993e+00, 2.267331177321658e+00, 2.334812758026125e+00, 2.401259815155735e+00, 2.466731527616571e+00, 2.531280319859907e+00, 2.594954591065344e+00, 2.657798200815308e+00, 2.719851702811617e+00, 2.781152277404342e+00, 2.841733541722272e+00, 2.901626968978746e+00, 2.960862122232315e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Validation_Tests_n50Test2.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Validation_Tests_n50Test2.txt
index 1340325071..a7c8d10543 100644
--- a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Validation_Tests_n50Test2.txt
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Validation_Tests_n50Test2.txt
@@ -1,11 +1,11 @@
-last-generated=2023-05-02
+last-generated=2024-12-03
 statistics-simulation=
 {
-  "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0",
+  "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0",
   "nonlinear": "1",
-  "number of continuous time states": "48",
+  "number of continuous time states": "46",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 3e+00]
-ach=[-6.944444574941144e-09, -6.944444574941144e-09, -6.944444574941144e-09, -6.944444574941144e-09, -6.944444574941144e-09, -6.944444574941144e-09, -6.944444574941144e-09, -6.944444574941144e-09, -6.944444574941144e-09, -6.944444574941144e-09, -6.944444574941144e-09, -6.944444574941144e-09, -6.944444574941144e-09, -6.944444574941144e-09, -6.944444574941144e-09, -6.944444574941144e-09, -6.944444574941144e-09, -6.944444574941144e-09, -6.944444574941144e-09, -6.944444574941144e-09, -6.944444574941144e-09, -6.944444574941144e-09, -6.944444574941144e-09, -6.944444574941144e-09, -6.944444574941144e-09, -6.944444574941144e-09, -6.944444574941144e-09, -6.944444574941144e-09, -6.944444574941144e-09, -6.944444574941144e-09, -6.944444574941144e-09, -6.944444574941144e-09, -6.944444574941144e-09, -6.944444574941144e-09, 2.359342479533388e-01, 4.280081309373993e-01, 5.809377166843187e-01, 7.145398841345806e-01, 8.358041003026943e-01, 9.482287522869779e-01, 1.053878858408148e+00, 1.154102382151736e+00, 1.249838620301016e+00, 1.341775889267823e+00, 1.430436815897005e+00, 1.516231350317807e+00, 1.599486602441899e+00, 1.680470078475409e+00, 1.759403556518142e+00, 1.836474226603568e+00, 1.911840915679932e+00, 1.985640356933086e+00, 2.05799116425983e+00, 2.128997009049669e+00, 2.198750008062993e+00, 2.267331177321658e+00, 2.334812758026125e+00, 2.401259815155735e+00, 2.466731527616571e+00, 2.531280319859907e+00, 2.594954591065344e+00, 2.657798200815308e+00, 2.719851702811617e+00, 2.781152277404342e+00, 2.841733541722272e+00, 2.901626968978746e+00, 2.960862122232315e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00]
+ach=[6.920798600873468e-09, 6.920798600873468e-09, 6.920798600873468e-09, 6.920798600873468e-09, 6.920798600873468e-09, 6.920798600873468e-09, 6.920798600873468e-09, 6.920798600873468e-09, 6.920798600873468e-09, 6.920798600873468e-09, 6.920798600873468e-09, 6.920798600873468e-09, 6.920798600873468e-09, 6.920798600873468e-09, 6.920798600873468e-09, 6.920798600873468e-09, 6.920798600873468e-09, 6.920798600873468e-09, 6.920798600873468e-09, 6.920798600873468e-09, 6.920798600873468e-09, 6.920798600873468e-09, 6.920798600873468e-09, 6.920798600873468e-09, 6.920798600873468e-09, 6.920798600873468e-09, 6.920798600873468e-09, 6.920798600873468e-09, 6.920798600873468e-09, 6.920798600873468e-09, 6.920798600873468e-09, 6.920798600873468e-09, 6.920798600873468e-09, 6.920798600873468e-09, 2.359342628545474e-01, 4.280081309373993e-01, 5.809377762885372e-01, 7.145398841345806e-01, 8.358041003028364e-01, 9.482287522869779e-01, 1.053878858408148e+00, 1.154102382151736e+00, 1.249838620301206e+00, 1.341775889267823e+00, 1.430436815897005e+00, 1.516231350318281e+00, 1.599486602441899e+00, 1.680470078475409e+00, 1.759403556518142e+00, 1.836474226604137e+00, 1.911840915679932e+00, 1.985640356933086e+00, 2.05799116425983e+00, 2.128997009049669e+00, 2.198750008063183e+00, 2.267331177321658e+00, 2.334812758026125e+00, 2.401259815155735e+00, 2.466731527616571e+00, 2.531280319859907e+00, 2.594954591065344e+00, 2.657798200815308e+00, 2.719851941229627e+00, 2.781152277404342e+00, 2.841733541722272e+00, 2.901626968978746e+00, 2.960862122232315e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00]
 ach1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 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.572895085696509e-01, 2.853387539582662e-01, 3.872918309908809e-01, 4.763599227563871e-01, 5.572027335351769e-01, 6.321524816567212e-01, 7.025858857375326e-01, 7.694015682330052e-01, 8.332257468674071e-01, 8.94517259511756e-01, 9.536245637993779e-01, 1.01082093994838e+00, 1.066324361891566e+00, 1.120313345914064e+00, 1.172935624872947e+00, 1.224316190805665e+00, 1.274560570716858e+00, 1.323760198219719e+00, 1.371994109506932e+00, 1.419331379102655e+00, 1.465833298972327e+00, 1.511554038742053e+00, 1.556541878420513e+00, 1.600839916507173e+00, 1.644487605604791e+00, 1.687520173503761e+00, 1.729969687641098e+00, 1.771865427474059e+00, 1.813234548013748e+00, 1.854101438796796e+00, 1.894488988079271e+00, 1.934418019056226e+00, 1.973908160960817e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Validation_Tests_n50Test2TwoPort.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Validation_Tests_n50Test2TwoPort.txt
new file mode 100644
index 0000000000..af2980df1b
--- /dev/null
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Validation_Tests_n50Test2TwoPort.txt
@@ -0,0 +1,11 @@
+last-generated=2024-10-30
+statistics-simulation=
+{
+  "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0",
+  "nonlinear": "1",
+  "number of continuous time states": "51",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 3e+00]
+ach=[3.460399256027813e-08, 3.460399611299181e-08, 3.460399966570549e-08, 3.460400321841917e-08, 3.460401032384652e-08, 3.460401387655668e-08, 3.460401742926965e-08, 3.460402098198756e-08, 3.460402453470124e-08, 3.460402808741492e-08, 3.46040316401286e-08, 3.460403519284228e-08, 3.460404229826116e-08, 3.460404585098331e-08, 3.460404940369699e-08, 3.460405295641067e-08, 3.460405650912435e-08, 3.460406006184367e-08, 3.460406716725268e-08, 3.460407071997906e-08, 3.460407427267863e-08, 3.460407782540642e-08, 3.46040813781201e-08, 3.460408493083378e-08, 3.460408848354746e-08, 3.460409558897481e-08, 3.460409914168849e-08, 3.460410269440217e-08, 3.460410624711585e-08, 3.460410979982953e-08, 3.460411335255732e-08, 3.460411690525689e-08, 3.460412401068425e-08, 3.460412756339792e-08, 2.359342926568697e-01, 4.280081607397216e-01, 5.809377762889635e-01, 7.145398841345806e-01, 8.35804159907339e-01, 9.482288118911963e-01, 1.053878858408148e+00, 1.154102382151736e+00, 1.249838620301206e+00, 1.341775889267823e+00, 1.430436935105252e+00, 1.516231350318281e+00, 1.599486602441994e+00, 1.680470078476072e+00, 1.759403556518142e+00, 1.836474345812858e+00, 1.911841034889221e+00, 1.985640356934223e+00, 2.05799116425983e+00, 2.128997009049669e+00, 2.198750008063183e+00, 2.267331177321658e+00, 2.334812758026125e+00, 2.401259815155735e+00, 2.466731527616571e+00, 2.531280319859907e+00, 2.594954591065344e+00, 2.657798200815308e+00, 2.719851941229627e+00, 2.781152277404342e+00, 2.841733541722272e+00, 2.901626968980641e+00, 2.960862360650137e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00]
+ach1=[3.460399256027813e-08, 3.45928548025842e-08, 3.458032793415235e-08, 3.456919373062437e-08, 3.455805952450235e-08, 3.454692176912536e-08, 3.45357875647327e-08, 3.45232606915974e-08, 3.451073027225398e-08, 3.449959607380712e-08, 3.448846186968409e-08, 3.447593145214308e-08, 3.446618990542518e-08, 3.4453663030353e-08, 3.444252882291668e-08, 3.442999840509896e-08, 3.441886419820897e-08, 3.440772999409298e-08, 3.439519958733606e-08, 3.438406537104547e-08, 3.437293117355609e-08, 3.43617934084425e-08, 3.434926654830911e-08, 3.433813233644566e-08, 3.432560548238544e-08, 3.431446771173796e-08, 3.430333349378722e-08, 3.429219930295123e-08, 3.42782797641184e-08, 3.426714201503625e-08, 3.425600779708548e-08, 3.424487005243045e-08, 3.423234317737099e-08, 3.422120897988304e-08, 1.572846954917431e-01, 2.853299920702736e-01, 3.872799398685114e-01, 4.763452600150513e-01, 5.571856270009895e-01, 6.321330505391138e-01, 7.02564308858966e-01, 7.693779051903556e-01, 8.332001168694906e-01, 8.94489722163596e-01, 9.535952383172748e-01, 1.010789826325229e+00, 1.066291579336655e+00, 1.120278894427394e+00, 1.172899623669777e+00, 1.224278520671304e+00, 1.274521350860596e+00, 1.323719428640987e+00, 1.371951909415021e+00, 1.419287629295379e+00, 1.465788237861066e+00, 1.511507547117707e+00, 1.556493956284029e+00, 1.600790683071346e+00, 1.644436941657301e+00, 1.687468198252759e+00, 1.729916520295116e+00, 1.77181094883044e+00, 1.813178758066522e+00, 1.854044456755538e+00, 1.894430694734123e+00, 1.934358414413345e+00, 1.973847364223904e+00, 1.999938368797302e+00, 1.999938368797302e+00, 1.999938368797302e+00, 1.999938368797302e+00, 1.999938368797302e+00, 1.999938368797302e+00, 1.999938368797302e+00, 1.999938368797302e+00, 1.999938368797302e+00, 1.999938368797302e+00, 1.999938368797302e+00, 1.999938368797302e+00, 1.999938368797302e+00, 1.999938368797302e+00, 1.999938368797302e+00, 1.999938368797302e+00, 1.999938368797302e+00, 1.999938368797302e+00, 1.999938368797302e+00, 1.999938368797302e+00, 1.999938368797302e+00, 1.999938368797302e+00, 1.999938368797302e+00, 1.999938368797302e+00, 1.999938368797302e+00, 1.999938368797302e+00, 1.999938368797302e+00, 1.999938368797302e+00, 1.999938368797302e+00, 1.999938368797302e+00, 1.999938368797302e+00, 1.999938368797302e+00, 1.999938368797302e+00, 1.999938368797302e+00]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Validation_Tests_n50Test3.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Validation_Tests_n50Test3.txt
index dd3221afd9..87d535727c 100644
--- a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Validation_Tests_n50Test3.txt
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Validation_Tests_n50Test3.txt
@@ -1,10 +1,10 @@
-last-generated=2023-05-02
+last-generated=2024-12-03
 statistics-simulation=
 {
-  "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0",
+  "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0",
   "nonlinear": "1",
-  "number of continuous time states": "48",
+  "number of continuous time states": "46",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 3e+00]
-flowDelta=[8.640000224113464e-02, 8.640000224113464e-02, 8.640000224113464e-02, 8.640000224113464e-02, 8.640000224113464e-02, 8.640000224113464e-02, 8.640000224113464e-02, 8.640000224113464e-02, 8.640000224113464e-02, 8.640000224113464e-02, 8.640000224113464e-02, 8.640000224113464e-02, 8.640000224113464e-02, 8.640000224113464e-02, 8.640000224113464e-02, 8.640000224113464e-02, 8.640000224113464e-02, 8.640000224113464e-02, 8.640000224113464e-02, 8.640000224113464e-02, 8.640000224113464e-02, 8.640000224113464e-02, 8.640000224113464e-02, 8.640000224113464e-02, 8.640000224113464e-02, 8.640000224113464e-02, 8.640000224113464e-02, 8.640000224113464e-02, 8.640000224113464e-02, 8.640000224113464e-02, 8.640000224113464e-02, 8.640000224113464e-02, 8.640000224113464e-02, 8.640000224113464e-02, 7.96050910721198e-02, 7.407336678268006e-02, 6.966899181641166e-02, 6.582125451980952e-02, 6.232883995029546e-02, 5.909101219640707e-02, 5.604828994475149e-02, 5.316185386165909e-02, 5.040464837309842e-02, 4.77568548778505e-02, 4.520341821802097e-02, 4.273253873207913e-02, 4.033478684506958e-02, 3.800246236573627e-02, 3.572917786433134e-02, 3.350953967506552e-02, 3.133898228406906e-02, 2.921355874253152e-02, 2.7129854803074e-02, 2.508488709603233e-02, 2.307600000918208e-02, 2.110086412266071e-02, 1.915739140060675e-02, 1.724371555921744e-02, 1.535813476880705e-02, 1.349912839139587e-02, 1.166530781903151e-02, 9.855412659916596e-03, 8.068268103975058e-03, 6.302815491831269e-03, 4.558073672058757e-03, 2.83314234642695e-03, 1.127168219121693e-03, 9.999999439624929e-11, 9.999999439624929e-11, 9.999999439624929e-11, 9.999999439624929e-11, 9.999999439624929e-11, 9.999999439624929e-11, 9.999999439624929e-11, 9.999999439624929e-11, 9.999999439624929e-11, 9.999999439624929e-11, 9.999999439624929e-11, 9.999999439624929e-11, 9.999999439624929e-11, 9.999999439624929e-11, 9.999999439624929e-11, 9.999999439624929e-11, 9.999999439624929e-11, 9.999999439624929e-11, 9.999999439624929e-11, 9.999999439624929e-11, 9.999999439624929e-11, 9.999999439624929e-11, 9.999999439624929e-11, 9.999999439624929e-11, 9.999999439624929e-11, 9.999999439624929e-11, 9.999999439624929e-11, 9.999999439624929e-11, 9.999999439624929e-11, 9.999999439624929e-11, 9.999999439624929e-11, 9.999999439624929e-11, 9.999999439624929e-11, 9.999999439624929e-11]
+flowDelta=[8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 7.987707450307345e-02, 7.432644807881701e-02, 6.990703043604653e-02, 6.604614285055112e-02, 6.25417961647803e-02, 5.929290428891782e-02, 5.623978850870866e-02, 5.334348784689919e-02, 5.057686481538097e-02, 4.792002258167295e-02, 4.535786504355054e-02, 4.287854031608814e-02, 4.047259650780162e-02, 3.813230362507405e-02, 3.585125191682977e-02, 3.362403275423936e-02, 3.144605457782745e-02, 2.931337230129556e-02, 2.722254932549632e-02, 2.517059299500359e-02, 2.315484391678597e-02, 2.117295779785487e-02, 1.922284473965482e-02, 1.730263103355354e-02, 1.541060827866697e-02, 1.354525027525585e-02, 1.170516375873127e-02, 9.889084636401386e-03, 8.095834323758763e-03, 6.324349995207342e-03, 4.573646774020358e-03, 2.842822056932025e-03, 1.131019125242392e-03, -1.00000015212931e-10, -1.00000015212931e-10, -1.00000015212931e-10, -1.00000015212931e-10, -1.00000015212931e-10, -1.00000015212931e-10, -1.00000015212931e-10, -1.00000015212931e-10, -1.00000015212931e-10, -1.00000015212931e-10, -1.00000015212931e-10, -1.00000015212931e-10, -1.00000015212931e-10, -1.00000015212931e-10, -1.00000015212931e-10, -1.00000015212931e-10, -1.00000015212931e-10, -1.00000015212931e-10, -1.00000015212931e-10, -1.00000015212931e-10, -1.00000015212931e-10, -1.00000015212931e-10, -1.00000015212931e-10, -1.00000015212931e-10, -1.00000015212931e-10, -1.00000015212931e-10, -1.00000015212931e-10, -1.00000015212931e-10, -1.00000015212931e-10, -1.00000015212931e-10, -1.00000015212931e-10, -1.00000015212931e-10, -1.00000015212931e-10, -1.00000015212931e-10]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Validation_Tests_n50Test3TwoPort.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Validation_Tests_n50Test3TwoPort.txt
new file mode 100644
index 0000000000..6bd4e9eb40
--- /dev/null
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Validation_Tests_n50Test3TwoPort.txt
@@ -0,0 +1,10 @@
+last-generated=2024-10-30
+statistics-simulation=
+{
+  "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0",
+  "nonlinear": "1",
+  "number of continuous time states": "51",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 3e+00]
+flowDelta=[8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 8.669520169496536e-02, 7.987719371243406e-02, 7.432666414577274e-02, 6.990732100858323e-02, 6.604650047838424e-02, 6.254221339732037e-02, 5.929337740086566e-02, 5.624031377455192e-02, 5.334406526684809e-02, 5.057748693887858e-02, 4.792069313397404e-02, 4.535857657393241e-02, 4.287929654998912e-02, 4.047339371993141e-02, 3.813314181545337e-02, 3.585213108523363e-02, 3.362494917561725e-02, 3.144700825214386e-02, 2.931436136591421e-02, 2.72235756430446e-02, 2.517165656533199e-02, 2.315594101477442e-02, 2.117409028612781e-02, 1.922401075556709e-02, 1.730382871434897e-02, 1.541183948709877e-02, 1.354651314868776e-02, 1.170645922847697e-02, 9.890411771023584e-03, 8.097191260736655e-03, 6.325738131519239e-03, 4.575065178344795e-03, 2.844270496316236e-03, 1.13249690131879e-03, 1.497260427640867e-06, 1.497260427640867e-06, 1.497260427640867e-06, 1.497260427640867e-06, 1.497260427640867e-06, 1.497260427640867e-06, 1.497260541327705e-06, 1.497260541327705e-06, 1.497260541327705e-06, 1.497260541327705e-06, 1.497260541327705e-06, 1.497260541327705e-06, 1.497260541327705e-06, 1.497260541327705e-06, 1.497260541327705e-06, 1.497260541327705e-06, 1.497260541327705e-06, 1.497260541327705e-06, 1.497260541327705e-06, 1.497260541327705e-06, 1.497260541327705e-06, 1.497260655014543e-06, 1.497260655014543e-06, 1.497260655014543e-06, 1.497260655014543e-06, 1.497260655014543e-06, 1.497260655014543e-06, 1.497260655014543e-06, 1.497260655014543e-06, 1.497260655014543e-06, 1.497260655014543e-06, 1.497260655014543e-06, 1.497260655014543e-06, 1.497260655014543e-06]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Validation_Tests_n50TestTwoPort.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Validation_Tests_n50TestTwoPort.txt
new file mode 100644
index 0000000000..20c9a7176f
--- /dev/null
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Buildings_Validation_Tests_n50TestTwoPort.txt
@@ -0,0 +1,15 @@
+last-generated=2024-10-29
+statistics-initialization=
+{
+  "nonlinear": "7",
+  "numerical Jacobians": "0"
+}
+statistics-simulation=
+{
+  "linear": "0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0",
+  "nonlinear": "1",
+  "number of continuous time states": "42",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 3e+00]
+ach=[2.152645173225665e-08, 2.149188382738926e-08, 2.145731592303725e-08, 2.142274802409327e-08, 2.13881818901739e-08, 2.135591792982855e-08, 2.132135002710743e-08, 2.128908781587619e-08, 2.125221598291345e-08, 2.121995380647843e-08, 2.118308019257976e-08, 2.115081800103618e-08, 2.111624832196245e-08, 2.108168393760647e-08, 2.104711603488958e-08, 2.101485206698915e-08, 2.097797845309366e-08, 2.094341233038816e-08, 2.091115016952255e-08, 2.087658223246356e-08, 2.084201614959207e-08, 2.080744820337464e-08, 2.07728803450653e-08, 2.074061810911135e-08, 2.070374452955259e-08, 2.066917836884841e-08, 2.063460865543055e-08, 2.060004256432167e-08, 2.056547463641557e-08, 2.053321246730905e-08, 2.049864453208039e-08, 2.046407666370135e-08, 2.042951050299497e-08, 2.039494263461383e-08, 2.359199577312748e-01, 4.279821730987309e-01, 5.809024903516198e-01, 7.144964919568789e-01, 8.357533767467219e-01, 9.481711741907458e-01, 1.05381484303008e+00, 1.154032287093269e+00, 1.249762683981867e+00, 1.341694469315481e+00, 1.430350031542549e+00, 1.516139201541721e+00, 1.599389446870157e+00, 1.680368035318248e+00, 1.759296745002663e+00, 1.836362765922386e+00, 1.911724805831909e+00, 1.98551971712865e+00, 2.05786623291756e+00, 2.128867786183775e+00, 2.198616493659455e+00, 2.267193371380095e+00, 2.334671137381802e+00, 2.401114141408451e+00, 2.466581562331832e+00, 2.531126539874113e+00, 2.594796996378874e+00, 2.657636791442372e+00, 2.719686717156015e+00, 2.780983238630622e+00, 2.841560926665887e+00, 2.901450777654475e+00, 2.960682354625947e+00, 2.999817848205566e+00, 2.999817848205566e+00, 2.999817848205566e+00, 2.999817848205566e+00, 2.999817848205566e+00, 2.999817848205566e+00, 2.999817848205566e+00, 2.999817848205566e+00, 2.999817848205566e+00, 2.999817848205566e+00, 2.999817848205566e+00, 2.999817848205566e+00, 2.999817848205566e+00, 2.999817848205566e+00, 2.999817848205566e+00, 2.999817848205566e+00, 2.999817848205566e+00, 2.999817848205566e+00, 2.999817848205566e+00, 2.999817848205566e+00, 2.999817848205566e+00, 2.999817848205566e+00, 2.999817848205566e+00, 2.999817848205566e+00, 2.999817848205566e+00, 2.999817848205566e+00, 2.999817848205566e+00, 2.999817848205566e+00, 2.999817848205566e+00, 2.999817848205566e+00, 2.999817848205566e+00, 2.999817848205566e+00, 2.999817848205566e+00, 2.999817848205566e+00]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_PPD12_VentilationRBC.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_PPD12_VentilationRBC.txt
index e3e1eb32f2..b3035d945e 100644
--- a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_PPD12_VentilationRBC.txt
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_PPD12_VentilationRBC.txt
@@ -1,30 +1,30 @@
-last-generated=2024-10-30
+last-generated=2024-12-04
 statistics-initialization=
 {
-  "nonlinear": "8, 7, 10, 8, 9, 7, 7, 7, 10, 3, 3, 3, 3, 3, 3, 11, 1, 1, 1",
+  "nonlinear": "8, 7, 10, 8, 9, 7, 7, 7, 10, 3, 3, 3, 3, 3, 3, 10, 0, 0, 0, 0, 1, 1, 1",
   "numerical Jacobians": "0"
 }
 statistics-simulation=
 {
-  "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 0,   0, 0, 0, 0, 0, 0",
+  "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7,   7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0,   0, 4, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 0, 0, 0, 0",
   "nonlinear": "11, 1, 1, 1, 1",
-  "number of continuous time states": "376",
+  "number of continuous time states": "367",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 5.00006e+05]
-living.TSensor=[2.931499938964844e+02, 2.917967491912842e+02, 2.912710118103028e+02, 2.909172509002685e+02, 2.906265878295898e+02, 2.951346535818918e+02, 2.949100791931152e+02, 2.930451424407959e+02, 2.915582818603515e+02, 2.909799025726318e+02, 2.906271675109863e+02, 2.903149897003174e+02, 2.90046879272461e+02, 2.947245168304443e+02, 2.946219436645508e+02, 2.941495400565011e+02, 2.949898120117188e+02, 2.93374204711914e+02, 2.914399130249024e+02, 2.907330020141601e+02, 2.903012832641601e+02, 2.899646250152588e+02, 2.937809375e+02, 2.951191815185547e+02, 2.950756341552735e+02, 2.95088415145874e+02, 2.954046322631836e+02, 2.941621032714844e+02, 2.945090643310547e+02, 2.947324353790283e+02, 2.94863053894043e+02, 2.949576854705811e+02, 2.95152861328125e+02, 2.952841002655029e+02, 2.937720823669434e+02, 2.920401706695557e+02, 2.913595896693639e+02, 2.909227046203613e+02, 2.905814698791504e+02, 2.914351803588867e+02, 2.943021545410156e+02, 2.944850684356689e+02, 2.950012841796875e+02, 2.941914435577393e+02, 2.948538128662109e+02, 2.953804538726807e+02, 2.947638757324219e+02, 2.941817663574219e+02, 2.944049011230469e+02, 2.947380651855469e+02, 2.949868049621582e+02, 2.952588062286377e+02, 2.925864105224609e+02, 2.916653681945801e+02, 2.911772595214844e+02, 2.908039836883545e+02, 2.904919226074219e+02, 2.950408128356934e+02, 2.94597322845459e+02, 2.927815988922119e+02, 2.916935485839844e+02, 2.913432182312011e+02, 2.909259817504883e+02, 2.904645874786377e+02, 2.900707153320312e+02, 2.949337985992432e+02, 2.94657055053711e+02, 2.95202201385498e+02, 2.949222521972656e+02, 2.929092993164062e+02, 2.914102699279785e+02, 2.90816215133667e+02, 2.904320002441406e+02, 2.901500066375733e+02, 2.94422668762207e+02, 2.951387557983398e+02, 2.931052880859375e+02, 2.915182968139649e+02, 2.90995422668457e+02, 2.906451044464112e+02, 2.902708801269531e+02, 2.899579332733154e+02, 2.944115745544433e+02, 2.947053081512451e+02, 2.951884713745117e+02, 2.949174133300781e+02, 2.937153565979004e+02, 2.915810029602051e+02, 2.908386450195313e+02, 2.904237815093994e+02, 2.901122901916504e+02, 2.933410528564453e+02, 2.950208416748047e+02, 2.94590690612793e+02, 2.919706066894531e+02, 2.912804340362549e+02, 2.908931408691406e+02, 2.905178255462646e+02, 2.90151953125e+02, 2.938085637664795e+02, 2.94416015625e+02]
-hallway.TSensor=[2.931499938964844e+02, 2.92323002243042e+02, 2.919788276672363e+02, 2.917084587860107e+02, 2.914633322143555e+02, 2.92971673148019e+02, 2.927913566589356e+02, 2.921831118011474e+02, 2.916865509033203e+02, 2.914016371154785e+02, 2.91170792388916e+02, 2.909312261962891e+02, 2.90710989074707e+02, 2.922821214294434e+02, 2.922343891906738e+02, 2.921521427699498e+02, 2.923287634277344e+02, 2.919833679199219e+02, 2.912570782470703e+02, 2.909199582672119e+02, 2.906502487182617e+02, 2.904058177185059e+02, 2.918884289550781e+02, 2.920795135498047e+02, 2.922168347167969e+02, 2.92523365020752e+02, 2.927156146240234e+02, 2.924151529947916e+02, 2.925611730957031e+02, 2.925865244293213e+02, 2.926840782165527e+02, 2.926893673706055e+02, 2.928188354492187e+02, 2.928190134429931e+02, 2.922475378417969e+02, 2.916404090881348e+02, 2.913169916643415e+02, 2.910529640197754e+02, 2.908163562011719e+02, 2.909984797668457e+02, 2.919999389648438e+02, 2.920162127685547e+02, 2.923727685546875e+02, 2.923380583190918e+02, 2.92664479675293e+02, 2.928178218841553e+02, 2.92480899810791e+02, 2.9249594871521e+02, 2.925399792480468e+02, 2.927411768341065e+02, 2.927792091369629e+02, 2.929068601989746e+02, 2.919302258300781e+02, 2.915094757080078e+02, 2.912351080322265e+02, 2.909831462860108e+02, 2.907507720947266e+02, 2.9235270652771e+02, 2.922625108337402e+02, 2.915789785766602e+02, 2.913214248657226e+02, 2.912267085266113e+02, 2.909489097595215e+02, 2.906308799743653e+02, 2.903506396484375e+02, 2.920150032043457e+02, 2.919079421997071e+02, 2.922139916992188e+02, 2.922380715942382e+02, 2.916230866241455e+02, 2.910386177062989e+02, 2.907540151977539e+02, 2.905131240234375e+02, 2.903125402832031e+02, 2.918842021179199e+02, 2.921203136444092e+02, 2.914196264648438e+02, 2.909484934234619e+02, 2.907626354980468e+02, 2.90576402053833e+02, 2.903305603027344e+02, 2.901147049713135e+02, 2.917185348510742e+02, 2.918233100891113e+02, 2.921581335449219e+02, 2.922187923431397e+02, 2.918567663574219e+02, 2.910128202819824e+02, 2.906723919677734e+02, 2.904342241668701e+02, 2.902235488891602e+02, 2.915357244873047e+02, 2.919373324584961e+02, 2.918964472961426e+02, 2.910534875488281e+02, 2.908887729644775e+02, 2.907021142578125e+02, 2.904649382019043e+02, 2.902198919677734e+02, 2.916734749603272e+02, 2.917260437011719e+02]
-Diner.TSensor=[2.931499938964844e+02, 2.91592737121582e+02, 2.909729241943359e+02, 2.905722859191894e+02, 2.902539178466797e+02, 2.931364584786551e+02, 2.929612731933594e+02, 2.918244396209717e+02, 2.908054473876953e+02, 2.903530966949463e+02, 2.900634895324707e+02, 2.89760316696167e+02, 2.894888305664062e+02, 2.92508490447998e+02, 2.924508946228027e+02, 2.921195931570871e+02, 2.925366784667969e+02, 2.915268016052246e+02, 2.900727410888672e+02, 2.895349385070801e+02, 2.891887405395508e+02, 2.889077959442139e+02, 2.914443600463867e+02, 2.923420757293701e+02, 2.92626450805664e+02, 2.934868927001953e+02, 2.939452647399903e+02, 2.930688356526693e+02, 2.92985537109375e+02, 2.928615029907227e+02, 2.928136116027832e+02, 2.928064320373535e+02, 2.928951391601562e+02, 2.929279705810547e+02, 2.918731221008301e+02, 2.905762378692627e+02, 2.900622867257255e+02, 2.897138129425049e+02, 2.894284942626953e+02, 2.897741387939453e+02, 2.919369689941406e+02, 2.920032528686523e+02, 2.928374426269531e+02, 2.929090196990967e+02, 2.934154122924805e+02, 2.934689594268799e+02, 2.927363728332519e+02, 2.923287429046631e+02, 2.924080895996094e+02, 2.926118047332764e+02, 2.927152824401855e+02, 2.928409323883056e+02, 2.909143466186524e+02, 2.902109646606445e+02, 2.898292041015625e+02, 2.895259243011475e+02, 2.892719592285156e+02, 2.92396597366333e+02, 2.921479525756836e+02, 2.910926641845703e+02, 2.907727401733399e+02, 2.90880353012085e+02, 2.903010108947754e+02, 2.896465543365479e+02, 2.891405590820312e+02, 2.923327217102051e+02, 2.921012698364258e+02, 2.925077895355225e+02, 2.923764016723633e+02, 2.909884787750244e+02, 2.898777908325195e+02, 2.8944669921875e+02, 2.891635910644531e+02, 2.889554942321777e+02, 2.918617066955566e+02, 2.923686389923096e+02, 2.912383505249023e+02, 2.903358656311035e+02, 2.901253273010254e+02, 2.898289360809326e+02, 2.89382080078125e+02, 2.890234156799316e+02, 2.919549133300781e+02, 2.921172267913818e+02, 2.924914752197266e+02, 2.923703353881836e+02, 2.915645106506348e+02, 2.89968030090332e+02, 2.894031805419922e+02, 2.890837508392334e+02, 2.888370246887207e+02, 2.909698919677735e+02, 2.922117483520508e+02, 2.920649283599853e+02, 2.906651330566406e+02, 2.90437882232666e+02, 2.9015220703125e+02, 2.896940566253662e+02, 2.892248506164551e+02, 2.915549285888672e+02, 2.920054321289062e+02]
-Porch.TSensor=[2.931499938964844e+02, 2.903067307281494e+02, 2.895910868835449e+02, 2.891526429748535e+02, 2.888367993164063e+02, 2.916601697649274e+02, 2.915599314880371e+02, 2.909884484100342e+02, 2.899811352539062e+02, 2.89433934173584e+02, 2.891226783752442e+02, 2.887171127319336e+02, 2.883734747314453e+02, 2.912495762634277e+02, 2.912056420898438e+02, 2.908142756870815e+02, 2.910400732421875e+02, 2.901497341156006e+02, 2.885836148071289e+02, 2.880047311401367e+02, 2.876669830322265e+02, 2.873891838073731e+02, 2.897319929504395e+02, 2.90836809463501e+02, 2.921478729248047e+02, 2.955750751495361e+02, 2.962344372558593e+02, 2.943822814941406e+02, 2.928976824951172e+02, 2.919815048217773e+02, 2.916323356628418e+02, 2.91527232131958e+02, 2.915237170410156e+02, 2.914925114440918e+02, 2.905216007995605e+02, 2.891383041381836e+02, 2.885970029994419e+02, 2.882307479858399e+02, 2.879424102783203e+02, 2.881088632202149e+02, 2.905364532470703e+02, 2.906084128570557e+02, 2.929300610351563e+02, 2.945462786102295e+02, 2.944409652709961e+02, 2.932075439453125e+02, 2.918013868713379e+02, 2.911425791931152e+02, 2.911471704101563e+02, 2.912759906768799e+02, 2.91240665435791e+02, 2.91246538848877e+02, 2.894005477905274e+02, 2.88617679977417e+02, 2.882318688964844e+02, 2.879525596618652e+02, 2.877210797119141e+02, 2.908817902374267e+02, 2.906809364318848e+02, 2.904121453094482e+02, 2.913749969482422e+02, 2.919450889587403e+02, 2.902174789428711e+02, 2.887096537780762e+02, 2.878006713867188e+02, 2.908696235656738e+02, 2.906083618164063e+02, 2.909619912719726e+02, 2.909098107910156e+02, 2.89619196395874e+02, 2.884381958007813e+02, 2.880122071075439e+02, 2.877693081054687e+02, 2.876054308319092e+02, 2.904096514892578e+02, 2.909820041656494e+02, 2.90616686706543e+02, 2.901551833343506e+02, 2.901929638671875e+02, 2.895433731842041e+02, 2.8856328125e+02, 2.879320455169678e+02, 2.906395465087891e+02, 2.907934563446045e+02, 2.910636837768554e+02, 2.909627578735352e+02, 2.902018144226074e+02, 2.885079829406739e+02, 2.878780725097656e+02, 2.87563254776001e+02, 2.873296920776367e+02, 2.892011614990235e+02, 2.907625646972656e+02, 2.909806552886963e+02, 2.908143821716309e+02, 2.910682224273681e+02, 2.90356728515625e+02, 2.891816927337646e+02, 2.882102352905274e+02, 2.900961000061035e+02, 2.908169860839844e+02]
-bedRoom1.TSensor=[2.931499938964844e+02, 2.927259458160401e+02, 2.925666458129883e+02, 2.924007932281494e+02, 2.922337585449219e+02, 2.945294320242746e+02, 2.93588134765625e+02, 2.931156344604492e+02, 2.926192218017578e+02, 2.923275611877442e+02, 2.920810600280762e+02, 2.918266054534912e+02, 2.916165649414062e+02, 2.938533460998535e+02, 2.933711108398438e+02, 2.935041268484933e+02, 2.933991162109375e+02, 2.93317854309082e+02, 2.923448718261719e+02, 2.918887143707275e+02, 2.915438003540039e+02, 2.91262765045166e+02, 2.942983923339844e+02, 2.931422064971924e+02, 2.932024377441406e+02, 2.93207202911377e+02, 2.933561724853516e+02, 2.936272650146485e+02, 2.939742889404297e+02, 2.938381082153321e+02, 2.941489128112793e+02, 2.939140536499024e+02, 2.942771008300781e+02, 2.940168477630615e+02, 2.931778182983398e+02, 2.924247627258301e+02, 2.920082999093192e+02, 2.916884370422363e+02, 2.914358851623535e+02, 2.928248336791992e+02, 2.929108245849609e+02, 2.934847843933105e+02, 2.938895874023438e+02, 2.929854989624023e+02, 2.932000704956055e+02, 2.934975360870361e+02, 2.93550824432373e+02, 2.938380485534668e+02, 2.936591931152344e+02, 2.94145853805542e+02, 2.939274673461914e+02, 2.942449063110352e+02, 2.928419464111328e+02, 2.922448962402344e+02, 2.918819000244141e+02, 2.915743076324463e+02, 2.913096771240234e+02, 2.934424745941162e+02, 2.935980249023438e+02, 2.923718704986572e+02, 2.918963317871094e+02, 2.916375052642823e+02, 2.913600508117676e+02, 2.910428690338135e+02, 2.907591735839844e+02, 2.929296653747559e+02, 2.930592070007324e+02, 2.931400026702881e+02, 2.930802032470703e+02, 2.927749304962159e+02, 2.918347770690918e+02, 2.913795117950439e+02, 2.910167736816406e+02, 2.907650482940674e+02, 2.935314280700683e+02, 2.937527027130127e+02, 2.922534698486328e+02, 2.91587268447876e+02, 2.912361553955078e+02, 2.909832392883301e+02, 2.907027160644531e+02, 2.904770877838135e+02, 2.931479609680176e+02, 2.93595454788208e+02, 2.939088568115234e+02, 2.939069358825683e+02, 2.933754211425781e+02, 2.919336446380615e+02, 2.913602709960937e+02, 2.909981224060058e+02, 2.90721257019043e+02, 2.939161236572266e+02, 2.928668670654297e+02, 2.928275329589844e+02, 2.917744342041016e+02, 2.913933013916015e+02, 2.911213854980469e+02, 2.908714176177979e+02, 2.906191426086426e+02, 2.938980116271973e+02, 2.926014404296875e+02]
-bathRoom.TSensor=[2.931499938964844e+02, 2.928388542175293e+02, 2.927093090820313e+02, 2.925627365112305e+02, 2.924115969848633e+02, 2.95278810773577e+02, 2.938967556762695e+02, 2.93416734085083e+02, 2.929608178710938e+02, 2.926531568145752e+02, 2.924006027221679e+02, 2.921504624938965e+02, 2.919454968261718e+02, 2.946937614440918e+02, 2.937176739501953e+02, 2.939462454659598e+02, 2.936275085449219e+02, 2.937279684448242e+02, 2.927502304077149e+02, 2.922978746032715e+02, 2.919513259887696e+02, 2.916678781127929e+02, 2.954976921081543e+02, 2.935046733093262e+02, 2.936037145996094e+02, 2.939686584472656e+02, 2.940681991577148e+02, 2.94105126953125e+02, 2.943727526855469e+02, 2.941280923461914e+02, 2.945803382873535e+02, 2.941124674224853e+02, 2.94718388671875e+02, 2.941135897064209e+02, 2.935780754089355e+02, 2.928708152770996e+02, 2.924702966308594e+02, 2.921523123168946e+02, 2.918926840209961e+02, 2.939156079864502e+02, 2.936708892822265e+02, 2.940337907409668e+02, 2.942129626464844e+02, 2.936498516845703e+02, 2.937530187988281e+02, 2.938792098999023e+02, 2.939305905151367e+02, 2.942038433837891e+02, 2.939451440429688e+02, 2.946224414825439e+02, 2.940181427001953e+02, 2.945754905700684e+02, 2.932620455932617e+02, 2.926868954467773e+02, 2.923289135742187e+02, 2.920203815460205e+02, 2.917494342041015e+02, 2.943188736724854e+02, 2.940468649291992e+02, 2.928639610290527e+02, 2.925371673583984e+02, 2.923383800506592e+02, 2.919637954711914e+02, 2.916002922821045e+02, 2.913046520996094e+02, 2.938104438781738e+02, 2.934539775085449e+02, 2.93647240524292e+02, 2.935394415283203e+02, 2.931083680725098e+02, 2.922662185668945e+02, 2.91832240524292e+02, 2.914732905273437e+02, 2.912100564575196e+02, 2.946426547241211e+02, 2.942559089660645e+02, 2.927046166992188e+02, 2.921158259582519e+02, 2.917715657043457e+02, 2.914900347137451e+02, 2.911810302734375e+02, 2.909419281768799e+02, 2.942258567810059e+02, 2.942575752258301e+02, 2.944509603881836e+02, 2.943857749938965e+02, 2.938455110168457e+02, 2.924133268737793e+02, 2.918343835449219e+02, 2.914606201934814e+02, 2.911715194702148e+02, 2.952918408203125e+02, 2.932599688720703e+02, 2.932529932403564e+02, 2.92400884552002e+02, 2.92068733215332e+02, 2.917503295898438e+02, 2.914296417236328e+02, 2.911495512390136e+02, 2.952801926422119e+02, 2.931277465820312e+02]
-stairWay.TSensor=[2.931499938964844e+02, 2.927500417327881e+02, 2.925427011108399e+02, 2.923650450897217e+02, 2.921946444702148e+02, 2.938312194824219e+02, 2.93296827545166e+02, 2.929841388702392e+02, 2.925868035888672e+02, 2.923093058013916e+02, 2.920973655700683e+02, 2.91876170501709e+02, 2.916752926635742e+02, 2.93275524520874e+02, 2.930206559753418e+02, 2.930512699672154e+02, 2.930114416503906e+02, 2.928731320953369e+02, 2.921393109130859e+02, 2.918058818817138e+02, 2.915415435791016e+02, 2.913071472167969e+02, 2.932615286254883e+02, 2.927263672637939e+02, 2.930136462402344e+02, 2.937486209869385e+02, 2.938874171447754e+02, 2.9367123046875e+02, 2.936774124145508e+02, 2.93542643737793e+02, 2.936998077392578e+02, 2.935665576934815e+02, 2.937647961425781e+02, 2.936131950378418e+02, 2.930076031494141e+02, 2.924371746063233e+02, 2.921181056431362e+02, 2.918590391540527e+02, 2.916298820495605e+02, 2.921962048339844e+02, 2.926884338378906e+02, 2.928962209320068e+02, 2.935125915527344e+02, 2.934227996063232e+02, 2.934936346435547e+02, 2.934389049530029e+02, 2.933018096923828e+02, 2.934286865234375e+02, 2.933449768066406e+02, 2.936355033111572e+02, 2.935231094360352e+02, 2.936951554107666e+02, 2.926765350341797e+02, 2.922492490386963e+02, 2.919768377685547e+02, 2.917276996612549e+02, 2.9149734375e+02, 2.930323815155029e+02, 2.930705760192871e+02, 2.923585600280762e+02, 2.922987274169922e+02, 2.922347507476807e+02, 2.918298083496094e+02, 2.914608808135986e+02, 2.911616516113281e+02, 2.926588474273682e+02, 2.926602087402344e+02, 2.927712992095947e+02, 2.927505749511719e+02, 2.9238982421875e+02, 2.91746671295166e+02, 2.91443132019043e+02, 2.911892802734375e+02, 2.909824839019776e+02, 2.92814786529541e+02, 2.929636936187744e+02, 2.921099301147461e+02, 2.917197582244873e+02, 2.915351104736328e+02, 2.913085479736328e+02, 2.910248779296875e+02, 2.90794568862915e+02, 2.925548863220215e+02, 2.927391191101074e+02, 2.930181726074219e+02, 2.930538249969483e+02, 2.926799433898926e+02, 2.916870690917969e+02, 2.913152551269531e+02, 2.910661547851562e+02, 2.90852091217041e+02, 2.927770263671875e+02, 2.923886022949219e+02, 2.924277928161621e+02, 2.919023893737793e+02, 2.917689811706543e+02, 2.91511025390625e+02, 2.91203572845459e+02, 2.909344691467285e+02, 2.92923826751709e+02, 2.922868347167969e+02]
-bedRoom2.TSensor=[2.931499938964844e+02, 2.927008423614502e+02, 2.925863795471191e+02, 2.924486667633057e+02, 2.923006161499023e+02, 2.947395246233259e+02, 2.936765701293945e+02, 2.930948120880127e+02, 2.925895489501953e+02, 2.923290232086181e+02, 2.920932182312011e+02, 2.918385143280029e+02, 2.916410308837891e+02, 2.939783277893067e+02, 2.935164883422851e+02, 2.939080304827009e+02, 2.934269689941406e+02, 2.936986280059814e+02, 2.9247611328125e+02, 2.920181350708008e+02, 2.916668121337891e+02, 2.91378853302002e+02, 2.948062432861328e+02, 2.931407870483399e+02, 2.931940972900391e+02, 2.932007942199707e+02, 2.934921636962891e+02, 2.938475410970052e+02, 2.942095162963867e+02, 2.941712673187256e+02, 2.945684852600098e+02, 2.941044820404053e+02, 2.948589050292969e+02, 2.939734817504883e+02, 2.932321987915039e+02, 2.924591903686523e+02, 2.920539482770647e+02, 2.917328441619873e+02, 2.914815870666504e+02, 2.930197546386719e+02, 2.928675964355469e+02, 2.937430644989013e+02, 2.940716540527343e+02, 2.928678343200684e+02, 2.932541897583008e+02, 2.935018291473389e+02, 2.93820737915039e+02, 2.940011124420166e+02, 2.939092346191406e+02, 2.946333032989502e+02, 2.938837471008301e+02, 2.94610682220459e+02, 2.929307049560547e+02, 2.923158912658691e+02, 2.919653881835937e+02, 2.916487144470215e+02, 2.913703637695313e+02, 2.935156623077393e+02, 2.941153877258301e+02, 2.92365534286499e+02, 2.918225646972656e+02, 2.914976346588135e+02, 2.912227478027344e+02, 2.909169589233398e+02, 2.906565222167969e+02, 2.929020816802978e+02, 2.93146183013916e+02, 2.931829003143311e+02, 2.933084042358398e+02, 2.925427931976319e+02, 2.917319519042969e+02, 2.913414882659912e+02, 2.909767150878906e+02, 2.907288185119629e+02, 2.937207695007324e+02, 2.941532649993896e+02, 2.920774612426758e+02, 2.914327656555176e+02, 2.910801063537598e+02, 2.9083796875e+02, 2.905607788085937e+02, 2.903548767089844e+02, 2.931948751831055e+02, 2.938790085601806e+02, 2.943150094604492e+02, 2.945262004852295e+02, 2.93385316619873e+02, 2.91872310333252e+02, 2.913457513427734e+02, 2.910038034057617e+02, 2.907299285888672e+02, 2.943795953369141e+02, 2.928216732788086e+02, 2.926983780670166e+02, 2.916326751708984e+02, 2.912618816375733e+02, 2.9100001953125e+02, 2.907638758087158e+02, 2.905227658081055e+02, 2.942462298583985e+02, 2.9251953125e+02]
-bedRoom3.TSensor=[2.931499938964844e+02, 2.926543399810791e+02, 2.924687066650391e+02, 2.922695761871338e+02, 2.920884075927734e+02, 2.946111899239676e+02, 2.936292323303223e+02, 2.931636122894287e+02, 2.926468237304687e+02, 2.923558894348145e+02, 2.921156448364258e+02, 2.918570895385742e+02, 2.916683724975586e+02, 2.941236139678955e+02, 2.936612504577637e+02, 2.939801627022879e+02, 2.935833020019531e+02, 2.937699119567871e+02, 2.926546810913086e+02, 2.921512236022949e+02, 2.917673248291015e+02, 2.914687120056153e+02, 2.947300602722168e+02, 2.933503843688965e+02, 2.934915356445313e+02, 2.93836088180542e+02, 2.940423301696777e+02, 2.941508581542969e+02, 2.943694497680664e+02, 2.942327967834473e+02, 2.945795028686524e+02, 2.941572884368896e+02, 2.947179541015625e+02, 2.94040707244873e+02, 2.934730349731445e+02, 2.927564975738525e+02, 2.923259594726562e+02, 2.919837085723877e+02, 2.917269111633301e+02, 2.932329959106445e+02, 2.932984619140625e+02, 2.9384642578125e+02, 2.941243664550781e+02, 2.935516355133057e+02, 2.938336761474609e+02, 2.938231678009033e+02, 2.939954940795898e+02, 2.941793159484864e+02, 2.939724194335938e+02, 2.946398901367187e+02, 2.939650802612305e+02, 2.944837680816651e+02, 2.93197314453125e+02, 2.925805744934082e+02, 2.922133288574219e+02, 2.918836372375488e+02, 2.915992449951172e+02, 2.938868003845215e+02, 2.941511460876465e+02, 2.927939954376221e+02, 2.923745956420898e+02, 2.921350052642823e+02, 2.917757937622071e+02, 2.913797164916992e+02, 2.910671081542969e+02, 2.933120204925537e+02, 2.934253004455566e+02, 2.934752482604981e+02, 2.936505795288086e+02, 2.929088716125489e+02, 2.921090034484863e+02, 2.916908521270752e+02, 2.9129771875e+02, 2.910434572601318e+02, 2.940064071655273e+02, 2.942591857910156e+02, 2.926043350219726e+02, 2.919951210021973e+02, 2.916291481018067e+02, 2.913599251556396e+02, 2.910201904296875e+02, 2.907781879425049e+02, 2.93629585723877e+02, 2.940438611602783e+02, 2.944193231201172e+02, 2.945769584655762e+02, 2.936995202636719e+02, 2.922834559631348e+02, 2.916847631835938e+02, 2.913014241027832e+02, 2.910108184814453e+02, 2.94429965209961e+02, 2.931498977661133e+02, 2.931018488311768e+02, 2.922525555419922e+02, 2.919279747009277e+02, 2.916451696777344e+02, 2.913363725280762e+02, 2.910349526977539e+02, 2.945404354095459e+02, 2.929812316894531e+02]
-valBed1.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.628385485133814e-06, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.671569826999786e-10, 0e+00, 7.163745787040977e-12, 3.555438397452235e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.16603905048396e-06, 1.999062091344967e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.026527209207438e-02, 0e+00, 1.384127671830422e-02, 8.964362181723966e-03, 0e+00, 0e+00, 0e+00, 4.863168757583975e-04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.26657084701563e-03, 6.139614499406172e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.29122873255983e-05, 1.489180729663531e-05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.024385710479692e-04, 4.939669627776047e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.054058954119425e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.671478233600254e-10, 0e+00]
-valBat2.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.236639785185818e-06, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.671569826999786e-10, 0e+00, 3.24849326196307e-06, 1.690395691548613e-04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.370535319438204e-04, 3.767300653271465e-04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.098902511410439e-02, 0e+00, 1.659633551420736e-10, 5.892832045681809e-05, 0e+00, 0e+00, 0e+00, 1.671426028138079e-10, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 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.669201013521082e-10, 4.782698585768231e-04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.67149155627655e-10, 7.962062133839119e-06, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.081053269444965e-04, 1.66802168258262e-10, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.468478821215411e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.588049490237609e-04, 0e+00]
-valBat1.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.236638771748865e-06, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.671569826999786e-10, 0e+00, 3.248485154467443e-06, 1.690383418463309e-04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.370529207633808e-04, 3.767252503530559e-04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.028006717562698e-02, 0e+00, 1.659633551420736e-10, 5.892815223667805e-05, 0e+00, 0e+00, 0e+00, 1.671426028138079e-10, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 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.669201013521082e-10, 4.782624628569465e-04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.67149155627655e-10, 7.962059916945784e-06, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.081049485947005e-04, 1.66802168258262e-10, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.46598183363416e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.588041341165081e-04, 0e+00]
-valBed2.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.422363968583199e-06, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.671569826999786e-10, 0e+00, 7.163745787040977e-12, 9.761391719803986e-04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.389959965716116e-05, 1.542898090265226e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.061780581250809e-02, 0e+00, 2.428747438360071e-02, 5.531345810742256e-03, 0e+00, 0e+00, 0e+00, 1.499314753891667e-04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.243242327356579e-03, 2.507300306039767e-05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.638919493416324e-04, 2.375975492441285e-05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.479728184174746e-05, 1.125851160031897e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.053969945758324e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.524374820291996e-04, 0e+00]
-valBed3.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.532097418991521e-05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.671569826999786e-10, 0e+00, 7.163745787040977e-12, 2.037092735991006e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.671509874956456e-10, 2.5490567763336e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.889610416255915e-02, 0e+00, 1.060868263826781e-02, 3.28734860412015e-05, 0e+00, 0e+00, 0e+00, 1.074049688031664e-04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.073861821554523e-03, 9.143333428078018e-04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.589223247719929e-04, 6.320969873740978e-05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.29867868963629e-04, 3.433422346181184e-04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.684386644512156e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.302637080400018e-06, 0e+00]
-valGnd.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.214059827583176e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.214089810848236e-02, 0e+00, 3.948861147670302e-03, 9.210281610488892e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.213924407958984e-02, 9.210324311628938e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.718923119828102e-02, 0e+00, 9.18113040179014e-02, 9.20567288994789e-02, 0e+00, 0e+00, 0e+00, 9.213693633675575e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.207558939233422e-02, 9.209641262888908e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.213874489068985e-02, 9.214027458801866e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.213832765817642e-02, 9.204304140061138e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.156327635049832e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.21383798122406e-02, 0e+00]
-pump.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.219744482210704e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.214090555906296e-02, 0e+00, 3.955358160387675e-03, 9.90095600485804e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.245041757822037e-02, 9.894771229475738e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.182375204563152e-01, 0e+00, 1.405487418361029e-01, 1.067031639814396e-01, 0e+00, 0e+00, 0e+00, 9.288059119135146e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.036592653952535e-01, 1.001319608464835e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.254447370767593e-02, 9.225806361064315e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.262164682149887e-02, 1.085845679417284e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.684218832850328e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.261272847652435e-02, 0e+00]
+living.TSensor=[2.931499938964844e+02, 2.917724174499511e+02, 2.912591619873047e+02, 2.909086988830566e+02, 2.906182354736328e+02, 2.951511871337891e+02, 2.948579092407227e+02, 2.930113243865967e+02, 2.915410192871093e+02, 2.909748458862305e+02, 2.906289978027344e+02, 2.90321781616211e+02, 2.900554193115235e+02, 2.947566798400879e+02, 2.944530638122558e+02, 2.943244247436523e+02, 2.951841394042969e+02, 2.932297370147705e+02, 2.913927474975586e+02, 2.907194039154053e+02, 2.902964965820312e+02, 2.899675092315674e+02, 2.938147724914551e+02, 2.951434934234619e+02, 2.949058459472656e+02, 2.948864097595215e+02, 2.953406553649903e+02, 2.947725119781494e+02, 2.942780206298828e+02, 2.944314301300049e+02, 2.945770385742188e+02, 2.946649873352051e+02, 2.948252026367188e+02, 2.950272231292724e+02, 2.948746136474609e+02, 2.924234489440918e+02, 2.915718054199219e+02, 2.910903534698487e+02, 2.907352801513672e+02, 2.915977997589111e+02, 2.94652474975586e+02, 2.952083964538574e+02, 2.952578332519531e+02, 2.950691911621093e+02, 2.945761184692383e+02, 2.952041080474854e+02, 2.953911767578125e+02, 2.944980432128906e+02, 2.942503747558594e+02, 2.945442515563965e+02, 2.949209938049316e+02, 2.952057021331787e+02, 2.925801486206055e+02, 2.916803372192383e+02, 2.912018566894531e+02, 2.908366760253906e+02, 2.905284936523437e+02, 2.948607148742676e+02, 2.944138410949707e+02, 2.927016809844971e+02, 2.916746704101562e+02, 2.913261145019531e+02, 2.909161558532715e+02, 2.90461349029541e+02, 2.900751599121094e+02, 2.949649772644043e+02, 2.949196217346192e+02, 2.95103041229248e+02, 2.947429943847656e+02, 2.928358772277832e+02, 2.913999656677246e+02, 2.908295824432373e+02, 2.904509211425781e+02, 2.901747973632812e+02, 2.944740882873535e+02, 2.951203689575195e+02, 2.929537493896485e+02, 2.91480237197876e+02, 2.909795048522949e+02, 2.906381501770019e+02, 2.902667663574219e+02, 2.899634297943115e+02, 2.944477604675293e+02, 2.949382466888428e+02, 2.951136660766602e+02, 2.947282772064209e+02, 2.94069587097168e+02, 2.917072235107422e+02, 2.909210278320313e+02, 2.904957967376709e+02, 2.901827560424805e+02, 2.934403568267822e+02, 2.945814172363281e+02, 2.941367419433594e+02, 2.918522265625e+02, 2.912466835021972e+02, 2.908844860839844e+02, 2.905176740264893e+02, 2.901562313842774e+02, 2.938493273925781e+02, 2.942166748046875e+02]
+hallway.TSensor=[2.931499938964844e+02, 2.923015062713623e+02, 2.919653625488281e+02, 2.916952610015869e+02, 2.914485217285156e+02, 2.929803019205729e+02, 2.927716595458984e+02, 2.921654586791992e+02, 2.916672827148437e+02, 2.91388002166748e+02, 2.911605278015137e+02, 2.909204965209961e+02, 2.907014868164063e+02, 2.922980206298828e+02, 2.921964799499511e+02, 2.921025314331055e+02, 2.924178649902344e+02, 2.919123477172852e+02, 2.912203704833984e+02, 2.909001862335205e+02, 2.906337371826172e+02, 2.903932217407227e+02, 2.918964851379395e+02, 2.92088583908081e+02, 2.921670770263672e+02, 2.924484596252441e+02, 2.927425096130371e+02, 2.924379282379151e+02, 2.924658099365234e+02, 2.924539240264892e+02, 2.925621994018555e+02, 2.925776684570313e+02, 2.926661706542969e+02, 2.927821188354492e+02, 2.927343475341797e+02, 2.918332817077637e+02, 2.914421798270089e+02, 2.911650793457031e+02, 2.909277980041504e+02, 2.91122823562622e+02, 2.920752288818359e+02, 2.923687085723877e+02, 2.92595322265625e+02, 2.925542601318359e+02, 2.926633157348633e+02, 2.929178157806397e+02, 2.927966442871094e+02, 2.923938248443603e+02, 2.924329248046875e+02, 2.925519276428222e+02, 2.927121620178223e+02, 2.928115458679199e+02, 2.918941082763672e+02, 2.915040655517578e+02, 2.912386865234375e+02, 2.909933391571045e+02, 2.907637829589844e+02, 2.923228914642334e+02, 2.922082678222656e+02, 2.915552416992188e+02, 2.913066253662109e+02, 2.911991094970703e+02, 2.909256680297852e+02, 2.906106127166748e+02, 2.903366528320312e+02, 2.920288139343262e+02, 2.920035710144043e+02, 2.922109824371338e+02, 2.921747146606446e+02, 2.916071406555176e+02, 2.910316543579102e+02, 2.907580895233154e+02, 2.905163305664062e+02, 2.90319987411499e+02, 2.919140626525879e+02, 2.921441421508789e+02, 2.913565213012695e+02, 2.90930139465332e+02, 2.907465887451172e+02, 2.905632109832763e+02, 2.9031669921875e+02, 2.901077333831787e+02, 2.917371397399903e+02, 2.919495670318603e+02, 2.921611700439453e+02, 2.921582557678223e+02, 2.919883541870117e+02, 2.910623941802979e+02, 2.907130883789063e+02, 2.904755261993408e+02, 2.902670974731445e+02, 2.91599755935669e+02, 2.918168981933593e+02, 2.917464360809326e+02, 2.910366716003418e+02, 2.908814903259278e+02, 2.906993774414062e+02, 2.904629998016358e+02, 2.902181219482422e+02, 2.917023051452637e+02, 2.916600646972656e+02]
+Diner.TSensor=[2.931499938964844e+02, 2.915639474487305e+02, 2.909561515808106e+02, 2.905583393859863e+02, 2.902389947509766e+02, 2.931563705444336e+02, 2.929294407653808e+02, 2.917964208984375e+02, 2.907810333251953e+02, 2.903352410888672e+02, 2.900491897583008e+02, 2.897481266784668e+02, 2.894781729125976e+02, 2.925329329681397e+02, 2.923452545166015e+02, 2.921449108123779e+02, 2.926789794921875e+02, 2.914107398986816e+02, 2.900204742431641e+02, 2.895082356262207e+02, 2.89166860961914e+02, 2.888912213134765e+02, 2.91465942993164e+02, 2.923539059448242e+02, 2.925223901367187e+02, 2.933560543060303e+02, 2.93930046081543e+02, 2.93309860534668e+02, 2.92808782043457e+02, 2.926392247009277e+02, 2.92609211730957e+02, 2.926022343444824e+02, 2.926700134277344e+02, 2.927721036529541e+02, 2.926292195129395e+02, 2.908452209472656e+02, 2.902010140555246e+02, 2.898221683502197e+02, 2.895286817932129e+02, 2.898860684967041e+02, 2.920830810546875e+02, 2.925480631256103e+02, 2.931103918457031e+02, 2.933611708984375e+02, 2.932493762207031e+02, 2.93386446762085e+02, 2.93193974609375e+02, 2.923903955841064e+02, 2.922825524902344e+02, 2.924496667480469e+02, 2.926581726074219e+02, 2.927848287963867e+02, 2.908855331420899e+02, 2.902034117126465e+02, 2.898292572021484e+02, 2.895330268859863e+02, 2.892810845947266e+02, 2.922885472869873e+02, 2.920217633056641e+02, 2.910220138549805e+02, 2.907440063476562e+02, 2.908396009063721e+02, 2.902588236999512e+02, 2.896078544616699e+02, 2.891115844726563e+02, 2.923448833465576e+02, 2.922691946411133e+02, 2.924565361785889e+02, 2.9225013671875e+02, 2.909171347045898e+02, 2.898490371704102e+02, 2.894354997253418e+02, 2.891555366210937e+02, 2.889515068817138e+02, 2.918945310974121e+02, 2.923845653533936e+02, 2.911149234008789e+02, 2.902886931610108e+02, 2.900902362060547e+02, 2.897959465789795e+02, 2.893476501464844e+02, 2.889990049743652e+02, 2.919732681274414e+02, 2.922787973022461e+02, 2.924650985717773e+02, 2.922421401977539e+02, 2.918018336486817e+02, 2.900393537139893e+02, 2.894426531982422e+02, 2.891165204620361e+02, 2.888694664001465e+02, 2.910377905273438e+02, 2.91933323059082e+02, 2.91754923248291e+02, 2.905633377075195e+02, 2.903947910308838e+02, 2.901207800292969e+02, 2.89664133605957e+02, 2.891969023132324e+02, 2.915715033721924e+02, 2.918594360351562e+02]
+Porch.TSensor=[2.931499938964844e+02, 2.902059387207031e+02, 2.895218829345703e+02, 2.890914999389648e+02, 2.88777360534668e+02, 2.916451868693034e+02, 2.914797933959961e+02, 2.909178498840332e+02, 2.899048992919922e+02, 2.893714277648926e+02, 2.890662033081055e+02, 2.886624117279053e+02, 2.883221130371094e+02, 2.91238705368042e+02, 2.910563069152832e+02, 2.907176094055176e+02, 2.911041381835938e+02, 2.89959871673584e+02, 2.884621871948242e+02, 2.879190488433838e+02, 2.875898391723633e+02, 2.873191537475586e+02, 2.897150482177734e+02, 2.907860906219482e+02, 2.920634234619141e+02, 2.955036315917969e+02, 2.962304945373535e+02, 2.943106996154785e+02, 2.92635798034668e+02, 2.916916452789307e+02, 2.913802970886231e+02, 2.912846397399903e+02, 2.912793054199219e+02, 2.913153203582764e+02, 2.911242367553711e+02, 2.893542484283447e+02, 2.886716739327567e+02, 2.882751690673828e+02, 2.879802165222168e+02, 2.8815751663208e+02, 2.905101654052735e+02, 2.910377518463135e+02, 2.932181115722656e+02, 2.946992839355469e+02, 2.942469973754883e+02, 2.93060876083374e+02, 2.921112777709961e+02, 2.910301341247558e+02, 2.909541320800781e+02, 2.910593486022949e+02, 2.911178016662598e+02, 2.911262915802002e+02, 2.892919696044922e+02, 2.88540203704834e+02, 2.881669885253907e+02, 2.879002750396729e+02, 2.876726495361328e+02, 2.907475894927979e+02, 2.905027281188965e+02, 2.902953486633301e+02, 2.91337075805664e+02, 2.918579720306396e+02, 2.900764184570313e+02, 2.885759006500244e+02, 2.876937719726562e+02, 2.90817191696167e+02, 2.906709100341797e+02, 2.908655591583252e+02, 2.90735842590332e+02, 2.894677995300293e+02, 2.883424026489258e+02, 2.87944504699707e+02, 2.877094326171875e+02, 2.875530827331543e+02, 2.904065191650391e+02, 2.909634494781494e+02, 2.904535327148437e+02, 2.900657400512695e+02, 2.901185829162598e+02, 2.894477397918701e+02, 2.884610961914062e+02, 2.878497853088379e+02, 2.906163244628906e+02, 2.9086671875e+02, 2.910038043212891e+02, 2.907939098358154e+02, 2.903648658752442e+02, 2.885102531433105e+02, 2.878530090332031e+02, 2.875356238555908e+02, 2.873047286987305e+02, 2.892256388854981e+02, 2.904717739868164e+02, 2.906570101165772e+02, 2.906783415222168e+02, 2.909828567504883e+02, 2.90259111328125e+02, 2.890718894195556e+02, 2.881075973510742e+02, 2.900667595672608e+02, 2.906199645996094e+02]
+bedRoom1.TSensor=[2.931499938964844e+02, 2.926989472198486e+02, 2.925481332397461e+02, 2.923838843536377e+02, 2.922191479492187e+02, 2.945421356201172e+02, 2.935626675415039e+02, 2.931259354400635e+02, 2.926300817871094e+02, 2.923464395141602e+02, 2.921066368103027e+02, 2.918468816375732e+02, 2.916423196411133e+02, 2.939045527648926e+02, 2.935043614196777e+02, 2.934165988922119e+02, 2.934424487304688e+02, 2.932595405578613e+02, 2.923420867919922e+02, 2.919061093902588e+02, 2.915721328735352e+02, 2.912976622009277e+02, 2.943535546875e+02, 2.931752318572998e+02, 2.93201318359375e+02, 2.932106742858887e+02, 2.933517289733887e+02, 2.935277610015869e+02, 2.939318075561524e+02, 2.936975777435303e+02, 2.93989363861084e+02, 2.938287071228027e+02, 2.93925546875e+02, 2.9419442237854e+02, 2.941565046691895e+02, 2.928588973999023e+02, 2.92311635219029e+02, 2.919422410583496e+02, 2.916747241210937e+02, 2.930549839019776e+02, 2.932514984130859e+02, 2.933067388916016e+02, 2.933821423339844e+02, 2.934869301757813e+02, 2.938787268066406e+02, 2.944793399810791e+02, 2.941294216918945e+02, 2.936825797271728e+02, 2.932247338867188e+02, 2.932476242828369e+02, 2.934378471374512e+02, 2.934494123840332e+02, 2.926178256225586e+02, 2.921569921112061e+02, 2.918471697998047e+02, 2.91566637802124e+02, 2.913177447509765e+02, 2.934785391998291e+02, 2.935508453369141e+02, 2.923695781707764e+02, 2.919059646606445e+02, 2.916402573394776e+02, 2.913670639038086e+02, 2.910494338989258e+02, 2.907733850097656e+02, 2.929640239715576e+02, 2.93129425201416e+02, 2.931324806213379e+02, 2.930540481567383e+02, 2.928306317901611e+02, 2.919026382446289e+02, 2.914595442199707e+02, 2.910924028320313e+02, 2.908485147094727e+02, 2.936227491760254e+02, 2.936799945831299e+02, 2.922472674560547e+02, 2.916337239074707e+02, 2.91289884185791e+02, 2.910474868774414e+02, 2.907662170410156e+02, 2.905463932037354e+02, 2.932207345581054e+02, 2.937837403869629e+02, 2.938251016235351e+02, 2.938535835266113e+02, 2.93585633392334e+02, 2.920541353607178e+02, 2.914702673339844e+02, 2.911111039733887e+02, 2.908398155212402e+02, 2.940390051269532e+02, 2.92775361328125e+02, 2.927256640625e+02, 2.917961528015137e+02, 2.914518447875977e+02, 2.911929248046875e+02, 2.909525649261475e+02, 2.907060377502441e+02, 2.939961993408203e+02, 2.925972595214844e+02]
+bathRoom.TSensor=[2.931499938964844e+02, 2.928657189178467e+02, 2.92735238647461e+02, 2.925952738952637e+02, 2.924493450927735e+02, 2.95319841003418e+02, 2.938961416625976e+02, 2.934590557861328e+02, 2.930176983642578e+02, 2.927113466644287e+02, 2.924584007263184e+02, 2.921934187316895e+02, 2.920004956054688e+02, 2.947584873962402e+02, 2.93796997680664e+02, 2.937221076965332e+02, 2.936531604003906e+02, 2.935608451080323e+02, 2.92712035522461e+02, 2.922903870391846e+02, 2.919689147949219e+02, 2.916940017700196e+02, 2.955351913452149e+02, 2.935316004943847e+02, 2.935776354980469e+02, 2.939619426727295e+02, 2.940916780090332e+02, 2.940114589691162e+02, 2.942887997436524e+02, 2.939547467041016e+02, 2.944862632751465e+02, 2.939213134002686e+02, 2.941341430664062e+02, 2.94333835067749e+02, 2.944231240844726e+02, 2.932474800109864e+02, 2.927320246233259e+02, 2.923693246459961e+02, 2.920976025390625e+02, 2.941141563415527e+02, 2.938890930175781e+02, 2.935763149261475e+02, 2.939429699707031e+02, 2.940512072753907e+02, 2.942229476928711e+02, 2.947230236053467e+02, 2.942189601135254e+02, 2.941517636871337e+02, 2.936434729003906e+02, 2.93494871673584e+02, 2.937970504760742e+02, 2.936187200164795e+02, 2.929373062133789e+02, 2.925301643371582e+02, 2.922332397460938e+02, 2.91957538986206e+02, 2.91705224609375e+02, 2.943072532653809e+02, 2.939020976257324e+02, 2.928065064239502e+02, 2.925140808105469e+02, 2.92319292678833e+02, 2.919461749267578e+02, 2.915829582977295e+02, 2.912945471191406e+02, 2.938447269439697e+02, 2.934186349487305e+02, 2.935916876220703e+02, 2.934031280517578e+02, 2.932266832733155e+02, 2.923476402282715e+02, 2.919029494476318e+02, 2.915348815917969e+02, 2.912758515167236e+02, 2.947091110229492e+02, 2.940644912719727e+02, 2.926760678100586e+02, 2.921428702545166e+02, 2.91809676361084e+02, 2.915454203796387e+02, 2.912390319824219e+02, 2.909981415557861e+02, 2.942737487792969e+02, 2.943871393585205e+02, 2.942590252685547e+02, 2.943575771331787e+02, 2.93857299194336e+02, 2.924582774353028e+02, 2.918988568115234e+02, 2.915420285797119e+02, 2.912657203674316e+02, 2.953848608398438e+02, 2.932669915771484e+02, 2.93045439529419e+02, 2.923678807067871e+02, 2.920894180297852e+02, 2.917844506835938e+02, 2.914815531921387e+02, 2.912101286315918e+02, 2.953277416992187e+02, 2.931340637207031e+02]
+stairWay.TSensor=[2.931499938964844e+02, 2.927350389099121e+02, 2.925319236755371e+02, 2.923548969268799e+02, 2.921851724243164e+02, 2.93834587097168e+02, 2.932761424255371e+02, 2.929827262878418e+02, 2.92587573852539e+02, 2.923170359802246e+02, 2.921106063842773e+02, 2.9188674659729e+02, 2.916894897460937e+02, 2.933064087677002e+02, 2.930775144958496e+02, 2.92976187133789e+02, 2.930439440917969e+02, 2.928031509399414e+02, 2.921181848144531e+02, 2.918046162414551e+02, 2.915481170654297e+02, 2.913191370391846e+02, 2.932831326293945e+02, 2.927400537872314e+02, 2.930070654296875e+02, 2.937562274932861e+02, 2.939400537109375e+02, 2.936226207733154e+02, 2.936159680175781e+02, 2.93422861328125e+02, 2.935819915771484e+02, 2.934804198455811e+02, 2.935383459472656e+02, 2.936835105895996e+02, 2.936321592712403e+02, 2.926929527282715e+02, 2.922987866210938e+02, 2.920212643432617e+02, 2.917921678161621e+02, 2.923652129364013e+02, 2.928705291748047e+02, 2.929826862335205e+02, 2.934137707519531e+02, 2.937064969482422e+02, 2.93832956237793e+02, 2.940031604766846e+02, 2.936756507873535e+02, 2.932532098388672e+02, 2.931209484863281e+02, 2.931437684631348e+02, 2.932684707641602e+02, 2.932556644439697e+02, 2.925873849487305e+02, 2.92223330078125e+02, 2.919685675048828e+02, 2.91730797958374e+02, 2.915064080810547e+02, 2.930394090270996e+02, 2.93025520324707e+02, 2.923497721099853e+02, 2.923077697753906e+02, 2.922370367431641e+02, 2.918302110290527e+02, 2.91460816192627e+02, 2.911667712402344e+02, 2.926750331878662e+02, 2.927088798522949e+02, 2.927614116668701e+02, 2.92712607421875e+02, 2.924023416137695e+02, 2.917767601013184e+02, 2.914866809082031e+02, 2.912320397949219e+02, 2.910307731628418e+02, 2.928701174926758e+02, 2.929454441070557e+02, 2.92093616027832e+02, 2.917484308624267e+02, 2.91569573059082e+02, 2.913480570220947e+02, 2.9106220703125e+02, 2.908355234527588e+02, 2.92599659576416e+02, 2.928908944702148e+02, 2.929904061889649e+02, 2.930181182861328e+02, 2.928255380249024e+02, 2.917628566741943e+02, 2.913863555908203e+02, 2.911414471435547e+02, 2.909327171325684e+02, 2.928641645050049e+02, 2.923371420288086e+02, 2.923475471496582e+02, 2.919246313476563e+02, 2.918132148742676e+02, 2.915593347167969e+02, 2.912515748596192e+02, 2.909806001281738e+02, 2.929846598815918e+02, 2.922784423828125e+02]
+bedRoom2.TSensor=[2.931499938964844e+02, 2.927056007385254e+02, 2.925866317749023e+02, 2.924499094390869e+02, 2.923062292480469e+02, 2.947633483886719e+02, 2.936033058166504e+02, 2.931424143218994e+02, 2.92641943359375e+02, 2.923838079071045e+02, 2.921472557067871e+02, 2.918696027374268e+02, 2.916864755249023e+02, 2.940214598846435e+02, 2.93769122467041e+02, 2.936912143707276e+02, 2.936069604492188e+02, 2.934148079681397e+02, 2.924299084472656e+02, 2.920034037780762e+02, 2.91678776550293e+02, 2.913952149200439e+02, 2.94839797668457e+02, 2.931697283935547e+02, 2.931596234130859e+02, 2.931075897216797e+02, 2.934760429382324e+02, 2.935394555664063e+02, 2.941145217895508e+02, 2.938818859100342e+02, 2.945849662780762e+02, 2.934978984069824e+02, 2.935233764648438e+02, 2.941180730438232e+02, 2.946815879821777e+02, 2.929544834136963e+02, 2.923579994419643e+02, 2.919702889251709e+02, 2.917077186584473e+02, 2.932403867340088e+02, 2.932555938720703e+02, 2.934198558044434e+02, 2.933861389160156e+02, 2.936567872314453e+02, 2.940195413208008e+02, 2.947231159210205e+02, 2.944090299987793e+02, 2.937998089599608e+02, 2.932811315917968e+02, 2.931726298522949e+02, 2.935553550720215e+02, 2.933815753936768e+02, 2.925666540527343e+02, 2.921298327636719e+02, 2.918410888671875e+02, 2.915500312805176e+02, 2.912894097900391e+02, 2.934572842407227e+02, 2.940062139892578e+02, 2.923014958190918e+02, 2.917704132080078e+02, 2.914337280273438e+02, 2.911629579162598e+02, 2.908561068725586e+02, 2.906069543457031e+02, 2.928961986541748e+02, 2.930705642700195e+02, 2.930961756896972e+02, 2.931474822998047e+02, 2.926754272460938e+02, 2.918207931518555e+02, 2.914166522979737e+02, 2.910288850097656e+02, 2.907867417144776e+02, 2.937791973876953e+02, 2.942039318084717e+02, 2.920839251708985e+02, 2.91480591430664e+02, 2.911192906188965e+02, 2.908962965393067e+02, 2.906160461425781e+02, 2.904064870452881e+02, 2.932320811462403e+02, 2.940926614379883e+02, 2.943463467407227e+02, 2.943821975708008e+02, 2.936108471679688e+02, 2.919696775054932e+02, 2.914360614013672e+02, 2.911060036468506e+02, 2.908439338684082e+02, 2.944866986846924e+02, 2.927159130859375e+02, 2.925965355682373e+02, 2.916616661071777e+02, 2.913171684265137e+02, 2.910522009277344e+02, 2.908472372436523e+02, 2.906139457702637e+02, 2.943409785461426e+02, 2.924904479980469e+02]
+bedRoom3.TSensor=[2.931499938964844e+02, 2.927854524993896e+02, 2.925739697265625e+02, 2.923999649047852e+02, 2.922332092285156e+02, 2.947301122029622e+02, 2.935999526977539e+02, 2.932585712432862e+02, 2.927995922851562e+02, 2.925090200042725e+02, 2.922460784912109e+02, 2.919239645385742e+02, 2.917854870605469e+02, 2.942357009124756e+02, 2.937614836120605e+02, 2.936686714172363e+02, 2.935820922851562e+02, 2.935105507659912e+02, 2.926493234252929e+02, 2.921616471099853e+02, 2.918238143920898e+02, 2.915238997650147e+02, 2.947999157714844e+02, 2.933697645568848e+02, 2.934604479980469e+02, 2.937513236999512e+02, 2.94115345916748e+02, 2.93995198135376e+02, 2.942124450683594e+02, 2.939521542358398e+02, 2.946296798706055e+02, 2.93775022277832e+02, 2.938633032226563e+02, 2.94147672958374e+02, 2.945168070983887e+02, 2.932410358428955e+02, 2.9263953125e+02, 2.922110446929931e+02, 2.919385633850098e+02, 2.934356935882568e+02, 2.935118835449219e+02, 2.935559690856933e+02, 2.938018225097656e+02, 2.940341608886719e+02, 2.941952435302734e+02, 2.94598754119873e+02, 2.942394107055664e+02, 2.939171683502196e+02, 2.935936987304688e+02, 2.934415790557861e+02, 2.937181434631348e+02, 2.935398783874512e+02, 2.927994857788086e+02, 2.923560832214355e+02, 2.920646380615235e+02, 2.917649997711181e+02, 2.914970983886719e+02, 2.938119354248047e+02, 2.940199476623535e+02, 2.927054644012451e+02, 2.923135360717773e+02, 2.920627951049805e+02, 2.917040893554687e+02, 2.913040975189209e+02, 2.910049768066406e+02, 2.933380313873291e+02, 2.933430577087402e+02, 2.934611713409424e+02, 2.933551239013672e+02, 2.930223460388184e+02, 2.922256202697754e+02, 2.917677854156494e+02, 2.913325002441406e+02, 2.910838198852539e+02, 2.940216101074218e+02, 2.942127532958984e+02, 2.926320895385742e+02, 2.920450199890137e+02, 2.916569476318359e+02, 2.914231818389893e+02, 2.910796264648437e+02, 2.908160094451904e+02, 2.936558190917969e+02, 2.941388327026367e+02, 2.943560247802735e+02, 2.944749584197998e+02, 2.937719218444824e+02, 2.923300442504883e+02, 2.917484936523438e+02, 2.913953673553467e+02, 2.911311653137207e+02, 2.94549771270752e+02, 2.93060422668457e+02, 2.929916059875488e+02, 2.92267709350586e+02, 2.919727638244629e+02, 2.916737365722656e+02, 2.914296995544433e+02, 2.91141307220459e+02, 2.946118454742432e+02, 2.929616394042969e+02]
+valBed1.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.365115358716429e-10, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.671569826999786e-10, 0e+00, 2.979746280470903e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.069804996717721e-05, 3.365087776328437e-03, 0e+00, 0e+00, 0e+00, 1.977135852757308e-04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.869661259464943e-02, 2.389013604260981e-03, 0e+00, 0e+00, 9.893055784051983e-04, 0e+00, 0e+00, 0e+00, 2.418729670811619e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.452924891141972e-03, 2.587360250763595e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.876636376138777e-05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.671540406089633e-10, 1.671569826999786e-10, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.82770882593451e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.671540961201146e-10, 0e+00]
+valBat2.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.365115358716429e-10, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.671569826999786e-10, 0e+00, 2.369516348608158e-05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.5619133238215e-05, 3.251434426783915e-04, 0e+00, 0e+00, 0e+00, 6.074391238144017e-05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.936001043766761e-02, 8.961842468124814e-06, 0e+00, 0e+00, 4.40617851927253e-06, 0e+00, 0e+00, 0e+00, 3.027034063304465e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.848698952424456e-05, 1.014650380820967e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.67150890351131e-10, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.671540406089633e-10, 1.671569826999786e-10, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.775155528808383e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.671540961201146e-10, 0e+00]
+valBat1.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.365115358716429e-10, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.671569826999786e-10, 0e+00, 2.369514529618755e-05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.561899499502033e-05, 3.251397677740995e-04, 0e+00, 0e+00, 0e+00, 6.074379232813954e-05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.870943889021896e-02, 8.961839739640709e-06, 0e+00, 0e+00, 4.406177067718987e-06, 0e+00, 0e+00, 0e+00, 3.02640645658992e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.848694223052007e-05, 1.014617189066484e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.67150890351131e-10, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.671540406089633e-10, 1.671569826999786e-10, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.773649223974345e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.671540961201146e-10, 0e+00]
+valBed2.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.365115358716429e-10, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.671569826999786e-10, 0e+00, 2.154641056222317e-05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.185576810617931e-05, 1.272027190716471e-03, 0e+00, 0e+00, 0e+00, 6.077786331380946e-05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.817132152617e-02, 1.264367211842701e-03, 0e+00, 0e+00, 8.347449766002119e-06, 0e+00, 0e+00, 0e+00, 3.116854132153265e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.928434110478888e-03, 1.418214819277993e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.046272445819341e-04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.705620838445611e-05, 1.671569826999786e-10, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.828860447974708e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.497300108894706e-04, 0e+00]
+valBed3.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.365115358716429e-10, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.671569826999786e-10, 0e+00, 1.670973253861674e-10, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.671520977186702e-10, 1.055120613018516e-03, 0e+00, 0e+00, 0e+00, 6.093476796195319e-05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.583015291020299e-02, 6.737920863088221e-04, 0e+00, 0e+00, 1.084705012908158e-05, 0e+00, 0e+00, 0e+00, 1.119417518610312e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.185050948058327e-04, 2.018574144458658e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.628402824280784e-04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.156346261268482e-04, 1.671569826999786e-10, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.50341316650139e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.671540961201146e-10, 0e+00]
+valGnd.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.524840012192383e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.214089810848236e-02, 0e+00, 9.212445700541139e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.213954955339432e-02, 9.210609056055546e-02, 0e+00, 0e+00, 0e+00, 9.213854664936662e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.744236618280408e-02, 9.21173021197319e-02, 0e+00, 0e+00, 9.213547110557556e-02, 0e+00, 0e+00, 0e+00, 9.159315627068272e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.207919798791409e-02, 9.209628172218799e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.213922172784805e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.214009344577789e-02, 9.214089810848236e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.165290011093027e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.214010834693909e-02, 0e+00]
+pump.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.524840620656464e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.214090555906296e-02, 0e+00, 9.517313959077005e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.239334613084793e-02, 9.844861542806031e-02, 0e+00, 0e+00, 0e+00, 9.257946325466029e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.082098990678799e-01, 9.646239578723886e-02, 0e+00, 0e+00, 9.315278273820891e-02, 0e+00, 0e+00, 0e+00, 1.641966104880063e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.03056030813604e-01, 1.001496968045837e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.245545417070389e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.229278564453125e-02, 9.214090555906296e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.588015300594187e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.228983521461487e-02, 0e+00]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_Tutorial_Example10.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_Tutorial_Example10.txt
index 3ed0029dd6..82636e0dcc 100644
--- a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_Tutorial_Example10.txt
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_Tutorial_Example10.txt
@@ -1,4 +1,4 @@
-last-generated=2024-10-30
+last-generated=2024-12-04
 statistics-initialization=
 {
   "nonlinear": "7, 7, 2, 2, 1, 1, 1, 0",
@@ -12,7 +12,7 @@ statistics-simulation=
   "numerical Jacobians": "0"
 }
 time=[1e+07, 1.1e+07]
-rectangularZoneTemplate.ppm=[4e+02, 4.619889526367188e+02, 4.167012023925781e+02, 4.045001220703125e+02, 4.012130126953125e+02, 4.003274230957031e+02, 4.000888366699219e+02, 4.000245666503906e+02, 4.000072631835938e+02, 4.000025939941406e+02, 4.000013427734375e+02, 4.000010070800781e+02, 4.000009155273438e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 1.001733520507812e+03, 1e+03, 1e+03, 1e+03, 5.516473388671875e+02, 4.4083984375e+02, 4.110021057128906e+02, 4.0296435546875e+02, 4.007991943359375e+02, 9.999957275390625e+02, 1e+03, 1e+03, 7.518633422851562e+02, 4.947963562011719e+02, 4.25539794921875e+02, 4.068813171386719e+02, 4.018545532226562e+02, 1.041068115234375e+03, 9.999994506835938e+02, 1e+03, 1e+03, 6.187280883789062e+02, 4.589219665527344e+02, 4.158740539550781e+02, 4.042772827148438e+02, 4.011529541015625e+02, 9.999088745117188e+02, 1e+03, 1e+03, 9.081140747070312e+02, 5.3644775390625e+02, 4.367583312988281e+02, 4.099032287597656e+02, 4.026686706542969e+02, 5.072425537109375e+02, 9.999884643554688e+02, 1e+03, 1e+03, 7.16934814453125e+02, 4.85105712890625e+02, 4.229132080078125e+02, 4.061689453125e+02, 4.016622009277344e+02, 4.004482116699219e+02, 4.001212768554688e+02, 4.000332946777344e+02, 4.000095825195312e+02, 4.000032348632812e+02, 4.000014953613281e+02, 4.000010375976562e+02, 4.000009155273438e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 7.019678955078125e+02, 1.0000048828125e+03, 1e+03, 1e+03, 6.851543579101562e+02, 4.767418823242188e+02, 4.206533508300781e+02, 4.05558837890625e+02, 4.0149658203125e+02, 9.934772338867188e+02, 1.000000061035156e+03, 1e+03, 1e+03, 5.776031494140625e+02, 4.477917785644531e+02, 4.128614807128906e+02, 4.034617614746094e+02, 4.009325561523438e+02]
-rectangularZoneTemplate1.ppm=[4e+02, 1.000680725097656e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1.000063415527344e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1.000001586914062e+03, 1e+03, 1e+03, 9.999832153320312e+02, 1e+03, 1e+03, 1e+03, 1e+03, 1.000258361816406e+03, 9.999998779296875e+02, 1e+03, 1e+03, 1.000000366210938e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1.000023132324219e+03, 1e+03, 1e+03, 9.996951293945312e+02, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 9.999981689453125e+02, 1e+03, 1e+03, 1.000003723144531e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1.000000427246094e+03, 1e+03, 1e+03, 1.000002563476562e+03, 1e+03, 1e+03, 1e+03, 1e+03, 9.99780517578125e+02, 1e+03, 1e+03, 1e+03, 9.999998779296875e+02, 1e+03, 1e+03, 1e+03, 1e+03]
-conPID1.y=[1.000000014901161e-01, 2.534231543540955e-01, 2.511081993579865e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.543134689331055e-01, 2.545689344406128e-01, 2.545689642429352e-01, 2.545689642429352e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.54595547914505e-01, 2.545689642429352e-01, 2.545689642429352e-01, 2.510594129562378e-01, 2.511083781719208e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.53369927406311e-01, 2.545686066150665e-01, 2.545689642429352e-01, 2.545689642429352e-01, 2.511070072650909e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.548888027667999e-01, 2.545689642429352e-01, 2.545689642429352e-01, 2.507182955741882e-01, 2.511084675788879e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.545661926269531e-01, 2.545689642429352e-01, 2.545689642429352e-01, 2.510710060596466e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.545634806156158e-01, 2.545689642429352e-01, 2.545689642429352e-01, 2.51129686832428e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.544636726379395e-01, 2.545692026615143e-01, 2.545689642429352e-01, 2.545689642429352e-01, 2.511081695556641e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01]
-conPID.y=[1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 6.166859269142151e-01, 6.146654486656189e-01, 6.146655678749084e-01, 6.146655678749084e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 6.148430705070496e-01, 6.146655678749084e-01, 6.146655678749084e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 6.567420363426208e-01, 6.146630048751831e-01, 6.146655678749084e-01, 6.146655678749084e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 6.186805367469788e-01, 6.146655082702637e-01, 6.146655678749084e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 6.146158576011658e-01, 6.146655678749084e-01, 6.146655678749084e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 6.146508455276489e-01, 6.146655678749084e-01, 6.146655678749084e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 5.860274434089661e-01, 6.146663427352905e-01, 6.146655678749084e-01, 6.146655678749084e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01]
+rectangularZoneTemplate.ppm=[4e+02, 4.619889526367188e+02, 4.167012023925781e+02, 4.045001220703125e+02, 4.012130126953125e+02, 4.003274230957031e+02, 4.000888366699219e+02, 4.000245666503906e+02, 4.000072631835938e+02, 4.000025939941406e+02, 4.000013427734375e+02, 4.000010070800781e+02, 4.000009155273438e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 1.001733520507812e+03, 1e+03, 1e+03, 1e+03, 5.519990234375e+02, 4.409502563476562e+02, 4.110323791503906e+02, 4.029725646972656e+02, 4.008013610839844e+02, 9.99994873046875e+02, 1e+03, 1e+03, 7.518633422851562e+02, 4.947951049804688e+02, 4.255394592285156e+02, 4.068812255859375e+02, 4.018545227050781e+02, 1.041106811523438e+03, 9.9999951171875e+02, 1e+03, 1e+03, 6.189216918945312e+02, 4.589765319824219e+02, 4.158878479003906e+02, 4.04281005859375e+02, 4.011539916992188e+02, 9.999019775390625e+02, 1e+03, 1e+03, 9.066947021484375e+02, 5.363548583984375e+02, 4.367302551269531e+02, 4.09894775390625e+02, 4.026662902832031e+02, 5.072419128417969e+02, 9.999884643554688e+02, 1e+03, 1e+03, 7.16816162109375e+02, 4.853542785644531e+02, 4.229960021972656e+02, 4.061960144042969e+02, 4.016698913574219e+02, 4.004505310058594e+02, 4.001220092773438e+02, 4.000335693359375e+02, 4.000096740722656e+02, 4.000032348632812e+02, 4.000014953613281e+02, 4.000010375976562e+02, 4.000009155273438e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 6.991200561523438e+02, 1.000004638671875e+03, 1e+03, 1e+03, 6.850235595703125e+02, 4.765068359375e+02, 4.205855712890625e+02, 4.055536193847656e+02, 4.014911499023438e+02, 9.935990600585938e+02, 1.000000061035156e+03, 1e+03, 1e+03, 5.778335571289062e+02, 4.478703002929688e+02, 4.128497924804688e+02, 4.034664611816406e+02, 4.009332885742188e+02]
+rectangularZoneTemplate1.ppm=[4e+02, 1.000680725097656e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1.000063415527344e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1.00000146484375e+03, 1e+03, 1e+03, 9.999832153320312e+02, 1e+03, 1e+03, 1e+03, 1e+03, 1.000258422851562e+03, 9.999998779296875e+02, 1e+03, 1e+03, 1.000000366210938e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1.000023071289062e+03, 1e+03, 1e+03, 9.99698486328125e+02, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 9.999981689453125e+02, 1e+03, 1e+03, 1.000002990722656e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1.000000305175781e+03, 1e+03, 1e+03, 1.000002746582031e+03, 1e+03, 1e+03, 1e+03, 1e+03, 9.99791748046875e+02, 1e+03, 1e+03, 1e+03, 9.999998779296875e+02, 1e+03, 1e+03, 1e+03, 1e+03]
+conPID1.y=[1.000000014901161e-01, 2.534231543540955e-01, 2.511081993579865e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.543134689331055e-01, 2.545689344406128e-01, 2.545689642429352e-01, 2.545689642429352e-01, 2.51108318567276e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.545950710773468e-01, 2.545689642429352e-01, 2.545689642429352e-01, 2.510594129562378e-01, 2.511083781719208e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.533684372901917e-01, 2.545686066150665e-01, 2.545689642429352e-01, 2.545689642429352e-01, 2.511070072650909e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.548917531967163e-01, 2.545689642429352e-01, 2.545689642429352e-01, 2.506577372550964e-01, 2.511084675788879e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.545661926269531e-01, 2.545689642429352e-01, 2.545689642429352e-01, 2.510738372802734e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.545632123947144e-01, 2.545689642429352e-01, 2.545689642429352e-01, 2.511321902275085e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.545098960399628e-01, 2.545691728591919e-01, 2.545689642429352e-01, 2.545689642429352e-01, 2.511081993579865e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01]
+conPID.y=[1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 6.166859269142151e-01, 6.146654486656189e-01, 6.146655678749084e-01, 6.146655678749084e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 6.148364543914795e-01, 6.146655678749084e-01, 6.146655678749084e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 6.568922400474548e-01, 6.146630644798279e-01, 6.146655678749084e-01, 6.146655678749084e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 6.186922192573547e-01, 6.146655082702637e-01, 6.146655678749084e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 6.146158576011658e-01, 6.146655678749084e-01, 6.146655678749084e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 6.146485805511475e-01, 6.146655678749084e-01, 6.146655678749084e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 5.884575843811035e-01, 6.146662831306458e-01, 6.146655678749084e-01, 6.146655678749084e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_Tutorial_Example6.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_Tutorial_Example6.txt
index 7b687fe8ed..2c5b90f0ae 100644
--- a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_Tutorial_Example6.txt
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_Tutorial_Example6.txt
@@ -1,4 +1,4 @@
-last-generated=2024-10-30
+last-generated=2024-12-04
 statistics-initialization=
 {
   "nonlinear": "7, 7, 5, 5, 0, 2",
@@ -12,8 +12,8 @@ statistics-simulation=
   "numerical Jacobians": "0"
 }
 time=[1e+07, 1.1e+07]
-rectangularZoneTemplate.TSensor=[2.931499938964844e+02, 2.933516540527344e+02, 2.934883117675781e+02, 2.935362243652344e+02, 2.935664367675781e+02, 2.9360595703125e+02, 2.937015991210938e+02, 2.937844848632812e+02, 2.938014221191406e+02, 2.937838439941406e+02, 2.937321166992188e+02, 2.936959228515625e+02, 2.936678771972656e+02, 2.936490173339844e+02, 2.936863098144531e+02, 2.937556762695312e+02, 2.937997741699219e+02, 2.93824462890625e+02, 2.937914733886719e+02, 2.937495727539062e+02, 2.937023010253906e+02, 2.936612243652344e+02, 2.936902465820312e+02, 2.937887268066406e+02, 2.93901611328125e+02, 2.939739379882812e+02, 2.939374084472656e+02, 2.938580017089844e+02, 2.938006286621094e+02, 2.937579345703125e+02, 2.937294311523438e+02, 2.937483520507812e+02, 2.938024291992188e+02, 2.938766784667969e+02, 2.939107055664062e+02, 2.938680725097656e+02, 2.937937927246094e+02, 2.937313537597656e+02, 2.936866149902344e+02, 2.937022094726562e+02, 2.937514953613281e+02, 2.93840087890625e+02, 2.938985900878906e+02, 2.938697204589844e+02, 2.937900390625e+02, 2.937373352050781e+02, 2.936898803710938e+02, 2.936519165039062e+02, 2.936943359375e+02, 2.937613830566406e+02, 2.938271179199219e+02, 2.938686828613281e+02, 2.938842163085938e+02, 2.938268737792969e+02, 2.937642211914062e+02, 2.93700439453125e+02, 2.936873168945312e+02, 2.937473449707031e+02, 2.938933715820312e+02, 2.940720520019531e+02, 2.942605285644531e+02, 2.94207763671875e+02, 2.939737243652344e+02, 2.938844604492188e+02, 2.938104248046875e+02, 2.938426208496094e+02, 2.938761291503906e+02, 2.9397998046875e+02, 2.940526733398438e+02, 2.940974426269531e+02, 2.939649963378906e+02, 2.938338317871094e+02, 2.93755126953125e+02, 2.936986083984375e+02, 2.93754150390625e+02, 2.938632507324219e+02, 2.939915161132812e+02, 2.941471862792969e+02, 2.941894226074219e+02, 2.939971313476562e+02, 2.938665466308594e+02, 2.937906494140625e+02, 2.937941589355469e+02, 2.938398132324219e+02, 2.939971923828125e+02, 2.942143859863281e+02, 2.944202270507812e+02, 2.945837097167969e+02, 2.944221496582031e+02, 2.941621398925781e+02, 2.939332885742188e+02, 2.940266418457031e+02, 2.941367797851562e+02, 2.945903930664062e+02, 2.949760131835938e+02, 2.9522802734375e+02, 2.953689880371094e+02, 2.951278991699219e+02, 2.949371948242188e+02, 2.947583312988281e+02, 2.949676208496094e+02]
-rectangularZoneTemplate1.TSensor=[2.931499938964844e+02, 2.93358642578125e+02, 2.934993286132812e+02, 2.935440368652344e+02, 2.935722351074219e+02, 2.93614013671875e+02, 2.939535217285156e+02, 2.951249389648438e+02, 2.952263793945312e+02, 2.946049499511719e+02, 2.941665954589844e+02, 2.9387548828125e+02, 2.937833862304688e+02, 2.937254028320312e+02, 2.937709350585938e+02, 2.940748596191406e+02, 2.9466943359375e+02, 2.947215270996094e+02, 2.942566833496094e+02, 2.939211120605469e+02, 2.938044128417969e+02, 2.937270812988281e+02, 2.937247924804688e+02, 2.940045776367188e+02, 2.953958740234375e+02, 2.954736328125e+02, 2.951650085449219e+02, 2.947873840332031e+02, 2.944126892089844e+02, 2.940408325195312e+02, 2.938675537109375e+02, 2.938546142578125e+02, 2.939459838867188e+02, 2.94191650390625e+02, 2.945367736816406e+02, 2.942126770019531e+02, 2.938927001953125e+02, 2.937898254394531e+02, 2.937236938476562e+02, 2.937026062011719e+02, 2.93829833984375e+02, 2.946434631347656e+02, 2.955906372070312e+02, 2.951929321289062e+02, 2.945975646972656e+02, 2.941233215332031e+02, 2.938399658203125e+02, 2.937475280761719e+02, 2.937483215332031e+02, 2.940788879394531e+02, 2.95622314453125e+02, 2.964872741699219e+02, 2.959057922363281e+02, 2.95432373046875e+02, 2.949733276367188e+02, 2.944266052246094e+02, 2.939078369140625e+02, 2.939639587402344e+02, 2.953249206542969e+02, 2.968030090332031e+02, 2.970078125e+02, 2.964745788574219e+02, 2.960539245605469e+02, 2.956799011230469e+02, 2.952684326171875e+02, 2.948971862792969e+02, 2.951349487304688e+02, 2.967474975585938e+02, 2.978927612304688e+02, 2.975284423828125e+02, 2.969274597167969e+02, 2.963793334960938e+02, 2.957995300292969e+02, 2.952218017578125e+02, 2.949026184082031e+02, 2.957697143554688e+02, 2.974472351074219e+02, 2.9771142578125e+02, 2.97328369140625e+02, 2.968549194335938e+02, 2.96378662109375e+02, 2.958915710449219e+02, 2.953839416503906e+02, 2.953645324707031e+02, 2.968760070800781e+02, 2.984861450195312e+02, 2.986652526855469e+02, 2.98135498046875e+02, 2.977667236328125e+02, 2.97325927734375e+02, 2.968751220703125e+02, 2.965437927246094e+02, 2.969910278320312e+02, 2.988793334960938e+02, 3.001080932617188e+02, 2.99817626953125e+02, 2.994358215332031e+02, 2.99025634765625e+02, 2.986403503417969e+02, 2.982621459960938e+02, 2.981437683105469e+02]
-heaPum.con.T=[2.931499938964844e+02, 3.166233825683594e+02, 3.266098022460938e+02, 3.315053405761719e+02, 3.349197387695312e+02, 3.396166381835938e+02, 3.370910949707031e+02, 3.396752319335938e+02, 3.398566284179688e+02, 3.363102111816406e+02, 3.355005493164062e+02, 3.352831115722656e+02, 3.36606689453125e+02, 3.392500610351562e+02, 3.383901977539062e+02, 3.387282104492188e+02, 3.399388122558594e+02, 3.37468505859375e+02, 3.388641967773438e+02, 3.371146240234375e+02, 3.379045104980469e+02, 3.372695617675781e+02, 3.364384765625e+02, 3.355973815917969e+02, 3.398589477539062e+02, 3.39375732421875e+02, 3.373624572753906e+02, 3.365320434570312e+02, 3.380993347167969e+02, 3.35572509765625e+02, 3.369102172851562e+02, 3.381972351074219e+02, 3.389598388671875e+02, 3.364597473144531e+02, 3.377872619628906e+02, 3.356937561035156e+02, 3.385130310058594e+02, 3.377765197753906e+02, 3.356822814941406e+02, 3.401824035644531e+02, 3.362869262695312e+02, 3.358510437011719e+02, 3.356829528808594e+02, 3.355560607910156e+02, 3.387537841796875e+02, 3.393322448730469e+02, 3.392909545898438e+02, 3.388125610351562e+02, 3.352705383300781e+02, 3.390477600097656e+02, 3.355920715332031e+02, 3.387311401367188e+02, 3.379045715332031e+02, 3.401666259765625e+02, 3.36734375e+02, 3.401216735839844e+02, 3.354548645019531e+02, 3.368735656738281e+02, 3.397428588867188e+02, 3.353045959472656e+02, 3.352832641601562e+02, 3.352744140625e+02, 3.379791564941406e+02, 3.40136962890625e+02, 3.352507019042969e+02, 3.369282836914062e+02, 3.399358520507812e+02, 3.379776306152344e+02, 3.387112426757812e+02, 3.385490417480469e+02, 3.362630920410156e+02, 3.395632934570312e+02, 3.3952978515625e+02, 3.375877685546875e+02, 3.353452758789062e+02, 3.388434448242188e+02, 3.387732849121094e+02, 3.373836669921875e+02, 3.373744506835938e+02, 3.367750244140625e+02, 3.402091064453125e+02, 3.371082763671875e+02, 3.370176086425781e+02, 3.372793273925781e+02, 3.394346008300781e+02, 3.384580078125e+02, 3.384486694335938e+02, 3.384393310546875e+02, 3.384299621582031e+02, 3.384205322265625e+02, 3.393558959960938e+02, 3.383511352539062e+02, 3.360448303222656e+02, 3.360359191894531e+02, 3.360272521972656e+02, 3.360186767578125e+02, 3.360101318359375e+02, 3.360015258789062e+02, 3.359928588867188e+02, 3.35984130859375e+02, 3.35975341796875e+02]
-senTemSup.T=[2.931499938964844e+02, 3.027041320800781e+02, 3.108938598632812e+02, 3.175636596679688e+02, 3.229031982421875e+02, 3.270995788574219e+02, 3.295328674316406e+02, 3.303586120605469e+02, 3.308964233398438e+02, 3.314189758300781e+02, 3.320031433105469e+02, 3.327098693847656e+02, 3.336025695800781e+02, 3.3455615234375e+02, 3.353377990722656e+02, 3.357068481445312e+02, 3.358912048339844e+02, 3.360258483886719e+02, 3.361492004394531e+02, 3.362973937988281e+02, 3.365129699707031e+02, 3.367773742675781e+02, 3.370265197753906e+02, 3.371630554199219e+02, 3.372024841308594e+02, 3.372204284667969e+02, 3.37235595703125e+02, 3.372576293945312e+02, 3.372893981933594e+02, 3.373280639648438e+02, 3.373770751953125e+02, 3.374277648925781e+02, 3.37462890625e+02, 3.374799194335938e+02, 3.374897766113281e+02, 3.374994201660156e+02, 3.375150451660156e+02, 3.375424194335938e+02, 3.375814514160156e+02, 3.3763037109375e+02, 3.376669006347656e+02, 3.376790161132812e+02, 3.376844787597656e+02, 3.376888122558594e+02, 3.376943664550781e+02, 3.377011108398438e+02, 3.377091369628906e+02, 3.377211303710938e+02, 3.377380065917969e+02, 3.377479858398438e+02, 3.377512512207031e+02, 3.377528686523438e+02, 3.377538146972656e+02, 3.377545776367188e+02, 3.377551574707031e+02, 3.377542419433594e+02, 3.377535095214844e+02, 3.377535400390625e+02, 3.3775244140625e+02, 3.377521362304688e+02, 3.377521362304688e+02, 3.377521362304688e+02, 3.377517700195312e+02, 3.377514343261719e+02, 3.377502136230469e+02, 3.377488098144531e+02, 3.377476501464844e+02, 3.377470092773438e+02, 3.377468872070312e+02, 3.377469482421875e+02, 3.377469482421875e+02, 3.377461853027344e+02, 3.377448120117188e+02, 3.377438049316406e+02, 3.377432250976562e+02, 3.377422790527344e+02, 3.377417907714844e+02, 3.377418212890625e+02, 3.377418212890625e+02, 3.377418518066406e+02, 3.377412719726562e+02, 3.377402648925781e+02, 3.377392883300781e+02, 3.377384948730469e+02, 3.377379760742188e+02, 3.377380065917969e+02, 3.377380065917969e+02, 3.377380065917969e+02, 3.377380065917969e+02, 3.377380065917969e+02, 3.377379150390625e+02, 3.37737548828125e+02, 3.377375793457031e+02, 3.377375793457031e+02, 3.377375793457031e+02, 3.377375793457031e+02, 3.377375793457031e+02, 3.377375793457031e+02, 3.377375793457031e+02, 3.377375793457031e+02, 3.377376098632812e+02]
-heaPum.QCon_flow=[0e+00, 6.310774536132812e+02, 6.041836547851562e+02, 5.880996704101562e+02, 5.741981201171875e+02, 5.47104736328125e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.8949365234375e+02, 0e+00, 0e+00, 0e+00, 5.539735107421875e+02, 0e+00, 0e+00, 0e+00, 5.73601318359375e+02, 5.758492431640625e+02, 5.90625244140625e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.911699829101562e+02, 0e+00, 0e+00, 5.999429321289062e+02, 0e+00, 0e+00, 0e+00, 0e+00, 6.044892578125e+02, 0e+00, 6.010406494140625e+02, 0e+00, 0e+00, 0e+00, 0e+00, 5.607674560546875e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.939022827148438e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.585873413085938e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+rectangularZoneTemplate.TSensor=[2.931499938964844e+02, 2.933523864746094e+02, 2.934900512695312e+02, 2.935381469726562e+02, 2.935686340332031e+02, 2.936085815429688e+02, 2.93704345703125e+02, 2.937875671386719e+02, 2.938036499023438e+02, 2.937865600585938e+02, 2.937344055175781e+02, 2.936980895996094e+02, 2.936699829101562e+02, 2.936512145996094e+02, 2.936888732910156e+02, 2.937579956054688e+02, 2.93802001953125e+02, 2.938266296386719e+02, 2.93793212890625e+02, 2.937516479492188e+02, 2.937042846679688e+02, 2.936632385253906e+02, 2.936922912597656e+02, 2.937916870117188e+02, 2.939043273925781e+02, 2.939774780273438e+02, 2.939399719238281e+02, 2.938603515625e+02, 2.93802734375e+02, 2.937598876953125e+02, 2.937313842773438e+02, 2.937506103515625e+02, 2.938048706054688e+02, 2.938791198730469e+02, 2.939129638671875e+02, 2.938699035644531e+02, 2.937957458496094e+02, 2.937332458496094e+02, 2.936885986328125e+02, 2.937049865722656e+02, 2.937540893554688e+02, 2.938427429199219e+02, 2.939019165039062e+02, 2.938723449707031e+02, 2.937923583984375e+02, 2.937395629882812e+02, 2.936920776367188e+02, 2.936540832519531e+02, 2.936961975097656e+02, 2.937643127441406e+02, 2.938300476074219e+02, 2.938717651367188e+02, 2.938873291015625e+02, 2.938297424316406e+02, 2.937667236328125e+02, 2.937027893066406e+02, 2.936908264160156e+02, 2.9375048828125e+02, 2.938970642089844e+02, 2.940801696777344e+02, 2.942716064453125e+02, 2.942184753417969e+02, 2.939833068847656e+02, 2.938884582519531e+02, 2.938134155273438e+02, 2.938464660644531e+02, 2.938799743652344e+02, 2.939855041503906e+02, 2.940628662109375e+02, 2.941098937988281e+02, 2.939751586914062e+02, 2.938380126953125e+02, 2.937584228515625e+02, 2.937015686035156e+02, 2.93756591796875e+02, 2.938672790527344e+02, 2.939976806640625e+02, 2.941589965820312e+02, 2.942027587890625e+02, 2.940099792480469e+02, 2.938712768554688e+02, 2.937940673828125e+02, 2.937989807128906e+02, 2.938439331054688e+02, 2.940034790039062e+02, 2.94227294921875e+02, 2.944347839355469e+02, 2.945998840332031e+02, 2.944380798339844e+02, 2.941791381835938e+02, 2.939412841796875e+02, 2.940374145507812e+02, 2.941524047851562e+02, 2.946098937988281e+02, 2.949959716796875e+02, 2.952477722167969e+02, 2.953879089355469e+02, 2.951501770019531e+02, 2.949606018066406e+02, 2.947821960449219e+02, 2.949915771484375e+02]
+rectangularZoneTemplate1.TSensor=[2.931499938964844e+02, 2.933594665527344e+02, 2.935010986328125e+02, 2.935459899902344e+02, 2.93574462890625e+02, 2.9361669921875e+02, 2.939597473144531e+02, 2.951441345214844e+02, 2.952436828613281e+02, 2.946197509765625e+02, 2.941831970214844e+02, 2.938807678222656e+02, 2.937868041992188e+02, 2.93728271484375e+02, 2.937748107910156e+02, 2.940847473144531e+02, 2.94687744140625e+02, 2.947355041503906e+02, 2.942702331542969e+02, 2.939284973144531e+02, 2.938076477050781e+02, 2.937296447753906e+02, 2.937278442382812e+02, 2.940132141113281e+02, 2.95415283203125e+02, 2.954900817871094e+02, 2.95178955078125e+02, 2.948018493652344e+02, 2.944273986816406e+02, 2.940555419921875e+02, 2.938716125488281e+02, 2.938584594726562e+02, 2.93951171875e+02, 2.94204345703125e+02, 2.945511474609375e+02, 2.942237548828125e+02, 2.938967590332031e+02, 2.9379248046875e+02, 2.9372607421875e+02, 2.937052917480469e+02, 2.938345031738281e+02, 2.946595764160156e+02, 2.95611083984375e+02, 2.952068176269531e+02, 2.946127624511719e+02, 2.941391906738281e+02, 2.93843994140625e+02, 2.937503967285156e+02, 2.937516479492188e+02, 2.940898132324219e+02, 2.956492309570312e+02, 2.965140380859375e+02, 2.959252014160156e+02, 2.95453857421875e+02, 2.94994873046875e+02, 2.944481811523438e+02, 2.939203491210938e+02, 2.93972900390625e+02, 2.953547668457031e+02, 2.968370361328125e+02, 2.97036865234375e+02, 2.965022888183594e+02, 2.960826721191406e+02, 2.957080993652344e+02, 2.952956237792969e+02, 2.949251708984375e+02, 2.951705017089844e+02, 2.967910461425781e+02, 2.979384765625e+02, 2.975653381347656e+02, 2.969655456542969e+02, 2.96417236328125e+02, 2.958368530273438e+02, 2.95259033203125e+02, 2.94942138671875e+02, 2.958190612792969e+02, 2.974989318847656e+02, 2.977614135742188e+02, 2.973721008300781e+02, 2.968995056152344e+02, 2.964228820800781e+02, 2.959346618652344e+02, 2.954268798828125e+02, 2.954111022949219e+02, 2.969325866699219e+02, 2.985476989746094e+02, 2.987189025878906e+02, 2.981877746582031e+02, 2.978192749023438e+02, 2.973772583007812e+02, 2.969253234863281e+02, 2.965946655273438e+02, 2.970494079589844e+02, 2.989425354003906e+02, 3.001731262207031e+02, 2.998734436035156e+02, 2.994929504394531e+02, 2.990821228027344e+02, 2.986960144042969e+02, 2.983162231445312e+02, 2.981988220214844e+02]
+heaPum.con.T=[2.931499938964844e+02, 3.166568298339844e+02, 3.267539367675781e+02, 3.316985473632812e+02, 3.351641845703125e+02, 3.399205627441406e+02, 3.36724609375e+02, 3.359006652832031e+02, 3.384154052734375e+02, 3.369988403320312e+02, 3.383976440429688e+02, 3.359493408203125e+02, 3.356868591308594e+02, 3.361740112304688e+02, 3.381758117675781e+02, 3.377802124023438e+02, 3.357451171875e+02, 3.364346923828125e+02, 3.381941833496094e+02, 3.398353576660156e+02, 3.401585693359375e+02, 3.397799987792969e+02, 3.373278198242188e+02, 3.393355712890625e+02, 3.399499206542969e+02, 3.36080078125e+02, 3.355427551269531e+02, 3.361237487792969e+02, 3.396195068359375e+02, 3.391288757324219e+02, 3.355447387695312e+02, 3.354908142089844e+02, 3.400905456542969e+02, 3.386864929199219e+02, 3.375513305664062e+02, 3.367659912109375e+02, 3.368270874023438e+02, 3.389006652832031e+02, 3.361573486328125e+02, 3.37107177734375e+02, 3.399062805175781e+02, 3.374054870605469e+02, 3.392552490234375e+02, 3.357243957519531e+02, 3.356834106445312e+02, 3.388534240722656e+02, 3.390687255859375e+02, 3.399070129394531e+02, 3.362354125976562e+02, 3.377046203613281e+02, 3.398153991699219e+02, 3.396456298828125e+02, 3.355242309570312e+02, 3.397307434082031e+02, 3.388275146484375e+02, 3.378051452636719e+02, 3.360181579589844e+02, 3.393893127441406e+02, 3.357220458984375e+02, 3.379912719726562e+02, 3.379750366210938e+02, 3.379656066894531e+02, 3.364763488769531e+02, 3.361270446777344e+02, 3.395174865722656e+02, 3.384042358398438e+02, 3.383047790527344e+02, 3.390067749023438e+02, 3.35713134765625e+02, 3.356346435546875e+02, 3.390709228515625e+02, 3.359206848144531e+02, 3.381233825683594e+02, 3.391715698242188e+02, 3.399432373046875e+02, 3.394736328125e+02, 3.376697692871094e+02, 3.366524047851562e+02, 3.366433410644531e+02, 3.36306884765625e+02, 3.380685119628906e+02, 3.383453674316406e+02, 3.355768127441406e+02, 3.390038757324219e+02, 3.386630249023438e+02, 3.379513549804688e+02, 3.379421081542969e+02, 3.379329223632812e+02, 3.379236755371094e+02, 3.379143371582031e+02, 3.36068359375e+02, 3.384317016601562e+02, 3.36987060546875e+02, 3.369779357910156e+02, 3.369690856933594e+02, 3.369603271484375e+02, 3.369515686035156e+02, 3.369427490234375e+02, 3.369338684082031e+02, 3.369249572753906e+02, 3.369159851074219e+02]
+senTemSup.T=[2.931499938964844e+02, 3.027024230957031e+02, 3.108856201171875e+02, 3.175692749023438e+02, 3.229349670410156e+02, 3.271602783203125e+02, 3.295732727050781e+02, 3.303892211914062e+02, 3.309205627441406e+02, 3.314375610351562e+02, 3.320159912109375e+02, 3.327100524902344e+02, 3.335906372070312e+02, 3.345355224609375e+02, 3.353108520507812e+02, 3.356756286621094e+02, 3.358596496582031e+02, 3.359942626953125e+02, 3.361178588867188e+02, 3.362656860351562e+02, 3.36481689453125e+02, 3.367484130859375e+02, 3.370001220703125e+02, 3.371376953125e+02, 3.371776428222656e+02, 3.371956787109375e+02, 3.372110595703125e+02, 3.372335510253906e+02, 3.372660522460938e+02, 3.373058471679688e+02, 3.373560180664062e+02, 3.37408203125e+02, 3.374443664550781e+02, 3.374619750976562e+02, 3.374722290039062e+02, 3.374823303222656e+02, 3.3749853515625e+02, 3.375272216796875e+02, 3.375681457519531e+02, 3.376187438964844e+02, 3.376561889648438e+02, 3.376686706542969e+02, 3.376743774414062e+02, 3.376789245605469e+02, 3.376848449707031e+02, 3.376921691894531e+02, 3.377009887695312e+02, 3.377139892578125e+02, 3.377314147949219e+02, 3.3774169921875e+02, 3.377451477050781e+02, 3.377469482421875e+02, 3.37748046875e+02, 3.377489929199219e+02, 3.377498474121094e+02, 3.377502746582031e+02, 3.377499389648438e+02, 3.377500610351562e+02, 3.377491760253906e+02, 3.377488708496094e+02, 3.377488708496094e+02, 3.377488708496094e+02, 3.377489318847656e+02, 3.377483215332031e+02, 3.377471923828125e+02, 3.377459411621094e+02, 3.377449035644531e+02, 3.377443237304688e+02, 3.377443542480469e+02, 3.377444152832031e+02, 3.377442016601562e+02, 3.377436218261719e+02, 3.377423706054688e+02, 3.377415161132812e+02, 3.377410278320312e+02, 3.377402648925781e+02, 3.377398071289062e+02, 3.377398376464844e+02, 3.377398376464844e+02, 3.377398681640625e+02, 3.377393493652344e+02, 3.377384033203125e+02, 3.37737548828125e+02, 3.377367858886719e+02, 3.377363586425781e+02, 3.377363891601562e+02, 3.377363891601562e+02, 3.377363891601562e+02, 3.377363891601562e+02, 3.377363891601562e+02, 3.377363891601562e+02, 3.377360229492188e+02, 3.377360534667969e+02, 3.377360534667969e+02, 3.377360534667969e+02, 3.377360534667969e+02, 3.377360534667969e+02, 3.377360534667969e+02, 3.377360534667969e+02, 3.377360534667969e+02, 3.377360534667969e+02]
+heaPum.QCon_flow=[0e+00, 6.30992431640625e+02, 6.037505493164062e+02, 5.873876342773438e+02, 5.730702514648438e+02, 5.447786865234375e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.059801635742188e+02, 6.064074096679688e+02, 0e+00, 5.681343994140625e+02, 0e+00, 0e+00, 6.014746704101562e+02, 0e+00, 0e+00, 0e+00, 5.473164672851562e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.159716796875e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.518604125976562e+02, 0e+00, 0e+00, 0e+00, 6.1403466796875e+02, 0e+00, 5.598495483398438e+02, 5.46303466796875e+02, 5.960327758789062e+02, 5.826287231445312e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.590516357421875e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_Tutorial_Example7.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_Tutorial_Example7.txt
index 27f2b1bde0..bfe7b4bd97 100644
--- a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_Tutorial_Example7.txt
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_Tutorial_Example7.txt
@@ -1,4 +1,4 @@
-last-generated=2024-10-30
+last-generated=2024-12-04
 statistics-initialization=
 {
   "nonlinear": "7, 7, 5, 5, 0, 2",
@@ -12,8 +12,8 @@ statistics-simulation=
   "numerical Jacobians": "0"
 }
 time=[1e+07, 1.1e+07]
-rectangularZoneTemplate.TSensor=[2.931499938964844e+02, 2.933516540527344e+02, 2.934883117675781e+02, 2.935362243652344e+02, 2.935007934570312e+02, 2.934945983886719e+02, 2.936316223144531e+02, 2.937230834960938e+02, 2.937348327636719e+02, 2.936990356445312e+02, 2.93616455078125e+02, 2.935720520019531e+02, 2.935614929199219e+02, 2.93490966796875e+02, 2.935226745605469e+02, 2.9365234375e+02, 2.937159423828125e+02, 2.9374169921875e+02, 2.936958923339844e+02, 2.936200561523438e+02, 2.935468444824219e+02, 2.93530517578125e+02, 2.935120239257812e+02, 2.936599426269531e+02, 2.938154907226562e+02, 2.939053955078125e+02, 2.938729248046875e+02, 2.937855834960938e+02, 2.937203369140625e+02, 2.936581726074219e+02, 2.935902709960938e+02, 2.936051330566406e+02, 2.936976623535156e+02, 2.937993469238281e+02, 2.93844970703125e+02, 2.938020629882812e+02, 2.937122192382812e+02, 2.936029663085938e+02, 2.935182189941406e+02, 2.935761413574219e+02, 2.935928344726562e+02, 2.937264709472656e+02, 2.938080444335938e+02, 2.937830505371094e+02, 2.936920471191406e+02, 2.936336669921875e+02, 2.935525207519531e+02, 2.934400939941406e+02, 2.935544128417969e+02, 2.936382446289062e+02, 2.937132873535156e+02, 2.9376171875e+02, 2.937853393554688e+02, 2.937172241210938e+02, 2.936399230957031e+02, 2.935680847167969e+02, 2.935548400878906e+02, 2.935993347167969e+02, 2.937867431640625e+02, 2.939924926757812e+02, 2.941632385253906e+02, 2.941105651855469e+02, 2.939015197753906e+02, 2.937985534667969e+02, 2.937061157226562e+02, 2.937472839355469e+02, 2.937944641113281e+02, 2.939208984375e+02, 2.939959106445312e+02, 2.940328674316406e+02, 2.939135437011719e+02, 2.937658996582031e+02, 2.936676025390625e+02, 2.935631408691406e+02, 2.936138916015625e+02, 2.937593688964844e+02, 2.939228515625e+02, 2.940713806152344e+02, 2.941107788085938e+02, 2.939287109375e+02, 2.937876892089844e+02, 2.936944885253906e+02, 2.936962890625e+02, 2.937623596191406e+02, 2.939456176757812e+02, 2.941517333984375e+02, 2.943559875488281e+02, 2.945210571289062e+02, 2.943611145019531e+02, 2.941026306152344e+02, 2.938900451660156e+02, 2.939861145019531e+02, 2.940953979492188e+02, 2.945445861816406e+02, 2.949313659667969e+02, 2.951846618652344e+02, 2.953267822265625e+02, 2.950865783691406e+02, 2.948967590332031e+02, 2.947189331054688e+02, 2.949292602539062e+02]
-rectangularZoneTemplate1.TSensor=[2.931499938964844e+02, 2.93358642578125e+02, 2.934993286132812e+02, 2.935440368652344e+02, 2.935048522949219e+02, 2.9350146484375e+02, 2.939106750488281e+02, 2.950848999023438e+02, 2.951866760253906e+02, 2.945662231445312e+02, 2.941287231445312e+02, 2.938240661621094e+02, 2.937205505371094e+02, 2.936167907714844e+02, 2.936549377441406e+02, 2.940213928222656e+02, 2.946040649414062e+02, 2.946566162109375e+02, 2.941933288574219e+02, 2.938671875e+02, 2.937079467773438e+02, 2.936319274902344e+02, 2.935708923339844e+02, 2.939224548339844e+02, 2.953111877441406e+02, 2.953897705078125e+02, 2.950833435058594e+02, 2.947080688476562e+02, 2.943356323242188e+02, 2.939681091308594e+02, 2.937888488769531e+02, 2.937623596191406e+02, 2.938818969726562e+02, 2.941311950683594e+02, 2.944720764160156e+02, 2.941492309570312e+02, 2.938405456542969e+02, 2.936927490234375e+02, 2.935821533203125e+02, 2.935843505859375e+02, 2.937019653320312e+02, 2.945561218261719e+02, 2.955005187988281e+02, 2.9510498046875e+02, 2.945120239257812e+02, 2.940401611328125e+02, 2.937630310058594e+02, 2.936109313964844e+02, 2.936350402832031e+02, 2.940107116699219e+02, 2.955380249023438e+02, 2.964036865234375e+02, 2.958243713378906e+02, 2.953530883789062e+02, 2.948960266113281e+02, 2.943511352539062e+02, 2.938518981933594e+02, 2.93896240234375e+02, 2.952599792480469e+02, 2.967382202148438e+02, 2.969447021484375e+02, 2.964130554199219e+02, 2.959938354492188e+02, 2.956212768554688e+02, 2.952112731933594e+02, 2.948413391113281e+02, 2.950803527832031e+02, 2.966943664550781e+02, 2.978410949707031e+02, 2.974782409667969e+02, 2.968786010742188e+02, 2.963317260742188e+02, 2.957531127929688e+02, 2.951764221191406e+02, 2.948580322265625e+02, 2.957259521484375e+02, 2.974043273925781e+02, 2.976695251464844e+02, 2.972874145507812e+02, 2.968148803710938e+02, 2.963394775390625e+02, 2.958532104492188e+02, 2.953462829589844e+02, 2.953275146484375e+02, 2.9683984375e+02, 2.984508666992188e+02, 2.986309204101562e+02, 2.981018371582031e+02, 2.977338256835938e+02, 2.972937622070312e+02, 2.968436584472656e+02, 2.965130310058594e+02, 2.969610595703125e+02, 2.988502197265625e+02, 3.000797119140625e+02, 2.997900390625e+02, 2.994088134765625e+02, 2.98999267578125e+02, 2.986145935058594e+02, 2.982370300292969e+02, 2.981192626953125e+02]
-heaPum.con.T=[2.931499938964844e+02, 3.166233825683594e+02, 3.266097412109375e+02, 3.315052185058594e+02, 2.970041809082031e+02, 3.2747265625e+02, 2.958501281738281e+02, 2.948075561523438e+02, 2.944069213867188e+02, 2.946151123046875e+02, 3.36102294921875e+02, 3.360584411621094e+02, 2.961727600097656e+02, 2.965088500976562e+02, 3.3592236328125e+02, 3.018840942382812e+02, 2.947454528808594e+02, 2.944497680664062e+02, 2.945279541015625e+02, 2.950524291992188e+02, 3.3636865234375e+02, 2.964051513671875e+02, 3.144834594726562e+02, 3.381892395019531e+02, 3.388897094726562e+02, 3.382237854003906e+02, 3.357015686035156e+02, 2.989024658203125e+02, 2.944578552246094e+02, 2.949781188964844e+02, 2.952886657714844e+02, 3.371069641113281e+02, 3.369694519042969e+02, 3.127763366699219e+02, 2.954767761230469e+02, 2.941219177246094e+02, 2.943177795410156e+02, 2.950830078125e+02, 3.324122314453125e+02, 2.964517517089844e+02, 3.36041748046875e+02, 3.384684448242188e+02, 3.399869384765625e+02, 3.383584289550781e+02, 3.354117431640625e+02, 2.955572204589844e+02, 2.957901916503906e+02, 3.296775817871094e+02, 3.076386413574219e+02, 2.954725036621094e+02, 2.947282104492188e+02, 3.363741149902344e+02, 3.359225158691406e+02, 3.378675537109375e+02, 3.353576049804688e+02, 3.389665832519531e+02, 2.965963439941406e+02, 2.9572509765625e+02, 3.355193786621094e+02, 3.380057373046875e+02, 3.367919006347656e+02, 3.367823181152344e+02, 3.398299560546875e+02, 3.377533569335938e+02, 3.361406860351562e+02, 3.382857360839844e+02, 3.364311828613281e+02, 3.383112182617188e+02, 3.394217834472656e+02, 3.363533325195312e+02, 3.267384033203125e+02, 2.963289184570312e+02, 2.948276062011719e+02, 2.960551452636719e+02, 3.357630310058594e+02, 3.371885375976562e+02, 3.38143310546875e+02, 3.380003662109375e+02, 3.379338989257812e+02, 3.367792358398438e+02, 3.360041198730469e+02, 3.360289916992188e+02, 3.365936889648438e+02, 2.947028198242188e+02, 2.941598205566406e+02, 2.941380615234375e+02, 2.941385498046875e+02, 2.941390686035156e+02, 2.941395263671875e+02, 2.941399230957031e+02, 2.940581359863281e+02, 2.939577331542969e+02, 2.939579467773438e+02, 2.939583740234375e+02, 2.939590454101562e+02, 2.939598388671875e+02, 2.939606323242188e+02, 2.939613647460938e+02, 2.939620056152344e+02, 2.939626159667969e+02, 2.939631652832031e+02]
-senTemSup.T=[2.931499938964844e+02, 3.027041320800781e+02, 3.108938598632812e+02, 3.175636596679688e+02, 3.145692443847656e+02, 3.154521179199219e+02, 3.189456176757812e+02, 3.178551940917969e+02, 3.161578674316406e+02, 3.143526000976562e+02, 3.132706604003906e+02, 3.151976013183594e+02, 3.191770629882812e+02, 3.146210632324219e+02, 3.152475280761719e+02, 3.1861474609375e+02, 3.194667053222656e+02, 3.179632568359375e+02, 3.161383972167969e+02, 3.136421813964844e+02, 3.147083129882812e+02, 3.195026550292969e+02, 3.130805969238281e+02, 3.154942016601562e+02, 3.168543395996094e+02, 3.174898986816406e+02, 3.180005187988281e+02, 3.187172546386719e+02, 3.193036804199219e+02, 3.175770874023438e+02, 3.1405078125e+02, 3.142958679199219e+02, 3.169351196289062e+02, 3.184077453613281e+02, 3.190764770507812e+02, 3.194753112792969e+02, 3.1873583984375e+02, 3.147186584472656e+02, 3.14921630859375e+02, 3.187142333984375e+02, 3.131449584960938e+02, 3.143663330078125e+02, 3.15279052734375e+02, 3.161153564453125e+02, 3.174268188476562e+02, 3.191510314941406e+02, 3.165964050292969e+02, 3.137735290527344e+02, 3.184186706542969e+02, 3.167130737304688e+02, 3.14495361328125e+02, 3.13132080078125e+02, 3.13323486328125e+02, 3.138710021972656e+02, 3.152424011230469e+02, 3.178393249511719e+02, 3.187226257324219e+02, 3.14382080078125e+02, 3.131906127929688e+02, 3.133368835449219e+02, 3.13349609375e+02, 3.13349609375e+02, 3.135495910644531e+02, 3.138163452148438e+02, 3.145217590332031e+02, 3.158348693847656e+02, 3.170057983398438e+02, 3.176820983886719e+02, 3.1796923828125e+02, 3.181100158691406e+02, 3.184090576171875e+02, 3.189722290039062e+02, 3.189435119628906e+02, 3.157320251464844e+02, 3.131311645507812e+02, 3.13840576171875e+02, 3.143379821777344e+02, 3.144513549804688e+02, 3.144527587890625e+02, 3.148049011230469e+02, 3.152734375e+02, 3.162979125976562e+02, 3.181175537109375e+02, 3.191417541503906e+02, 3.193412170410156e+02, 3.193552551269531e+02, 3.193552856445312e+02, 3.193552856445312e+02, 3.193552856445312e+02, 3.193553161621094e+02, 3.194994812011719e+02, 3.191781921386719e+02, 3.190986633300781e+02, 3.190986633300781e+02, 3.190986633300781e+02, 3.190986633300781e+02, 3.190986633300781e+02, 3.190986633300781e+02, 3.190986633300781e+02, 3.190986633300781e+02, 3.190986633300781e+02]
-heaPum.QCon_flow=[0e+00, 6.310774536132812e+02, 6.04183837890625e+02, 5.8810009765625e+02, 0e+00, 6.015513305664062e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.932901000976562e+02, 0e+00, 0e+00, 5.69315185546875e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.765064086914062e+02, 0e+00, 6.349025268554688e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.75399169921875e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.847320556640625e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.175474853515625e+02, 0e+00, 0e+00, 5.945571899414062e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.163944091796875e+02, 5.572557373046875e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.712125244140625e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.068447265625e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+rectangularZoneTemplate.TSensor=[2.931499938964844e+02, 2.933523864746094e+02, 2.934900512695312e+02, 2.935381469726562e+02, 2.9350390625e+02, 2.934971313476562e+02, 2.936346130371094e+02, 2.937278747558594e+02, 2.937388305664062e+02, 2.937043151855469e+02, 2.936195983886719e+02, 2.935727233886719e+02, 2.935614929199219e+02, 2.935009460449219e+02, 2.935230712890625e+02, 2.936526184082031e+02, 2.937183837890625e+02, 2.937477722167969e+02, 2.937023620605469e+02, 2.936293640136719e+02, 2.935455627441406e+02, 2.935286865234375e+02, 2.935258483886719e+02, 2.9366015625e+02, 2.938163757324219e+02, 2.939082641601562e+02, 2.938746337890625e+02, 2.9378564453125e+02, 2.937210388183594e+02, 2.936666259765625e+02, 2.936021423339844e+02, 2.936044921875e+02, 2.936950988769531e+02, 2.937979431152344e+02, 2.938443298339844e+02, 2.938017272949219e+02, 2.937159423828125e+02, 2.936141662597656e+02, 2.935141296386719e+02, 2.935757446289062e+02, 2.936095275878906e+02, 2.937254943847656e+02, 2.9380810546875e+02, 2.937810974121094e+02, 2.936865539550781e+02, 2.9362744140625e+02, 2.93571533203125e+02, 2.934446411132812e+02, 2.935419006347656e+02, 2.936575622558594e+02, 2.937328796386719e+02, 2.937798156738281e+02, 2.937979125976562e+02, 2.9372216796875e+02, 2.936324157714844e+02, 2.935510559082031e+02, 2.935546264648438e+02, 2.936272888183594e+02, 2.938046875e+02, 2.940048217773438e+02, 2.9417919921875e+02, 2.941263427734375e+02, 2.939133911132812e+02, 2.93807373046875e+02, 2.937045593261719e+02, 2.937416687011719e+02, 2.937882080078125e+02, 2.939208679199219e+02, 2.940006408691406e+02, 2.940404968261719e+02, 2.939173278808594e+02, 2.9375927734375e+02, 2.936605224609375e+02, 2.935916748046875e+02, 2.936473083496094e+02, 2.937736206054688e+02, 2.939338684082031e+02, 2.940882568359375e+02, 2.941302490234375e+02, 2.939440612792969e+02, 2.937889709472656e+02, 2.936831359863281e+02, 2.936784057617188e+02, 2.937494812011719e+02, 2.939437561035156e+02, 2.9415673828125e+02, 2.943629455566406e+02, 2.945298767089844e+02, 2.943699035644531e+02, 2.941127319335938e+02, 2.938933410644531e+02, 2.939920654296875e+02, 2.941050720214844e+02, 2.945584411621094e+02, 2.949459228515625e+02, 2.951991577148438e+02, 2.953406372070312e+02, 2.951039428710938e+02, 2.949153747558594e+02, 2.947381591796875e+02, 2.949486999511719e+02]
+rectangularZoneTemplate1.TSensor=[2.931499938964844e+02, 2.933594665527344e+02, 2.935010986328125e+02, 2.935459899902344e+02, 2.935079956054688e+02, 2.935040588378906e+02, 2.939173278808594e+02, 2.951041870117188e+02, 2.952041625976562e+02, 2.945812072753906e+02, 2.941455078125e+02, 2.938307495117188e+02, 2.937231750488281e+02, 2.936252136230469e+02, 2.936579284667969e+02, 2.940308837890625e+02, 2.946227111816406e+02, 2.946710205078125e+02, 2.94207275390625e+02, 2.938770141601562e+02, 2.937099304199219e+02, 2.936317443847656e+02, 2.935847473144531e+02, 2.939307861328125e+02, 2.953313598632812e+02, 2.954071044921875e+02, 2.9509814453125e+02, 2.94723388671875e+02, 2.943511352539062e+02, 2.939826049804688e+02, 2.93798095703125e+02, 2.937655029296875e+02, 2.938860168457031e+02, 2.94143310546875e+02, 2.94486572265625e+02, 2.941604919433594e+02, 2.938462829589844e+02, 2.9370263671875e+02, 2.935799865722656e+02, 2.935841064453125e+02, 2.937190246582031e+02, 2.9457421875e+02, 2.955234069824219e+02, 2.951212158203125e+02, 2.945294799804688e+02, 2.940581359863281e+02, 2.937753295898438e+02, 2.93616455078125e+02, 2.93627685546875e+02, 2.940253601074219e+02, 2.955655212402344e+02, 2.964309692382812e+02, 2.958443298339844e+02, 2.953751831054688e+02, 2.949181823730469e+02, 2.94373291015625e+02, 2.938636169433594e+02, 2.939153442382812e+02, 2.952929992675781e+02, 2.967750549316406e+02, 2.969764709472656e+02, 2.964433898925781e+02, 2.960251770019531e+02, 2.956520080566406e+02, 2.952409362792969e+02, 2.948717041015625e+02, 2.951181640625e+02, 2.96739990234375e+02, 2.978887939453125e+02, 2.975169982910156e+02, 2.969184265136719e+02, 2.963712463378906e+02, 2.957919616699219e+02, 2.952150573730469e+02, 2.948989868164062e+02, 2.957768249511719e+02, 2.974575500488281e+02, 2.977210388183594e+02, 2.973326721191406e+02, 2.968609619140625e+02, 2.963851928710938e+02, 2.958977355957031e+02, 2.953905029296875e+02, 2.953752136230469e+02, 2.968973693847656e+02, 2.985132446289062e+02, 2.98685302734375e+02, 2.981547546386719e+02, 2.977869262695312e+02, 2.973456115722656e+02, 2.96894287109375e+02, 2.96564208984375e+02, 2.970196838378906e+02, 2.989136047363281e+02, 3.001448974609375e+02, 2.99845947265625e+02, 2.994659729003906e+02, 2.990557861328125e+02, 2.986702575683594e+02, 2.982910461425781e+02, 2.981742248535156e+02]
+heaPum.con.T=[2.931499938964844e+02, 3.166568603515625e+02, 3.267539672851562e+02, 3.316986999511719e+02, 2.969683837890625e+02, 3.276716613769531e+02, 2.959309692382812e+02, 2.947788391113281e+02, 2.943842468261719e+02, 2.945842895507812e+02, 3.353000183105469e+02, 3.386765747070312e+02, 2.972335815429688e+02, 2.964348449707031e+02, 3.360806274414062e+02, 3.316476440429688e+02, 2.947530517578125e+02, 2.944233703613281e+02, 2.944913635253906e+02, 2.950078735351562e+02, 3.375554809570312e+02, 2.96623779296875e+02, 2.963094177246094e+02, 3.354226989746094e+02, 3.373361206054688e+02, 3.380568237304688e+02, 3.370534973144531e+02, 3.363152465820312e+02, 2.950261840820312e+02, 2.949413452148438e+02, 2.952273864746094e+02, 3.38900634765625e+02, 3.358080444335938e+02, 3.395078735351562e+02, 3.353990478515625e+02, 2.970255737304688e+02, 2.943262939453125e+02, 2.950182189941406e+02, 3.320631713867188e+02, 2.966093444824219e+02, 2.954449768066406e+02, 3.4010888671875e+02, 3.361937561035156e+02, 3.386272888183594e+02, 3.388956604003906e+02, 3.395009460449219e+02, 2.9571875e+02, 3.295903625488281e+02, 3.360746459960938e+02, 2.954105834960938e+02, 2.946423950195312e+02, 2.942525634765625e+02, 2.94097900390625e+02, 2.942503356933594e+02, 3.360145568847656e+02, 3.378050842285156e+02, 2.97069091796875e+02, 2.955901489257812e+02, 2.94462890625e+02, 2.941488342285156e+02, 2.941463928222656e+02, 2.941466674804688e+02, 2.940988464355469e+02, 2.939601135253906e+02, 3.375726623535156e+02, 3.354208984375e+02, 3.389892883300781e+02, 3.3997705078125e+02, 3.401083374023438e+02, 3.376613464355469e+02, 3.382239074707031e+02, 3.360871276855469e+02, 3.370888671875e+02, 2.959207153320312e+02, 2.951972045898438e+02, 2.945177001953125e+02, 2.940978698730469e+02, 2.940732727050781e+02, 2.940736694335938e+02, 2.940678100585938e+02, 2.939554748535156e+02, 3.3894287109375e+02, 3.35858642578125e+02, 3.362282409667969e+02, 3.371834716796875e+02, 3.36870361328125e+02, 3.368613586425781e+02, 3.368523864746094e+02, 3.368433532714844e+02, 3.368340148925781e+02, 3.369857482910156e+02, 3.246700439453125e+02, 3.194969177246094e+02, 3.194914245605469e+02, 3.194864196777344e+02, 3.194815368652344e+02, 3.194766540527344e+02, 3.194717102050781e+02, 3.194667358398438e+02, 3.19461669921875e+02, 3.194565734863281e+02]
+senTemSup.T=[2.931499938964844e+02, 3.027024536132812e+02, 3.108855895996094e+02, 3.175692749023438e+02, 3.146452026367188e+02, 3.154079895019531e+02, 3.189413452148438e+02, 3.180920715332031e+02, 3.164202575683594e+02, 3.146369323730469e+02, 3.131922302246094e+02, 3.148978576660156e+02, 3.189363708496094e+02, 3.151773681640625e+02, 3.148644714355469e+02, 3.181886901855469e+02, 3.194010620117188e+02, 3.186284484863281e+02, 3.168192443847656e+02, 3.14354248046875e+02, 3.141368713378906e+02, 3.191920166015625e+02, 3.138731994628906e+02, 3.14875244140625e+02, 3.161588439941406e+02, 3.167668762207031e+02, 3.172566833496094e+02, 3.180051879882812e+02, 3.189993286132812e+02, 3.1853466796875e+02, 3.150354919433594e+02, 3.136557312011719e+02, 3.159409790039062e+02, 3.173550415039062e+02, 3.181624145507812e+02, 3.188796081542969e+02, 3.194542846679688e+02, 3.157713928222656e+02, 3.141167297363281e+02, 3.189380187988281e+02, 3.138733520507812e+02, 3.135043029785156e+02, 3.14148681640625e+02, 3.148275451660156e+02, 3.160144653320312e+02, 3.180607604980469e+02, 3.18556640625e+02, 3.131134033203125e+02, 3.168499450683594e+02, 3.192668151855469e+02, 3.170307006835938e+02, 3.155978088378906e+02, 3.145459899902344e+02, 3.133538208007812e+02, 3.135501708984375e+02, 3.156431579589844e+02, 3.191336059570312e+02, 3.171275024414062e+02, 3.152231750488281e+02, 3.148116149902344e+02, 3.14806640625e+02, 3.14806640625e+02, 3.147147216796875e+02, 3.140830688476562e+02, 3.131428527832031e+02, 3.137372131347656e+02, 3.146217651367188e+02, 3.151974182128906e+02, 3.15438720703125e+02, 3.155447692871094e+02, 3.158137817382812e+02, 3.164186706542969e+02, 3.177939758300781e+02, 3.192226257324219e+02, 3.165769653320312e+02, 3.146125793457031e+02, 3.139635925292969e+02, 3.139111633300781e+02, 3.139111633300781e+02, 3.138851928710938e+02, 3.132660827636719e+02, 3.133714904785156e+02, 3.146927185058594e+02, 3.16020263671875e+02, 3.167562561035156e+02, 3.168492431640625e+02, 3.168492736816406e+02, 3.168493347167969e+02, 3.168493957519531e+02, 3.168495178222656e+02, 3.179012145996094e+02, 3.182553100585938e+02, 3.183876647949219e+02, 3.183876953125e+02, 3.183877258300781e+02, 3.183877868652344e+02, 3.183878479003906e+02, 3.18387939453125e+02, 3.183880310058594e+02, 3.183881530761719e+02, 3.183882751464844e+02]
+heaPum.QCon_flow=[0e+00, 6.309923095703125e+02, 6.037504272460938e+02, 5.873870239257812e+02, 0e+00, 6.0093505859375e+02, 0e+00, 0e+00, 0e+00, 0e+00, 6.164760131835938e+02, 5.571451416015625e+02, 0e+00, 0e+00, 5.685240478515625e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.615038452148438e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.54500244140625e+02, 6.083815307617188e+02, 5.594110107421875e+02, 0e+00, 0e+00, 0e+00, 0e+00, 5.86072998046875e+02, 0e+00, 0e+00, 0e+00, 6.054337768554688e+02, 0e+00, 0e+00, 5.544163818359375e+02, 0e+00, 5.947279052734375e+02, 5.686388549804688e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.033689575195312e+02, 5.696614990234375e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_Tutorial_Example9.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_Tutorial_Example9.txt
index b7ade64d99..be2f17a938 100644
--- a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_Tutorial_Example9.txt
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_Tutorial_Example9.txt
@@ -1,4 +1,4 @@
-last-generated=2024-10-30
+last-generated=2024-12-04
 statistics-initialization=
 {
   "nonlinear": "7, 7, 5, 5, 0, 0, 2",
@@ -12,7 +12,7 @@ statistics-simulation=
   "numerical Jacobians": "0"
 }
 time=[1e+07, 1.1e+07]
-rectangularZoneTemplate.ppm=[4e+02, 4.618714294433594e+02, 4.167232666015625e+02, 4.045209045410156e+02, 4.012230529785156e+02, 4.003313293457031e+02, 4.000901489257812e+02, 4.000250244140625e+02, 4.000073852539062e+02, 4.000026245117188e+02, 4.000013427734375e+02, 4.000010070800781e+02, 4.000009155273438e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 1.00146728515625e+03, 1e+03, 1e+03, 1e+03, 5.52740234375e+02, 4.412571105957031e+02, 4.112381591796875e+02, 4.030622863769531e+02, 4.008324890136719e+02, 1.000004943847656e+03, 1e+03, 1e+03, 7.533167114257812e+02, 4.953663940429688e+02, 4.257376098632812e+02, 4.069465637207031e+02, 4.018753662109375e+02, 1.03985107421875e+03, 9.999986572265625e+02, 1e+03, 1e+03, 6.204432373046875e+02, 4.595894470214844e+02, 4.161443786621094e+02, 4.043576049804688e+02, 4.011766662597656e+02, 1.000069396972656e+03, 1e+03, 1e+03, 9.097560424804688e+02, 5.376080932617188e+02, 4.371903381347656e+02, 4.100528259277344e+02, 4.027151794433594e+02, 5.071200561523438e+02, 9.999827270507812e+02, 1e+03, 1e+03, 7.1814208984375e+02, 4.858442687988281e+02, 4.232174072265625e+02, 4.062729187011719e+02, 4.016935424804688e+02, 4.004579162597656e+02, 4.001243591308594e+02, 4.000342102050781e+02, 4.000098876953125e+02, 4.000032958984375e+02, 4.000015258789062e+02, 4.000010375976562e+02, 4.000009155273438e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 7.031476440429688e+02, 9.999966430664062e+02, 1e+03, 1e+03, 6.864569702148438e+02, 4.772593078613281e+02, 4.208445434570312e+02, 4.056711730957031e+02, 4.015460510253906e+02, 9.93975830078125e+02, 1.000000122070312e+03, 1e+03, 1e+03, 5.788165893554688e+02, 4.483286437988281e+02, 4.130426330566406e+02, 4.035253295898438e+02, 4.00956298828125e+02]
-rectangularZoneTemplate1.ppm=[4e+02, 1.000597290039062e+03, 9.999998168945312e+02, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1.000047058105469e+03, 1e+03, 1e+03, 1e+03, 9.999998779296875e+02, 1e+03, 1e+03, 1e+03, 1e+03, 1.000001831054688e+03, 1e+03, 1e+03, 9.999845581054688e+02, 1e+03, 1e+03, 1e+03, 1e+03, 1.000249328613281e+03, 9.999996948242188e+02, 1e+03, 1e+03, 1.000000122070312e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1.000024780273438e+03, 1e+03, 1e+03, 9.997171630859375e+02, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 9.999981079101562e+02, 1e+03, 1e+03, 1.000001037597656e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 9.99999267578125e+02, 1e+03, 1e+03, 1.000003540039062e+03, 1e+03, 1e+03, 1e+03, 1e+03, 9.9982421875e+02, 1e+03, 1e+03, 1e+03, 9.999998779296875e+02, 1e+03, 1e+03, 1e+03, 1e+03]
-conPID1.y=[1.000000014901161e-01, 2.524215877056122e-01, 2.51107931137085e-01, 2.511083781719208e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083781719208e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083781719208e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.5428706407547e-01, 2.545689940452576e-01, 2.545689642429352e-01, 2.545689642429352e-01, 2.511076927185059e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083781719208e-01, 2.545869648456573e-01, 2.545689642429352e-01, 2.545689642429352e-01, 2.510882914066315e-01, 2.511083781719208e-01, 2.511084079742432e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.533569931983948e-01, 2.545686066150665e-01, 2.545689642429352e-01, 2.545689642429352e-01, 2.511051297187805e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083781719208e-01, 2.511083483695984e-01, 2.548176646232605e-01, 2.545689642429352e-01, 2.545689642429352e-01, 2.507091462612152e-01, 2.511084973812103e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083781719208e-01, 2.511083483695984e-01, 2.545722424983978e-01, 2.545689642429352e-01, 2.545689642429352e-01, 2.510721981525421e-01, 2.51108318567276e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083781719208e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511084675788879e-01, 2.511083483695984e-01, 2.511083781719208e-01, 2.511083483695984e-01, 2.511082887649536e-01, 2.511083483695984e-01, 2.545645833015442e-01, 2.545689642429352e-01, 2.545689642429352e-01, 2.511216402053833e-01, 2.511083781719208e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.546598315238953e-01, 2.545686066150665e-01, 2.545689642429352e-01, 2.545689642429352e-01, 2.511102855205536e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01, 2.511083483695984e-01]
-conPID.y=[1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 6.147541403770447e-01, 6.146656274795532e-01, 6.146655678749084e-01, 6.146655678749084e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 6.148117780685425e-01, 6.146655678749084e-01, 6.146655678749084e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 6.454051733016968e-01, 6.146587729454041e-01, 6.146655678749084e-01, 6.146655678749084e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 6.183221936225891e-01, 6.146655678749084e-01, 6.146655678749084e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 6.146310567855835e-01, 6.146655678749084e-01, 6.146655678749084e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 6.14628791809082e-01, 6.146655678749084e-01, 6.146655678749084e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 5.958689451217651e-01, 6.146641373634338e-01, 6.146655678749084e-01, 6.146655678749084e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01]
+rectangularZoneTemplate.ppm=[4e+02, 4.618736267089844e+02, 4.167059326171875e+02, 4.045112609863281e+02, 4.012178955078125e+02, 4.003295288085938e+02, 4.000894775390625e+02, 4.000247497558594e+02, 4.0000732421875e+02, 4.000026245117188e+02, 4.000013427734375e+02, 4.000010070800781e+02, 4.000009155273438e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 1.001457580566406e+03, 1e+03, 1e+03, 1e+03, 5.52521240234375e+02, 4.41284423828125e+02, 4.112297668457031e+02, 4.030896606445312e+02, 4.008401794433594e+02, 1.000004516601562e+03, 1e+03, 9.999999389648438e+02, 7.531309814453125e+02, 4.951823120117188e+02, 4.256513061523438e+02, 4.069132995605469e+02, 4.018636779785156e+02, 1.03976318359375e+03, 9.999986572265625e+02, 1e+03, 1.000000061035156e+03, 6.20215087890625e+02, 4.594642944335938e+02, 4.161041870117188e+02, 4.043558349609375e+02, 4.011744689941406e+02, 1.000035827636719e+03, 1e+03, 1e+03, 9.0969091796875e+02, 5.374098510742188e+02, 4.3708447265625e+02, 4.100082092285156e+02, 4.027035522460938e+02, 5.07229736328125e+02, 9.999829711914062e+02, 1e+03, 1.000000061035156e+03, 7.17966796875e+02, 4.856474609375e+02, 4.231298217773438e+02, 4.062445068359375e+02, 4.016835021972656e+02, 4.004549865722656e+02, 4.001233215332031e+02, 4.000339660644531e+02, 4.000097961425781e+02, 4.000032958984375e+02, 4.000015258789062e+02, 4.000010375976562e+02, 4.000009155273438e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 4.000008850097656e+02, 7.034448852539062e+02, 9.999959716796875e+02, 1e+03, 1e+03, 6.862622680664062e+02, 4.771427001953125e+02, 4.20777587890625e+02, 4.056412353515625e+02, 4.015341491699219e+02, 9.940339965820312e+02, 9.999999389648438e+02, 1e+03, 1e+03, 5.786196899414062e+02, 4.482255554199219e+02, 4.129827575683594e+02, 4.0350244140625e+02, 4.009481506347656e+02]
+rectangularZoneTemplate1.ppm=[4e+02, 1.000588806152344e+03, 1e+03, 1e+03, 1e+03, 1e+03, 9.999999389648438e+02, 1.000000061035156e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 9.999999389648438e+02, 1.000000122070312e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1.000047119140625e+03, 1e+03, 1e+03, 1e+03, 9.999998779296875e+02, 1e+03, 1e+03, 1e+03, 1e+03, 1.000001831054688e+03, 1e+03, 9.999999389648438e+02, 9.9998486328125e+02, 1e+03, 1e+03, 1e+03, 1e+03, 1.000251098632812e+03, 9.999998779296875e+02, 1e+03, 1.000000061035156e+03, 1.000000183105469e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1.000023498535156e+03, 1e+03, 1e+03, 9.997171630859375e+02, 1.000000061035156e+03, 1e+03, 1e+03, 1e+03, 1e+03, 9.999976196289062e+02, 1e+03, 1.000000061035156e+03, 1.000000915527344e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 9.999999389648438e+02, 1e+03, 1e+03, 9.999999389648438e+02, 1e+03, 9.999992065429688e+02, 1e+03, 1e+03, 1.000003601074219e+03, 1.000000061035156e+03, 1e+03, 1e+03, 1e+03, 9.998242797851562e+02, 1e+03, 1e+03, 1e+03, 9.999999389648438e+02, 1e+03, 1.000000061035156e+03, 1e+03, 1e+03]
+conPID1.y=[1.000000014901161e-01, 2.525329291820526e-01, 2.511099576950073e-01, 2.511084377765656e-01, 2.511082291603088e-01, 2.511089742183685e-01, 2.511054277420044e-01, 2.511085271835327e-01, 2.511081695556641e-01, 2.511086761951447e-01, 2.511086165904999e-01, 2.511084973812103e-01, 2.511085867881775e-01, 2.511087357997894e-01, 2.511076629161835e-01, 2.511072754859924e-01, 2.511070966720581e-01, 2.511081397533417e-01, 2.511087656021118e-01, 2.511091530323029e-01, 2.511091530323029e-01, 2.511084079742432e-01, 2.511065900325775e-01, 2.542925477027893e-01, 2.545688152313232e-01, 2.545683681964874e-01, 2.545689940452576e-01, 2.511085867881775e-01, 2.511085271835327e-01, 2.51108318567276e-01, 2.51108318567276e-01, 2.511081695556641e-01, 2.545859217643738e-01, 2.545678019523621e-01, 2.545687854290009e-01, 2.510877549648285e-01, 2.511096596717834e-01, 2.511091530323029e-01, 2.511081993579865e-01, 2.511082589626312e-01, 2.5337815284729e-01, 2.545693516731262e-01, 2.545686066150665e-01, 2.545697093009949e-01, 2.511056661605835e-01, 2.511088848114014e-01, 2.511086761951447e-01, 2.511087656021118e-01, 2.511074244976044e-01, 2.54824310541153e-01, 2.545678019523621e-01, 2.54567950963974e-01, 2.507081031799316e-01, 2.511093616485596e-01, 2.511090934276581e-01, 2.51108855009079e-01, 2.511084079742432e-01, 2.511055469512939e-01, 2.545664608478546e-01, 2.54567950963974e-01, 2.54569798707962e-01, 2.510732114315033e-01, 2.511087656021118e-01, 2.511084377765656e-01, 2.511085271835327e-01, 2.511085569858551e-01, 2.511077523231506e-01, 2.511084079742432e-01, 2.511083781719208e-01, 2.511071562767029e-01, 2.511093318462372e-01, 2.511089146137238e-01, 2.511079609394073e-01, 2.511085569858551e-01, 2.511065900325775e-01, 2.511070072650909e-01, 2.511076927185059e-01, 2.511094510555267e-01, 2.511089742183685e-01, 2.511084377765656e-01, 2.51108318567276e-01, 2.511093318462372e-01, 2.511061429977417e-01, 2.511059939861298e-01, 2.545638382434845e-01, 2.545685768127441e-01, 2.545689046382904e-01, 2.511204779148102e-01, 2.51109778881073e-01, 2.511090338230133e-01, 2.511089444160461e-01, 2.511071562767029e-01, 2.546431422233582e-01, 2.545681297779083e-01, 2.545683979988098e-01, 2.545687854290009e-01, 2.511139810085297e-01, 2.511090934276581e-01, 2.511085569858551e-01, 2.511079907417297e-01, 2.511069476604462e-01]
+conPID.y=[1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 6.148018836975098e-01, 6.146656274795532e-01, 6.146649718284607e-01, 6.146656274795532e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 6.148102879524231e-01, 6.146643757820129e-01, 6.146653890609741e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 6.470436453819275e-01, 6.146662831306458e-01, 6.146652102470398e-01, 6.146662831306458e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 6.182550191879272e-01, 6.146643757820129e-01, 6.146644949913025e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 6.145896911621094e-01, 6.146645545959473e-01, 6.146663427352905e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 6.146262288093567e-01, 6.14665150642395e-01, 6.146655082702637e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 5.957710146903992e-01, 6.146637201309204e-01, 6.146649718284607e-01, 6.146653890609741e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_TwinHouses_BuildingN2_Exp1.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_TwinHouses_BuildingN2_Exp1.txt
index 9b241c0bf2..c4a49973bc 100644
--- a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_TwinHouses_BuildingN2_Exp1.txt
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_TwinHouses_BuildingN2_Exp1.txt
@@ -1,4 +1,4 @@
-last-generated=2022-07-20
+last-generated=2023-10-23
 statistics-initialization=
 {
   "nonlinear": "18, 10, 8, 11, 10, 8, 12",
@@ -12,27 +12,27 @@ statistics-simulation=
   "numerical Jacobians": "0"
 }
 time=[1.5e+07, 2.35872e+07]
-struct.TSensor[1]=[2.931499938964844e+02, 3.016920751953125e+02, 3.031350960286458e+02, 3.031369018554688e+02, 3.031374816894531e+02, 3.031377258300781e+02, 3.031378784179688e+02, 3.031379972330729e+02, 3.031380615234375e+02, 3.031380920410156e+02, 3.031381225585938e+02, 3.031381530761719e+02, 3.0313818359375e+02, 3.0313818359375e+02, 3.0313818359375e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382446289062e+02, 3.031382446289062e+02, 3.031382446289062e+02, 3.031382446289062e+02, 3.031382446289062e+02, 3.031382446289062e+02, 3.031382446289062e+02, 3.031382446289062e+02, 3.031382446289062e+02, 3.031382446289062e+02, 3.031382446289062e+02, 3.031382446289062e+02, 3.031382446289062e+02, 3.031382446289062e+02, 3.031382446289062e+02, 3.031382446289062e+02, 3.031382446289062e+02, 3.031382446289062e+02, 3.031382446289062e+02, 3.031382446289062e+02, 3.031382446289062e+02, 3.031382446289062e+02, 3.031382446289062e+02, 3.031382446289062e+02, 3.031382446289062e+02, 3.031382446289062e+02, 3.031382446289062e+02, 3.031382446289062e+02, 3.031382446289062e+02, 3.031369352213542e+02, 3.031372314453125e+02, 3.03138301188151e+02, 3.031388549804688e+02, 3.031402893066406e+02, 3.031381335449219e+02, 3.031386800130209e+02, 3.031393823242187e+02, 3.03137256266276e+02, 2.996693245442708e+02, 2.998756225585938e+02, 2.981005350748698e+02, 2.970178592936198e+02, 2.954022045898437e+02, 2.957551924641927e+02, 2.967383601888021e+02, 2.970362243652344e+02, 2.977860982259115e+02, 2.967993806966146e+02, 2.960994311523438e+02, 2.939313854980469e+02, 2.923740478515625e+02, 2.915314758300781e+02, 2.908236161295573e+02, 2.954575256347656e+02, 2.98138388671875e+02, 2.981408996582031e+02, 2.981393876139323e+02, 2.981398620605469e+02, 2.981407661946615e+02, 2.955874039713541e+02, 2.932143188476563e+02, 2.915133996582031e+02, 2.908686140950521e+02, 2.903502551269531e+02, 2.903012345377604e+02, 2.910004130045573e+02, 2.904391943359375e+02, 2.897157194010417e+02, 2.891308764648438e+02, 2.882133862304688e+02, 2.874666137695312e+02]
+struct.TSensor[1]=[2.931499938964844e+02, 3.017018892415364e+02, 3.031351265462239e+02, 3.031369091796875e+02, 3.031374816894531e+02, 3.031377258300781e+02, 3.031378784179688e+02, 3.031379699707031e+02, 3.031380615234375e+02, 3.031380920410156e+02, 3.031381225585938e+02, 3.031381530761719e+02, 3.0313818359375e+02, 3.0313818359375e+02, 3.0313818359375e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031382141113281e+02, 3.031369539388021e+02, 3.031372863769531e+02, 3.031383622233073e+02, 3.03138904008709e+02, 3.031402893066406e+02, 3.031381640625e+02, 3.031387064615885e+02, 3.031393823242187e+02, 3.031373173014323e+02, 2.996578963216146e+02, 2.998730065917969e+02, 2.980866821289063e+02, 2.970131795247396e+02, 2.953818884277344e+02, 2.957598986816406e+02, 2.967418286132813e+02, 2.970412902832031e+02, 2.977913061523437e+02, 2.967937569173177e+02, 2.961033715820312e+02, 2.939250651041667e+02, 2.923632019042969e+02, 2.915188110351563e+02, 2.908043188476562e+02, 2.954401680501302e+02, 2.981383581542969e+02, 2.981409261067708e+02, 2.981394348144531e+02, 2.98139892578125e+02, 2.981407661946615e+02, 2.95567295328776e+02, 2.931950805664063e+02, 2.915018868001302e+02, 2.908561966959635e+02, 2.903433056640625e+02, 2.902927254231771e+02, 2.909911905924479e+02, 2.904292736816406e+02, 2.897051802571614e+02, 2.891202115885417e+02, 2.882018627929688e+02, 2.874527282714844e+02]
 heaSys.heaSche.TdegC[1].y=[3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031360168457031e+02, 3.031566979980469e+02, 3.031549255371094e+02, 3.031681502278646e+02, 3.031586458800269e+02, 3.031499814987183e+02, 3.031488899739583e+02, 3.031598470052083e+02, 3.031428112792969e+02, 3.031367883300781e+02, 3.005173478190104e+02, 3.000359936523437e+02, 2.983834777832031e+02, 2.970857287597656e+02, 2.954567053222656e+02, 2.958717272949219e+02, 2.970119999186198e+02, 2.973654479980469e+02, 2.979108231608073e+02, 2.974407934570312e+02, 2.96683935546875e+02, 2.942657670084636e+02, 2.928125142415365e+02, 2.920661206054688e+02, 2.913698055013021e+02, 2.958438423665365e+02, 2.981514135742187e+02, 2.981447631835937e+02, 2.981467936197917e+02, 2.981531884765625e+02, 2.981561869303385e+02, 2.963656787109375e+02, 2.933755310058594e+02, 2.920279459635416e+02, 2.91316328531901e+02, 2.909127587890625e+02, 2.909366552734375e+02, 2.914933024088542e+02, 2.909561218261719e+02, 2.903412158203125e+02, 2.89828798421224e+02, 2.889145068359375e+02, 2.882002258300781e+02]
-struct.TSensor[2]=[2.931499938964844e+02, 2.998268623860677e+02, 3.021621199544271e+02, 3.026247717285156e+02, 3.027461767578125e+02, 3.027851135253906e+02, 3.0280244140625e+02, 3.028127648925781e+02, 3.028200260416667e+02, 3.028255529785156e+02, 3.028298685709635e+02, 3.028332686360677e+02, 3.028359362792969e+02, 3.028380546061198e+02, 3.028397216796875e+02, 3.028410400390625e+02, 3.02842090250651e+02, 3.028429260253906e+02, 3.028435668945312e+02, 3.028440856933594e+02, 3.02844482421875e+02, 3.028448181152344e+02, 3.028450622558594e+02, 3.028452758789062e+02, 3.028454284667969e+02, 3.028455505371094e+02, 3.028456726074219e+02, 3.028457336425781e+02, 3.028457946777344e+02, 3.028458557128906e+02, 3.028458862304688e+02, 3.028459167480469e+02, 3.02845947265625e+02, 3.028459777832031e+02, 3.028459777832031e+02, 3.028459777832031e+02, 3.028460083007812e+02, 3.028460083007812e+02, 3.028460083007812e+02, 3.028460083007812e+02, 3.028460083007812e+02, 3.028460083007812e+02, 3.028460388183594e+02, 3.028460388183594e+02, 3.028460388183594e+02, 3.028460388183594e+02, 3.028460388183594e+02, 3.028460388183594e+02, 3.028460388183594e+02, 3.028460388183594e+02, 3.028460388183594e+02, 3.028460388183594e+02, 3.028460388183594e+02, 3.028460388183594e+02, 3.028460388183594e+02, 3.028460388183594e+02, 3.028460388183594e+02, 3.028460388183594e+02, 3.028460388183594e+02, 3.028464237467448e+02, 3.029094299316406e+02, 3.029389876302083e+02, 3.029119582879738e+02, 3.02925594329834e+02, 3.028728670247396e+02, 3.028733256022135e+02, 3.02858544921875e+02, 3.028526794433594e+02, 3.013544344075521e+02, 3.007175512695313e+02, 2.993975830078125e+02, 2.979713317871094e+02, 2.967097009277344e+02, 2.963559399414062e+02, 2.969032975260417e+02, 2.971598815917969e+02, 2.976053617350261e+02, 2.972715067545573e+02, 2.9673193359375e+02, 2.951638338216146e+02, 2.938624369303386e+02, 2.930350268554687e+02, 2.920982486979167e+02, 2.936575740559896e+02, 2.970786108398437e+02, 2.976938761393229e+02, 2.97842968343099e+02, 2.979094360351563e+02, 2.978988195800781e+02, 2.968134138997396e+02, 2.947175842285156e+02, 2.93186484375e+02, 2.922873551432291e+02, 2.916107946777344e+02, 2.913083662923177e+02, 2.914940877278646e+02, 2.909833959960937e+02, 2.903924011230469e+02, 2.898638382975261e+02, 2.891233032226563e+02, 2.883733215332031e+02]
+struct.TSensor[2]=[2.931499938964844e+02, 2.998272644042969e+02, 3.02152578531901e+02, 3.02611435546875e+02, 3.027311315917969e+02, 3.027692118326823e+02, 3.027861145019531e+02, 3.027961938476562e+02, 3.02803271891276e+02, 3.028086987304687e+02, 3.028129048665365e+02, 3.02816239827474e+02, 3.028188464355469e+02, 3.028209037272135e+02, 3.028225402832031e+02, 3.028238220214844e+02, 3.028248478190104e+02, 3.028256530761719e+02, 3.028262939453125e+02, 3.028267822265625e+02, 3.028271789550781e+02, 3.028275048828125e+02, 3.028277587890625e+02, 3.028279418945312e+02, 3.028280944824219e+02, 3.028282165527344e+02, 3.028283081054688e+02, 3.028283996582031e+02, 3.028284606933594e+02, 3.028284912109375e+02, 3.028285522460938e+02, 3.028285827636719e+02, 3.028285827636719e+02, 3.0282861328125e+02, 3.0282861328125e+02, 3.028286437988281e+02, 3.028286437988281e+02, 3.028286437988281e+02, 3.028286743164062e+02, 3.028286743164062e+02, 3.028286743164062e+02, 3.028286743164062e+02, 3.028286743164062e+02, 3.028286743164062e+02, 3.028286743164062e+02, 3.028286743164062e+02, 3.028286743164062e+02, 3.028286743164062e+02, 3.028286743164062e+02, 3.028286743164062e+02, 3.028286743164062e+02, 3.028286743164062e+02, 3.028286743164062e+02, 3.028286743164062e+02, 3.028286743164062e+02, 3.028286743164062e+02, 3.028286743164062e+02, 3.028286743164062e+02, 3.028286743164062e+02, 3.0282873046875e+02, 3.028950317382813e+02, 3.029261877441406e+02, 3.029003856221183e+02, 3.029147825241089e+02, 3.028589676920573e+02, 3.028593566894531e+02, 3.028452307128906e+02, 3.028393713378906e+02, 3.013372147623698e+02, 3.007021374511719e+02, 2.993768961588542e+02, 2.979517289225261e+02, 2.966831884765625e+02, 2.963404931640625e+02, 2.968929467773438e+02, 2.971522827148438e+02, 2.975986551920573e+02, 2.972605554199219e+02, 2.967267919921875e+02, 2.951481396484375e+02, 2.938423177083333e+02, 2.930135888671875e+02, 2.920730244954427e+02, 2.93630859375e+02, 2.970684704589844e+02, 2.976866088867188e+02, 2.978335217285156e+02, 2.978971997070312e+02, 2.978871313476562e+02, 2.96792119140625e+02, 2.946915649414062e+02, 2.931629927571615e+02, 2.922647102864584e+02, 2.915906774902344e+02, 2.912896069335937e+02, 2.914781209309896e+02, 2.909677087402344e+02, 2.903758662923177e+02, 2.898466271972656e+02, 2.891044177246094e+02, 2.883518981933594e+02]
 heaSys.heaSche.TdegC[2].y=[3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031993103027344e+02, 3.031961730957031e+02, 3.032340637207031e+02, 3.033282649739583e+02, 3.033284101642546e+02, 3.033190011978149e+02, 3.033246801757812e+02, 3.033201985677084e+02, 3.033067602539062e+02, 3.033239501953125e+02, 3.011796085611979e+02, 3.001304602050781e+02, 2.989952758789062e+02, 2.973662878417969e+02, 2.962697082519531e+02, 2.960590608723958e+02, 2.968429846191406e+02, 2.971441040039062e+02, 2.976796248372396e+02, 2.975354646809896e+02, 2.96864365234375e+02, 2.950991251627604e+02, 2.937280029296875e+02, 2.930097790527344e+02, 2.920682088216146e+02, 2.958661612955729e+02, 2.981982556152344e+02, 2.982716756184896e+02, 2.982968505859375e+02, 2.983101330566406e+02, 2.983160286458333e+02, 2.969369246419271e+02, 2.943506896972656e+02, 2.929302958170573e+02, 2.922265584309896e+02, 2.917359265136719e+02, 2.916001212565104e+02, 2.918391398111979e+02, 2.914057336425781e+02, 2.908829935709635e+02, 2.903894571940104e+02, 2.895677416992187e+02, 2.88826416015625e+02]
-struct.TSensor[3]=[2.931499938964844e+02, 3.031457035319011e+02, 3.031477661132812e+02, 3.03148193359375e+02, 3.031483154296875e+02, 3.031483764648438e+02, 3.031484069824219e+02, 3.031484375e+02, 3.031484680175781e+02, 3.031484680175781e+02, 3.031484680175781e+02, 3.031484680175781e+02, 3.031484680175781e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484916178385e+02, 3.03148779296875e+02, 3.031488342285156e+02, 3.031488222215996e+02, 3.031490173339844e+02, 3.031487121582031e+02, 3.031487426757812e+02, 3.031487426757812e+02, 3.031486206054688e+02, 3.014520536295573e+02, 3.00664130859375e+02, 2.996444986979167e+02, 2.980932043457031e+02, 2.971697631835938e+02, 2.966447843424479e+02, 2.9681126953125e+02, 2.969187927246094e+02, 2.972178238932292e+02, 2.972191723632812e+02, 2.967928259277344e+02, 2.955879064941406e+02, 2.944552958170573e+02, 2.939522827148438e+02, 2.926409903971354e+02, 2.981426835123698e+02, 2.981481237792969e+02, 2.981487731933594e+02, 2.981487870279948e+02, 2.981488659667968e+02, 2.981488952636719e+02, 2.969453092447916e+02, 2.9511103515625e+02, 2.937520454915365e+02, 2.929973445638021e+02, 2.921674353027344e+02, 2.920139147949219e+02, 2.921068684895833e+02, 2.912969470214844e+02, 2.907066328938802e+02, 2.90210898844401e+02, 2.895207373046875e+02, 2.887737426757812e+02]
+struct.TSensor[3]=[2.931499938964844e+02, 3.031457035319011e+02, 3.031477661132812e+02, 3.03148193359375e+02, 3.031483154296875e+02, 3.031483764648438e+02, 3.031484069824219e+02, 3.031484375e+02, 3.031484375e+02, 3.031484680175781e+02, 3.031484680175781e+02, 3.031484680175781e+02, 3.031484680175781e+02, 3.031484680175781e+02, 3.031484680175781e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484985351562e+02, 3.031484916178385e+02, 3.03148779296875e+02, 3.031488407389323e+02, 3.031488342285156e+02, 3.031490173339844e+02, 3.031487121582031e+02, 3.031487426757812e+02, 3.031487426757812e+02, 3.031486206054688e+02, 3.014559794108073e+02, 3.006640954589844e+02, 2.996372782389323e+02, 2.980842533365885e+02, 2.971531921386719e+02, 2.96636142578125e+02, 2.968091711425781e+02, 2.969205322265625e+02, 2.972198592122396e+02, 2.972194860839843e+02, 2.967933288574219e+02, 2.955827644856771e+02, 2.94445888264974e+02, 2.939424743652344e+02, 2.926242883300781e+02, 2.981414469401042e+02, 2.981481237792969e+02, 2.981487731933594e+02, 2.981488037109375e+02, 2.981488952636719e+02, 2.981488952636719e+02, 2.969412394205729e+02, 2.950965576171875e+02, 2.937419767252604e+02, 2.929859029134115e+02, 2.92157890625e+02, 2.920039534505208e+02, 2.920955220540365e+02, 2.912839978027343e+02, 2.906939851888021e+02, 2.901985408528646e+02, 2.895078234863281e+02, 2.887575073242188e+02]
 heaSys.heaSche.TdegC[3].y=[3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.0312939453125e+02, 3.032199877929688e+02, 3.032847900390625e+02, 3.031992443847656e+02, 3.031610717773438e+02, 3.031455383300781e+02, 3.03159082438151e+02, 3.031503967285156e+02, 3.031563793945313e+02, 3.031545166015625e+02, 3.009260457356771e+02, 2.997968603515625e+02, 2.987770568847656e+02, 2.971344685872396e+02, 2.960803125e+02, 2.958870304361979e+02, 2.966016825358073e+02, 2.968663024902344e+02, 2.97340468343099e+02, 2.973211999511719e+02, 2.966828503417969e+02, 2.948757425944011e+02, 2.935184122721354e+02, 2.928620654296875e+02, 2.918941678873698e+02, 2.966872041829427e+02, 2.981503344726563e+02, 2.981515563964844e+02, 2.981489998372396e+02, 2.981533166503907e+02, 2.981525244140625e+02, 2.96760947672526e+02, 2.9412822265625e+02, 2.927351094563802e+02, 2.920570520019531e+02, 2.915239514160156e+02, 2.914565759277344e+02, 2.91816943359375e+02, 2.913139636230469e+02, 2.90756680094401e+02, 2.902638362630208e+02, 2.89394208984375e+02, 2.886743469238281e+02]
-struct.TSensor[4]=[2.931499938964844e+02, 3.024460404459635e+02, 3.031460266113281e+02, 3.031468811035156e+02, 3.031471756998698e+02, 3.031473083496094e+02, 3.031473999023438e+02, 3.031474609375e+02, 3.031474914550781e+02, 3.031475219726562e+02, 3.031475219726562e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031474914550781e+02, 3.031476135253906e+02, 3.031478271484375e+02, 3.0314794921875e+02, 3.031481628417969e+02, 3.031479187011719e+02, 3.031479187011719e+02, 3.031479187011719e+02, 3.031477449544271e+02, 3.01643428141276e+02, 3.003365124511719e+02, 2.993918192545573e+02, 2.981024617513021e+02, 2.970976953125e+02, 2.963665034993489e+02, 2.962726822916667e+02, 2.963186340332031e+02, 2.965684676106771e+02, 2.966369641113281e+02, 2.963863061523438e+02, 2.954353922526042e+02, 2.944270914713542e+02, 2.935950183105469e+02, 2.926097814941406e+02, 2.960767736816406e+02, 2.981466064453125e+02, 2.981477701822917e+02, 2.9814794921875e+02, 2.981480102539062e+02, 2.981481018066406e+02, 2.969239957682292e+02, 2.951379272460937e+02, 2.937134847005208e+02, 2.927606612141927e+02, 2.9198361328125e+02, 2.915476041666666e+02, 2.915001708984375e+02, 2.911461193847656e+02, 2.906534073893229e+02, 2.901439042154948e+02, 2.894981494140625e+02, 2.888021240234375e+02]
+struct.TSensor[4]=[2.931499938964844e+02, 3.024487133789062e+02, 3.031460213216146e+02, 3.031468811035156e+02, 3.031471557617188e+02, 3.031473083496094e+02, 3.031473693847656e+02, 3.031474304199219e+02, 3.031474609375e+02, 3.031474914550781e+02, 3.031475219726562e+02, 3.031475219726562e+02, 3.031475219726562e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031474727376302e+02, 3.031476135253906e+02, 3.031478271484375e+02, 3.031479307080879e+02, 3.031481323242188e+02, 3.031479020182292e+02, 3.031478881835938e+02, 3.031478881835938e+02, 3.031477355957031e+02, 3.016388635253906e+02, 3.003277355957031e+02, 2.993771728515625e+02, 2.980875598144531e+02, 2.970761120605468e+02, 2.963509606933594e+02, 2.962627840169271e+02, 2.963135375976562e+02, 2.965609456380208e+02, 2.966301688639323e+02, 2.963800988769531e+02, 2.954241760253906e+02, 2.944123128255208e+02, 2.935783117675781e+02, 2.925889530436198e+02, 2.960499580891927e+02, 2.981465979003906e+02, 2.981477661132812e+02, 2.9814794921875e+02, 2.981480102539062e+02, 2.981481018066406e+02, 2.969168501790364e+02, 2.951200439453125e+02, 2.936977563476563e+02, 2.927429024251302e+02, 2.919676257324219e+02, 2.915308544921875e+02, 2.914827311197917e+02, 2.9113009765625e+02, 2.906381323242188e+02, 2.901284635416667e+02, 2.894820642089844e+02, 2.887832336425781e+02]
 heaSys.heaSche.TdegC[4].y=[3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031406477864583e+02, 3.031186462402344e+02, 3.031501208496094e+02, 3.031509824659004e+02, 3.031482801437378e+02, 3.031564827473958e+02, 3.031488891601563e+02, 3.031507580566406e+02, 3.031548364257812e+02, 3.009309993489583e+02, 2.997498706054687e+02, 2.986632446289062e+02, 2.9710900390625e+02, 2.959812280273438e+02, 2.957644262695313e+02, 2.963872741699219e+02, 2.966893920898438e+02, 2.970937036132813e+02, 2.971420943196615e+02, 2.965530334472656e+02, 2.9487693359375e+02, 2.935362874348958e+02, 2.927940234375e+02, 2.918426407877604e+02, 2.960942399088541e+02, 2.981475268554688e+02, 2.981504557291667e+02, 2.981444600423177e+02, 2.981455651855469e+02, 2.981601989746094e+02, 2.96684600016276e+02, 2.940852905273438e+02, 2.926908520507812e+02, 2.91957822672526e+02, 2.914587438964843e+02, 2.913234106445312e+02, 2.914977945963541e+02, 2.911826818847656e+02, 2.907050728352864e+02, 2.902214900716146e+02, 2.894200122070313e+02, 2.88713134765625e+02]
-struct.TSensor[5]=[2.931499938964844e+02, 3.031432926432292e+02, 3.031456298828125e+02, 3.031461486816406e+02, 3.031463623046875e+02, 3.031464538574219e+02, 3.031465148925781e+02, 3.031465454101562e+02, 3.031465759277344e+02, 3.031466064453125e+02, 3.031466064453125e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031466674804688e+02, 3.031463553873698e+02, 3.031467468261719e+02, 3.03147070719401e+02, 3.031471252441406e+02, 3.031474914550781e+02, 3.031468644205729e+02, 3.0314697265625e+02, 3.031471252441406e+02, 3.031466463216146e+02, 3.00770575764974e+02, 2.99702392578125e+02, 2.989695760091146e+02, 2.972138423665365e+02, 2.964183630371094e+02, 2.963082161458333e+02, 2.963218054199219e+02, 2.9633154296875e+02, 2.964509785970052e+02, 2.964794649251302e+02, 2.958803894042969e+02, 2.954293290201823e+02, 2.93923964436849e+02, 2.93115498046875e+02, 2.919434480794271e+02, 2.96729384765625e+02, 2.981465759277344e+02, 2.981474304199219e+02, 2.98147139078776e+02, 2.981474609375e+02, 2.981475219726562e+02, 2.964083467610677e+02, 2.946169311523437e+02, 2.933720495605469e+02, 2.926982059733073e+02, 2.924431884765625e+02, 2.922893172200521e+02, 2.924816874186198e+02, 2.915096545410156e+02, 2.907484619140625e+02, 2.901403946940104e+02, 2.893122631835938e+02, 2.885189208984375e+02]
+struct.TSensor[5]=[2.931499938964844e+02, 3.031433052571614e+02, 3.031456298828125e+02, 3.031461486816406e+02, 3.031463317871094e+02, 3.031464538574219e+02, 3.031465148925781e+02, 3.031465454101562e+02, 3.031465759277344e+02, 3.031466064453125e+02, 3.031466064453125e+02, 3.031466064453125e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031466369628906e+02, 3.031463553873698e+02, 3.031467468261719e+02, 3.03147070719401e+02, 3.031471252441406e+02, 3.031474914550781e+02, 3.031468644205729e+02, 3.0314697265625e+02, 3.031471252441406e+02, 3.031466463216146e+02, 3.007809309895833e+02, 2.997040795898437e+02, 2.989646402994792e+02, 2.972043314615885e+02, 2.964021887207031e+02, 2.962992122395833e+02, 2.963162174479166e+02, 2.96327880859375e+02, 2.964454329427084e+02, 2.96474775797526e+02, 2.958724328613282e+02, 2.954248795572917e+02, 2.939136983235677e+02, 2.931032153320313e+02, 2.919256290690104e+02, 2.967058040364583e+02, 2.981465759277344e+02, 2.981474304199219e+02, 2.981471557617188e+02, 2.981474609375e+02, 2.981475219726562e+02, 2.964029516601562e+02, 2.946039978027344e+02, 2.933628234863281e+02, 2.926878926595052e+02, 2.92437578125e+02, 2.922827962239583e+02, 2.924744608561198e+02, 2.914982495117188e+02, 2.907362662760416e+02, 2.901278824869792e+02, 2.892989270019531e+02, 2.885029602050781e+02]
 heaSys.heaSche.TdegC[5].y=[3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.0313671875e+02, 3.031591979980469e+02, 3.031619201660156e+02, 3.031660823567709e+02, 3.03154541015625e+02, 3.031486682891846e+02, 3.031485046386719e+02, 3.031328491210937e+02, 3.031478002929687e+02, 3.031454252115885e+02, 3.003424471028646e+02, 2.988025793457031e+02, 2.979611897786459e+02, 2.960664298502604e+02, 2.951804663085937e+02, 2.954259029134114e+02, 2.957232381184896e+02, 2.958912353515625e+02, 2.960247473144531e+02, 2.961410815429688e+02, 2.954523754882812e+02, 2.949671948242187e+02, 2.932097188313802e+02, 2.924218579101562e+02, 2.911758898925781e+02, 2.970436429850261e+02, 2.981498608398438e+02, 2.98153135172526e+02, 2.981533520507812e+02, 2.981468090820313e+02, 2.981483276367188e+02, 2.961378633626302e+02, 2.937140319824219e+02, 2.925633740234375e+02, 2.919309903971354e+02, 2.918592041015625e+02, 2.917480696614583e+02, 2.919398132324219e+02, 2.910723608398437e+02, 2.904604056803386e+02, 2.900028361002604e+02, 2.892000561523437e+02, 2.883916931152344e+02]
-struct.TSensor[6]=[2.931499938964844e+02, 3.031463264973958e+02, 3.031479439290364e+02, 3.031483154296875e+02, 3.031484375e+02, 3.031484985351562e+02, 3.031485290527344e+02, 3.031485290527344e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031485900878906e+02, 3.031484985351562e+02, 3.031486145019531e+02, 3.031487121582031e+02, 3.031487731933594e+02, 3.031488647460938e+02, 3.031486649576823e+02, 3.031487121582031e+02, 3.031487426757812e+02, 3.031485994466146e+02, 3.013957063802083e+02, 3.000738830566406e+02, 2.992109781901042e+02, 2.978099593098958e+02, 2.968759167480468e+02, 2.963037219238281e+02, 2.960491853841146e+02, 2.959806823730469e+02, 2.961252758789062e+02, 2.962176639811198e+02, 2.959612951660156e+02, 2.951881237792969e+02, 2.941968790690104e+02, 2.933746826171875e+02, 2.923417313639323e+02, 2.981434676106771e+02, 2.98148193359375e+02, 2.981488037109375e+02, 2.981487426757812e+02, 2.981488037109375e+02, 2.981488952636719e+02, 2.968453454589844e+02, 2.951839782714844e+02, 2.938775516764323e+02, 2.92969111735026e+02, 2.922550805664063e+02, 2.918381245930989e+02, 2.918034647623698e+02, 2.913512097167969e+02, 2.907920023600261e+02, 2.90256523844401e+02, 2.895271594238282e+02, 2.888169555664062e+02]
+struct.TSensor[6]=[2.931499938964844e+02, 3.031463138834636e+02, 3.031479187011719e+02, 3.031483154296875e+02, 3.031484069824219e+02, 3.031484680175781e+02, 3.031484985351562e+02, 3.031485290527344e+02, 3.031485290527344e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031485595703125e+02, 3.031484798177083e+02, 3.031486145019531e+02, 3.031487121582031e+02, 3.031487426757812e+02, 3.031488647460938e+02, 3.031486511230469e+02, 3.031487121582031e+02, 3.031487426757812e+02, 3.031485900878906e+02, 3.013862056477865e+02, 3.000600720214844e+02, 2.991943237304687e+02, 2.977897355143229e+02, 2.968527233886718e+02, 2.962825016276042e+02, 2.960299540201823e+02, 2.959630737304688e+02, 2.961087101236979e+02, 2.962026241048177e+02, 2.959460595703125e+02, 2.951721960449219e+02, 2.941774373372396e+02, 2.933533203125e+02, 2.923174393717448e+02, 2.98143437093099e+02, 2.981481848144531e+02, 2.981488037109375e+02, 2.981487426757812e+02, 2.981488037109375e+02, 2.981488952636719e+02, 2.968363948567708e+02, 2.951654113769531e+02, 2.938571166992188e+02, 2.929482979329427e+02, 2.922355187988281e+02, 2.918196704101563e+02, 2.917873514811198e+02, 2.913350048828125e+02, 2.907750927734375e+02, 2.902388846842448e+02, 2.895079968261718e+02, 2.88795654296875e+02]
 heaSys.heaSche.TdegC[6].y=[3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031622314453125e+02, 3.031462605794271e+02, 3.031526794433594e+02, 3.031633256022135e+02, 3.031534403816598e+02, 3.031490335464478e+02, 3.031507727050781e+02, 3.031429911295573e+02, 3.031494616699219e+02, 3.031506591796875e+02, 3.009080928548177e+02, 2.989505517578125e+02, 2.980511433919271e+02, 2.966162093098959e+02, 2.956721911621094e+02, 2.9540138671875e+02, 2.954007100423177e+02, 2.95432861328125e+02, 2.95631562906901e+02, 2.957826460774739e+02, 2.955466528320313e+02, 2.946401790364583e+02, 2.935517211914063e+02, 2.927693347167969e+02, 2.918028995768229e+02, 2.98189795328776e+02, 2.981478259277344e+02, 2.981478983561198e+02, 2.98164766031901e+02, 2.98153583984375e+02, 2.981462577311198e+02, 2.966881172688802e+02, 2.943078247070313e+02, 2.930038452148438e+02, 2.921597696940104e+02, 2.916634753417969e+02, 2.91296552734375e+02, 2.913660298665365e+02, 2.910529028320312e+02, 2.906289424641927e+02, 2.901841328938802e+02, 2.8944740234375e+02, 2.887413330078125e+02]
-struct.TSensor[7]=[2.931499938964844e+02, 3.029821736653646e+02, 3.031462959798177e+02, 3.0314697265625e+02, 3.03147216796875e+02, 3.031473693847656e+02, 3.031474304199219e+02, 3.031474914550781e+02, 3.031475219726562e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031475642903646e+02, 3.031477294921875e+02, 3.031478946940104e+02, 3.031480102539062e+02, 3.03148193359375e+02, 3.031479797363281e+02, 3.031479797363281e+02, 3.031479797363281e+02, 3.031478576660156e+02, 3.015856665039062e+02, 3.003503662109375e+02, 2.99499696858724e+02, 2.983456026204427e+02, 2.97482861328125e+02, 2.967894104003906e+02, 2.964210310872396e+02, 2.9622412109375e+02, 2.962373714192709e+02, 2.96279482014974e+02, 2.961710498046875e+02, 2.956051399739583e+02, 2.947950948079427e+02, 2.941831115722656e+02, 2.931972684733073e+02, 2.967879105631511e+02, 2.981470251464844e+02, 2.9814794921875e+02, 2.981480712890625e+02, 2.981481323242188e+02, 2.98148193359375e+02, 2.969921459960938e+02, 2.954701293945312e+02, 2.943244645182291e+02, 2.935002746582031e+02, 2.927154968261719e+02, 2.922127620442708e+02, 2.920245849609375e+02, 2.91565146484375e+02, 2.910845247395833e+02, 2.906438875325521e+02, 2.900534838867188e+02, 2.893783569335938e+02]
+struct.TSensor[7]=[2.931499938964844e+02, 3.029856579589843e+02, 3.031462959798177e+02, 3.0314697265625e+02, 3.03147216796875e+02, 3.031473388671875e+02, 3.031474304199219e+02, 3.031474914550781e+02, 3.031475219726562e+02, 3.031475219726562e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475524902344e+02, 3.031477355957031e+02, 3.031479187011719e+02, 3.031480102539062e+02, 3.03148193359375e+02, 3.031479797363281e+02, 3.031479797363281e+02, 3.031479797363281e+02, 3.031478576660156e+02, 3.015905993652344e+02, 3.003504699707031e+02, 2.994950602213542e+02, 2.983401200358073e+02, 2.974711120605469e+02, 2.967816800944011e+02, 2.964156726074219e+02, 2.962211303710938e+02, 2.96231533203125e+02, 2.96275107421875e+02, 2.961670129394531e+02, 2.956028149414062e+02, 2.947893513997396e+02, 2.941759716796875e+02, 2.931849731445312e+02, 2.967674943033854e+02, 2.981470251464844e+02, 2.9814794921875e+02, 2.981480712890625e+02, 2.981481323242188e+02, 2.98148193359375e+02, 2.969919759114583e+02, 2.954624694824219e+02, 2.943194498697916e+02, 2.934929545084635e+02, 2.927096069335938e+02, 2.9220453125e+02, 2.920135457356771e+02, 2.915542626953125e+02, 2.910743155924479e+02, 2.906338639322917e+02, 2.900435607910156e+02, 2.893657531738281e+02]
 heaSys.heaSche.TdegC[7].y=[3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031509399414062e+02, 3.031531416829427e+02, 3.031559631347656e+02, 3.031586991373698e+02, 3.031480352683146e+02, 3.031428823471069e+02, 3.031486804199219e+02, 3.031467000325521e+02, 3.031521545410156e+02, 3.031530684407552e+02, 3.011923661295573e+02, 2.993719104003906e+02, 2.983482727050781e+02, 2.972056770833333e+02, 2.963346557617188e+02, 2.957730525716146e+02, 2.955567720540365e+02, 2.954555358886719e+02, 2.955151241048177e+02, 2.95628622639974e+02, 2.955542529296875e+02, 2.949260172526041e+02, 2.940760009765625e+02, 2.934734228515625e+02, 2.925160127766927e+02, 2.973942700195312e+02, 2.981493579101563e+02, 2.981498881022135e+02, 2.981512622070313e+02, 2.98150546875e+02, 2.981502237955729e+02, 2.968683178710937e+02, 2.947584716796875e+02, 2.935555354817708e+02, 2.926975378417969e+02, 2.919737670898438e+02, 2.914856030273438e+02, 2.913217142740885e+02, 2.91015263671875e+02, 2.907115055338542e+02, 2.904199784342448e+02, 2.898993896484375e+02, 2.892545471191406e+02]
-heaSys.Qhea[1]=[1.82e+03, 1.82e+03, 1.4900339453125e+03, 1.309145991210938e+03, 1.252972039388021e+03, 1.22666455078125e+03, 1.211315727539062e+03, 1.201428277994792e+03, 1.19477400390625e+03, 1.190120893554687e+03, 1.186809993489583e+03, 1.184410851236979e+03, 1.182648354492188e+03, 1.181330647786458e+03, 1.180340576171875e+03, 1.1795919921875e+03, 1.179018264973958e+03, 1.178572032877604e+03, 1.178229072265625e+03, 1.177961923828125e+03, 1.177754606119792e+03, 1.177591533203125e+03, 1.177464718424479e+03, 1.177363336588542e+03, 1.177284604492188e+03, 1.177222574869792e+03, 1.177173707682292e+03, 1.177135561523437e+03, 1.177105258789062e+03, 1.177080935872396e+03, 1.177061840820312e+03, 1.1770478515625e+03, 1.177036593424479e+03, 1.1770262890625e+03, 1.177019287109375e+03, 1.177012882486979e+03, 1.177008544921875e+03, 1.177004638671875e+03, 1.17700244140625e+03, 1.176999633789062e+03, 1.176998111979167e+03, 1.1769970703125e+03, 1.176995483398438e+03, 1.176994656575521e+03, 1.176993629557292e+03, 1.176992919921875e+03, 1.176992919921875e+03, 1.176992727864583e+03, 1.176992534179687e+03, 1.176991974283854e+03, 1.17699169921875e+03, 1.176991831054688e+03, 1.176991637369792e+03, 1.176991821289062e+03, 1.176991538085937e+03, 1.176991455078125e+03, 1.176991437174479e+03, 1.176991455078125e+03, 1.176991577148438e+03, 1.306304239908854e+03, 1.277462133789063e+03, 1.169470711263021e+03, 1.114207259381404e+03, 9.71725866317749e+02, 1.186042236328125e+03, 1.131018863932292e+03, 1.061660424804687e+03, 1.273643251953125e+03, 1.388002232958873e-02, 5.000555187988281e+02, 1.161762583069503e-03, 4.999834195963542e+02, 0e+00, 5.000797086588541e+02, 5.001837076822916e+02, 4.99848388671875e+02, 4.999617106119792e+02, 1.060694329440594e-02, 1.552451707422733e-02, 0e+00, 0e+00, 0e+00, 1.231320598473152e-02, 1.82e+03, 1.162235717773438e+03, 9.0896083984375e+02, 1.060786720377604e+03, 1.015219165039063e+03, 9.231862784830729e+02, 1.087218338002761e-02, 4.750388115644455e-02, 4.00932473440965e-02, 5.504919523994128e-02, 5.2820213586092e-02, 3.577298219005267e-02, 3.24382704993089e-02, 4.333248779177665e-02, 4.400631745656331e-02, 5.810848370194435e-02, 5.358335852622986e-02, 4.516699910163879e-02]
+heaSys.Qhea[1]=[1.82e+03, 1.82e+03, 1.488324244791667e+03, 1.308448935546875e+03, 1.252737169596354e+03, 1.226669913736979e+03, 1.211432045898438e+03, 1.201592789713542e+03, 1.194958489583333e+03, 1.190313276367187e+03, 1.187004711914062e+03, 1.184605553385417e+03, 1.182842197265625e+03, 1.181523152669271e+03, 1.180531860351562e+03, 1.179782177734375e+03, 1.179207521158854e+03, 1.178760631510417e+03, 1.178417182617188e+03, 1.17814966796875e+03, 1.177942106119792e+03, 1.177778828125e+03, 1.177651852213542e+03, 1.177550470377604e+03, 1.17747173828125e+03, 1.177409708658854e+03, 1.177360841471354e+03, 1.177322797851562e+03, 1.177292392578125e+03, 1.177268069661458e+03, 1.177249096679687e+03, 1.177235107421875e+03, 1.177223849283854e+03, 1.177213544921875e+03, 1.17720654296875e+03, 1.1772001953125e+03, 1.177195922851562e+03, 1.177192016601562e+03, 1.177189819335938e+03, 1.17718701171875e+03, 1.177185489908854e+03, 1.177184563802083e+03, 1.177182861328125e+03, 1.177182034505208e+03, 1.177181007486979e+03, 1.177180297851562e+03, 1.177180418294271e+03, 1.17718017578125e+03, 1.177179912109375e+03, 1.177179352213542e+03, 1.177179077148438e+03, 1.177179321289062e+03, 1.177179015299479e+03, 1.177179309895833e+03, 1.177178955078125e+03, 1.177178833007812e+03, 1.177178833007812e+03, 1.177178833007812e+03, 1.177178955078125e+03, 1.303588385416667e+03, 1.272164184570312e+03, 1.164309558919271e+03, 1.110142271948642e+03, 9.701404304504395e+02, 1.182849700520833e+03, 1.129340641276042e+03, 1.061257880859375e+03, 1.269261954752604e+03, 1.388002232958873e-02, 5.000555187988281e+02, 1.161762583069503e-03, 4.999834195963542e+02, 0e+00, 5.000797086588541e+02, 5.001837076822916e+02, 4.99848388671875e+02, 4.999617106119792e+02, 1.060694329440594e-02, 1.552451707422733e-02, 0e+00, 0e+00, 0e+00, 1.231320598473152e-02, 1.82e+03, 1.16315970703125e+03, 9.081203084309896e+02, 1.057573084309896e+03, 1.012094191894531e+03, 9.225312801106771e+02, 1.087218338002761e-02, 4.750388115644455e-02, 4.00932473440965e-02, 5.504919523994128e-02, 5.2820213586092e-02, 3.577298219005267e-02, 3.24382704993089e-02, 4.333248779177665e-02, 4.400631745656331e-02, 5.810848370194435e-02, 5.358335852622986e-02, 4.516699910163879e-02]
 heaSys.heaSche.Pel_IDEAL[1]=[1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.1482958984375e+03, 1.265359905598958e+03, 1.219719677734375e+03, 1.099763126627604e+03, 1.04736984703189e+03, 9.113274955749512e+02, 1.166508416341146e+03, 1.069226082356771e+03, 9.989011474609375e+02, 1.223894682617188e+03, 1.388002232958873e-02, 5.000555187988281e+02, 1.161762583069503e-03, 4.999834195963542e+02, 0e+00, 5.000797086588541e+02, 5.001837076822916e+02, 4.99848388671875e+02, 4.999617106119792e+02, 1.060694329440594e-02, 1.552451707422733e-02, 0e+00, 0e+00, 0e+00, 1.231320598473152e-02, 1.831648051757812e+03, 9.476201538085937e+02, 7.7937197265625e+02, 9.714805387369792e+02, 9.825216943359375e+02, 8.67020096842448e+02, 1.087218338002761e-02, 4.750388115644455e-02, 4.00932473440965e-02, 5.504919523994128e-02, 5.2820213586092e-02, 3.577298219005267e-02, 3.24382704993089e-02, 4.333248779177665e-02, 4.400631745656331e-02, 5.810848370194435e-02, 5.358335852622986e-02, 4.516699910163879e-02]
-heaSys.Qhea[3]=[7.5e+02, 4.302127775065104e+02, 2.233914021809896e+02, 1.812892388916016e+02, 1.675474727376302e+02, 1.614984944661458e+02, 1.581285852050781e+02, 1.559885609944662e+02, 1.54532651163737e+02, 1.534952728271484e+02, 1.527411499023438e+02, 1.521808850097656e+02, 1.517603820800781e+02, 1.514388387044271e+02, 1.511937969970703e+02, 1.510046478271484e+02, 1.508567649332682e+02, 1.507393717447917e+02, 1.506489855957031e+02, 1.505820717366537e+02, 1.505227060953776e+02, 1.504784588623047e+02, 1.504445670572917e+02, 1.504187357584636e+02, 1.503932318115234e+02, 1.503780771891276e+02, 1.503642897542318e+02, 1.503490167236328e+02, 1.503398697916667e+02, 1.503283892822266e+02, 1.503263946533203e+02, 1.503212048339844e+02, 1.50315014851888e+02, 1.503138006591797e+02, 1.503089666748047e+02, 1.503034006754557e+02, 1.502988439941406e+02, 1.502926568603516e+02, 1.502996018473307e+02, 1.502916784667969e+02, 1.502978271484375e+02, 1.502971470133463e+02, 1.502943084716797e+02, 1.502914693196614e+02, 1.502924289957682e+02, 1.502926361083984e+02, 1.502946105957031e+02, 1.50295156656901e+02, 1.502967346191406e+02, 1.502970017496745e+02, 1.50298344930013e+02, 1.502992504882812e+02, 1.503016835530599e+02, 1.503060858154297e+02, 1.503059509277344e+02, 1.503090698242187e+02, 1.50312100016276e+02, 1.503153588867187e+02, 1.503166656494141e+02, 1.515529056803385e+02, 1.228486053466797e+02, 1.165791061401367e+02, 1.180259486964491e+02, 9.760462117195129e+01, 1.288008711751302e+02, 1.245339665730794e+02, 1.254381314086914e+02, 1.391215370686849e+02, 7.218269834915797e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.325063020833334e+02, 1.879171911621094e+02, 1.235217208862305e+02, 1.210650838216146e+02, 1.119874340820313e+02, 1.111073168945313e+02, 8.033366570870082e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+heaSys.Qhea[3]=[7.5e+02, 4.295938334147135e+02, 2.233822780354818e+02, 1.815721618652344e+02, 1.679677726236979e+02, 1.619849456787109e+02, 1.586482104492187e+02, 1.565267069498698e+02, 1.550822338867187e+02, 1.540528533935547e+02, 1.533046936035156e+02, 1.527490696207682e+02, 1.52332158203125e+02, 1.520135514322917e+02, 1.517708321126302e+02, 1.515835693359375e+02, 1.514371482340495e+02, 1.513210215250651e+02, 1.512315832519531e+02, 1.511654502360026e+02, 1.511067321777344e+02, 1.510629565429687e+02, 1.510294431559245e+02, 1.510040016682943e+02, 1.509788049316406e+02, 1.50963877360026e+02, 1.509503155517578e+02, 1.509354333496094e+02, 1.509264392089844e+02, 1.509152447509766e+02, 1.509130981445313e+02, 1.509079966227214e+02, 1.509021232096354e+02, 1.509009234619141e+02, 1.508963014729818e+02, 1.508908884684245e+02, 1.508865563964844e+02, 1.508806642659505e+02, 1.50887294921875e+02, 1.508797027587891e+02, 1.508856272379557e+02, 1.508850280761719e+02, 1.508823254394531e+02, 1.508796040852864e+02, 1.508805637613932e+02, 1.508807861328125e+02, 1.50882729695638e+02, 1.508832586669922e+02, 1.508847985839844e+02, 1.508850718180339e+02, 1.508863881429037e+02, 1.508872540283203e+02, 1.508896500651042e+02, 1.508938930257162e+02, 1.508937683105469e+02, 1.508967793782552e+02, 1.508996993001302e+02, 1.509028314208985e+02, 1.50904096476237e+02, 1.519858410644531e+02, 1.228484741210937e+02, 1.161745614624023e+02, 1.175856520856013e+02, 9.751295948028564e+01, 1.287608628336588e+02, 1.245928721110026e+02, 1.255736819458008e+02, 1.386691617838542e+02, 7.218269834915797e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.405042643229167e+02, 1.881770892333984e+02, 1.233655797322591e+02, 1.206248465983073e+02, 1.118419058227539e+02, 1.111153521728516e+02, 8.033366570870082e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 heaSys.heaSche.Pel_IDEAL[3]=[1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.95525390625e+02, 1.077377620442708e+02, 5.189975585937501e+01, 1.430058304850261e+02, 1.583604773849737e+02, 1.363961930274963e+02, 1.743756427001953e+02, 1.646248514811198e+02, 1.647554870605469e+02, 1.876993607584635e+02, 7.218269834915797e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.750027189127604e+02, 1.698689849853516e+02, 1.480752512613932e+02, 1.625502970377604e+02, 1.509081658935547e+02, 1.386764794921875e+02, 8.033366570870082e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-heaSys.Qhea[4]=[7.5e+02, 7.5e+02, 3.973792842610677e+02, 3.122338269042968e+02, 2.829637923177083e+02, 2.686790262858073e+02, 2.602751062011719e+02, 2.548992946370443e+02, 2.513323935953776e+02, 2.488795672607422e+02, 2.471646748860677e+02, 2.459429756673177e+02, 2.450605731201172e+02, 2.444103129069011e+02, 2.439283754475912e+02, 2.435681976318359e+02, 2.432948942057292e+02, 2.430848795572917e+02, 2.429237805175781e+02, 2.42799623819987e+02, 2.427037353515625e+02, 2.42628525390625e+02, 2.425699226888021e+02, 2.425239914957682e+02, 2.4248806640625e+02, 2.424597880045573e+02, 2.424377258300781e+02, 2.424203503417969e+02, 2.424065985107422e+02, 2.423957230631511e+02, 2.423870574951172e+02, 2.423803424072265e+02, 2.42375059000651e+02, 2.423709478759766e+02, 2.423677793375651e+02, 2.4236513671875e+02, 2.423630731201172e+02, 2.423614672851562e+02, 2.423601666259766e+02, 2.423591387939453e+02, 2.42358305867513e+02, 2.423579728190104e+02, 2.42357451171875e+02, 2.423569287109375e+02, 2.42356576944987e+02, 2.423563568115234e+02, 2.423563684082031e+02, 2.423562034098307e+02, 2.423560815429688e+02, 2.423560561116537e+02, 2.423559824625651e+02, 2.423558782958984e+02, 2.423560563151042e+02, 2.423561263020833e+02, 2.423560131835937e+02, 2.423559305826823e+02, 2.423559242757161e+02, 2.4235595703125e+02, 2.423559722900391e+02, 2.516337721761068e+02, 2.373715515136719e+02, 2.161946858723958e+02, 2.061889200679591e+02, 1.851944832801819e+02, 2.087149928792318e+02, 2.092730356852213e+02, 2.087509503173828e+02, 2.251829296875e+02, 1.171302696069082e-01, 3.821562185883522e-02, 3.891944959759712e-02, 3.854666699965795e-02, 4.23929163813591e-02, 3.853051955501238e-02, 3.825907667477926e-02, 4.24170009791851e-02, 3.72940082848072e-02, 3.852315361301104e-02, 3.818601667881012e-02, 4.263555124402046e-02, 3.966160913308461e-02, 3.766097411513328e-02, 3.908053790529569e-02, 7.5e+02, 3.38812529296875e+02, 2.22041704305013e+02, 2.061595623779297e+02, 1.979566754150391e+02, 1.895039129638672e+02, 1.154813618461291e-01, 3.528055995702743e-02, 3.718616396188736e-02, 4.720215092102686e-02, 3.753710076212883e-02, 3.338143552343051e-02, 3.581358939409256e-02, 3.763950064778328e-02, 3.655238971114159e-02, 3.431935471793016e-02, 3.743234381079674e-02, 4.306700080633163e-02]
+heaSys.Qhea[4]=[7.5e+02, 7.5e+02, 3.9785083984375e+02, 3.132390222167969e+02, 2.842320467122396e+02, 2.700757893880208e+02, 2.617382458496094e+02, 2.564009814453125e+02, 2.528593298339844e+02, 2.504248278808594e+02, 2.487238972981771e+02, 2.475131481933594e+02, 2.466393969726562e+02, 2.459960443115234e+02, 2.45519628499349e+02, 2.451638519287109e+02, 2.448940645345052e+02, 2.446868697102865e+02, 2.445280200195313e+02, 2.444056724039714e+02, 2.443111958821615e+02, 2.442371173095703e+02, 2.441794211832682e+02, 2.441342287190755e+02, 2.440988604736328e+02, 2.44071055094401e+02, 2.440493591308594e+02, 2.440322583007813e+02, 2.440187418619792e+02, 2.440080430094401e+02, 2.439995147705078e+02, 2.439929217529297e+02, 2.439877416992188e+02, 2.439836950683594e+02, 2.439805875651042e+02, 2.439779907226562e+02, 2.439759729003906e+02, 2.439743931070963e+02, 2.439731121826172e+02, 2.43972099609375e+02, 2.439712972005208e+02, 2.439709649658203e+02, 2.439704675292969e+02, 2.439699505615234e+02, 2.439696112060547e+02, 2.439693939208984e+02, 2.439694207763672e+02, 2.439692492675781e+02, 2.439691363525391e+02, 2.439691084798177e+02, 2.439690500895182e+02, 2.439689459228516e+02, 2.439691239420573e+02, 2.439691939290365e+02, 2.439690808105469e+02, 2.439689982096354e+02, 2.43968994140625e+02, 2.439690399169922e+02, 2.439690551757812e+02, 2.528600948079427e+02, 2.380262145996094e+02, 2.167351261393229e+02, 2.067164899482102e+02, 1.859532461166382e+02, 2.095610778808594e+02, 2.103483612060547e+02, 2.098392687988281e+02, 2.256624131266276e+02, 1.171302696069082e-01, 3.821562185883522e-02, 3.891944959759712e-02, 3.854666699965795e-02, 4.23929163813591e-02, 3.853051955501238e-02, 3.825907667477926e-02, 4.24170009791851e-02, 3.72940082848072e-02, 3.852315361301104e-02, 3.818601667881012e-02, 4.263555124402046e-02, 3.966160913308461e-02, 3.766097411513328e-02, 3.908053790529569e-02, 7.5e+02, 3.401824389648438e+02, 2.226300496419271e+02, 2.064744612630208e+02, 1.989253479003906e+02, 1.904164093017578e+02, 1.154813618461291e-01, 3.528055995702743e-02, 3.718616396188736e-02, 4.720215092102686e-02, 3.753710076212883e-02, 3.338143552343051e-02, 3.581358939409256e-02, 3.763950064778328e-02, 3.655238971114159e-02, 3.431935471793016e-02, 3.743234381079674e-02, 4.306700080633163e-02]
 heaSys.heaSche.Pel_IDEAL[4]=[3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.624784545898438e+02, 3.510102844238281e+02, 3.226813415527344e+02, 2.937624357096354e+02, 2.866764236200051e+02, 2.680862636566162e+02, 3.007419083658854e+02, 2.968406290690104e+02, 2.953560546875e+02, 3.171920072428385e+02, 1.171302696069082e-01, 3.821562185883522e-02, 3.891944959759712e-02, 3.854666699965795e-02, 4.23929163813591e-02, 3.853051955501238e-02, 3.825907667477926e-02, 4.24170009791851e-02, 3.72940082848072e-02, 3.852315361301104e-02, 3.818601667881012e-02, 4.263555124402046e-02, 3.966160913308461e-02, 3.766097411513328e-02, 3.908053790529569e-02, 7.725170198567708e+02, 3.68180888671875e+02, 2.917607299804687e+02, 2.940689274088542e+02, 2.882565417480469e+02, 2.664429077148437e+02, 1.154813618461291e-01, 3.528055995702743e-02, 3.718616396188736e-02, 4.720215092102686e-02, 3.753710076212883e-02, 3.338143552343051e-02, 3.581358939409256e-02, 3.763950064778328e-02, 3.655238971114159e-02, 3.431935471793016e-02, 3.743234381079674e-02, 4.306700080633163e-02]
-heaSys.Qhea[5]=[7.5e+02, 5.235650927734375e+02, 2.898514676920573e+02, 2.374424853515625e+02, 2.17439292195638e+02, 2.070040354410807e+02, 2.006437408447266e+02, 1.965167405192057e+02, 1.93772856241862e+02, 1.918951861572266e+02, 1.905955139160156e+02, 1.896819775390625e+02, 1.890306842041016e+02, 1.885584027099609e+02, 1.882137910970052e+02, 1.879605163574219e+02, 1.877708870442708e+02, 1.876254644775391e+02, 1.875172027587891e+02, 1.874336293538412e+02, 1.873695922851562e+02, 1.873198132324219e+02, 1.872821199544271e+02, 1.872512876383464e+02, 1.872280584716797e+02, 1.872098185221354e+02, 1.871954541015625e+02, 1.871845764160156e+02, 1.871757482910156e+02, 1.871684122721354e+02, 1.871628540039063e+02, 1.871594401041667e+02, 1.871565586344401e+02, 1.871528985595703e+02, 1.871511094156901e+02, 1.871488566080729e+02, 1.871478765869141e+02, 1.871465714518229e+02, 1.871463883463542e+02, 1.871452905273437e+02, 1.871451314290365e+02, 1.871450026448568e+02, 1.871442205810547e+02, 1.871440498860677e+02, 1.871434908040364e+02, 1.87143212890625e+02, 1.871435850016276e+02, 1.8714359375e+02, 1.871435552978515e+02, 1.871432002766927e+02, 1.871430155436198e+02, 1.871433331298828e+02, 1.871431115722656e+02, 1.871433548990885e+02, 1.871430877685547e+02, 1.871430552164714e+02, 1.871431315104167e+02, 1.871430883789062e+02, 1.871432342529297e+02, 1.919222045898437e+02, 1.497977203369141e+02, 1.342624489339193e+02, 1.390349849013031e+02, 1.282521963119507e+02, 1.51994609781901e+02, 1.52697173055013e+02, 1.526527972412109e+02, 1.598044836425781e+02, -1.438711735026042e+02, -1.063751669311524e+02, -7.496523132324219e+01, -8.628615956624348e+01, -5.028893035888672e+01, -7.411785532633463e+01, -7.461906778971354e+01, -8.156156921386719e+01, -5.133353378295899e+01, -5.433077458699545e+01, -5.378089370727539e+01, -7.509255015055338e+01, -7.272313842773437e+01, -6.174055755615235e+01, -5.162819188435872e+01, 7.5e+02, 2.520472906494141e+02, 1.655379414876302e+02, 1.56872734781901e+02, 1.242168368530273e+02, 1.361308032226563e+02, -9.904454091389974e+01, -5.934945068359375e+01, -8.504895985921225e+01, -6.508414927164714e+01, -7.445955383300782e+01, -5.525932205200196e+01, -1.978502209981282e+01, -1.902037536621094e+01, -2.885745404561361e+01, -3.199160906473795e+01, -3.956168106079102e+01, -3.243476104736328e+01]
+heaSys.Qhea[5]=[7.5e+02, 5.229197526041667e+02, 2.898624357096354e+02, 2.378121667480469e+02, 2.180001505533854e+02, 2.076609598795573e+02, 2.013514660644531e+02, 1.97254765218099e+02, 1.945312131754557e+02, 1.926685046386719e+02, 1.913802439371745e+02, 1.904756066894531e+02, 1.898313854980469e+02, 1.893647304280599e+02, 1.890245570882161e+02, 1.887748077392578e+02, 1.885880045572917e+02, 1.884448622639974e+02, 1.883383850097656e+02, 1.882562284342448e+02, 1.881933420817057e+02, 1.881444592285156e+02, 1.881074831136068e+02, 1.880772231038411e+02, 1.880544592285156e+02, 1.880365854899088e+02, 1.880225071207682e+02, 1.880118469238281e+02, 1.880031801350912e+02, 1.879960032145182e+02, 1.879905670166016e+02, 1.879872322591146e+02, 1.879844124348958e+02, 1.879808001708984e+02, 1.879790665690104e+02, 1.879768595377604e+02, 1.87975923461914e+02, 1.879746354166667e+02, 1.879744630940755e+02, 1.879733850097656e+02, 1.879732259114583e+02, 1.879731123860677e+02, 1.879723303222656e+02, 1.879721748860677e+02, 1.879716033935547e+02, 1.879713287353516e+02, 1.879717100016276e+02, 1.879717340087891e+02, 1.879716827392578e+02, 1.879713252766927e+02, 1.879711405436198e+02, 1.879714733886719e+02, 1.879712440999349e+02, 1.879714951578776e+02, 1.879712329101563e+02, 1.8797119140625e+02, 1.879712717692057e+02, 1.879712133789062e+02, 1.879713745117188e+02, 1.924609352620443e+02, 1.484242919921875e+02, 1.329094203694661e+02, 1.384183292076236e+02, 1.278936295509338e+02, 1.519371561686198e+02, 1.528763000488281e+02, 1.529201177978516e+02, 1.59304838256836e+02, -1.438711735026042e+02, -1.063751669311524e+02, -7.496523132324219e+01, -8.628615956624348e+01, -5.028893035888672e+01, -7.411785532633463e+01, -7.461906778971354e+01, -8.156156921386719e+01, -5.133353378295899e+01, -5.433077458699545e+01, -5.378089370727539e+01, -7.509255015055338e+01, -7.272313842773437e+01, -6.174055755615235e+01, -5.162819188435872e+01, 7.5e+02, 2.524595935058594e+02, 1.654455820719401e+02, 1.565436560058594e+02, 1.23365466003418e+02, 1.362532358805339e+02, -9.904454091389974e+01, -5.934945068359375e+01, -8.504895985921225e+01, -6.508414927164714e+01, -7.445955383300782e+01, -5.525932205200196e+01, -1.978502209981282e+01, -1.902037536621094e+01, -2.885745404561361e+01, -3.199160906473795e+01, -3.956168106079102e+01, -3.243476104736328e+01]
 heaSys.heaSche.Pel_IDEAL[5]=[1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.694965209960938e+02, 1.482323942057292e+02, 1.16247477722168e+02, 1.115396725463867e+02, 1.294839182369045e+02, 1.300806527137756e+02, 1.422248956298828e+02, 1.492191518147787e+02, 1.495097454833984e+02, 1.420806793212891e+02, -1.438711735026042e+02, -1.063751669311524e+02, -7.496523132324219e+01, -8.628615956624348e+01, -5.028893035888672e+01, -7.411785532633463e+01, -7.461906778971354e+01, -8.156156921386719e+01, -5.133353378295899e+01, -5.433077458699545e+01, -5.378089370727539e+01, -7.509255015055338e+01, -7.272313842773437e+01, -6.174055755615235e+01, -5.162819188435872e+01, 6.61037197265625e+02, 2.085265545654297e+02, 1.566329233805339e+02, 1.44114853515625e+02, 1.33791806640625e+02, 1.402317417399088e+02, -9.904454091389974e+01, -5.934945068359375e+01, -8.504895985921225e+01, -6.508414927164714e+01, -7.445955383300782e+01, -5.525932205200196e+01, -1.978502209981282e+01, -1.902037536621094e+01, -2.885745404561361e+01, -3.199160906473795e+01, -3.956168106079102e+01, -3.243476104736328e+01]
-heaSys.Qhea[6]=[7.5e+02, 3.67064599609375e+02, 2.062008302815755e+02, 1.688197454833984e+02, 1.569647890218099e+02, 1.516123545328776e+02, 1.48504208984375e+02, 1.464749230957031e+02, 1.450861517333984e+02, 1.441014678955078e+02, 1.433930206298828e+02, 1.428750415039063e+02, 1.424927465820313e+02, 1.422055419921875e+02, 1.419895481363932e+02, 1.418260559082031e+02, 1.417006919352214e+02, 1.416035711669922e+02, 1.415283843994141e+02, 1.414700575764974e+02, 1.414248209635417e+02, 1.413894512939453e+02, 1.413623663330078e+02, 1.413400486246745e+02, 1.413231274414063e+02, 1.413096618652344e+02, 1.412991180419922e+02, 1.412911712646484e+02, 1.412846177164714e+02, 1.41279159749349e+02, 1.412749969482422e+02, 1.412723075358073e+02, 1.412702067057292e+02, 1.412672760009766e+02, 1.412659584554036e+02, 1.412644012451172e+02, 1.412634832763672e+02, 1.412627095540365e+02, 1.412620528157552e+02, 1.412613854980469e+02, 1.412612528483073e+02, 1.412608223470052e+02, 1.41260376586914e+02, 1.412598899332682e+02, 1.41259887491862e+02, 1.412594573974609e+02, 1.412596307373047e+02, 1.41259413655599e+02, 1.412588977050781e+02, 1.412584364827474e+02, 1.412579650878906e+02, 1.412580010986328e+02, 1.412577630615234e+02, 1.412580135091146e+02, 1.412577563476563e+02, 1.41257231648763e+02, 1.412575233968099e+02, 1.412576934814453e+02, 1.412572664388021e+02, 1.499398168945312e+02, 1.378907043457031e+02, 1.284846551513672e+02, 1.238257268686764e+02, 1.125285530090332e+02, 1.331465041097005e+02, 1.284269073486328e+02, 1.257334512329102e+02, 1.395230177815755e+02, 1.105265368024508e-01, 2.663118533790112e-02, 2.223564460873604e-02, 2.925884234408537e-02, 2.860437504947186e-02, 2.598198771476746e-02, 3.081977002322674e-02, 2.831700071692467e-02, 2.333926223218441e-02, 3.059879114230474e-02, 2.76437759399414e-02, 2.552881814539433e-02, 3.00786371032397e-02, 2.369841918349266e-02, 2.831608571112156e-02, 6.52813065592448e+02, 1.811637139892578e+02, 1.191375910441081e+02, 1.246085326131185e+02, 1.183405520629883e+02, 1.107624402872721e+02, 1.065432000160217e-01, 2.927718199789524e-02, 2.566054321825504e-02, 2.743249036371708e-02, 2.699641332030296e-02, 3.14441318064928e-02, 2.422875252862771e-02, 2.681538566946983e-02, 2.808345603446166e-02, 3.343569869796435e-02, 3.15064038336277e-02, 3.003299981355667e-02]
+heaSys.Qhea[6]=[7.5e+02, 3.673973299153646e+02, 2.069012878417969e+02, 1.697868280029297e+02, 1.580653163655599e+02, 1.527765238444011e+02, 1.497008361816406e+02, 1.476907712809245e+02, 1.463151625569662e+02, 1.453405017089844e+02, 1.446399943033854e+02, 1.441284318033854e+02, 1.437513354492187e+02, 1.434683707682292e+02, 1.432557922363281e+02, 1.430950439453125e+02, 1.429719051106771e+02, 1.428765665690104e+02, 1.428028204345703e+02, 1.427456290690104e+02, 1.427012949625651e+02, 1.426666577148438e+02, 1.426401525878906e+02, 1.426182926432292e+02, 1.426017376708984e+02, 1.425885772705078e+02, 1.425782623291016e+02, 1.425704986572266e+02, 1.425640911865234e+02, 1.425587465413412e+02, 1.425546813964844e+02, 1.425520621744792e+02, 1.425500223795573e+02, 1.425471276855469e+02, 1.425458504231771e+02, 1.425443237304688e+02, 1.425434210205078e+02, 1.425426625569661e+02, 1.425420318603516e+02, 1.425413690185547e+02, 1.425412445068359e+02, 1.425408219401042e+02, 1.42540390625e+02, 1.425399039713542e+02, 1.425399015299479e+02, 1.425394714355469e+02, 1.425396447753906e+02, 1.42539442952474e+02, 1.425389270019531e+02, 1.425384619140625e+02, 1.425379842122396e+02, 1.425380303955078e+02, 1.425377923583984e+02, 1.425380428059896e+02, 1.425377856445313e+02, 1.42537260945638e+02, 1.425375526936849e+02, 1.425377227783203e+02, 1.425372957356771e+02, 1.512535176595052e+02, 1.388506774902344e+02, 1.29333388264974e+02, 1.246610298782098e+02, 1.132611889839172e+02, 1.341595635986328e+02, 1.294552551269531e+02, 1.266996047973633e+02, 1.40477588297526e+02, 1.105265368024508e-01, 2.663118533790112e-02, 2.223564460873604e-02, 2.925884234408537e-02, 2.860437504947186e-02, 2.598198771476746e-02, 3.081977002322674e-02, 2.831700071692467e-02, 2.333926223218441e-02, 3.059879114230474e-02, 2.76437759399414e-02, 2.552881814539433e-02, 3.00786371032397e-02, 2.369841918349266e-02, 2.831608571112156e-02, 6.567336336263021e+02, 1.819509509277344e+02, 1.196650405883789e+02, 1.253038734944661e+02, 1.191824340820312e+02, 1.116159231567383e+02, 1.065432000160217e-01, 2.927718199789524e-02, 2.566054321825504e-02, 2.743249036371708e-02, 2.699641332030296e-02, 3.14441318064928e-02, 2.422875252862771e-02, 2.681538566946983e-02, 2.808345603446166e-02, 3.343569869796435e-02, 3.15064038336277e-02, 3.003299981355667e-02]
 heaSys.heaSche.Pel_IDEAL[6]=[1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.818350982666016e+02, 1.774959897867839e+02, 1.581708953857422e+02, 1.506814426676432e+02, 1.507253910752594e+02, 1.347213644981384e+02, 1.625447273763021e+02, 1.573305308024088e+02, 1.51347431640625e+02, 1.660419944254557e+02, 1.105265368024508e-01, 2.663118533790112e-02, 2.223564460873604e-02, 2.925884234408537e-02, 2.860437504947186e-02, 2.598198771476746e-02, 3.081977002322674e-02, 2.831700071692467e-02, 2.333926223218441e-02, 3.059879114230474e-02, 2.76437759399414e-02, 2.552881814539433e-02, 3.00786371032397e-02, 2.369841918349266e-02, 2.831608571112156e-02, 6.016779541015625e+02, 1.697183172607422e+02, 1.230776555379232e+02, 1.27075991007487e+02, 1.417883624267578e+02, 1.371340098063151e+02, 1.065432000160217e-01, 2.927718199789524e-02, 2.566054321825504e-02, 2.743249036371708e-02, 2.699641332030296e-02, 3.14441318064928e-02, 2.422875252862771e-02, 2.681538566946983e-02, 2.808345603446166e-02, 3.343569869796435e-02, 3.15064038336277e-02, 3.003299981355667e-02]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_TwinHouses_BuildingN2_Exp2.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_TwinHouses_BuildingN2_Exp2.txt
index 740a7ad3cf..dc2424b4f9 100644
--- a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_TwinHouses_BuildingN2_Exp2.txt
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_TwinHouses_BuildingN2_Exp2.txt
@@ -1,4 +1,4 @@
-last-generated=2024-10-30
+last-generated=2024-12-04
 statistics-initialization=
 {
   "nonlinear": "18, 10, 8, 11, 10, 8, 12",
@@ -12,27 +12,27 @@ statistics-simulation=
   "numerical Jacobians": "0"
 }
 time=[8e+06, 1.23e+07]
-struct.TSensor[1]=[2.931499938964844e+02, 3.031349589029948e+02, 3.031373596191406e+02, 3.031380920410156e+02, 3.031383056640625e+02, 3.031383361816406e+02, 3.031383056640625e+02, 3.031382310655382e+02, 3.031381530761719e+02, 3.031380920410156e+02, 3.031380310058594e+02, 3.031380140516493e+02, 3.031437174479167e+02, 3.031388176812066e+02, 3.031405029296875e+02, 3.031384989420573e+02, 3.031493767632379e+02, 3.031389872233073e+02, 3.031470031738281e+02, 3.031407165527344e+02, 3.031443820529514e+02, 3.031399129231771e+02, 3.031425136990017e+02, 3.031383768717448e+02, 3.031389261881511e+02, 3.031371053059896e+02, 3.031409403483073e+02, 3.031372680664062e+02, 3.02342515733507e+02, 2.994189147949219e+02, 2.981969807942708e+02, 2.957391221788195e+02, 2.950797458224827e+02, 2.943591918945312e+02, 2.944486965603298e+02, 2.942361077202691e+02, 2.955804138183594e+02, 2.941224093967014e+02, 2.945746629503038e+02, 2.942906595865886e+02, 3.038565538194445e+02, 3.031360439724392e+02, 3.031481526692708e+02, 3.031404486762153e+02, 3.031499226888021e+02, 3.031417846679688e+02, 3.031440700954861e+02, 3.03141587999132e+02, 3.031408284505208e+02, 3.0313916015625e+02, 3.031412963867188e+02, 3.031392822265625e+02, 3.064825032552083e+02, 3.069510667588976e+02, 3.067446899414062e+02, 3.073042432996962e+02, 3.083103332519531e+02, 3.034911804199219e+02, 3.084475674099392e+02, 3.069884982638889e+02, 2.998335164388021e+02, 2.97938001844618e+02, 3.042548082139757e+02, 3.060263671875e+02, 3.08476314968533e+02, 3.097256469726562e+02, 3.117366739908854e+02, 3.118613111707899e+02, 3.117627495659722e+02, 3.077941487630208e+02, 3.109079420301649e+02, 3.059235568576389e+02, 3.037413635253906e+02, 3.024050462510851e+02, 3.012999165852864e+02, 3.008720092773438e+02, 2.992887166341146e+02, 2.986436462402344e+02, 2.977990926106771e+02, 2.976552632649739e+02, 2.980055135091146e+02, 2.970258178710938e+02, 3.031357116699219e+02, 3.031372646755642e+02, 3.031396280924479e+02, 3.031384853786892e+02, 3.031392652723524e+02, 3.031385599772136e+02, 3.031391432020399e+02, 3.03139153374566e+02, 3.031417236328125e+02, 3.031413981119792e+02, 3.031444871690538e+02, 3.031431070963542e+02, 3.04313001844618e+02, 3.045778096516927e+02, 3.048048400878906e+02, 3.050103454589844e+02, 3.051980082194011e+02, 3.053699340820312e+02, 3.055275268554688e+02]
+struct.TSensor[1]=[2.931499938964844e+02, 3.031350199381511e+02, 3.031373765733507e+02, 3.031380920410156e+02, 3.031383056640625e+02, 3.031383056640625e+02, 3.031382751464844e+02, 3.031382141113281e+02, 3.031381530761719e+02, 3.031380615234375e+02, 3.031380310058594e+02, 3.031379835340712e+02, 3.031435343424479e+02, 3.031388481987847e+02, 3.031404724121094e+02, 3.031384887695312e+02, 3.031491326226129e+02, 3.031390482584636e+02, 3.031468811035156e+02, 3.031407775878906e+02, 3.031443040635851e+02, 3.031399739583333e+02, 3.031424594455295e+02, 3.031384073893229e+02, 3.03138916015625e+02, 3.031371053059896e+02, 3.031408860948351e+02, 3.031372985839844e+02, 3.022444458007812e+02, 2.994168192545573e+02, 2.981663411458333e+02, 2.957244635687934e+02, 2.950455932617188e+02, 2.943382670084636e+02, 2.944037475585938e+02, 2.942186414930555e+02, 2.955124206542969e+02, 2.94105224609375e+02, 2.945327487521702e+02, 2.942820536295573e+02, 3.037769402398004e+02, 3.031360744900173e+02, 3.031478169759114e+02, 3.031405097113715e+02, 3.031493767632379e+02, 3.03141845703125e+02, 3.031440327962239e+02, 3.031416625976562e+02, 3.031408284505208e+02, 3.0313916015625e+02, 3.031412353515625e+02, 3.031392822265625e+02, 3.064549391004774e+02, 3.069491678873698e+02, 3.066739501953125e+02, 3.07305894639757e+02, 3.082675136990017e+02, 3.034898579915364e+02, 3.084251912434896e+02, 3.069823913574219e+02, 2.998185933430989e+02, 2.979191555447048e+02, 3.042159322102864e+02, 3.06021240234375e+02, 3.084122992621528e+02, 3.097271626790364e+02, 3.116803487141927e+02, 3.11854000515408e+02, 3.117473958333333e+02, 3.077750244140625e+02, 3.10862562391493e+02, 3.05909427218967e+02, 3.037068786621094e+02, 3.023813069661458e+02, 3.012492302788629e+02, 3.008532206217448e+02, 2.992598266601562e+02, 2.986252814398871e+02, 2.977552591959636e+02, 2.976399298773871e+02, 2.979780714246962e+02, 2.970042724609375e+02, 3.031355658637153e+02, 3.031372951931423e+02, 3.031395975748698e+02, 3.031384887695312e+02, 3.031392313639323e+02, 3.031385599772136e+02, 3.031391126844618e+02, 3.03139153374566e+02, 3.031416320800781e+02, 3.031414591471354e+02, 3.031443956163195e+02, 3.031431376139323e+02, 3.043108249240452e+02, 3.045726860894097e+02, 3.047976786295573e+02, 3.050017428927952e+02, 3.051883036295573e+02, 3.053593139648438e+02, 3.055161743164062e+02]
 heaSys.heaSche.TdegC[1].y=[2.990380859375e+02, 2.990380859375e+02, 2.990380859375e+02, 2.990380859375e+02, 2.990380859375e+02, 2.990380859375e+02, 2.990380859375e+02, 2.990380859375e+02, 2.990380859375e+02, 2.990380859375e+02, 2.990380859375e+02, 3.021195848253038e+02, 3.031872762044271e+02, 3.031346605088976e+02, 3.031639980740017e+02, 3.031531575520833e+02, 3.04109137641059e+02, 3.031228705512153e+02, 3.03719482421875e+02, 3.031609598795573e+02, 3.034354078504774e+02, 3.031559651692708e+02, 3.030040351019965e+02, 3.031412523057726e+02, 3.031261393229167e+02, 3.031443854437934e+02, 3.029156222873264e+02, 3.030721740722656e+02, 3.032326422797309e+02, 2.991427239312066e+02, 2.981273600260417e+02, 2.956830376519097e+02, 2.953414476182726e+02, 2.946087239583333e+02, 2.949816012912327e+02, 2.946831766764323e+02, 2.966837768554688e+02, 2.94917487250434e+02, 2.958516167534722e+02, 2.952198588053386e+02, 3.045009596082899e+02, 3.0314013671875e+02, 3.035987243652344e+02, 3.031372172037761e+02, 3.035993143717448e+02, 3.031558227539062e+02, 3.032898898654514e+02, 3.03152336968316e+02, 3.031201273600261e+02, 3.031529947916667e+02, 3.031325378417969e+02, 3.031494140625e+02, 3.062656080457899e+02, 3.064721069335938e+02, 3.083427429199219e+02, 3.074852769639757e+02, 3.076666327582465e+02, 3.034290568033854e+02, 3.073068237304688e+02, 3.056910671657986e+02, 3.000613606770833e+02, 2.977960442437066e+02, 3.032782762315538e+02, 3.051010437011719e+02, 3.080572408040364e+02, 3.085728793674045e+02, 3.109004109700521e+02, 3.106543579101562e+02, 3.106228502061632e+02, 3.077914123535156e+02, 3.097730984157986e+02, 3.054059007432726e+02, 3.031150512695312e+02, 3.015087788899739e+02, 3.010467664930555e+02, 3.001897888183594e+02, 2.987091912163629e+02, 2.979744567871094e+02, 2.975061442057292e+02, 2.971534423828125e+02, 2.980043843587239e+02, 2.967503662109375e+02, 3.032006598578559e+02, 3.031304083930121e+02, 3.030696512858073e+02, 3.031482510036892e+02, 3.03218736436632e+02, 3.031403096516927e+02, 3.031676432291667e+02, 3.031570468478733e+02, 3.032133483886719e+02, 3.031370781792535e+02, 3.032227105034722e+02, 3.031352437337239e+02, 3.031604309082031e+02, 3.031604309082031e+02, 3.031604309082031e+02, 3.031604309082031e+02, 3.031604309082031e+02, 3.031604309082031e+02, 3.031604309082031e+02]
-struct.TSensor[2]=[2.931499938964844e+02, 3.005153367784288e+02, 3.01247321234809e+02, 3.016088053385417e+02, 3.017813279893663e+02, 3.018560350206163e+02, 3.018807678222656e+02, 3.018801676432292e+02, 3.018675096299913e+02, 3.018495483398438e+02, 3.01829830593533e+02, 3.01810560438368e+02, 3.018428243001302e+02, 3.018656582302517e+02, 3.018454928927952e+02, 3.01820068359375e+02, 3.01907728407118e+02, 3.01953131781684e+02, 3.019797973632812e+02, 3.019810519748264e+02, 3.019349772135417e+02, 3.019278971354167e+02, 3.019399108886719e+02, 3.019062737358941e+02, 3.0186083984375e+02, 3.018217061360677e+02, 3.01838375515408e+02, 3.018262939453125e+02, 3.015317281087239e+02, 3.005254211425781e+02, 2.994072265625e+02, 2.97961910671658e+02, 2.969241129557292e+02, 2.962263081868489e+02, 2.957012634277344e+02, 2.954526977539062e+02, 2.955741577148438e+02, 2.951330973307292e+02, 2.950029703776042e+02, 2.951261494954427e+02, 2.985080091688368e+02, 3.001125115288629e+02, 3.009766438802083e+02, 3.014654710557726e+02, 3.017086588541667e+02, 3.018866577148438e+02, 3.018744574652778e+02, 3.019170769585504e+02, 3.018832194010417e+02, 3.018524237738715e+02, 3.018279927571614e+02, 3.018144632975261e+02, 3.028708394368489e+02, 3.03883802625868e+02, 3.04804931640625e+02, 3.057549947102864e+02, 3.052100592719184e+02, 3.042000834147136e+02, 3.0528076171875e+02, 3.047872992621528e+02, 3.021084289550781e+02, 3.005159301757812e+02, 3.017514207628038e+02, 3.031878662109375e+02, 3.045519544813368e+02, 3.06163804796007e+02, 3.073273213704427e+02, 3.08412835015191e+02, 3.087642381456163e+02, 3.081851806640625e+02, 3.082721998426649e+02, 3.069521721733941e+02, 3.054879150390625e+02, 3.04171875e+02, 3.028246154785156e+02, 3.022077026367188e+02, 3.010329149034288e+02, 3.002609219021267e+02, 2.994090881347656e+02, 2.991275092230903e+02, 2.993776245117188e+02, 2.987239379882812e+02, 3.006254475911458e+02, 3.012550048828125e+02, 3.015350952148438e+02, 3.017050509982639e+02, 3.017501254611545e+02, 3.018144632975261e+02, 3.017992519802517e+02, 3.018104315863715e+02, 3.017944030761719e+02, 3.018885498046875e+02, 3.019090915256077e+02, 3.020133463541667e+02, 3.023990444607205e+02, 3.026264377170139e+02, 3.028455708821614e+02, 3.030571933322483e+02, 3.0325927734375e+02, 3.034504699707031e+02, 3.036300964355469e+02]
+struct.TSensor[2]=[2.931499938964844e+02, 3.005100606282552e+02, 3.012357957628038e+02, 3.015927530924479e+02, 3.017622172037761e+02, 3.018349236382379e+02, 3.018583068847656e+02, 3.018568522135417e+02, 3.018436143663195e+02, 3.018253173828125e+02, 3.018053012424045e+02, 3.017858412000868e+02, 3.018198852539062e+02, 3.018441060384114e+02, 3.0182275390625e+02, 3.017972819010417e+02, 3.018911709255642e+02, 3.01936754014757e+02, 3.019635925292969e+02, 3.019654710557726e+02, 3.019172804090712e+02, 3.019109395345052e+02, 3.019227905273438e+02, 3.01886725531684e+02, 3.018377583821614e+02, 3.017965325249566e+02, 3.018146294487847e+02, 3.018018798828125e+02, 3.014792819552952e+02, 3.00495374891493e+02, 2.993684183756511e+02, 2.979248216417101e+02, 2.968799201117621e+02, 2.961837666829427e+02, 2.956526624891493e+02, 2.954112108018663e+02, 2.955203247070312e+02, 2.95095201280382e+02, 2.949597710503472e+02, 2.950924479166667e+02, 2.984613952636719e+02, 3.000893385145399e+02, 3.009630126953125e+02, 3.014557393391927e+02, 3.017001003689236e+02, 3.018779602050781e+02, 3.018618774414062e+02, 3.019063618977864e+02, 3.018688252766927e+02, 3.018347744411892e+02, 3.018081800672743e+02, 3.017946065266927e+02, 3.028412984212239e+02, 3.038586154513889e+02, 3.047661437988281e+02, 3.057309977213542e+02, 3.051734008789062e+02, 3.041724650065104e+02, 3.052481825086805e+02, 3.047575005425347e+02, 3.020728352864583e+02, 3.004759148491754e+02, 3.01705064561632e+02, 3.031495361328125e+02, 3.045022176106771e+02, 3.061287400987413e+02, 3.072821248372396e+02, 3.08379397922092e+02, 3.08728759765625e+02, 3.081465352376302e+02, 3.082244330512153e+02, 3.069096306694879e+02, 3.054405517578125e+02, 3.041261969672309e+02, 3.02773193359375e+02, 3.021646423339844e+02, 3.009880608452691e+02, 3.002176852756077e+02, 2.99360107421875e+02, 2.990853780110677e+02, 2.993328653971354e+02, 2.986792297363281e+02, 3.005900268554688e+02, 3.012296922471788e+02, 3.015104268391927e+02, 3.016824985080295e+02, 3.017262301974827e+02, 3.017925618489583e+02, 3.017754211425781e+02, 3.017879401312934e+02, 3.017715759277344e+02, 3.018723449707031e+02, 3.018934631347656e+02, 3.020026041666667e+02, 3.02386956108941e+02, 3.026124030219184e+02, 3.028296915690104e+02, 3.030397237141927e+02, 3.03240471733941e+02, 3.034305114746094e+02, 3.036091613769531e+02]
 heaSys.heaSche.TdegC[2].y=[2.997415161132812e+02, 2.997415161132812e+02, 2.997415161132812e+02, 2.997415161132812e+02, 2.997415161132812e+02, 2.997415161132812e+02, 2.997415161132812e+02, 2.997415161132812e+02, 2.997415161132812e+02, 2.997415161132812e+02, 2.997415161132812e+02, 3.026630520290798e+02, 3.029274291992188e+02, 3.032151184082031e+02, 3.03078362358941e+02, 3.032037556966146e+02, 3.032131890190972e+02, 3.032126668294271e+02, 3.0302685546875e+02, 3.031861843532986e+02, 3.03045905219184e+02, 3.032153828938802e+02, 3.029517178005642e+02, 3.032437540690104e+02, 3.031488037109375e+02, 3.032519870334202e+02, 3.028664008246528e+02, 3.032142944335938e+02, 3.026327006022136e+02, 2.99836666531033e+02, 2.985971577962239e+02, 2.966207377115886e+02, 2.958135952419705e+02, 2.952578430175781e+02, 2.951641099717882e+02, 2.950580444335938e+02, 2.960299987792969e+02, 2.952173156738281e+02, 2.955768703884548e+02, 2.955915730794271e+02, 3.034792853461371e+02, 3.031609090169271e+02, 3.030744832356771e+02, 3.03168958875868e+02, 3.030994330512153e+02, 3.031918334960938e+02, 3.029573465983073e+02, 3.031334194607205e+02, 3.030595601399739e+02, 3.032026706271702e+02, 3.030104743109809e+02, 3.031759643554688e+02, 3.057472161187066e+02, 3.067300652398004e+02, 3.080120849609375e+02, 3.078919304741754e+02, 3.071237691243489e+02, 3.040349019368489e+02, 3.071390957302517e+02, 3.05968994140625e+02, 3.008857421875e+02, 2.989105021158854e+02, 3.031704983181423e+02, 3.05344482421875e+02, 3.077722744411892e+02, 3.086579386393229e+02, 3.104686686197917e+02, 3.107575785319011e+02, 3.107275221082899e+02, 3.085185750325521e+02, 3.096358744303386e+02, 3.060349934895833e+02, 3.039185180664062e+02, 3.023673570421007e+02, 3.01292961968316e+02, 3.006912027994792e+02, 2.993406236436632e+02, 2.985871412489149e+02, 2.980579935709636e+02, 2.977375284830729e+02, 2.985225965711805e+02, 2.975119934082031e+02, 3.027685546875e+02, 3.031639980740017e+02, 3.029517313639323e+02, 3.032058275010851e+02, 3.031592814127604e+02, 3.032112935384114e+02, 3.03152103000217e+02, 3.031882731119792e+02, 3.029213256835938e+02, 3.031535068088108e+02, 3.031410319010417e+02, 3.031365661621094e+02, 3.031742858886719e+02, 3.031742858886719e+02, 3.031742858886719e+02, 3.031742858886719e+02, 3.031742858886719e+02, 3.031742858886719e+02, 3.031742858886719e+02]
-struct.TSensor[3]=[2.931499938964844e+02, 3.031465996636285e+02, 3.031473558213976e+02, 3.031475626627604e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476135253906e+02, 3.031475830078125e+02, 3.031475524902344e+02, 3.031475524902344e+02, 3.031475219726562e+02, 3.031474914550781e+02, 3.031481526692708e+02, 3.031475490993923e+02, 3.031478271484375e+02, 3.031475219726562e+02, 3.031489562988281e+02, 3.031476745605469e+02, 3.031488342285156e+02, 3.031478576660156e+02, 3.031483493381077e+02, 3.031476745605469e+02, 3.031483696831597e+02, 3.031476169162327e+02, 3.031477355957031e+02, 3.031473999023438e+02, 3.031482645670573e+02, 3.031473999023438e+02, 3.02360110812717e+02, 3.000463053385417e+02, 2.992540893554688e+02, 2.976419576009114e+02, 2.968960808648004e+02, 2.961260070800781e+02, 2.958353000217014e+02, 2.952897203233507e+02, 2.959975280761719e+02, 2.95068352593316e+02, 2.951996799045139e+02, 2.949966837565104e+02, 3.031718580457899e+02, 3.031462063259548e+02, 3.031487019856771e+02, 3.031475219726562e+02, 3.031495463053386e+02, 3.031479187011719e+02, 3.031483866373698e+02, 3.031478576660156e+02, 3.031478881835938e+02, 3.031476745605469e+02, 3.031480407714844e+02, 3.031476745605469e+02, 3.065004509819879e+02, 3.074943271213108e+02, 3.075214538574219e+02, 3.076529100206163e+02, 3.085800577799479e+02, 3.041495259602864e+02, 3.087868381076389e+02, 3.07692613389757e+02, 3.020328165690104e+02, 3.004801974826389e+02, 3.055943467881945e+02, 3.070117492675781e+02, 3.099581400553386e+02, 3.100750698513455e+02, 3.126733296712239e+02, 3.124376322428386e+02, 3.126214260525173e+02, 3.094746195475261e+02, 3.124283413357205e+02, 3.072987467447917e+02, 3.056520080566406e+02, 3.041099446614583e+02, 3.036044209798177e+02, 3.02337158203125e+02, 3.012149251302083e+02, 3.003378431532118e+02, 3.006199340820312e+02, 2.994548950195312e+02, 3.000849372016059e+02, 2.989432983398438e+02, 3.03147213406033e+02, 3.031472473144531e+02, 3.031478474934896e+02, 3.031475219726562e+02, 3.03147701687283e+02, 3.031475830078125e+02, 3.031476745605469e+02, 3.031476135253906e+02, 3.031482238769531e+02, 3.031478881835938e+02, 3.037913208007812e+02, 3.031485493977864e+02, 3.038606974283854e+02, 3.040799696180555e+02, 3.042989807128906e+02, 3.045154995388455e+02, 3.047245517306858e+02, 3.049234619140625e+02, 3.051110534667969e+02]
+struct.TSensor[3]=[2.931499938964844e+02, 3.031465996636285e+02, 3.031473558213976e+02, 3.031475524902344e+02, 3.031476135253906e+02, 3.031476440429688e+02, 3.031476135253906e+02, 3.031475830078125e+02, 3.031475524902344e+02, 3.031475219726562e+02, 3.031474914550781e+02, 3.031474914550781e+02, 3.031481424967448e+02, 3.031475490993923e+02, 3.031477966308594e+02, 3.031475219726562e+02, 3.031489427354601e+02, 3.03147698296441e+02, 3.031488037109375e+02, 3.031478576660156e+02, 3.031483493381077e+02, 3.031476745605469e+02, 3.031483696831597e+02, 3.031476440429688e+02, 3.031477355957031e+02, 3.031473999023438e+02, 3.031482645670573e+02, 3.031473999023438e+02, 3.023417392306858e+02, 3.000448065863715e+02, 2.992293192545573e+02, 2.976327785915798e+02, 2.968675808376736e+02, 2.961044514973958e+02, 2.957937520345052e+02, 2.952649807400173e+02, 2.959393615722656e+02, 2.950441724989149e+02, 2.95155520968967e+02, 2.949774678548177e+02, 3.031277838812934e+02, 3.031462063259548e+02, 3.031487019856771e+02, 3.031475219726562e+02, 3.031495463053386e+02, 3.0314794921875e+02, 3.031483561197917e+02, 3.031478576660156e+02, 3.031478881835938e+02, 3.031476745605469e+02, 3.031480373806423e+02, 3.031476745605469e+02, 3.064750739203559e+02, 3.074842698838976e+02, 3.074779357910156e+02, 3.076451110839844e+02, 3.085379333496094e+02, 3.041401062011719e+02, 3.087573716905382e+02, 3.07673587375217e+02, 3.020219624837239e+02, 3.004664679633246e+02, 3.055502522786458e+02, 3.069883117675781e+02, 3.098927408854167e+02, 3.100550096299913e+02, 3.126135152180989e+02, 3.124170396592882e+02, 3.125950453016493e+02, 3.094552510579427e+02, 3.123777398003472e+02, 3.072776082356771e+02, 3.056175842285156e+02, 3.04080579969618e+02, 3.035407511393229e+02, 3.023122456868489e+02, 3.01183108859592e+02, 3.003160502115886e+02, 3.005736897786458e+02, 2.994347805447048e+02, 3.000553758409288e+02, 2.989211730957031e+02, 3.031471828884548e+02, 3.031472473144531e+02, 3.031478169759114e+02, 3.031475219726562e+02, 3.031476711697048e+02, 3.031475830078125e+02, 3.031476440429688e+02, 3.031476135253906e+02, 3.03148193359375e+02, 3.031478949652778e+02, 3.037188754611545e+02, 3.031485493977864e+02, 3.038539733886719e+02, 3.040704820421007e+02, 3.042876688639323e+02, 3.045028652615017e+02, 3.047108120388455e+02, 3.049087524414062e+02, 3.050954895019531e+02]
 heaSys.heaSche.TdegC[3].y=[2.997743225097656e+02, 2.997743225097656e+02, 2.997743225097656e+02, 2.997743225097656e+02, 2.997743225097656e+02, 2.997743225097656e+02, 2.997743225097656e+02, 2.997743225097656e+02, 2.997743225097656e+02, 2.997743225097656e+02, 2.997743225097656e+02, 3.02930168999566e+02, 3.031438090006511e+02, 3.031362609863281e+02, 3.031385837131077e+02, 3.031478474934896e+02, 3.031436869303386e+02, 3.031433749728733e+02, 3.031524047851562e+02, 3.031480882432726e+02, 3.031511027018229e+02, 3.031505737304688e+02, 3.030699462890625e+02, 3.031499532063802e+02, 3.031288452148438e+02, 3.031443549262153e+02, 3.029015367296007e+02, 3.038079833984375e+02, 3.024598083496094e+02, 2.994956292046441e+02, 2.984579366048177e+02, 2.963550618489583e+02, 2.956574537489149e+02, 2.950015462239583e+02, 2.950739237467448e+02, 2.947861056857639e+02, 2.961797180175781e+02, 2.950216403537327e+02, 2.956040412055121e+02, 2.953513793945312e+02, 3.036381666395399e+02, 3.031558193630642e+02, 3.031571858723958e+02, 3.031485561794705e+02, 3.031413743760851e+02, 3.031607971191406e+02, 3.031738586425781e+02, 3.031502007378472e+02, 3.031642862955729e+02, 3.031515943739149e+02, 3.031690911187066e+02, 3.031526285807292e+02, 3.061023593478733e+02, 3.068106011284722e+02, 3.081710205078125e+02, 3.077520446777344e+02, 3.075915425618489e+02, 3.037330118815104e+02, 3.073641459147136e+02, 3.059669325086805e+02, 3.006717020670573e+02, 2.986086324055989e+02, 3.034354553222656e+02, 3.053403015136719e+02, 3.085636393229167e+02, 3.087740444607205e+02, 3.114782613118489e+02, 3.108324381510417e+02, 3.108883361816406e+02, 3.082302754720052e+02, 3.105557420518663e+02, 3.057198079427083e+02, 3.037047119140625e+02, 3.020441792805989e+02, 3.014859517415364e+02, 3.004310607910156e+02, 2.991788838704427e+02, 2.983324211968316e+02, 2.982880045572917e+02, 2.975054253472222e+02, 2.984278361002604e+02, 2.972750854492188e+02, 3.033182101779514e+02, 3.031497938368055e+02, 3.030288696289062e+02, 3.03162360297309e+02, 3.03216315375434e+02, 3.031557718912761e+02, 3.031449110243055e+02, 3.031498480902778e+02, 3.031077270507812e+02, 3.031326463487413e+02, 3.041793891059028e+02, 3.031500854492188e+02, 3.031549072265625e+02, 3.031549072265625e+02, 3.031549072265625e+02, 3.031549072265625e+02, 3.031549072265625e+02, 3.031549072265625e+02, 3.031549072265625e+02]
-struct.TSensor[4]=[2.931499938964844e+02, 3.031448838975695e+02, 3.031464538574219e+02, 3.031469116210938e+02, 3.031470642089844e+02, 3.031470947265625e+02, 3.031470947265625e+02, 3.031470947265625e+02, 3.031470642089844e+02, 3.031470642089844e+02, 3.031470336914062e+02, 3.031470336914062e+02, 3.03148193359375e+02, 3.031472473144531e+02, 3.031474914550781e+02, 3.031471862792969e+02, 3.03149176703559e+02, 3.031475151909722e+02, 3.031488037109375e+02, 3.031477423773871e+02, 3.031484103732639e+02, 3.031475524902344e+02, 3.031480373806423e+02, 3.031473422580295e+02, 3.031473999023438e+02, 3.031470506456163e+02, 3.031476847330729e+02, 3.0314697265625e+02, 3.024237874348958e+02, 3.008532138400608e+02, 2.998796488444011e+02, 2.98427727593316e+02, 2.974841512044271e+02, 2.966511535644531e+02, 2.96119154188368e+02, 2.956205613878038e+02, 2.958370361328125e+02, 2.951359592013889e+02, 2.950735168457031e+02, 2.951001078287761e+02, 3.004154086642795e+02, 3.03143792046441e+02, 3.031478780110677e+02, 3.031470336914062e+02, 3.031490614149305e+02, 3.03147705078125e+02, 3.031481730143229e+02, 3.031477830674913e+02, 3.031476745605469e+02, 3.031473999023438e+02, 3.031477355957031e+02, 3.031473693847656e+02, 3.051425442165798e+02, 3.060555962456597e+02, 3.058633422851562e+02, 3.067987230088976e+02, 3.07345208062066e+02, 3.047832641601562e+02, 3.076251491970486e+02, 3.06963385687934e+02, 3.028789672851562e+02, 3.013754577636719e+02, 3.043846672905816e+02, 3.056393432617188e+02, 3.071682298448351e+02, 3.083691134982639e+02, 3.097338053385417e+02, 3.105807868109809e+02, 3.111014946831597e+02, 3.092392985026042e+02, 3.108392266167535e+02, 3.078393046061198e+02, 3.064450378417969e+02, 3.051038377549913e+02, 3.039333902994792e+02, 3.030799967447917e+02, 3.019396362304688e+02, 3.010809902615017e+02, 3.002821553548177e+02, 2.998613586425781e+02, 3.001992526584202e+02, 2.993798522949219e+02, 3.031457417805989e+02, 3.031466674804688e+02, 3.031472778320312e+02, 3.031471557617188e+02, 3.031473049587673e+02, 3.031472473144531e+02, 3.031473083496094e+02, 3.031473083496094e+02, 3.031476745605469e+02, 3.031476813422309e+02, 3.031482747395833e+02, 3.03148193359375e+02, 3.036083780924479e+02, 3.038323364257812e+02, 3.040545450846354e+02, 3.042725321451823e+02, 3.044826083713108e+02, 3.046824645996094e+02, 3.048710632324219e+02]
+struct.TSensor[4]=[2.931499938964844e+02, 3.031448838975695e+02, 3.031464538574219e+02, 3.031469116210938e+02, 3.031470642089844e+02, 3.031470947265625e+02, 3.031470947265625e+02, 3.031470947265625e+02, 3.031470642089844e+02, 3.031470336914062e+02, 3.031470336914062e+02, 3.031470167371962e+02, 3.031481323242188e+02, 3.031472473144531e+02, 3.031474609375e+02, 3.031471557617188e+02, 3.031491156684028e+02, 3.031475219726562e+02, 3.031487731933594e+02, 3.031477661132812e+02, 3.031483798556858e+02, 3.031475524902344e+02, 3.031480373806423e+02, 3.031473422580295e+02, 3.031473795572917e+02, 3.031470336914062e+02, 3.031476779513889e+02, 3.0314697265625e+02, 3.023607313368055e+02, 3.008433668348524e+02, 2.998535359700521e+02, 2.98409912109375e+02, 2.974523383246528e+02, 2.966243896484375e+02, 2.96077640109592e+02, 2.955925835503472e+02, 2.95777587890625e+02, 2.951080864800347e+02, 2.950302836100261e+02, 2.950767822265625e+02, 3.003482666015625e+02, 3.031437615288629e+02, 3.031477864583333e+02, 3.031470642089844e+02, 3.031489698621962e+02, 3.031477355957031e+02, 3.031481662326389e+02, 3.031477966308594e+02, 3.031476745605469e+02, 3.031473999023438e+02, 3.031477355957031e+02, 3.031473490397136e+02, 3.051197916666667e+02, 3.060437791612413e+02, 3.058084411621094e+02, 3.067886386447483e+02, 3.073071729871962e+02, 3.047698262532552e+02, 3.075978732638889e+02, 3.069434983995226e+02, 3.028592529296875e+02, 3.013517693413629e+02, 3.043433702256945e+02, 3.056133117675781e+02, 3.071094699435764e+02, 3.083462727864583e+02, 3.096815592447917e+02, 3.105566236707899e+02, 3.110734524197048e+02, 3.092137044270833e+02, 3.107923346625434e+02, 3.078115709092882e+02, 3.064071960449219e+02, 3.050718451605903e+02, 3.038824327256945e+02, 3.030490824381511e+02, 3.019043138292101e+02, 3.010509202745226e+02, 3.002378031412761e+02, 2.998334655761719e+02, 3.001655476888021e+02, 2.993482666015625e+02, 3.031456807454427e+02, 3.031466674804688e+02, 3.031472676595052e+02, 3.031471557617188e+02, 3.031472778320312e+02, 3.031472473144531e+02, 3.031472913953993e+02, 3.031472778320312e+02, 3.031476440429688e+02, 3.03147705078125e+02, 3.031482272677952e+02, 3.03148193359375e+02, 3.03604007297092e+02, 3.038251410590278e+02, 3.040450744628906e+02, 3.042611965603298e+02, 3.044696689181858e+02, 3.046681518554688e+02, 3.048555603027344e+02]
 heaSys.heaSche.TdegC[4].y=[2.99871826171875e+02, 2.99871826171875e+02, 2.99871826171875e+02, 2.99871826171875e+02, 2.99871826171875e+02, 2.99871826171875e+02, 2.99871826171875e+02, 2.99871826171875e+02, 2.99871826171875e+02, 2.99871826171875e+02, 2.99871826171875e+02, 3.028327433268229e+02, 3.032151184082031e+02, 3.031512620713976e+02, 3.031538560655382e+02, 3.031556599934896e+02, 3.032718370225695e+02, 3.031378682454427e+02, 3.032116394042969e+02, 3.031583692762587e+02, 3.033137308756511e+02, 3.031635437011719e+02, 3.031355828179254e+02, 3.031445685492621e+02, 3.031247456868489e+02, 3.031439175075955e+02, 3.0300537109375e+02, 3.030937805175781e+02, 3.02628899468316e+02, 2.998594224717882e+02, 2.986151835123698e+02, 2.967021009657118e+02, 2.958927273220486e+02, 2.952815144856771e+02, 2.951417541503906e+02, 2.949697740342882e+02, 2.958978881835938e+02, 2.951258443196614e+02, 2.954678955078125e+02, 2.954807535807292e+02, 3.030375162760417e+02, 3.031507873535156e+02, 3.031756998697917e+02, 3.031411946614583e+02, 3.031812845865886e+02, 3.031546630859375e+02, 3.032029317220052e+02, 3.031513231065538e+02, 3.03158935546875e+02, 3.031547648111979e+02, 3.031243726942274e+02, 3.031501261393229e+02, 3.057310621473524e+02, 3.06626207139757e+02, 3.079546813964844e+02, 3.078349372016059e+02, 3.071077134874132e+02, 3.040570271809896e+02, 3.071795281304254e+02, 3.059310370551215e+02, 3.010067036946614e+02, 2.990037841796875e+02, 3.031640930175781e+02, 3.052535095214844e+02, 3.076239217122396e+02, 3.085827806260851e+02, 3.102722880045573e+02, 3.106931932237413e+02, 3.107215440538195e+02, 3.085177510579427e+02, 3.095633917914496e+02, 3.060313585069445e+02, 3.039961853027344e+02, 3.024514363606771e+02, 3.013216925726996e+02, 3.007687784830729e+02, 2.994232618543837e+02, 2.986694641113281e+02, 2.980366821289062e+02, 2.977483893500434e+02, 2.98484368218316e+02, 2.975355224609375e+02, 3.031500379774305e+02, 3.031457316080729e+02, 3.030693766276042e+02, 3.031535034179688e+02, 3.031649983723958e+02, 3.031503499348958e+02, 3.031416117350261e+02, 3.031473422580295e+02, 3.031635131835938e+02, 3.031445617675781e+02, 3.031718241373698e+02, 3.031441752115886e+02, 3.031453552246094e+02, 3.031453552246094e+02, 3.031453552246094e+02, 3.031453552246094e+02, 3.031453552246094e+02, 3.031453552246094e+02, 3.031453552246094e+02]
-struct.TSensor[5]=[2.931499938964844e+02, 2.96927232530382e+02, 2.966708068847656e+02, 2.964371236165364e+02, 2.962049424913195e+02, 2.959824117024739e+02, 2.957552591959636e+02, 2.955284118652344e+02, 2.953108147515191e+02, 2.951499328613281e+02, 2.951497497558594e+02, 2.95149658203125e+02, 2.951498006184896e+02, 2.951495056152344e+02, 2.951497802734375e+02, 2.951495361328125e+02, 2.951724514431423e+02, 2.951492614746094e+02, 2.952160034179688e+02, 2.951498413085938e+02, 2.951912841796875e+02, 2.951496988932292e+02, 2.951498718261719e+02, 2.951493259006077e+02, 2.951493326822917e+02, 2.951490342881945e+02, 2.951493699815538e+02, 2.951490173339844e+02, 2.951338467068142e+02, 2.950065273708767e+02, 2.951964721679688e+02, 2.950687018500434e+02, 2.951167704264323e+02, 2.949808959960938e+02, 2.950619710286458e+02, 2.948096991644965e+02, 2.948944396972656e+02, 2.947122056749132e+02, 2.947560865614149e+02, 2.945328877766927e+02, 2.94544664171007e+02, 2.951488342285156e+02, 2.951634826660156e+02, 2.951497192382812e+02, 2.953991868760851e+02, 2.952669982910156e+02, 2.954796922471788e+02, 2.954348856608073e+02, 2.952928466796875e+02, 2.951498718261719e+02, 2.9514990234375e+02, 2.951498413085938e+02, 2.951948988172743e+02, 2.951178215874566e+02, 2.955638732910156e+02, 2.957513834635417e+02, 2.961065877278646e+02, 2.961820475260417e+02, 2.962600436740452e+02, 2.962690056694879e+02, 2.956937357584636e+02, 2.952772047254774e+02, 2.95204087999132e+02, 2.948543701171875e+02, 2.951735161675347e+02, 2.954671732584636e+02, 2.96324462890625e+02, 2.967717895507812e+02, 2.970973849826389e+02, 2.971503295898438e+02, 2.974416300455729e+02, 2.97505126953125e+02, 2.975655517578125e+02, 2.975374111599392e+02, 2.97313245985243e+02, 2.971658223470052e+02, 2.967864447699653e+02, 2.96389156765408e+02, 2.960971883138021e+02, 2.959497748480903e+02, 2.958032701280382e+02, 2.95793701171875e+02, 2.951497802734375e+02, 2.951495666503906e+02, 2.951496683756511e+02, 2.951496276855469e+02, 2.951496887207031e+02, 2.951495666503906e+02, 2.951496276855469e+02, 2.951497192382812e+02, 2.951499633789062e+02, 2.95204833984375e+02, 2.954469570583767e+02, 2.956775817871094e+02, 2.959266526963976e+02, 2.961663614908854e+02, 2.964118957519531e+02, 2.966533643934462e+02, 2.968860982259114e+02, 2.971078186035156e+02, 2.973175048828125e+02]
+struct.TSensor[5]=[2.931499938964844e+02, 2.969396870930989e+02, 2.966766425238715e+02, 2.964368387858073e+02, 2.961996222601996e+02, 2.95972907172309e+02, 2.957412211100261e+02, 2.955109286838108e+02, 2.952904764811198e+02, 2.9514990234375e+02, 2.951497497558594e+02, 2.95149658203125e+02, 2.951497802734375e+02, 2.951495056152344e+02, 2.951497497558594e+02, 2.951495361328125e+02, 2.951624315049913e+02, 2.951492614746094e+02, 2.952020568847656e+02, 2.951498345269097e+02, 2.951800537109375e+02, 2.951496887207031e+02, 2.951498718261719e+02, 2.951493259006077e+02, 2.951493225097656e+02, 2.951490342881945e+02, 2.951493699815538e+02, 2.951490173339844e+02, 2.951173366970486e+02, 2.949943542480469e+02, 2.951733601888021e+02, 2.950533243815104e+02, 2.950977478027344e+02, 2.949603576660156e+02, 2.950415140787761e+02, 2.94788333468967e+02, 2.948667907714844e+02, 2.946886562771267e+02, 2.947322625054254e+02, 2.945128377278646e+02, 2.945099249945746e+02, 2.951488308376736e+02, 2.951525573730469e+02, 2.951497056749132e+02, 2.953842196994358e+02, 2.952584838867188e+02, 2.954639689127604e+02, 2.954234110514323e+02, 2.952806599934896e+02, 2.951498718261719e+02, 2.9514990234375e+02, 2.951498413085938e+02, 2.951806979709202e+02, 2.951045159233941e+02, 2.955409545898438e+02, 2.957314826117621e+02, 2.96080325656467e+02, 2.961587117513021e+02, 2.962343987358941e+02, 2.962436014811198e+02, 2.956693827311198e+02, 2.952501288519965e+02, 2.951728312174479e+02, 2.948262329101562e+02, 2.951358947753906e+02, 2.954353400336371e+02, 2.962845764160156e+02, 2.967364027235243e+02, 2.970622117784288e+02, 2.971177876790364e+02, 2.97401360405816e+02, 2.974688856336805e+02, 2.9752587890625e+02, 2.974972500271267e+02, 2.972712198893229e+02, 2.971268717447917e+02, 2.967502712673611e+02, 2.96353773328993e+02, 2.960599161783854e+02, 2.959169209798177e+02, 2.957700636121962e+02, 2.957606506347656e+02, 2.951497429741754e+02, 2.951495361328125e+02, 2.95149658203125e+02, 2.951495971679688e+02, 2.95149658203125e+02, 2.951495666503906e+02, 2.951495971679688e+02, 2.951496887207031e+02, 2.951499328613281e+02, 2.951908908420139e+02, 2.95430419921875e+02, 2.956567586263021e+02, 2.959073994954427e+02, 2.961475931803386e+02, 2.963931884765625e+02, 2.966345045301649e+02, 2.968669942220052e+02, 2.9708837890625e+02, 2.972976989746094e+02]
 heaSys.heaSche.TdegC[5].y=[2.95154541015625e+02, 2.95154541015625e+02, 2.95154541015625e+02, 2.95154541015625e+02, 2.95154541015625e+02, 2.95154541015625e+02, 2.95154541015625e+02, 2.95154541015625e+02, 2.95154541015625e+02, 2.95154541015625e+02, 2.95154541015625e+02, 2.951514010959202e+02, 2.951507771809896e+02, 2.951469048394097e+02, 2.951542222764757e+02, 2.951512044270833e+02, 2.952439676920573e+02, 2.95141604953342e+02, 2.952870788574219e+02, 2.951521199544271e+02, 2.952401597764757e+02, 2.951516011555989e+02, 2.95148674858941e+02, 2.951487392849392e+02, 2.951475423177083e+02, 2.951466606987847e+02, 2.951491156684028e+02, 2.951117553710938e+02, 2.951506924099392e+02, 2.951417338053386e+02, 2.951452128092448e+02, 2.95154544406467e+02, 2.951424763997396e+02, 2.951372680664062e+02, 2.951528116861979e+02, 2.95151607937283e+02, 2.951491394042969e+02, 2.951535949707031e+02, 2.951548258463542e+02, 2.951520284016927e+02, 2.951545511881511e+02, 2.951609361436632e+02, 2.953994649251302e+02, 2.954758673773871e+02, 2.955855916341146e+02, 2.957141418457031e+02, 2.958246290418837e+02, 2.959639451768663e+02, 2.957486572265625e+02, 2.955277947319879e+02, 2.954687228732639e+02, 2.954164733886719e+02, 2.955001085069445e+02, 2.956902194552952e+02, 2.961376953125e+02, 2.964449191623264e+02, 2.964661085340712e+02, 2.965964864095052e+02, 2.965398966471354e+02, 2.964988132052952e+02, 2.956641337076823e+02, 2.951496141221788e+02, 2.951512349446614e+02, 2.951499938964844e+02, 2.953776346842448e+02, 2.960283372667101e+02, 2.966080017089844e+02, 2.972698703342014e+02, 2.974525112575955e+02, 2.974011637369792e+02, 2.973997701009114e+02, 2.975360039605035e+02, 2.972183227539062e+02, 2.970083821614583e+02, 2.965835130479601e+02, 2.965709126790364e+02, 2.959723612467448e+02, 2.955472378200955e+02, 2.951423238118489e+02, 2.951471659342448e+02, 2.951483154296875e+02, 2.951487426757812e+02, 2.951575080023871e+02, 2.951480034722222e+02, 2.95154052734375e+02, 2.951626349555121e+02, 2.951501905653212e+02, 2.951500244140625e+02, 2.951516452365452e+02, 2.951518012152778e+02, 2.951689147949219e+02, 2.955332370334202e+02, 2.955308702256945e+02, 2.959816385904948e+02, 2.95889404296875e+02, 2.95889404296875e+02, 2.95889404296875e+02, 2.95889404296875e+02, 2.95889404296875e+02, 2.95889404296875e+02, 2.95889404296875e+02]
-struct.TSensor[6]=[2.931499938964844e+02, 2.96989990234375e+02, 2.967725796169705e+02, 2.966164449055989e+02, 2.964770745171441e+02, 2.963250698513455e+02, 2.961686401367188e+02, 2.960120985243055e+02, 2.958591647677952e+02, 2.957128295898438e+02, 2.955853441026476e+02, 2.954734700520833e+02, 2.957224019368489e+02, 2.954386291503906e+02, 2.955643954806858e+02, 2.954253438313802e+02, 2.959605136447483e+02, 2.954345160590278e+02, 2.961114196777344e+02, 2.957206386990017e+02, 2.960519714355469e+02, 2.956732482910156e+02, 2.958209940592448e+02, 2.953989969889323e+02, 2.952651468912761e+02, 2.95149888780382e+02, 2.954141065809462e+02, 2.951498107910156e+02, 2.954618801540798e+02, 2.953664177788629e+02, 2.956147359212239e+02, 2.954024013943142e+02, 2.955509067111545e+02, 2.953852335611979e+02, 2.954755316840278e+02, 2.952333340115017e+02, 2.954375305175781e+02, 2.950348171657986e+02, 2.951123487684462e+02, 2.948053181966146e+02, 2.948832431369358e+02, 2.951496276855469e+02, 2.956172688802083e+02, 2.954898986816406e+02, 2.959452243381077e+02, 2.958410339355469e+02, 2.961832716200087e+02, 2.960980122884114e+02, 2.959839680989583e+02, 2.957442423502604e+02, 2.959210035536024e+02, 2.957169494628906e+02, 2.960123324924045e+02, 2.959430270724827e+02, 2.966244812011719e+02, 2.966912095811632e+02, 2.972699144151476e+02, 2.971612040201823e+02, 2.973832770453559e+02, 2.972386779785156e+02, 2.966469116210938e+02, 2.96091552734375e+02, 2.959637620713976e+02, 2.958382873535156e+02, 2.962776217990452e+02, 2.966249694824219e+02, 2.975872294108073e+02, 2.979594285753038e+02, 2.982718336317274e+02, 2.982955017089844e+02, 2.987528584798177e+02, 2.987350802951389e+02, 2.987128295898438e+02, 2.985203653971354e+02, 2.983719618055555e+02, 2.980916035970052e+02, 2.975800306532118e+02, 2.970817192925347e+02, 2.967265116373698e+02, 2.962275865342882e+02, 2.959354587131077e+02, 2.959171752929688e+02, 2.95564938015408e+02, 2.955104437934028e+02, 2.956299031575521e+02, 2.955125732421875e+02, 2.955307345920139e+02, 2.955247090657552e+02, 2.954729241265191e+02, 2.955710110134548e+02, 2.957195739746094e+02, 2.959929029676649e+02, 2.962657979329427e+02, 2.966279703776042e+02, 2.967812025282118e+02, 2.969952426486545e+02, 2.972171529134114e+02, 2.974361809624566e+02, 2.976479051378038e+02, 2.978500671386719e+02, 2.980416870117188e+02]
+struct.TSensor[6]=[2.931499938964844e+02, 2.969866536458333e+02, 2.967639804416233e+02, 2.966023661295573e+02, 2.964583875868055e+02, 2.963026428222656e+02, 2.961429951985677e+02, 2.959837951660156e+02, 2.95828609890408e+02, 2.956806030273438e+02, 2.955536736382379e+02, 2.954419453938802e+02, 2.956917724609375e+02, 2.954085998535156e+02, 2.955340576171875e+02, 2.953947957356771e+02, 2.95931627061632e+02, 2.954071044921875e+02, 2.960841064453125e+02, 2.956941494411892e+02, 2.960256958007812e+02, 2.956473592122396e+02, 2.957947455512153e+02, 2.953717820909288e+02, 2.952352091471354e+02, 2.951498582628038e+02, 2.953921067979601e+02, 2.951497802734375e+02, 2.954410603841146e+02, 2.953394470214844e+02, 2.955835164388021e+02, 2.953680962456597e+02, 2.95513434516059e+02, 2.953462117513021e+02, 2.954348551432292e+02, 2.951933492024739e+02, 2.953970336914062e+02, 2.949956359863281e+02, 2.950728725857205e+02, 2.947678019205729e+02, 2.94846421983507e+02, 2.951496276855469e+02, 2.955985514322917e+02, 2.954709947374132e+02, 2.959261542426215e+02, 2.958218994140625e+02, 2.961622483995226e+02, 2.960777316623264e+02, 2.959619954427083e+02, 2.957196112738715e+02, 2.958951246473524e+02, 2.956907450358073e+02, 2.959848395453559e+02, 2.959143269856771e+02, 2.965941162109375e+02, 2.966606614854601e+02, 2.972373657226562e+02, 2.971286214192708e+02, 2.973498874240452e+02, 2.972042473687066e+02, 2.966099141438802e+02, 2.960515645345052e+02, 2.95922115749783e+02, 2.957959289550781e+02, 2.962345614963108e+02, 2.965826822916667e+02, 2.975445454915364e+02, 2.979185045030382e+02, 2.982304585774739e+02, 2.982528279622396e+02, 2.987078891330295e+02, 2.986901279025608e+02, 2.986672058105469e+02, 2.98474595811632e+02, 2.983260633680555e+02, 2.980465698242188e+02, 2.975352240668403e+02, 2.970367974175347e+02, 2.966808369954427e+02, 2.961820576985677e+02, 2.95889417860243e+02, 2.958706359863281e+02, 2.95519517686632e+02, 2.954701504177517e+02, 2.955917663574219e+02, 2.954764777289496e+02, 2.954951510959202e+02, 2.954907124837239e+02, 2.954387003580729e+02, 2.955377841525608e+02, 2.956870422363281e+02, 2.959631720648871e+02, 2.962369995117188e+02, 2.966023254394531e+02, 2.967575208875868e+02, 2.969725680881077e+02, 2.971949564615886e+02, 2.974141167534722e+02, 2.976257493760851e+02, 2.978277282714844e+02, 2.980190734863281e+02]
 heaSys.heaSche.TdegC[6].y=[2.954591979980469e+02, 2.954591979980469e+02, 2.954591979980469e+02, 2.954591979980469e+02, 2.954591979980469e+02, 2.954591979980469e+02, 2.954591979980469e+02, 2.954591979980469e+02, 2.954591979980469e+02, 2.954591979980469e+02, 2.954591979980469e+02, 2.955227695041233e+02, 2.957923583984375e+02, 2.957061462402344e+02, 2.956512518988715e+02, 2.954332173665364e+02, 2.957140129937066e+02, 2.954229024251302e+02, 2.956398315429688e+02, 2.955661892361111e+02, 2.957978515625e+02, 2.956359151204427e+02, 2.956908535427517e+02, 2.953812086317274e+02, 2.952647094726562e+02, 2.951482103135851e+02, 2.951785854763455e+02, 2.951382141113281e+02, 2.951515875922309e+02, 2.951482916937934e+02, 2.951490885416667e+02, 2.951494479709202e+02, 2.951527947319879e+02, 2.951462809244792e+02, 2.95151363796658e+02, 2.951479865180121e+02, 2.951411743164062e+02, 2.951542188856337e+02, 2.951564534505208e+02, 2.951481119791667e+02, 2.951529303656684e+02, 2.952069295247396e+02, 2.955927225748698e+02, 2.956660427517361e+02, 2.957851121690538e+02, 2.959401550292969e+02, 2.961097852918837e+02, 2.961854790581597e+02, 2.961495666503906e+02, 2.959325561523438e+02, 2.959359673394097e+02, 2.958600260416667e+02, 2.960679355197483e+02, 2.963277418348524e+02, 2.966926879882812e+02, 2.970447319878472e+02, 2.971388244628906e+02, 2.971946411132812e+02, 2.971961703830295e+02, 2.971456671820746e+02, 2.963222249348958e+02, 2.955274217393663e+02, 2.953038330078125e+02, 2.956175537109375e+02, 2.958252733018663e+02, 2.965680033365886e+02, 2.971255086263021e+02, 2.978757222493489e+02, 2.981737094455295e+02, 2.982734781901042e+02, 2.982682189941406e+02, 2.983179219563802e+02, 2.979937438964844e+02, 2.976878763834636e+02, 2.972891947428386e+02, 2.971529744466146e+02, 2.966026645236545e+02, 2.961447211371528e+02, 2.956649780273438e+02, 2.9530908203125e+02, 2.951644354926215e+02, 2.951498718261719e+02, 2.951538933648004e+02, 2.951500210232205e+02, 2.952548319498698e+02, 2.95333987765842e+02, 2.953195461697048e+02, 2.954143981933594e+02, 2.954111328125e+02, 2.955629442003038e+02, 2.956679382324219e+02, 2.959912957085504e+02, 2.960502827962239e+02, 2.963864949544271e+02, 2.963084411621094e+02, 2.963084411621094e+02, 2.963084411621094e+02, 2.963084411621094e+02, 2.963084411621094e+02, 2.963084411621094e+02, 2.963084411621094e+02]
-struct.TSensor[7]=[2.931499938964844e+02, 2.976512044270833e+02, 2.976857096354167e+02, 2.976181030273438e+02, 2.974928656684028e+02, 2.973418273925781e+02, 2.971819051106771e+02, 2.970229932996962e+02, 2.968708970811632e+02, 2.967284851074219e+02, 2.965971781412761e+02, 2.96478773328993e+02, 2.964208577473958e+02, 2.963113776312934e+02, 2.962917717827691e+02, 2.962210083007812e+02, 2.963143886990017e+02, 2.961803080240886e+02, 2.963412780761719e+02, 2.963166029188368e+02, 2.963889668782552e+02, 2.963273010253906e+02, 2.963867662217882e+02, 2.962604810926649e+02, 2.961542460123698e+02, 2.960072767469618e+02, 2.959634433322483e+02, 2.957886962890625e+02, 2.959067993164062e+02, 2.957339647081163e+02, 2.955749308268229e+02, 2.953700391981337e+02, 2.953845994737413e+02, 2.952817687988281e+02, 2.952682189941406e+02, 2.951125827365452e+02, 2.950933227539062e+02, 2.949195149739583e+02, 2.94889173719618e+02, 2.946919453938802e+02, 2.94646959092882e+02, 2.95149654812283e+02, 2.954532674153646e+02, 2.956626688639323e+02, 2.960015326605903e+02, 2.96145263671875e+02, 2.963593919542101e+02, 2.964550069173177e+02, 2.964742431640625e+02, 2.964552883572048e+02, 2.964486456976996e+02, 2.964279886881511e+02, 2.965840996636285e+02, 2.968376091851129e+02, 2.973222045898438e+02, 2.97729973687066e+02, 2.979075249565972e+02, 2.980773315429688e+02, 2.981307339138455e+02, 2.98215589735243e+02, 2.978952941894531e+02, 2.974400227864583e+02, 2.970638868543837e+02, 2.970733642578125e+02, 2.973745727539062e+02, 2.978036227756077e+02, 2.984372762044271e+02, 2.990353190104167e+02, 2.994904106987847e+02, 2.997827351888021e+02, 2.999547695583767e+02, 3.000496893988715e+02, 2.999342651367188e+02, 2.996847669813368e+02, 2.993136461046007e+02, 2.990383402506511e+02, 2.986265326605903e+02, 2.98202884250217e+02, 2.977583109537761e+02, 2.973851047092014e+02, 2.971140984429254e+02, 2.9678662109375e+02, 2.964813469780816e+02, 2.96441158718533e+02, 2.964029541015625e+02, 2.96371578640408e+02, 2.963371107313368e+02, 2.963077901204427e+02, 2.962611321343316e+02, 2.962805413140191e+02, 2.962926635742188e+02, 2.964043816460504e+02, 2.965283508300781e+02, 2.968233947753906e+02, 2.971458536783854e+02, 2.974307522243923e+02, 2.977008260091146e+02, 2.9795703125e+02, 2.98198723687066e+02, 2.984259948730469e+02, 2.986386108398438e+02]
+struct.TSensor[7]=[2.931499938964844e+02, 2.976656595865886e+02, 2.976949903700087e+02, 2.976205342610677e+02, 2.974903225368923e+02, 2.973353373209636e+02, 2.971722819010417e+02, 2.970108506944445e+02, 2.968566623263889e+02, 2.967123107910156e+02, 2.965796373155382e+02, 2.964599270290798e+02, 2.963988342285156e+02, 2.9629345703125e+02, 2.962700907389323e+02, 2.962007141113281e+02, 2.962908833821614e+02, 2.961669447157118e+02, 2.963182678222656e+02, 2.962991739908854e+02, 2.963676859537761e+02, 2.963117472330729e+02, 2.963673706054688e+02, 2.962461107042101e+02, 2.961373697916667e+02, 2.959899631076389e+02, 2.959426167805989e+02, 2.95773193359375e+02, 2.958831041124132e+02, 2.95714599609375e+02, 2.955468851725261e+02, 2.953488939073351e+02, 2.953595004611545e+02, 2.952567749023438e+02, 2.9523876953125e+02, 2.950870056152344e+02, 2.950596923828125e+02, 2.948927001953125e+02, 2.948589579264323e+02, 2.946684163411458e+02, 2.946116333007812e+02, 2.951496242947048e+02, 2.954338073730469e+02, 2.956513095431858e+02, 2.959834967719184e+02, 2.961353149414062e+02, 2.963437398274739e+02, 2.964439900716146e+02, 2.964632466634114e+02, 2.964427456325955e+02, 2.96432623969184e+02, 2.96411376953125e+02, 2.965653008355035e+02, 2.968228454589844e+02, 2.973011474609375e+02, 2.977124769422743e+02, 2.978827819824219e+02, 2.980560099283854e+02, 2.981075236002604e+02, 2.981926845974392e+02, 2.978738301595052e+02, 2.974152153862847e+02, 2.970349663628472e+02, 2.970484619140625e+02, 2.973422207302517e+02, 2.97776858859592e+02, 2.984019877115886e+02, 2.990082668728298e+02, 2.994640062120226e+02, 2.997567952473958e+02, 2.999210611979167e+02, 3.000188869900173e+02, 2.998995666503906e+02, 2.996490817599827e+02, 2.992758348253038e+02, 2.990032450358073e+02, 2.985937194824219e+02, 2.981705830891927e+02, 2.977237345377604e+02, 2.973531629774305e+02, 2.970820414225261e+02, 2.967530517578125e+02, 2.964469672309028e+02, 2.964113294813368e+02, 2.963733927408854e+02, 2.963444247775608e+02, 2.963092278374566e+02, 2.962827860514323e+02, 2.962354159884983e+02, 2.962540757921007e+02, 2.962648010253906e+02, 2.963795979817708e+02, 2.965010409884983e+02, 2.9679736328125e+02, 2.971228502061632e+02, 2.974098442925347e+02, 2.976816609700521e+02, 2.979387512207031e+02, 2.981810845269097e+02, 2.984085388183594e+02, 2.986210021972656e+02]
 heaSys.heaSche.TdegC[7].y=[2.96263427734375e+02, 2.96263427734375e+02, 2.96263427734375e+02, 2.96263427734375e+02, 2.96263427734375e+02, 2.96263427734375e+02, 2.96263427734375e+02, 2.96263427734375e+02, 2.96263427734375e+02, 2.96263427734375e+02, 2.96263427734375e+02, 2.962425842285156e+02, 2.963945210774739e+02, 2.964496697319879e+02, 2.964606255425347e+02, 2.964639892578125e+02, 2.965338134765625e+02, 2.964749586317274e+02, 2.965295104980469e+02, 2.965325859917535e+02, 2.96605953640408e+02, 2.966092631022136e+02, 2.966123284233941e+02, 2.965487433539496e+02, 2.964447224934896e+02, 2.963434143066406e+02, 2.962869364420573e+02, 2.961744689941406e+02, 2.960701395670573e+02, 2.957579311794705e+02, 2.953584798177083e+02, 2.951451992458767e+02, 2.951424628363715e+02, 2.951470642089844e+02, 2.951522894965278e+02, 2.951522555881077e+02, 2.951587219238281e+02, 2.951524454752604e+02, 2.951497565375434e+02, 2.951533406575521e+02, 2.952301364474827e+02, 2.957107103135851e+02, 2.960041605631511e+02, 2.961971944173177e+02, 2.963538038465712e+02, 2.965180053710938e+02, 2.966541951497396e+02, 2.967628682454427e+02, 2.968300984700521e+02, 2.968152160644531e+02, 2.967881910536024e+02, 2.967921854654948e+02, 2.969112141927083e+02, 2.972941284179688e+02, 2.976505432128906e+02, 2.980945739746094e+02, 2.979377950032552e+02, 2.980881652832031e+02, 2.980507134331597e+02, 2.980714382595486e+02, 2.975535380045573e+02, 2.969226718478733e+02, 2.965559455023871e+02, 2.968380737304688e+02, 2.970881618923611e+02, 2.976688435872396e+02, 2.980881144205729e+02, 2.987601487901476e+02, 2.99132581922743e+02, 2.994072672526042e+02, 2.992886216905382e+02, 2.993033820258246e+02, 2.989508361816406e+02, 2.985686408148871e+02, 2.980962253146702e+02, 2.978739725748698e+02, 2.974313320583767e+02, 2.970308973524305e+02, 2.965588073730469e+02, 2.962494947645399e+02, 2.961024441189236e+02, 2.958006286621094e+02, 2.958540717230903e+02, 2.961243184407552e+02, 2.962321879069011e+02, 2.963092888726129e+02, 2.963377143012153e+02, 2.963837890625e+02, 2.964018792046441e+02, 2.964659830729167e+02, 2.965070190429688e+02, 2.966405707465278e+02, 2.966910027398004e+02, 2.969098510742188e+02, 2.969032592773438e+02, 2.969032592773438e+02, 2.969032592773438e+02, 2.969032592773438e+02, 2.969032592773438e+02, 2.969032592773438e+02, 2.969032592773438e+02]
-heaSys.Qhea[1]=[1.975e+03, 1.503680976019965e+03, 1.263735446506076e+03, 1.191148152669271e+03, 1.17001409233941e+03, 1.16709026421441e+03, 1.170869750976562e+03, 1.177045260959201e+03, 1.183822957356771e+03, 1.190429931640625e+03, 1.195962022569444e+03, 1.198778564453125e+03, 6.289740397135416e+02, 1.119381266276042e+03, 9.498682250976562e+02, 1.149823527018229e+03, 6.255709075927734e+01, 1.101821017795139e+03, 2.98949951171875e+02, 9.280008409288195e+02, 5.62748304578993e+02, 1.008542765299479e+03, 7.490415988498264e+02, 1.163268459743924e+03, 1.10672021484375e+03, 1.290424329969618e+03, 9.060568101671007e+02, 1.274240478515625e+03, 3.721138874689738e+00, 3.67002002398173e+00, 3.888568798700968e+00, 4.03113055229187e+00, 3.857529587215847e+00, 3.535365502039591e+00, 4.141806337568495e+00, 4.000012318293254e+00, 3.938359975814819e+00, 3.794501066207886e+00, 4.033551745944553e+00, 3.847039620081584e+00, 1.799867513020833e+03, 1.395166029188368e+03, 1.843014424641927e+02, 9.556511027018229e+02, 3.221460172865126e+01, 8.22967041015625e+02, 5.923728095160591e+02, 8.400909356011284e+02, 9.172099202473959e+02, 1.084175265842014e+03, 8.712087673611111e+02, 1.071336385091146e+03, 1.79985498046875e+03, 1.79975543891059e+03, 3.901853084564209e+00, 4.029849152565002e+02, 1.800012220594618e+03, 4.138351440429688e+00, 1.800154256184896e+03, 1.799837320963542e+03, 3.811973810195923e+00, 3.791929589377509e+00, 1.799779690212674e+03, 1.799428100585938e+03, 1.799679144965278e+03, 1.800058024088542e+03, 1.799945638020833e+03, 1.799740614149306e+03, 1.799954237196181e+03, 3.765749851862589e+00, 1.799984239366319e+03, 3.477728896670871e+00, 4.231503486633301e+00, 4.10546875e+00, 3.430997769037882e+00, 4.045747041702271e+00, 3.918411334355672e+00, 3.808463308546278e+00, 3.81222661336263e+00, 3.906562911139594e+00, 4.121158281962077e+00, 3.920814990997314e+00, 1.428646525065104e+03, 1.273653347439236e+03, 1.036196858723958e+03, 1.152335801866319e+03, 1.072554796006944e+03, 1.145139485677083e+03, 1.086067749023438e+03, 1.084280137803819e+03, 8.272931518554688e+02, 8.596814846462673e+02, 5.517043185763889e+02, 6.885086263020834e+02, 1.076171997070312e+03, 1.076171997070312e+03, 1.076171997070312e+03, 1.076171997070312e+03, 1.076171997070312e+03, 1.076171997070312e+03, 1.076171997070312e+03]
+heaSys.Qhea[1]=[1.975e+03, 1.498698974609375e+03, 1.261773356119792e+03, 1.190652913411458e+03, 1.170399115668403e+03, 1.168051771375868e+03, 1.172223551432292e+03, 1.178665785047743e+03, 1.185637220594618e+03, 1.192356567382812e+03, 1.197886271158854e+03, 1.2007666015625e+03, 6.4649951171875e+02, 1.116107530381944e+03, 9.537504069010416e+02, 1.150776692708333e+03, 8.711412387424045e+01, 1.09453948296441e+03, 3.133482360839844e+02, 9.223854912651909e+02, 5.706532762315538e+02, 1.002287780761719e+03, 7.532158270941841e+02, 1.159677517361111e+03, 1.107791544596354e+03, 1.289943589952257e+03, 9.1092138671875e+02, 1.270905395507812e+03, 3.721138874689738e+00, 3.67002002398173e+00, 3.888568798700968e+00, 4.03113055229187e+00, 3.857529587215847e+00, 3.535365502039591e+00, 4.141806337568495e+00, 4.000012318293254e+00, 3.938359975814819e+00, 3.794501066207886e+00, 4.033551745944553e+00, 3.847039620081584e+00, 1.799867513020833e+03, 1.391707383897569e+03, 2.171671549479167e+02, 9.484228108723959e+02, 6.163230217827691e+01, 8.169456787109375e+02, 5.966965535481771e+02, 8.335849202473959e+02, 9.174827473958334e+02, 1.083727661132812e+03, 8.767731458875868e+02, 1.072101236979167e+03, 1.79985498046875e+03, 1.79975543891059e+03, 3.901853084564209e+00, 4.029849152565002e+02, 1.800012220594618e+03, 4.138351440429688e+00, 1.800154256184896e+03, 1.799837320963542e+03, 3.811973810195923e+00, 3.791929589377509e+00, 1.799779690212674e+03, 1.799428100585938e+03, 1.799679144965278e+03, 1.800058024088542e+03, 1.799945638020833e+03, 1.799740614149306e+03, 1.799954237196181e+03, 3.765749851862589e+00, 1.799984239366319e+03, 3.477728896670871e+00, 4.231503486633301e+00, 4.10546875e+00, 3.430997769037882e+00, 4.045747041702271e+00, 3.918411334355672e+00, 3.808463308546278e+00, 3.81222661336263e+00, 3.906562911139594e+00, 4.121158281962077e+00, 3.920814990997314e+00, 1.442211439344618e+03, 1.270933430989583e+03, 1.041566487630208e+03, 1.15058440483941e+03, 1.076015638563368e+03, 1.143484985351562e+03, 1.089180677625868e+03, 1.084666097005208e+03, 8.352920532226562e+02, 8.539337565104166e+02, 5.611733466254341e+02, 6.860696411132812e+02, 1.076171997070312e+03, 1.076171997070312e+03, 1.076171997070312e+03, 1.076171997070312e+03, 1.076171997070312e+03, 1.076171997070312e+03, 1.076171997070312e+03]
 heaSys.heaSche.Pel_IDEAL[1]=[1.832202880859375e+03, 1.832202880859375e+03, 1.832202880859375e+03, 1.832202880859375e+03, 1.832202880859375e+03, 1.832202880859375e+03, 1.832202880859375e+03, 1.832202880859375e+03, 1.832202880859375e+03, 1.832202880859375e+03, 1.832202880859375e+03, 1.947222520616319e+03, 2.726523946126302e+02, 1.47767626953125e+03, 1.008759887695312e+03, 1.352717244466146e+03, 3.851435210969713e+00, 1.354211154513889e+03, 3.73984169960022e+00, 1.163608723958333e+03, 1.100137630038791e+02, 1.283353068033854e+03, 6.912016330295139e+02, 1.465353108723958e+03, 1.226174112955729e+03, 1.510863661024306e+03, 6.689734632703993e+02, 9.00289794921875e+02, 3.721138874689738e+00, 3.67002002398173e+00, 3.888568798700968e+00, 4.03113055229187e+00, 3.857529587215847e+00, 3.535365502039591e+00, 4.141806337568495e+00, 4.000012318293254e+00, 3.938359975814819e+00, 3.794501066207886e+00, 4.033551745944553e+00, 3.847039620081584e+00, 1.799867513020833e+03, 1.460135660807292e+03, 3.700684388478597e+00, 1.121155164930556e+03, 3.690000904930963e+00, 1.036303466796875e+03, 1.664480887518989e+02, 9.851815456814236e+02, 9.363943074544271e+02, 1.284705078125e+03, 8.172040473090278e+02, 1.225471435546875e+03, 1.79985498046875e+03, 1.79975543891059e+03, 3.901853084564209e+00, 4.029849152565002e+02, 1.800012220594618e+03, 4.138351440429688e+00, 1.800154256184896e+03, 1.799837320963542e+03, 3.811973810195923e+00, 3.791929589377509e+00, 1.799779690212674e+03, 1.799428100585938e+03, 1.799679144965278e+03, 1.800058024088542e+03, 1.799945638020833e+03, 1.799740614149306e+03, 1.799954237196181e+03, 3.765749851862589e+00, 1.799984239366319e+03, 3.477728896670871e+00, 4.231503486633301e+00, 4.10546875e+00, 3.430997769037882e+00, 4.045747041702271e+00, 3.918411334355672e+00, 3.808463308546278e+00, 3.81222661336263e+00, 3.906562911139594e+00, 4.121158281962077e+00, 3.920814990997314e+00, 1.829982191297743e+03, 1.521341267903646e+03, 9.095154012044271e+02, 1.370043999565972e+03, 1.091281412760417e+03, 1.352484944661458e+03, 1.107396999782986e+03, 1.257471842447917e+03, 5.92395751953125e+02, 1.049224717881944e+03, 2.554434390597873e+02, 1.015377319335938e+03, 1.076171997070312e+03, 1.076171997070312e+03, 1.076171997070312e+03, 1.076171997070312e+03, 1.076171997070312e+03, 1.076171997070312e+03, 1.076171997070312e+03]
-heaSys.Qhea[3]=[7.5e+02, 3.39705817328559e+02, 2.648523186577691e+02, 2.433303426106771e+02, 2.370511067708333e+02, 2.364078776041667e+02, 2.380499267578125e+02, 2.405972730848524e+02, 2.434003668891059e+02, 2.461664123535156e+02, 2.487623426649305e+02, 2.510741458468967e+02, 1.837556711832682e+02, 2.456482374403212e+02, 2.181724531385634e+02, 2.474002329508463e+02, 1.04310422261556e+02, 2.313891211615668e+02, 1.167073364257812e+02, 2.156451195610894e+02, 1.639710879855686e+02, 2.321594950358073e+02, 1.628715633816189e+02, 2.370939144558377e+02, 2.25549067179362e+02, 2.605183919270833e+02, 1.736416778564453e+02, 2.599633483886719e+02, 1.001074822743734e+01, 9.83742978837755e+00, 9.601400375366211e+00, 9.519094149271647e+00, 9.585663795471191e+00, 9.66518529256185e+00, 9.309705628289116e+00, 9.360679944356283e+00, 9.378019332885742e+00, 9.847430123223198e+00, 1.022967963748508e+01, 9.887352307637533e+00, 4.999909057617188e+02, 3.792447679307726e+02, 1.291832758585612e+02, 2.478357933892144e+02, 4.544563547770182e+01, 2.073100891113281e+02, 1.622790103488498e+02, 2.146868269178602e+02, 2.101148579915365e+02, 2.329646623399523e+02, 1.956922861735026e+02, 2.332806447347005e+02, 5.000098843044705e+02, 4.999979722764757e+02, 9.566512107849121e+00, 1.18480712890625e+02, 5.000377977159288e+02, 9.038625717163086e+00, 5.000889451768663e+02, 4.999916449652778e+02, 8.963774045308432e+00, 9.491825633578831e+00, 5.000062696668837e+02, 4.999195556640625e+02, 5.00016604953342e+02, 5.000530598958333e+02, 5.000093078613281e+02, 4.998594936794705e+02, 4.999817199707031e+02, 9.444955507914225e+00, 5.000227932400173e+02, 9.997639656066895e+00, 9.51969051361084e+00, 9.167121145460341e+00, 9.21886126200358e+00, 9.048268636067709e+00, 9.086102061801487e+00, 9.009578280978733e+00, 9.457995732625326e+00, 9.527658250596788e+00, 9.98153633541531e+00, 9.653515815734863e+00, 2.77551272922092e+02, 2.744670715332031e+02, 2.160521697998047e+02, 2.469282073974609e+02, 2.309171871609158e+02, 2.425802052815755e+02, 2.331876373291016e+02, 2.372679002549913e+02, 1.777545928955078e+02, 2.112549641927083e+02, 0e+00, 1.447658030192057e+02, 2.273497772216797e+02, 2.273497772216797e+02, 2.273497772216797e+02, 2.273497772216797e+02, 2.273497772216797e+02, 2.273497772216797e+02, 2.273497772216797e+02]
+heaSys.Qhea[3]=[7.5e+02, 3.388774956597222e+02, 2.646364305284288e+02, 2.434737396240234e+02, 2.374287889268663e+02, 2.369457143147787e+02, 2.387009887695312e+02, 2.413267483181424e+02, 2.4418775261773e+02, 2.470008392333984e+02, 2.496293453640408e+02, 2.51983408610026e+02, 1.858698120117188e+02, 2.458685709635417e+02, 2.196143324110243e+02, 2.481068064371745e+02, 1.04466178894043e+02, 2.304002685546875e+02, 1.181764907836914e+02, 2.155125054253472e+02, 1.660389166937934e+02, 2.32055185953776e+02, 1.630743882921007e+02, 2.368664974636502e+02, 2.262124176025391e+02, 2.608958570692274e+02, 1.739983690049913e+02, 2.596011352539062e+02, 1.001074822743734e+01, 9.83742978837755e+00, 9.601400375366211e+00, 9.519094149271647e+00, 9.585663795471191e+00, 9.66518529256185e+00, 9.309705628289116e+00, 9.360679944356283e+00, 9.378019332885742e+00, 9.847430123223198e+00, 1.022967963748508e+01, 9.887352307637533e+00, 4.999909057617188e+02, 3.798927205403646e+02, 1.29452995300293e+02, 2.468678402370877e+02, 4.679157384236654e+01, 2.062223815917969e+02, 1.640434790717231e+02, 2.142516682942708e+02, 2.108140157063802e+02, 2.332829420301649e+02, 1.974233788384332e+02, 2.33843012491862e+02, 5.000098843044705e+02, 4.999979722764757e+02, 9.566512107849121e+00, 1.18480712890625e+02, 5.000377977159288e+02, 9.038625717163086e+00, 5.000889451768663e+02, 4.999916449652778e+02, 8.963774045308432e+00, 9.491825633578831e+00, 5.000062696668837e+02, 4.999195556640625e+02, 5.00016604953342e+02, 5.000530598958333e+02, 5.000093078613281e+02, 4.998594936794705e+02, 4.999817199707031e+02, 9.444955507914225e+00, 5.000227932400173e+02, 9.997639656066895e+00, 9.51969051361084e+00, 9.167121145460341e+00, 9.21886126200358e+00, 9.048268636067709e+00, 9.086102061801487e+00, 9.009578280978733e+00, 9.457995732625326e+00, 9.527658250596788e+00, 9.98153633541531e+00, 9.653515815734863e+00, 2.823760104709202e+02, 2.749579569498698e+02, 2.185268910725912e+02, 2.473368801540799e+02, 2.324812367757162e+02, 2.428412475585938e+02, 2.345848371717665e+02, 2.378894348144531e+02, 1.810953521728516e+02, 2.109640180799696e+02, 0e+00, 1.44807861328125e+02, 2.273497772216797e+02, 2.273497772216797e+02, 2.273497772216797e+02, 2.273497772216797e+02, 2.273497772216797e+02, 2.273497772216797e+02, 2.273497772216797e+02]
 heaSys.heaSche.Pel_IDEAL[3]=[6.529138793945312e+02, 6.529138793945312e+02, 6.529138793945312e+02, 6.529138793945312e+02, 6.529138793945312e+02, 6.529138793945312e+02, 6.529138793945312e+02, 6.529138793945312e+02, 6.529138793945312e+02, 6.529138793945312e+02, 6.529138793945312e+02, 7.29192369249132e+02, 2.893183390299479e+02, 2.864266425238715e+02, 1.967096201578776e+02, 2.672375081380208e+02, 4.011805089314779e+01, 2.637550218370226e+02, 8.027382659912109e+01, 2.625664672851562e+02, 1.259518373277452e+02, 2.762430928548177e+02, 2.140645226372613e+02, 2.643975423177083e+02, 2.074988657633463e+02, 2.910273098415798e+02, 2.04717525906033e+02, 1.717235565185547e+02, 1.001074822743734e+01, 9.83742978837755e+00, 9.601400375366211e+00, 9.519094149271647e+00, 9.585663795471191e+00, 9.66518529256185e+00, 9.309705628289116e+00, 9.360679944356283e+00, 9.378019332885742e+00, 9.847430123223198e+00, 1.022967963748508e+01, 9.887352307637533e+00, 4.999909057617188e+02, 3.297927754720052e+02, 3.959134292602539e+01, 2.89707027859158e+02, 1.528154373168945e+01, 2.726466369628906e+02, 7.566426510281033e+01, 2.487258046468099e+02, 2.291477610270182e+02, 2.686624111599392e+02, 1.799872029622396e+02, 2.523026224772135e+02, 5.000098843044705e+02, 4.999979722764757e+02, 9.566512107849121e+00, 1.18480712890625e+02, 5.000377977159288e+02, 9.038625717163086e+00, 5.000889451768663e+02, 4.999916449652778e+02, 8.963774045308432e+00, 9.491825633578831e+00, 5.000062696668837e+02, 4.999195556640625e+02, 5.00016604953342e+02, 5.000530598958333e+02, 5.000093078613281e+02, 4.998594936794705e+02, 4.999817199707031e+02, 9.444955507914225e+00, 5.000227932400173e+02, 9.997639656066895e+00, 9.51969051361084e+00, 9.167121145460341e+00, 9.21886126200358e+00, 9.048268636067709e+00, 9.086102061801487e+00, 9.009578280978733e+00, 9.457995732625326e+00, 9.527658250596788e+00, 9.98153633541531e+00, 9.653515815734863e+00, 8.622950236002605e+01, 3.498629726833767e+02, 1.822058308919271e+02, 2.956475050184462e+02, 2.33125239054362e+02, 2.948767293294271e+02, 2.637545979817708e+02, 2.72444098578559e+02, 2.376811981201172e+01, 2.66777825249566e+02, 4.355816602706909e+00, 2.231080881754557e+02, 2.273497772216797e+02, 2.273497772216797e+02, 2.273497772216797e+02, 2.273497772216797e+02, 2.273497772216797e+02, 2.273497772216797e+02, 2.273497772216797e+02]
-heaSys.Qhea[4]=[7.5e+02, 5.122173665364584e+02, 3.541070183648004e+02, 3.085487976074219e+02, 2.938295220269097e+02, 2.896729838053386e+02, 2.893995869954427e+02, 2.905504862467448e+02, 2.921230163574219e+02, 2.937293090820312e+02, 2.95219245062934e+02, 2.965529412163629e+02, 1.814349721272787e+02, 2.749672648111979e+02, 2.505116221110026e+02, 2.825089518229167e+02, 8.166055891248915e+01, 2.492000088161892e+02, 1.18911003112793e+02, 2.250936550564236e+02, 1.598051198323568e+02, 2.445499979654948e+02, 1.950506303575304e+02, 2.654947102864583e+02, 2.609166564941406e+02, 2.953372870551215e+02, 2.305659569634332e+02, 3.033367004394531e+02, 9.599583877457513e-01, 9.694700108634101e-01, 9.927230676015218e-01, 9.771479699346755e-01, 9.841848413149515e-01, 8.842723170916239e-01, 1.011302067173852e+00, 1.045485748185052e+00, 1.005138278007507e+00, 9.731321930885315e-01, 1.05796406004164e+00, 9.846790035565695e-01, 5.000967983669705e+02, 6.202984212239584e+02, 2.127716369628906e+02, 2.964317084418403e+02, 9.460559166802301e+01, 2.282416839599609e+02, 1.816476338704427e+02, 2.218210601806641e+02, 2.329026489257812e+02, 2.591365966796875e+02, 2.251885715060764e+02, 2.636784464518229e+02, 5.000074971516927e+02, 4.999283515082465e+02, 1.397427678108215e+00, 1.1204209751553e+02, 5.000408698187934e+02, 1.073804219563802e+00, 5.001113077799479e+02, 4.999710049099392e+02, 9.949536323547363e-01, 9.817858669492934e-01, 4.999091152615017e+02, 4.999146728515625e+02, 4.999361945258246e+02, 5.000139872233073e+02, 4.999700317382812e+02, 5.000246887207031e+02, 4.998998582628038e+02, 1.126166423161824e+00, 5.000322842068142e+02, 8.948204451137118e-01, 1.094631671905518e+00, 1.050877465142144e+00, 8.664110435379876e-01, 1.034764051437378e+00, 1.012566553221808e+00, 9.790288739734225e-01, 1.011754810810089e+00, 1.016105850537618e+00, 1.04619824886322e+00, 1.049198031425476e+00, 4.263885023328993e+02, 3.337948608398438e+02, 2.708314615885417e+02, 2.834354383680555e+02, 2.690345357259114e+02, 2.754240926106771e+02, 2.688202887641059e+02, 2.699270765516493e+02, 2.312901306152344e+02, 2.30982676188151e+02, 1.730589514838325e+02, 1.804272155761719e+02, 2.450659942626953e+02, 2.450659942626953e+02, 2.450659942626953e+02, 2.450659942626953e+02, 2.450659942626953e+02, 2.450659942626953e+02, 2.450659942626953e+02]
+heaSys.Qhea[4]=[7.5e+02, 5.112357957628038e+02, 3.541910603841146e+02, 3.091626281738281e+02, 2.947670016818577e+02, 2.908181728786892e+02, 2.906771036783854e+02, 2.919072536892361e+02, 2.935310431586371e+02, 2.951734924316406e+02, 2.966850382486979e+02, 2.980477362738715e+02, 1.864029795328776e+02, 2.751752760145399e+02, 2.525260637071398e+02, 2.836379597981771e+02, 8.933432769775391e+01, 2.473550313313802e+02, 1.225264892578125e+02, 2.243501247829861e+02, 1.629679345024957e+02, 2.441238861083984e+02, 1.959932607014974e+02, 2.65454847547743e+02, 2.622177530924479e+02, 2.962224222819011e+02, 2.32795152452257e+02, 3.034471130371094e+02, 9.599583877457513e-01, 9.694700108634101e-01, 9.927230676015218e-01, 9.771479699346755e-01, 9.841848413149515e-01, 8.842723170916239e-01, 1.011302067173852e+00, 1.045485748185052e+00, 1.005138278007507e+00, 9.731321930885315e-01, 1.05796406004164e+00, 9.846790035565695e-01, 5.000967983669705e+02, 6.231089138454861e+02, 2.224485778808594e+02, 2.947366604275173e+02, 1.038834915161133e+02, 2.259199523925781e+02, 1.838288269042969e+02, 2.206386244032118e+02, 2.337089284261068e+02, 2.597470126681858e+02, 2.276215989854601e+02, 2.646472371419271e+02, 5.000074971516927e+02, 4.999283515082465e+02, 1.397427678108215e+00, 1.1204209751553e+02, 5.000408698187934e+02, 1.073804219563802e+00, 5.001113077799479e+02, 4.999710049099392e+02, 9.949536323547363e-01, 9.817858669492934e-01, 4.999091152615017e+02, 4.999146728515625e+02, 4.999361945258246e+02, 5.000139872233073e+02, 4.999700317382812e+02, 5.000246887207031e+02, 4.998998582628038e+02, 1.126166423161824e+00, 5.000322842068142e+02, 8.948204451137118e-01, 1.094631671905518e+00, 1.050877465142144e+00, 8.664110435379876e-01, 1.034764051437378e+00, 1.012566553221808e+00, 9.790288739734225e-01, 1.011754810810089e+00, 1.016105850537618e+00, 1.04619824886322e+00, 1.049198031425476e+00, 4.329388258192274e+02, 3.345826212565104e+02, 2.735992126464844e+02, 2.84026126437717e+02, 2.710594889322917e+02, 2.758849080403646e+02, 2.706938646104601e+02, 2.709268120659722e+02, 2.345576629638672e+02, 2.30318840874566e+02, 1.764239637586805e+02, 1.803501841227213e+02, 2.450659942626953e+02, 2.450659942626953e+02, 2.450659942626953e+02, 2.450659942626953e+02, 2.450659942626953e+02, 2.450659942626953e+02, 2.450659942626953e+02]
 heaSys.heaSche.Pel_IDEAL[4]=[6.7473095703125e+02, 6.7473095703125e+02, 6.7473095703125e+02, 6.7473095703125e+02, 6.7473095703125e+02, 6.7473095703125e+02, 6.7473095703125e+02, 6.7473095703125e+02, 6.7473095703125e+02, 6.7473095703125e+02, 6.7473095703125e+02, 7.563562961154514e+02, 2.142824554443359e+02, 3.102371487087673e+02, 2.978282911512587e+02, 2.873998107910156e+02, 1.120461066563924e+00, 2.797241685655382e+02, 7.11297607421875e+01, 2.708055521647136e+02, 1.86304429796007e+02, 2.745662434895833e+02, 2.912228054470486e+02, 2.795084974500868e+02, 2.998457234700521e+02, 3.062941792805989e+02, 2.940026346842448e+02, 1.791123046875e+02, 9.599583877457513e-01, 9.694700108634101e-01, 9.927230676015218e-01, 9.771479699346755e-01, 9.841848413149515e-01, 8.842723170916239e-01, 1.011302067173852e+00, 1.045485748185052e+00, 1.005138278007507e+00, 9.731321930885315e-01, 1.05796406004164e+00, 9.846790035565695e-01, 5.000967983669705e+02, 4.354048970540364e+02, 5.556234995524088e+01, 3.113610602484809e+02, 2.572029834323459e+01, 2.719609375e+02, 2.189127790662977e+02, 2.582200385199653e+02, 2.788397216796875e+02, 2.755746731228298e+02, 2.870612250434028e+02, 2.726972961425781e+02, 5.000074971516927e+02, 4.999283515082465e+02, 1.397427678108215e+00, 1.1204209751553e+02, 5.000408698187934e+02, 1.073804219563802e+00, 5.001113077799479e+02, 4.999710049099392e+02, 9.949536323547363e-01, 9.817858669492934e-01, 4.999091152615017e+02, 4.999146728515625e+02, 4.999361945258246e+02, 5.000139872233073e+02, 4.999700317382812e+02, 5.000246887207031e+02, 4.998998582628038e+02, 1.126166423161824e+00, 5.000322842068142e+02, 8.948204451137118e-01, 1.094631671905518e+00, 1.050877465142144e+00, 8.664110435379876e-01, 1.034764051437378e+00, 1.012566553221808e+00, 9.790288739734225e-01, 1.011754810810089e+00, 1.016105850537618e+00, 1.04619824886322e+00, 1.049198031425476e+00, 5.887699381510416e+02, 3.849117702907986e+02, 3.130439961751302e+02, 3.030356987847222e+02, 2.922485249837239e+02, 2.820123494466146e+02, 2.795901319715712e+02, 2.753977966308594e+02, 2.920945129394531e+02, 2.48879136827257e+02, 1.635620608859592e+02, 2.297624969482422e+02, 2.450659942626953e+02, 2.450659942626953e+02, 2.450659942626953e+02, 2.450659942626953e+02, 2.450659942626953e+02, 2.450659942626953e+02, 2.450659942626953e+02]
-heaSys.Qhea[5]=[7.5e+02, -4.460639572143555e+01, -4.460639572143555e+01, -4.460639572143555e+01, -4.460639572143555e+01, -4.460639572143555e+01, -4.460639572143555e+01, -4.460639572143555e+01, -4.460639572143555e+01, -3.778438186645508e+01, -2.034415181477864e+01, -1.076488367716471e+01, -1.51528050104777e+01, -2.578734159469604e+00, -8.182710700564915e+00, -3.601108801861604e-02, -1.402664184570312e+01, 5.384023242526585e+00, -1.494820880889893e+01, -1.873509746127658e+01, -1.856462987263997e+01, -1.459017753601074e+01, -2.091627883911133e+01, 9.045665992630852e-01, 7.140146414438884e+00, 2.06220039791531e+01, 1.283498456743028e+01, 3.437834548950195e+01, 1.040262603759766e+01, 2.632699796888564e+01, 4.313343811035156e+01, 6.835009511311848e+01, 9.285723707411024e+01, 8.888693237304688e+01, 9.518837229410808e+01, 8.466955820719402e+01, 7.506573486328125e+01, 7.622516208224826e+01, 6.915196990966797e+01, 6.587427266438802e+01, 2.516512235005696e+01, 7.062158033582899e+01, 1.509114762147268e+00, -9.693728446960449e+00, -1.416056240598361e+00, -3.576244735717773e+01, -1.099680540296766e+01, -3.129597918192546e+01, -3.661311213175455e+01, -3.425115585327148e+01, -2.766058497958713e+01, -2.127730878194173e+01, -1.33455990685357e+01, -4.677644856770834e+01, -1.211525344848633e+01, -3.792041524251302e+01, -6.82242907418145e+00, -3.206850814819336e+01, -2.224804751078288e+01, -3.20345884958903e+01, -5.551817576090495e+01, -3.48643438551161e+01, -7.972897317674425e+00, -4.983417892456055e+01, -1.999738311767578e+01, -4.770196363661024e+01, 1.025315125783285e+01, -2.388886155022515e+01, -2.590687306722005e+01, -4.620501454671224e+01, -1.607958666483561e+01, -4.083320575290256e+01, -1.987872314453125e+01, -1.849700440300835e+01, -6.965548409356011e+00, -2.092738405863444e+01, -2.169252353244358e+01, -2.773180982801649e+01, -4.368976434071858e+00, 1.148255125681559e+01, 1.668723731570774e+01, 3.396221542358398e+01, -1.931900321112739e+01, -7.079136636522081e+00, -1.001233386993408e+01, -7.878868420918782e+00, -7.680136097802056e+00, -4.169918537139893e+00, -2.409356620576647e+00, -6.272899150848389e+00, -1.240578174591064e+01, -2.922794935438368e+01, 2.45965666241116e+00, -2.38291384379069e+01, -1.12687931060791e+01, -1.12687931060791e+01, -1.12687931060791e+01, -1.12687931060791e+01, -1.12687931060791e+01, -1.12687931060791e+01, -1.12687931060791e+01]
+heaSys.Qhea[5]=[7.5e+02, -4.460639572143555e+01, -4.460639572143555e+01, -4.460639572143555e+01, -4.460639572143555e+01, -4.460639572143555e+01, -4.460639572143555e+01, -4.460639572143555e+01, -4.460639572143555e+01, -3.494787216186523e+01, -1.868142742580838e+01, -9.319447941250271e+00, -1.328393109639486e+01, -1.755835281478034e+00, -6.583122783237034e+00, 1.068078835805257e+00, -1.402664184570312e+01, 5.464903036753337e+00, -1.494820880889893e+01, -1.73975109524197e+01, -1.856462987263997e+01, -1.367978922526042e+01, -1.94296137491862e+01, 1.298747453424665e+00, 8.205469767252604e+00, 2.136199802822537e+01, 1.430557876163059e+01, 3.457376861572266e+01, 1.040262603759766e+01, 2.632699796888564e+01, 4.313343811035156e+01, 6.835009511311848e+01, 9.285723707411024e+01, 8.888693237304688e+01, 9.518837229410808e+01, 8.466955820719402e+01, 7.506573486328125e+01, 7.622516208224826e+01, 6.915196990966797e+01, 6.587427266438802e+01, 2.516512235005696e+01, 7.099430677625868e+01, 2.093471686045329e+00, -8.599115159776476e+00, -1.416056240598361e+00, -3.576244735717773e+01, -1.099680540296766e+01, -3.129597918192546e+01, -3.661311213175455e+01, -3.261201858520508e+01, -2.611552238464355e+01, -2.006593831380208e+01, -1.33455990685357e+01, -4.677644856770834e+01, -1.211525344848633e+01, -3.792041524251302e+01, -6.82242907418145e+00, -3.206850814819336e+01, -2.224804751078288e+01, -3.20345884958903e+01, -5.551817576090495e+01, -3.48643438551161e+01, -7.972897317674425e+00, -4.983417892456055e+01, -1.999738311767578e+01, -4.770196363661024e+01, 1.025315125783285e+01, -2.388886155022515e+01, -2.590687306722005e+01, -4.620501454671224e+01, -1.607958666483561e+01, -4.083320575290256e+01, -1.987872314453125e+01, -1.849700440300835e+01, -6.965548409356011e+00, -2.092738405863444e+01, -2.169252353244358e+01, -2.773180982801649e+01, -4.368976434071858e+00, 1.148255125681559e+01, 1.668723731570774e+01, 3.396221542358398e+01, -1.5646697362264e+01, -5.391466617584229e+00, -8.126970609029135e+00, -6.549368858337402e+00, -6.054075929853651e+00, -3.138808886210124e+00, -9.945744209819369e-01, -4.949680540296766e+00, -1.057298755645752e+01, -2.922794935438368e+01, 2.45965666241116e+00, -2.38291384379069e+01, -1.12687931060791e+01, -1.12687931060791e+01, -1.12687931060791e+01, -1.12687931060791e+01, -1.12687931060791e+01, -1.12687931060791e+01, -1.12687931060791e+01]
 heaSys.heaSche.Pel_IDEAL[5]=[-8.98396372795105e-01, -8.98396372795105e-01, -8.98396372795105e-01, -8.98396372795105e-01, -8.98396372795105e-01, -8.98396372795105e-01, -8.98396372795105e-01, -8.98396372795105e-01, -8.98396372795105e-01, -8.98396372795105e-01, -8.98396372795105e-01, -8.345592220624288e-01, -1.094837856292725e+01, -1.579194980197483e+01, -8.406349658966064e+00, -1.501177215576172e+01, -5.386964109208849e+00, -3.070842912462022e+01, -5.749712944030762e+00, -2.363928010728624e+01, -9.498944812350803e+00, -3.119009971618652e+01, -1.925462701585558e+01, -1.878280046251085e+01, -4.37747065226237e+00, -5.741100311279297e+00, -1.093129303720262e+00, -1.568125152587891e+01, 1.040262603759766e+01, 2.632699796888564e+01, 4.313343811035156e+01, 6.835009511311848e+01, 9.285723707411024e+01, 8.888693237304688e+01, 9.518837229410808e+01, 8.466955820719402e+01, 7.506573486328125e+01, 7.622516208224826e+01, 6.915196990966797e+01, 6.587427266438802e+01, 2.516512235005696e+01, -2.080164464314779e+01, 1.062746747334798e+01, -2.800645277235243e+01, 7.576911873287624e+00, -2.564285469055176e+01, -1.396310276455349e+00, -2.045783869425456e+01, -2.557629712422689e+01, -3.517827563815646e+01, -2.614377551608615e+01, -2.694548034667969e+01, -1.33455990685357e+01, -4.677644856770834e+01, -1.211525344848633e+01, -3.792041524251302e+01, -6.82242907418145e+00, -3.206850814819336e+01, -2.224804751078288e+01, -3.20345884958903e+01, -5.551817576090495e+01, -3.48643438551161e+01, -7.972897317674425e+00, -4.983417892456055e+01, -1.999738311767578e+01, -4.770196363661024e+01, 1.025315125783285e+01, -2.388886155022515e+01, -2.590687306722005e+01, -4.620501454671224e+01, -1.607958666483561e+01, -4.083320575290256e+01, -1.987872314453125e+01, -1.849700440300835e+01, -6.965548409356011e+00, -2.092738405863444e+01, -2.169252353244358e+01, -2.773180982801649e+01, -4.368976434071858e+00, 1.148255125681559e+01, 1.668723731570774e+01, 3.396221542358398e+01, 1.867845005459256e+01, -8.257864846123589e+00, -1.457650979359945e+01, -1.638609462314182e+01, -1.303499126434326e+01, -1.706249809265137e+01, -1.29287559721205e+01, -1.618680466545953e+01, -6.086662769317627e+00, -1.909201516045464e+01, 6.857298851013184e+00, -1.294235293070475e+01, -1.12687931060791e+01, -1.12687931060791e+01, -1.12687931060791e+01, -1.12687931060791e+01, -1.12687931060791e+01, -1.12687931060791e+01, -1.12687931060791e+01]
-heaSys.Qhea[6]=[7.5e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.135325622558594e+01, 0e+00, 1.984072875976562e+01, 8.375078201293945e+00, 3.517358567979601e+01, 3.065868377685547e+01, 7.03780025906033e+01, 7.574361843532986e+01, 7.842931365966797e+01, 6.35745357937283e+01, 7.201771291097005e+01, 2.961342620849609e+01, 5.925784259372287e+01, 2.96458502875434e+01, 5.684692001342773e+01, 4.393418365054661e+00, 3.653183703952365e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.416564994388156e-01, 7.716224590937296e-01, 9.52853798866272e-01, 9.077511297331916e-01, 6.593133939637078e-01, 1.017178972562154e+00, 7.516319884194268e-01, 6.692745950486925e-01, 9.402742385864258e-01, 9.271143939759996e-01, 7.298420800103081e-01, 7.416840791702271e-01, 7.806434300210741e-01, 7.828782664404975e-01, 8.392439484596252e-01, 6.90659138891432e-01, 8.475990229182773e-01, 9.562441309293112e-01, 7.720607320467631e-01, 8.505154119597541e-01, 1.042111396789551e+00, 9.955918921364678e-01, 8.168973326683044e-01, 9.885510206222534e-01, 9.511100914743211e-01, 9.219625062412686e-01, 9.43829079469045e-01, 9.696067571640015e-01, 4.102711412641737e+00, 2.725464820861816e+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, 8.514999747276306e-01, 8.514999747276306e-01, 8.514999747276306e-01, 8.514999747276306e-01, 8.514999747276306e-01, 8.514999747276306e-01, 8.514999747276306e-01]
+heaSys.Qhea[6]=[7.5e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.395468902587891e+01, 0e+00, 2.205690574645996e+01, 8.375078201293945e+00, 3.517358567979601e+01, 3.065868377685547e+01, 7.03780025906033e+01, 7.574361843532986e+01, 7.842931365966797e+01, 6.35745357937283e+01, 7.201771291097005e+01, 2.961342620849609e+01, 5.925784259372287e+01, 2.96458502875434e+01, 5.684692001342773e+01, 4.393418365054661e+00, 3.828947321573893e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.416564994388156e-01, 7.716224590937296e-01, 9.52853798866272e-01, 9.077511297331916e-01, 6.593133939637078e-01, 1.017178972562154e+00, 7.516319884194268e-01, 6.692745950486925e-01, 9.402742385864258e-01, 9.271143939759996e-01, 7.298420800103081e-01, 7.416840791702271e-01, 7.806434300210741e-01, 7.828782664404975e-01, 8.392439484596252e-01, 6.90659138891432e-01, 8.475990229182773e-01, 9.562441309293112e-01, 7.720607320467631e-01, 8.505154119597541e-01, 1.042111396789551e+00, 9.955918921364678e-01, 8.168973326683044e-01, 9.885510206222534e-01, 9.511100914743211e-01, 9.219625062412686e-01, 9.43829079469045e-01, 9.696067571640015e-01, 4.102711412641737e+00, 2.725464820861816e+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, 8.514999747276306e-01, 8.514999747276306e-01, 8.514999747276306e-01, 8.514999747276306e-01, 8.514999747276306e-01, 8.514999747276306e-01, 8.514999747276306e-01]
 heaSys.heaSche.Pel_IDEAL[6]=[6.414999961853027e-01, 6.414999961853027e-01, 6.414999961853027e-01, 6.414999961853027e-01, 6.414999961853027e-01, 6.414999961853027e-01, 6.414999961853027e-01, 6.414999961853027e-01, 6.414999961853027e-01, 6.414999961853027e-01, 6.414999961853027e-01, 5.637077556716071e-01, 8.288944363594055e-01, 8.090947932667203e-01, 7.646678355005052e-01, 8.574405113855997e-01, 9.236059387524923e-01, 8.407445086373223e-01, 9.760252237319946e-01, 7.905506160524156e-01, 9.015504916508993e-01, 8.152259389559428e-01, 7.962058981259664e-01, 8.977580732769437e-01, 8.525000015894572e-01, 7.172546916537815e+00, 9.025453329086304e-01, 4.24285364151001e+00, 8.375078201293945e+00, 3.517358567979601e+01, 3.065868377685547e+01, 7.03780025906033e+01, 7.574361843532986e+01, 7.842931365966797e+01, 6.35745357937283e+01, 7.201771291097005e+01, 2.961342620849609e+01, 5.925784259372287e+01, 2.96458502875434e+01, 5.684692001342773e+01, 4.393418365054661e+00, 8.198534515168932e-01, 9.503834446271261e-01, 8.376047677463956e-01, 9.123669995201958e-01, 9.468863010406494e-01, 8.202339741918776e-01, 9.073164131906297e-01, 8.080288767814636e-01, 8.689974678887261e-01, 8.709011475245158e-01, 7.693395415941874e-01, 8.416564994388156e-01, 7.716224590937296e-01, 9.52853798866272e-01, 9.077511297331916e-01, 6.593133939637078e-01, 1.017178972562154e+00, 7.516319884194268e-01, 6.692745950486925e-01, 9.402742385864258e-01, 9.271143939759996e-01, 7.298420800103081e-01, 7.416840791702271e-01, 7.806434300210741e-01, 7.828782664404975e-01, 8.392439484596252e-01, 6.90659138891432e-01, 8.475990229182773e-01, 9.562441309293112e-01, 7.720607320467631e-01, 8.505154119597541e-01, 1.042111396789551e+00, 9.955918921364678e-01, 8.168973326683044e-01, 9.885510206222534e-01, 9.511100914743211e-01, 9.219625062412686e-01, 9.43829079469045e-01, 9.696067571640015e-01, 4.102711412641737e+00, 2.725464820861816e+01, 7.936586168077257e+00, 2.937664376364814e+00, 8.910453319549561e-01, 8.657487299707201e-01, 8.907120360268487e-01, 8.843346834182739e-01, 8.896610140800476e-01, 8.333342141575284e-01, 8.083950877189636e-01, 7.970688078138564e-01, 8.681218359205458e-01, 8.014073371887207e-01, 8.514999747276306e-01, 8.514999747276306e-01, 8.514999747276306e-01, 8.514999747276306e-01, 8.514999747276306e-01, 8.514999747276306e-01, 8.514999747276306e-01]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_TwinHouses_BuildingN2_Exp2_Tset.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_TwinHouses_BuildingN2_Exp2_Tset.txt
index 4a41c48c74..6526a18d7c 100644
--- a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_TwinHouses_BuildingN2_Exp2_Tset.txt
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_TwinHouses_BuildingN2_Exp2_Tset.txt
@@ -1,4 +1,4 @@
-last-generated=2024-10-30
+last-generated=2024-12-04
 statistics-initialization=
 {
   "nonlinear": "18, 10, 8, 11, 10, 8, 12",
@@ -12,16 +12,16 @@ statistics-simulation=
   "numerical Jacobians": "0"
 }
 time=[8e+06, 1.23e+07]
-heaSys.Qhea[1]=[5.888088125e+05, 1.359026217990451e+03, 1.049405151367188e+03, 9.360840657552084e+02, 8.892238837348091e+02, 8.678133544921875e+02, 8.570337727864584e+02, 8.509812554253472e+02, 8.471463623046875e+02, 8.444359741210938e+02, 8.423551364474827e+02, 2.060917860243056e+03, 1.021171264648438e+03, 1.301230902777778e+03, 1.074384602864583e+03, 1.224060017903646e+03, 4.905806477864583e+02, 1.09564592827691e+03, 5.641517333984375e+02, 9.306197102864584e+02, 7.412755601671007e+02, 1.019578959147135e+03, 6.805512424045139e+02, 1.165638685438368e+03, 1.097212687174479e+03, 1.27573583984375e+03, 7.667416788736979e+02, 1.243606567382812e+03, 2.256067199707031e+02, -1.354187655978733e+02, 1.554367891947429e+01, 2.03271115620931e+01, 1.319103732638889e+02, 6.501151784261067e+01, 1.422378997802734e+02, 5.94177737765842e+01, 1.798428497314453e+02, 9.875670878092448e+01, 2.493607821994358e+02, 1.007726771036784e+02, 1.93261565483941e+03, 1.29325592719184e+03, 3.077780049641927e+02, 8.57027601453993e+02, 1.734638790554471e+02, 7.544537353515625e+02, 6.167568291558159e+02, 7.812636311848959e+02, 8.868023681640625e+02, 1.056753295898438e+03, 9.000236884223091e+02, 1.063998779296875e+03, 1.797587592230903e+03, 1.680039225260417e+03, 8.397896118164062e+02, 6.988456353081597e+02, 1.485190741644965e+03, 8.352852543195088e+00, 1.529921820746528e+03, 1.327212890625e+03, 1.164862696329753e+02, -3.155971823798286e+01, 1.621538438585069e+03, 1.640003784179688e+03, 1.830291408962674e+03, 1.572422973632812e+03, 1.732730672200521e+03, 1.578812391493056e+03, 1.650986287434896e+03, 4.838170166015625e+02, 1.604390706380208e+03, 2.40052121480306e+01, 4.770772933959961e+01, -1.305988583034939e+02, 1.338414459228516e+02, -7.691396331787109e+01, 1.04734312693278e+01, -7.704125044080946e+01, 1.248153127034505e+02, -4.476395628187392e+01, 3.293929612901476e+02, 1.095347690582275e+01, 1.788132175021701e+03, 1.356177083333333e+03, 1.004274617513021e+03, 1.172532809787326e+03, 1.136573052300347e+03, 1.134113484700521e+03, 1.078671251085069e+03, 1.081747694227431e+03, 8.193734741210938e+02, 8.330276828342014e+02, 5.672578667534722e+02, 6.588264363606771e+02, 7.75561279296875e+02, 8.053644476996528e+02, 8.114847412109375e+02, 8.101213989257812e+02, 8.06754163953993e+02, 8.03283935546875e+02, 8.002523193359375e+02]
+heaSys.Qhea[1]=[5.888088125e+05, 1.355726386176215e+03, 1.047753770616319e+03, 9.353057657877604e+02, 8.889932793511284e+02, 8.679502902560764e+02, 8.574149169921875e+02, 8.515219116210938e+02, 8.477907986111111e+02, 8.451488647460938e+02, 8.431143595377604e+02, 2.067218804253472e+03, 1.036337910970052e+03, 1.320318508572049e+03, 1.078306844075521e+03, 1.222930094401042e+03, 5.14258558485243e+02, 1.087839436848958e+03, 5.767221069335938e+02, 9.228067966037327e+02, 7.493506537543403e+02, 1.01083066813151e+03, 6.851115519205729e+02, 1.161105333116319e+03, 1.097281168619792e+03, 1.274592271592882e+03, 7.734207967122396e+02, 1.239330810546875e+03, 2.577374047173394e+02, -1.847549591064453e+02, 1.934963734944661e+01, 2.024388864305284e+01, 1.36762321472168e+02, 6.502709452311198e+01, 1.488211534288195e+02, 5.558078214857314e+01, 1.953592987060547e+02, 9.574367184109158e+01, 2.545895690917969e+02, 9.617849222819011e+01, 1.955909084743924e+03, 1.282890475802951e+03, 3.377905680338542e+02, 8.459462687174479e+02, 2.034109446207682e+02, 7.448442993164062e+02, 6.203558756510416e+02, 7.741929931640625e+02, 8.856521606445312e+02, 1.056582370334201e+03, 9.058481716579861e+02, 1.06414306640625e+03, 1.806737589518229e+03, 1.672574462890625e+03, 8.6199560546875e+02, 6.909552883572049e+02, 1.499743272569444e+03, 5.034594535827637e+00, 1.534439276801215e+03, 1.323732476128472e+03, 1.193209482828776e+02, -2.549919721815321e+01, 1.630542765299479e+03, 1.632332641601562e+03, 1.851688205295139e+03, 1.560250651041667e+03, 1.749866943359375e+03, 1.573011867947049e+03, 1.651486246744792e+03, 4.843121134440104e+02, 1.616553304036458e+03, 1.748173242145115e+01, 5.327040863037109e+01, -1.317460411919488e+02, 1.406963992648654e+02, -8.343625895182292e+01, 1.2371949089898e+01, -8.070696173773871e+01, 1.319978612263997e+02, -5.098713472154405e+01, 3.299853278266059e+02, 1.040459442138672e+01, 1.795360527886285e+03, 1.351224867078993e+03, 1.00734423828125e+03, 1.169198228624132e+03, 1.139241672092014e+03, 1.131297281901042e+03, 1.078057047526042e+03, 1.081328748914931e+03, 8.269094848632812e+02, 8.266151190863716e+02, 5.777036607530382e+02, 6.557163696289062e+02, 7.753837890625e+02, 8.059474894205729e+02, 8.122340901692709e+02, 8.108890787760416e+02, 8.075067545572916e+02, 8.040184326171875e+02, 8.009716796875e+02]
 validationDataExp2_1.heat_elP_living_room=[1.832202880859375e+03, 1.832202880859375e+03, 1.832202880859375e+03, 1.832202880859375e+03, 1.832202880859375e+03, 1.832202880859375e+03, 1.832202880859375e+03, 1.832202880859375e+03, 1.832202880859375e+03, 1.832202880859375e+03, 1.832202880859375e+03, 1.947252956814236e+03, 2.706466166178386e+02, 1.47757512749566e+03, 1.008120524088542e+03, 1.352516520182292e+03, 3.851395474539863e+00, 1.354310370551215e+03, 3.741147756576538e+00, 1.163492892795139e+03, 1.139264358944363e+02, 1.282660929361979e+03, 6.892838338216146e+02, 1.465950113932292e+03, 1.221497599283854e+03, 1.511859944661458e+03, 6.470806274414062e+02, 9.00289794921875e+02, 3.720352305306329e+00, 3.670646455552843e+00, 3.896207094192505e+00, 4.025518231921726e+00, 3.849720610512628e+00, 3.537674983342489e+00, 4.150689866807726e+00, 4.016224596235487e+00, 3.923926115036011e+00, 3.795951578352186e+00, 4.039925416310628e+00, 3.848837852478027e+00, 1.799900824652778e+03, 1.460316908094618e+03, 3.701281785964966e+00, 1.120830390082465e+03, 3.688332902060615e+00, 1.034624267578125e+03, 1.66861334906684e+02, 9.852110663519966e+02, 9.409392700195312e+02, 1.284641452365451e+03, 8.193178168402778e+02, 1.225637451171875e+03, 1.799846028645833e+03, 1.799761678059896e+03, 3.893561601638794e+00, 4.029702788458931e+02, 1.800024644639757e+03, 4.11775541305542e+00, 1.800160441080729e+03, 1.799823974609375e+03, 3.814132213592529e+00, 3.816585540771484e+00, 1.799794976128472e+03, 1.799443115234375e+03, 1.799697848849826e+03, 1.800071695963542e+03, 1.799944498697917e+03, 1.799741577148438e+03, 1.799940253363715e+03, 3.781856218973795e+00, 1.799975287543403e+03, 3.47227398554484e+00, 4.24841833114624e+00, 4.102788925170898e+00, 3.434947835074531e+00, 4.037086566289266e+00, 3.906073782179091e+00, 3.812233130137126e+00, 3.811453024546305e+00, 3.909247557322184e+00, 4.11121326022678e+00, 3.912876129150391e+00, 1.842773573133681e+03, 1.521472493489583e+03, 9.104511922200521e+02, 1.370629150390625e+03, 1.082194186740451e+03, 1.352799560546875e+03, 1.107395304361979e+03, 1.257544759114583e+03, 5.924979248046875e+02, 1.049191297743056e+03, 2.538209211561415e+02, 1.015488525390625e+03, 1.076171997070312e+03, 1.076171997070312e+03, 1.076171997070312e+03, 1.076171997070312e+03, 1.076171997070312e+03, 1.076171997070312e+03, 1.076171997070312e+03]
-heaSys.Qhea[3]=[6.624323125e+05, 2.969636433919271e+02, 2.038287438286675e+02, 1.787242838541667e+02, 1.702074449327257e+02, 1.667116173638238e+02, 1.64982899983724e+02, 1.63961429172092e+02, 1.632596028645833e+02, 1.627244262695312e+02, 1.622910732693142e+02, 5.571720174153646e+02, 2.416479237874349e+02, 2.501395212809245e+02, 2.086697743733724e+02, 2.27446278889974e+02, 6.517035420735677e+01, 2.056033087836371e+02, 9.14833984375e+01, 1.853175116644965e+02, 1.395847896999783e+02, 2.07640146891276e+02, 1.233007337782118e+02, 2.060985073513455e+02, 1.857169443766276e+02, 2.268980526394314e+02, 1.066361982557509e+02, 3.003893127441406e+02, -3.08302427927653e+01, -5.101170688205295e+01, -2.190615781148275e+01, -4.03262333340115e+01, -7.840648969014486e+00, -1.655882136027018e+01, 1.26093446943495e+01, 5.962093194325765e+00, 4.647073745727539e+01, 8.128015200297037e+00, 4.027197308010525e+01, 1.186648654937744e+01, 4.316366509331597e+02, 2.714088779025608e+02, 4.044442749023438e+01, 1.8982543097602e+02, -3.024554104275174e+01, 1.67509765625e+02, 1.326679195827908e+02, 1.814676513671875e+02, 1.823421834309896e+02, 1.981651814778646e+02, 1.819635230170356e+02, 2.006696421305338e+02, 4.334820692274305e+02, 3.707611694335938e+02, 4.02392692565918e+01, 1.181287044949001e+02, 3.535089653862847e+02, -3.645241165161133e+01, 3.608786282009548e+02, 3.09151841905382e+02, -4.781739298502604e+01, -6.236889394124349e+01, 3.949902716742621e+02, 3.702626037597656e+02, 3.170073682996962e+02, 3.442961052788629e+02, 3.247432861328125e+02, 3.088406880696614e+02, 3.459521993001302e+02, -4.070709228515625e+00, 3.837012532552083e+02, -4.413651699490018e+01, -3.819002532958984e+01, -4.927916590372721e+01, -2.802376047770182e+01, -2.590382957458496e+01, -2.755237939622667e+01, -3.401624213324653e+01, -5.56935895284017e+01, -3.474505784776476e+01, 1.022979148228963e+01, -2.788758277893066e+01, 3.531080322265625e+02, 2.727666320800781e+02, 1.706873830159505e+02, 2.26091798570421e+02, 2.200801696777344e+02, 2.15490244547526e+02, 2.026309068467882e+02, 2.274034695095486e+02, 1.383264617919922e+02, 1.819902920193142e+02, -3.223192554050021e+01, 1.14635747273763e+02, 1.456328786214193e+02, 1.513255343967014e+02, 1.511443125406901e+02, 1.498102637396918e+02, 1.484555867513021e+02, 1.473119201660156e+02, 1.464083099365234e+02]
+heaSys.Qhea[3]=[6.624323125e+05, 2.96192142062717e+02, 2.034022589789496e+02, 1.784807586669922e+02, 1.700807885064019e+02, 1.666568925645616e+02, 1.649709879557292e+02, 1.639726782904731e+02, 1.632830725775825e+02, 1.627569885253906e+02, 1.623314870198568e+02, 5.584195014105903e+02, 2.430396372477213e+02, 2.49199222140842e+02, 2.088035803900825e+02, 2.267354329427083e+02, 6.46446066962348e+01, 2.037407006157769e+02, 9.233389282226562e+01, 1.883189765082465e+02, 1.409139065212674e+02, 2.04652837117513e+02, 1.230297563340929e+02, 2.049653896755642e+02, 1.858226267496745e+02, 2.26278089735243e+02, 1.062129270765517e+02, 2.994983215332031e+02, -3.205307960510254e+01, -5.903384908040365e+01, -2.143928718566895e+01, -4.078594589233398e+01, -7.422214825948079e+00, -1.718385823567708e+01, 1.437231296963162e+01, 5.407862928178576e+00, 4.930305099487305e+01, 7.46308347913954e+00, 4.156883112589518e+01, 1.147360070546468e+01, 4.309933200412327e+02, 2.694890882703993e+02, 3.991344833374023e+01, 1.894953138563368e+02, -3.116292232937283e+01, 1.705113830566406e+02, 1.339382663302951e+02, 1.803788638644748e+02, 1.824199778238932e+02, 1.979195522732205e+02, 1.836277126736111e+02, 2.005152384440104e+02, 4.352969801161024e+02, 3.647199469672309e+02, 4.201398468017578e+01, 1.158810581631131e+02, 3.561691453721788e+02, -3.88084971110026e+01, 3.620443827311198e+02, 3.081446363661024e+02, -4.884847640991211e+01, -6.219625600179037e+01, 3.978295559353298e+02, 3.685399169921875e+02, 3.2048876953125e+02, 3.402794765896267e+02, 3.266095275878906e+02, 3.099136081271702e+02, 3.460406901041667e+02, -4.746069590250649e+00, 3.86228013780382e+02, -4.634987343682183e+01, -3.733919143676758e+01, -4.989938693576389e+01, -2.655446073744032e+01, -2.728379058837891e+01, -2.72622241973877e+01, -3.471513875325521e+01, -5.471777852376302e+01, -3.579040400187174e+01, 7.76388496822781e+00, -2.810659790039062e+01, 3.554620903862847e+02, 2.726210632324219e+02, 1.717955169677734e+02, 2.253929663764106e+02, 2.209286651611328e+02, 2.147730712890625e+02, 2.023154788547092e+02, 2.271100819905599e+02, 1.407687072753906e+02, 1.808839009602865e+02, -2.272102419535319e+01, 1.136464665730794e+02, 1.455052371554904e+02, 1.513508978949653e+02, 1.511977844238281e+02, 1.498674163818359e+02, 1.485118815104167e+02, 1.473669281005859e+02, 1.464622650146484e+02]
 validationDataExp2_1.heat_elP_bath_room=[6.529138793945312e+02, 6.529138793945312e+02, 6.529138793945312e+02, 6.529138793945312e+02, 6.529138793945312e+02, 6.529138793945312e+02, 6.529138793945312e+02, 6.529138793945312e+02, 6.529138793945312e+02, 6.529138793945312e+02, 6.529138793945312e+02, 7.291917385525173e+02, 2.901495259602864e+02, 2.862638108995226e+02, 1.967620527479384e+02, 2.672538655598958e+02, 4.025407791137695e+01, 2.636096428765191e+02, 8.01968994140625e+01, 2.625527716742621e+02, 1.259860551622179e+02, 2.764245707194011e+02, 2.142971038818359e+02, 2.644413113064236e+02, 2.08102793375651e+02, 2.90867933485243e+02, 2.065329810248481e+02, 1.717235565185547e+02, 1.00308903588189e+01, 9.834057913886177e+00, 9.601095835367838e+00, 9.519502109951443e+00, 9.580195956759983e+00, 9.663450241088867e+00, 9.309868388705784e+00, 9.357555389404297e+00, 9.379887580871582e+00, 9.847408294677734e+00, 1.023258050282796e+01, 9.888726870218912e+00, 4.999905836317274e+02, 3.298348558213976e+02, 3.941971333821615e+01, 2.897656012641059e+02, 1.533812321556939e+01, 2.727304382324219e+02, 7.555737728542752e+01, 2.488557366265191e+02, 2.27900136311849e+02, 2.686824713812934e+02, 1.796439548068576e+02, 2.525145111083984e+02, 5.00004157172309e+02, 4.999974399142795e+02, 9.564971923828125e+00, 1.184786172442966e+02, 5.000368482801649e+02, 9.039888699849447e+00, 5.000897318522136e+02, 4.999915568033854e+02, 8.963667233784994e+00, 9.493077066209581e+00, 5.000053304036458e+02, 4.999264526367188e+02, 5.000144246419271e+02, 5.000576612684462e+02, 5.000062764485677e+02, 4.998627556694879e+02, 4.999793497721354e+02, 9.441642761230469e+00, 5.00022216796875e+02, 1.001571167839898e+01, 9.546541213989258e+00, 9.164217525058323e+00, 9.221543100145128e+00, 9.04572614034017e+00, 9.086475054423014e+00, 9.009279780917698e+00, 9.458445231119791e+00, 9.528207778930664e+00, 9.984059121873644e+00, 9.654270172119141e+00, 8.373024410671658e+01, 3.502925686306423e+02, 1.826490224202474e+02, 2.956906500922309e+02, 2.295795271131727e+02, 2.948918050130208e+02, 2.644499104817708e+02, 2.723629692925347e+02, 2.352076148986816e+01, 2.671247897677952e+02, 4.651559617784288e+00, 2.231551818847656e+02, 2.273497772216797e+02, 2.273497772216797e+02, 2.273497772216797e+02, 2.273497772216797e+02, 2.273497772216797e+02, 2.273497772216797e+02, 2.273497772216797e+02]
-heaSys.Qhea[4]=[6.721838125e+05, 5.165637139214409e+02, 3.39553209092882e+02, 2.829759928385417e+02, 2.606098293728298e+02, 2.501870235866971e+02, 2.445398305257162e+02, 2.410348748101129e+02, 2.386063164605035e+02, 2.367938232421875e+02, 2.353793301052517e+02, 8.510469021267361e+02, 3.634337463378906e+02, 3.45212395562066e+02, 2.865875956217448e+02, 2.968049723307292e+02, 1.075302598741319e+02, 2.425501793755425e+02, 1.262056884765625e+02, 2.152505476209852e+02, 1.871631249321832e+02, 2.317423400878906e+02, 1.775865580240885e+02, 2.439381306966146e+02, 2.350049438476562e+02, 2.693238864474827e+02, 1.848318871392144e+02, 2.679173278808594e+02, 1.106573592291938e+01, -1.531767052544488e+02, -8.622891743977864e+01, -1.222216262817383e+02, -4.951427205403646e+01, -5.052483749389648e+01, 2.813793473773532e+00, -2.114576578140259e+00, 6.101679229736328e+01, 1.918258264329698e+01, 6.487231784396701e+01, 1.236900552113851e+01, 8.328069254557291e+02, 4.395514797634548e+02, 1.388322041829427e+02, 2.438650597466363e+02, 5.952178488837348e+01, 1.955041046142578e+02, 1.715159793429904e+02, 1.919607611762153e+02, 2.10360356648763e+02, 2.321527726915148e+02, 2.178232896592882e+02, 2.413318888346354e+02, 5.957705349392361e+02, 4.897939453125e+02, 2.364690246582031e+02, 1.492582032945421e+02, 4.579752739800347e+02, -1.465164184570312e+02, 4.786794942220052e+02, 3.682455681694879e+02, -1.652985229492188e+02, -1.718182796902127e+02, 5.470764634874132e+02, 5.108647766113281e+02, 6.351267903645834e+02, 4.680399509006077e+02, 5.785105997721354e+02, 4.435102166069879e+02, 4.236010233561198e+02, -7.048416582743326e+01, 4.451595831976996e+02, -1.565154707166884e+02, -1.562095489501953e+02, -1.609578993055555e+02, -8.51831300523546e+01, -8.216251118977864e+01, -1.02009767320421e+02, -9.841729651557074e+01, -4.334016672770182e+01, -7.338519880506728e+01, -1.53552115228441e+01, -7.256805419921875e+01, 6.067047932942709e+02, 3.811836988661024e+02, 2.576221618652344e+02, 2.808665635850695e+02, 2.665154588487413e+02, 2.603816528320312e+02, 2.49271731906467e+02, 2.547110290527344e+02, 2.143748779296875e+02, 2.10981187608507e+02, 1.542719489203559e+02, 1.567113749186198e+02, 1.718255462646484e+02, 1.732122904459635e+02, 1.70869873046875e+02, 1.675840521918403e+02, 1.644046630859375e+02, 1.616558227539062e+02, 1.5941748046875e+02]
+heaSys.Qhea[4]=[6.721838125e+05, 5.159591403537327e+02, 3.394975179036458e+02, 2.832572631835938e+02, 2.611137288411458e+02, 2.508409932454427e+02, 2.45292485555013e+02, 2.418510318332248e+02, 2.394632042778863e+02, 2.376774597167969e+02, 2.362812330457899e+02, 8.537331136067709e+02, 3.676464538574219e+02, 3.443758239746094e+02, 2.877784830729167e+02, 2.967818806966146e+02, 1.143320142957899e+02, 2.402590738932292e+02, 1.293647155761719e+02, 2.136281178792318e+02, 1.901062520345052e+02, 2.309112803141276e+02, 1.781849246554904e+02, 2.434102444118924e+02, 2.356653340657552e+02, 2.696167975531684e+02, 1.858108520507812e+02, 2.673580017089844e+02, 2.045016119215224e+01, -1.54295401679145e+02, -8.502925618489583e+01, -1.218039745754666e+02, -4.766256035698785e+01, -5.013947423299154e+01, 4.849056402842204e+00, -2.650979068544176e+00, 6.601372528076172e+01, 1.851432164510091e+01, 6.67414042154948e+01, 1.120932292938232e+01, 8.395866021050347e+02, 4.368970879448785e+02, 1.472406819661458e+02, 2.409102376302083e+02, 6.818006049262152e+01, 1.925995025634766e+02, 1.732903238932292e+02, 1.902828657362196e+02, 2.104792277018229e+02, 2.326562296549479e+02, 2.200347679985894e+02, 2.418087615966797e+02, 5.989711235894097e+02, 4.888710666232639e+02, 2.431362915039062e+02, 1.45839959886339e+02, 4.623682963053386e+02, -1.485289459228516e+02, 4.804194844563802e+02, 3.679118177625868e+02, -1.635064595540365e+02, -1.707273847791884e+02, 5.501811048719618e+02, 5.097151794433594e+02, 6.413665228949653e+02, 4.655469122992621e+02, 5.834554850260416e+02, 4.419703063964844e+02, 4.241481831868489e+02, -6.990918413798013e+01, 4.493333740234375e+02, -1.575829179551866e+02, -1.542356719970703e+02, -1.60764397515191e+02, -8.300416395399306e+01, -8.342158508300781e+01, -1.00971689860026e+02, -9.883271874321832e+01, -4.132995859781901e+01, -7.37531009250217e+01, -1.522382174597846e+01, -7.277538299560547e+01, 6.094974229600695e+02, 3.803317328559028e+02, 2.590031331380208e+02, 2.80420166015625e+02, 2.676824696858724e+02, 2.600602518717448e+02, 2.48848876953125e+02, 2.550357496473524e+02, 2.171097717285156e+02, 2.098003760443793e+02, 1.583123440212674e+02, 1.561881103515625e+02, 1.720005374484592e+02, 1.735730183919271e+02, 1.712784983317057e+02, 1.680010969373915e+02, 1.648197004530165e+02, 1.620672454833984e+02, 1.598257446289062e+02]
 validationDataExp2_1.heat_elP_children_room=[6.7473095703125e+02, 6.7473095703125e+02, 6.7473095703125e+02, 6.7473095703125e+02, 6.7473095703125e+02, 6.7473095703125e+02, 6.7473095703125e+02, 6.7473095703125e+02, 6.7473095703125e+02, 6.7473095703125e+02, 6.7473095703125e+02, 7.563535427517361e+02, 2.145452524820963e+02, 3.100720757378472e+02, 2.975270250108507e+02, 2.874563802083333e+02, 1.091549383269416e+00, 2.798645358615452e+02, 7.156118011474609e+01, 2.705017462836371e+02, 1.846650187174479e+02, 2.746572265625e+02, 2.910805935329861e+02, 2.796228705512153e+02, 3.00060302734375e+02, 3.063643493652344e+02, 2.947843797471788e+02, 1.791123046875e+02, 9.58837456173367e-01, 9.715679287910461e-01, 9.901543060938517e-01, 9.775205651919047e-01, 9.819711777899001e-01, 8.844274679819742e-01, 1.011223766538832e+00, 1.044092588954502e+00, 1.00514817237854e+00, 9.739912549654642e-01, 1.057071540090773e+00, 9.825432101885477e-01, 5.000924987792969e+02, 4.353911675347222e+02, 5.548783620198568e+01, 3.113047790527344e+02, 2.56855337354872e+01, 2.722777099609375e+02, 2.180537533230252e+02, 2.582492133246528e+02, 2.782448527018229e+02, 2.75621097140842e+02, 2.883702629937066e+02, 2.727069702148438e+02, 5.00007826063368e+02, 4.999308369954427e+02, 1.402999997138977e+00, 1.120430318117142e+02, 5.000395406087239e+02, 1.075240770975749e+00, 5.001144782172309e+02, 4.99972900390625e+02, 9.943703611691793e-01, 9.846625261836581e-01, 4.999140082465278e+02, 4.999064636230469e+02, 4.99937984890408e+02, 5.000135091145833e+02, 4.999716288248698e+02, 5.000253804524739e+02, 4.999018351236979e+02, 1.12670373916626e+00, 5.000328843858507e+02, 8.965287937058343e-01, 1.097685217857361e+00, 1.050811741087172e+00, 8.662572039498223e-01, 1.034981528917948e+00, 1.010654330253601e+00, 9.784568150838217e-01, 1.010990738868713e+00, 1.022442393832736e+00, 1.044698596000671e+00, 1.049537062644958e+00, 5.890511135525173e+02, 3.849629584418403e+02, 3.121813659667969e+02, 3.028070949978298e+02, 2.901153293185764e+02, 2.819744160970052e+02, 2.800949944390191e+02, 2.75430406358507e+02, 2.919209594726562e+02, 2.488358459472656e+02, 1.638251274956597e+02, 2.298800659179688e+02, 2.450659942626953e+02, 2.450659942626953e+02, 2.450659942626953e+02, 2.450659942626953e+02, 2.450659942626953e+02, 2.450659942626953e+02, 2.450659942626953e+02]
-heaSys.Qhea[5]=[2.0045390625e+05, 1.371841803656684e+02, 8.587987603081598e+01, 6.818486022949219e+01, 6.186121622721354e+01, 5.979124493069119e+01, 6.020089721679688e+01, 6.145801077948676e+01, 6.283615832858615e+01, 6.407112884521484e+01, 6.508744388156467e+01, 6.259125137329102e+01, 3.635009892781576e+01, 2.967349391513401e+01, 1.194019476572672e+01, 1.366479873657227e+01, 7.394512971242269e+00, 4.483111169603136e+00, 1.14240038394928e+00, -2.229738850063748e+01, -8.652539359198677e+00, -1.905626551310221e+01, -2.016702842712402e+01, 2.470678647359213e+00, 7.548979759216309e+00, 2.039922862582737e+01, 1.349972640143501e+01, 3.072246932983398e+01, 1.499739382002089e+01, 3.478802998860677e+01, 3.600399271647135e+01, 8.327583397759332e+01, 9.153753492567274e+01, 1.039326629638672e+02, 9.844715711805556e+01, 1.065920901828342e+02, 7.983380126953125e+01, 9.422780609130859e+01, 7.874574788411458e+01, 9.133704121907552e+01, 4.327038870917426e+01, 3.00659482744005e+01, 1.45771427154541e+01, -1.010804578993056e+01, -2.22162530819575e+00, -1.493826961517334e+01, -3.14622335963779e+00, -1.105205504099528e+01, -2.420061492919922e+01, -3.129014820522732e+01, -2.074265268113878e+01, -2.034115727742513e+01, -1.251049747069677e+00, -5.428790092468262e+00, 1.935586547851562e+01, -2.472935305701362e+00, -8.708166440327963e+00, -3.154962666829427e+01, -1.649618318345811e+01, -2.908337232801649e+01, -7.740287272135417e+01, -4.716984939575195e+01, -8.71272560622957e-01, -4.920173168182373e+00, -3.299212720659044e+00, 7.810577127668592e+00, 2.233832359313965e+01, 2.043405299716526e+01, -4.09643374549018e+00, -3.372264353434245e+01, -2.440811856587728e+01, -3.919314320882162e+01, -4.989997100830078e+01, -5.208262591891818e+01, -4.207945844862196e+01, -3.400799560546875e+01, -5.469485176934136e+01, -5.528272120157877e+01, -3.545762125651041e+01, 1.350952350431018e+00, 2.024232504102919e+01, 3.018589210510254e+01, 2.950673442416721e+01, 2.050291061401367e+01, 7.003209431966146e+00, 8.354317241244846e+00, -3.403549061881173e-02, 2.62248420715332e+00, 2.004964351654053e+00, -1.239853989746836e+00, -7.056220054626465e+00, 4.158818403879801e+00, -1.860559622446696e+00, -2.529087940851848e+00, -2.492471673753526e+01, -3.215255694919162e+01, -3.776266860961914e+01, -4.243975321451823e+01, -4.633209440443251e+01, -4.955343627929688e+01, -5.215934753417969e+01]
+heaSys.Qhea[5]=[2.0045390625e+05, 1.364019538031684e+02, 8.524862501356337e+01, 6.766171264648438e+01, 6.213985527886285e+01, 6.025914637247721e+01, 6.077071380615234e+01, 6.205421193440755e+01, 6.345389090643989e+01, 6.470751190185547e+01, 6.57393552992079e+01, 6.329848395453559e+01, 3.777683258056641e+01, 2.955546718173557e+01, 1.3145096566942e+01, 1.351301765441895e+01, 8.749319871266684e+00, 4.040492375691731e+00, 2.635870695114136e+00, -2.15867805480957e+01, -7.535609086354573e+00, -1.784561729431152e+01, -1.936857838100857e+01, 2.756731907526651e+00, 8.62337589263916e+00, 2.085292773776584e+01, 1.479270161522759e+01, 3.076005554199219e+01, 1.681684642367893e+01, 3.40037464565701e+01, 3.691521453857422e+01, 8.310130055745442e+01, 9.212243567572699e+01, 1.043770446777344e+02, 9.879831271701389e+01, 1.062252426147461e+02, 8.095213317871094e+01, 9.396406809488933e+01, 7.940989939371745e+01, 8.976967620849609e+01, 4.472453816731771e+01, 3.05532726711697e+01, 1.589913527170817e+01, -1.094772020975749e+01, -9.532244205474854e-01, -1.276906108856201e+01, -2.41028078397115e+00, -1.056022251976861e+01, -2.414347966512044e+01, -3.136912684970432e+01, -1.989759996202257e+01, -1.963745625813802e+01, -3.418034182654486e-01, -7.269008901384142e+00, 2.031888389587402e+01, -2.058281395170424e+00, -7.553391138712565e+00, -3.118965784708659e+01, -1.592180177900526e+01, -2.864431550767686e+01, -7.651207224527995e+01, -4.896814600626627e+01, -6.198004881540933e-02, -5.109603404998779e+00, -1.850963817702399e+00, 7.200856102837457e+00, 2.355801264444987e+01, 2.076156383090549e+01, -3.408566210005018e+00, -3.334415562947591e+01, -2.293047438727485e+01, -3.865255694919162e+01, -4.906103134155273e+01, -5.127708138359917e+01, -4.117660480075412e+01, -3.396898396809896e+01, -5.431475999620226e+01, -5.522477467854818e+01, -3.483621470133463e+01, 1.219027259283596e+00, 1.993275875515408e+01, 3.021584510803223e+01, 3.01935183207194e+01, 1.997651502821181e+01, 7.800817012786865e+00, 8.78428151872423e+00, 8.945424424277411e-01, 3.004947741826375e+00, 3.215070300632053e+00, -5.095403095086416e-01, -5.744597434997559e+00, 4.63334255748325e+00, -3.637279828389486e+00, -1.366618871688843e+00, -2.422996923658583e+01, -3.159276538425022e+01, -3.724600982666016e+01, -4.194329494900174e+01, -4.584822633531358e+01, -4.907867813110352e+01, -5.169124221801758e+01]
 validationDataExp2_1.heat_elP_kitchen=[4.370800018310547e+01, 4.370800018310547e+01, 4.370800018310547e+01, 4.370800018310547e+01, 4.370800018310547e+01, 4.370800018310547e+01, 4.370800018310547e+01, 4.370800018310547e+01, 4.370800018310547e+01, 4.370800018310547e+01, 4.370800018310547e+01, 4.30748536851671e+01, 2.357698631286621e+01, 3.49151471455892e+01, 2.295854038662381e+01, 3.016344451904297e+01, 8.640521473354763e+00, 3.762528567843967e+01, 9.199333190917969e+00, 1.08691586388482e+01, 9.070188098483616e+00, 1.417866071065267e+01, 1.309288173251682e+01, 4.721430333455404e+01, 5.576609166463216e+01, 6.948030175103082e+01, 4.811741977267795e+01, 4.83388557434082e+01, 4.977938461303711e+01, 9.51494140625e+01, 7.980215962727864e+01, 1.455292477077908e+02, 1.36216788397895e+02, 1.48116200764974e+02, 1.183390663994683e+02, 1.308742218017578e+02, 7.727607727050781e+01, 1.141591415405273e+02, 7.950001186794705e+01, 1.136279805501302e+02, 2.789022890726725e+01, 2.468911107381185e+01, 9.130758285522461e+00, 1.014786593119303e+01, 8.987577544318306e+00, 1.011874008178711e+01, 9.600711080763075e+00, 1.083830473158095e+01, 1.103384081522624e+01, 1.048080656263563e+01, 1.034659269120958e+01, 9.63508415222168e+00, 9.641070153978136e+00, 9.562919298807779e+00, 9.163629531860352e+00, 9.24546676211887e+00, 9.250538720024956e+00, 9.025562604268393e+00, 9.662209828694662e+00, 9.305656115214029e+00, 8.945598920186361e+00, 2.608942116631402e+01, 3.279232449001736e+01, 1.690785217285156e+01, 9.754097514682346e+00, 9.443766593933105e+00, 9.464008013407389e+00, 9.462370130750868e+00, 9.792805989583334e+00, 9.293229738871256e+00, 1.018501408894857e+01, 9.969227261013454e+00, 9.519166946411133e+00, 9.133048269483778e+00, 9.194419436984592e+00, 9.015382130940756e+00, 9.0603363249037e+00, 8.968790054321289e+00, 2.554316139221191e+01, 5.604595353868272e+01, 6.935555945502387e+01, 8.390549468994141e+01, 5.953146743774414e+01, 4.302049297756619e+01, 2.7591246287028e+01, 2.990230941772461e+01, 2.587283515930176e+01, 3.068875694274902e+01, 2.776528082953559e+01, 1.857013363308377e+01, 1.040583324432373e+01, 1.014178477393256e+01, 4.693637450536093e+00, 1.087430636088053e+01, 1.05959997177124e+01, 1.05959997177124e+01, 1.05959997177124e+01, 1.05959997177124e+01, 1.05959997177124e+01, 1.05959997177124e+01, 1.05959997177124e+01]
-heaSys.Qhea[6]=[2.3091890625e+05, 1.399207933213976e+02, 9.163898468017578e+01, 7.244342803955078e+01, 6.342411083645291e+01, 5.952442465888129e+01, 5.780684153238932e+01, 5.706383853488498e+01, 5.680422761705186e+01, 5.674695205688477e+01, 5.675735304090712e+01, 6.060054482354058e+01, 3.352249272664388e+01, 4.229655498928494e+01, 8.367117881774902e+00, 3.153060833613078e+00, -1.376690589057075e+01, 3.21093930138482e+00, -3.385022735595703e+01, -5.850470648871528e+00, -1.412137201097276e+01, 1.991195619106293e+00, -8.943048901028103e+00, 2.346252918243408e+00, -5.804415096839269e-01, 1.063694127400716e+01, -2.276464017232259e+01, 2.131401443481445e+01, -2.063258955213759e+01, 2.294548246595595e+01, 5.407848834991455e+00, 6.385570526123047e+01, 5.904378339979384e+01, 7.531870778401692e+01, 5.104952409532335e+01, 7.393202633327908e+01, 9.53931999206543e+00, 6.494690619574652e+01, 2.62300362057156e+01, 6.134418741861979e+01, 4.700157854292128e+00, 2.192217530144585e+01, -1.115444469451904e+01, 2.174722380108304e+00, -2.50024782816569e+01, -1.049252390861511e+00, -1.504894298977322e+01, -2.248947646882799e+00, 1.43240483601888e+00, 9.923535850312974e-01, -1.339092244042291e+01, 8.720002969106039e-01, -6.600724856058757e+00, 2.346885850694444e+01, -9.975203514099121e+00, 1.401684994167752e+01, -2.476645130581326e+01, -7.002952575683594e+00, -1.552420001559787e+01, -4.038648075527615e+00, -2.238350550333659e+01, -3.232120768229166e+01, -2.500384733412001e+01, 1.861923599243164e+01, -1.443309285905626e+01, 2.169979858398438e+01, -1.943582153320312e+01, 1.242772515614828e+01, 7.541949801974827e+00, 1.332132943471273e+01, -2.14319576687283e+01, -6.57218689388699e+00, -2.654307556152344e+01, -2.481833606296115e+01, -3.356717046101888e+01, -1.368697675069173e+01, -1.722839758131239e+01, -1.043361706203885e+01, -1.882479413350423e+01, -5.706555949317084e+00, 8.733479923672146e+00, 2.459350204467773e+01, 6.512221230400933e+00, 1.082146167755127e+01, -8.352474689483643e+00, 8.00238593419393e+00, -3.182108985053168e+00, 6.587691783905029e+00, 2.182461685604519e+00, 7.523201200697157e+00, -5.193922519683838e+00, 3.972563690609402e+00, -1.765207163492839e+01, -1.732711664835612e+01, -2.594339476691352e+01, -2.827874120076497e+01, -3.017158762613932e+01, -3.18155083126492e+01, -3.323247570461697e+01, -3.443375396728516e+01, -3.542269134521484e+01]
+heaSys.Qhea[6]=[2.3091890625e+05, 1.402249467637804e+02, 9.219457668728299e+01, 7.318583170572917e+01, 6.431590270996094e+01, 6.042297744750977e+01, 5.880585606892904e+01, 5.809468375311958e+01, 5.784642495049371e+01, 5.779531097412109e+01, 5.781245761447482e+01, 6.166431427001953e+01, 3.449118169148763e+01, 4.2172730339898e+01, 9.791277037726509e+00, 4.288185278574626e+00, -1.29819770389133e+01, 4.035034126705593e+00, -3.306200790405273e+01, -5.195898426903619e+00, -1.340848520067003e+01, 3.202982664108276e+00, -8.004697031444973e+00, 3.336689578162299e+00, 5.696439345677694e-01, 1.188611178927951e+01, -2.14845150841607e+01, 2.256608200073242e+01, -1.9466736263699e+01, 2.425006739298503e+01, 4.80031140645345e+00, 6.478941429985895e+01, 5.978788884480795e+01, 7.675067901611328e+01, 5.206309170193143e+01, 7.476651848687067e+01, 1.00652437210083e+01, 6.567342291937933e+01, 2.681838035583496e+01, 6.663740793863933e+01, 5.213682254155477e+00, 2.254743978712294e+01, -1.072332509358724e+01, 2.60037808948093e+00, -2.45341739654541e+01, -6.309471130371094e-01, -1.450542736053467e+01, -1.741575638453166e+00, 2.099579493204752e+00, 1.925197694036696e+00, -1.247616015540229e+01, 1.804832220077515e+00, -5.849349710676405e+00, 2.436950492858887e+01, -9.246715545654297e+00, 1.47427888446384e+01, -2.400204001532661e+01, -6.09037987391154e+00, -1.484020678202311e+01, -3.245204422208998e+00, -2.16130911509196e+01, -3.333140733506944e+01, -2.40648381974962e+01, 1.954190826416016e+01, -1.357369878556993e+01, 2.20094977484809e+01, -1.881995709737142e+01, 1.30908842086792e+01, 8.227835443284777e+00, 1.429388523101807e+01, -2.044640329149034e+01, -5.727945221794976e+00, -2.570242309570312e+01, -2.403757180107964e+01, -3.299963887532552e+01, -1.311793931325277e+01, -1.651490932040744e+01, -9.751747979058159e+00, -1.805895487467448e+01, -4.426923274993896e+00, 1.048932647705078e+01, 2.538764572143555e+01, 7.415876706441244e+00, 1.166019153594971e+01, -7.431552410125732e+00, 8.965262518988716e+00, -2.200329091813829e+00, 7.562410195668538e+00, 3.156703339682685e+00, 8.511176109313965e+00, -4.31850004196167e+00, 4.716959688398573e+00, -1.724300999111599e+01, -1.67980047861735e+01, -2.55588813357883e+01, -2.793421321445041e+01, -2.984008280436198e+01, -3.148960389031304e+01, -3.29095458984375e+01, -3.411270141601562e+01, -3.510288619995117e+01]
 validationDataExp2_1.heat_elP_doorway=[6.414999961853027e-01, 6.414999961853027e-01, 6.414999961853027e-01, 6.414999961853027e-01, 6.414999961853027e-01, 6.414999961853027e-01, 6.414999961853027e-01, 6.414999961853027e-01, 6.414999961853027e-01, 6.414999961853027e-01, 6.414999961853027e-01, 5.650432176060147e-01, 8.282098770141602e-01, 8.08819956249661e-01, 7.660884790950351e-01, 8.568271597226461e-01, 9.240817957454257e-01, 8.400915662447611e-01, 9.744444489479065e-01, 7.909835444556342e-01, 9.052571853001913e-01, 8.148858149846395e-01, 7.976172632641263e-01, 8.976810773213705e-01, 8.531566262245178e-01, 7.182072639465332e+00, 9.014423688252767e-01, 4.24285364151001e+00, 8.37623659769694e+00, 3.510874472724067e+01, 3.071772575378418e+01, 7.037856547037761e+01, 7.578727637396918e+01, 7.843080647786458e+01, 6.35137693617079e+01, 7.1958251953125e+01, 2.975913047790527e+01, 5.920235061645508e+01, 2.966947216457791e+01, 5.679577509562174e+01, 4.382358868916829e+00, 8.193950586848788e-01, 9.522438247998556e-01, 8.364362120628357e-01, 9.119510253270467e-01, 9.446666836738586e-01, 8.184567822350396e-01, 9.071687195036147e-01, 8.086049556732178e-01, 8.690946565734016e-01, 8.705658316612244e-01, 7.686010996500651e-01, 8.418508238262601e-01, 7.74209115240309e-01, 9.523518681526184e-01, 9.073981444040935e-01, 6.614989505873786e-01, 1.01871915658315e+00, 7.531286146905687e-01, 6.715781754917569e-01, 9.388333360354105e-01, 9.294506112734476e-01, 7.298529015647041e-01, 7.413703799247742e-01, 7.812983459896512e-01, 7.836378481653001e-01, 8.382253249486288e-01, 6.904660330878364e-01, 8.472098774380155e-01, 9.567993879318237e-01, 7.720781829622057e-01, 8.519475195142958e-01, 1.04709255695343e+00, 9.962363772922092e-01, 8.160596622361077e-01, 9.883580009142557e-01, 9.476440217759874e-01, 9.214938349193997e-01, 9.436890482902527e-01, 9.648436440361871e-01, 4.065895001093547e+00, 2.724170303344727e+01, 7.943986892700195e+00, 2.933283938301934e+00, 8.922353386878967e-01, 8.653168545828925e-01, 8.910473121537102e-01, 8.824506004651388e-01, 8.888827363650004e-01, 8.310301105181376e-01, 8.084259033203125e-01, 7.964809669388665e-01, 8.667654262648689e-01, 8.034321268399557e-01, 8.514999747276306e-01, 8.514999747276306e-01, 8.514999747276306e-01, 8.514999747276306e-01, 8.514999747276306e-01, 8.514999747276306e-01, 8.514999747276306e-01]
-heaSys.Qhea[7]=[3.11344e+05, 2.1723560418023e+02, 1.297968037923177e+02, 1.023432896931966e+02, 9.38748779296875e+01, 9.110966406928168e+01, 9.060289255777995e+01, 9.094681972927518e+01, 9.15474116007487e+01, 9.212197113037109e+01, 9.257824198404948e+01, 8.64207500881619e+01, 5.465764236450195e+01, 4.596513324313693e+01, 2.438049528333876e+01, 2.405867385864258e+01, 8.879886521233452e+00, 2.040995364718967e+01, -5.634077787399292e-01, 5.641451994578044e+00, 3.951667149861654e+00, 1.403718058268229e+01, 1.01006015141805e+00, 1.14824890560574e+01, 5.164686679840088e+00, 1.12060981326633e+01, 3.490413453843859e+00, 1.427955341339111e+01, -1.853929498460558e+01, -1.170586119757758e+01, -1.210022672017415e+01, 5.004343838161893e+01, 8.789058515760634e+01, 1.111738688151042e+02, 1.109331614176432e+02, 1.207155939737956e+02, 9.722489929199219e+01, 1.083771336873372e+02, 9.25044191148546e+01, 1.051528956095378e+02, 2.931776873270671e+01, 3.458162053426107e+01, -5.040771166483561e+00, 6.246453762054443e+00, -2.330364714728461e+01, -2.971048951148987e-01, -8.031779289245605e+00, 2.058937417136298e+00, 8.722671826680502e+00, 4.23731713824802e+00, 2.819249047173394e+00, 5.593973477681478e+00, 1.22087246576945e+01, 2.131742901272244e+01, -9.812334060668945e+00, 2.015826357735528e+00, -2.55845218234592e+01, -1.488045183817546e+01, -3.333061138788859e+00, -7.422927008734809e+00, -1.56436513264974e+01, -1.355903328789605e+01, 1.19715690612793e+01, 2.563585472106934e+01, -6.348245143890381e+00, 6.366587426927355e+00, -3.088146273295085e+01, -1.317883533901638e+01, -1.621899731953939e+01, -9.126454671223959e+00, -3.13927313486735e+01, -2.297863303290473e+01, -3.294974899291992e+01, -2.665652847290039e+01, -2.138564427693685e+01, -3.642082691192627e+00, -7.578138616349962e+00, -2.365036673016018e+00, -3.114238103230794e+00, 4.947657532162136e+00, 1.301889673868815e+01, 6.155433177947998e+00, 2.309403377109104e+01, 2.339616245693631e+01, 1.109897836049398e+01, 1.102412234412299e+01, 6.714173158009847e+00, 1.187397384643555e+01, 1.0457229508294e+01, 2.144670973883735e+01, 6.546448707580566e+00, 1.16296755472819e+01, -1.69078303443061e+01, -1.453480974833171e+01, -3.358685217963325e+01, -4.407047907511393e+01, -5.154913457234701e+01, -5.732255638970269e+01, -6.183570861816406e+01, -6.541973114013672e+01, -6.822583770751953e+01]
+heaSys.Qhea[7]=[3.11344e+05, 2.16374018351237e+02, 1.294374610053168e+02, 1.021472040812175e+02, 9.375118340386285e+01, 9.122886827256944e+01, 9.086907450358073e+01, 9.12736061943902e+01, 9.18744608561198e+01, 9.242238616943359e+01, 9.28634516398112e+01, 8.680466800265842e+01, 5.571304321289062e+01, 4.611671786838107e+01, 2.557039027743869e+01, 2.474259122212728e+01, 9.974647310045031e+00, 1.987585406833225e+01, 8.493888974189758e-01, 7.710391945309109e+00, 5.008631653255886e+00, 1.4795760790507e+01, 1.771010385619269e+00, 1.139831839667426e+01, 5.733339309692383e+00, 1.15698373582628e+01, 4.414486779106988e+00, 1.414730262756348e+01, -1.699271032545302e+01, -1.13013522889879e+01, -1.079999701182047e+01, 5.003396055433485e+01, 8.835552385118272e+01, 1.115489679972331e+02, 1.108253021240234e+02, 1.200022218492296e+02, 9.833547210693359e+01, 1.079402008056641e+02, 9.305074395073785e+01, 1.0180113474528e+02, 3.084620751274957e+01, 3.402289115058051e+01, -3.659959236780802e+00, 5.822951740688747e+00, -2.199598693847656e+01, 1.529494285583496e+00, -7.229783323076036e+00, 2.023903078503079e+00, 8.549614906311035e+00, 5.659709294637044e+00, 3.590543720457289e+00, 6.093217372894287e+00, 1.298808034261068e+01, 2.092133649190267e+01, -8.807453155517578e+00, 1.947335958480835e+00, -2.422104750739204e+01, -1.478789615631104e+01, -2.811546829011705e+00, -7.135310649871826e+00, -1.529754225413004e+01, -1.175824896494547e+01, 1.266740417480469e+01, 2.500150680541992e+01, -5.200747860802545e+00, 5.706982983483209e+00, -2.908628336588542e+01, -1.325744099087185e+01, -1.575769869486491e+01, -9.089825789133707e+00, -3.00045534769694e+01, -2.324127875434028e+01, -3.203476333618164e+01, -2.614553705851237e+01, -2.033762974209256e+01, -3.711619297663371e+00, -7.271406915452745e+00, -2.423759566413032e+00, -2.633276621500651e+00, 4.724334981706408e+00, 1.309883700476752e+01, 6.614211082458496e+00, 2.348759905497233e+01, 2.348001204596626e+01, 1.179974238077799e+01, 1.134766578674316e+01, 7.486791451772054e+00, 1.207218805948893e+01, 1.111125416225857e+01, 2.201158989800347e+01, 7.646099090576172e+00, 1.168625322977702e+01, -1.73090222676595e+01, -1.384361680348714e+01, -3.303800921969943e+01, -4.359200244479709e+01, -5.110560862223307e+01, -5.689907116360135e+01, -6.142504458957248e+01, -6.50181884765625e+01, -6.783091735839844e+01]
 validationDataExp2_1.heat_elP_parents_room=[1.183055877685547e+01, 1.183055877685547e+01, 1.183055877685547e+01, 1.183055877685547e+01, 1.183055877685547e+01, 1.183055877685547e+01, 1.183055877685547e+01, 1.183055877685547e+01, 1.183055877685547e+01, 1.183055877685547e+01, 1.183055877685547e+01, 1.199909104241265e+01, 1.155797799428304e+01, 1.160574934217665e+01, 1.069912719726562e+01, 1.07635285059611e+01, 9.909903420342339e+00, 1.080287806193034e+01, 1.100877952575684e+01, 1.084261565738254e+01, 1.080412112341987e+01, 1.086983839670817e+01, 1.043138270907932e+01, 1.095919068654378e+01, 9.908881823221842e+00, 1.100146208869086e+01, 1.052982393900553e+01, 1.10616340637207e+01, 1.133266311221653e+01, 1.123413202497694e+01, 1.118651135762533e+01, 5.484067747328017e+01, 8.486455196804471e+01, 9.157468922932942e+01, 9.528991275363498e+01, 9.486553531222873e+01, 7.977210998535156e+01, 8.221834988064236e+01, 7.386472829182942e+01, 7.235190327962239e+01, 1.062839783562554e+01, 1.138216718037923e+01, 1.09264129002889e+01, 1.105208290947808e+01, 1.045154370201958e+01, 1.098244476318359e+01, 1.097883563571506e+01, 1.142696645524767e+01, 1.139182504018148e+01, 1.145057815975613e+01, 1.113856580522325e+01, 1.116574796040853e+01, 1.104973432752821e+01, 1.095881652832031e+01, 1.05063304901123e+01, 1.089411301083035e+01, 1.100621149275038e+01, 1.06432212193807e+01, 1.106984784868028e+01, 1.068591658274333e+01, 1.043288962046305e+01, 1.072830020056831e+01, 1.127821424272325e+01, 1.092591381072998e+01, 1.148214011722141e+01, 1.092739444308811e+01, 1.106068197886149e+01, 1.091174740261502e+01, 1.103968567318386e+01, 1.090537039438883e+01, 1.129528427124023e+01, 1.099123912387424e+01, 1.081146621704102e+01, 1.069284937116835e+01, 1.084424538082547e+01, 1.048707516988119e+01, 1.058480177985297e+01, 1.063234000735813e+01, 1.089437294006348e+01, 1.083514902326796e+01, 1.121938663058811e+01, 1.111963367462158e+01, 1.099581294589573e+01, 1.141470336914062e+01, 1.102562300364176e+01, 1.128112443288167e+01, 1.022117763095432e+01, 1.107497755686442e+01, 1.066702810923258e+01, 1.136785538991292e+01, 1.111101055145264e+01, 1.137602053748237e+01, 4.916111495759752e+00, 1.166111246744792e+01, 1.130653953552246e+01, 1.130653953552246e+01, 1.130653953552246e+01, 1.130653953552246e+01, 1.130653953552246e+01, 1.130653953552246e+01, 1.130653953552246e+01]
-heaSys.Qhea[2]=[6.591521875e+05, 2.256715274386936e+02, 1.261126251220703e+02, 9.427349090576172e+01, 8.209045918782552e+01, 7.689627075195312e+01, 7.447009785970052e+01, 7.321359168158637e+01, 7.247420077853732e+01, 7.197920227050781e+01, 7.161118740505643e+01, 3.730102098253038e+02, 1.428255564371745e+02, 1.24606554667155e+02, 8.99976077609592e+01, 9.943264770507812e+01, 5.995677651299371e+01, 8.169460805257161e+01, 4.667710113525391e+01, 7.793347930908203e+01, 6.613536071777344e+01, 8.729090372721355e+01, 6.20402094523112e+01, 9.241956583658855e+01, 8.29873784383138e+01, 9.562571801079645e+01, 5.422109222412109e+01, 9.147937774658203e+01, 3.071730444166396e+01, -9.453347015380859e+01, -4.692352930704752e+01, -8.32539325290256e+01, -3.856067276000977e+01, -4.52397600809733e+01, -1.106273916032579e+01, -2.23757201300727e+01, 3.002255821228027e+01, -1.797408697340224e+01, 1.164039961496989e+01, -1.83430913289388e+01, 4.696407301161024e+02, 1.648219146728516e+02, 8.726610819498698e+01, 8.989117855495877e+01, 5.634602906968858e+01, 7.60318603515625e+01, 5.459089914957682e+01, 7.591356235080295e+01, 7.232904561360677e+01, 8.960475497775607e+01, 8.134061177571614e+01, 9.282461039225261e+01, 2.900811326768663e+02, 2.164176093207465e+02, 1.300360260009766e+02, 5.142567242516409e+01, 2.451951904296875e+02, -7.726351420084636e+01, 2.309332343207465e+02, 1.788023410373264e+02, -9.936759440104167e+01, -8.734573109944661e+01, 2.792491115993923e+02, 2.276315612792969e+02, 3.373079223632812e+02, 1.979251658121745e+02, 3.093271687825521e+02, 1.921018337673611e+02, 1.88040286593967e+02, -5.047939236958821e+01, 2.456510365804037e+02, -7.776144748263889e+01, -6.999501800537109e+01, -6.546957906087239e+01, -1.872787666320801e+01, -3.089835103352864e+01, -4.036783854166666e+01, -4.454031117757162e+01, -9.060677210489908e+00, -3.092839707268609e+01, -1.46280148824056e+01, -4.421035766601562e+01, 2.407943437364366e+02, 1.621630028618707e+02, 8.606162007649739e+01, 1.064664993286133e+02, 9.259502241346571e+01, 9.253733825683594e+01, 8.723560163709853e+01, 9.877169715033637e+01, 5.577644348144531e+01, 8.863645595974393e+01, 6.726807827419705e+01, 7.10677490234375e+01, 8.020479498969183e+01, 8.451447041829427e+01, 8.662576548258464e+01, 8.754746924506293e+01, 8.790831078423395e+01, 8.804206085205078e+01, 8.807267761230469e+01]
+heaSys.Qhea[2]=[6.591521875e+05, 2.262708875868055e+02, 1.271004214816623e+02, 9.549060567220052e+01, 8.345759921603732e+01, 7.835846032036676e+01, 7.599104309082031e+01, 7.476743486192491e+01, 7.404611290825738e+01, 7.356333923339844e+01, 7.32046390109592e+01, 3.751209072536892e+02, 1.44155756632487e+02, 1.255697538587782e+02, 9.15751215616862e+01, 1.00967030843099e+02, 6.060410987006293e+01, 8.240474277072482e+01, 4.749193572998047e+01, 7.771341111924913e+01, 6.721692233615451e+01, 9.007338205973308e+01, 6.336730278862847e+01, 9.368328942192926e+01, 8.466015370686848e+01, 9.748788028293185e+01, 5.552358839246962e+01, 9.32041015625e+01, 3.167320293850369e+01, -9.08284200032552e+01, -4.543312199910482e+01, -8.172647009955512e+01, -3.723870383368598e+01, -4.369055557250977e+01, -9.969465573628744e+00, -2.130764346652561e+01, 3.13165397644043e+01, -1.724339527553982e+01, 1.249822489420573e+01, -1.8128173828125e+01, 4.698286709255642e+02, 1.655499131944445e+02, 8.728509775797527e+01, 9.011755879720052e+01, 5.646767298380534e+01, 7.357673645019531e+01, 5.535201729668511e+01, 7.656017218695746e+01, 7.369297790527344e+01, 9.139682769775391e+01, 8.286902364095052e+01, 9.419355010986328e+01, 2.915391574435764e+02, 2.17486314561632e+02, 1.307101745605469e+02, 5.052964772118463e+01, 2.463028971354167e+02, -7.762631479899089e+01, 2.318413628472222e+02, 1.798910268147787e+02, -9.777687581380208e+01, -8.686486901177301e+01, 2.807844645182292e+02, 2.291353454589844e+02, 3.386288248697917e+02, 1.962375098334418e+02, 3.100324198404948e+02, 1.925152367485894e+02, 1.893498111300998e+02, -4.909912101427715e+01, 2.472257351345486e+02, -7.675602383083768e+01, -6.877024078369141e+01, -6.450285254584418e+01, -1.846701494852702e+01, -3.027469253540039e+01, -3.947982618543837e+01, -4.360552427503798e+01, -8.10793431599935e+00, -2.99450143178304e+01, -1.393563768598768e+01, -4.298624420166016e+01, 2.421008131239149e+02, 1.62968492296007e+02, 8.72418924967448e+01, 1.077174979315864e+02, 9.410280354817708e+01, 9.385956573486328e+01, 8.802163441975911e+01, 1.001346198187934e+02, 5.716365432739258e+01, 8.939596811930339e+01, 6.756306627061632e+01, 7.135120900472005e+01, 8.067723168267145e+01, 8.505709330240886e+01, 8.719022623697917e+01, 8.811779106987848e+01, 8.847960747612848e+01, 8.861324310302734e+01, 8.864359283447266e+01]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_TwinHouses_BuildingO5_Exp1.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_TwinHouses_BuildingO5_Exp1.txt
index d883665680..763d3d685a 100644
--- a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_TwinHouses_BuildingO5_Exp1.txt
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_TwinHouses_BuildingO5_Exp1.txt
@@ -1,4 +1,4 @@
-last-generated=2022-07-20
+last-generated=2023-10-23
 statistics-initialization=
 {
   "nonlinear": "17, 10, 8, 11, 10, 8, 11",
@@ -12,27 +12,27 @@ statistics-simulation=
   "numerical Jacobians": "0"
 }
 time=[1.5e+07, 2.35872e+07]
-struct.TSensor[1]=[2.931499938964844e+02, 3.018595576985677e+02, 3.031354927571614e+02, 3.031372985839844e+02, 3.031378678385417e+02, 3.031381225585938e+02, 3.031382751464844e+02, 3.031383666992188e+02, 3.031384582519531e+02, 3.031384887695312e+02, 3.031385192871094e+02, 3.031385498046875e+02, 3.031385803222656e+02, 3.031385803222656e+02, 3.031385803222656e+02, 3.031386108398438e+02, 3.031386108398438e+02, 3.031386108398438e+02, 3.031386108398438e+02, 3.031386108398438e+02, 3.031386108398438e+02, 3.031386108398438e+02, 3.031386108398438e+02, 3.031386108398438e+02, 3.031386108398438e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031373083496094e+02, 3.031376159667969e+02, 3.031387524414063e+02, 3.031392211914062e+02, 3.031407556533813e+02, 3.031385135904948e+02, 3.031391337076823e+02, 3.031397790527344e+02, 3.031376106770833e+02, 2.998556852213542e+02, 3.015915979003906e+02, 3.004869812011719e+02, 2.990375158691406e+02, 2.975214819335937e+02, 2.987733561197917e+02, 3.002016121419271e+02, 3.008837280273438e+02, 3.017815270996094e+02, 3.010991902669271e+02, 2.998141711425781e+02, 2.983167883300781e+02, 2.961165323893229e+02, 2.958326489257813e+02, 2.942365140787761e+02, 2.98105215250651e+02, 2.981411828613281e+02, 2.981422993977865e+02, 2.98140380859375e+02, 2.981405944824219e+02, 2.98141376546224e+02, 2.959703336588541e+02, 2.941819946289062e+02, 2.934162821451823e+02, 2.934554720052083e+02, 2.9402712890625e+02, 2.948896594238281e+02, 2.95957334391276e+02, 2.938148474121094e+02, 2.925233194986979e+02, 2.916787219238281e+02, 2.9060607421875e+02, 2.896365966796875e+02]
+struct.TSensor[1]=[2.931499938964844e+02, 3.018676753743489e+02, 3.031354927571614e+02, 3.031373059082031e+02, 3.031378784179688e+02, 3.031381225585938e+02, 3.031382751464844e+02, 3.031383666992188e+02, 3.031384582519531e+02, 3.031384887695312e+02, 3.031385192871094e+02, 3.031385498046875e+02, 3.031385803222656e+02, 3.031385803222656e+02, 3.031385803222656e+02, 3.031386108398438e+02, 3.031386108398438e+02, 3.031386108398438e+02, 3.031386108398438e+02, 3.031386108398438e+02, 3.031386108398438e+02, 3.031386108398438e+02, 3.031386108398438e+02, 3.031386108398438e+02, 3.031386108398438e+02, 3.031386108398438e+02, 3.031386108398438e+02, 3.031386108398438e+02, 3.031386108398438e+02, 3.031386108398438e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031386413574219e+02, 3.031373388671875e+02, 3.031376708984375e+02, 3.031388134765625e+02, 3.031392517089844e+02, 3.031407775878906e+02, 3.031385579427084e+02, 3.031391377766927e+02, 3.031397790527344e+02, 3.031376411946615e+02, 2.998471606445312e+02, 3.0159873046875e+02, 3.004847676595052e+02, 2.990374841308594e+02, 2.97508134765625e+02, 2.987834366861979e+02, 3.002156490071615e+02, 3.009014892578125e+02, 3.01797021891276e+02, 3.011084830729167e+02, 2.998207092285156e+02, 2.983223368326823e+02, 2.961125935872396e+02, 2.958298278808594e+02, 2.942220837402344e+02, 2.980970198567708e+02, 2.981411828613281e+02, 2.981423299153646e+02, 2.981404113769531e+02, 2.98140625e+02, 2.981413956705729e+02, 2.959508113606771e+02, 2.941646667480469e+02, 2.934101314290365e+02, 2.934518082682292e+02, 2.9403392578125e+02, 2.948999381510417e+02, 2.959667439778646e+02, 2.9381111328125e+02, 2.925160457356771e+02, 2.916703759765625e+02, 2.905959448242187e+02, 2.896227722167969e+02]
 heaSys.heaSche.TdegC[1].y=[3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031255187988281e+02, 3.031705769856771e+02, 3.031395751953125e+02, 3.031938264973958e+02, 3.031598605796939e+02, 3.031543788909912e+02, 3.031609448242187e+02, 3.03137978108724e+02, 3.031456652832031e+02, 3.031357604980469e+02, 3.007823779296875e+02, 3.014443786621094e+02, 3.001624389648438e+02, 2.983042167154948e+02, 2.968552954101563e+02, 2.980836071777344e+02, 2.996503649902344e+02, 3.003038024902344e+02, 3.010514204915365e+02, 3.007983056640625e+02, 2.994410620117188e+02, 2.973098046875e+02, 2.950185648600261e+02, 2.948921313476562e+02, 2.933681193033854e+02, 2.973613505045573e+02, 2.98151396484375e+02, 2.981584777832031e+02, 2.981616479492188e+02, 2.981546313476563e+02, 2.981465974934896e+02, 2.962956502278646e+02, 2.937534912109375e+02, 2.932260144042968e+02, 2.932722538248698e+02, 2.938831774902344e+02, 2.946370190429687e+02, 2.954608215332031e+02, 2.932236389160156e+02, 2.920767065429687e+02, 2.913681921386719e+02, 2.902578161621093e+02, 2.893561401367188e+02]
-struct.TSensor[2]=[2.931499938964844e+02, 3.019554178873698e+02, 3.028810038248698e+02, 3.029831799316406e+02, 3.03010536702474e+02, 3.030199015299479e+02, 3.03024443359375e+02, 3.030274015299479e+02, 3.030296114095052e+02, 3.030313110351562e+02, 3.030326538085938e+02, 3.030337219238281e+02, 3.030345751953125e+02, 3.030352172851562e+02, 3.030357600911458e+02, 3.030361633300781e+02, 3.030364990234375e+02, 3.030367439778646e+02, 3.030369567871094e+02, 3.030371354166667e+02, 3.030372619628906e+02, 3.03037353515625e+02, 3.030374450683594e+02, 3.030375061035156e+02, 3.030375366210938e+02, 3.0303759765625e+02, 3.030376281738281e+02, 3.030376586914062e+02, 3.030376586914062e+02, 3.030376892089844e+02, 3.030376892089844e+02, 3.030376892089844e+02, 3.030377197265625e+02, 3.030377197265625e+02, 3.030377197265625e+02, 3.030377197265625e+02, 3.030377197265625e+02, 3.030377197265625e+02, 3.030377197265625e+02, 3.030377197265625e+02, 3.030377197265625e+02, 3.030377197265625e+02, 3.030377502441406e+02, 3.030377502441406e+02, 3.030377502441406e+02, 3.030377502441406e+02, 3.030377502441406e+02, 3.030377502441406e+02, 3.030377502441406e+02, 3.030377502441406e+02, 3.030377502441406e+02, 3.030377502441406e+02, 3.030377502441406e+02, 3.030377502441406e+02, 3.030377502441406e+02, 3.030377502441406e+02, 3.030377502441406e+02, 3.030377502441406e+02, 3.030377502441406e+02, 3.030372973632813e+02, 3.030571838378906e+02, 3.030668774414062e+02, 3.03057779781154e+02, 3.030628576278687e+02, 3.030440120442709e+02, 3.030449768066406e+02, 3.030408374023438e+02, 3.03037949625651e+02, 3.008556652832031e+02, 3.01713681640625e+02, 3.009990743001302e+02, 2.994807267252604e+02, 2.982087670898438e+02, 2.988541467285156e+02, 2.999296655273437e+02, 3.006124267578125e+02, 3.013698840332031e+02, 3.012806860351562e+02, 3.002849194335938e+02, 2.989683817545573e+02, 2.970359008789063e+02, 2.966145471191406e+02, 2.950240763346354e+02, 2.975960319010417e+02, 2.979639099121094e+02, 2.98039609781901e+02, 2.980564880371094e+02, 2.980691577148438e+02, 2.980624926757812e+02, 2.966687605794271e+02, 2.949053771972656e+02, 2.941134985351562e+02, 2.939980513509115e+02, 2.943502172851562e+02, 2.950504508463542e+02, 2.958258728027344e+02, 2.942503051757812e+02, 2.930442248535156e+02, 2.921995780436198e+02, 2.911976782226562e+02, 2.902199401855469e+02]
+struct.TSensor[2]=[2.931499938964844e+02, 3.019574678548177e+02, 3.028788370768229e+02, 3.029797009277344e+02, 3.03006386311849e+02, 3.030154154459635e+02, 3.030197900390625e+02, 3.030226407877604e+02, 3.030247497558594e+02, 3.030263891601563e+02, 3.030276794433594e+02, 3.030287032063802e+02, 3.030295104980469e+02, 3.030301513671875e+02, 3.030306396484375e+02, 3.030310363769531e+02, 3.030313720703125e+02, 3.030316162109375e+02, 3.030317993164062e+02, 3.030319519042969e+02, 3.030320739746094e+02, 3.030321960449219e+02, 3.030322570800781e+02, 3.030323181152344e+02, 3.030323791503906e+02, 3.030324096679688e+02, 3.030324401855469e+02, 3.03032470703125e+02, 3.03032470703125e+02, 3.030325012207031e+02, 3.030325012207031e+02, 3.030325012207031e+02, 3.030325317382812e+02, 3.030325317382812e+02, 3.030325317382812e+02, 3.030325317382812e+02, 3.030325317382812e+02, 3.030325317382812e+02, 3.030325317382812e+02, 3.030325317382812e+02, 3.030325317382812e+02, 3.030325317382812e+02, 3.030325317382812e+02, 3.030325317382812e+02, 3.030325317382812e+02, 3.030325317382812e+02, 3.030325317382812e+02, 3.030325317382812e+02, 3.030325317382812e+02, 3.030325317382812e+02, 3.030325317382812e+02, 3.030325317382812e+02, 3.030325317382812e+02, 3.030325317382812e+02, 3.030325317382812e+02, 3.030325317382812e+02, 3.030325317382812e+02, 3.030325317382812e+02, 3.030325317382812e+02, 3.030320483398438e+02, 3.030527648925781e+02, 3.0306291015625e+02, 3.030543127841637e+02, 3.030594310760498e+02, 3.030398311360677e+02, 3.030407653808594e+02, 3.030368395996094e+02, 3.030340645345052e+02, 3.008476236979167e+02, 3.017122290039063e+02, 3.009933451334635e+02, 2.994754260253906e+02, 2.981938269042969e+02, 2.988525956217448e+02, 2.999349975585938e+02, 3.00621337890625e+02, 3.013786006673177e+02, 3.012854703776042e+02, 3.002887927246094e+02, 2.98969921875e+02, 2.970297627766927e+02, 2.966085668945312e+02, 2.95008759765625e+02, 2.975891593424479e+02, 2.979616296386719e+02, 2.980374430338542e+02, 2.980535278320312e+02, 2.980651599121094e+02, 2.980587084960937e+02, 2.966531901041666e+02, 2.948863525390625e+02, 2.941025565592448e+02, 2.939892631022136e+02, 2.943480102539062e+02, 2.950512369791667e+02, 2.95826708984375e+02, 2.942444250488281e+02, 2.93035078125e+02, 2.921888366699219e+02, 2.911850158691406e+02, 2.902037963867188e+02]
 heaSys.heaSche.TdegC[2].y=[3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031163024902344e+02, 3.031803210449219e+02, 3.032077575683594e+02, 3.032363818359375e+02, 3.032310996133773e+02, 3.032312259674072e+02, 3.032264994303385e+02, 3.031983357747396e+02, 3.032075036621094e+02, 3.032203633626302e+02, 3.014236979166666e+02, 3.013085778808594e+02, 3.005885030110677e+02, 2.986348555501302e+02, 2.975138464355469e+02, 2.980783211263021e+02, 2.992659684244792e+02, 2.998769226074219e+02, 3.006252856445312e+02, 3.006422420247396e+02, 2.995704174804687e+02, 2.980027909342448e+02, 2.959541849772135e+02, 2.957011962890625e+02, 2.940158756510417e+02, 2.972161079915364e+02, 2.981064318847656e+02, 2.981441833496094e+02, 2.981962902832031e+02, 2.981940307617188e+02, 2.981711124674479e+02, 2.969734313964844e+02, 2.94578515625e+02, 2.939648718261719e+02, 2.939077840169271e+02, 2.941530603027344e+02, 2.946839042154948e+02, 2.953250752766927e+02, 2.937352990722656e+02, 2.926123612467448e+02, 2.919104903157552e+02, 2.908899768066406e+02, 2.899605102539062e+02]
-struct.TSensor[3]=[2.931499938964844e+02, 3.031437093098958e+02, 3.03147705078125e+02, 3.031481323242188e+02, 3.031482543945312e+02, 3.031483154296875e+02, 3.031483459472656e+02, 3.031483764648438e+02, 3.031484069824219e+02, 3.031484069824219e+02, 3.031484069824219e+02, 3.031484236653646e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484305826823e+02, 3.031487182617187e+02, 3.03148779703776e+02, 3.031487731933594e+02, 3.031489868164062e+02, 3.031486649576823e+02, 3.031487121582031e+02, 3.031487121582031e+02, 3.031485595703125e+02, 3.012267960611979e+02, 3.014957641601562e+02, 3.00954482014974e+02, 2.994175036621094e+02, 2.9838818359375e+02, 2.986591959635417e+02, 2.996075569661458e+02, 3.002593383789062e+02, 3.009735331217448e+02, 3.010606660970052e+02, 3.002429699707031e+02, 2.989812622070312e+02, 2.972915181477865e+02, 2.968493200683594e+02, 2.952467789713542e+02, 2.981457377115885e+02, 2.981486206054688e+02, 2.981489562988281e+02, 2.981488647460938e+02, 2.9814892578125e+02, 2.981488952636719e+02, 2.969006656901042e+02, 2.951252746582031e+02, 2.942741394042969e+02, 2.941039912923177e+02, 2.941923315429688e+02, 2.948572497558594e+02, 2.955849975585937e+02, 2.9425640625e+02, 2.931618998209635e+02, 2.923449475097656e+02, 2.913809411621094e+02, 2.9040966796875e+02]
+struct.TSensor[3]=[2.931499938964844e+02, 3.031437272135417e+02, 3.03147705078125e+02, 3.031481091308594e+02, 3.031482543945312e+02, 3.031483154296875e+02, 3.031483459472656e+02, 3.031483764648438e+02, 3.031483764648438e+02, 3.031484069824219e+02, 3.031484069824219e+02, 3.031484069824219e+02, 3.031484069824219e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484375e+02, 3.031484305826823e+02, 3.031487182617187e+02, 3.03148779703776e+02, 3.031487731933594e+02, 3.031489868164062e+02, 3.031486649576823e+02, 3.031487121582031e+02, 3.031487121582031e+02, 3.031485595703125e+02, 3.01224091796875e+02, 3.014971789550781e+02, 3.009515563964844e+02, 2.99415439046224e+02, 2.983757385253906e+02, 2.986585961914063e+02, 2.99612802734375e+02, 3.002680358886719e+02, 3.009819519042969e+02, 3.010666475423177e+02, 3.002505541992188e+02, 2.989857661946614e+02, 2.972875142415365e+02, 2.968454455566406e+02, 2.952338557942708e+02, 2.981457071940104e+02, 2.981486206054688e+02, 2.981489562988281e+02, 2.981488647460938e+02, 2.9814892578125e+02, 2.981488952636719e+02, 2.968913643391927e+02, 2.951087158203125e+02, 2.942659065755208e+02, 2.940968839518229e+02, 2.941902770996094e+02, 2.948584057617188e+02, 2.955839579264323e+02, 2.94251806640625e+02, 2.931541263834636e+02, 2.923355338541667e+02, 2.913696472167969e+02, 2.903946533203125e+02]
 heaSys.heaSche.TdegC[3].y=[3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.031421203613281e+02, 3.032592749023437e+02, 3.033442504882813e+02, 3.032078792317708e+02, 3.031651496261847e+02, 3.031524362564087e+02, 3.031524385579427e+02, 3.031448465983073e+02, 3.031422509765625e+02, 3.031504573567709e+02, 3.011473128255208e+02, 3.009273498535156e+02, 3.003576700846354e+02, 2.983823030598958e+02, 2.973246032714844e+02, 2.977948706054688e+02, 2.989049833170573e+02, 2.99496826171875e+02, 3.001808475748698e+02, 3.003032014973958e+02, 2.993244958496094e+02, 2.977371752929687e+02, 2.957421468098958e+02, 2.955331335449219e+02, 2.93830498453776e+02, 2.978957291666667e+02, 2.981524353027344e+02, 2.98150244140625e+02, 2.981564530436198e+02, 2.981508190917968e+02, 2.98146884358724e+02, 2.967469661458333e+02, 2.9441328125e+02, 2.937540958658854e+02, 2.937009745279948e+02, 2.938385693359375e+02, 2.943725911458333e+02, 2.950568400065104e+02, 2.935744909667969e+02, 2.925001582845052e+02, 2.918039729817708e+02, 2.907538977050781e+02, 2.898383483886719e+02]
-struct.TSensor[4]=[2.931499938964844e+02, 3.02456094156901e+02, 3.031461128743489e+02, 3.031469421386719e+02, 3.03147216796875e+02, 3.031473693847656e+02, 3.031474609375e+02, 3.031475187174479e+02, 3.031475524902344e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475996907552e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031476440429688e+02, 3.031475524902344e+02, 3.031476745605469e+02, 3.031478881835938e+02, 3.031479797363281e+02, 3.03148193359375e+02, 3.0314794921875e+02, 3.0314794921875e+02, 3.031479797363281e+02, 3.031477966308594e+02, 3.011993497721354e+02, 3.015500354003906e+02, 3.011677897135417e+02, 2.996353063964844e+02, 2.985286145019531e+02, 2.988737447102865e+02, 2.997193188476563e+02, 3.00400390625e+02, 3.011049462890625e+02, 3.013046724446614e+02, 3.004786047363281e+02, 2.993747192382813e+02, 2.97546543375651e+02, 2.970536413574219e+02, 2.954415861002604e+02, 2.981438338216146e+02, 2.981478491210938e+02, 2.981483154296875e+02, 2.981482543945312e+02, 2.981482543945312e+02, 2.981482849121094e+02, 2.968930432128906e+02, 2.952066833496094e+02, 2.944506506347656e+02, 2.942720536295573e+02, 2.945798547363281e+02, 2.952138053385416e+02, 2.958776631673177e+02, 2.944975622558593e+02, 2.933371240234375e+02, 2.92482832438151e+02, 2.915129565429688e+02, 2.905286560058594e+02]
+struct.TSensor[4]=[2.931499938964844e+02, 3.024593037923177e+02, 3.031461128743489e+02, 3.031469421386719e+02, 3.03147216796875e+02, 3.031473693847656e+02, 3.031474304199219e+02, 3.031474914550781e+02, 3.031475219726562e+02, 3.031475524902344e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031475830078125e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031476135253906e+02, 3.031475219726562e+02, 3.031476745605469e+02, 3.031478881835938e+02, 3.031479797363281e+02, 3.03148193359375e+02, 3.0314794921875e+02, 3.0314794921875e+02, 3.0314794921875e+02, 3.031477966308594e+02, 3.011934554036458e+02, 3.015486596679688e+02, 3.011633707682292e+02, 2.996295585123698e+02, 2.985142395019531e+02, 2.988710005696615e+02, 2.997232218424479e+02, 3.004081726074219e+02, 3.011122916666667e+02, 3.013119095865886e+02, 3.004834899902344e+02, 2.99376991780599e+02, 2.975407430013021e+02, 2.970482263183594e+02, 2.954271980794271e+02, 2.981437821451823e+02, 2.981478271484375e+02, 2.981483154296875e+02, 2.981482543945312e+02, 2.981482238769531e+02, 2.981482543945312e+02, 2.968825166829427e+02, 2.951884216308594e+02, 2.944399409993489e+02, 2.942634484863281e+02, 2.945775524902344e+02, 2.952137451171875e+02, 2.958777221679687e+02, 2.944918139648437e+02, 2.933280936686198e+02, 2.924721061197916e+02, 2.915002917480469e+02, 2.905124206542969e+02]
 heaSys.heaSche.TdegC[4].y=[3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031481323242188e+02, 3.031509151204427e+02, 3.031266174316406e+02, 3.03160732421875e+02, 3.031503360935899e+02, 3.031515283584595e+02, 3.031516682942708e+02, 3.031392639160156e+02, 3.03147314453125e+02, 3.031494222005209e+02, 3.012610420735677e+02, 3.011154748535157e+02, 3.00473769124349e+02, 2.985399609375e+02, 2.974013232421875e+02, 2.979585677083333e+02, 2.990644999186198e+02, 2.996881713867188e+02, 3.003557242838542e+02, 3.004894449869792e+02, 2.994871704101562e+02, 2.979653930664062e+02, 2.959233215332031e+02, 2.956557214355469e+02, 2.939559200032552e+02, 2.975124279785156e+02, 2.981543139648438e+02, 2.981511881510417e+02, 2.981503987630209e+02, 2.981578552246094e+02, 2.981513208007813e+02, 2.968174283854167e+02, 2.944976867675781e+02, 2.938742093912761e+02, 2.938250610351562e+02, 2.940883984375e+02, 2.946194250488281e+02, 2.952847778320312e+02, 2.937850646972656e+02, 2.926836149088542e+02, 2.919648335774739e+02, 2.909442749023438e+02, 2.900247497558594e+02]
-struct.TSensor[5]=[2.931499938964844e+02, 3.031434578450521e+02, 3.031457824707031e+02, 3.031463012695312e+02, 3.031465148925781e+02, 3.031466064453125e+02, 3.031466674804688e+02, 3.031466979980469e+02, 3.03146728515625e+02, 3.031467590332031e+02, 3.031467590332031e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031465079752604e+02, 3.031468811035156e+02, 3.031472233072917e+02, 3.031472778320312e+02, 3.031476440429688e+02, 3.031470170084635e+02, 3.03147129313151e+02, 3.031472778320312e+02, 3.031467989095052e+02, 3.008741577148438e+02, 3.000782751464844e+02, 2.997062032063802e+02, 2.981230859375e+02, 2.974261608886719e+02, 2.975455106608073e+02, 2.978427591959635e+02, 2.981240234375e+02, 2.984776798502604e+02, 2.98679287109375e+02, 2.981311645507812e+02, 2.977252579752604e+02, 2.962315673828125e+02, 2.954799047851562e+02, 2.942700561523437e+02, 2.981432751464844e+02, 2.981473693847656e+02, 2.981478576660156e+02, 2.981474609375e+02, 2.98147705078125e+02, 2.981477355957031e+02, 2.965823738606771e+02, 2.949350708007813e+02, 2.938926346842448e+02, 2.934738126627604e+02, 2.935516711425781e+02, 2.937864994303386e+02, 2.94307676188151e+02, 2.934500622558594e+02, 2.92591220703125e+02, 2.918860335286458e+02, 2.909858386230469e+02, 2.90109375e+02]
+struct.TSensor[5]=[2.931499938964844e+02, 3.031434578450521e+02, 3.031457824707031e+02, 3.031463012695312e+02, 3.03146484375e+02, 3.031466064453125e+02, 3.031466674804688e+02, 3.031466979980469e+02, 3.03146728515625e+02, 3.031467590332031e+02, 3.031467590332031e+02, 3.031467590332031e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031467895507812e+02, 3.031465079752604e+02, 3.031469055175781e+02, 3.031472473144531e+02, 3.031472778320312e+02, 3.031476440429688e+02, 3.031470170084635e+02, 3.03147129313151e+02, 3.031472778320312e+02, 3.031467989095052e+02, 3.008838077799479e+02, 3.000822546386719e+02, 2.997055725097656e+02, 2.981168908691406e+02, 2.974128308105469e+02, 2.975411360677084e+02, 2.978446215820313e+02, 2.98130126953125e+02, 2.984797993977865e+02, 2.986826997884115e+02, 2.981313891601562e+02, 2.977276725260417e+02, 2.962256062825521e+02, 2.9547140625e+02, 2.942545499674479e+02, 2.981432352701823e+02, 2.981473693847656e+02, 2.981478576660156e+02, 2.981474609375e+02, 2.98147705078125e+02, 2.981477355957031e+02, 2.965761678059896e+02, 2.949211791992187e+02, 2.938832983398437e+02, 2.934646887207031e+02, 2.935500341796875e+02, 2.937862471516927e+02, 2.943056294759115e+02, 2.934443566894531e+02, 2.925818688964844e+02, 2.918748490397135e+02, 2.909727490234375e+02, 2.900926818847656e+02]
 heaSys.heaSche.TdegC[5].y=[3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031468200683594e+02, 3.031678588867188e+02, 3.031545227050781e+02, 3.031677482096354e+02, 3.03149061359343e+02, 3.031460571289062e+02, 3.031549186197917e+02, 3.031406677246094e+02, 3.031371032714844e+02, 3.031515881347656e+02, 3.004947013346354e+02, 2.993114721679688e+02, 2.987556376139323e+02, 2.968971842447917e+02, 2.960780358886719e+02, 2.965198413085938e+02, 2.970284045410156e+02, 2.973584594726562e+02, 2.976025927734375e+02, 2.978450374348959e+02, 2.971257922363282e+02, 2.96694403889974e+02, 2.94814902750651e+02, 2.940865649414063e+02, 2.927240897623698e+02, 2.977569641113281e+02, 2.981499584960937e+02, 2.981494954427083e+02, 2.981476737467448e+02, 2.981549353027344e+02, 2.981528755696614e+02, 2.963095776367188e+02, 2.9403603515625e+02, 2.9319314453125e+02, 2.927784920247396e+02, 2.930228308105468e+02, 2.931994453938802e+02, 2.936209655761719e+02, 2.925954748535156e+02, 2.918574308268229e+02, 2.913246240234375e+02, 2.904397692871094e+02, 2.895865783691406e+02]
-struct.TSensor[6]=[2.931499938964844e+02, 3.031464485677083e+02, 3.031480407714844e+02, 3.031484069824219e+02, 3.031485290527344e+02, 3.031485900878906e+02, 3.031486206054688e+02, 3.031486206054688e+02, 3.031486511230469e+02, 3.031486511230469e+02, 3.031486511230469e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.031486018880208e+02, 3.031487365722656e+02, 3.031488102213542e+02, 3.031488647460938e+02, 3.031489562988281e+02, 3.031487731933594e+02, 3.031488037109375e+02, 3.031488342285156e+02, 3.031487121582031e+02, 3.014796879069011e+02, 3.005126086425781e+02, 3.000139404296875e+02, 2.988002103678385e+02, 2.979630700683594e+02, 2.976714607747396e+02, 2.977304463704427e+02, 2.979419555664062e+02, 2.983128861490886e+02, 2.985967517089844e+02, 2.983866320800781e+02, 2.977211201985677e+02, 2.966932535807292e+02, 2.959286254882812e+02, 2.948140336100261e+02, 2.981462683105469e+02, 2.981487121582031e+02, 2.981490478515625e+02, 2.9814892578125e+02, 2.981489562988281e+02, 2.981490173339844e+02, 2.969593953450521e+02, 2.954848449707031e+02, 2.944474715169271e+02, 2.938486857096354e+02, 2.935021643066406e+02, 2.935046655273438e+02, 2.938183064778646e+02, 2.934524621582031e+02, 2.927908736165364e+02, 2.921441658528646e+02, 2.913169116210938e+02, 2.905208435058594e+02]
+struct.TSensor[6]=[2.931499938964844e+02, 3.031464485677083e+02, 3.031480407714844e+02, 3.031484069824219e+02, 3.031485290527344e+02, 3.031485595703125e+02, 3.031485900878906e+02, 3.031486206054688e+02, 3.031486206054688e+02, 3.031486511230469e+02, 3.031486511230469e+02, 3.031486511230469e+02, 3.031486511230469e+02, 3.031486511230469e+02, 3.031486511230469e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.03148681640625e+02, 3.031485900878906e+02, 3.031487121582031e+02, 3.031488037109375e+02, 3.031488647460938e+02, 3.031489562988281e+02, 3.031487565104167e+02, 3.031488037109375e+02, 3.031488342285156e+02, 3.031487121582031e+02, 3.014714994303386e+02, 3.005030249023437e+02, 3.000030476888021e+02, 2.98784716796875e+02, 2.979436755371094e+02, 2.976557495117187e+02, 2.977182645670573e+02, 2.979324340820312e+02, 2.983046822102864e+02, 2.985901094563802e+02, 2.983782629394531e+02, 2.977119860839844e+02, 2.966784200032552e+02, 2.959116442871094e+02, 2.947924336751302e+02, 2.981462377929687e+02, 2.981487121582031e+02, 2.981490437825521e+02, 2.9814892578125e+02, 2.981489562988281e+02, 2.981489982096354e+02, 2.969505537923177e+02, 2.954669250488281e+02, 2.944286421712239e+02, 2.938307092285156e+02, 2.934875634765625e+02, 2.934931909179688e+02, 2.938097534179688e+02, 2.934414440917969e+02, 2.927770491536458e+02, 2.921282047526042e+02, 2.912986291503906e+02, 2.904996643066406e+02]
 heaSys.heaSche.TdegC[6].y=[3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03147216796875e+02, 3.03159766031901e+02, 3.031488037109375e+02, 3.031601497395833e+02, 3.031439509157275e+02, 3.031625356674194e+02, 3.031603955078125e+02, 3.031594523111979e+02, 3.031442163085937e+02, 3.031536547851563e+02, 3.010737931315104e+02, 2.995045556640625e+02, 2.988587158203125e+02, 2.974989074707031e+02, 2.966177331542969e+02, 2.96530800374349e+02, 2.967274873860677e+02, 2.969363403320312e+02, 2.972476981608073e+02, 2.975268180338542e+02, 2.972431188964844e+02, 2.964525402832031e+02, 2.95251318359375e+02, 2.9454380859375e+02, 2.93424394124349e+02, 2.981842097981771e+02, 2.981505395507813e+02, 2.981706013997396e+02, 2.981586836751302e+02, 2.981569592285156e+02, 2.981478377278646e+02, 2.967634256998698e+02, 2.94558837890625e+02, 2.935546004231771e+02, 2.929678776041667e+02, 2.9275806640625e+02, 2.926757771809896e+02, 2.929480244954427e+02, 2.924814514160156e+02, 2.919171122233073e+02, 2.913971419270833e+02, 2.906026025390625e+02, 2.898280334472656e+02]
-struct.TSensor[7]=[2.931499938964844e+02, 3.031434094238281e+02, 3.031466979980469e+02, 3.031472778320312e+02, 3.031474914550781e+02, 3.031476135253906e+02, 3.031476745605469e+02, 3.031477355957031e+02, 3.031477661132812e+02, 3.031477966308594e+02, 3.031477966308594e+02, 3.031477966308594e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478084309896e+02, 3.031479736328125e+02, 3.031481323242188e+02, 3.031482238769531e+02, 3.031484069824219e+02, 3.03148193359375e+02, 3.03148193359375e+02, 3.03148193359375e+02, 3.031480806477865e+02, 3.0175119140625e+02, 3.006355908203125e+02, 3.000537292480469e+02, 2.991237898763021e+02, 2.983737475585938e+02, 2.978709554036458e+02, 2.977807979329427e+02, 2.9787109375e+02, 2.981299670410156e+02, 2.98400116780599e+02, 2.984011596679687e+02, 2.979231164550781e+02, 2.971232157389323e+02, 2.965031958007813e+02, 2.954805342610677e+02, 2.981447823079427e+02, 2.981480407714844e+02, 2.981484680175781e+02, 2.981484375e+02, 2.981484375e+02, 2.981484680175781e+02, 2.971595845540365e+02, 2.957e+02, 2.947166446940104e+02, 2.941096187337239e+02, 2.936212902832031e+02, 2.934709256998698e+02, 2.936157918294271e+02, 2.9336828125e+02, 2.929099841308594e+02, 2.924123950195312e+02, 2.917489135742188e+02, 2.909834594726562e+02]
+struct.TSensor[7]=[2.931499938964844e+02, 3.031434094238281e+02, 3.031466979980469e+02, 3.031472778320312e+02, 3.031474914550781e+02, 3.031476135253906e+02, 3.031476745605469e+02, 3.031477355957031e+02, 3.031477661132812e+02, 3.031477661132812e+02, 3.031477966308594e+02, 3.031477966308594e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478271484375e+02, 3.031478084309896e+02, 3.031479797363281e+02, 3.031481323242188e+02, 3.031482543945312e+02, 3.031484069824219e+02, 3.03148193359375e+02, 3.03148193359375e+02, 3.03148193359375e+02, 3.031481018066406e+02, 3.017578942871094e+02, 3.00636015625e+02, 3.000497639973958e+02, 2.991206477864583e+02, 2.9836453125e+02, 2.978648836263021e+02, 2.977766243489583e+02, 2.978688049316406e+02, 2.981259724934896e+02, 2.983978373209636e+02, 2.983996105957031e+02, 2.979220825195313e+02, 2.971200968424479e+02, 2.964981311035156e+02, 2.954709549967448e+02, 2.981447517903646e+02, 2.981480407714844e+02, 2.981484680175781e+02, 2.981484375e+02, 2.981484375e+02, 2.981484680175781e+02, 2.971599877929688e+02, 2.956926208496094e+02, 2.947130053710937e+02, 2.941030004882812e+02, 2.936152783203125e+02, 2.934623897298177e+02, 2.936047973632812e+02, 2.933582409667969e+02, 2.929007763671875e+02, 2.924033020019531e+02, 2.9174e+02, 2.909721374511719e+02]
 heaSys.heaSche.TdegC[7].y=[3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031521911621094e+02, 3.031661665852865e+02, 3.031518920898437e+02, 3.031635286458333e+02, 3.031548301821849e+02, 3.031515731811523e+02, 3.031500524902344e+02, 3.031445454915365e+02, 3.031404833984375e+02, 3.031556526692708e+02, 3.014970678710937e+02, 3.00007119140625e+02, 2.992713358561198e+02, 2.982234318033854e+02, 2.974044689941406e+02, 2.970124430338541e+02, 2.970103169759115e+02, 2.971046447753906e+02, 2.973276009114583e+02, 2.975865779622396e+02, 2.975255993652344e+02, 2.969346638997396e+02, 2.960083292643229e+02, 2.954344360351562e+02, 2.943543998209635e+02, 2.9819298828125e+02, 2.981506811523437e+02, 2.981465169270833e+02, 2.981495422363281e+02, 2.981516235351563e+02, 2.981601147460938e+02, 2.971098856608073e+02, 2.952056396484375e+02, 2.942124747721354e+02, 2.93601621500651e+02, 2.931248120117187e+02, 2.929139176432292e+02, 2.930052998860677e+02, 2.926814855957031e+02, 2.922765502929688e+02, 2.919014493815104e+02, 2.913028649902344e+02, 2.905611877441406e+02]
-heaSys.Qhea[1]=[1.82e+03, 1.82e+03, 1.45140458984375e+03, 1.269420678710937e+03, 1.213570317382812e+03, 1.187274625651042e+03, 1.17197490234375e+03, 1.162062093098958e+03, 1.155330494791667e+03, 1.150622475585938e+03, 1.147242651367188e+03, 1.14478380859375e+03, 1.142967216796875e+03, 1.141610662434896e+03, 1.140589163411458e+03, 1.139815356445313e+03, 1.139221240234375e+03, 1.138758793945312e+03, 1.138402846679687e+03, 1.138125375976563e+03, 1.137909847005208e+03, 1.137740131835938e+03, 1.137608151041667e+03, 1.137502679036458e+03, 1.137420712890625e+03, 1.137356119791667e+03, 1.137305177408854e+03, 1.137265424804687e+03, 1.1372335546875e+03, 1.137208499348958e+03, 1.137188623046875e+03, 1.137173950195312e+03, 1.137162081705729e+03, 1.137151533203125e+03, 1.137144165039062e+03, 1.137137451171875e+03, 1.13713294921875e+03, 1.13712890625e+03, 1.137126342773438e+03, 1.137123764648438e+03, 1.137122135416667e+03, 1.137121087239583e+03, 1.137119384765625e+03, 1.137118435872396e+03, 1.137117431640625e+03, 1.13711669921875e+03, 1.13711669921875e+03, 1.137116507161458e+03, 1.137116313476562e+03, 1.137115753580729e+03, 1.137115437825521e+03, 1.137115610351563e+03, 1.137115416666667e+03, 1.137115600585938e+03, 1.137115317382812e+03, 1.137115234375e+03, 1.137115216471354e+03, 1.137115166015625e+03, 1.137115234375e+03, 1.269336735026042e+03, 1.238764306640625e+03, 1.124136225585938e+03, 1.078503453989498e+03, 9.240930614471436e+02, 1.147381538085938e+03, 1.086936743164063e+03, 1.022132373046875e+03, 1.239404231770833e+03, 2.592767295837402e+00, 4.997988159179687e+02, 2.395521354675293e+00, 4.99925087890625e+02, 6.51017303466797e-01, 4.9998873046875e+02, 4.996845218912761e+02, 5.001900939941406e+02, 5.001681616210938e+02, 2.646130873362223e+00, 2.547221851348877e+00, 2.450000527699788e+00, 2.664408032099406e+00, 2.813818550109863e+00, 2.555002196629842e+00, 1.808672762044271e+03, 8.807349877929687e+02, 7.693518025716146e+02, 9.61908145345052e+02, 9.40900029296875e+02, 8.61524364420573e+02, 2.976796522140503e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+heaSys.Qhea[1]=[1.82e+03, 1.82e+03, 1.449951500651042e+03, 1.268854853515625e+03, 1.213437010091146e+03, 1.187371044921875e+03, 1.172166787109375e+03, 1.162281549479167e+03, 1.155543958333333e+03, 1.1508221484375e+03, 1.147444067382813e+03, 1.144985224609375e+03, 1.143167290039062e+03, 1.141808828125e+03, 1.140785478515625e+03, 1.14001015625e+03, 1.139414721679688e+03, 1.138951176757812e+03, 1.138594375e+03, 1.138316293945313e+03, 1.138100276692708e+03, 1.137930317382813e+03, 1.137798081054688e+03, 1.137692438151042e+03, 1.137610297851563e+03, 1.137545694986979e+03, 1.137494752604167e+03, 1.137455e+03, 1.137423077799479e+03, 1.137398074544271e+03, 1.137378125e+03, 1.137363426106771e+03, 1.137351656901042e+03, 1.137341108398437e+03, 1.137333740234375e+03, 1.137327091471354e+03, 1.137322631835938e+03, 1.137318481445312e+03, 1.137316040039062e+03, 1.137313354492188e+03, 1.137311710611979e+03, 1.137310668945312e+03, 1.13730908203125e+03, 1.137308133138021e+03, 1.137307006835938e+03, 1.137306274414062e+03, 1.137306396484375e+03, 1.137306204427083e+03, 1.137305908203125e+03, 1.137305419921875e+03, 1.137305135091146e+03, 1.137305307617188e+03, 1.137305113932292e+03, 1.137305297851562e+03, 1.137304931640625e+03, 1.137304809570312e+03, 1.137304913736979e+03, 1.137304809570312e+03, 1.137304931640625e+03, 1.266342594401042e+03, 1.233868725585937e+03, 1.119217263997396e+03, 1.074128610079406e+03, 9.224647827148438e+02, 1.1440346875e+03, 1.08526279296875e+03, 1.021866586914063e+03, 1.234751559244792e+03, 2.592767295837402e+00, 4.997988159179687e+02, 2.395521354675293e+00, 4.99925087890625e+02, 6.51017303466797e-01, 4.9998873046875e+02, 4.996845218912761e+02, 5.001900939941406e+02, 5.001681616210938e+02, 2.646130873362223e+00, 2.547221851348877e+00, 2.450000527699788e+00, 2.664408032099406e+00, 2.813818550109863e+00, 2.555002196629842e+00, 1.811032845052083e+03, 8.809700732421875e+02, 7.683607788085938e+02, 9.581439420572916e+02, 9.382119897460938e+02, 8.604247843424479e+02, 2.976796522140503e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 heaSys.heaSche.Pel_IDEAL[1]=[1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.152259033203125e+03, 1.249891723632812e+03, 1.226740307617187e+03, 1.118995856119792e+03, 1.049175276959529e+03, 8.858257293701172e+02, 1.184540167643229e+03, 1.088329117838542e+03, 1.036261791992187e+03, 1.248768665364583e+03, 2.592767295837402e+00, 4.997988159179687e+02, 2.395521354675293e+00, 4.99925087890625e+02, 6.51017303466797e-01, 4.9998873046875e+02, 4.996845218912761e+02, 5.001900939941406e+02, 5.001681616210938e+02, 2.646130873362223e+00, 2.547221851348877e+00, 2.450000527699788e+00, 2.664408032099406e+00, 2.813818550109863e+00, 2.555002196629842e+00, 1.805216103515625e+03, 7.925255322265625e+02, 7.198470458984375e+02, 9.404459733072916e+02, 9.372869873046875e+02, 8.323960327148437e+02, 2.976796522140503e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-heaSys.Qhea[3]=[7.5e+02, 6.292870076497396e+02, 2.302440981038411e+02, 1.881314923095703e+02, 1.745805438232422e+02, 1.681922383626302e+02, 1.644917541503906e+02, 1.620862744140625e+02, 1.604315504964193e+02, 1.592576953125e+02, 1.584067270914714e+02, 1.577769854736328e+02, 1.573049560546875e+02, 1.569464381917318e+02, 1.56673832804362e+02, 1.564639709472656e+02, 1.563002807617187e+02, 1.561707039388021e+02, 1.560711499023438e+02, 1.559966664632161e+02, 1.559316864013672e+02, 1.558829992675781e+02, 1.558455928548177e+02, 1.558170204671224e+02, 1.557894464111328e+02, 1.557725575764974e+02, 1.557574745686849e+02, 1.557412390136719e+02, 1.557282139078776e+02, 1.557190454101562e+02, 1.557166137695312e+02, 1.557110630289714e+02, 1.557044427490234e+02, 1.557031353759766e+02, 1.556981404622396e+02, 1.556924865722656e+02, 1.556878552246094e+02, 1.556816141764323e+02, 1.556841080729167e+02, 1.556803063964844e+02, 1.556864593505859e+02, 1.556858044433594e+02, 1.556829858398438e+02, 1.556801529947917e+02, 1.556810732014974e+02, 1.556812561035156e+02, 1.556832061767578e+02, 1.556837282307943e+02, 1.556852770996094e+02, 1.556855287679036e+02, 1.556868489583333e+02, 1.556877276611328e+02, 1.556901338704427e+02, 1.556944635009766e+02, 1.556943218994141e+02, 1.556973897298177e+02, 1.557003580729167e+02, 1.557035766601562e+02, 1.5570486328125e+02, 1.572995735677083e+02, 1.280962493896484e+02, 1.21814553527832e+02, 1.221026417466461e+02, 1.018965771198273e+02, 1.334116923014323e+02, 1.287928771972656e+02, 1.297290551757812e+02, 1.441257845052083e+02, 6.190400854746501e+00, 3.482743725180626e-03, 5.464368623991808e-03, 3.601493726794918e-03, 7.009276002645495e-04, 5.739738860478004e-03, 4.671930260956287e-03, 2.349999966099858e-03, 5.533666741102934e-03, 2.602929106603066e-03, 2.663659164682031e-03, 5.367437247186899e-03, 4.558338209365805e-03, 3.57006000354886e-03, 4.541421215981245e-03, 4.263550646972656e+02, 1.378060003662109e+02, 1.052708414713542e+02, 1.12986007792155e+02, 1.081748379516602e+02, 1.096311100260417e+02, 8.233065859476726e+00, 3.771672025322914e-03, 3.961580169076721e-03, 1.796385059133172e-03, 4.301025085151195e-03, 2.680089386800925e-03, 7.988946170856555e-03, 3.958637174218893e-03, 2.75331078718106e-03, 3.335171633710464e-03, 3.251076284796e-03, 6.86699990183115e-03]
+heaSys.Qhea[3]=[7.5e+02, 6.276344930013021e+02, 2.302279416910807e+02, 1.884120306396484e+02, 1.750017797851563e+02, 1.686818827311198e+02, 1.650160711669922e+02, 1.626304018147787e+02, 1.609886558024089e+02, 1.598244879150391e+02, 1.589811716715495e+02, 1.583574770100911e+02, 1.578900988769531e+02, 1.575353015136719e+02, 1.572656231689453e+02, 1.570581085205078e+02, 1.568962526448568e+02, 1.567682228597005e+02, 1.566698455810547e+02, 1.565963391113281e+02, 1.565321421305339e+02, 1.564840270996094e+02, 1.564470857747396e+02, 1.564189794921875e+02, 1.563917749023437e+02, 1.563751627604167e+02, 1.563603346761068e+02, 1.563445166015625e+02, 1.563317706298828e+02, 1.56322807820638e+02, 1.563202392578125e+02, 1.56314794921875e+02, 1.563085188802083e+02, 1.563072204589844e+02, 1.563024438476563e+02, 1.562969573974609e+02, 1.562925524902344e+02, 1.562866306559245e+02, 1.56288969116211e+02, 1.562853424072266e+02, 1.562912577311198e+02, 1.562906846110026e+02, 1.562880108642578e+02, 1.562852860514323e+02, 1.562862091064453e+02, 1.562864135742188e+02, 1.562883237711588e+02, 1.562888503011068e+02, 1.562903393554687e+02, 1.562906162516276e+02, 1.562918955485026e+02, 1.562927294921875e+02, 1.562951062011719e+02, 1.562992828369141e+02, 1.562991375732422e+02, 1.563020863850911e+02, 1.563049556477865e+02, 1.563080340576172e+02, 1.563092771402995e+02, 1.577497058105469e+02, 1.280064819335938e+02, 1.212562497965495e+02, 1.215762998236984e+02, 1.01695286989212e+02, 1.333452880859375e+02, 1.288441497802734e+02, 1.298564715576172e+02, 1.436445798746745e+02, 6.190400854746501e+00, 3.482743725180626e-03, 5.464368623991808e-03, 3.601493726794918e-03, 7.009276002645495e-04, 5.739738860478004e-03, 4.671930260956287e-03, 2.349999966099858e-03, 5.533666741102934e-03, 2.602929106603066e-03, 2.663659164682031e-03, 5.367437247186899e-03, 4.558338209365805e-03, 3.57006000354886e-03, 4.541421215981245e-03, 4.297470296223958e+02, 1.379176123046875e+02, 1.050792826334635e+02, 1.125236200968424e+02, 1.079839996337891e+02, 1.096424986775716e+02, 8.233065859476726e+00, 3.771672025322914e-03, 3.961580169076721e-03, 1.796385059133172e-03, 4.301025085151195e-03, 2.680089386800925e-03, 7.988946170856555e-03, 3.958637174218893e-03, 2.75331078718106e-03, 3.335171633710464e-03, 3.251076284796e-03, 6.86699990183115e-03]
 heaSys.heaSche.Pel_IDEAL[3]=[2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 2.183162078857422e+02, 1.437343299357096e+02, 8.326061401367188e+01, 1.62660908203125e+02, 1.743271384317367e+02, 1.437606601715088e+02, 1.978478137207031e+02, 1.963321095784505e+02, 1.840036016845703e+02, 2.09896215616862e+02, 6.190400854746501e+00, 3.482743725180626e-03, 5.464368623991808e-03, 3.601493726794918e-03, 7.009276002645495e-04, 5.739738860478004e-03, 4.671930260956287e-03, 2.349999966099858e-03, 5.533666741102934e-03, 2.602929106603066e-03, 2.663659164682031e-03, 5.367437247186899e-03, 4.558338209365805e-03, 3.57006000354886e-03, 4.541421215981245e-03, 7.422104866536458e+02, 1.840092291259766e+02, 1.48614687093099e+02, 1.584789265950521e+02, 1.674950036621094e+02, 1.547437019856771e+02, 8.233065859476726e+00, 3.771672025322914e-03, 3.961580169076721e-03, 1.796385059133172e-03, 4.301025085151195e-03, 2.680089386800925e-03, 7.988946170856555e-03, 3.958637174218893e-03, 2.75331078718106e-03, 3.335171633710464e-03, 3.251076284796e-03, 6.86699990183115e-03]
-heaSys.Qhea[4]=[7.5e+02, 7.5e+02, 3.893266532389323e+02, 3.054719885253906e+02, 2.772024552408854e+02, 2.630868184407552e+02, 2.547125006103516e+02, 2.493033662923177e+02, 2.456736804199219e+02, 2.431764898681641e+02, 2.414234303792318e+02, 2.401706614176432e+02, 2.392609454345703e+02, 2.385918393961589e+02, 2.380949271647135e+02, 2.377229309082031e+02, 2.37440254313151e+02, 2.372227864583333e+02, 2.370558642578125e+02, 2.36927041422526e+02, 2.368274800618489e+02, 2.367493695068359e+02, 2.366884820556641e+02, 2.366407364908854e+02, 2.366033935546875e+02, 2.36573984781901e+02, 2.365510414632161e+02, 2.365329730224609e+02, 2.365186263020833e+02, 2.365072648111979e+02, 2.364983032226563e+02, 2.364913376871745e+02, 2.364858648681641e+02, 2.364815795898438e+02, 2.364782979329427e+02, 2.36475542195638e+02, 2.364733941650391e+02, 2.364717272949219e+02, 2.364703503417969e+02, 2.364692309570312e+02, 2.36468413289388e+02, 2.364680649820964e+02, 2.364675433349609e+02, 2.364670056152344e+02, 2.364666385904948e+02, 2.364664031982422e+02, 2.364664147949219e+02, 2.364662345377604e+02, 2.364661126708984e+02, 2.364660872395833e+02, 2.364660135904948e+02, 2.364658953857422e+02, 2.364660721842448e+02, 2.364661269124349e+02, 2.364660137939453e+02, 2.364659311930339e+02, 2.364659271240234e+02, 2.364659576416016e+02, 2.364659729003906e+02, 2.458344293212891e+02, 2.317355010986328e+02, 2.110917700195313e+02, 2.009340109903304e+02, 1.803279066085815e+02, 2.039848046875e+02, 2.041395955403646e+02, 2.035200341796875e+02, 2.203522882080078e+02, 9.752881534894308e-01, 5.505538374185562e-02, 5.195364455382029e-02, 6.184483448664347e-02, 4.742465287446976e-02, 5.762286951144537e-02, 5.396102587381998e-02, 6.800000369548798e-02, 5.167586599787076e-02, 6.63365505139033e-02, 5.63154648244381e-02, 5.860327174266179e-02, 6.190045153101285e-02, 6.263795852661133e-02, 5.414900109171868e-02, 6.156454777018229e+02, 2.154697003173828e+02, 1.686524078369141e+02, 1.740524534098307e+02, 1.757148187255859e+02, 1.728738458251953e+02, 1.024191549619039e+00, 5.88746964931488e-02, 6.05575888355573e-02, 6.415272275606791e-02, 6.655989736318588e-02, 7.174693201979002e-02, 5.891634300351143e-02, 5.878492817282677e-02, 5.807839155197143e-02, 5.612119977672895e-02, 6.730084925889969e-02, 5.249999836087227e-02]
+heaSys.Qhea[4]=[7.5e+02, 7.5e+02, 3.897992118326823e+02, 3.064671362304687e+02, 2.784617879231771e+02, 2.644792785644531e+02, 2.561746630859375e+02, 2.508075233968099e+02, 2.472069677734375e+02, 2.447323577880859e+02, 2.42997412109375e+02, 2.417588559977214e+02, 2.408602612304688e+02, 2.401999210611979e+02, 2.397099501546224e+02, 2.393434417724609e+02, 2.390651298014323e+02, 2.388511594645182e+02, 2.386870202636719e+02, 2.385604315185547e+02, 2.384626118977864e+02, 2.383859002685547e+02, 2.383261163330078e+02, 2.382792710367839e+02, 2.382426147460938e+02, 2.382137858072917e+02, 2.381912849934896e+02, 2.381735546875e+02, 2.381594954427083e+02, 2.381483477783203e+02, 2.381395690917969e+02, 2.381327408854167e+02, 2.381273901367188e+02, 2.381231964111328e+02, 2.381199766031901e+02, 2.381172810872396e+02, 2.381151940917969e+02, 2.381135577392578e+02, 2.38112211303711e+02, 2.381111071777344e+02, 2.381103118896484e+02, 2.381099869791667e+02, 2.381094653320312e+02, 2.381089428710937e+02, 2.381085882568359e+02, 2.381083648681641e+02, 2.381083825683594e+02, 2.38108217569987e+02, 2.381080828857422e+02, 2.381080702718099e+02, 2.381079966227213e+02, 2.381078784179687e+02, 2.381080704752604e+02, 2.381081252034505e+02, 2.381080120849609e+02, 2.381079294840495e+02, 2.381079254150391e+02, 2.381079559326172e+02, 2.381079711914062e+02, 2.470743758138021e+02, 2.323531433105469e+02, 2.115376599121094e+02, 2.013989200279361e+02, 1.81051155090332e+02, 2.048248940022787e+02, 2.052258219401042e+02, 2.046215936279297e+02, 2.208224088541667e+02, 9.752881534894308e-01, 5.505538374185562e-02, 5.195364455382029e-02, 6.184483448664347e-02, 4.742465287446976e-02, 5.762286951144537e-02, 5.396102587381998e-02, 6.800000369548798e-02, 5.167586599787076e-02, 6.63365505139033e-02, 5.63154648244381e-02, 5.860327174266179e-02, 6.190045153101285e-02, 6.263795852661133e-02, 5.414900109171868e-02, 6.213122892252604e+02, 2.163601171875e+02, 1.691531168619792e+02, 1.743183392333984e+02, 1.766585797119141e+02, 1.737905924479167e+02, 1.024191549619039e+00, 5.88746964931488e-02, 6.05575888355573e-02, 6.415272275606791e-02, 6.655989736318588e-02, 7.174693201979002e-02, 5.891634300351143e-02, 5.878492817282677e-02, 5.807839155197143e-02, 5.612119977672895e-02, 6.730084925889969e-02, 5.249999836087227e-02]
 heaSys.heaSche.Pel_IDEAL[4]=[3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.188374633789062e+02, 3.043249438476562e+02, 2.829982055664062e+02, 2.776407478841146e+02, 2.568080284243724e+02, 2.189292287826538e+02, 2.844235974121094e+02, 2.855980061848958e+02, 2.741242199707031e+02, 3.03363037109375e+02, 9.752881534894308e-01, 5.505538374185562e-02, 5.195364455382029e-02, 6.184483448664347e-02, 4.742465287446976e-02, 5.762286951144537e-02, 5.396102587381998e-02, 6.800000369548798e-02, 5.167586599787076e-02, 6.63365505139033e-02, 5.63154648244381e-02, 5.860327174266179e-02, 6.190045153101285e-02, 6.263795852661133e-02, 5.414900109171868e-02, 7.628140494791667e+02, 2.766561169433594e+02, 2.309833740234375e+02, 2.400625583902995e+02, 2.510734362792969e+02, 2.357335729980469e+02, 1.024191549619039e+00, 5.88746964931488e-02, 6.05575888355573e-02, 6.415272275606791e-02, 6.655989736318588e-02, 7.174693201979002e-02, 5.891634300351143e-02, 5.878492817282677e-02, 5.807839155197143e-02, 5.612119977672895e-02, 6.730084925889969e-02, 5.249999836087227e-02]
-heaSys.Qhea[5]=[7.5e+02, 5.14359355061849e+02, 2.808374792480469e+02, 2.287881359863281e+02, 2.088429404703776e+02, 1.983397104899089e+02, 1.919728430175781e+02, 1.878364170328776e+02, 1.850664801025391e+02, 1.831738739013672e+02, 1.818595794677734e+02, 1.80933207804362e+02, 1.802691516113281e+02, 1.797885015869141e+02, 1.794369671630859e+02, 1.791780639648437e+02, 1.789837801106771e+02, 1.788346154785156e+02, 1.787233288574219e+02, 1.78637338663737e+02, 1.785713857014974e+02, 1.785200592041016e+02, 1.78481137491862e+02, 1.784493009440104e+02, 1.784252947998047e+02, 1.784064381917318e+02, 1.78391586710612e+02, 1.783803161621094e+02, 1.783709191894531e+02, 1.783636942545573e+02, 1.783578918457031e+02, 1.783542976888021e+02, 1.783512760416667e+02, 1.783476159667969e+02, 1.783457039388021e+02, 1.783433685302734e+02, 1.783423327636719e+02, 1.783409836832682e+02, 1.783405959065755e+02, 1.783396875e+02, 1.783394673665365e+02, 1.783393233235677e+02, 1.783385260009766e+02, 1.783383400472005e+02, 1.783377809651693e+02, 1.783374938964844e+02, 1.783378599039713e+02, 1.783378686523438e+02, 1.783378302001953e+02, 1.783374904378255e+02, 1.783372904459635e+02, 1.783376080322266e+02, 1.783374322509766e+02, 1.783376131184896e+02, 1.783373522949219e+02, 1.783373260498047e+02, 1.783373911539714e+02, 1.783373480224609e+02, 1.783375091552734e+02, 1.825555385335286e+02, 1.409782684326172e+02, 1.258546105957031e+02, 1.302785261810803e+02, 1.203919575214386e+02, 1.43365361328125e+02, 1.442660654703776e+02, 1.445758880615234e+02, 1.506242063395182e+02, -1.326857588704427e+02, -1.062741342163086e+02, -7.496921895345052e+01, -8.617052856445312e+01, -5.135450134277344e+01, -7.775631429036459e+01, -8.115551483154297e+01, -8.960887908935547e+01, -5.91967827351888e+01, -6.372870396931966e+01, -6.020910858154297e+01, -8.391736623128256e+01, -7.847548014322916e+01, -6.872395446777344e+01, -5.79864638264974e+01, 5.668294783528646e+02, 1.777937164306641e+02, 1.312839680989583e+02, 1.332737306722005e+02, 1.072409429931641e+02, 1.217622559611003e+02, -8.563879302978516e+01, -5.65097152709961e+01, -8.600895334879557e+01, -6.965178639729818e+01, -7.943564910888672e+01, -6.423207478841145e+01, -2.708434727986654e+01, -2.71374235534668e+01, -3.396710398356119e+01, -3.755201497395834e+01, -4.31510969543457e+01, -3.695193862915039e+01]
+heaSys.Qhea[5]=[7.5e+02, 5.139314152018229e+02, 2.809561315917969e+02, 2.292481878662109e+02, 2.094961702473958e+02, 1.990941111246745e+02, 1.927818395996094e+02, 1.886792952473958e+02, 1.859334584554036e+02, 1.840598657226562e+02, 1.827607381184896e+02, 1.81846162109375e+02, 1.811913433837891e+02, 1.807179180908203e+02, 1.803721010335287e+02, 1.801176940917969e+02, 1.799269903564453e+02, 1.797806921386719e+02, 1.796716455078125e+02, 1.795874554443359e+02, 1.795229278564453e+02, 1.794727264404297e+02, 1.79434692586263e+02, 1.794035856119792e+02, 1.793801580810547e+02, 1.793617502848307e+02, 1.793472599283854e+02, 1.793362640380859e+02, 1.79327089436849e+02, 1.793200541178385e+02, 1.793143890380859e+02, 1.793109016927083e+02, 1.793079563395182e+02, 1.793043780517578e+02, 1.793025071207682e+02, 1.793002319335938e+02, 1.792992419433594e+02, 1.792979233805339e+02, 1.792975661214193e+02, 1.792966577148437e+02, 1.792964528401693e+02, 1.792963240559896e+02, 1.792955267333984e+02, 1.792953560384115e+02, 1.792947845458984e+02, 1.792945037841797e+02, 1.792948758951823e+02, 1.792948999023438e+02, 1.792948461914062e+02, 1.792945064290365e+02, 1.792943216959635e+02, 1.792946392822266e+02, 1.792944557698568e+02, 1.792946457926432e+02, 1.792943835449219e+02, 1.792943572998047e+02, 1.792944224039714e+02, 1.792943792724609e+02, 1.792945404052734e+02, 1.832322664388021e+02, 1.396194580078125e+02, 1.244610383097331e+02, 1.297256429703509e+02, 1.201107277870178e+02, 1.434337982177734e+02, 1.445683553059896e+02, 1.449481549072266e+02, 1.502595815022786e+02, -1.326857588704427e+02, -1.062741342163086e+02, -7.496921895345052e+01, -8.617052856445312e+01, -5.135450134277344e+01, -7.775631429036459e+01, -8.115551483154297e+01, -8.960887908935547e+01, -5.91967827351888e+01, -6.372870396931966e+01, -6.020910858154297e+01, -8.391736623128256e+01, -7.847548014322916e+01, -6.872395446777344e+01, -5.79864638264974e+01, 5.707053409830729e+02, 1.781212982177734e+02, 1.312411204020182e+02, 1.330319803873698e+02, 1.062837033081055e+02, 1.21986476949056e+02, -8.563879302978516e+01, -5.65097152709961e+01, -8.600895334879557e+01, -6.965178639729818e+01, -7.943564910888672e+01, -6.423207478841145e+01, -2.708434727986654e+01, -2.71374235534668e+01, -3.396710398356119e+01, -3.755201497395834e+01, -4.31510969543457e+01, -3.695193862915039e+01]
 heaSys.heaSche.Pel_IDEAL[5]=[1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.542762908935547e+02, 1.358191180419922e+02, 1.060055679321289e+02, 1.060824329630534e+02, 1.154211313216413e+02, 1.156888723373413e+02, 1.327414410400391e+02, 1.37064501953125e+02, 1.38200712890625e+02, 1.311152852376302e+02, -1.326857588704427e+02, -1.062741342163086e+02, -7.496921895345052e+01, -8.617052856445312e+01, -5.135450134277344e+01, -7.775631429036459e+01, -8.115551483154297e+01, -8.960887908935547e+01, -5.91967827351888e+01, -6.372870396931966e+01, -6.020910858154297e+01, -8.391736623128256e+01, -7.847548014322916e+01, -6.872395446777344e+01, -5.79864638264974e+01, 5.628778295898437e+02, 1.653119317626953e+02, 1.289661488850911e+02, 1.222166645304362e+02, 1.128956085205078e+02, 1.227967681884766e+02, -8.563879302978516e+01, -5.65097152709961e+01, -8.600895334879557e+01, -6.965178639729818e+01, -7.943564910888672e+01, -6.423207478841145e+01, -2.708434727986654e+01, -2.71374235534668e+01, -3.396710398356119e+01, -3.755201497395834e+01, -4.31510969543457e+01, -3.695193862915039e+01]
-heaSys.Qhea[6]=[7.5e+02, 3.547354642740885e+02, 1.949171411132812e+02, 1.586237634277344e+02, 1.470835245768229e+02, 1.41800141398112e+02, 1.387323071289063e+02, 1.367153155517578e+02, 1.353210972086588e+02, 1.343317858886719e+02, 1.336171946207682e+02, 1.330932240804036e+02, 1.327045556640625e+02, 1.324130902099609e+02, 1.321934763590495e+02, 1.320269775390625e+02, 1.318991324869792e+02, 1.317999814860026e+02, 1.317231018066406e+02, 1.316634954833984e+02, 1.316172037760417e+02, 1.315809692382813e+02, 1.315532065836589e+02, 1.315303257242838e+02, 1.315129772949219e+02, 1.314991760253906e+02, 1.314883575439453e+02, 1.314801818847656e+02, 1.314732491048177e+02, 1.314679412841797e+02, 1.314636169433594e+02, 1.314608327229818e+02, 1.314586527506511e+02, 1.314556970214844e+02, 1.314543282063802e+02, 1.314527404785156e+02, 1.314517767333984e+02, 1.314509877522786e+02, 1.314502915445964e+02, 1.314496331787109e+02, 1.314494852701823e+02, 1.314490547688802e+02, 1.31448609008789e+02, 1.314481070963542e+02, 1.314481046549479e+02, 1.314476654052734e+02, 1.314478326416016e+02, 1.314476155598958e+02, 1.31447099609375e+02, 1.314466383870443e+02, 1.314461873372396e+02, 1.314462042236328e+02, 1.314459802246094e+02, 1.314462168375651e+02, 1.314459582519531e+02, 1.314454335530599e+02, 1.314457253011068e+02, 1.314458953857422e+02, 1.31445468343099e+02, 1.393773400878906e+02, 1.269023895263672e+02, 1.181654416910807e+02, 1.139899075617556e+02, 1.038862752914429e+02, 1.234301252237956e+02, 1.190543512980143e+02, 1.168340264892578e+02, 1.290729791259766e+02, 1.045146072705587e+00, 4.484226673841477e-02, 4.613749831914902e-02, 5.083625862995783e-02, 3.42814264446497e-02, 4.716059635082881e-02, 5.112666507562001e-02, 4.749999940395355e-02, 4.94067553182443e-02, 5.113217338919639e-02, 5.052876874804497e-02, 4.983208333452543e-02, 5.118621413906415e-02, 5.475384652614593e-02, 5.211083089311917e-02, 3.729136336263021e+02, 1.291261694335938e+02, 9.614117736816407e+01, 1.075196279907227e+02, 1.043236770629883e+02, 9.906672281901042e+01, 1.071081395149231e+00, 4.74142849445343e-02, 4.643494894107183e-02, 4.726075887680053e-02, 4.494624972343444e-02, 6.009872640172641e-02, 4.670104036728541e-02, 5.412444978952408e-02, 4.715399886171023e-02, 4.835468272368113e-02, 4.906171262264251e-02, 5.000000074505806e-02]
+heaSys.Qhea[6]=[7.5e+02, 3.549865799967448e+02, 1.955499271647136e+02, 1.595152655029297e+02, 1.481096142578125e+02, 1.428931304931641e+02, 1.398604754638672e+02, 1.378654272460938e+02, 1.364873122151693e+02, 1.355111340332031e+02, 1.348073008219401e+02, 1.342918589274089e+02, 1.339099523925781e+02, 1.33623876953125e+02, 1.334085392252604e+02, 1.33245458984375e+02, 1.331203332519531e+02, 1.330233557128906e+02, 1.329482214355469e+02, 1.328899947102865e+02, 1.328448038736979e+02, 1.328094390869141e+02, 1.327823797607422e+02, 1.327600545247396e+02, 1.327431408691406e+02, 1.327296905517578e+02, 1.327191314697266e+02, 1.327111999511719e+02, 1.327044350179036e+02, 1.326992494710287e+02, 1.326950469970703e+02, 1.326923514811198e+02, 1.326902471923828e+02, 1.326873254394531e+02, 1.326860168457031e+02, 1.326844533284505e+02, 1.326835272216797e+02, 1.326827427164714e+02, 1.326820725504557e+02, 1.326814276123047e+02, 1.326812896728516e+02, 1.326808662923177e+02, 1.326804205322265e+02, 1.326799338785807e+02, 1.326799314371745e+02, 1.326795013427734e+02, 1.326796746826172e+02, 1.326794576009115e+02, 1.326789416503906e+02, 1.326784804280599e+02, 1.326780242919922e+02, 1.326780462646484e+02, 1.32677822265625e+02, 1.326780588785807e+02, 1.326778002929688e+02, 1.326772755940755e+02, 1.326775695800781e+02, 1.326777459716797e+02, 1.326773107910156e+02, 1.406277392578125e+02, 1.277689697265625e+02, 1.189189275105794e+02, 1.147276339921795e+02, 1.045674574375153e+02, 1.243734431966146e+02, 1.200106964111328e+02, 1.177501354980469e+02, 1.299449776204427e+02, 1.045146072705587e+00, 4.484226673841477e-02, 4.613749831914902e-02, 5.083625862995783e-02, 3.42814264446497e-02, 4.716059635082881e-02, 5.112666507562001e-02, 4.749999940395355e-02, 4.94067553182443e-02, 5.113217338919639e-02, 5.052876874804497e-02, 4.983208333452543e-02, 5.118621413906415e-02, 5.475384652614593e-02, 5.211083089311917e-02, 3.755041825358073e+02, 1.298227911376953e+02, 9.665037434895834e+01, 1.081810634358724e+02, 1.051183660888672e+02, 9.988682678222656e+01, 1.071081395149231e+00, 4.74142849445343e-02, 4.643494894107183e-02, 4.726075887680053e-02, 4.494624972343444e-02, 6.009872640172641e-02, 4.670104036728541e-02, 5.412444978952408e-02, 4.715399886171023e-02, 4.835468272368113e-02, 4.906171262264251e-02, 5.000000074505806e-02]
 heaSys.heaSche.Pel_IDEAL[6]=[1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.628659973144531e+02, 1.611251334635417e+02, 1.502260772705078e+02, 1.376515087890625e+02, 1.373890563464556e+02, 1.212908692359924e+02, 1.483543298339844e+02, 1.512997863769531e+02, 1.400960803222656e+02, 1.498909788004557e+02, 1.045146072705587e+00, 4.484226673841477e-02, 4.613749831914902e-02, 5.083625862995783e-02, 3.42814264446497e-02, 4.716059635082881e-02, 5.112666507562001e-02, 4.749999940395355e-02, 4.94067553182443e-02, 5.113217338919639e-02, 5.052876874804497e-02, 4.983208333452543e-02, 5.118621413906415e-02, 5.475384652614593e-02, 5.211083089311917e-02, 4.214241422526042e+02, 1.320410803222656e+02, 1.07367919921875e+02, 1.174979822794596e+02, 1.271886199951172e+02, 1.195394449869792e+02, 1.071081395149231e+00, 4.74142849445343e-02, 4.643494894107183e-02, 4.726075887680053e-02, 4.494624972343444e-02, 6.009872640172641e-02, 4.670104036728541e-02, 5.412444978952408e-02, 4.715399886171023e-02, 4.835468272368113e-02, 4.906171262264251e-02, 5.000000074505806e-02]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_TwinHouses_BuildingO5_Exp1_1Port.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_TwinHouses_BuildingO5_Exp1_1Port.txt
index 81cec86189..22302f0002 100644
--- a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_TwinHouses_BuildingO5_Exp1_1Port.txt
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_TwinHouses_BuildingO5_Exp1_1Port.txt
@@ -1,24 +1,24 @@
-last-generated=2021-06-08
+last-generated=2023-10-23
 statistics-initialization=
 {
-  "nonlinear": "17, 10, 8, 11, 10, 8, 11",
+  "nonlinear": "17, 10, 8, 11, 10, 8, 11, 7",
   "numerical Jacobians": "0"
 }
 statistics-simulation=
 {
-  "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0",
+  "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0",
   "nonlinear": "7, 3, 6, 1, 1, 1, 1, 1, 1, 1, 1",
-  "number of continuous time states": "405",
+  "number of continuous time states": "402",
   "numerical Jacobians": "0"
 }
 time=[1.5e+07, 2.35872e+07]
-comparison_W40[1]=[3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.948019072413445e-02, 3.844196990132332e-02, 4.023750573396682e-02, 4.038260355591774e-02, 4.059998855971899e-02, 4.162869625724852e-02, 4.021723662813505e-02, 4.032295445601145e-02, 4.269881635904312e-02, 4.109594071904818e-02, 4.031281590461731e-02, 4.159370645880699e-02, 4.246152738730113e-02, 4.214904129505157e-02, 4.277453348040581e-02, 4.010856454571088e-02, 4.016620680689811e-02, 4.024252668023109e-02, 4.083195835351944e-02, 4.018431757887204e-02, 4.942907631397248e-02, 4.215682576100031e-02, 4.158170322577159e-02, 4.39471460878849e-02, 4.55832069615523e-02, 4.227639963229497e-02, 4.069649711251259e-02, 4.494441126783689e-02, 4.407031695048014e-02, 4.038368135690689e-02, 4.189043665925662e-02, 4.169184669852257e-02, 4.274097234010697e-02, 4.053758834799131e-02, 4.09135848780473e-02, 4.038951173424721e-02, 4.122792209188143e-02, 4.351488227645556e-02, 4.09933140873909e-02, 3.750507344802221e-02, 3.70292858282725e-02, 3.887699514627457e-02, 3.912869840860367e-02]
+comparison_W40[1]=[9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 9.021107107400894e-03, 8.741963890691599e-03, 9.211779572069645e-03, 9.254115136961142e-03, 9.293065910212329e-03, 9.56120211048983e-03, 9.211149948338668e-03, 9.24911896387736e-03, 9.779531210660934e-03, 9.432664203147093e-03, 9.237892230351766e-03, 9.529578685760497e-03, 9.751713710526626e-03, 9.724598651130994e-03, 9.885968714952469e-03, 9.192336685955524e-03, 9.198599979281425e-03, 9.213540703058243e-03, 9.342996428410213e-03, 9.210255692402521e-03, 1.136466108262539e-02, 9.722235637406509e-03, 9.567310598989328e-03, 1.012227211147547e-02, 1.051585285613934e-02, 9.744883552193641e-03, 9.320776984095573e-03, 1.030470486730337e-02, 1.015433218330145e-02, 9.321532510221005e-03, 9.57412841419379e-03, 9.606125925978025e-03, 9.863078035414219e-03, 9.283429756760598e-03, 9.367451034486295e-03, 9.250188320875168e-03, 9.44294939438502e-03, 1.000866821656624e-02, 9.373076446354388e-03, 8.53172678500414e-03, 8.396902307868003e-03, 8.878518603742122e-03, 8.940295316278934e-03]
 comparison_W40[2]=[3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.940000012516975e-02, 3.80713339149952e-02, 4.034999907016754e-02, 4.035733183224996e-02, 4.056352431901165e-02, 4.199999943375587e-02, 4.010066712896029e-02, 4.035166800022125e-02, 4.300499945878983e-02, 4.143899967273076e-02, 4.048933327198029e-02, 4.167299926280976e-02, 4.223749910791715e-02, 4.226533353328705e-02, 4.296625107526779e-02, 4.022633383671443e-02, 4.025866642594338e-02, 4.026874899864197e-02, 4.084541762868563e-02, 4.033066521088282e-02, 4.971025079488754e-02, 4.225133230288824e-02, 4.169166833162308e-02, 4.436224937438965e-02, 4.589433362086614e-02, 4.25399157901605e-02, 4.082275107502938e-02, 4.521041537324588e-02, 4.465033461650213e-02, 4.059200167655945e-02, 4.191933418313662e-02, 4.187866777181625e-02, 4.305624961853027e-02, 4.064683293302854e-02, 4.104300156235695e-02, 4.050000011920929e-02, 4.14000004529953e-02, 4.38000001013279e-02, 4.111274868249893e-02, 3.731424982349078e-02, 3.662733306487401e-02, 3.867599964141846e-02, 3.909999877214432e-02]
-comparison_W1[1]=[1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, 1.287064969801577e-05, -9.681183951518809e-05, 1.19735874250182e-05, 3.279493563847306e-05, 4.810202106037635e-05, 1.649839546189469e-04, 1.784755554884517e-05, 2.879513364556866e-05, 2.615858637727797e-04, 1.109287519163142e-04, 2.424079199651412e-05, 1.488609157968313e-04, 2.47736102513348e-04, 2.409645461011678e-04, 3.1130934599787e-04, 1.851171742600855e-05, 7.858352740489256e-06, 1.391250498272711e-05, 6.565523508470506e-05, 1.138595836285579e-05, 9.134878311306238e-04, 2.397914382163435e-04, 1.680248436362793e-04, 4.136126860976219e-04, 5.86143236917754e-04, 2.487717320521673e-04, 6.11948742880486e-05, 4.909189301542938e-04, 4.243004508316517e-04, 1.023105924832635e-04, 2.717294807856282e-05, 1.894951784440006e-04, 2.979881945066154e-04, 4.643764586944599e-05, 8.069388568401336e-05, 3.29409861296881e-05, 1.169196595825876e-04, 3.628444954908143e-04, -2.990680834045635e-05, 7.290873501915485e-05, 6.284969470774136e-06, 7.231072842841968e-05, 5.7082979765255e-05]
+comparison_W1[1]=[1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, 1.54244335135445e-05, -1.008625514805317e-04, 8.726899341127137e-06, 3.580774345512813e-05, 4.330711084042035e-05, 1.62697699124692e-04, 1.973002290469594e-05, 4.018611992554118e-05, 2.413891302421689e-04, 1.119190439931117e-04, 2.834840760139438e-05, 1.387591101229191e-04, 2.380533551331609e-04, 2.524483238812536e-04, 3.266499994788319e-04, 2.872142868000083e-05, 8.177704488237699e-06, 1.109270397137152e-05, 5.727417873761928e-05, 2.128321628939981e-05, 8.432573336176574e-04, 2.503833562756578e-04, 1.743886682864589e-04, 4.012249840889126e-04, 5.584372696466744e-04, 2.548445935826749e-04, 5.805528431665152e-05, 4.554917803034186e-04, 4.133165891592701e-04, 1.509649434592575e-04, 1.546300676030408e-06, 2.003679112143194e-04, 3.043799952138215e-04, 4.400830725595976e-05, 7.476230084042375e-05, 3.145368551486172e-05, 1.093146303901449e-04, 3.475639949707935e-04, -4.706189472926781e-05, 7.698713937619081e-05, 7.427712844219059e-06, 7.648189144674688e-05, 6.082381150918081e-05]
 comparison_W1[2]=[1.196250013890676e-05, 1.150000025518239e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, 1.169999995909166e-05, -1.085229181141282e-04, 1.932800005306489e-05, 2.912875017500482e-05, 3.56966736974561e-05, 2.039025484918966e-04, 2.221484223506801e-05, 2.468333271584318e-05, 2.86230007186532e-04, 1.392027516461288e-04, 3.136266522536365e-05, 1.539225020678714e-04, 2.239500017215808e-04, 2.384533317914854e-04, 3.185674897395074e-04, 2.041233286339169e-05, 6.786333451600513e-06, 1.006500042421976e-05, 6.280224983735631e-05, 2.134783260165326e-05, 8.528150012716651e-04, 2.38383342900003e-04, 1.805749964357043e-04, 4.511000064667314e-04, 6.111433256107072e-04, 2.672399914202591e-04, 6.754100060788914e-05, 5.200083212306102e-04, 4.803975143780311e-04, 1.177775033283979e-04, -1.121783211904889e-05, 1.93736666891103e-04, 3.250749898143113e-04, 5.173763449420221e-05, 9.257366424814487e-05, 3.506399909383617e-05, 1.295866596046835e-04, 3.938333344801019e-04, 2.435597541989409e-05, -1.916666573379189e-05, 2.882366616783353e-05, 8.155799907399341e-05, 5.160000000614673e-05]
-comparison_W7[1]=[1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 1.714435056783259e-04, 4.210193866553406e-04, 4.100913574802689e-05, -8.760448945395183e-05, 1.428272955875355e-04, 6.305769989012333e-05, -3.435888274301154e-05, -3.323926483669008e-04, 7.946738181635738e-04, -6.858483422547579e-05, -1.22739973012358e-04, 3.552938427310437e-04, 3.423097252380103e-04, -5.215683709441994e-04, -5.544161866419018e-04, -2.180202697248509e-04, -2.598156682021606e-05, 4.07098705181852e-05, 2.597895714764794e-04, -2.150101742396752e-04, 2.528411690145731e-03, -4.442772994904468e-04, -3.012303191402074e-04, 4.333403537748381e-04, 8.032316574826837e-04, -3.17678414673234e-04, 8.213051827624438e-05, 1.430876413360238e-03, 4.373367115234335e-04, -1.383291902020574e-03, 6.436815477597217e-04, -4.870861667829255e-04, -3.258333826579474e-04, 6.918830835881331e-05, 2.014967092933754e-04, 3.150840275338851e-05, 2.798767017278199e-04, 5.087851973560949e-04, 3.192497615236789e-04, 6.624666430676977e-04, 8.080741569089393e-04, 2.729010418988764e-04, 2.153557434212416e-04]
-comparison_W7[2]=[1.820000034058467e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 5.212033408073087e-04, -7.021499768598006e-05, -1.747005698659147e-04, 9.921457436933854e-05, 1.16061929929856e-04, -3.891858418986278e-05, -3.257499930138389e-04, 8.128800103440881e-04, -1.17668167319304e-04, -2.194999988811711e-05, 3.799400001298636e-04, 4.232333216350525e-04, -4.584599986750012e-04, -3.831724950578064e-04, -2.139341629420718e-04, -2.951599953424496e-05, -1.404999966325704e-05, 2.341974945738912e-04, -2.386753429891542e-04, 3.030699947848916e-03, -2.993641848055025e-04, -2.989300041614721e-04, 5.670497613027691e-04, 9.592591521019737e-04, -2.941616574147095e-04, 1.147502720914417e-04, 1.418666681274772e-03, 5.80011997759963e-04, -1.473674979060888e-03, 6.32725009539475e-04, -4.029725003056228e-04, -3.206587512977422e-04, 4.368616733700036e-05, 2.1317916107364e-04, 3.633040018030442e-05, 3.070575041541209e-04, 5.859333323314786e-04, 3.667599952314049e-04, 7.264066503072778e-04, 8.804183329145114e-04, 3.050799923948943e-04, 2.300000051036477e-04]
-comparison_W10[1]=[5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 5.336372851161286e-05, 2.196024377675106e-04, -6.506564313895069e-05, -2.855927712516859e-05, -2.335210065510063e-04, -5.195607354835374e-04, -1.089324844845881e-05, 1.616873545572161e-04, -1.304575502872467e-03, -2.691762723649541e-04, 1.774841090082191e-05, -6.788363447412848e-04, -9.423086303286254e-04, -3.02638179079319e-04, -4.807774454820901e-04, 1.372224488295615e-04, -4.738745219583506e-06, -6.686894630547613e-05, -3.797100950032472e-04, 1.161444484023377e-04, -4.458333142101764e-03, -3.547929871516924e-04, -2.589953364804387e-04, -1.47259552963078e-03, -2.22178924207886e-03, -4.79077467850099e-04, -2.288549984223209e-04, -2.393595051641266e-03, -1.51076168132325e-03, 7.78005828615278e-04, -8.763162589942416e-04, -1.80783310206607e-04, -6.138807511888444e-04, -1.790508033203272e-04, -3.677145892288536e-04, -1.131624408299103e-04, -5.251323586950699e-04, -1.383532653562725e-03, -4.163243086077273e-04, 2.113938114295403e-04, 2.878241295305391e-04, 1.138882545637898e-04, 8.916879596654326e-05]
+comparison_W7[1]=[1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 1.688661868683994e-04, 4.160471082044145e-04, 4.496645706240088e-05, -8.134588220855221e-05, 1.343514960637072e-04, 3.806051324772852e-05, -2.917149773566052e-05, -3.181259186627964e-04, 7.300281920470297e-04, -7.48498531174846e-05, -1.162142861479272e-04, 3.231821034569293e-04, 2.952328892812754e-04, -5.209821610090633e-04, -5.61675950884819e-04, -2.080970839597285e-04, -1.773874277811653e-05, 4.490426726988517e-05, 2.438954329894235e-04, -2.045359710852305e-04, 2.304291948676109e-03, -4.476688307477162e-04, -3.01989526875938e-04, 3.600706142606213e-04, 6.868854669543604e-04, -3.290412679780275e-04, 7.548964058514684e-05, 1.309569894025723e-03, 3.548644035860586e-04, -1.332293343730271e-03, 6.101696247545382e-04, -4.802085218640665e-04, -3.45163990277797e-04, 6.550953514912786e-05, 1.861400593770668e-04, 3.23505330743501e-05, 2.558954228879884e-04, 4.381865010752032e-04, 3.076760354451835e-04, 6.350975856184959e-04, 7.818837805340687e-04, 2.60749562876299e-04, 2.071696799248457e-04]
+comparison_W7[2]=[1.820000034058467e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 1.809999957913533e-04, 5.212033408073087e-04, -7.021499768598006e-05, -1.747005698659147e-04, 9.921457436933854e-05, 1.160619258371298e-04, -3.891858418986278e-05, -3.257499930138389e-04, 8.128800103440881e-04, -1.17668167319304e-04, -2.194999988811711e-05, 3.799400001298636e-04, 4.232333216350525e-04, -4.584599986750012e-04, -3.831724950578064e-04, -2.139341629420718e-04, -2.951599953424496e-05, -1.404999966325704e-05, 2.341974945738912e-04, -2.386753429891542e-04, 3.030699947848916e-03, -2.993641848055025e-04, -2.989300041614721e-04, 5.670497613027691e-04, 9.592591521019737e-04, -2.941616574147095e-04, 1.147502720914417e-04, 1.418666681274772e-03, 5.80011997759963e-04, -1.473674979060888e-03, 6.32725009539475e-04, -4.029725003056228e-04, -3.206587512977422e-04, 4.368616733700036e-05, 2.1317916107364e-04, 3.633040018030442e-05, 3.070575041541209e-04, 5.859333323314786e-04, 3.667599952314049e-04, 7.264066503072778e-04, 8.804183329145114e-04, 3.050799923948943e-04, 2.300000051036477e-04]
+comparison_W10[1]=[4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 4.457830800674856e-05, 2.083279685272525e-04, -6.472376480815001e-05, -3.098026538888613e-05, -2.224031944575979e-04, -4.88166265313339e-04, -1.482258230680601e-05, 1.489000404641653e-04, -1.232343320734799e-03, -2.562828381390621e-04, 1.111295513207248e-05, -6.415346264839173e-04, -8.903040861090025e-04, -2.972129379243901e-04, -4.678801610134542e-04, 1.247771297736714e-04, -9.088730318277763e-06, -6.699821824440733e-05, -3.596750320866704e-04, 1.053084188121526e-04, -4.20820401981473e-03, -3.461757484668245e-04, -2.517844433896243e-04, -1.390685692895204e-03, -2.092452443515261e-03, -4.593537786665062e-04, -2.190131775569171e-04, -2.260437499110897e-03, -1.425393650618692e-03, 7.26273360196501e-04, -8.217123926927646e-04, -1.823765573014195e-04, -5.857410957105458e-04, -1.722656973773458e-04, -3.485778230242431e-04, -1.103291002800688e-04, -4.969043975385527e-04, -1.306132537623246e-03, -3.903914289548993e-04, 1.830602175323293e-04, 2.613871294306591e-04, 9.484594716923312e-05, 7.27762671886012e-05]
 comparison_W10[2]=[4.925000030198134e-05, 5.00999994983431e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 5.020000025979243e-05, 2.175649965647608e-04, -4.099999569007195e-06, 5.799999969894998e-05, -1.776881327997649e-04, -6.52806931611849e-04, 2.486266603227705e-05, 1.683333384183546e-04, -1.407475019805133e-03, -2.9298000348111e-04, -6.925066777815421e-05, -7.117075053974986e-04, -9.287000090504686e-04, -3.097113355761394e-04, -5.855424958281219e-04, 1.275733313135182e-04, -1.300933448267945e-06, -2.225000025646295e-05, -3.629933235545953e-04, 1.251826617711534e-04, -4.908300023525953e-03, -4.405399858175466e-04, -2.752166765276343e-04, -1.659109946340322e-03, -2.367899989088376e-03, -5.105133214965463e-04, -2.67439991584979e-04, -2.514666753510634e-03, -1.75044166855514e-03, 8.856575097888708e-04, -8.850258247305949e-04, -2.283125083583096e-04, -6.507000070996583e-04, -1.743989103609541e-04, -4.208400038381417e-04, -1.24279999290593e-04, -5.851474800147116e-04, -1.513833312007288e-03, -4.964625253342092e-04, 2.180541659860561e-04, 2.415241650305688e-04, 1.191800006199628e-04, 7.639999967068434e-05]
-comparison_W37[1]=[1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, 1.252416495844955e-06, -9.019270810919504e-05, 5.105797481519403e-06, 2.677762308546031e-05, 2.279700734628723e-05, 1.068952715286287e-04, 1.372509616582344e-05, 4.104440085939132e-05, 1.398562506074086e-04, 7.824915393333261e-05, 2.256811969952347e-05, 8.204025420127436e-05, 1.483331046377619e-04, 1.876973252122601e-04, 2.368931449018419e-04, 2.691331848230523e-05, 6.914099697799733e-06, 6.324929927359335e-06, 2.91936823244517e-05, 2.203486311676291e-05, 4.924731818027794e-04, 1.836375729180873e-04, 1.283734207390808e-04, 2.549405180616304e-04, 3.489213611464947e-04, 1.826152116215477e-04, 3.54800617787987e-05, 2.657044620718807e-04, 2.602287478900204e-04, 1.634808420203626e-04, -1.137833906492839e-05, 1.523650926537812e-04, 2.155724330805242e-04, 2.600505618223299e-05, 4.252374138256225e-05, 1.878319701063447e-05, 6.514321624611815e-05, 2.157285295349235e-04, -4.12514532217756e-05, 1.236185074958485e-05, -4.028327894047834e-05, 3.286161692813039e-05, 2.562439658504445e-05]
+comparison_W37[1]=[2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.576842438429594e-03, 2.428622258206209e-03, 2.633727388456464e-03, 2.665168695772688e-03, 2.669471037406169e-03, 2.808651785016991e-03, 2.642562339703242e-03, 2.677427418529987e-03, 2.87579545751214e-03, 2.752866928155223e-03, 2.658604281023145e-03, 2.774272318929434e-03, 2.887240114311377e-03, 2.926324134071668e-03, 3.007196197286248e-03, 2.650310089811683e-03, 2.63274382489423e-03, 2.635385608300567e-03, 2.685236039881905e-03, 2.651577352856596e-03, 3.544613206759095e-03, 2.91972148232162e-03, 2.832784270867706e-03, 3.069395292550325e-03, 3.241658313199878e-03, 2.923952918499708e-03, 2.687409529462456e-03, 3.102044512828191e-03, 3.08531764584283e-03, 2.801476838067174e-03, 2.705847217390935e-03, 2.865171553567052e-03, 2.982667135074735e-03, 2.670392580330372e-03, 2.70350725390017e-03, 2.656390117481351e-03, 2.738488937417666e-03, 3.00705935806036e-03, 2.639829777181149e-03, 2.445344068109989e-03, 2.365854841967424e-03, 2.56178991869092e-03, 2.574271289631724e-03]
 comparison_W37[2]=[2.08749995067592e-07, -1.727200005916529e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -2.459999905113364e-06, -1.047252504698311e-04, 1.608900047358474e-05, 3.250124946741076e-05, 1.531372555425643e-05, 1.277401402148826e-04, 1.803439998184331e-05, 4.005999993144845e-05, 1.511000044411048e-04, 9.96982520155143e-05, 2.048336665514701e-05, 8.330324839334936e-05, 1.270499982638285e-04, 1.830925012473017e-04, 2.307700022356585e-04, 2.809366613898116e-05, 5.56131654472362e-06, 5.760000021837186e-06, 2.630908294425656e-05, 3.149433405875849e-05, 4.112499917391688e-04, 1.761877488267297e-04, 1.374129201091516e-04, 2.696750091854483e-04, 3.541666700039059e-04, 1.936975010903552e-04, 3.858124910038896e-05, 2.787499921396375e-04, 2.872400012953828e-04, 1.923199999146163e-04, -5.33493339753477e-05, 1.516733293343956e-04, 2.332875010324642e-04, 3.210208259891563e-05, 5.044833262218162e-05, 1.985800001421012e-05, 7.015549878512199e-05, 2.289999974891543e-04, -1.97287488845177e-05, -5.138533306308091e-05, -3.507833402788189e-05, 3.877100025420077e-05, 1.949999932548963e-05]
diff --git a/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_TwinHouses_BuildingO5_Exp1_2Port.txt b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_TwinHouses_BuildingO5_Exp1_2Port.txt
new file mode 100644
index 0000000000..d5e374e3d3
--- /dev/null
+++ b/IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Examples_TwinHouses_BuildingO5_Exp1_2Port.txt
@@ -0,0 +1,19 @@
+last-generated=2024-10-30
+statistics-initialization=
+{
+  "nonlinear": "17, 10, 8, 11, 10, 8, 11, 7",
+  "numerical Jacobians": "0"
+}
+statistics-simulation=
+{
+  "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0",
+  "nonlinear": "7, 3, 6, 1, 1, 1, 1, 1, 1, 1, 1",
+  "number of continuous time states": "442",
+  "numerical Jacobians": "0"
+}
+time=[1.5e+07, 2.35872e+07]
+struct.W40.crackOrOperableDoor.m1_flow=[3.96963432431221e-02, 3.985523248712221e-02, 9.351935038963953e-02, 7.811982452869415e-02, 7.330268810192744e-02, 7.157726635535558e-02, 7.071045160293579e-02, 7.013304869333903e-02, 6.969672054052353e-02, 6.935365259647369e-02, 6.908192535241445e-02, 6.886605948209762e-02, 6.869518369436264e-02, 6.855987131595612e-02, 6.84528245528539e-02, 6.836800128221512e-02, 6.830084969600042e-02, 6.82478415966034e-02, 6.820586830377579e-02, 6.817277749379476e-02, 6.814658045768737e-02, 6.812581896781922e-02, 6.810937037070593e-02, 6.809644689162572e-02, 6.808618605136871e-02, 6.8078118065993e-02, 6.807177166144053e-02, 6.806677371263505e-02, 6.806277473767598e-02, 6.805959403514862e-02, 6.805707961320877e-02, 6.805512398481368e-02, 6.80536170800527e-02, 6.805244147777557e-02, 6.805150012175241e-02, 6.80507093667984e-02, 6.80501189827919e-02, 6.80496530731519e-02, 6.804927567640941e-02, 6.804898768663406e-02, 6.804877469937007e-02, 6.804868737856547e-02, 6.804853349924088e-02, 6.804838707049687e-02, 6.804833749930064e-02, 6.804825514554977e-02, 6.804826070864996e-02, 6.804818024237951e-02, 6.804816782474518e-02, 6.804819772640865e-02, 6.804816921552022e-02, 6.8048155605793e-02, 6.804820160071055e-02, 6.804820289214453e-02, 6.80481743812561e-02, 6.804817368586859e-02, 6.804818550745646e-02, 6.804818660020828e-02, 6.804819405078888e-02, 6.903046329816183e-02, 6.335708349943162e-02, 6.085011492172877e-02, 6.264878956020856e-02, 6.125741533469409e-02, 6.620264877875646e-02, 6.589518934488296e-02, 6.707511693239213e-02, 6.756727357705435e-02, 1.680679498116175e-01, 7.05286955833435e-02, 1.312299519777298e-01, 1.233500975370407e-01, 1.502637791633606e-01, 5.503407637278239e-02, 1.012505053480466e-01, 1.014087423682213e-01, 1.165534117817879e-01, 7.532158210873605e-02, 1.485978937149048e-01, 1.453616197903951e-01, 1.686139166355133e-01, 1.645319479703903e-01, 1.694258626302083e-01, 1.25174545844396e-01, 8.380045801401138e-02, 6.938193142414092e-02, 6.645762542883556e-02, 6.27524110674858e-02, 6.303089727958043e-02, 1.473426653941472e-01, 1.542991876602173e-01, 1.485897421836853e-01, 1.342084513107936e-01, 1.062699028849602e-01, 8.287600268920263e-02, 5.898093556364378e-02, 1.244723013043404e-01, 1.275826861461004e-01, 1.248055481910706e-01, 1.342954695224762e-01, 1.3797926902771e-01]
+struct.W1.propsBus_a.port_1.m_flow=[5.371185761759989e-05, 7.619541206319506e-05, 7.626659101030479e-05, 7.613483496243133e-05, 7.607120525790378e-05, 7.603994066206118e-05, 7.602417696034536e-05, 7.60160317683282e-05, 7.601170926742877e-05, 7.600935030495748e-05, 7.600802734183768e-05, 7.600725075462833e-05, 7.600678538437932e-05, 7.600649405503646e-05, 7.600630643234277e-05, 7.600618118885905e-05, 7.600609387736768e-05, 7.600603566970676e-05, 7.600599201396108e-05, 7.600595563417301e-05, 7.600593380630016e-05, 7.600591925438493e-05, 7.600590470246971e-05, 7.600589015055448e-05, 7.600588287459686e-05, 7.600587559863925e-05, 7.600587559863925e-05, 7.600586832268164e-05, 7.600586832268164e-05, 7.600586104672402e-05, 7.600586104672402e-05, 7.600586104672402e-05, 7.600586104672402e-05, 7.600586104672402e-05, 7.600585377076641e-05, 7.600585377076641e-05, 7.600585377076641e-05, 7.600585377076641e-05, 7.600585377076641e-05, 7.600585377076641e-05, 7.600585377076641e-05, 7.600585377076641e-05, 7.600585377076641e-05, 7.600585377076641e-05, 7.600585377076641e-05, 7.600585377076641e-05, 7.600585377076641e-05, 7.600585377076641e-05, 7.600585377076641e-05, 7.600585377076641e-05, 7.600585377076641e-05, 7.600585377076641e-05, 7.600585377076641e-05, 7.600585377076641e-05, 7.600585377076641e-05, 7.600585377076641e-05, 7.600585377076641e-05, 7.600585377076641e-05, 7.600585377076641e-05, 5.877683555202869e-05, 8.204936457332224e-05, 8.082837807402636e-05, 8.135010857138875e-05, 1.1483499656606e-04, 7.760513428365811e-05, 7.851428090361878e-05, 1.575357728870586e-04, 1.065284414410902e-04, 7.830695055114727e-05, 1.163213391555473e-04, 1.468117183928068e-04, 1.447533517299841e-04, 1.701557514024898e-04, 6.467342493124306e-05, 6.085330571901674e-05, 6.576689338544384e-05, 6.875090640581524e-05, 5.49392733470692e-05, 4.527708108071238e-04, 1.455667541207125e-04, 1.102755214863767e-04, 2.227535494603217e-04, 3.04994136483098e-04, 1.487017888575792e-04, 6.869892502436414e-05, 2.540911159788569e-04, 2.36693211675932e-04, 1.023725920822471e-04, 4.843376722419635e-05, 1.202900449667747e-04, 1.649454847211018e-04, 7.418927154503763e-05, 8.065972554807862e-05, 6.670741742709652e-05, 9.282647486543283e-05, 1.861611138641213e-04, 1.78402302753966e-05, 6.529139878693968e-05, 4.060375407182922e-05, 7.1992592420429e-05, 6.373439828166738e-05]
+struct.W7.propsBus_a.port_1.m_flow=[2.364216488786042e-04, 3.169665198462705e-04, 3.203754010610283e-04, 3.205098398029804e-04, 3.205522145920744e-04, 3.205676097422838e-04, 3.205754025839269e-04, 3.205805780210843e-04, 3.205844639645269e-04, 3.205875027924776e-04, 3.205898722323278e-04, 3.205917760108908e-04, 3.205932723358274e-04, 3.205944485186289e-04, 3.205953689757735e-04, 3.205961256753653e-04, 3.205967077519745e-04, 3.205971450855335e-04, 3.205975226592273e-04, 3.205978136975318e-04, 3.205980465281755e-04, 3.205982211511582e-04, 3.205983666703105e-04, 3.205984830856323e-04, 3.205985703971237e-04, 3.205986286047846e-04, 3.205986868124455e-04, 3.20598715916276e-04, 3.205987741239369e-04, 3.205988032277673e-04, 3.205988032277673e-04, 3.205988323315978e-04, 3.205988323315978e-04, 3.205988614354283e-04, 3.205988614354283e-04, 3.205988614354283e-04, 3.205988614354283e-04, 3.205988614354283e-04, 3.205988905392587e-04, 3.205988905392587e-04, 3.205988905392587e-04, 3.205988905392587e-04, 3.205988905392587e-04, 3.205988905392587e-04, 3.205988905392587e-04, 3.205988905392587e-04, 3.205988905392587e-04, 3.205988905392587e-04, 3.205988905392587e-04, 3.205988905392587e-04, 3.205988905392587e-04, 3.205988905392587e-04, 3.205988905392587e-04, 3.205988905392587e-04, 3.205988905392587e-04, 3.205988905392587e-04, 3.205988905392587e-04, 3.205988905392587e-04, 3.205988905392587e-04, 4.413489652021477e-04, 3.22782009607181e-04, 2.783086232375354e-04, 3.086007562786585e-04, 2.601066898932913e-04, 2.891321255204578e-04, 1.965557700411106e-04, 5.121289961971343e-04, 2.947172724331419e-04, 2.816055431806793e-04, 3.815288748592138e-04, 3.32868939343219e-04, -6.943196135883532e-05, -1.207344414433464e-04, 2.065910367916028e-04, 2.473430188062291e-04, 2.746718819253147e-04, 2.903818905663987e-04, 1.853845835042497e-04, 1.253665145486593e-03, -4.916592617519204e-05, 1.336383342277259e-04, 3.977334511000663e-04, 4.892314256479342e-04, 1.239935861667618e-04, 2.311732957605273e-04, 7.494311158855756e-04, 3.99479993696635e-04, -5.535688565578311e-04, 4.489472857676446e-04, -5.003367958124727e-05, 2.297298196936027e-05, 2.801103653231015e-04, 2.92920763992394e-04, 2.607251552399248e-04, 3.180681801556299e-04, 3.162870785066237e-04, 2.538217348046601e-04, 4.123480788742503e-04, 4.762406530790031e-04, 2.861789870075881e-04, 2.566928160376847e-04]
+struct.W10.propsBus_a.port_1.m_flow=[1.705449831206352e-04, 2.339375932933763e-04, 2.427509923775991e-04, 2.426884527085349e-04, 2.426697527213643e-04, 2.426635881420225e-04, 2.42660652147606e-04, 2.426586886091779e-04, 2.426571546432873e-04, 2.426559117157012e-04, 2.426549035590142e-04, 2.426540886517614e-04, 2.426534343976527e-04, 2.426529099466279e-04, 2.426525024930015e-04, 2.426521677989513e-04, 2.426519058644772e-04, 2.426516875857487e-04, 2.426515275146812e-04, 2.426513965474442e-04, 2.426512946840376e-04, 2.426512073725462e-04, 2.426511491648853e-04, 2.426510909572244e-04, 2.426510473014787e-04, 2.426510181976482e-04, 2.426509890938178e-04, 2.426509745419025e-04, 2.426509599899873e-04, 2.426509454380721e-04, 2.426509308861569e-04, 2.426509308861569e-04, 2.426509163342416e-04, 2.426509163342416e-04, 2.426509163342416e-04, 2.426509163342416e-04, 2.426509017823264e-04, 2.426509017823264e-04, 2.426509017823264e-04, 2.426509017823264e-04, 2.426509017823264e-04, 2.426509017823264e-04, 2.426509017823264e-04, 2.426509017823264e-04, 2.426509017823264e-04, 2.426509017823264e-04, 2.426509017823264e-04, 2.426509017823264e-04, 2.426509017823264e-04, 2.426509017823264e-04, 2.426509017823264e-04, 2.426509017823264e-04, 2.426509017823264e-04, 2.426509017823264e-04, 2.426509017823264e-04, 2.426509017823264e-04, 2.426509017823264e-04, 2.426509017823264e-04, 2.426509017823264e-04, 3.15843541175127e-04, 2.487895311787724e-04, 2.390317744963492e-04, 1.806756071211984e-04, -9.666868345448165e-05, 2.358594501856714e-04, 2.589435103194167e-04, -5.379876983352005e-04, 1.799345274533456e-04, 2.302896772744134e-04, -1.560020569013432e-04, -3.568292964094629e-04, 5.522967180392394e-05, -1.349407198722474e-04, 2.258748386520892e-04, 2.078798888639237e-04, 2.155204711016268e-04, 1.654177923531583e-05, 2.05216637502114e-04, -2.091831937432289e-03, 3.840197217262661e-05, 8.579025792035585e-05, -6.4401515875943e-04, -1.02228655324628e-03, -1.045340873921911e-04, 1.087300985818729e-04, -1.101026148535311e-03, -6.409825035370887e-04, 4.905249620787799e-04, -3.129805764183402e-04, 1.303867372917011e-04, -2.208050806075334e-04, 1.6065244776352e-04, 5.706463106131802e-05, 1.809682027669623e-04, -1.071728130530876e-04, -6.171137210913002e-04, -1.253780277329497e-04, 1.909126570293059e-04, 2.168373639384906e-04, 1.875616679899394e-04, 1.721973094390705e-04]
+struct.W37.propsBus_a.port_1.m_flow=[7.734288942629064e-07, -1.883115735836327e-05, 5.048419552622363e-06, 6.039407835487509e-06, 6.754553329907746e-06, 7.224666690793432e-06, 7.520935014326824e-06, 7.703661782822262e-06, 7.814912338896344e-06, 7.88203913543839e-06, 7.922100182137608e-06, 7.945894115740278e-06, 7.959795948409009e-06, 7.967874929211878e-06, 7.972502025950234e-06, 7.975111111591105e-06, 7.976533524924889e-06, 7.977265486260876e-06, 7.977612658578438e-06, 7.977746330046406e-06, 7.977766472322401e-06, 7.977729183039628e-06, 7.977669071503138e-06, 7.977604121454837e-06, 7.977540917636361e-06, 7.97748422579995e-06, 7.97743564665628e-06, 7.977394488989376e-06, 7.97736031624178e-06, 7.977332643349655e-06, 7.97730954218423e-06, 7.977291716088075e-06, 7.977277164172847e-06, 7.977266577654518e-06, 7.977258016277726e-06, 7.977249879331794e-06, 7.977244422363583e-06, 7.977239874890074e-06, 7.977236236911267e-06, 7.977233508427162e-06, 7.977231689437758e-06, 7.97723082844944e-06, 7.977229543030263e-06, 7.977228051458951e-06, 7.977227881686606e-06, 7.977226596267429e-06, 7.977227141964249e-06, 7.977226232469548e-06, 7.977226232469548e-06, 7.977226232469548e-06, 7.977226232469548e-06, 7.977226232469548e-06, 7.977226232469548e-06, 7.977227141964249e-06, 7.977226232469548e-06, 7.977226232469548e-06, 7.977226232469548e-06, 7.977227141964249e-06, 7.977227141964249e-06, -2.02999155105014e-05, 8.248919948528055e-06, 1.156311831437051e-05, 9.581041475209277e-06, 5.056307577433472e-05, 4.0449906403713e-06, 1.376574916018095e-05, 6.561857997439802e-05, 2.385169626601661e-05, -2.264184535306413e-05, 5.180280335480347e-05, 7.851441575136656e-05, 9.276519568326573e-05, 1.142586005153134e-04, 2.992816948487113e-05, 4.026712238555774e-05, 4.352347605163231e-05, 5.358977427628512e-05, 4.207261076468664e-05, 2.37116728676483e-04, 9.325447822144877e-05, 4.912761808858098e-05, 1.240268340916373e-04, 1.693349228783821e-04, 8.594911661930383e-05, 1.195251730678137e-05, 1.265582104679197e-04, 1.315207276881362e-04, 8.307510928716511e-05, -8.028940016326184e-06, 6.590255623450502e-05, 9.924728656187653e-05, -9.389908069958135e-06, 1.171350599179277e-05, 1.925461219798308e-05, 4.957341351352322e-05, 1.181534651550464e-04, -1.53629185660975e-05, -1.043884864581439e-06, -2.312166944382928e-05, 7.47774889532593e-06, 1.620327680029732e-06]
diff --git a/IDEAS/Resources/Scripts/BuildingsPy/conf.yml b/IDEAS/Resources/Scripts/BuildingsPy/conf.yml
index 9bb0d1e51e..bb4810b326 100644
--- a/IDEAS/Resources/Scripts/BuildingsPy/conf.yml
+++ b/IDEAS/Resources/Scripts/BuildingsPy/conf.yml
@@ -1,3 +1,9 @@
+- model_name: IDEAS.Examples.Tutorial.Example10
+  dymola:
+    time_out: 900
+- model_name: IDEAS.Examples.Tutorial.Example9
+  dymola:
+    time_out: 3600
 - model_name: IDEAS.Fluid.Examples.FlowSystem.Basic
   openmodelica:
     comment: '''omc'' caused ''simulation terminated by an assertion at initialization''.'
@@ -14,7 +20,12 @@
   openmodelica:
     comment: '''omc'' caused ''simulation terminated by an assertion at initialization''.'
     simulate: false
+- model_name: IDEAS.Fluid.FixedResistances.Validation.PlugFlowPipes.MSLAIT
+  dymola:
+    time_out: 900
 - model_name: IDEAS.Fluid.FixedResistances.Validation.PlugFlowPipes.PlugFlowAIT
+  dymola:
+    time_out: 900
   openmodelica:
     comment: timed out after 300 seconds
     simulate: false
diff --git a/IDEAS/Resources/Scripts/Dymola/Airflow/Multizone/Examples/TrickleVentIDEAS.mos b/IDEAS/Resources/Scripts/Dymola/Airflow/Multizone/Examples/TrickleVentIDEAS.mos
new file mode 100644
index 0000000000..19cb9fb01a
--- /dev/null
+++ b/IDEAS/Resources/Scripts/Dymola/Airflow/Multizone/Examples/TrickleVentIDEAS.mos
@@ -0,0 +1,2 @@
+simulateModel("IDEAS.Airflow.Multizone.Examples.TrickleVentIDEAS", stopTime=2592000, numberOfIntervals=0, outputInterval=600, tolerance=1e-06, resultFile="TrickleVentIDEAS");
+createPlot(id=1, position={55, 55, 584, 361}, y={"tabDat_m_flow.m_flow", "vent.m_flow"}, range={0.0, 2600000.0, -0.08, 0.039999999999999994}, grid=true, colors={{28,108,200}, {0,0,0}}, displayUnits={"kg/s", "kg/s"});
diff --git a/IDEAS/Resources/Scripts/Dymola/Airflow/Multizone/Validation/LargeHorizontalOpening.mos b/IDEAS/Resources/Scripts/Dymola/Airflow/Multizone/Validation/LargeHorizontalOpening.mos
new file mode 100644
index 0000000000..1e7d315520
--- /dev/null
+++ b/IDEAS/Resources/Scripts/Dymola/Airflow/Multizone/Validation/LargeHorizontalOpening.mos
@@ -0,0 +1,5 @@
+simulateModel("IDEAS.Airflow.Multizone.Validation.LargeHorizontalOpening", stopTime=300, method="Cvode", tolerance=1e-12, resultFile="LargeHorizontalOpening");
+createPlot(id=1, position={0, 0, 1319, 716}, y={"OpeningflowDiff"}, range={0.0, 300.0, -2000.0, 500.0}, grid=true, subPlot=103, colors={{28,108,200}}, timeUnit="s", displayUnits={"kg/s"});
+createPlot(id=1, position={0, 0, 1319, 716}, y={"MF_Orifice.y", "MF_Doormodel.y"}, range={0.0, 300.0, 0.0, 2000.0}, autoscale=false, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}}, range2={0.76, 0.96}, timeUnit="s");
+createPlot(id=1, position={0, 0, 1319, 716}, y={"Opening_Orifice.dp", "Opening_CrackOrOperableDoor.doo.dpAB[1]"}, range={0.0, 300.0, -0.1, 0.1}, autoscale=false, grid=true, subPlot=102, colors={{238,46,47}, {28,108,200}}, range2={0.785, 0.8200000000000001}, timeUnit="s", displayUnits={"Pa", "Pa"});
+
diff --git a/IDEAS/Resources/Scripts/Dymola/Buildings/Components/Examples/AirflowOptions.mos b/IDEAS/Resources/Scripts/Dymola/Buildings/Components/Examples/AirflowOptions.mos
new file mode 100644
index 0000000000..a49cd7233e
--- /dev/null
+++ b/IDEAS/Resources/Scripts/Dymola/Buildings/Components/Examples/AirflowOptions.mos
@@ -0,0 +1,8 @@
+simulateModel("IDEAS.Buildings.Components.Examples.AirflowBoxModel", stopTime=3e+06, method="Dassl", tolerance=1e-06, resultFile="AirflowOptions");
+
+createPlot(id=1, position={0, 0, 629, 701}, 
+y={"Energy_Only.BoxModel.airModel.ACH", "Energy_n50Corr.BoxModel.airModel.ACH", "IAQ_1port.BoxModel.airModel.ACH", "IAQ_1port_trickle.BoxModel.airModel.ACH", "IAQ_2Port.BoxModel.airModel.ACH"}, 
+range={0.0, 1250000.0, 0.0, 0.12}, 
+grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}}, 
+timeUnit="s", 
+displayUnits={"1/h", "1/h", "1/h", "1/h", "1/h"});
diff --git a/IDEAS/Resources/Scripts/Dymola/Buildings/Components/Examples/CavityInternalWall.mos b/IDEAS/Resources/Scripts/Dymola/Buildings/Components/Examples/CavityInternalWall.mos
new file mode 100644
index 0000000000..824f39006f
--- /dev/null
+++ b/IDEAS/Resources/Scripts/Dymola/Buildings/Components/Examples/CavityInternalWall.mos
@@ -0,0 +1,10 @@
+simulateModel("IDEAS.Buildings.Components.Examples.CavityInternalWall", stopTime=1000000, method="Lsodar", tolerance=1e-06, resultFile="CavityInternalWall");
+
+createPlot(id=1, 
+y={"zone1.TSensor", "zone.TSensor"}, 
+range={0.0, 1000000.0, 274.0, 294.0}, 
+grid=true, 
+leftTitleType=1, 
+bottomTitleType=1, 
+colors={{0,0,255}, {255,0,0}});
+createPlot(id=1, position={0, 0, 1549, 435}, y={"zone.airModel.phi", "zone1.airModel.phi"}, range={0.0, 1000000.0, 0.64, 0.88}, erase=false, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}});
diff --git a/IDEAS/Resources/Scripts/Dymola/Buildings/Components/Examples/RectangularZoneTemplate.mos b/IDEAS/Resources/Scripts/Dymola/Buildings/Components/Examples/RectangularZoneTemplate.mos
new file mode 100644
index 0000000000..4f99341fe4
--- /dev/null
+++ b/IDEAS/Resources/Scripts/Dymola/Buildings/Components/Examples/RectangularZoneTemplate.mos
@@ -0,0 +1,2 @@
+simulateModel("IDEAS.Buildings.Components.Examples.RectangularZoneTemplate", startTime=0, stopTime=604800, method="Lsodar", tolerance=1e-06, resultFile="RectangularZoneTemplate");
+createPlot(id=1, position={0, 0, 1283, 740}, y={"Zone.TSensor"}, range={0.0, 620000.0, 5.0, 21.0}, grid=true, colors={{28,108,200}});
diff --git a/IDEAS/Resources/Scripts/Dymola/Buildings/Components/Examples/RectangularZoneTemplateOnePort.mos b/IDEAS/Resources/Scripts/Dymola/Buildings/Components/Examples/RectangularZoneTemplateOnePort.mos
new file mode 100644
index 0000000000..a82bb2fad8
--- /dev/null
+++ b/IDEAS/Resources/Scripts/Dymola/Buildings/Components/Examples/RectangularZoneTemplateOnePort.mos
@@ -0,0 +1,3 @@
+simulateModel("IDEAS.Buildings.Components.Examples.RectangularZoneTemplateOnePort", startTime=0, stopTime=604800, method="Lsodar", tolerance=1e-06, resultFile="RectangularZoneTemplateOnePort");
+createPlot(id=1, position={0, 0, 1283, 740}, y={"Zone.TSensor"}, range={0.0, 620000.0, 5.0, 21.0}, grid=true, colors={{28,108,200}});
+createPlot(id=1, position={0, 0, 1283, 740}, y={"Zone.airModel.ACH"}, range={0.0, 620000.0, -0.1, 0.4}, grid=true, subPlot=102, colors={{28,108,200}}, displayUnits={"1/h"});
diff --git a/IDEAS/Resources/Scripts/Dymola/Buildings/Components/Examples/RectangularZoneTemplateTwoPort.mos b/IDEAS/Resources/Scripts/Dymola/Buildings/Components/Examples/RectangularZoneTemplateTwoPort.mos
new file mode 100644
index 0000000000..94bb5bdb7b
--- /dev/null
+++ b/IDEAS/Resources/Scripts/Dymola/Buildings/Components/Examples/RectangularZoneTemplateTwoPort.mos
@@ -0,0 +1,3 @@
+simulateModel("IDEAS.Buildings.Components.Examples.RectangularZoneTemplateTwoPort", startTime=0, stopTime=604800, method="Lsodar", tolerance=1e-06, resultFile="RectangularZoneTemplateTwoPort");
+createPlot(id=1, position={0, 0, 1283, 740}, y={"Zone.TSensor"}, range={0.0, 620000.0, 5.0, 21.0}, grid=true, colors={{28,108,200}});
+createPlot(id=1, position={0, 0, 1283, 740}, y={"Zone.airModel.ACH"}, range={0.0, 620000.0, -0.1, 0.4}, grid=true, subPlot=102, colors={{28,108,200}}, displayUnits={"1/h"});
diff --git a/IDEAS/Resources/Scripts/Dymola/Buildings/Examples/TwoStoreyBoxes.mos b/IDEAS/Resources/Scripts/Dymola/Buildings/Examples/TwoStoreyBoxes.mos
new file mode 100644
index 0000000000..1c2225284b
--- /dev/null
+++ b/IDEAS/Resources/Scripts/Dymola/Buildings/Examples/TwoStoreyBoxes.mos
@@ -0,0 +1,4 @@
+simulateModel("IDEAS.Buildings.Components.Examples.TwoStoreyBoxes", stopTime=1.2096e+06, method="Dassl", tolerance=1e-12, resultFile="TwoStoreyBoxes");
+createPlot(id=1, position={0, 0, 1521, 716}, y={"Level.intFlo.crackOrOperableDoor.m1_flow"}, range={0.0, 1220000.0, 0.0028, 0.005}, grid=true, subPlot=101, colors={{28,108,200}}, timeUnit="s", displayUnits={"kg/s"});
+createPlot(id=1, position={0, 0, 1521, 716}, y={"Level.intFlo.crackOrOperableDoor.doo.dpAB[1]", "Level.intFlo.crackOrOperableDoor.doo.dpAB[2]"}, range={0.0, 1220000.0, 1.0000000000000002E-06, 4.000000000000001E-06}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"Pa", "Pa"});
+
diff --git a/IDEAS/Resources/Scripts/Dymola/Buildings/Examples/ZoneWithSources.mos b/IDEAS/Resources/Scripts/Dymola/Buildings/Examples/ZoneWithSources.mos
new file mode 100644
index 0000000000..9b8ac0519e
--- /dev/null
+++ b/IDEAS/Resources/Scripts/Dymola/Buildings/Examples/ZoneWithSources.mos
@@ -0,0 +1,4 @@
+simulateModel("IDEAS.Buildings.Examples.ZoneWithSources", stopTime=100000, method="Lsodar", tolerance=1e-06, resultFile="ZoneWithSources");
+createPlot(id=1, position={0, 0, 1301, 714}, y={"zone.phi"}, range={0.0, 100000.0, 0, 1}, erase=false, grid=true, colors={{28,108,200}});
+createPlot(id=1, position={0, 0, 1301, 714}, y={"zone.TSensor"}, range={0.0, 100000.0, 280, 300}, subPlot=2, erase=false, grid=true, colors={{28,108,200}});
+createPlot(id=1, position={0, 0, 1301, 714}, y={"zone.ppm"}, range={0.0, 100000.0, 0, 1000}, subPlot=3, erase=false, grid=true, colors={{28,108,200}});
diff --git a/IDEAS/Resources/Scripts/Dymola/Buildings/Validation/Tests/n50Test2TwoPort.mos b/IDEAS/Resources/Scripts/Dymola/Buildings/Validation/Tests/n50Test2TwoPort.mos
new file mode 100644
index 0000000000..613f8f3765
--- /dev/null
+++ b/IDEAS/Resources/Scripts/Dymola/Buildings/Validation/Tests/n50Test2TwoPort.mos
@@ -0,0 +1,3 @@
+simulateModel("IDEAS.Buildings.Validation.Tests.n50Test2TwoPort", stopTime=3, method="dassl", tolerance=1e-06, resultFile="n50Test2TwoPort");
+
+createPlot(id=1, position={0, 0, 1367, 610}, y={"ach", "ach1"}, range={0.0, 3.0, -0.2, 3.2}, erase=false, grid=true, colors={{28,108,200}, {238,46,47}});
diff --git a/IDEAS/Resources/Scripts/Dymola/Buildings/Validation/Tests/n50Test3TwoPort.mos b/IDEAS/Resources/Scripts/Dymola/Buildings/Validation/Tests/n50Test3TwoPort.mos
new file mode 100644
index 0000000000..e6e25e1b6d
--- /dev/null
+++ b/IDEAS/Resources/Scripts/Dymola/Buildings/Validation/Tests/n50Test3TwoPort.mos
@@ -0,0 +1,3 @@
+simulateModel("IDEAS.Buildings.Validation.Tests.n50Test3TwoPort", stopTime=3, method="dassl", tolerance=1e-06, resultFile="n50Test3TwoPort");
+
+createPlot(id=1, position={0, 0, 1367, 610}, y={"flowDelta"}, range={0.0, 3.0, -0.005, 0.09}, erase=false, grid=true, colors={{28,108,200}});
diff --git a/IDEAS/Resources/Scripts/Dymola/Buildings/Validation/Tests/n50TestTwoPort.mos b/IDEAS/Resources/Scripts/Dymola/Buildings/Validation/Tests/n50TestTwoPort.mos
new file mode 100644
index 0000000000..786b2bc686
--- /dev/null
+++ b/IDEAS/Resources/Scripts/Dymola/Buildings/Validation/Tests/n50TestTwoPort.mos
@@ -0,0 +1,3 @@
+simulateModel("IDEAS.Buildings.Validation.Tests.n50TestTwoPort", stopTime=3, method="dassl", tolerance=1e-06, resultFile="n50TestTwoPort");
+
+createPlot(id=1, position={0, 0, 1367, 610}, y={"ach"}, range={0.0, 3.0, -0.2, 3.2}, grid=true, colors={{28,108,200}});
diff --git a/IDEAS/Resources/Scripts/Dymola/Examples/Tutorial/Example9.mos b/IDEAS/Resources/Scripts/Dymola/Examples/Tutorial/Example9.mos
index 9e42025f8a..da9516c288 100644
--- a/IDEAS/Resources/Scripts/Dymola/Examples/Tutorial/Example9.mos
+++ b/IDEAS/Resources/Scripts/Dymola/Examples/Tutorial/Example9.mos
@@ -1,4 +1,4 @@
-simulateModel("IDEAS.Examples.Tutorial.Example9", startTime=10000000, stopTime=11000000, numberOfIntervals=5000, method="LSodar", tolerance=1e-4, resultFile="Tutorial9");
+simulateModel("IDEAS.Examples.Tutorial.Example9", startTime=10000000, stopTime=11000000, numberOfIntervals=5000, method="LSodar", tolerance=0.00011, resultFile="Tutorial9");
 
 createPlot(id=1, position={0, 0, 965, 656}, y={"rectangularZoneTemplate.ppm", "rectangularZoneTemplate1.ppm"}, range={10000000.0, 11000000.0, 200.0, 1200.0}, erase=false, grid=true, colors={{28,108,200}, {238,46,47}});
 createPlot(id=1, position={0, 0, 965, 326}, y={"conPID1.y", "conPID.y"}, range={10000000.0, 11000000.0, 0.0, 1.0}, erase=false, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}});
diff --git a/IDEAS/Resources/Scripts/Dymola/Examples/TwinHouses/BuildingO5_Exp1_2Port.mos b/IDEAS/Resources/Scripts/Dymola/Examples/TwinHouses/BuildingO5_Exp1_2Port.mos
new file mode 100644
index 0000000000..d60067caeb
--- /dev/null
+++ b/IDEAS/Resources/Scripts/Dymola/Examples/TwinHouses/BuildingO5_Exp1_2Port.mos
@@ -0,0 +1,7 @@
+simulateModel("IDEAS.Examples.TwinHouses.BuildingO5_Exp1_2Port", startTime=1.5e+007, stopTime=2.35872e+007, numberOfIntervals=0, outputInterval=900, method="dassl", tolerance=1e-006, resultFile="BuildingO5_Exp1_2Port");
+
+createPlot(id=1, position={0, 0, 1367, 119}, y={"struct.W40.crackOrOperableDoor.m1_flow"}, range={19900000.0, 21100000.0, 0, 0.3}, autoscale=false, grid=true, subPlot=1, colors={{28,108,200}});
+createPlot(id=1, position={0, 0, 1367, 119}, y={"struct.W1.propsBus_a.port_1.m_flow"}, range={19900000.0, 21100000.0, -0.001, 0.001}, autoscale=false, grid=true, subPlot=2, colors={{28,108,200}});
+createPlot(id=1, position={0, 0, 1367, 119}, y={"struct.W7.propsBus_a.port_1.m_flow"}, range={19900000.0, 21100000.0, -0.005, 0.005}, autoscale=false, grid=true, subPlot=3, colors={{28,108,200}});
+createPlot(id=1, position={0, 0, 1367, 119}, y={"struct.W10.propsBus_a.port_1.m_flow"}, range={19900000.0, 21100000.0, -0.005, 0.005}, autoscale=false, grid=true, subPlot=4, colors={{28,108,200}});
+createPlot(id=1, position={0, 0, 1367, 119}, y={"struct.W37.propsBus_a.port_1.m_flow"}, range={19900000.0, 21100000.0, -0.0005, 0.0005}, autoscale=false, grid=true, subPlot=5, colors={{28,108,200}});
diff --git a/IDEAS/Resources/weatherdata/IdealBoundaryConditions.mos b/IDEAS/Resources/weatherdata/IdealBoundaryConditions.mos
new file mode 100644
index 0000000000..b603723f7b
--- /dev/null
+++ b/IDEAS/Resources/weatherdata/IdealBoundaryConditions.mos
@@ -0,0 +1,37 @@
+#1
+double tab1(2,30)
+#LOCATION,Uccle,VLG,BEL,SRC-TMYx,064470,50.79690,4.35810,1.0,101.0
+#COMMENTS 2,"Based on an existing weather file: 10 degrees dry bulb at night, no wind."
+#DATA PERIODS,1,1,Data,Sunday,1/ 1,12/31
+#C1 Time in seconds. Beginning of a year is 0s.
+#C2 Dry bulb temperature in Celsius at indicated time
+#C3 Dew point temperature in Celsius at indicated time
+#C4 Relative humidity in percent at indicated time
+#C5 Atmospheric station pressure in Pa at indicated time
+#C6 Extraterrestrial horizontal radiation in Wh/m2
+#C7 Extraterrestrial direct normal radiation in Wh/m2
+#C8 Horizontal infrared radiation intensity in Wh/m2
+#C9 Global horizontal radiation in Wh/m2
+#C10 Direct normal radiation in Wh/m2
+#C11 Diffuse horizontal radiation in Wh/m2
+#C12 Averaged global horizontal illuminance in lux during minutes preceding the indicated time
+#C13 Direct normal illuminance in lux during minutes preceding the indicated time
+#C14 Diffuse horizontal illuminance in lux  during minutes preceding the indicated time
+#C15 Zenith luminance in Cd/m2 during minutes preceding the indicated time
+#C16 Wind direction at indicated time. N=0, E=90, S=180, W=270
+#C17 Wind speed in m/s at indicated time
+#C18 Total sky cover at indicated time
+#C19 Opaque sky cover at indicated time
+#C20 Visibility in km at indicated time
+#C21 Ceiling height in m
+#C22 Present weather observation
+#C23 Present weather codes
+#C24 Precipitable water in mm
+#C25 Aerosol optical depth
+#C26 Snow depth in cm
+#C27 Days since last snowfall
+#C28 Albedo
+#C29 Liquid precipitation depth in mm at indicated time
+#C30 Liquid precipitation quantity
+0	10.00	4.60	69	101477	0	0	270	0	0	0	0	0	0	0	270	0.00	0	6	777.7	2000	9	999999999	16	0.2170	0	88	0.190	0.0	0.0	
+1E11	10.00	4.60	69	101477	0	0	270	0	0	0	0	0	0	0	270	0.00	0	6	777.7	2000	9	999999999	16	0.2170	0	88	0.190	0.0	0.0	
