diff --git a/IBPSA/Examples/SimpleHouse.mo b/IBPSA/Examples/SimpleHouse.mo
index 28640bded5..b1aca9becc 100644
--- a/IBPSA/Examples/SimpleHouse.mo
+++ b/IBPSA/Examples/SimpleHouse.mo
@@ -126,7 +126,7 @@ model SimpleHouse
     m1_flow_nominal=mAir_flow_nominal,
     m2_flow_nominal=mAir_flow_nominal,
     eps=0.85) "Heat exchanger for heat recuperation"
-    annotation (Placement(transformation(extent={{-45,124},{-75,156}})));
+    annotation (Placement(transformation(extent={{-61,124},{-91,156}})));
   Modelica.Blocks.Logical.Hysteresis hysRad(uLow=273.15 + 20, uHigh=273.15 + 22)
     "Hysteresis controller for radiator"
     annotation (Placement(transformation(extent={{-80,-120},{-60,-100}})));
@@ -156,10 +156,20 @@ model SimpleHouse
     m_flow_nominal=mAir_flow_nominal,
     dp_nominal=0,
     redeclare package Medium = MediumAir) "Cooling for supply air"
-    annotation (Placement(transformation(extent={{30,140},{50,120}})));
+    annotation (Placement(transformation(extent={{48,140},{68,120}})));
   Modelica.Blocks.Sources.Constant TSupAirCoo(k=273.15 + 20)
     "Cooling setpoint for supply air"
     annotation (Placement(transformation(extent={{0,90},{20,110}})));
+  IBPSA.Fluid.Sensors.TemperatureTwoPort TFanInl(
+    redeclare final package Medium = MediumAir,
+    final m_flow_nominal=mAir_flow_nominal,
+    tau=0) "Temperature at fan inlet"
+    annotation (Placement(transformation(extent={{-50,120},{-30,140}})));
+  IBPSA.Fluid.Sensors.TemperatureTwoPort TFanOut(
+    redeclare final package Medium = MediumAir,
+    final m_flow_nominal=mAir_flow_nominal,
+    tau=0) "Temperature at fan outlet"
+    annotation (Placement(transformation(extent={{6,120},{26,140}})));
 equation
   connect(conRes.port_a, zon.heatPort)
     annotation (Line(points={{110,30},{110,40},{160,40}},   color={191,0,0}));
@@ -171,7 +181,8 @@ equation
           1.77636e-15},{160,1.77636e-15}},
                          color={191,0,0}));
   connect(TOut.T, weaBus.TDryBul)
-    annotation (Line(points={{-82,0},{-130,0}},           color={0,0,127}));
+    annotation (Line(points={{-82,0},{-106,0},{-106,0.05},{-129.95,0.05}},
+                                                          color={0,0,127}));
   connect(TOut.port, walRes.port_a)
     annotation (Line(points={{-60,0},{60,0}},     color={191,0,0}));
   connect(heaWat.port_b, rad.port_a) annotation (Line(points={{80,-130},{120,-130}},
@@ -183,7 +194,7 @@ equation
   connect(senTemZonAir.port, zon.heatPort) annotation (Line(points={{120,180},{160,
           180},{160,40}},                      color={191,0,0}));
   connect(bouAir.ports[1], hexRec.port_b1) annotation (Line(points={{-100,139},{
-          -100,149.6},{-75,149.6}},
+          -100,162},{-91,162},{-91,149.6}},
                               color={0,127,255}));
   connect(rad.heatPortCon, zon.heatPort) annotation (Line(points={{128,-122.8},{
           128,40},{160,40}},                    color={191,0,0}));
@@ -199,14 +210,12 @@ equation
           118}},           color={0,0,127}));
   connect(gaiWin.y, win.Q_flow) annotation (Line(points={{41,-40},{60,-40}},
                            color={0,0,127}));
-  connect(gaiWin.u, weaBus.HGloHor) annotation (Line(points={{18,-40},{-130,-40},
-          {-130,0}},             color={0,0,127}));
+  connect(gaiWin.u, weaBus.HGloHor) annotation (Line(points={{18,-40},{-129.95,-40},
+          {-129.95,0.05}},       color={0,0,127}));
   connect(booToInt.u, not1.y) annotation (Line(points={{-2,-150},{-11,-150},{-11,
           -110},{-19,-110}}, color={255,0,255}));
   connect(booToInt.y, pum.stage) annotation (Line(points={{21,-150},{130,-150},{
           130,-168}},       color={255,127,0}));
-  connect(hexRec.port_b2, fan.port_a) annotation (Line(points={{-45,130.4},{-30,
-          130.4},{-30,130},{-20,130}}, color={0,127,255}));
   connect(vavDam.port_b, zon.ports[1])
     annotation (Line(points={{120,130},{140,130},{140,50},{169,50}},
                                                           color={0,127,255}));
@@ -219,24 +228,32 @@ equation
   connect(TSetRoo.y,conDam. u_m) annotation (Line(points={{61,100},{70,100},{70,
           82},{90,82},{90,88}},
                          color={0,0,127}));
-  connect(fan.port_b, cooAir.port_a)
-    annotation (Line(points={{0,130},{30,130}},   color={0,127,255}));
   connect(cooAir.port_b, vavDam.port_a)
-    annotation (Line(points={{50,130},{100,130}},         color={0,127,255}));
-  connect(TSupAirCoo.y, cooAir.TSet) annotation (Line(points={{21,100},{24,100},
-          {24,122},{28,122}},color={0,0,127}));
-  connect(bouAir.T_in, weaBus.TDryBul) annotation (Line(points={{-122,144},{
-          -130,144},{-130,0}},  color={0,0,127}));
+    annotation (Line(points={{68,130},{100,130}},         color={0,127,255}));
+  connect(TSupAirCoo.y, cooAir.TSet) annotation (Line(points={{21,100},{34,100},
+          {34,122},{46,122}},color={0,0,127}));
+  connect(bouAir.T_in, weaBus.TDryBul) annotation (Line(points={{-122,144},{-129.95,
+          144},{-129.95,0.05}}, color={0,0,127}));
   connect(bouAir.ports[2], hexRec.port_a2) annotation (Line(points={{-100,141},{
-          -100,130.4},{-75,130.4}}, color={0,127,255}));
-  connect(hexRec.port_a1, zon.ports[2]) annotation (Line(points={{-45,149.6},{171,
-          149.6},{171,50}}, color={0,127,255}));
+          -100,118},{-91,118},{-91,130.4}},
+                                    color={0,127,255}));
+  connect(hexRec.port_a1, zon.ports[2]) annotation (Line(points={{-61,149.6},{138,
+          149.6},{138,50},{171,50}},
+                            color={0,127,255}));
   connect(conRes.port_b, walCap.port) annotation (Line(points={{110,10},{110,0},
           {122,0},{122,1.77636e-15},{160,1.77636e-15}}, color={191,0,0}));
   connect(win.port, walCap.port) annotation (Line(points={{80,-40},{110,-40},{110,
           0},{132,0},{132,1.77636e-15},{160,1.77636e-15}}, color={191,0,0}));
   connect(rad.heatPortRad, walCap.port) annotation (Line(points={{132,-122.8},{132,
           1.77636e-15},{160,1.77636e-15}}, color={191,0,0}));
+  connect(hexRec.port_b2, TFanInl.port_a) annotation (Line(points={{-61,130.4},{
+          -60,130},{-50,130}}, color={0,127,255}));
+  connect(TFanInl.port_b, fan.port_a)
+    annotation (Line(points={{-30,130},{-20,130}}, color={0,127,255}));
+  connect(fan.port_b, TFanOut.port_a)
+    annotation (Line(points={{0,130},{6,130}}, color={0,127,255}));
+  connect(TFanOut.port_b, cooAir.port_a)
+    annotation (Line(points={{26,130},{48,130}}, color={0,127,255}));
   annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-220,
             -220},{220,220}}), graphics={
         Rectangle(
@@ -287,6 +304,12 @@ equation
     Documentation(revisions="<html>
 <ul>
 <li>
+August 5, 2024, by Hongxiang Fu:<br/>
+Added two-port temperature sensors to replace <code>sta_?.T</code>
+in reference results. This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1913\">#1913</a>.
+</li>
+<li>
 September 15, 2023, by Jelger Jansen:<br/>
 Move the example model to <a href=\"modelica://IBPSA.Examples\">IBPSA.Examples</a>, 
 update the information section, and revise lay-out.<br/>
diff --git a/IBPSA/Examples/Tutorial/SimpleHouse/SimpleHouse6.mo b/IBPSA/Examples/Tutorial/SimpleHouse/SimpleHouse6.mo
index aee5eb15c2..6458f0f879 100644
--- a/IBPSA/Examples/Tutorial/SimpleHouse/SimpleHouse6.mo
+++ b/IBPSA/Examples/Tutorial/SimpleHouse/SimpleHouse6.mo
@@ -15,7 +15,7 @@ model SimpleHouse6 "Free cooling model"
     dpDamper_nominal=dpAir_nominal)
     "Damper" annotation (Placement(transformation(extent={{-10,10},{10,
             -10}}, origin={110,130})));
-  Fluid.Movers.Preconfigured.FlowControlled_dp fan(
+  IBPSA.Fluid.Movers.Preconfigured.FlowControlled_dp fan(
     redeclare package Medium = MediumAir,
     show_T=true,
     dp_nominal=dpAir_nominal,
@@ -52,11 +52,21 @@ model SimpleHouse6 "Free cooling model"
   Modelica.Blocks.Math.BooleanToReal booRea3(realTrue=dpAir_nominal)
     "Boolean to real"
     annotation (Placement(transformation(extent={{30,80},{10,100}})));
+  IBPSA.Fluid.Sensors.TemperatureTwoPort TFanInl(
+    redeclare final package Medium = MediumAir,
+    final m_flow_nominal=mAir_flow_nominal,
+    tau=0) "Temperature at fan inlet"
+    annotation (Placement(transformation(extent={{-40,120},{-20,140}})));
+  IBPSA.Fluid.Sensors.TemperatureTwoPort TFanOut(
+    redeclare final package Medium = MediumAir,
+    final m_flow_nominal=mAir_flow_nominal,
+    tau=0) "Temperature at fan outlet"
+    annotation (Placement(transformation(extent={{20,120},{40,140}})));
 equation
   connect(hexRec.port_a1, zon.ports[1]) annotation (Line(points={{-55,149.6},{169,
           149.6},{169,50},{170,50}},     color={0,127,255}));
-  connect(bouAir.T_in, weaBus.TDryBul) annotation (Line(points={{-122,144},{-130,
-          144},{-130,0}},       color={0,0,127}));
+  connect(bouAir.T_in, weaBus.TDryBul) annotation (Line(points={{-122,144},{-129.95,
+          144},{-129.95,0.05}}, color={0,0,127}));
   connect(vavDam.port_b, zon.ports[2]) annotation (Line(points={{120,130},{142,130},
           {142,50},{170,50}},
                            color={0,127,255}));
@@ -64,12 +74,8 @@ equation
     annotation (Line(points={{101,90},{110,90},{110,118}}, color={0,0,127}));
   connect(hysAir.y, booRea2.u)
     annotation (Line(points={{50,99},{50,90},{78,90}}, color={255,0,255}));
-  connect(vavDam.port_a, fan.port_b)
-    annotation (Line(points={{100,130},{10,130}}, color={0,127,255}));
   connect(bouAir.ports[1], hexRec.port_a2) annotation (Line(points={{-100,139},{
           -100,130.4},{-85,130.4}},   color={0,127,255}));
-  connect(fan.port_a, hexRec.port_b2) annotation (Line(points={{-10,130},{-32,130},
-          {-32,130.4},{-55,130.4}}, color={0,127,255}));
   connect(hexRec.port_b1, bouAir.ports[2]) annotation (Line(points={{-85,149.6},
           {-100,149.6},{-100,141}}, color={0,127,255}));
   connect(booRea1.y, pum.m_flow_in) annotation (Line(points={{21,-150},{100,
@@ -80,12 +86,26 @@ equation
     annotation (Line(points={{9,90},{0,90},{0,118}}, color={0,0,127}));
   connect(booRea3.u, hysAir.y)
     annotation (Line(points={{32,90},{50,90},{50,99}}, color={255,0,255}));
+  connect(hexRec.port_b2, TFanInl.port_a) annotation (Line(points={{-55,130.4},{
+          -54,130},{-40,130}}, color={0,127,255}));
+  connect(TFanInl.port_b, fan.port_a)
+    annotation (Line(points={{-20,130},{-10,130}}, color={0,127,255}));
+  connect(vavDam.port_a, TFanOut.port_b)
+    annotation (Line(points={{100,130},{40,130}}, color={0,127,255}));
+  connect(TFanOut.port_a, fan.port_b)
+    annotation (Line(points={{20,130},{10,130}}, color={0,127,255}));
   annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-220,
             -220},{220,220}})),
     experiment(Tolerance=1e-6, StopTime=1e+06),
     Documentation(revisions="<html>
 <ul>
 <li>
+August 5, 2024, by Hongxiang Fu:<br/>
+Added two-port temperature sensors to replace <code>sta_?.T</code>
+in reference results. This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1913\">#1913</a>.
+</li>
+<li>
 September 4, 2023, by Jelger Jansen:<br/>
 First implementation.
 </li>
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Examples_SimpleHouse.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Examples_SimpleHouse.txt
index c7c87ba983..8a1c2820b2 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Examples_SimpleHouse.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Examples_SimpleHouse.txt
@@ -1,4 +1,4 @@
-last-generated=2022-12-19
+last-generated=2024-08-05
 statistics-initialization=
 {
   "nonlinear": "5",
@@ -15,5 +15,5 @@ time=[0e+00, 3.1536e+07]
 zon.T=[2.931499938964844e+02, 2.938165893554688e+02, 2.948394775390625e+02, 2.951160888671875e+02, 2.933800964355469e+02, 2.949007263183594e+02, 2.937331848144531e+02, 2.949746704101562e+02, 2.94963623046875e+02, 2.944449768066406e+02, 2.949704284667969e+02, 2.932081604003906e+02, 2.945489196777344e+02, 2.949959106445312e+02, 2.950682983398438e+02, 2.951320190429688e+02, 2.94079345703125e+02, 2.940500793457031e+02, 2.93251708984375e+02, 2.933990783691406e+02, 2.932026672363281e+02, 2.936112365722656e+02, 2.94181396484375e+02, 2.951331481933594e+02, 2.93716552734375e+02, 2.932184143066406e+02, 2.950964050292969e+02, 2.934932556152344e+02, 2.940997009277344e+02, 2.96098876953125e+02, 2.970375061035156e+02, 2.962566223144531e+02, 2.963293762207031e+02, 2.957511291503906e+02, 2.968561096191406e+02, 2.973106079101562e+02, 2.972330017089844e+02, 2.974053955078125e+02, 2.972986145019531e+02, 2.974791564941406e+02, 2.975252075195312e+02, 2.975371398925781e+02, 2.97523681640625e+02, 2.975829772949219e+02, 2.975098876953125e+02, 2.974816284179688e+02, 2.975858459472656e+02, 2.975862426757812e+02, 2.97521728515625e+02, 2.975988159179688e+02, 2.974871520996094e+02, 2.975801086425781e+02, 2.97568115234375e+02, 2.975059204101562e+02, 2.975872802734375e+02, 2.97644775390625e+02, 2.975877075195312e+02, 2.975962524414062e+02, 2.976087341308594e+02, 2.975819396972656e+02, 2.975243835449219e+02, 2.975371398925781e+02, 2.974706420898438e+02, 2.975225830078125e+02, 2.975242614746094e+02, 2.97474609375e+02, 2.974830017089844e+02, 2.974789428710938e+02, 2.974937438964844e+02, 2.974887390136719e+02, 2.974450988769531e+02, 2.974119873046875e+02, 2.970668029785156e+02, 2.966719360351562e+02, 2.971568603515625e+02, 2.972576599121094e+02, 2.966737670898438e+02, 2.959289245605469e+02, 2.957213745117188e+02, 2.9481201171875e+02, 2.944169616699219e+02, 2.947103271484375e+02, 2.939195556640625e+02, 2.940602722167969e+02, 2.940169677734375e+02, 2.937295227050781e+02, 2.931671142578125e+02, 2.933880310058594e+02, 2.950133056640625e+02, 2.940987243652344e+02, 2.951145935058594e+02, 2.951122131347656e+02, 2.931902465820312e+02, 2.951495361328125e+02, 2.950298767089844e+02, 2.942200012207031e+02, 2.936318054199219e+02, 2.943542785644531e+02, 2.931622009277344e+02, 2.951441650390625e+02, 2.932530822753906e+02]
 heaWat.u=[1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00]
 vavDam.y=[2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.554025948047638e-01, 2.5e-01, 3.29160213470459e-01, 3.752192556858063e-01, 3.871423006057739e-01, 3.736800849437714e-01, 4.329911172389984e-01, 3.599009811878204e-01, 3.316185176372528e-01, 4.358335733413696e-01, 4.362431168556213e-01, 3.717152774333954e-01, 4.48826789855957e-01, 3.371655642986298e-01, 4.301155805587769e-01, 4.181102514266968e-01, 3.559122383594513e-01, 4.37283456325531e-01, 4.947710633277893e-01, 4.377006590366364e-01, 4.462576806545258e-01, 4.58719402551651e-01, 4.31939035654068e-01, 3.743763864040375e-01, 3.871388733386993e-01, 3.206299543380737e-01, 3.725927770137787e-01, 3.742593824863434e-01, 3.246186673641205e-01, 3.33006888628006e-01, 3.289314806461334e-01, 3.437333405017853e-01, 3.387492895126343e-01, 2.950859367847443e-01, 2.619776129722595e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01]
-fan.sta_a.T=[2.883200073242188e+02, 2.90562744140625e+02, 2.883319396972656e+02, 2.920919799804688e+02, 2.906665649414062e+02, 2.918930969238281e+02, 2.898759155273438e+02, 2.901109619140625e+02, 2.89111572265625e+02, 2.908656616210938e+02, 2.898673706054688e+02, 2.899195861816406e+02, 2.912050170898438e+02, 2.915523681640625e+02, 2.904037475585938e+02, 2.919996948242188e+02, 2.906729431152344e+02, 2.909330749511719e+02, 2.910764465332031e+02, 2.914588623046875e+02, 2.901047668457031e+02, 2.916375122070312e+02, 2.910815734863281e+02, 2.919293212890625e+02, 2.92504638671875e+02, 2.907031555175781e+02, 2.918236694335938e+02, 2.916273803710938e+02, 2.919345703125e+02, 2.964934997558594e+02, 2.946243896484375e+02, 2.942006225585938e+02, 2.941107788085938e+02, 2.946829528808594e+02, 2.956533813476562e+02, 2.953515014648438e+02, 2.958345642089844e+02, 2.946706848144531e+02, 2.963741760253906e+02, 2.969334106445312e+02, 2.952789306640625e+02, 2.982248229980469e+02, 2.966036376953125e+02, 2.979476318359375e+02, 2.962223205566406e+02, 2.965768737792969e+02, 2.962604675292969e+02, 2.985108032226562e+02, 2.948568725585938e+02, 2.9739111328125e+02, 2.97256591796875e+02, 2.973014831542969e+02, 2.968691101074219e+02, 2.978995361328125e+02, 2.976356811523438e+02, 2.979755554199219e+02, 2.981031188964844e+02, 2.967643127441406e+02, 2.979931640625e+02, 2.976788024902344e+02, 2.957882080078125e+02, 2.974443054199219e+02, 2.967668151855469e+02, 2.963309020996094e+02, 2.979713745117188e+02, 2.966609191894531e+02, 2.968990478515625e+02, 2.969129638671875e+02, 2.965253295898438e+02, 2.967495727539062e+02, 2.962158203125e+02, 2.966826782226562e+02, 2.9535986328125e+02, 2.960602416992188e+02, 2.956841430664062e+02, 2.958915100097656e+02, 2.955003356933594e+02, 2.934600830078125e+02, 2.941224365234375e+02, 2.925818786621094e+02, 2.921419067382812e+02, 2.928599243164062e+02, 2.915148315429688e+02, 2.920691223144531e+02, 2.939436645507812e+02, 2.926375732421875e+02, 2.904195556640625e+02, 2.91980224609375e+02, 2.920718688964844e+02, 2.905301208496094e+02, 2.907398986816406e+02, 2.901202697753906e+02, 2.900093688964844e+02, 2.924759521484375e+02, 2.906303100585938e+02, 2.909695129394531e+02, 2.895492553710938e+02, 2.903458862304688e+02, 2.896872253417969e+02, 2.911193237304688e+02, 2.893901062011719e+02]
-fan.sta_b.T=[2.886552734375e+02, 2.908980102539062e+02, 2.886672058105469e+02, 2.924272155761719e+02, 2.910018310546875e+02, 2.922283630371094e+02, 2.90211181640625e+02, 2.904462280273438e+02, 2.894468383789062e+02, 2.91200927734375e+02, 2.9020263671875e+02, 2.902548522949219e+02, 2.91540283203125e+02, 2.918876342773438e+02, 2.90739013671875e+02, 2.923349609375e+02, 2.910082092285156e+02, 2.91268310546875e+02, 2.914117126464844e+02, 2.917941284179688e+02, 2.904400329589844e+02, 2.919727783203125e+02, 2.914168395996094e+02, 2.922645874023438e+02, 2.928399047851562e+02, 2.910384216308594e+02, 2.92158935546875e+02, 2.91962646484375e+02, 2.922698364257812e+02, 2.968287353515625e+02, 2.949596252441406e+02, 2.94535888671875e+02, 2.944460144042969e+02, 2.950182189941406e+02, 2.959886474609375e+02, 2.95686767578125e+02, 2.961697998046875e+02, 2.950059509277344e+02, 2.967094421386719e+02, 2.972686767578125e+02, 2.956141967773438e+02, 2.9856005859375e+02, 2.969389038085938e+02, 2.982828979492188e+02, 2.965575866699219e+02, 2.969121398925781e+02, 2.965957336425781e+02, 2.988460693359375e+02, 2.95192138671875e+02, 2.977263793945312e+02, 2.975918579101562e+02, 2.976367492675781e+02, 2.972043762207031e+02, 2.982347717285156e+02, 2.97970947265625e+02, 2.983108215332031e+02, 2.984383850097656e+02, 2.970995788574219e+02, 2.983284301757812e+02, 2.980140686035156e+02, 2.961234741210938e+02, 2.977795715332031e+02, 2.971020812988281e+02, 2.966661682128906e+02, 2.98306640625e+02, 2.969961853027344e+02, 2.972343139648438e+02, 2.972482299804688e+02, 2.968605651855469e+02, 2.970848388671875e+02, 2.965510864257812e+02, 2.970179443359375e+02, 2.956951293945312e+02, 2.963955078125e+02, 2.960194091796875e+02, 2.962267761230469e+02, 2.958355712890625e+02, 2.937953491210938e+02, 2.944577026367188e+02, 2.929171447753906e+02, 2.924771728515625e+02, 2.931951904296875e+02, 2.918500671386719e+02, 2.924043884277344e+02, 2.942789306640625e+02, 2.929728393554688e+02, 2.907548217773438e+02, 2.923154907226562e+02, 2.924071350097656e+02, 2.908653869628906e+02, 2.910751647949219e+02, 2.904555358886719e+02, 2.903446350097656e+02, 2.928112182617188e+02, 2.90965576171875e+02, 2.913047790527344e+02, 2.89884521484375e+02, 2.906811218261719e+02, 2.900224914550781e+02, 2.9145458984375e+02, 2.897253723144531e+02]
+TFanInl.T=[2.883200073242188e+02, 2.90562744140625e+02, 2.883319396972656e+02, 2.920919799804688e+02, 2.906665649414062e+02, 2.918930969238281e+02, 2.898759155273438e+02, 2.901109619140625e+02, 2.89111572265625e+02, 2.908656616210938e+02, 2.898673706054688e+02, 2.899195861816406e+02, 2.912050170898438e+02, 2.915523681640625e+02, 2.904037475585938e+02, 2.919996948242188e+02, 2.906729431152344e+02, 2.909330749511719e+02, 2.910764465332031e+02, 2.914588623046875e+02, 2.901047668457031e+02, 2.916375122070312e+02, 2.910815734863281e+02, 2.919293212890625e+02, 2.92504638671875e+02, 2.907031555175781e+02, 2.918236694335938e+02, 2.916273803710938e+02, 2.919345703125e+02, 2.964934997558594e+02, 2.946243896484375e+02, 2.942006225585938e+02, 2.941107788085938e+02, 2.946829528808594e+02, 2.956533813476562e+02, 2.953515014648438e+02, 2.958345642089844e+02, 2.946706848144531e+02, 2.963741760253906e+02, 2.969334106445312e+02, 2.952789306640625e+02, 2.982248229980469e+02, 2.966036376953125e+02, 2.979476318359375e+02, 2.962223205566406e+02, 2.965768737792969e+02, 2.962604675292969e+02, 2.985108032226562e+02, 2.948568725585938e+02, 2.9739111328125e+02, 2.97256591796875e+02, 2.973014831542969e+02, 2.968691101074219e+02, 2.978995361328125e+02, 2.976356811523438e+02, 2.979755554199219e+02, 2.981031188964844e+02, 2.967643127441406e+02, 2.979931640625e+02, 2.976788024902344e+02, 2.957882080078125e+02, 2.974443054199219e+02, 2.967668151855469e+02, 2.963309020996094e+02, 2.979713745117188e+02, 2.966609191894531e+02, 2.968990478515625e+02, 2.969129638671875e+02, 2.965253295898438e+02, 2.967495727539062e+02, 2.962158203125e+02, 2.966826782226562e+02, 2.9535986328125e+02, 2.960602416992188e+02, 2.956841430664062e+02, 2.958915100097656e+02, 2.955003356933594e+02, 2.934600830078125e+02, 2.941224365234375e+02, 2.925818786621094e+02, 2.921419067382812e+02, 2.928599243164062e+02, 2.915148315429688e+02, 2.920691223144531e+02, 2.939436645507812e+02, 2.926375732421875e+02, 2.904195556640625e+02, 2.91980224609375e+02, 2.920718688964844e+02, 2.905301208496094e+02, 2.907398986816406e+02, 2.901202697753906e+02, 2.900093688964844e+02, 2.924759521484375e+02, 2.906303100585938e+02, 2.909695129394531e+02, 2.895492553710938e+02, 2.903458862304688e+02, 2.896872253417969e+02, 2.911193237304688e+02, 2.893901062011719e+02]
+TFanOut.T=[2.886552734375e+02, 2.908980102539062e+02, 2.886672058105469e+02, 2.924272155761719e+02, 2.910018310546875e+02, 2.922283630371094e+02, 2.90211181640625e+02, 2.904462280273438e+02, 2.894468383789062e+02, 2.91200927734375e+02, 2.9020263671875e+02, 2.902548522949219e+02, 2.91540283203125e+02, 2.918876342773438e+02, 2.90739013671875e+02, 2.923349609375e+02, 2.910082092285156e+02, 2.91268310546875e+02, 2.914117126464844e+02, 2.917941284179688e+02, 2.904400329589844e+02, 2.919727783203125e+02, 2.914168395996094e+02, 2.922645874023438e+02, 2.928399047851562e+02, 2.910384216308594e+02, 2.92158935546875e+02, 2.91962646484375e+02, 2.922698364257812e+02, 2.968287353515625e+02, 2.949596252441406e+02, 2.94535888671875e+02, 2.944460144042969e+02, 2.950182189941406e+02, 2.959886474609375e+02, 2.95686767578125e+02, 2.961697998046875e+02, 2.950059509277344e+02, 2.967094421386719e+02, 2.972686767578125e+02, 2.956141967773438e+02, 2.9856005859375e+02, 2.969389038085938e+02, 2.982828979492188e+02, 2.965575866699219e+02, 2.969121398925781e+02, 2.965957336425781e+02, 2.988460693359375e+02, 2.95192138671875e+02, 2.977263793945312e+02, 2.975918579101562e+02, 2.976367492675781e+02, 2.972043762207031e+02, 2.982347717285156e+02, 2.97970947265625e+02, 2.983108215332031e+02, 2.984383850097656e+02, 2.970995788574219e+02, 2.983284301757812e+02, 2.980140686035156e+02, 2.961234741210938e+02, 2.977795715332031e+02, 2.971020812988281e+02, 2.966661682128906e+02, 2.98306640625e+02, 2.969961853027344e+02, 2.972343139648438e+02, 2.972482299804688e+02, 2.968605651855469e+02, 2.970848388671875e+02, 2.965510864257812e+02, 2.970179443359375e+02, 2.956951293945312e+02, 2.963955078125e+02, 2.960194091796875e+02, 2.962267761230469e+02, 2.958355712890625e+02, 2.937953491210938e+02, 2.944577026367188e+02, 2.929171447753906e+02, 2.924771728515625e+02, 2.931951904296875e+02, 2.918500671386719e+02, 2.924043884277344e+02, 2.942789306640625e+02, 2.929728393554688e+02, 2.907548217773438e+02, 2.923154907226562e+02, 2.924071350097656e+02, 2.908653869628906e+02, 2.910751647949219e+02, 2.904555358886719e+02, 2.903446350097656e+02, 2.928112182617188e+02, 2.90965576171875e+02, 2.913047790527344e+02, 2.89884521484375e+02, 2.906811218261719e+02, 2.900224914550781e+02, 2.9145458984375e+02, 2.897253723144531e+02]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Examples_Tutorial_SimpleHouse_SimpleHouse6.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Examples_Tutorial_SimpleHouse_SimpleHouse6.txt
index 6461262282..584da19981 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Examples_Tutorial_SimpleHouse_SimpleHouse6.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Examples_Tutorial_SimpleHouse_SimpleHouse6.txt
@@ -1,4 +1,4 @@
-last-generated=2024-06-05
+last-generated=2024-08-05
 statistics-initialization=
 {
   "nonlinear": "5, 1, 1, 1",
@@ -15,5 +15,5 @@ time=[0e+00, 1e+06]
 zon.T=[2.931499938964844e+02, 2.945089721679688e+02, 2.9591064453125e+02, 2.966475830078125e+02, 2.943829650878906e+02, 2.942815856933594e+02, 2.942722473144531e+02, 2.942023620605469e+02, 2.961566772460938e+02, 2.945024719238281e+02, 2.941602478027344e+02, 2.941692504882812e+02, 2.941706237792969e+02, 2.941706237792969e+02, 2.941705322265625e+02, 2.941653137207031e+02, 2.941563415527344e+02, 2.941509399414062e+02, 2.944056091308594e+02, 2.951830139160156e+02, 2.965977478027344e+02, 2.966069641113281e+02, 2.957481384277344e+02, 2.950252685546875e+02, 2.945764465332031e+02, 2.943215942382812e+02, 2.94180419921875e+02, 2.960561218261719e+02, 2.962270202636719e+02, 2.950879821777344e+02, 2.945108642578125e+02, 2.942588195800781e+02, 2.941806640625e+02, 2.967988891601562e+02, 2.956056823730469e+02, 2.946774291992188e+02, 2.942577514648438e+02, 2.965518188476562e+02, 2.942180786132812e+02, 2.950231323242188e+02, 2.957951049804688e+02, 2.958897399902344e+02, 2.958036499023438e+02, 2.957058715820312e+02, 2.956015014648438e+02, 2.954901733398438e+02, 2.953814697265625e+02, 2.957745666503906e+02, 2.95923095703125e+02, 2.958970642089844e+02, 2.958109741210938e+02, 2.956842041015625e+02, 2.955548400878906e+02, 2.954227905273438e+02, 2.952863159179688e+02, 2.953405151367188e+02, 2.961509399414062e+02, 2.970860900878906e+02, 2.97620849609375e+02, 2.975162048339844e+02, 2.973799743652344e+02, 2.972396850585938e+02, 2.970963439941406e+02, 2.969541625976562e+02, 2.972663269042969e+02, 2.979443969726562e+02, 2.965866088867188e+02, 2.96625244140625e+02, 2.964942932128906e+02, 2.963471069335938e+02, 2.961507568359375e+02, 2.980345153808594e+02, 2.979453735351562e+02, 2.980507507324219e+02, 2.969282836914062e+02, 2.971327209472656e+02, 2.969210510253906e+02, 2.968065490722656e+02, 2.96587646484375e+02, 2.964854736328125e+02, 2.962903747558594e+02, 2.978039855957031e+02, 2.971773071289062e+02, 2.978541259765625e+02, 2.979232788085938e+02, 2.975360717773438e+02, 2.973730163574219e+02, 2.972575073242188e+02, 2.971753234863281e+02, 2.969627380371094e+02, 2.969119262695312e+02, 2.973591003417969e+02, 2.980840148925781e+02, 2.980621337890625e+02, 2.980009155273438e+02, 2.977578735351562e+02, 2.976857604980469e+02, 2.976209411621094e+02, 2.974058227539062e+02, 2.974420471191406e+02, 2.973437805175781e+02]
 heaWat.u=[1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 vavDam.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-fan.sta_a.T=[2.931499938964844e+02, 2.945089721679688e+02, 2.9591064453125e+02, 2.966475830078125e+02, 2.943829650878906e+02, 2.942815856933594e+02, 2.942722473144531e+02, 2.942023620605469e+02, 2.961566772460938e+02, 2.945024719238281e+02, 2.941602478027344e+02, 2.941692504882812e+02, 2.941706237792969e+02, 2.941706237792969e+02, 2.941705322265625e+02, 2.941653137207031e+02, 2.941563415527344e+02, 2.941509399414062e+02, 2.944056091308594e+02, 2.951830139160156e+02, 2.965977478027344e+02, 2.966069641113281e+02, 2.957481384277344e+02, 2.950252685546875e+02, 2.945764465332031e+02, 2.943215942382812e+02, 2.94180419921875e+02, 2.960561218261719e+02, 2.962270202636719e+02, 2.950879821777344e+02, 2.945108642578125e+02, 2.942588195800781e+02, 2.941806640625e+02, 2.967988891601562e+02, 2.956056823730469e+02, 2.946774291992188e+02, 2.942577514648438e+02, 2.965518188476562e+02, 2.942180786132812e+02, 2.950231323242188e+02, 2.957951049804688e+02, 2.958897399902344e+02, 2.958036499023438e+02, 2.957058715820312e+02, 2.956015014648438e+02, 2.954901733398438e+02, 2.953814697265625e+02, 2.957745666503906e+02, 2.95923095703125e+02, 2.958970642089844e+02, 2.958109741210938e+02, 2.956842041015625e+02, 2.955548400878906e+02, 2.954227905273438e+02, 2.952863159179688e+02, 2.953405151367188e+02, 2.961509399414062e+02, 2.970860900878906e+02, 2.97620849609375e+02, 2.975162048339844e+02, 2.973799743652344e+02, 2.972396850585938e+02, 2.970963439941406e+02, 2.969541625976562e+02, 2.972663269042969e+02, 2.979443969726562e+02, 2.916777954101562e+02, 2.916039428710938e+02, 2.916503295898438e+02, 2.915558776855469e+02, 2.914031677246094e+02, 2.648500061035156e+02, 2.653500061035156e+02, 2.700659484863281e+02, 2.935667114257812e+02, 2.937242126464844e+02, 2.933616638183594e+02, 2.9326806640625e+02, 2.92906982421875e+02, 2.929345703125e+02, 2.92521240234375e+02, 2.978039855957031e+02, 2.93811767578125e+02, 2.944094848632812e+02, 2.93957275390625e+02, 2.931138610839844e+02, 2.929995727539062e+02, 2.930938720703125e+02, 2.931195983886719e+02, 2.927978820800781e+02, 2.930176391601562e+02, 2.939828796386719e+02, 2.949122619628906e+02, 2.946842346191406e+02, 2.94760498046875e+02, 2.942406311035156e+02, 2.944235534667969e+02, 2.943671875e+02, 2.939551086425781e+02, 2.942182312011719e+02, 2.94204833984375e+02]
-fan.sta_b.T=[2.609500122070312e+02, 2.619280090332031e+02, 2.625499877929688e+02, 2.634280090332031e+02, 2.683388977050781e+02, 2.720243530273438e+02, 2.720499877929688e+02, 2.713381958007812e+02, 2.719623107910156e+02, 2.6925e+02, 2.701626892089844e+02, 2.723464965820312e+02, 2.733500061035156e+02, 2.748500061035156e+02, 2.725348815917969e+02, 2.727846984863281e+02, 2.745153503417969e+02, 2.731499938964844e+02, 2.731499938964844e+02, 2.7229443359375e+02, 2.698047180175781e+02, 2.689043273925781e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.698500061035156e+02, 2.706798400878906e+02, 2.716392211914062e+02, 2.7251513671875e+02, 2.704963989257812e+02, 2.680260009765625e+02, 2.676611022949219e+02, 2.660404052734375e+02, 2.6425e+02, 2.58110595703125e+02, 2.604417114257812e+02, 2.657166748046875e+02, 2.6940087890625e+02, 2.682166748046875e+02, 2.657166748046875e+02, 2.637611083984375e+02, 2.618667907714844e+02, 2.5925e+02, 2.581764831542969e+02, 2.604611206054688e+02, 2.616584777832031e+02, 2.608323364257812e+02, 2.561037292480469e+02, 2.546492767333984e+02, 2.542643737792969e+02, 2.530166625976562e+02, 2.509499969482422e+02, 2.541903991699219e+02, 2.587667236328125e+02, 2.602073364257812e+02, 2.569347839355469e+02, 2.549143829345703e+02, 2.536127471923828e+02, 2.520500030517578e+02, 2.519742736816406e+02, 2.514499969482422e+02, 2.582235412597656e+02, 2.619212036132812e+02, 2.920173645019531e+02, 2.919435424804688e+02, 2.919898986816406e+02, 2.918954772949219e+02, 2.917427368164062e+02, 2.648500061035156e+02, 2.653500061035156e+02, 2.700659484863281e+02, 2.939062805175781e+02, 2.940637817382812e+02, 2.937012329101562e+02, 2.936076354980469e+02, 2.9324658203125e+02, 2.93274169921875e+02, 2.9286083984375e+02, 2.978039855957031e+02, 2.941513366699219e+02, 2.947490539550781e+02, 2.942968444824219e+02, 2.934534301757812e+02, 2.933391418457031e+02, 2.934334411621094e+02, 2.934591674804688e+02, 2.93137451171875e+02, 2.933572082519531e+02, 2.943224792480469e+02, 2.952518310546875e+02, 2.950238037109375e+02, 2.9510009765625e+02, 2.945802001953125e+02, 2.947631530761719e+02, 2.947067565917969e+02, 2.94294677734375e+02, 2.945578308105469e+02, 2.945444030761719e+02]
+TFanInl.T=[2.770499877929688e+02, 2.782184753417969e+02, 2.792303161621094e+02, 2.800377807617188e+02, 2.813609313964844e+02, 2.831529541015625e+02, 2.831611022949219e+02, 2.827702941894531e+02, 2.840594787597656e+02, 2.818762512207031e+02, 2.821614685058594e+02, 2.832578735351562e+02, 2.837603149414062e+02, 2.845103149414062e+02, 2.833526916503906e+02, 2.834750061035156e+02, 2.843358459472656e+02, 2.836504821777344e+02, 2.837778015136719e+02, 2.837387390136719e+02, 2.832012329101562e+02, 2.827556457519531e+02, 2.83049072265625e+02, 2.826876220703125e+02, 2.824632263183594e+02, 2.823358154296875e+02, 2.822652282714844e+02, 2.832030639648438e+02, 2.830385131835938e+02, 2.828839111328125e+02, 2.830750427246094e+02, 2.833869934082031e+02, 2.823385314941406e+02, 2.824124450683594e+02, 2.816333923339844e+02, 2.803589172363281e+02, 2.792538757324219e+02, 2.773312072753906e+02, 2.773298950195312e+02, 2.803699035644531e+02, 2.825979919433594e+02, 2.820531921386719e+02, 2.807601623535156e+02, 2.797334899902344e+02, 2.787341613769531e+02, 2.773700866699219e+02, 2.767789916992188e+02, 2.781178283691406e+02, 2.787908020019531e+02, 2.783647155761719e+02, 2.759573669433594e+02, 2.75166748046875e+02, 2.749096069335938e+02, 2.742197265625e+02, 2.731181640625e+02, 2.747654418945312e+02, 2.774588317871094e+02, 2.78646728515625e+02, 2.772778015136719e+02, 2.762153015136719e+02, 2.754963684082031e+02, 2.746448364257812e+02, 2.745353088378906e+02, 2.742020874023438e+02, 2.777449340820312e+02, 2.799328002929688e+02, 2.916777954101562e+02, 2.916039428710938e+02, 2.916503295898438e+02, 2.915558776855469e+02, 2.914031677246094e+02, 2.814422607421875e+02, 2.816476745605469e+02, 2.84058349609375e+02, 2.935667114257812e+02, 2.937242126464844e+02, 2.933616638183594e+02, 2.9326806640625e+02, 2.92906982421875e+02, 2.929345703125e+02, 2.92521240234375e+02, 2.84927001953125e+02, 2.93811767578125e+02, 2.944094848632812e+02, 2.93957275390625e+02, 2.931138610839844e+02, 2.929995727539062e+02, 2.930938720703125e+02, 2.931195983886719e+02, 2.927978820800781e+02, 2.930176391601562e+02, 2.939828796386719e+02, 2.949122619628906e+02, 2.946842346191406e+02, 2.94760498046875e+02, 2.942406311035156e+02, 2.944235534667969e+02, 2.943671875e+02, 2.939551086425781e+02, 2.942182312011719e+02, 2.94204833984375e+02]
+TFanOut.T=[2.770499877929688e+02, 2.782184753417969e+02, 2.792303161621094e+02, 2.800377807617188e+02, 2.813609313964844e+02, 2.831529541015625e+02, 2.831611022949219e+02, 2.827702941894531e+02, 2.840594787597656e+02, 2.818762512207031e+02, 2.821614685058594e+02, 2.832578735351562e+02, 2.837603149414062e+02, 2.845103149414062e+02, 2.833526916503906e+02, 2.834750061035156e+02, 2.843358459472656e+02, 2.836504821777344e+02, 2.837778015136719e+02, 2.837387390136719e+02, 2.832012329101562e+02, 2.827556457519531e+02, 2.83049072265625e+02, 2.826876220703125e+02, 2.824632263183594e+02, 2.823358154296875e+02, 2.822652282714844e+02, 2.832030639648438e+02, 2.830385131835938e+02, 2.828839111328125e+02, 2.830750427246094e+02, 2.833869934082031e+02, 2.823385314941406e+02, 2.824124450683594e+02, 2.816333923339844e+02, 2.803589172363281e+02, 2.792538757324219e+02, 2.773312072753906e+02, 2.773298950195312e+02, 2.803699035644531e+02, 2.825979919433594e+02, 2.820531921386719e+02, 2.807601623535156e+02, 2.797334899902344e+02, 2.787341613769531e+02, 2.773700866699219e+02, 2.767789916992188e+02, 2.781178283691406e+02, 2.787908020019531e+02, 2.783647155761719e+02, 2.759573669433594e+02, 2.75166748046875e+02, 2.749096069335938e+02, 2.742197265625e+02, 2.731181640625e+02, 2.747654418945312e+02, 2.774588317871094e+02, 2.78646728515625e+02, 2.772778015136719e+02, 2.762153015136719e+02, 2.754963684082031e+02, 2.746448364257812e+02, 2.745353088378906e+02, 2.742020874023438e+02, 2.777449340820312e+02, 2.799328002929688e+02, 2.920173645019531e+02, 2.919435424804688e+02, 2.919898986816406e+02, 2.918954772949219e+02, 2.917427368164062e+02, 2.814422607421875e+02, 2.816476745605469e+02, 2.84058349609375e+02, 2.939062805175781e+02, 2.940637817382812e+02, 2.937012329101562e+02, 2.936076354980469e+02, 2.9324658203125e+02, 2.93274169921875e+02, 2.9286083984375e+02, 2.84927001953125e+02, 2.941513366699219e+02, 2.947490539550781e+02, 2.942968444824219e+02, 2.934534301757812e+02, 2.933391418457031e+02, 2.934334411621094e+02, 2.934591674804688e+02, 2.93137451171875e+02, 2.933572082519531e+02, 2.943224792480469e+02, 2.952518310546875e+02, 2.950238037109375e+02, 2.9510009765625e+02, 2.945802001953125e+02, 2.947631530761719e+02, 2.947067565917969e+02, 2.94294677734375e+02, 2.945578308105469e+02, 2.945444030761719e+02]
diff --git a/IBPSA/Resources/Scripts/Dymola/Examples/SimpleHouse.mos b/IBPSA/Resources/Scripts/Dymola/Examples/SimpleHouse.mos
index 82e9fbc0b0..49cdaa4415 100644
--- a/IBPSA/Resources/Scripts/Dymola/Examples/SimpleHouse.mos
+++ b/IBPSA/Resources/Scripts/Dymola/Examples/SimpleHouse.mos
@@ -2,4 +2,4 @@ simulateModel("IBPSA.Examples.SimpleHouse", stopTime=3.1536e+07, method="Lsodar"
 createPlot(id=1, position={0, 0, 792, 1247}, y={"zon.T"}, range={0.0, 32000000.0, 19.5, 24.5}, grid=true, colors={{28,108,200}});
 createPlot(id=1, position={0, 0, 792, 413}, y={"heaWat.u"}, range={0.0, 32000000.0, -0.1, 1.1}, grid=true, subPlot=2, colors={{28,108,200}});
 createPlot(id=1, position={0, 0, 792, 413}, y={"vavDam.y"}, range={0.0, 380.0, 0.098, 0.124}, grid=true, subPlot=3, colors={{28,108,200}});
-createPlot(id=2, position={818, 10, 662, 377}, y={"fan.sta_a.T", "fan.sta_b.T"}, range={0.0, 380.0, 18.0, 22.5}, grid=true, colors={{28,108,200}, {238,46,47}});
+createPlot(id=2, position={818, 10, 662, 377}, y={"TFanInl.T", "TFanOut.T"}, range={0.0, 380.0, 18.0, 22.5}, grid=true, colors={{28,108,200}, {238,46,47}});
diff --git a/IBPSA/Resources/Scripts/Dymola/Examples/Tutorial/SimpleHouse/SimpleHouse6.mos b/IBPSA/Resources/Scripts/Dymola/Examples/Tutorial/SimpleHouse/SimpleHouse6.mos
index 6f301bf5ae..34e2b09862 100644
--- a/IBPSA/Resources/Scripts/Dymola/Examples/Tutorial/SimpleHouse/SimpleHouse6.mos
+++ b/IBPSA/Resources/Scripts/Dymola/Examples/Tutorial/SimpleHouse/SimpleHouse6.mos
@@ -2,4 +2,4 @@ simulateModel("IBPSA.Examples.Tutorial.SimpleHouse.SimpleHouse6", stopTime=1e+06
 createPlot(id=1,position={0, 0, 792, 1247}, y={"zon.T"}, range={0.0, 1e+06, 20, 26}, grid=true, colors={{28,108,200}});
 createPlot(id=1, position={0, 0, 792, 413}, y={"heaWat.u"}, range={0.0, 1e+06, -0.1, 1.1}, grid=true, subPlot=2, colors={{28,108,200}});
 createPlot(id=1, position={0, 0, 792, 413}, y={"vavDam.y"}, range={0.0, 1e+06, -0.1, 1.1}, grid=true, subPlot=3, colors={{28,108,200}});
-createPlot(id=2, position={818, 10, 662, 377}, y={"fan.sta_a.T", "fan.sta_b.T"}, range={0.0, 380.0, 18.0, 22.5}, grid=true, colors={{28,108,200}, {238,46,47}});
+createPlot(id=2, position={818, 10, 662, 377}, y={"TFanInl.T", "TFanOut.T"}, range={0.0, 380.0, 18.0, 22.5}, grid=true, colors={{28,108,200}, {238,46,47}});