From de43d6c6ffb419ebc28dba6fc781efec6a4b370c Mon Sep 17 00:00:00 2001
From: SenHuang19 <jhy1987@gmail.com>
Date: Mon, 6 May 2024 11:24:47 -0400
Subject: [PATCH 01/27] model implementation improve

---
 .../Latent/BaseClasses/Effectiveness.mo       | 16 ++--
 .../Latent/BaseClasses/PartialWheel.mo        | 84 ++++++++-----------
 .../BaseClasses/Validation/Effectiveness.mo   |  4 +-
 .../ThermalWheels/Latent/BypassDampers.mo     | 27 +++---
 .../ThermalWheels/Latent/SpeedControlled.mo   | 39 ++++++---
 5 files changed, 85 insertions(+), 85 deletions(-)

diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Effectiveness.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Effectiveness.mo
index 553edb03963..c81650a0fe3 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Effectiveness.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Effectiveness.mo
@@ -18,8 +18,8 @@ model Effectiveness
     "Part load (75% of the nominal supply flow rate) sensible heat exchanger effectiveness at the heating mode";
   parameter Modelica.Units.SI.Efficiency epsLatHeaPL(final max=1)
     "Part load (75% of the nominal supply flow rate) latent heat exchanger effectiveness at the heating mode";
-  parameter Modelica.Units.SI.VolumeFlowRate VSup_flow_nominal
-    "Nominal supply air flow rate";
+  parameter Modelica.Units.SI.MassFlowRate mSup_flow_nominal
+    "Nominal supply air mass flow rate";
 
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TSup(
     final min=0,
@@ -33,11 +33,11 @@ model Effectiveness
     displayUnit="degC")
     "Exhaust air temperature"
     annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput VSup_flow(final unit="m3/s")
-    "Supply air volumetric flow rate"
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput mSup_flow(final unit="kg/s")
+    "Supply air mass flow rate"
     annotation (Placement(transformation(extent={{-140,60},{-100,100}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput VExh_flow(final unit="m3/s")
-    "Exhaust air volumetric flow rate"
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput mExh_flow(final unit="kg/s")
+    "Exhaust air mass flow rate"
     annotation (Placement(transformation(extent={{-140,20},{-100,60}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput uSpe(
     final unit="1",
@@ -82,11 +82,11 @@ protected
 
 equation
   // Check if the air flows are too unbalanced
-  assert(VSup_flow - 2*VExh_flow < 0 or VExh_flow - 2*VSup_flow < 0,
+  assert(mSup_flow - 2*mExh_flow < 0 or mExh_flow - 2*mSup_flow < 0,
     "In " + getInstanceName() + ": The ratio of the supply flow rate to the exhaust flow rate should be in the range of [0.5, 2].",
     level=AssertionLevel.warning);
   // Calculate the average volumetric air flow and flow rate ratio.
-  rat = (VSup_flow + VExh_flow)/2/VSup_flow_nominal;
+  rat = (mSup_flow +mExh_flow) /2/mSup_flow_nominal;
   // Switch between cooling and heating modes based on the difference between the supply air temperature and the exhaust air temperature
   fraCoo = if (equSen_nominal and equSenPL and equLat_nominal and equLatPL) then 0.5 else Buildings.Utilities.Math.Functions.regStep(TSup-TExh, 1, 0, 1e-5);
 
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/PartialWheel.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/PartialWheel.mo
index 5077d97dd83..8b249d07b58 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/PartialWheel.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/PartialWheel.mo
@@ -2,22 +2,19 @@ within Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BaseClasses;
 partial model PartialWheel
   "Partial model for enthalpy recovery wheel"
   extends Modelica.Blocks.Icons.Block;
-  replaceable package Medium1 =
+  replaceable package Medium =
     Modelica.Media.Interfaces.PartialCondensingGases
-    "Supply air";
-  replaceable package Medium2 =
-    Modelica.Media.Interfaces.PartialCondensingGases
-    "Exhaust air";
-  parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal
+    "Air";
+  parameter Modelica.Units.SI.MassFlowRate mSup_flow_nominal
     "Nominal supply air mass flow rate"
     annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal
+  parameter Modelica.Units.SI.MassFlowRate mExh_flow_nominal
     "Nominal exhaust air mass flow rate"
     annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.PressureDifference dp1_nominal(displayUnit="Pa") = 500
+  parameter Modelica.Units.SI.PressureDifference dpSup_nominal(displayUnit="Pa") = 500
     "Nominal supply air pressure drop"
     annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.PressureDifference dp2_nominal(displayUnit="Pa") = dp1_nominal
+  parameter Modelica.Units.SI.PressureDifference dpExh_nominal(displayUnit="Pa") = dpSup_nominal
     "Nominal exhaust air pressure drop"
     annotation (Dialog(group="Nominal condition"));
   parameter Real P_nominal(final unit="W")
@@ -41,19 +38,19 @@ partial model PartialWheel
     annotation (Dialog(group="Nominal condition"));
   parameter Modelica.Units.SI.Efficiency epsSenCooPL(
     final max=1) = 0.75
-    "Part load (75% of the nominal supply flow rate) sensible heat exchanger effectiveness at the cooling mode"
+    "Part load (75% of the nominal supply mass flow rate) sensible heat exchanger effectiveness at the cooling mode"
     annotation (Dialog(group="Part load effectiveness"));
   parameter Modelica.Units.SI.Efficiency epsLatCooPL(
     final max=1) = 0.75
-    "Part load (75% of the nominal supply flow rate) latent heat exchanger effectiveness at the cooling mode"
+    "Part load (75% of the nominal supply mass flow rate) latent heat exchanger effectiveness at the cooling mode"
     annotation (Dialog(group="Part load effectiveness"));
   parameter Modelica.Units.SI.Efficiency epsSenHeaPL(
     final max=1) = 0.75
-    "Part load (75% of the nominal supply flow rate) sensible heat exchanger effectiveness at the heating mode"
+    "Part load (75% of the nominal supply mass flow rate) sensible heat exchanger effectiveness at the heating mode"
     annotation (Dialog(group="Part load effectiveness"));
   parameter Modelica.Units.SI.Efficiency epsLatHeaPL(
     final max=1) = 0.75
-    "Part load (75% of the nominal supply flow rate) latent heat exchanger effectiveness at the heating mode"
+    "Part load (75% of the nominal supply mass flow rate) latent heat exchanger effectiveness at the heating mode"
     annotation (Dialog(group="Part load effectiveness"));
 
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput P(
@@ -70,32 +67,27 @@ partial model PartialWheel
     annotation (Placement(transformation(extent={{100,-50},{140,-10}}),
         iconTransformation(extent={{100,-50},{140,-10}})));
   Modelica.Fluid.Interfaces.FluidPort_a port_a1(
-    redeclare final package Medium = Medium1)
+    redeclare final package Medium = Medium)
     "Fluid connector a1 of the supply air (positive design flow direction is from port_a1 to port_b1)"
     annotation (Placement(transformation(extent={{-190,70},{-170,90}}),
         iconTransformation(extent={{-110,50},{-90,70}})));
   Modelica.Fluid.Interfaces.FluidPort_b port_b2(
-    redeclare final package Medium = Medium2)
+    redeclare final package Medium = Medium)
     "Fluid connector b2 of the exhaust air (positive design flow direction is from port_a2 to port_b2)"
     annotation (Placement(transformation(extent={{-170,-70},{-190,-50}}),
         iconTransformation(extent={{-90,-70},{-110,-50}})));
   Modelica.Fluid.Interfaces.FluidPort_b port_b1(
-    redeclare final package Medium = Medium1)
+    redeclare final package Medium = Medium)
     "Fluid connector b1 of the supply air (positive design flow direction is from port_a1 to port_b1)"
     annotation (Placement(transformation(extent={{110,70},{90,90}}),
         iconTransformation(extent={{110,50},{90,70}})));
   Modelica.Fluid.Interfaces.FluidPort_a port_a2(
-    redeclare final package Medium = Medium2)
+    redeclare final package Medium = Medium)
     "Fluid connector a2 of the exhaust air (positive design flow direction is from port_a2 to port_b2)"
     annotation (Placement(transformation(extent={{90,-70},{110,-50}})));
 
 protected
-  parameter Medium1.ThermodynamicState sta_nominal=Medium1.setState_pTX(
-      T=Buildings.Utilities.Psychrometrics.Constants.T_ref,
-      p=101325,
-      X=Medium1.X_default)
-   "State of the supply air at the default properties";
-    Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BaseClasses.Effectiveness effCal(
+  Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BaseClasses.Effectiveness effCal(
     final epsSenCoo_nominal=epsSenCoo_nominal,
     final epsLatCoo_nominal=epsLatCoo_nominal,
     final epsSenCooPL=epsSenCooPL,
@@ -104,45 +96,37 @@ protected
     final epsLatHea_nominal=epsLatHea_nominal,
     final epsSenHeaPL=epsSenHeaPL,
     final epsLatHeaPL=epsLatHeaPL,
-    final VSup_flow_nominal=m1_flow_nominal/Medium1.density(sta_nominal))
+    final mSup_flow_nominal=mSup_flow_nominal)
     "Calculates the effectiveness of heat exchange"
     annotation (Placement(transformation(extent={{-100,-10},{-80,10}})));
   Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BaseClasses.HeatExchangerWithInputEffectiveness hex(
-    redeclare package Medium1 = Medium1,
-    redeclare package Medium2 = Medium2,
-    final m1_flow_nominal=m1_flow_nominal,
-    final m2_flow_nominal=m2_flow_nominal,
-    final dp1_nominal=dp1_nominal,
-    final dp2_nominal=dp2_nominal)
+    redeclare package Medium1 = Medium,
+    redeclare package Medium2 = Medium,
+    final m1_flow_nominal=mSup_flow_nominal,
+    final m2_flow_nominal=mExh_flow_nominal,
+    final dp1_nominal=dpSup_nominal,
+    final dp2_nominal=dpExh_nominal)
     "Heat exchanger"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
-  Modelica.Blocks.Sources.RealExpression VSup_flow(
-    final y(final unit="m3/s")=hex.port_a1.m_flow/
-        Medium1.density(state=Medium1.setState_phX(
-        p=hex.port_a1.p,
-        h=hex.port_a1.h_outflow,
-        X=hex.port_a1.Xi_outflow)))
-    "Supply air volume flow rate"
+  Modelica.Blocks.Sources.RealExpression mSup_flow(
+    final y(final unit="kg/s")=hex.port_a1.m_flow)
+    "Supply air mass flow rate"
     annotation (Placement(transformation(extent={{-160,30},{-140,50}})));
-  Modelica.Blocks.Sources.RealExpression VExh_flow(
-    final y(final unit="m3/s")=hex.port_a2.m_flow/
-        Medium2.density(state=Medium2.setState_phX(
-        p=hex.port_a2.p,
-        h=hex.port_a2.h_outflow,
-        X=hex.port_a2.Xi_outflow)))
-    "Exhaust air volume flow rate"
+  Modelica.Blocks.Sources.RealExpression mExh_flow(
+    final y(final unit="kg/s")=hex.port_a2.m_flow)
+    "Exhaust air mass flow rate"
     annotation (Placement(transformation(extent={{-160,10},{-140,30}})));
   Modelica.Blocks.Sources.RealExpression TSup(
-    final y(final unit="K")=Medium1.temperature(
-      Medium1.setState_phX(
+    final y(final unit="K")=Medium.temperature(
+      Medium.setState_phX(
         p=port_a1.p,
         h=inStream(port_a1.h_outflow),
         X=inStream(port_a1.Xi_outflow))))
     "Supply air temperature"
     annotation (Placement(transformation(extent={{-160,-30},{-140,-10}})));
   Modelica.Blocks.Sources.RealExpression TExh(
-    final y(final unit="K")=Medium2.temperature(
-      Medium2.setState_phX(
+    final y(final unit="K")=Medium.temperature(
+      Medium.setState_phX(
         p=port_a2.p,
         h=inStream(port_a2.h_outflow),
         X=inStream(port_a2.Xi_outflow))))
@@ -168,10 +152,10 @@ equation
   connect(port_b2, hex.port_b2)
     annotation (Line(points={{-180,-60},{-40,-60},{-40,-6},{-10,-6}},
         color={0,127,255}));
-  connect(VSup_flow.y, effCal.VSup_flow)
+  connect(mSup_flow.y, effCal.mSup_flow)
     annotation (Line(points={{-139,40},{-110,40},{-110,8},{-102,8}},
         color={0,0,127}));
-  connect(VExh_flow.y, effCal.VExh_flow)
+  connect(mExh_flow.y, effCal.mExh_flow)
     annotation (Line(points={{-139,20},{-120,20},{-120,4},{-102,4}},
         color={0,0,127}));
   connect(epsSen, effCal.epsSen) annotation (Line(points={{120,30},{-60,30},{
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Validation/Effectiveness.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Validation/Effectiveness.mo
index 56ee5ae99c1..7b35542a646 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Validation/Effectiveness.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Validation/Effectiveness.mo
@@ -51,9 +51,9 @@ model Effectiveness
     "Exhaust air flow rate"
     annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
 equation
-  connect(VSup.y, epsCal.VSup_flow)
+  connect(VSup.y, epsCal.mSup_flow)
     annotation (Line(points={{-59,70},{-28,70},{-28,8},{-14,8}}, color={0,0,127}));
-  connect(VExh.y, epsCal.VExh_flow)
+  connect(VExh.y, epsCal.mExh_flow)
     annotation (Line(points={{-59,30},{-40,30},{-40,4},{-14,4}}, color={0,0,127}));
   connect(whSpe.y, epsCal.uSpe)
     annotation (Line(points={{-59,0},{-14,0}}, color={0,0,127}));
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo
index b36e11a4b49..106a91a17bf 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo
@@ -3,6 +3,9 @@ model BypassDampers
   "Enthalpy recovery wheel with bypass dampers"
   extends
     Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BaseClasses.PartialWheel;
+  parameter Modelica.Units.SI.PressureDifference dpDam_nominal(displayUnit="Pa") = 20
+    "Nominal pressure drop of supply air dampers"
+    annotation (Dialog(group="Nominal condition"));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput uBypDamPos(
     final unit="1",
     final min=0,
@@ -15,29 +18,29 @@ model BypassDampers
     annotation (Placement(transformation(extent={{-220,-20},{-180,20}}),
       iconTransformation(extent={{-140,60},{-100,100}})));
   Buildings.Fluid.Actuators.Dampers.Exponential bypDamSup(
-    redeclare package Medium = Medium1,
-    final m_flow_nominal=m1_flow_nominal,
-    final dpDamper_nominal=dp1_nominal)
+    redeclare package Medium = Medium,
+    final m_flow_nominal=mSup_flow_nominal,
+    final dpDamper_nominal=dpDam_nominal)
     "Supply air bypass damper"
     annotation (Placement(transformation(extent={{-60,70},{-40,90}})));
   Buildings.Fluid.Actuators.Dampers.Exponential damSup(
-    redeclare package Medium = Medium1,
-    final m_flow_nominal=m1_flow_nominal,
-    final dpDamper_nominal=dp1_nominal)
+    redeclare package Medium = Medium,
+    final m_flow_nominal=mSup_flow_nominal,
+    final dpDamper_nominal=dpDam_nominal)
     "Supply air damper"
     annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},rotation=0,origin={-50,40})));
   Buildings.Fluid.Actuators.Dampers.Exponential damExh(
-    redeclare package Medium = Medium2,
-    final m_flow_nominal=m2_flow_nominal,
-    final dpDamper_nominal=dp2_nominal)
+    redeclare package Medium = Medium,
+    final m_flow_nominal=mExh_flow_nominal,
+    final dpDamper_nominal=dpDam_nominal)
     "Exhaust air damper"
     annotation (Placement(transformation(
         extent={{10,10},{-10,-10}},rotation=-90,origin={60,-30})));
   Buildings.Fluid.Actuators.Dampers.Exponential bypDamExh(
-    redeclare package Medium = Medium2,
-    final m_flow_nominal=m2_flow_nominal,
-    final dpDamper_nominal=dp2_nominal)
+    redeclare package Medium = Medium,
+    final m_flow_nominal=mExh_flow_nominal,
+    final dpDamper_nominal=dpDam_nominal)
     "Exhaust air bypass damper"
     annotation (Placement(transformation(extent={{0,-70},{-20,-50}})));
 protected
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/SpeedControlled.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/SpeedControlled.mo
index 8086248b8e9..4ab1034d8c6 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/SpeedControlled.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/SpeedControlled.mo
@@ -3,8 +3,23 @@ model SpeedControlled
   "Enthalpy recovery wheel with a variable speed drive"
   extends
     Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BaseClasses.PartialWheel;
-  parameter Real a[:] = {1}
-    "Coefficients for power consumption curve for rotor. The sum of the elements must be equal to 1"
+  parameter Boolean defaultMotorEfficiencyCurve = true "= true, use the default motor efficiency curve"
+    annotation (Dialog(group="Efficiency"));
+  parameter Real table[:,:]=[0.8,1]
+    "Table of motor power efficiency as a function of the wheel speed ratio (first column)"
+    annotation (Dialog(group="Efficiency", enable = not defaultMotorEfficiencyCurve));
+  final parameter
+    Buildings.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters_yMot
+      motorEfficiency_default=
+        Buildings.Fluid.Movers.BaseClasses.Characteristics.motorEfficiencyCurve(
+          P_nominal=P_nominal,
+          eta_max=1)
+    "default motor efficiency  vs. whell speed ratio";
+  final parameter Real xSpe[:] = if defaultMotorEfficiencyCurve then motorEfficiency_default.y else table[:,1]
+    "x-axis support points of the power efficiency curve"
+    annotation (Dialog(group="Efficiency"));
+  final parameter Real[size(xSpe,1)] yeta = if defaultMotorEfficiencyCurve then motorEfficiency_default.eta else table[:,2]
+    "y-axis support points of the power efficiency curve"
     annotation (Dialog(group="Efficiency"));
 
   Buildings.Controls.OBC.CDL.Interfaces.RealInput uSpe(
@@ -15,16 +30,13 @@ model SpeedControlled
         iconTransformation(extent={{-140,-20},{-100,20}})));
 protected
   Modelica.Blocks.Sources.RealExpression PEle(
-    final y=P_nominal*Buildings.Utilities.Math.Functions.polynomial(a=a, x=uSpe))
+    final y=P_nominal*uSpe/Buildings.Utilities.Math.Functions.smoothInterpolation(
+      x=uSpe,
+      xSup=xSpe,
+      ySup=yeta))
     "Electric power consumption"
     annotation (Placement(transformation(extent={{60,-100},{80,-80}})));
 
-initial equation
-  assert(abs(sum(a)-1) < Modelica.Constants.eps,
-         "In " + getInstanceName() + ": Power efficiency curve is wrong. 
-         The sum of the coefficients for power efficiency curve must be 1.",
-         level=AssertionLevel.error);
-
 equation
   connect(P, PEle.y)
     annotation (Line(points={{120,-90},{81,-90}}, color={0,0,127}));
@@ -35,7 +47,7 @@ equation
           {100,-60}}, color={0,127,255}));
   connect(effCal.uSpe, uSpe)
     annotation (Line(points={{-102,0},{-200,0}}, color={0,0,127}));
-annotation (
+    annotation (
    defaultComponentName="whe",
         Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
    graphics={
@@ -63,12 +75,13 @@ The operation of the heat recovery wheel is adjustable by modulating the wheel s
 Accordingly, the power consumption of this wheel is calculated by
 </p>
 <p align=\"center\" style=\"font-style:italic;\">
-P = P_nominal * (a<sub>1</sub> + a<sub>2</sub> uSpe + a<sub>3</sub> uSpe<sup>2</sup> + ...),
+P = P_nominal * eta,
 </p>
 <p>
 where <code>P_nominal</code> is the nominal wheel power consumption,
-<code>uSpe</code> is the wheel speed ratio, 
-and the <code>a[:]</code> are the coefficients for power efficiency curve.
+<code>uSpe</code> is the wheel speed ratio.
+The <code>eta</code> is the motor power efficiency and is obtained from performing a polynomial fit
+based on the user input data table.
 The sum of the coefficients must be <i>1</i>, otherwise the model stops with an error.
 Thus, when the speed ratio <code>uSpe=1</code>, the power consumption is equal to
 nominal consumption <code>P=P_nominal</code>.

From 40a863ca416c7b716e8f6ba3ef7a0798b00a517c Mon Sep 17 00:00:00 2001
From: SenHuang19 <jhy1987@gmail.com>
Date: Wed, 8 May 2024 15:54:36 -0400
Subject: [PATCH 02/27] improve the implementation and examples

---
 .../Latent/BaseClasses/PartialWheel.mo        |  46 ++-
 .../BaseClasses/Validation/Effectiveness.mo   |   2 +-
 .../ThermalWheels/Latent/BypassDampers.mo     |  43 ++-
 .../Latent/Examples/SpaceCooling.mo           | 310 ++++++++++++++++++
 .../ThermalWheels/Latent/Examples/package.mo  |  12 +
 .../Latent/Examples/package.order             |   1 +
 .../ThermalWheels/Latent/SpeedControlled.mo   |  46 ++-
 .../Latent/Validation/BypassDampers.mo        |  27 +-
 .../Latent/Validation/SpeedControlled.mo      | 109 +++---
 .../ThermalWheels/Latent/package.order        |   1 +
 .../Sensible/BaseClasses/Effectiveness.mo     |  16 +-
 .../Sensible/BaseClasses/PartialWheel.mo      | 103 +++---
 .../BaseClasses/Validation/Effectiveness.mo   |   6 +-
 .../ThermalWheels/Sensible/BypassDampers.mo   |  34 +-
 .../Sensible/Examples/SpaceCooling.mo         | 310 ++++++++++++++++++
 .../Sensible/Examples/package.mo              |  12 +
 .../Sensible/Examples/package.order           |   1 +
 .../ThermalWheels/Sensible/SpeedControlled.mo |  69 +++-
 .../Sensible/Validation/BypassDampers.mo      |  29 +-
 .../Sensible/Validation/SpeedControlled.mo    |  96 ++++--
 .../ThermalWheels/Sensible/package.order      |   1 +
 21 files changed, 1007 insertions(+), 267 deletions(-)
 create mode 100644 Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mo
 create mode 100644 Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/package.mo
 create mode 100644 Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/package.order
 create mode 100644 Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo
 create mode 100644 Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/package.mo
 create mode 100644 Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/package.order

diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/PartialWheel.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/PartialWheel.mo
index 8b249d07b58..aec23570544 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/PartialWheel.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/PartialWheel.mo
@@ -66,6 +66,12 @@ partial model PartialWheel
     "Latent heat exchanger effectiveness"
     annotation (Placement(transformation(extent={{100,-50},{140,-10}}),
         iconTransformation(extent={{100,-50},{140,-10}})));
+  Buildings.Fluid.Sensors.MassFlowRate senSupMasFlo(redeclare package Medium = Medium)
+    "Supply air mass flow rate"
+    annotation (Placement(transformation(extent={{50,-4},{70,16}})));
+  Buildings.Fluid.Sensors.MassFlowRate senExhMasFlo(redeclare package Medium = Medium)
+    "Exhaust air mass flow rate"
+    annotation (Placement(transformation(extent={{-100,-50},{-120,-30}})));
   Modelica.Fluid.Interfaces.FluidPort_a port_a1(
     redeclare final package Medium = Medium)
     "Fluid connector a1 of the supply air (positive design flow direction is from port_a1 to port_b1)"
@@ -108,14 +114,6 @@ protected
     final dp2_nominal=dpExh_nominal)
     "Heat exchanger"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
-  Modelica.Blocks.Sources.RealExpression mSup_flow(
-    final y(final unit="kg/s")=hex.port_a1.m_flow)
-    "Supply air mass flow rate"
-    annotation (Placement(transformation(extent={{-160,30},{-140,50}})));
-  Modelica.Blocks.Sources.RealExpression mExh_flow(
-    final y(final unit="kg/s")=hex.port_a2.m_flow)
-    "Exhaust air mass flow rate"
-    annotation (Placement(transformation(extent={{-160,10},{-140,30}})));
   Modelica.Blocks.Sources.RealExpression TSup(
     final y(final unit="K")=Medium.temperature(
       Medium.setState_phX(
@@ -123,7 +121,7 @@ protected
         h=inStream(port_a1.h_outflow),
         X=inStream(port_a1.Xi_outflow))))
     "Supply air temperature"
-    annotation (Placement(transformation(extent={{-160,-30},{-140,-10}})));
+    annotation (Placement(transformation(extent={{-160,18},{-140,38}})));
   Modelica.Blocks.Sources.RealExpression TExh(
     final y(final unit="K")=Medium.temperature(
       Medium.setState_phX(
@@ -131,7 +129,7 @@ protected
         h=inStream(port_a2.h_outflow),
         X=inStream(port_a2.Xi_outflow))))
     "Exhaust air temperature"
-    annotation (Placement(transformation(extent={{-160,-50},{-140,-30}})));
+    annotation (Placement(transformation(extent={{-160,-40},{-140,-20}})));
 
 equation
   connect(effCal.epsSen, hex.epsSen)
@@ -141,27 +139,27 @@ equation
     annotation (Line(points={{-78,-5},{-46,-5},{-46,-3},{-12,-3}},
                                                  color={0,0,127}));
   connect(TSup.y, effCal.TSup)
-    annotation (Line(points={{-139,-20},{-120,-20},{-120,-4},{-102,-4}},
+    annotation (Line(points={{-139,28},{-130,28},{-130,-4},{-102,-4}},
         color={0,0,127}));
   connect(TExh.y, effCal.TExh)
-    annotation (Line(points={{-139,-40},{-110,-40},{-110,-8},{-102,-8}},
-        color={0,0,127}));
-  connect(hex.port_b1, port_b1)
-    annotation (Line(points={{10,6},{60,6},{60,80},{100,80}},
-        color={0,127,255}));
-  connect(port_b2, hex.port_b2)
-    annotation (Line(points={{-180,-60},{-40,-60},{-40,-6},{-10,-6}},
-        color={0,127,255}));
-  connect(mSup_flow.y, effCal.mSup_flow)
-    annotation (Line(points={{-139,40},{-110,40},{-110,8},{-102,8}},
-        color={0,0,127}));
-  connect(mExh_flow.y, effCal.mExh_flow)
-    annotation (Line(points={{-139,20},{-120,20},{-120,4},{-102,4}},
+    annotation (Line(points={{-139,-30},{-130,-30},{-130,-8},{-102,-8}},
         color={0,0,127}));
   connect(epsSen, effCal.epsSen) annotation (Line(points={{120,30},{-60,30},{
           -60,5},{-78,5}}, color={0,0,127}));
   connect(effCal.epsLat, epsLat) annotation (Line(points={{-78,-5},{-60,-5},{
           -60,-16},{80,-16},{80,-30},{120,-30}}, color={0,0,127}));
+  connect(senSupMasFlo.m_flow, effCal.mSup_flow) annotation (Line(points={{60,17},
+          {60,60},{-110,60},{-110,8},{-102,8}}, color={0,0,127}));
+  connect(senExhMasFlo.m_flow, effCal.mExh_flow) annotation (Line(points={{-110,
+          -29},{-110,4},{-102,4}},                 color={0,0,127}));
+  connect(hex.port_b1, senSupMasFlo.port_a)
+    annotation (Line(points={{10,6},{50,6}}, color={0,127,255}));
+  connect(senSupMasFlo.port_b, port_b1) annotation (Line(points={{70,6},{80,6},
+          {80,80},{100,80}}, color={0,127,255}));
+  connect(senExhMasFlo.port_a, hex.port_b2) annotation (Line(points={{-100,-40},
+          {-30,-40},{-30,-6},{-10,-6}}, color={0,127,255}));
+  connect(senExhMasFlo.port_b, port_b2) annotation (Line(points={{-120,-40},{
+          -160,-40},{-160,-60},{-180,-60}}, color={0,127,255}));
 annotation (
         defaultComponentName="whe",
         Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Validation/Effectiveness.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Validation/Effectiveness.mo
index 7b35542a646..d24f0385ac3 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Validation/Effectiveness.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Validation/Effectiveness.mo
@@ -12,7 +12,7 @@ model Effectiveness
     epsLatHea_nominal=0.6,
     epsSenHeaPL=0.6,
     epsLatHeaPL=0.5,
-    VSup_flow_nominal=1)
+    mSup_flow_nominal=1)
     "Effectiveness calculator"
     annotation (Placement(transformation(extent={{-12,-10},{8,10}})));
   Modelica.Blocks.Sources.Ramp whSpe(
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo
index 106a91a17bf..e982178b7fe 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo
@@ -29,14 +29,14 @@ model BypassDampers
     final dpDamper_nominal=dpDam_nominal)
     "Supply air damper"
     annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},rotation=0,origin={-50,40})));
+        extent={{-10,-10},{10,10}},rotation=0,origin={-90,36})));
   Buildings.Fluid.Actuators.Dampers.Exponential damExh(
     redeclare package Medium = Medium,
     final m_flow_nominal=mExh_flow_nominal,
     final dpDamper_nominal=dpDam_nominal)
     "Exhaust air damper"
     annotation (Placement(transformation(
-        extent={{10,10},{-10,-10}},rotation=-90,origin={60,-30})));
+        extent={{10,10},{-10,-10}},rotation=-90,origin={40,-44})));
   Buildings.Fluid.Actuators.Dampers.Exponential bypDamExh(
     redeclare package Medium = Medium,
     final m_flow_nominal=mExh_flow_nominal,
@@ -58,35 +58,19 @@ protected
     final realFalse=0) "Electric power consumption for motor"
     annotation (Placement(transformation(extent={{-160,-90},{-140,-70}})));
 equation
-  connect(bypDamSup.port_a, port_a1)
-    annotation (Line(points={{-60,80},{-180,80}}, color={0,127,255}));
-  connect(bypDamSup.port_b, port_b1)
-    annotation (Line(points={{-40,80},{100,80}}, color={0,127,255}));
-  connect(bypDamExh.port_a, port_a2)
-    annotation (Line(points={{0,-60},{100,-60}},  color={0,127,255}));
-  connect(bypDamExh.port_b, port_b2)
-    annotation (Line(points={{-20,-60},{-180,-60}}, color={0,127,255}));
-  connect(damExh.port_a, port_a2)
-    annotation (Line(points={{60,-40},{60,-60},{100,-60}}, color={0,127,255}));
   connect(sub.y, damSup.y)
-    annotation (Line(points={{-78,100},{20,100},{20,60},{-50,60},{-50,52}},
+    annotation (Line(points={{-78,100},{20,100},{20,54},{-90,54},{-90,48}},
         color={0,0,127}));
   connect(damExh.y,sub. y)
-    annotation (Line(points={{48,-30},{40,-30},{40,84},{20,84},{20,100},{-78,100}},
-                                                                    color={0,0,127}));
+    annotation (Line(points={{28,-44},{20,-44},{20,100},{-78,100}}, color={0,0,127}));
   connect(bypDamSup.y, uBypDamPos)
     annotation (Line(points={{-50,92},{-50,140},{-202,140}}, color={0,0,127}));
   connect(damSup.port_b, hex.port_a1)
-    annotation (Line(points={{-40,40},{-20,40},{-20,6},{-10,6}},
+    annotation (Line(points={{-80,36},{-30,36},{-30,6},{-10,6}},
         color={0,127,255}));
   connect(bypDamExh.y, uBypDamPos)
     annotation (Line(points={{-10,-48},{-10,-30},{30,-30},{30,140},{-202,140}},
         color={0,0,127}));
-  connect(hex.port_b1, port_b1)
-    annotation (Line(points={{10,6},{60,6},{60,80},{100,80}},
-        color={0,127,255}));
-  connect(hex.port_a2, damExh.port_b)
-    annotation (Line(points={{10,-6},{60,-6},{60,-20}}, color={0,127,255}));
   connect(sub.u2, uBypDamPos)
     annotation (Line(points={{-102,94},{-160,94},{-160,140},{-202,140}},
         color={0,0,127}));
@@ -98,13 +82,24 @@ equation
   connect(booleanToReal.y, effCal.uSpe)
     annotation (Line(points={{-139,0},{-120,0},{-120,0},{-102,0}},
         color={0,0,127}));
-  connect(damSup.port_a, port_a1)
-    annotation (Line(points={{-60,40},{-100,40},{-100,80},{-180,80}},
-        color={0,127,255}));
   connect(PEle.y, P) annotation (Line(points={{-139,-80},{80,-80},{80,-90},{120,
           -90}}, color={0,0,127}));
   connect(PEle.u, uRot) annotation (Line(points={{-162,-80},{-168,-80},{-168,0},
           {-200,0}}, color={255,0,255}));
+  connect(damSup.port_a, port_a1) annotation (Line(points={{-100,36},{-130,36},
+          {-130,80},{-180,80}}, color={0,127,255}));
+  connect(damExh.port_b, hex.port_a2)
+    annotation (Line(points={{40,-34},{40,-6},{10,-6}}, color={0,127,255}));
+  connect(bypDamExh.port_b, port_b2)
+    annotation (Line(points={{-20,-60},{-180,-60}}, color={0,127,255}));
+  connect(damExh.port_a, port_a2)
+    annotation (Line(points={{40,-54},{40,-60},{100,-60}}, color={0,127,255}));
+  connect(bypDamExh.port_a, port_a2)
+    annotation (Line(points={{0,-60},{100,-60}}, color={0,127,255}));
+  connect(bypDamSup.port_b, port_b1)
+    annotation (Line(points={{-40,80},{100,80}}, color={0,127,255}));
+  connect(bypDamSup.port_a, port_a1)
+    annotation (Line(points={{-60,80},{-180,80}}, color={0,127,255}));
 annotation (
         defaultComponentName="whe",
         Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mo
new file mode 100644
index 00000000000..0c11e75ec94
--- /dev/null
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mo
@@ -0,0 +1,310 @@
+within Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.Examples;
+model SpaceCooling "Space cooling system"
+  extends Modelica.Icons.Example;
+
+  replaceable package MediumA = Buildings.Media.Air "Medium for air";
+  replaceable package MediumW = Buildings.Media.Water "Medium for water";
+
+  Buildings.Fluid.MixingVolumes.MixingVolume vol(
+    redeclare package Medium = MediumA,
+    m_flow_nominal=mA_flow_nominal,
+    V=V,
+    nPorts=2,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    mSenFac=3)
+    annotation (Placement(transformation(extent={{60,20},{80,40}})));
+  Modelica.Thermal.HeatTransfer.Components.ThermalConductor theCon(G=10000/30)
+    "Thermal conductance with the ambient"
+    annotation (Placement(transformation(extent={{20,40},{40,60}})));
+  parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume";
+  // Heat recovery effectiveness
+  parameter Real eps = 0.8 "Heat recovery effectiveness";
+
+  /////////////////////////////////////////////////////////
+  // Design air conditions
+  parameter Modelica.Units.SI.Temperature TASup_nominal=291.15
+    "Nominal air temperature supplied to room";
+  parameter Modelica.Units.SI.DimensionlessRatio wASup_nominal=0.012
+    "Nominal air humidity ratio supplied to room [kg/kg] assuming 90% relative humidity";
+  parameter Modelica.Units.SI.Temperature TRooSet=297.15
+    "Nominal room air temperature";
+  parameter Modelica.Units.SI.Temperature TOut_nominal=303.15
+    "Design outlet air temperature";
+  parameter Modelica.Units.SI.Temperature THeaRecLvg=TOut_nominal - eps*(
+      TOut_nominal - TRooSet) "Air temperature leaving the heat recovery";
+  parameter Modelica.Units.SI.DimensionlessRatio wHeaRecLvg=0.0135
+    "Air humidity ratio leaving the heat recovery [kg/kg]";
+
+  /////////////////////////////////////////////////////////
+  // Cooling loads and air mass flow rates
+  parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow=1000
+    "Internal heat gains of the room";
+  parameter Modelica.Units.SI.HeatFlowRate QRooC_flow_nominal=-QRooInt_flow -
+      10E3/30*(TOut_nominal - TRooSet) "Nominal cooling load of the room";
+  parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal=1.3*
+      QRooC_flow_nominal/1006/(TASup_nominal - TRooSet)
+    "Nominal air mass flow rate, increased by factor 1.3 to allow for recovery after temperature setback";
+  parameter Modelica.Units.SI.TemperatureDifference dTFan=2
+    "Estimated temperature raise across fan that needs to be made up by the cooling coil";
+  parameter Modelica.Units.SI.HeatFlowRate QCoiC_flow_nominal=mA_flow_nominal*(
+      TASup_nominal - THeaRecLvg - dTFan)*1006 + mA_flow_nominal*(wASup_nominal
+       - wHeaRecLvg)*2458.3e3
+    "Cooling load of coil, taking into account outside air sensible and latent heat removal";
+
+  /////////////////////////////////////////////////////////
+  // Water temperatures and mass flow rates
+  parameter Modelica.Units.SI.Temperature TWSup_nominal=285.15
+    "Water supply temperature";
+  parameter Modelica.Units.SI.Temperature TWRet_nominal=289.15
+    "Water return temperature";
+  parameter Modelica.Units.SI.MassFlowRate mW_flow_nominal=-QCoiC_flow_nominal/
+      (TWRet_nominal - TWSup_nominal)/4200 "Nominal water mass flow rate";
+
+  Modelica.Thermal.HeatTransfer.Sources.PrescribedTemperature TOut
+    "Outside temperature"
+    annotation (Placement(transformation(extent={{-20,40},{0,60}})));
+  Modelica.Thermal.HeatTransfer.Sources.FixedHeatFlow preHea(Q_flow=
+        QRooInt_flow) "Prescribed heat flow"
+    annotation (Placement(transformation(extent={{20,70},{40,90}})));
+  Buildings.Fluid.Movers.FlowControlled_m_flow fan(
+    redeclare package Medium = MediumA,
+    m_flow_nominal=mA_flow_nominal,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
+    "Supply air fan"
+    annotation (Placement(transformation(extent={{40,-30},{60,-10}})));
+  Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BypassDampers whe(
+    redeclare package Medium = MediumA,
+    mSup_flow_nominal=mA_flow_nominal,
+    mExh_flow_nominal=mA_flow_nominal,
+    dpSup_nominal=200,
+    P_nominal=100,
+    epsSenCoo_nominal=eps,
+    epsLatCoo_nominal=eps,
+    epsSenHea_nominal=eps,
+    epsLatHea_nominal=eps) "Heat recovery"
+    annotation (Placement(transformation(extent={{-110,-36},{-90,-16}})));
+  Buildings.Fluid.HeatExchangers.WetCoilEffectivenessNTU cooCoi(
+    redeclare package Medium1 = MediumW,
+    redeclare package Medium2 = MediumA,
+    m1_flow_nominal=mW_flow_nominal,
+    m2_flow_nominal=mA_flow_nominal,
+    dp1_nominal=6000,
+    dp2_nominal=200,
+    use_Q_flow_nominal=true,
+    Q_flow_nominal=QCoiC_flow_nominal,
+    T_a1_nominal=TWSup_nominal,
+    T_a2_nominal=THeaRecLvg,
+    w_a2_nominal=wHeaRecLvg,
+    show_T=true,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial) "Cooling coil"
+   annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=180,
+        origin={-30,-26})));
+  Buildings.Fluid.Sources.Outside out(nPorts=2, redeclare package Medium = MediumA)
+    annotation (Placement(transformation(extent={{-140,-32},{-120,-12}})));
+  Buildings.Fluid.Sources.MassFlowSource_T souWat(
+    nPorts=1,
+    redeclare package Medium = MediumW,
+    use_m_flow_in=true,
+    T=TWSup_nominal) "Source for water flow rate"
+    annotation (Placement(transformation(extent={{-20,-110},{0,-90}})));
+  Buildings.Fluid.Sources.Boundary_pT sinWat(
+    nPorts=1, redeclare package Medium = MediumW) "Sink for water circuit"
+    annotation (Placement(transformation(extent={{-80,-76},{-60,-56}})));
+  BoundaryConditions.WeatherData.ReaderTMY3 weaDat(
+    pAtmSou=Buildings.BoundaryConditions.Types.DataSource.Parameter,
+    TDryBul=TOut_nominal,
+    filNam=Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos"),
+    TDryBulSou=Buildings.BoundaryConditions.Types.DataSource.File)
+    "Weather data reader"
+    annotation (Placement(transformation(extent={{-160,40},{-140,60}})));
+  BoundaryConditions.WeatherData.Bus weaBus "Weather data bus"
+    annotation (Placement(transformation(extent={{-120,40},{-100,60}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant mAir_flow(k=mA_flow_nominal)
+    "Fan air flow rate"
+    annotation (Placement(transformation(extent={{0,0},{20,20}})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senTemHXOut(redeclare package
+      Medium = MediumA, m_flow_nominal=mA_flow_nominal)
+    "Temperature sensor for heat recovery outlet on supply side"
+    annotation (Placement(transformation(extent={{-76,-26},{-64,-14}})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senTemSupAir(redeclare package
+      Medium = MediumA, m_flow_nominal=mA_flow_nominal)
+    "Temperature sensor for supply air"
+    annotation (Placement(transformation(extent={{6,-26},{18,-14}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TRooSetPoi(k=TRooSet)
+    "Room temperature set point"
+    annotation (Placement(transformation(extent={{-170,-104},{-150,-84}})));
+  Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor senTemRoo
+    "Room temperature sensor"
+    annotation (Placement(transformation(extent={{70,70},{90,90}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal mWat_flow(realTrue=0, realFalse=
+        mW_flow_nominal) "Conversion from boolean to real for water flow rate"
+    annotation (Placement(transformation(extent={{-60,-110},{-40,-90}})));
+  Buildings.Controls.OBC.CDL.Reals.Subtract sub
+    "Inputs different"
+    annotation (Placement(transformation(extent={{-130,-110},{-110,-90}})));
+  Buildings.Controls.OBC.CDL.Reals.Hysteresis con(
+    final uLow=-0.5,
+    final uHigh=0.5)
+    "Controller for coil water flow rate"
+    annotation (Placement(transformation(extent={{-100,-110},{-80,-90}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse opeSig(
+    width=0.5,
+    period=86400,
+    shift=0.25*86400)
+    "Operating signal"
+    annotation (Placement(transformation(extent={{-172,10},{-152,30}})));
+  Modelica.Blocks.Sources.Ramp bypDamPos(
+    height=0.5,
+    duration=86400/2,
+    offset=0,
+    startTime=15552000 + 6*3600)
+    "Bypass damper position"
+    annotation (Placement(transformation(extent={{-170,-60},{-150,-40}})));
+equation
+  connect(theCon.port_b, vol.heatPort) annotation (Line(
+      points={{40,50},{50,50},{50,30},{60,30}},
+      color={191,0,0},
+      smooth=Smooth.None));
+  connect(preHea.port, vol.heatPort) annotation (Line(
+      points={{40,80},{50,80},{50,30},{60,30}},
+      color={191,0,0},
+      smooth=Smooth.None));
+  connect(fan.port_b, vol.ports[1]) annotation (Line(
+      points={{60,-20},{69,-20},{69,20}},
+      color={0,127,255},
+      smooth=Smooth.None));
+  connect(vol.ports[2],whe. port_a2) annotation (Line(
+      points={{71,20},{71,-46},{-90,-46},{-90,-32}},
+      color={0,127,255},
+      smooth=Smooth.None));
+  connect(out.ports[2],whe. port_a1) annotation (Line(
+      points={{-120,-21},{-116,-21},{-116,-20},{-110,-20}},
+      color={0,127,255},
+      smooth=Smooth.None));
+  connect(souWat.ports[1], cooCoi.port_a1)   annotation (Line(
+      points={{0,-100},{20,-100},{20,-32},{-20,-32}},
+      color={0,127,255},
+      smooth=Smooth.None));
+  connect(cooCoi.port_b1, sinWat.ports[1])    annotation (Line(
+      points={{-40,-32},{-48,-32},{-48,-66},{-60,-66}},
+      color={0,127,255},
+      smooth=Smooth.None));
+  connect(weaDat.weaBus, out.weaBus) annotation (Line(
+      points={{-140,50},{-128,50},{-128,4},{-148,4},{-148,-21.8},{-140,-21.8}},
+      color={255,204,51},
+      thickness=0.5,
+      smooth=Smooth.None));
+  connect(weaDat.weaBus, weaBus) annotation (Line(
+      points={{-140,50},{-110,50}},
+      color={255,204,51},
+      thickness=0.5,
+      smooth=Smooth.None), Text(
+      textString="%second",
+      index=1,
+      extent={{6,3},{6,3}}));
+  connect(weaBus.TDryBul, TOut.T) annotation (Line(
+      points={{-109.95,50.05},{-66,50.05},{-66,50},{-22,50}},
+      color={255,204,51},
+      thickness=0.5,
+      smooth=Smooth.None), Text(
+      textString="%first",
+      index=-1,
+      extent={{-6,3},{-6,3}}));
+  connect(fan.m_flow_in, mAir_flow.y) annotation (Line(
+      points={{50,-8},{50,10},{22,10}},
+      color={0,0,127},
+      smooth=Smooth.None));
+  connect(whe.port_b1, senTemHXOut.port_a) annotation (Line(
+      points={{-90,-20},{-76,-20}},
+      color={0,127,255},
+      smooth=Smooth.None));
+  connect(senTemHXOut.port_b, cooCoi.port_a2) annotation (Line(
+      points={{-64,-20},{-40,-20}},
+      color={0,127,255},
+      smooth=Smooth.None));
+  connect(cooCoi.port_b2, senTemSupAir.port_a) annotation (Line(
+      points={{-20,-20},{6,-20}},
+      color={0,127,255},
+      smooth=Smooth.None));
+  connect(senTemSupAir.port_b, fan.port_a) annotation (Line(
+      points={{18,-20},{40,-20}},
+      color={0,127,255},
+      smooth=Smooth.None));
+  connect(TOut.port, theCon.port_a) annotation (Line(
+      points={{5.55112e-16,50},{20,50}},
+      color={191,0,0},
+      smooth=Smooth.None));
+  connect(vol.heatPort, senTemRoo.port) annotation (Line(
+      points={{60,30},{50,30},{50,80},{70,80}},
+      color={191,0,0},
+      smooth=Smooth.None));
+  connect(mWat_flow.y, souWat.m_flow_in) annotation (Line(
+      points={{-38,-100},{-30,-100},{-30,-92},{-22,-92}},
+      color={0,0,127},
+      smooth=Smooth.None));
+  connect(sub.y, con.u)
+    annotation (Line(points={{-108,-100},{-102,-100}}, color={0,0,127}));
+  connect(con.y, mWat_flow.u)
+    annotation (Line(points={{-78,-100},{-62,-100}}, color={255,0,255}));
+  connect(TRooSetPoi.y, sub.u1)
+    annotation (Line(points={{-148,-94},{-132,-94}}, color={0,0,127}));
+  connect(senTemRoo.T, sub.u2) annotation (Line(points={{91,80},{100,80},{100,-140},
+          {-140,-140},{-140,-106},{-132,-106}}, color={0,0,127}));
+  connect(whe.port_b2, out.ports[1]) annotation (Line(points={{-110,-32},{-116,-32},
+          {-116,-23},{-120,-23}}, color={0,127,255}));
+  connect(opeSig.y, whe.uRot) annotation (Line(points={{-150,20},{-116,20},{-116,
+          -18},{-112,-18}}, color={255,0,255}));
+  connect(bypDamPos.y, whe.uBypDamPos) annotation (Line(points={{-149,-50},{-118,
+          -50},{-118,-26},{-112,-26}}, color={0,0,127}));
+  annotation (Documentation(info="<html>
+<p>
+This block is identical to
+<a href=\"modelica://Buildings.Examples.Tutorial.SpaceCooling.System3\">
+Buildings.Examples.Tutorial.SpaceCooling.System3</a>,
+except that the heat recovery device is modelled with <a href=\"modelica://Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BypassDampers\">
+Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BypassDampers</a>.
+</p>
+<p>
+The major input signals for the heat recovery device are configured as follows:
+</p>
+<ul>
+<li>
+The operating signal <i>uRot</i> changes from <code>false</code> to <code>true</code> at 6:00
+and from <code>false</code> to <code>true</code> at 18:00.
+</li>
+<li>
+The bypass damper position <i>uBypDamPos</i> changes from <i>0</i> to <i>0.5</i> 
+during the period from 200 seconds to 360 seconds.
+</li>
+</ul>
+<p>
+The expected outputs are:
+</p>
+<ul>
+<li>
+The outdoor temperature, <code>TOut.T</code>, and the temperature of the air leaving the exchanger, senTemHXOut.T,
+becomes different at 6:00.
+</li>
+<li>
+Their difference becomes smaller and smaller after 6:00 and equals to <i>0</i> after 18:00.
+</li>
+</ul>
+</html>", revisions="<html>
+<ul>
+<li>
+May 3, 2024, by Sen Huang:<br/>
+First implementation based on <a href=\"modelica://Buildings.Examples.Tutorial.SpaceCooling.System3\">
+Buildings.Examples.Tutorial.SpaceCooling.System3</a>.
+</li>
+</ul>
+</html>"),
+    Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-180,-160},{120,
+            100}})),
+    __Dymola_Commands(file=
+     "modelica://Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mos"
+        "Simulate and plot"),
+    experiment(StartTime=15552000, Tolerance=1e-6, StopTime=15638400));
+end SpaceCooling;
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/package.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/package.mo
new file mode 100644
index 00000000000..1c14fd101b5
--- /dev/null
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/package.mo
@@ -0,0 +1,12 @@
+within Buildings.Fluid.HeatExchangers.ThermalWheels.Latent;
+package Examples "Collection of models that illustrate model use and test models"
+  extends Modelica.Icons.ExamplesPackage;
+
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains validation models for the classes in
+<a href=\"modelica://Buildings.Fluid.HeatExchangers.ThermalWheels.Latent\">
+Buildings.Fluid.HeatExchangers.ThermalWheels.Latent</a>.
+</p>
+</html>"));
+end Examples;
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/package.order b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/package.order
new file mode 100644
index 00000000000..50303e7a6b0
--- /dev/null
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/package.order
@@ -0,0 +1 @@
+SpaceCooling
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/SpeedControlled.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/SpeedControlled.mo
index 4ab1034d8c6..af8e21b2b02 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/SpeedControlled.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/SpeedControlled.mo
@@ -21,7 +21,6 @@ model SpeedControlled
   final parameter Real[size(xSpe,1)] yeta = if defaultMotorEfficiencyCurve then motorEfficiency_default.eta else table[:,2]
     "y-axis support points of the power efficiency curve"
     annotation (Dialog(group="Efficiency"));
-
   Buildings.Controls.OBC.CDL.Interfaces.RealInput uSpe(
     final unit="1",
     final max=1)
@@ -37,16 +36,22 @@ protected
     "Electric power consumption"
     annotation (Placement(transformation(extent={{60,-100},{80,-80}})));
 
+initial equation
+  assert(table[end,1] < 1,
+         "In " + getInstanceName() + ": Power efficiency curve is wrong. 
+         No need to define efficiency for the nominal condition",
+         level=AssertionLevel.error)
+         "Check if the effiency for the nominal conidtion is defined.";
+
 equation
   connect(P, PEle.y)
     annotation (Line(points={{120,-90},{81,-90}}, color={0,0,127}));
-  connect(port_a1, hex.port_a1) annotation (Line(points={{-180,80},{-40,80},{
-          -40,6},{-10,6}},
-                       color={0,127,255}));
-  connect(hex.port_a2, port_a2) annotation (Line(points={{10,-6},{60,-6},{60,-60},
-          {100,-60}}, color={0,127,255}));
   connect(effCal.uSpe, uSpe)
     annotation (Line(points={{-102,0},{-200,0}}, color={0,0,127}));
+  connect(hex.port_a2, port_a2) annotation (Line(points={{10,-6},{60,-6},{60,
+          -60},{100,-60},{100,-60}}, color={0,127,255}));
+  connect(hex.port_a1, port_a1) annotation (Line(points={{-10,6},{-32,6},{-32,
+          80},{-180,80}}, color={0,127,255}));
     annotation (
    defaultComponentName="whe",
         Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
@@ -75,22 +80,39 @@ The operation of the heat recovery wheel is adjustable by modulating the wheel s
 Accordingly, the power consumption of this wheel is calculated by
 </p>
 <p align=\"center\" style=\"font-style:italic;\">
-P = P_nominal * eta,
+P = P_nominal * uSpe / eta,
 </p>
 <p>
 where <code>P_nominal</code> is the nominal wheel power consumption,
 <code>uSpe</code> is the wheel speed ratio.
-The <code>eta</code> is the motor power efficiency and is obtained from performing a polynomial fit
-based on the user input data table.
-The sum of the coefficients must be <i>1</i>, otherwise the model stops with an error.
-Thus, when the speed ratio <code>uSpe=1</code>, the power consumption is equal to
-nominal consumption <code>P=P_nominal</code>.
+The <code>eta</code> is the motor percent full-Load efficiency, i.e.,
+the ratio of the motor efficiency to that when the <code>uSpe</code> is <i>1</i>.   
+There are two ways to define <code>eta</code>:
+</p>
+<ul>
+<li>
+Default curves in U.S. DOE (2014).
+</li>
+<li>
+Polynomial fit based on the user input data table.
+</li>
+</ul>
+<p>
+One can switch between those two options with the parameter <code>defaultMotorEfficiencyCurve</code>.
 </p>
 <p>
 The sensible and latent effectiveness is calculated with
 <a href=\"modelica://Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BaseClasses.Effectiveness\">
 Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BaseClasses.Effectiveness</a>.
 </p>
+<h4>References</h4>
+<p>
+U.S. DOE (2014).
+<i>Determining Electric Motor Load and Efficiency.</i>
+URL:
+<a href=\"https://www.energy.gov/sites/prod/files/2014/04/f15/10097517.pdf\">
+https://www.energy.gov/sites/prod/files/2014/04/f15/10097517.pdf</a>
+</p>
 </html>", revisions="<html>
 <ul>
 <li>
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/BypassDampers.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/BypassDampers.mo
index 6c430f4e987..e464a6f385a 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/BypassDampers.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/BypassDampers.mo
@@ -2,19 +2,17 @@ within Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.Validation;
 model BypassDampers
   "Test model for the enthalpy recovery wheel with bypass dampers"
   extends Modelica.Icons.Example;
-  package Medium1 = Buildings.Media.Air
-    "Supply air";
-  package Medium2 = Buildings.Media.Air
-    "Exhaust air";
+  package Medium = Buildings.Media.Air
+    "Air";
   Buildings.Fluid.Sources.Boundary_pT sin_2(
-    redeclare package Medium = Medium2,
+    redeclare package Medium = Medium,
     p(displayUnit="Pa") = 101325,
     T=273.15 + 10,
     nPorts=1)
     "Exhaust air sink"
     annotation (Placement(transformation(extent={{-78,-50},{-58,-30}})));
   Buildings.Fluid.Sources.Boundary_pT sou_2(
-    redeclare package Medium = Medium2,
+    redeclare package Medium = Medium,
     p(displayUnit="Pa") = 101325 + 500,
     T(displayUnit="K") = 293.15,
     nPorts=1)
@@ -28,7 +26,7 @@ model BypassDampers
     "Supply air temperature"
     annotation (Placement(transformation(extent={{-80,24},{-60,44}})));
   Buildings.Fluid.Sources.Boundary_pT sin_1(
-    redeclare package Medium = Medium1,
+    redeclare package Medium = Medium,
     T=273.15 + 30,
     X={0.012,1 - 0.012},
     p(displayUnit="Pa") = 101325 - 500,
@@ -36,7 +34,7 @@ model BypassDampers
     "Supply air sink"
     annotation (Placement(transformation(extent={{90,20},{70,40}})));
   Buildings.Fluid.Sources.Boundary_pT sou_1(
-    redeclare package Medium = Medium1,
+    redeclare package Medium = Medium,
     T=273.15 + 50,
     X={0.012,1 - 0.012},
     use_T_in=true,
@@ -45,12 +43,9 @@ model BypassDampers
     "Supply air source"
     annotation (Placement(transformation(extent={{-40,20},{-20,40}})));
   Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BypassDampers whe(
-    redeclare package Medium1 = Medium1,
-    redeclare package Medium2 = Medium2,
-    m1_flow_nominal=5,
-    m2_flow_nominal=5,
-    dp1_nominal(displayUnit="Pa"),
-    dp2_nominal(displayUnit="Pa"),
+    redeclare package Medium = Medium,
+    mSup_flow_nominal=5,
+    mExh_flow_nominal=5,
     P_nominal=100,
     epsLatCoo_nominal=0.7,
     epsLatCooPL=0.6,
@@ -71,12 +66,12 @@ model BypassDampers
     shift=72) "Operating signal"
     annotation (Placement(transformation(extent={{-80,60},{-60,80}})));
   Buildings.Fluid.Sensors.TemperatureTwoPort senExhTem(
-      redeclare package Medium =Medium2,
+      redeclare package Medium =Medium,
       m_flow_nominal=5)
       "Temperature of the exhaust air"
     annotation (Placement(transformation(extent={{-20,-50},{-40,-30}})));
   Buildings.Fluid.Sensors.TemperatureTwoPort senSupTem(
-      redeclare package Medium = Medium1,
+      redeclare package Medium = Medium,
       m_flow_nominal=5)
       "Temperature of the supply air"
     annotation (Placement(transformation(extent={{40,20},{60,40}})));
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mo
index 8cf0f8f86e3..2365ce85809 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mo
@@ -2,22 +2,20 @@ within Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.Validation;
 model SpeedControlled
   "Test model for the enthalpy recovery wheel with a variable speed drive"
   extends Modelica.Icons.Example;
-  package Medium1 = Buildings.Media.Air
-    "Supply air";
-  package Medium2 = Buildings.Media.Air
-    "Exhaust air";
+  package Medium = Buildings.Media.Air
+    "Air";
   Buildings.Fluid.Sources.Boundary_pT sin_2(
-    redeclare package Medium = Medium2,
+    redeclare package Medium = Medium,
     p(displayUnit="Pa") = 101325,
     T(displayUnit="K") = 273.15 + 10,
-    nPorts=1)
+    nPorts=2)
     "Exhaust air sink"
     annotation (Placement(transformation(extent={{-78,-50},{-58,-30}})));
   Buildings.Fluid.Sources.Boundary_pT sou_2(
-    redeclare package Medium = Medium2,
+    redeclare package Medium = Medium,
     p(displayUnit="Pa") = 101325 + 500,
     T(displayUnit="K") = 293.15,
-    nPorts=1)
+    nPorts=2)
     "Exhaust air source"
     annotation (Placement(transformation(extent={{90,-50},{70,-30}})));
   Modelica.Blocks.Sources.Ramp TSup(
@@ -28,35 +26,47 @@ model SpeedControlled
     "Supply air temperature"
     annotation (Placement(transformation(extent={{-80,24},{-60,44}})));
   Buildings.Fluid.Sources.Boundary_pT sin_1(
-    redeclare package Medium = Medium1,
+    redeclare package Medium = Medium,
     T=273.15 + 30,
     X={0.012,1 - 0.012},
     p(displayUnit="Pa") = 101325 - 500,
-    nPorts=1)
+    nPorts=2)
     "Supply air sink"
     annotation (Placement(transformation(extent={{90,20},{70,40}})));
   Buildings.Fluid.Sources.Boundary_pT sou_1(
-    redeclare package Medium = Medium1,
+    redeclare package Medium = Medium,
     T=273.15 + 50,
     X={0.012,1 - 0.012},
     use_T_in=true,
     p(displayUnit="Pa") = 101325,
-    nPorts=1)
+    nPorts=2)
     "Supply air source"
     annotation (Placement(transformation(extent={{-40,20},{-20,40}})));
-  Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.SpeedControlled
-    whe(
-    redeclare package Medium1 = Medium1,
-    redeclare package Medium2 = Medium2,
-    m1_flow_nominal=5,
-    m2_flow_nominal=5,
+  Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.SpeedControlled wheUseDefCur(
+    redeclare package Medium = Medium,
+    mSup_flow_nominal=5,
+    mExh_flow_nominal=5,
     P_nominal=100,
     epsLatCoo_nominal=0.7,
     epsLatCooPL=0.6,
     epsLatHea_nominal=0.7,
-    epsLatHeaPL=0.6)
-    "Wheel"
-    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
+    epsLatHeaPL=0.6,
+    defaultMotorEfficiencyCurve=false,
+    table=[0.8,1])
+    "Wheel with a user-defined curve"
+    annotation (Placement(transformation(extent={{2,14},{22,34}})));
+  Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.SpeedControlled wheDefCur(
+    redeclare package Medium = Medium,
+    mSup_flow_nominal=5,
+    mExh_flow_nominal=5,
+    P_nominal=100,
+    epsLatCoo_nominal=0.7,
+    epsLatCooPL=0.6,
+    epsLatHea_nominal=0.7,
+    epsLatHeaPL=0.6,
+    defaultMotorEfficiencyCurve=true)
+    "Wheel with a default curve"
+    annotation (Placement(transformation(extent={{2,-18},{22,2}})));
   Modelica.Blocks.Sources.Ramp wheSpe(
     height=0.3,
     duration=160,
@@ -65,33 +75,48 @@ model SpeedControlled
     "Wheel speed"
     annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
   Buildings.Fluid.Sensors.TemperatureTwoPort senExhTem(
-      redeclare package Medium = Medium2,
+      redeclare package Medium = Medium,
       m_flow_nominal=5)
       "Temperature of the exhaust air"
     annotation (Placement(transformation(extent={{-20,-50},{-40,-30}})));
   Buildings.Fluid.Sensors.TemperatureTwoPort senSupTem(
-      redeclare package Medium = Medium1,
+      redeclare package Medium = Medium,
       m_flow_nominal=5)
       "Temperature of the supply air"
     annotation (Placement(transformation(extent={{40,20},{60,40}})));
+
 equation
   connect(TSup.y, sou_1.T_in)
     annotation (Line(points={{-59,34},{-42,34}}, color={0,0,127}));
-  connect(sou_1.ports[1],whe. port_a1)
-    annotation (Line(points={{-20,30},{-10,30},{-10,6},{0,6}}, color={0,127,255}));
-  connect(whe.port_a2, sou_2.ports[1])
-    annotation (Line(points={{20,-6},{40,-6},{40,-40},{70,-40}}, color={0,127,255}));
-  connect(wheSpe.y, whe.uSpe)
-    annotation (Line(points={{-59,0},{-2,0}}, color={0,0,127}));
-
+  connect(sou_1.ports[2], wheUseDefCur.port_a1)
+    annotation (Line(points={{-20,31},{-10,31},{-10,30},{2,30}},
+    color={0,127,255}));
+  connect(wheUseDefCur.port_a2, sou_2.ports[1])
+    annotation (Line(points={{22,18},
+    {36,18},{36,-41},{70,-41}}, color={0,127,255}));
+  connect(wheSpe.y, wheUseDefCur.uSpe)
+    annotation (Line(points={{-59,0},{-10,0},
+    {-10,24},{0,24}}, color={0,0,127}));
   connect(senExhTem.port_b, sin_2.ports[1])
-    annotation (Line(points={{-40,-40},{-58,-40}}, color={0,127,255}));
-  connect(senExhTem.port_a, whe.port_b2) annotation (Line(points={{-20,-40},{-8,
-          -40},{-8,-6},{0,-6}}, color={0,127,255}));
-  connect(senSupTem.port_b, sin_1.ports[1])
-    annotation (Line(points={{60,30},{70,30}}, color={0,127,255}));
-  connect(senSupTem.port_a, whe.port_b1) annotation (Line(points={{40,30},{30,30},
-          {30,6},{20,6}}, color={0,127,255}));
+    annotation (Line(points={{-40,-40},{-50,-40},{-50,-41},{-58,-41}},
+    color={0,127,255}));
+  connect(senExhTem.port_a, wheUseDefCur.port_b2)
+    annotation (Line(points={{-20,-40},{-4,-40},{-4,18},{2,18}}, color={0,127,255}));
+  connect(senSupTem.port_b, sin_1.ports[2])
+    annotation (Line(points={{60,30},{66,30},{66,31},{70,31}},
+    color={0,127,255}));
+  connect(senSupTem.port_a, wheUseDefCur.port_b1)
+    annotation (Line(points={{40,30},{22,30}}, color={0,127,255}));
+  connect(wheDefCur.port_a1, sou_1.ports[1])
+    annotation (Line(points={{2,-2},{-16,-2},{-16,29},{-20,29}}, color={0,127,255}));
+  connect(wheDefCur.port_b2, sin_2.ports[2])
+    annotation (Line(points={{2,-14},{-50,-14},{-50,-39},{-58,-39}}, color={0,127,255}));
+  connect(wheDefCur.port_a2, sou_2.ports[2])
+    annotation (Line(points={{22,-14},{60,-14},{60,-39},{70,-39}}, color={0,127,255}));
+  connect(wheDefCur.port_b1, sin_1.ports[1])
+    annotation (Line(points={{22,-2},{62,-2},{62,29},{70,29}}, color={0,127,255}));
+  connect(wheDefCur.uSpe, wheSpe.y)
+    annotation (Line(points={{0,-8},{-50,-8},{-50,0},{-59,0}}, color={0,0,127}));
 annotation(experiment(Tolerance=1e-6, StopTime=360),
 __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mos"
         "Simulate and plot"),
@@ -102,6 +127,11 @@ Example for the model
 Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.SpeedControlled</a>.
 </p>
 <p>
+This example considers two wheels:
+<code>wheUseDefCur</code> employs a user-defined efficiency curve;
+<code>wheDefCur</code> employs a default efficiency curve
+</p>
+<p>
 The input signals are configured as follows:
 </p>
 <ul>
@@ -133,6 +163,11 @@ follow the change of <i>TSup</i> before the 200 seconds.
 After 200 seconds, the leaving supply air temperature decreases
 and the leaving exhaust air temperature increases.
 </li>
+<li>
+The power consumption of the instance <code>wheUseDefCur</code> is higher than that of the instance <code>wheDefCur</code>
+when <i>uSpe</i> is less than 1.
+The power consumption of those two instances are identical when <i>uSpe</i> equals to <i>1</i>.
+</li>
 </ul>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/package.order b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/package.order
index f72d2cb4843..1786308b3c1 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/package.order
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/package.order
@@ -1,4 +1,5 @@
 BypassDampers
 SpeedControlled
+Examples
 Validation
 BaseClasses
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Effectiveness.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Effectiveness.mo
index dc38a789a44..aa835c2e195 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Effectiveness.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Effectiveness.mo
@@ -10,8 +10,8 @@ model Effectiveness
     "Nominal sensible heat exchanger effectiveness at the heating mode";
   parameter Modelica.Units.SI.Efficiency epsHeaPL(final max=1)
     "Part load (75% of the nominal supply flow rate) sensible heat exchanger effectiveness at the heating mode";
-  parameter Modelica.Units.SI.VolumeFlowRate VSup_flow_nominal
-    "Nominal supply air flow rate";
+  parameter Modelica.Units.SI.MassFlowRate mSup_flow_nominal
+    "Nominal supply air mass flow rate";
 
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TSup(
     final min=0,
@@ -25,11 +25,11 @@ model Effectiveness
     displayUnit="degC")
     "Exhaust air temperature
     " annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput VSup_flow(final unit="m3/s")
-    "Supply air volumetric flow rate"
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput mSup_flow(final unit="kg/s")
+    "Supply air mass flow rate"
     annotation (Placement(transformation(extent={{-140,60},{-100,100}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput VExh_flow( final unit="m3/s")
-    "Exhaust air volumetric flow rate"
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput mExh_flow(final unit="kg/s")
+    "Exhaust air mass flow rate"
     annotation (Placement(transformation(extent={{-140,20},{-100,60}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput uSpe(
     final unit="1",
@@ -60,11 +60,11 @@ protected
 
 equation
   // Check if the air flows are too unbalanced
-  assert(VSup_flow - 2*VExh_flow < 0 or VExh_flow - 2*VSup_flow < 0,
+  assert(mSup_flow - 2*mExh_flow < 0 or mExh_flow - 2*mSup_flow < 0,
     "In " + getInstanceName() + ": The ratio of the supply flow rate to the exhaust flow rate should be in the range of [0.5, 2].",
     level=AssertionLevel.warning);
   // Calculate the average volumetric air flow and flow rate ratio.
-  rat = (VSup_flow + VExh_flow)/2/VSup_flow_nominal;
+  rat = (mSup_flow +mExh_flow) /2/mSup_flow_nominal;
   // Switch between cooling and heating modes based on the difference between the supply air temperature and the exhaust air temperature
   fraCoo = if equ_nominal and equPL then 0.5 else Buildings.Utilities.Math.Functions.regStep(TSup-TExh, 1, 0, 1e-5);
   epsPL = if equPL then epsCooPL else fraCoo*epsCooPL + (1-fraCoo) * epsHeaPL;
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/PartialWheel.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/PartialWheel.mo
index 4d59c89cf2b..d1be1669176 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/PartialWheel.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/PartialWheel.mo
@@ -2,22 +2,19 @@ within Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.BaseClasses;
 partial model PartialWheel
   "Partial model for sensible heat recovery wheel"
   extends Modelica.Blocks.Icons.Block;
-  replaceable package Medium1 =
+  replaceable package Medium =
     Modelica.Media.Interfaces.PartialCondensingGases
-    "Supply air";
-  replaceable package Medium2 =
-    Modelica.Media.Interfaces.PartialCondensingGases
-    "Exhaust air";
-  parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal
+    "Air";
+  parameter Modelica.Units.SI.MassFlowRate mSup_flow_nominal
     "Nominal supply air mass flow rate"
     annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal
+  parameter Modelica.Units.SI.MassFlowRate mExh_flow_nominal
     "Nominal exhaust air mass flow rate"
     annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.PressureDifference dp1_nominal(displayUnit="Pa") = 500
+  parameter Modelica.Units.SI.PressureDifference dpSup_nominal(displayUnit="Pa") = 500
     "Nominal supply air pressure drop"
     annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.PressureDifference dp2_nominal(displayUnit="Pa") = dp1_nominal
+  parameter Modelica.Units.SI.PressureDifference dpExh_nominal(displayUnit="Pa") = dpSup_nominal
     "Nominal exhaust air pressure drop"
     annotation (Dialog(group="Nominal condition"));
   parameter Real P_nominal(final unit="W")
@@ -50,38 +47,46 @@ partial model PartialWheel
         iconTransformation(extent={{100,-20},{140,20}})));
   Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.BaseClasses.HeatExchangerWithInputEffectiveness
     hex(
-    redeclare package Medium1 = Medium1,
-    redeclare package Medium2 = Medium2,
-    final m1_flow_nominal=m1_flow_nominal,
-    final m2_flow_nominal=m2_flow_nominal,
-    final dp1_nominal=dp1_nominal,
-    final dp2_nominal=dp2_nominal) "Heat exchanger"
+    redeclare package Medium1 = Medium,
+    redeclare package Medium2 = Medium,
+    final m1_flow_nominal=mSup_flow_nominal,
+    final m2_flow_nominal=mExh_flow_nominal,
+    final dp1_nominal=dpSup_nominal,
+    final dp2_nominal=dpExh_nominal) "Heat exchanger"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
   Modelica.Fluid.Interfaces.FluidPort_a port_a1(
-    redeclare final package Medium = Medium1)
+    redeclare final package Medium = Medium)
     "Fluid connector a1 of the supply air (positive design flow direction is from port_a1 to port_b1)"
     annotation (Placement(transformation(extent={{-190,70},{-170,90}}),
         iconTransformation(extent={{-110,50},{-90,70}})));
   Modelica.Fluid.Interfaces.FluidPort_b port_b2(
-    redeclare final package Medium = Medium2)
+    redeclare final package Medium = Medium)
     "Fluid connector b2 of the exhaust air (positive design flow direction is from port_a2 to port_b2)"
     annotation (Placement(transformation(extent={{-170,-70},{-190,-50}}),
         iconTransformation(extent={{-90,-70},{-110,-50}})));
   Modelica.Fluid.Interfaces.FluidPort_b port_b1(
-    redeclare final package Medium = Medium1)
+    redeclare final package Medium = Medium)
     "Fluid connector b1 of the supply air (positive design flow direction is from port_a1 to port_b1)"
     annotation (Placement(transformation(extent={{110,70},{90,90}}),
         iconTransformation(extent={{110,50},{90,70}})));
   Modelica.Fluid.Interfaces.FluidPort_a port_a2(
-    redeclare final package Medium = Medium2)
+    redeclare final package Medium = Medium)
     "Fluid connector a2 of the exhaust air (positive design flow direction is from port_a2 to port_b2)"
     annotation (Placement(transformation(extent={{90,-70},{110,-50}})));
 
+  Buildings.Fluid.Sensors.MassFlowRate senSupMasFlo(
+    redeclare package Medium = Medium)
+    "Supply air mass flow rate"
+    annotation (Placement(transformation(extent={{32,-4},{52,16}})));
+  Buildings.Fluid.Sensors.MassFlowRate senExhMasFlo(
+     redeclare package Medium = Medium)
+    "Exhaust air mass flow rate"
+    annotation (Placement(transformation(extent={{-70,-44},{-90,-24}})));
 protected
-  parameter Medium1.ThermodynamicState sta_nominal=Medium1.setState_pTX(
+  parameter Medium.ThermodynamicState sta_nominal=Medium.setState_pTX(
       T=Buildings.Utilities.Psychrometrics.Constants.T_ref,
       p=101325,
-      X=Medium1.X_default)
+      X=Medium.X_default)
    "State of the supply air at the default properties";
   Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.BaseClasses.Effectiveness
     effCal(
@@ -89,36 +94,20 @@ protected
     final epsCooPL=epsCooPL,
     final epsHea_nominal=epsHea_nominal,
     final epsHeaPL=epsHeaPL,
-    final VSup_flow_nominal=m1_flow_nominal/Medium1.density(sta_nominal))
+    final mSup_flow_nominal=mSup_flow_nominal)
     "Calculates the effectiveness of heat exchange"
     annotation (Placement(transformation(extent={{-100,-10},{-80,10}})));
-  Modelica.Blocks.Sources.RealExpression VSup_flow(
-    final y(final unit="m3/s")=hex.port_a1.m_flow/
-        Medium1.density(state=Medium1.setState_phX(
-        p=hex.port_a1.p,
-        h=hex.port_a1.h_outflow,
-        X=hex.port_a1.Xi_outflow)))
-    "Supply air volume flow rate"
-    annotation (Placement(transformation(extent={{-160,30},{-140,50}})));
-  Modelica.Blocks.Sources.RealExpression VExh_flow(
-    final y(final unit="m3/s")=hex.port_a2.m_flow/
-        Medium2.density(state=Medium2.setState_phX(
-        p=hex.port_a2.p,
-        h=hex.port_a2.h_outflow,
-        X=hex.port_a2.Xi_outflow)))
-    "Exhaust air volume flow rate"
-    annotation (Placement(transformation(extent={{-160,10},{-140,30}})));
   Modelica.Blocks.Sources.RealExpression TSup(
-    final y(final unit="K")=Medium1.temperature(
-      Medium1.setState_phX(
+    final y(final unit="K")=Medium.temperature(
+      Medium.setState_phX(
         p=port_a1.p,
         h=inStream(port_a1.h_outflow),
         X=inStream(port_a1.Xi_outflow))))
     "Supply air temperature"
-    annotation (Placement(transformation(extent={{-160,-30},{-140,-10}})));
+    annotation (Placement(transformation(extent={{-160,10},{-140,30}})));
   Modelica.Blocks.Sources.RealExpression TExh(
-    final y(final unit="K")=Medium2.temperature(
-      Medium2.setState_phX(
+    final y(final unit="K")=Medium.temperature(
+      Medium.setState_phX(
         p=port_a2.p,
         h=inStream(port_a2.h_outflow),
         X=inStream(port_a2.Xi_outflow))))
@@ -127,28 +116,28 @@ protected
 
 equation
   connect(TSup.y, effCal.TSup)
-    annotation (Line(points={{-139,-20},{-120,-20},{-120,-4},{-102,-4}},
+    annotation (Line(points={{-139,20},{-110,20},{-110,-4},{-102,-4}},
         color={0,0,127}));
   connect(TExh.y, effCal.TExh)
     annotation (Line(points={{-139,-40},{-110,-40},{-110,-8},{-102,-8}},
         color={0,0,127}));
-  connect(hex.port_b1, port_b1)
-    annotation (Line(points={{10,6},{60,6},{60,80},{100,80}},
-        color={0,127,255}));
-  connect(port_b2, hex.port_b2)
-    annotation (Line(points={{-180,-60},{-40,-60},{-40,-6},{-10,-6}},
-        color={0,127,255}));
-  connect(VSup_flow.y, effCal.VSup_flow)
-    annotation (Line(points={{-139,40},{-110,40},{-110,8},{-102,8}},
-        color={0,0,127}));
-  connect(VExh_flow.y, effCal.VExh_flow)
-    annotation (Line(points={{-139,20},{-120,20},{-120,4},{-102,4}},
-        color={0,0,127}));
   connect(effCal.eps, hex.eps)
     annotation (Line(points={{-78,0},{-12,0}}, color={0,0,127}));
   connect(effCal.eps, eps) annotation (Line(points={{-78,0},{-40,0},{-40,32},{
           80,32},{80,0},{120,0}},
                 color={0,0,127}));
+  connect(senExhMasFlo.port_b, port_b2) annotation (Line(points={{-90,-34},{-100,
+          -34},{-100,-60},{-180,-60}}, color={0,127,255}));
+  connect(senExhMasFlo.port_a, hex.port_b2) annotation (Line(points={{-70,-34},{
+          -16,-34},{-16,-6},{-10,-6}}, color={0,127,255}));
+  connect(hex.port_b1, senSupMasFlo.port_a)
+    annotation (Line(points={{10,6},{32,6}}, color={0,127,255}));
+  connect(senSupMasFlo.port_b, port_b1) annotation (Line(points={{52,6},{60,6},{
+          60,80},{100,80}}, color={0,127,255}));
+  connect(senExhMasFlo.m_flow, effCal.mExh_flow) annotation (Line(points={{-80,-23},
+          {-80,-16},{-106,-16},{-106,4},{-102,4}}, color={0,0,127}));
+  connect(senSupMasFlo.m_flow, effCal.mSup_flow) annotation (Line(points={{42,17},
+          {42,26},{-106,26},{-106,8},{-102,8}}, color={0,0,127}));
 annotation (
         defaultComponentName="whe",
         Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
@@ -207,7 +196,7 @@ annotation (
         Line(points={{-22,-74},{22,-74}}, color={0,0,0}),
         Line(points={{-22,78},{22,78}}, color={0,0,0})}),
           Diagram(
-        coordinateSystem(preserveAspectRatio=true, extent={{-180,-100},{100,180}})),
+        coordinateSystem(preserveAspectRatio=true, extent={{-180,-100},{100,100}})),
 Documentation(info="<html>
 <p>
 Partial model of a sensible heat recovery wheel.
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Validation/Effectiveness.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Validation/Effectiveness.mo
index 4cacde87ed2..77eb07f8f58 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Validation/Effectiveness.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Validation/Effectiveness.mo
@@ -8,7 +8,7 @@ model Effectiveness
     epsCooPL=0.75,
     epsHea_nominal=0.7,
     epsHeaPL=0.6,
-    VSup_flow_nominal=1) "Effectiveness calculator"
+    mSup_flow_nominal=1) "Effectiveness calculator"
     annotation (Placement(transformation(extent={{-12,-10},{8,10}})));
   Modelica.Blocks.Sources.Ramp whSpe(
     height=0.7,
@@ -46,9 +46,9 @@ model Effectiveness
     "Exhaust air flow rate"
     annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
 equation
-  connect(VSup.y, epsCal.VSup_flow)
+  connect(VSup.y,epsCal.mSup_flow)
     annotation (Line(points={{-59,70},{-28,70},{-28,8},{-14,8}}, color={0,0,127}));
-  connect(VExh.y, epsCal.VExh_flow)
+  connect(VExh.y,epsCal.mExh_flow)
     annotation (Line(points={{-59,30},{-40,30},{-40,4},{-14,4}}, color={0,0,127}));
   connect(whSpe.y, epsCal.uSpe)
     annotation (Line(points={{-59,0},{-14,0}}, color={0,0,127}));
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo
index 582938cb341..0498760ef77 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo
@@ -3,6 +3,9 @@ model BypassDampers
   "Sensible heat recovery wheel with bypass dampers"
   extends
     Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.BaseClasses.PartialWheel;
+  parameter Modelica.Units.SI.PressureDifference dpDam_nominal(displayUnit="Pa") = 20
+    "Nominal pressure drop of supply air dampers"
+    annotation (Dialog(group="Nominal condition"));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput uBypDamPos(
     final unit="1",
     final min=0,
@@ -15,29 +18,29 @@ model BypassDampers
     annotation (Placement(transformation(extent={{-220,-20},{-180,20}}),
         iconTransformation(extent={{-140,60},{-100,100}})));
   Buildings.Fluid.Actuators.Dampers.Exponential bypDamSup(
-    redeclare package Medium = Medium1,
-    final m_flow_nominal=m1_flow_nominal,
-    final dpDamper_nominal=dp1_nominal)
+    redeclare package Medium = Medium,
+    final m_flow_nominal=mSup_flow_nominal,
+    final dpDamper_nominal=dpDam_nominal)
     "Supply air bypass damper"
     annotation (Placement(transformation(extent={{-60,70},{-40,90}})));
   Buildings.Fluid.Actuators.Dampers.Exponential damSup(
-    redeclare package Medium = Medium1,
-    final m_flow_nominal=m1_flow_nominal,
-    final dpDamper_nominal=dp1_nominal)
+    redeclare package Medium = Medium,
+    final m_flow_nominal=mSup_flow_nominal,
+    final dpDamper_nominal=dpDam_nominal)
     "Supply air damper"
     annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},rotation=0,origin={-50,40})));
   Buildings.Fluid.Actuators.Dampers.Exponential damExh(
-    redeclare package Medium = Medium2,
-    final m_flow_nominal=m2_flow_nominal,
-    final dpDamper_nominal=dp2_nominal)
+    redeclare package Medium = Medium,
+    final m_flow_nominal=mExh_flow_nominal,
+    final dpDamper_nominal=dpDam_nominal)
     "Exhaust air damper"
     annotation (Placement(transformation(
         extent={{10,10},{-10,-10}},rotation=-90,origin={50,-40})));
   Buildings.Fluid.Actuators.Dampers.Exponential bypDamExh(
-    redeclare package Medium = Medium2,
-    final m_flow_nominal=m2_flow_nominal,
-    final dpDamper_nominal=dp2_nominal)
+    redeclare package Medium = Medium,
+    final m_flow_nominal=mExh_flow_nominal,
+    final dpDamper_nominal=dpDam_nominal)
     "Exhaust air bypass damper"
     annotation (Placement(transformation(extent={{0,-70},{-20,-50}})));
 protected
@@ -62,8 +65,6 @@ equation
     annotation (Line(points={{-40,80},{100,80}}, color={0,127,255}));
   connect(bypDamExh.port_a, port_a2)
     annotation (Line(points={{0,-60},{100,-60}},  color={0,127,255}));
-  connect(bypDamExh.port_b, port_b2)
-    annotation (Line(points={{-20,-60},{-180,-60}}, color={0,127,255}));
   connect(damExh.port_a, port_a2)
     annotation (Line(points={{50,-50},{50,-60},{100,-60}}, color={0,127,255}));
   connect(sub.y, damSup.y)
@@ -78,9 +79,6 @@ equation
   connect(bypDamExh.y, uBypDamPos)
     annotation (Line(points={{-10,-48},{-10,-30},{30,-30},{30,140},{-202,140}},
         color={0,0,127}));
-  connect(hex.port_b1, port_b1)
-    annotation (Line(points={{10,6},{60,6},{60,80},{100,80}},
-        color={0,127,255}));
   connect(hex.port_a2, damExh.port_b)
     annotation (Line(points={{10,-6},{50,-6},{50,-30}},
         color={0,127,255}));
@@ -102,6 +100,8 @@ equation
           -162,-80}}, color={255,0,255}));
   connect(PEle.y, P) annotation (Line(points={{-139,-80},{80,-80},{80,-90},{120,
           -90}}, color={0,0,127}));
+  connect(bypDamExh.port_b, port_b2)
+    annotation (Line(points={{-20,-60},{-180,-60}}, color={0,127,255}));
 annotation (
         defaultComponentName="whe",
         Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo
new file mode 100644
index 00000000000..e35e93dff4e
--- /dev/null
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo
@@ -0,0 +1,310 @@
+within Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.Examples;
+model SpaceCooling "Space cooling system"
+  extends Modelica.Icons.Example;
+
+  replaceable package MediumA = Buildings.Media.Air "Medium for air";
+  replaceable package MediumW = Buildings.Media.Water "Medium for water";
+
+  Buildings.Fluid.MixingVolumes.MixingVolume vol(
+    redeclare package Medium = MediumA,
+    m_flow_nominal=mA_flow_nominal,
+    V=V,
+    nPorts=2,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    mSenFac=3)
+    annotation (Placement(transformation(extent={{60,20},{80,40}})));
+  Modelica.Thermal.HeatTransfer.Components.ThermalConductor theCon(G=10000/30)
+    "Thermal conductance with the ambient"
+    annotation (Placement(transformation(extent={{20,40},{40,60}})));
+  parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume";
+  // Heat recovery effectiveness
+  parameter Real eps = 0.8 "Heat recovery effectiveness";
+
+  /////////////////////////////////////////////////////////
+  // Design air conditions
+  parameter Modelica.Units.SI.Temperature TASup_nominal=291.15
+    "Nominal air temperature supplied to room";
+  parameter Modelica.Units.SI.DimensionlessRatio wASup_nominal=0.012
+    "Nominal air humidity ratio supplied to room [kg/kg] assuming 90% relative humidity";
+  parameter Modelica.Units.SI.Temperature TRooSet=297.15
+    "Nominal room air temperature";
+  parameter Modelica.Units.SI.Temperature TOut_nominal=303.15
+    "Design outlet air temperature";
+  parameter Modelica.Units.SI.Temperature THeaRecLvg=TOut_nominal - eps*(
+      TOut_nominal - TRooSet) "Air temperature leaving the heat recovery";
+  parameter Modelica.Units.SI.DimensionlessRatio wHeaRecLvg=0.0135
+    "Air humidity ratio leaving the heat recovery [kg/kg]";
+
+  /////////////////////////////////////////////////////////
+  // Cooling loads and air mass flow rates
+  parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow=1000
+    "Internal heat gains of the room";
+  parameter Modelica.Units.SI.HeatFlowRate QRooC_flow_nominal=-QRooInt_flow -
+      10E3/30*(TOut_nominal - TRooSet) "Nominal cooling load of the room";
+  parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal=1.3*
+      QRooC_flow_nominal/1006/(TASup_nominal - TRooSet)
+    "Nominal air mass flow rate, increased by factor 1.3 to allow for recovery after temperature setback";
+  parameter Modelica.Units.SI.TemperatureDifference dTFan=2
+    "Estimated temperature raise across fan that needs to be made up by the cooling coil";
+  parameter Modelica.Units.SI.HeatFlowRate QCoiC_flow_nominal=mA_flow_nominal*(
+      TASup_nominal - THeaRecLvg - dTFan)*1006 + mA_flow_nominal*(wASup_nominal
+       - wHeaRecLvg)*2458.3e3
+    "Cooling load of coil, taking into account outside air sensible and latent heat removal";
+
+  /////////////////////////////////////////////////////////
+  // Water temperatures and mass flow rates
+  parameter Modelica.Units.SI.Temperature TWSup_nominal=285.15
+    "Water supply temperature";
+  parameter Modelica.Units.SI.Temperature TWRet_nominal=289.15
+    "Water return temperature";
+  parameter Modelica.Units.SI.MassFlowRate mW_flow_nominal=-QCoiC_flow_nominal/
+      (TWRet_nominal - TWSup_nominal)/4200 "Nominal water mass flow rate";
+
+  Modelica.Thermal.HeatTransfer.Sources.PrescribedTemperature TOut
+    "Outside temperature"
+    annotation (Placement(transformation(extent={{-20,40},{0,60}})));
+  Modelica.Thermal.HeatTransfer.Sources.FixedHeatFlow preHea(Q_flow=
+        QRooInt_flow) "Prescribed heat flow"
+    annotation (Placement(transformation(extent={{20,70},{40,90}})));
+  Buildings.Fluid.Movers.FlowControlled_m_flow fan(
+    redeclare package Medium = MediumA,
+    m_flow_nominal=mA_flow_nominal,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
+    "Supply air fan"
+    annotation (Placement(transformation(extent={{40,-30},{60,-10}})));
+  Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.BypassDampers whe(
+    redeclare package Medium = MediumA,
+    mSup_flow_nominal=mA_flow_nominal,
+    mExh_flow_nominal=mA_flow_nominal,
+    P_nominal=100,
+    dpSup_nominal=200,
+    epsCoo_nominal=eps,
+    epsHea_nominal=eps) "Heat recovery"
+    annotation (Placement(transformation(extent={{-110,-36},{-90,-16}})));
+  Buildings.Fluid.HeatExchangers.WetCoilEffectivenessNTU cooCoi(
+    redeclare package Medium1 = MediumW,
+    redeclare package Medium2 = MediumA,
+    m1_flow_nominal=mW_flow_nominal,
+    m2_flow_nominal=mA_flow_nominal,
+    dp1_nominal=6000,
+    dp2_nominal=200,
+    use_Q_flow_nominal=true,
+    Q_flow_nominal=QCoiC_flow_nominal,
+    T_a1_nominal=TWSup_nominal,
+    T_a2_nominal=THeaRecLvg,
+    w_a2_nominal=wHeaRecLvg,
+    show_T=true,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial) "Cooling coil"
+   annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=180,
+        origin={-30,-26})));
+  Buildings.Fluid.Sources.Outside out(nPorts=2, redeclare package Medium = MediumA)
+    annotation (Placement(transformation(extent={{-140,-32},{-120,-12}})));
+  Buildings.Fluid.Sources.MassFlowSource_T souWat(
+    nPorts=1,
+    redeclare package Medium = MediumW,
+    use_m_flow_in=true,
+    T=TWSup_nominal) "Source for water flow rate"
+    annotation (Placement(transformation(extent={{-20,-110},{0,-90}})));
+  Buildings.Fluid.Sources.Boundary_pT sinWat(nPorts=1, redeclare package Medium =
+        MediumW) "Sink for water circuit"
+    annotation (Placement(transformation(extent={{-80,-76},{-60,-56}})));
+  BoundaryConditions.WeatherData.ReaderTMY3 weaDat(
+    pAtmSou=Buildings.BoundaryConditions.Types.DataSource.Parameter,
+    TDryBul=TOut_nominal,
+    filNam=Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos"),
+    TDryBulSou=Buildings.BoundaryConditions.Types.DataSource.File)
+    "Weather data reader"
+    annotation (Placement(transformation(extent={{-160,40},{-140,60}})));
+  BoundaryConditions.WeatherData.Bus weaBus "Weather data bus"
+    annotation (Placement(transformation(extent={{-120,40},{-100,60}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant mAir_flow(k=mA_flow_nominal)
+    "Fan air flow rate"
+    annotation (Placement(transformation(extent={{0,0},{20,20}})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senTemHXOut(redeclare package
+      Medium =
+        MediumA, m_flow_nominal=mA_flow_nominal)
+    "Temperature sensor for heat recovery outlet on supply side"
+    annotation (Placement(transformation(extent={{-76,-26},{-64,-14}})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senTemSupAir(redeclare package
+      Medium =
+        MediumA, m_flow_nominal=mA_flow_nominal)
+    "Temperature sensor for supply air"
+    annotation (Placement(transformation(extent={{6,-26},{18,-14}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TRooSetPoi(k=TRooSet)
+    "Room temperature set point"
+    annotation (Placement(transformation(extent={{-170,-104},{-150,-84}})));
+  Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor senTemRoo
+    "Room temperature sensor"
+    annotation (Placement(transformation(extent={{70,70},{90,90}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal mWat_flow(realTrue=0, realFalse=
+        mW_flow_nominal) "Conversion from boolean to real for water flow rate"
+    annotation (Placement(transformation(extent={{-60,-110},{-40,-90}})));
+  Buildings.Controls.OBC.CDL.Reals.Subtract sub
+    "Inputs different"
+    annotation (Placement(transformation(extent={{-130,-110},{-110,-90}})));
+  Buildings.Controls.OBC.CDL.Reals.Hysteresis con(
+    final uLow=-0.5,
+    final uHigh=0.5)
+    "Controller for coil water flow rate"
+    annotation (Placement(transformation(extent={{-100,-110},{-80,-90}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse opeSig(
+    width=0.5,
+    period=86400,
+    shift=0.25*86400)
+              "Operating signal"
+    annotation (Placement(transformation(extent={{-172,10},{-152,30}})));
+  Modelica.Blocks.Sources.Ramp bypDamPos(
+    height=0.5,
+    duration=86400/2,
+    offset=0,
+    startTime=15552000 + 6*3600)
+    "Bypass damper position"
+    annotation (Placement(transformation(extent={{-170,-60},{-150,-40}})));
+equation
+  connect(theCon.port_b, vol.heatPort) annotation (Line(
+      points={{40,50},{50,50},{50,30},{60,30}},
+      color={191,0,0},
+      smooth=Smooth.None));
+  connect(preHea.port, vol.heatPort) annotation (Line(
+      points={{40,80},{50,80},{50,30},{60,30}},
+      color={191,0,0},
+      smooth=Smooth.None));
+  connect(fan.port_b, vol.ports[1]) annotation (Line(
+      points={{60,-20},{69,-20},{69,20}},
+      color={0,127,255},
+      smooth=Smooth.None));
+  connect(vol.ports[2],whe. port_a2) annotation (Line(
+      points={{71,20},{71,-46},{-90,-46},{-90,-32}},
+      color={0,127,255},
+      smooth=Smooth.None));
+  connect(out.ports[2],whe. port_a1) annotation (Line(
+      points={{-120,-21},{-116,-21},{-116,-20},{-110,-20}},
+      color={0,127,255},
+      smooth=Smooth.None));
+  connect(souWat.ports[1], cooCoi.port_a1)   annotation (Line(
+      points={{0,-100},{20,-100},{20,-32},{-20,-32}},
+      color={0,127,255},
+      smooth=Smooth.None));
+  connect(cooCoi.port_b1, sinWat.ports[1])    annotation (Line(
+      points={{-40,-32},{-48,-32},{-48,-66},{-60,-66}},
+      color={0,127,255},
+      smooth=Smooth.None));
+  connect(weaDat.weaBus, out.weaBus) annotation (Line(
+      points={{-140,50},{-128,50},{-128,4},{-148,4},{-148,-21.8},{-140,-21.8}},
+      color={255,204,51},
+      thickness=0.5,
+      smooth=Smooth.None));
+  connect(weaDat.weaBus, weaBus) annotation (Line(
+      points={{-140,50},{-110,50}},
+      color={255,204,51},
+      thickness=0.5,
+      smooth=Smooth.None), Text(
+      textString="%second",
+      index=1,
+      extent={{6,3},{6,3}}));
+  connect(weaBus.TDryBul, TOut.T) annotation (Line(
+      points={{-109.95,50.05},{-66,50.05},{-66,50},{-22,50}},
+      color={255,204,51},
+      thickness=0.5,
+      smooth=Smooth.None), Text(
+      textString="%first",
+      index=-1,
+      extent={{-6,3},{-6,3}}));
+  connect(fan.m_flow_in, mAir_flow.y) annotation (Line(
+      points={{50,-8},{50,10},{22,10}},
+      color={0,0,127},
+      smooth=Smooth.None));
+  connect(whe.port_b1, senTemHXOut.port_a) annotation (Line(
+      points={{-90,-20},{-76,-20}},
+      color={0,127,255},
+      smooth=Smooth.None));
+  connect(senTemHXOut.port_b, cooCoi.port_a2) annotation (Line(
+      points={{-64,-20},{-40,-20}},
+      color={0,127,255},
+      smooth=Smooth.None));
+  connect(cooCoi.port_b2, senTemSupAir.port_a) annotation (Line(
+      points={{-20,-20},{6,-20}},
+      color={0,127,255},
+      smooth=Smooth.None));
+  connect(senTemSupAir.port_b, fan.port_a) annotation (Line(
+      points={{18,-20},{40,-20}},
+      color={0,127,255},
+      smooth=Smooth.None));
+  connect(TOut.port, theCon.port_a) annotation (Line(
+      points={{5.55112e-16,50},{20,50}},
+      color={191,0,0},
+      smooth=Smooth.None));
+  connect(vol.heatPort, senTemRoo.port) annotation (Line(
+      points={{60,30},{50,30},{50,80},{70,80}},
+      color={191,0,0},
+      smooth=Smooth.None));
+  connect(mWat_flow.y, souWat.m_flow_in) annotation (Line(
+      points={{-38,-100},{-30,-100},{-30,-92},{-22,-92}},
+      color={0,0,127},
+      smooth=Smooth.None));
+  connect(sub.y, con.u)
+    annotation (Line(points={{-108,-100},{-102,-100}}, color={0,0,127}));
+  connect(con.y, mWat_flow.u)
+    annotation (Line(points={{-78,-100},{-62,-100}}, color={255,0,255}));
+  connect(TRooSetPoi.y, sub.u1)
+    annotation (Line(points={{-148,-94},{-132,-94}}, color={0,0,127}));
+  connect(senTemRoo.T, sub.u2) annotation (Line(points={{91,80},{100,80},{100,-140},
+          {-140,-140},{-140,-106},{-132,-106}}, color={0,0,127}));
+  connect(whe.port_b2, out.ports[1]) annotation (Line(points={{-110,-32},{-116,-32},
+          {-116,-23},{-120,-23}}, color={0,127,255}));
+  connect(opeSig.y, whe.uRot) annotation (Line(points={{-150,20},{-116,20},{-116,
+          -18},{-112,-18}}, color={255,0,255}));
+  connect(bypDamPos.y, whe.uBypDamPos) annotation (Line(points={{-149,-50},{-118,
+          -50},{-118,-26},{-112,-26}}, color={0,0,127}));
+  annotation (Documentation(info="<html>
+<p>
+This block is identical to
+<a href=\"modelica://Buildings.Examples.Tutorial.SpaceCooling.System3\">
+Buildings.Examples.Tutorial.SpaceCooling.System3</a>,
+except that the heat recovery device is modelled with <a href=\"modelica://Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BypassDampers\">
+Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BypassDampers</a>.
+</p>
+<p>
+The major input signals for the heat recovery device are configured as follows:
+</p>
+<ul>
+<li>
+The operating signal <i>uRot</i> changes from <code>false</code> to <code>true</code> at 6:00
+and from <code>false</code> to <code>true</code> at 18:00.
+</li>
+<li>
+The bypass damper position <i>uBypDamPos</i> changes from <i>0</i> to <i>0.5</i> 
+during the period from 200 seconds to 360 seconds.
+</li>
+</ul>
+<p>
+The expected outputs are:
+</p>
+<ul>
+<li>
+The outdoor temperature, <code>TOut.T</code>, and the temperature of the air leaving the exchanger, senTemHXOut.T,
+becomes different at 6:00.
+</li>
+<li>
+Their difference becomes smaller and smaller after 6:00 and equals to <i>0</i> after 18:00.
+</li>
+</ul>
+</html>", revisions="<html>
+<ul>
+<li>
+May 3, 2024, by Sen Huang:<br/>
+First implementation based on <a href=\"modelica://Buildings.Examples.Tutorial.SpaceCooling.System3\">
+Buildings.Examples.Tutorial.SpaceCooling.System3</a>.
+</li>
+</ul>
+</html>"),
+    Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-180,-160},{120,
+            100}})),
+    __Dymola_Commands(file=
+     "modelica://Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mos"
+        "Simulate and plot"),
+    experiment(StartTime=15552000, Tolerance=1e-6, StopTime=15638400));
+end SpaceCooling;
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/package.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/package.mo
new file mode 100644
index 00000000000..cd9bba7b7bb
--- /dev/null
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/package.mo
@@ -0,0 +1,12 @@
+within Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible;
+package Examples "Collection of models that illustrate model use and test models"
+  extends Modelica.Icons.ExamplesPackage;
+
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains validation models for the classes in
+<a href=\"modelica://Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible\">
+Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible</a>.
+</p>
+</html>"));
+end Examples;
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/package.order b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/package.order
new file mode 100644
index 00000000000..50303e7a6b0
--- /dev/null
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/package.order
@@ -0,0 +1 @@
+SpaceCooling
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/SpeedControlled.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/SpeedControlled.mo
index 36806cfa775..cfa833f28a8 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/SpeedControlled.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/SpeedControlled.mo
@@ -3,10 +3,24 @@ model SpeedControlled
   "Sensible heat recovery wheel with a variable speed drive"
   extends
     Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.BaseClasses.PartialWheel;
-  parameter Real a[:] = {1}
-    "Coefficients for power consumption curve for rotor. The sum of the elements must be equal to 1"
+  parameter Boolean defaultMotorEfficiencyCurve = true "= true, use the default motor efficiency curve"
+    annotation (Dialog(group="Efficiency"));
+  parameter Real table[:,:]=[0.8,1]
+    "Table of motor power efficiency as a function of the wheel speed ratio (first column)"
+    annotation (Dialog(group="Efficiency", enable = not defaultMotorEfficiencyCurve));
+  final parameter
+    Buildings.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters_yMot
+      motorEfficiency_default=
+        Buildings.Fluid.Movers.BaseClasses.Characteristics.motorEfficiencyCurve(
+          P_nominal=P_nominal,
+          eta_max=1)
+    "default motor efficiency  vs. whell speed ratio";
+  final parameter Real xSpe[:] = if defaultMotorEfficiencyCurve then motorEfficiency_default.y else table[:,1]
+    "x-axis support points of the power efficiency curve"
+    annotation (Dialog(group="Efficiency"));
+  final parameter Real[size(xSpe,1)] yeta = if defaultMotorEfficiencyCurve then motorEfficiency_default.eta else table[:,2]
+    "y-axis support points of the power efficiency curve"
     annotation (Dialog(group="Efficiency"));
-
   Buildings.Controls.OBC.CDL.Interfaces.RealInput uSpe(
     final unit="1",
     final max=1)
@@ -15,16 +29,19 @@ model SpeedControlled
         iconTransformation(extent={{-140,-20},{-100,20}})));
 protected
   Modelica.Blocks.Sources.RealExpression PEle(
-    final y=P_nominal*Buildings.Utilities.Math.Functions.polynomial(a=a, x=uSpe))
+    final y=P_nominal*uSpe/Buildings.Utilities.Math.Functions.smoothInterpolation(
+      x=uSpe,
+      xSup=xSpe,
+      ySup=yeta))
     "Electric power consumption"
     annotation (Placement(transformation(extent={{60,-100},{80,-80}})));
 
 initial equation
-  assert(abs(sum(a)-1) < Modelica.Constants.eps,
+  assert(table[end,1] < 1,
          "In " + getInstanceName() + ": Power efficiency curve is wrong. 
-         The sum of the coefficients for power efficiency curve must be 1.",
-         level=AssertionLevel.error);
-
+         No need to define efficiency for the nominal condition",
+         level=AssertionLevel.error)
+         "Check if the effiency for the nominal conidtion is defined.";
 equation
   connect(P, PEle.y)
     annotation (Line(points={{120,-90},{81,-90}}, color={0,0,127}));
@@ -62,20 +79,38 @@ The operation of the heat recovery wheel is adjustable by modulating the wheel s
 Accordingly, the power consumption of this wheel is calculated by
 </p>
 <p align=\"center\" style=\"font-style:italic;\">
-P = P_nominal * (a<sub>1</sub> + a<sub>2</sub> uSpe + a<sub>3</sub> uSpe<sup>2</sup> + ...),
+P = P_nominal * uSpe / eta,
 </p>
 <p>
 where <code>P_nominal</code> is the nominal wheel power consumption,
-<code>uSpe</code> is the wheel speed ratio, 
-and the <code>a[:]</code> are the coefficients for power efficiency curve.
-The sum of the coefficients must be <i>1</i>, otherwise the model stops with an error.
-Thus, when the speed ratio <code>uSpe=1</code>, the power consumption equal to
-nominal consumption, <code>P=P_nominal</code>.
+<code>uSpe</code> is the wheel speed ratio.
+The <code>eta</code> is the motor percent full-Load efficiency, i.e.,
+the ratio of the motor efficiency to that when the <code>uSpe</code> is <i>1</i>.   
+There are two ways to define <code>eta</code>:
+</p>
+<ul>
+<li>
+Default curves in U.S. DOE (2014).
+</li>
+<li>
+Polynomial fit based on the user input data table.
+</li>
+</ul>
+<p>
+One can switch between those two options with the parameter <code>defaultMotorEfficiencyCurve</code>.
+</p>
+<p>
+The sensible and latent effectiveness is calculated with
+<a href=\"modelica://Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BaseClasses.Effectiveness\">
+Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BaseClasses.Effectiveness</a>.
 </p>
+<h4>References</h4>
 <p>
-The sensible heat exchanger effectiveness is calculated with
-<a href=\"modelica://Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.BaseClasses.Effectiveness\">
-Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.BaseClasses.Effectiveness</a>.
+U.S. DOE (2014).
+<i>Determining Electric Motor Load and Efficiency.</i>
+URL:
+<a href=\"https://www.energy.gov/sites/prod/files/2014/04/f15/10097517.pdf\">
+https://www.energy.gov/sites/prod/files/2014/04/f15/10097517.pdf</a>
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/BypassDampers.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/BypassDampers.mo
index 2761ee13910..26c5447ac06 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/BypassDampers.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/BypassDampers.mo
@@ -2,19 +2,17 @@ within Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.Validation;
 model BypassDampers
   "Test model for the sensible heat recovery wheel with bypass dampers"
   extends Modelica.Icons.Example;
-  package Medium1 = Buildings.Media.Air
-    "Supply air";
-  package Medium2 = Buildings.Media.Air
-    "Exhaust air";
+  package Medium = Buildings.Media.Air
+    "Air";
   Buildings.Fluid.Sources.Boundary_pT sin_2(
-    redeclare package Medium = Medium2,
+    redeclare package Medium = Medium,
     p(displayUnit="Pa") = 101325,
     T=273.15 + 10,
     nPorts=1)
     "Exhaust air sink"
     annotation (Placement(transformation(extent={{-80,-44},{-60,-24}})));
   Buildings.Fluid.Sources.Boundary_pT sou_2(
-    redeclare package Medium = Medium2,
+    redeclare package Medium = Medium,
     p(displayUnit="Pa") = 101325 + 500,
     T(displayUnit="degC") = 293.15,
     nPorts=1)
@@ -28,7 +26,7 @@ model BypassDampers
     "Supply air temperature"
     annotation (Placement(transformation(extent={{-80,30},{-60,50}})));
   Buildings.Fluid.Sources.Boundary_pT sin_1(
-    redeclare package Medium = Medium1,
+    redeclare package Medium = Medium,
     T=273.15 + 30,
     X={0.012,1 - 0.012},
     p(displayUnit="Pa") = 101325 - 500,
@@ -36,7 +34,7 @@ model BypassDampers
     "Supply air sink"
     annotation (Placement(transformation(extent={{90,20},{70,40}})));
   Buildings.Fluid.Sources.Boundary_pT sou_1(
-    redeclare package Medium = Medium1,
+    redeclare package Medium = Medium,
     T=273.15 + 50,
     X={0.012,1 - 0.012},
     use_T_in=true,
@@ -45,12 +43,11 @@ model BypassDampers
     "Supply air source"
     annotation (Placement(transformation(extent={{-40,26},{-20,46}})));
   Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.BypassDampers whe(
-    redeclare package Medium1 = Medium1,
-    redeclare package Medium2 = Medium2,
-    m1_flow_nominal=5,
-    m2_flow_nominal=5,
-    dp1_nominal(displayUnit="Pa"),
-    dp2_nominal(displayUnit="Pa"),
+    redeclare package Medium = Medium,
+    mSup_flow_nominal=5,
+    mExh_flow_nominal=5,
+    dpSup_nominal(displayUnit="Pa"),
+    dpExh_nominal(displayUnit="Pa"),
     P_nominal=100) "Wheel"
     annotation (Placement(transformation(extent={{0,-10},{20,10}})));
   Modelica.Blocks.Sources.Ramp bypDamPos(
@@ -66,12 +63,12 @@ model BypassDampers
     shift=72) "Operating signal"
     annotation (Placement(transformation(extent={{-80,60},{-60,80}})));
   Buildings.Fluid.Sensors.TemperatureTwoPort senExhTem(
-    redeclare package Medium = Medium2,
+    redeclare package Medium = Medium,
     m_flow_nominal=5)
     "Temperature of the exhaust air"
     annotation (Placement(transformation(extent={{-30,-44},{-50,-24}})));
   Buildings.Fluid.Sensors.TemperatureTwoPort senSupTem(
-    redeclare package Medium = Medium1,
+    redeclare package Medium = Medium,
     m_flow_nominal=5)
     "Temperature of the supply air"
     annotation (Placement(transformation(extent={{60,20},{40,40}})));
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mo
index 3d1417726b6..f6742ed3299 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mo
@@ -2,22 +2,20 @@ within Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.Validation;
 model SpeedControlled
   "Test model for the sensible heat recovery wheel with a variable speed drive"
   extends Modelica.Icons.Example;
-  package Medium1 = Buildings.Media.Air
-    "Supply air";
-  package Medium2 = Buildings.Media.Air
-    "Exhaust air";
+  package Medium = Buildings.Media.Air
+    "Air";
   Buildings.Fluid.Sources.Boundary_pT sin_2(
-    redeclare package Medium = Medium2,
+    redeclare package Medium = Medium,
     p(displayUnit="Pa") = 101325,
     T(displayUnit="degC") = 273.15 + 10,
-    nPorts=1)
+    nPorts=2)
     "Exhaust air sink"
     annotation (Placement(transformation(extent={{-78,-50},{-58,-30}})));
   Buildings.Fluid.Sources.Boundary_pT sou_2(
-    redeclare package Medium = Medium2,
+    redeclare package Medium = Medium,
     p(displayUnit="Pa") = 101325 + 500,
     T(displayUnit="degC") = 293.15,
-    nPorts=1)
+    nPorts=2)
     "Exhaust air source"
     annotation (Placement(transformation(extent={{90,-40},{70,-20}})));
   Modelica.Blocks.Sources.Ramp TSup(
@@ -28,29 +26,30 @@ model SpeedControlled
     "Supply air temperature"
     annotation (Placement(transformation(extent={{-80,24},{-60,44}})));
   Buildings.Fluid.Sources.Boundary_pT sin_1(
-    redeclare package Medium = Medium1,
+    redeclare package Medium = Medium,
     T=273.15 + 30,
     X={0.012,1 - 0.012},
     p(displayUnit="Pa") = 101325 - 500,
-    nPorts=1)
+    nPorts=2)
     "Supply air sink"
     annotation (Placement(transformation(extent={{92,20},{72,40}})));
   Buildings.Fluid.Sources.Boundary_pT sou_1(
-    redeclare package Medium = Medium1,
+    redeclare package Medium = Medium,
     T=273.15 + 50,
     X={0.012,1 - 0.012},
     use_T_in=true,
     p(displayUnit="Pa") = 101325,
-    nPorts=1)
+    nPorts=2)
     "Supply air source"
     annotation (Placement(transformation(extent={{-40,20},{-20,40}})));
-  Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.SpeedControlled whe(
-    redeclare package Medium1 = Medium1,
-    redeclare package Medium2 = Medium2,
-    m1_flow_nominal=5,
-    m2_flow_nominal=5,
-    P_nominal=100) "Wheel"
-    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
+  Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.SpeedControlled wheUseDefCur(
+    redeclare package Medium = Medium,
+    mSup_flow_nominal=5,
+    mExh_flow_nominal=5,
+    P_nominal=100,
+    defaultMotorEfficiencyCurve=false)
+    "Wheel with a user-defined curve"
+    annotation (Placement(transformation(extent={{0,0},{20,20}})));
   Modelica.Blocks.Sources.Ramp wheSpe(
     height=0.3,
     duration=160,
@@ -59,32 +58,49 @@ model SpeedControlled
     "Wheel speed"
     annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
   Buildings.Fluid.Sensors.TemperatureTwoPort senExhTem(
-    redeclare package Medium = Medium2,
+    redeclare package Medium = Medium,
     m_flow_nominal=5)
     "Temperature of the exhaust air"
-    annotation (Placement(transformation(extent={{-20,-50},{-40,-30}})));
+    annotation (Placement(transformation(extent={{-20,-52},{-40,-32}})));
   Buildings.Fluid.Sensors.TemperatureTwoPort senSupTem(
-    redeclare package Medium = Medium1,
+    redeclare package Medium = Medium,
     m_flow_nominal=5)
     "Temperature of the supply air"
     annotation (Placement(transformation(extent={{60,20},{40,40}})));
+  Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.SpeedControlled wheDefCur(
+    redeclare package Medium = Medium,
+    mSup_flow_nominal=5,
+    mExh_flow_nominal=5,
+    P_nominal=100) "Wheel with a default curve"
+    annotation (Placement(transformation(extent={{0,-30},{20,-10}})));
 equation
   connect(TSup.y, sou_1.T_in)
     annotation (Line(points={{-59,34},{-42,34}}, color={0,0,127}));
-  connect(sou_1.ports[1],whe. port_a1)
-    annotation (Line(points={{-20,30},{-10,30},{-10,6},{0,6}}, color={0,127,255}));
-  connect(whe.port_a2, sou_2.ports[1])
-    annotation (Line(points={{20,-6},{40,-6},{40,-30},{70,-30}}, color={0,127,255}));
-  connect(wheSpe.y, whe.uSpe)
-    annotation (Line(points={{-59,0},{-2,0}}, color={0,0,127}));
-  connect(whe.port_b2, senExhTem.port_a) annotation (Line(points={{0,-6},{-6,-6},
-          {-6,-40},{-20,-40}}, color={0,127,255}));
+  connect(sou_1.ports[1], wheUseDefCur.port_a1) annotation (Line(points={{-20,29},
+          {-10,29},{-10,16},{0,16}}, color={0,127,255}));
+  connect(wheUseDefCur.port_a2, sou_2.ports[1]) annotation (Line(points={{20,4},{
+          40,4},{40,-31},{70,-31}},  color={0,127,255}));
+  connect(wheSpe.y, wheUseDefCur.uSpe) annotation (Line(points={{-59,0},{-30,0},
+          {-30,10},{-2,10}}, color={0,0,127}));
+  connect(wheUseDefCur.port_b2, senExhTem.port_a) annotation (Line(points={{0,4},{
+          -6,4},{-6,-42},{-20,-42}},  color={0,127,255}));
   connect(senExhTem.port_b, sin_2.ports[1])
-    annotation (Line(points={{-40,-40},{-58,-40}}, color={0,127,255}));
-  connect(senSupTem.port_a, sin_1.ports[1])
-    annotation (Line(points={{60,30},{72,30}}, color={0,127,255}));
-  connect(senSupTem.port_b, whe.port_b1) annotation (Line(points={{40,30},{28,30},
-          {28,6},{20,6}}, color={0,127,255}));
+    annotation (Line(points={{-40,-42},{-48,-42},{-48,-41},{-58,-41}},
+                                                   color={0,127,255}));
+  connect(senSupTem.port_b, wheUseDefCur.port_b1) annotation (Line(points={{40,30},
+          {28,30},{28,16},{20,16}}, color={0,127,255}));
+  connect(wheDefCur.port_a1, sou_1.ports[2]) annotation (Line(points={{0,-14},{
+          -14,-14},{-14,31},{-20,31}}, color={0,127,255}));
+  connect(wheDefCur.port_b1, sin_1.ports[1]) annotation (Line(points={{20,-14},
+          {36,-14},{36,22},{64,22},{64,29},{72,29}}, color={0,127,255}));
+  connect(wheDefCur.port_b2, sin_2.ports[2]) annotation (Line(points={{0,-26},{
+          -48,-26},{-48,-39},{-58,-39}}, color={0,127,255}));
+  connect(wheDefCur.port_a2, sou_2.ports[2]) annotation (Line(points={{20,-26},
+          {52,-26},{52,-29},{70,-29}}, color={0,127,255}));
+  connect(wheDefCur.uSpe, wheSpe.y) annotation (Line(points={{-2,-20},{-30,-20},
+          {-30,0},{-59,0}}, color={0,0,127}));
+  connect(senSupTem.port_a, sin_1.ports[2]) annotation (Line(points={{60,30},{
+          66,30},{66,31},{72,31}}, color={0,127,255}));
 annotation(experiment(Tolerance=1e-6, StopTime=360),
 __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mos"
         "Simulate and plot"),
@@ -95,6 +111,11 @@ Example for the model
 Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.SpeedControlled</a>.
 </p>
 <p>
+This example considers two wheels:
+<code>wheUseDefCur</code> employs a user-defined efficiency curve;
+<code>wheDefCur</code> employs a default efficiency curve
+</p>
+<p>
 The input signals are configured as follows:
 </p>
 <ul>
@@ -125,6 +146,11 @@ follow the change of <i>TSup</i> before the 200 seconds.
 After 200 seconds, the leaving supply air temperature decreases
 and the leaving exhaust air temperature increases.
 </li>
+<li>
+The power consumption of the instance <code>wheUseDefCur</code> is higher than that of the instance <code>wheDefCur</code>
+when <i>uSpe</i> is less than 1.
+The power consumption of those two instances are identical when <i>uSpe</i> equals to <i>1</i>.
+</li>
 </ul>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/package.order b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/package.order
index f72d2cb4843..1786308b3c1 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/package.order
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/package.order
@@ -1,4 +1,5 @@
 BypassDampers
 SpeedControlled
+Examples
 Validation
 BaseClasses

From e265a627ef62bdc988b6c77df01235cd40e1b489 Mon Sep 17 00:00:00 2001
From: SenHuang19 <jhy1987@gmail.com>
Date: Thu, 9 May 2024 14:06:59 -0400
Subject: [PATCH 03/27] model improve and clean

---
 .../Latent/BaseClasses/Effectiveness.mo       |  2 +-
 .../ThermalWheels/Latent/BypassDampers.mo     | 34 ++++++------
 .../Latent/Examples/SpaceCooling.mo           | 43 ++++++++-------
 .../ThermalWheels/Latent/SpeedControlled.mo   | 27 +++++-----
 .../Latent/Validation/BypassDampers.mo        | 18 +++----
 .../Latent/Validation/SpeedControlled.mo      | 11 ++--
 .../Sensible/BaseClasses/Effectiveness.mo     |  2 +-
 .../Sensible/BaseClasses/PartialWheel.mo      | 41 +++++++-------
 .../HeatExchangerWithInputEffectiveness.mo    |  2 +-
 .../ThermalWheels/Sensible/BypassDampers.mo   | 32 +++++------
 .../Sensible/Examples/SpaceCooling.mo         | 53 ++++++++++---------
 .../ThermalWheels/Sensible/SpeedControlled.mo | 17 +++---
 .../Sensible/Validation/BypassDampers.mo      |  6 +--
 .../Sensible/Validation/SpeedControlled.mo    | 50 +++++++++--------
 14 files changed, 177 insertions(+), 161 deletions(-)

diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Effectiveness.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Effectiveness.mo
index c81650a0fe3..4ac3be636af 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Effectiveness.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Effectiveness.mo
@@ -82,7 +82,7 @@ protected
 
 equation
   // Check if the air flows are too unbalanced
-  assert(mSup_flow - 2*mExh_flow < 0 or mExh_flow - 2*mSup_flow < 0,
+  assert(mSup_flow - 2*mExh_flow <= 0 and mExh_flow - 2*mSup_flow <= 0,
     "In " + getInstanceName() + ": The ratio of the supply flow rate to the exhaust flow rate should be in the range of [0.5, 2].",
     level=AssertionLevel.warning);
   // Calculate the average volumetric air flow and flow rate ratio.
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo
index e982178b7fe..7daad2bcf48 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo
@@ -3,7 +3,7 @@ model BypassDampers
   "Enthalpy recovery wheel with bypass dampers"
   extends
     Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BaseClasses.PartialWheel;
-  parameter Modelica.Units.SI.PressureDifference dpDam_nominal(displayUnit="Pa") = 20
+  parameter Modelica.Units.SI.PressureDifference dpDamper_nominal(displayUnit="Pa") = 20
     "Nominal pressure drop of supply air dampers"
     annotation (Dialog(group="Nominal condition"));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput uBypDamPos(
@@ -20,27 +20,27 @@ model BypassDampers
   Buildings.Fluid.Actuators.Dampers.Exponential bypDamSup(
     redeclare package Medium = Medium,
     final m_flow_nominal=mSup_flow_nominal,
-    final dpDamper_nominal=dpDam_nominal)
+    final dpDamper_nominal=dpDamper_nominal)
     "Supply air bypass damper"
     annotation (Placement(transformation(extent={{-60,70},{-40,90}})));
   Buildings.Fluid.Actuators.Dampers.Exponential damSup(
     redeclare package Medium = Medium,
     final m_flow_nominal=mSup_flow_nominal,
-    final dpDamper_nominal=dpDam_nominal)
+    final dpDamper_nominal=dpDamper_nominal)
     "Supply air damper"
     annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},rotation=0,origin={-90,36})));
   Buildings.Fluid.Actuators.Dampers.Exponential damExh(
     redeclare package Medium = Medium,
     final m_flow_nominal=mExh_flow_nominal,
-    final dpDamper_nominal=dpDam_nominal)
+    final dpDamper_nominal=dpDamper_nominal)
     "Exhaust air damper"
     annotation (Placement(transformation(
         extent={{10,10},{-10,-10}},rotation=-90,origin={40,-44})));
   Buildings.Fluid.Actuators.Dampers.Exponential bypDamExh(
     redeclare package Medium = Medium,
     final m_flow_nominal=mExh_flow_nominal,
-    final dpDamper_nominal=dpDam_nominal)
+    final dpDamper_nominal=dpDamper_nominal)
     "Exhaust air bypass damper"
     annotation (Placement(transformation(extent={{0,-70},{-20,-50}})));
 protected
@@ -60,34 +60,34 @@ protected
 equation
   connect(sub.y, damSup.y)
     annotation (Line(points={{-78,100},{20,100},{20,54},{-90,54},{-90,48}},
-        color={0,0,127}));
+    color={0,0,127}));
   connect(damExh.y,sub. y)
     annotation (Line(points={{28,-44},{20,-44},{20,100},{-78,100}}, color={0,0,127}));
   connect(bypDamSup.y, uBypDamPos)
     annotation (Line(points={{-50,92},{-50,140},{-202,140}}, color={0,0,127}));
   connect(damSup.port_b, hex.port_a1)
     annotation (Line(points={{-80,36},{-30,36},{-30,6},{-10,6}},
-        color={0,127,255}));
+    color={0,127,255}));
   connect(bypDamExh.y, uBypDamPos)
     annotation (Line(points={{-10,-48},{-10,-30},{30,-30},{30,140},{-202,140}},
-        color={0,0,127}));
+    color={0,0,127}));
   connect(sub.u2, uBypDamPos)
     annotation (Line(points={{-102,94},{-160,94},{-160,140},{-202,140}},
-        color={0,0,127}));
+    color={0,0,127}));
   connect(uni.y, sub.u1)
     annotation (Line(points={{-119,120},{-110,120},{-110,106},{-102,106}},
-        color={0,0,127}));
+    color={0,0,127}));
   connect(uRot, booleanToReal.u)
     annotation (Line(points={{-200,0},{-162,0}}, color={255,0,255}));
   connect(booleanToReal.y, effCal.uSpe)
     annotation (Line(points={{-139,0},{-120,0},{-120,0},{-102,0}},
-        color={0,0,127}));
-  connect(PEle.y, P) annotation (Line(points={{-139,-80},{80,-80},{80,-90},{120,
-          -90}}, color={0,0,127}));
-  connect(PEle.u, uRot) annotation (Line(points={{-162,-80},{-168,-80},{-168,0},
-          {-200,0}}, color={255,0,255}));
-  connect(damSup.port_a, port_a1) annotation (Line(points={{-100,36},{-130,36},
-          {-130,80},{-180,80}}, color={0,127,255}));
+    color={0,0,127}));
+  connect(PEle.y, P) annotation (Line(points={{-139,-80},{80,-80},{80,-90},{120,-90}},
+    color={0,0,127}));
+  connect(PEle.u, uRot) annotation (Line(points={{-162,-80},{-168,-80},{-168,0},{-200,0}}, 
+    color={255,0,255}));
+  connect(damSup.port_a, port_a1) annotation (Line(points={{-100,36},{-130,36},{-130,80},{-180,80}}, 
+    color={0,127,255}));
   connect(damExh.port_b, hex.port_a2)
     annotation (Line(points={{40,-34},{40,-6},{10,-6}}, color={0,127,255}));
   connect(bypDamExh.port_b, port_b2)
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mo
index 0c11e75ec94..2a50371b161 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mo
@@ -113,14 +113,14 @@ model SpaceCooling "Space cooling system"
   Buildings.Fluid.Sources.Boundary_pT sinWat(
     nPorts=1, redeclare package Medium = MediumW) "Sink for water circuit"
     annotation (Placement(transformation(extent={{-80,-76},{-60,-56}})));
-  BoundaryConditions.WeatherData.ReaderTMY3 weaDat(
+  Buildings.BoundaryConditions.WeatherData.ReaderTMY3 weaDat(
     pAtmSou=Buildings.BoundaryConditions.Types.DataSource.Parameter,
     TDryBul=TOut_nominal,
     filNam=Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos"),
     TDryBulSou=Buildings.BoundaryConditions.Types.DataSource.File)
     "Weather data reader"
     annotation (Placement(transformation(extent={{-160,40},{-140,60}})));
-  BoundaryConditions.WeatherData.Bus weaBus "Weather data bus"
+  Buildings.BoundaryConditions.WeatherData.Bus weaBus "Weather data bus"
     annotation (Placement(transformation(extent={{-120,40},{-100,60}})));
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant mAir_flow(k=mA_flow_nominal)
     "Fan air flow rate"
@@ -245,20 +245,27 @@ equation
       points={{-38,-100},{-30,-100},{-30,-92},{-22,-92}},
       color={0,0,127},
       smooth=Smooth.None));
-  connect(sub.y, con.u)
-    annotation (Line(points={{-108,-100},{-102,-100}}, color={0,0,127}));
-  connect(con.y, mWat_flow.u)
-    annotation (Line(points={{-78,-100},{-62,-100}}, color={255,0,255}));
-  connect(TRooSetPoi.y, sub.u1)
-    annotation (Line(points={{-148,-94},{-132,-94}}, color={0,0,127}));
-  connect(senTemRoo.T, sub.u2) annotation (Line(points={{91,80},{100,80},{100,-140},
-          {-140,-140},{-140,-106},{-132,-106}}, color={0,0,127}));
-  connect(whe.port_b2, out.ports[1]) annotation (Line(points={{-110,-32},{-116,-32},
-          {-116,-23},{-120,-23}}, color={0,127,255}));
-  connect(opeSig.y, whe.uRot) annotation (Line(points={{-150,20},{-116,20},{-116,
-          -18},{-112,-18}}, color={255,0,255}));
-  connect(bypDamPos.y, whe.uBypDamPos) annotation (Line(points={{-149,-50},{-118,
-          -50},{-118,-26},{-112,-26}}, color={0,0,127}));
+  connect(sub.y, con.u) annotation (Line(
+      points={{-108,-100},{-102,-100}},
+      color={0,0,127}));
+  connect(con.y, mWat_flow.u) annotation (Line(
+      points={{-78,-100},{-62,-100}},
+      color={255,0,255}));
+  connect(TRooSetPoi.y, sub.u1) annotation (Line(
+      points={{-148,-94},{-132,-94}},
+      color={0,0,127}));
+  connect(senTemRoo.T, sub.u2) annotation (Line(
+      points={{91,80},{100,80},{100,-140},{-140,-140},{-140,-106},{-132,-106}},
+      color={0,0,127}));
+  connect(whe.port_b2, out.ports[1]) annotation (Line(
+      points={{-110,-32},{-116,-32},{-116,-23},{-120,-23}},
+      color={0,127,255}));
+  connect(opeSig.y, whe.uRot) annotation (Line(
+      points={{-150,20},{-116,20},{-116,-18},{-112,-18}},
+      color={255,0,255}));
+  connect(bypDamPos.y, whe.uBypDamPos) annotation (Line(
+      points={{-149,-50},{-118,-50},{-118,-26},{-112,-26}},
+      color={0,0,127}));
   annotation (Documentation(info="<html>
 <p>
 This block is identical to
@@ -285,11 +292,11 @@ The expected outputs are:
 </p>
 <ul>
 <li>
-The outdoor temperature, <code>TOut.T</code>, and the temperature of the air leaving the exchanger, senTemHXOut.T,
+The outdoor temperature, <code>TOut.T</code>, and the temperature of the air leaving the exchanger, <code>senTemHXOut.T</code>,
 becomes different at 6:00.
 </li>
 <li>
-Their difference becomes smaller and smaller after 6:00 and equals to <i>0</i> after 18:00.
+Their difference equals <i>0</i> after 18:00.
 </li>
 </ul>
 </html>", revisions="<html>
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/SpeedControlled.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/SpeedControlled.mo
index af8e21b2b02..d62ef6a769d 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/SpeedControlled.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/SpeedControlled.mo
@@ -3,10 +3,11 @@ model SpeedControlled
   "Enthalpy recovery wheel with a variable speed drive"
   extends
     Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BaseClasses.PartialWheel;
-  parameter Boolean defaultMotorEfficiencyCurve = true "= true, use the default motor efficiency curve"
+  parameter Boolean defaultMotorEfficiencyCurve = true
+    "Set to true for using the default motor efficiency curve, or false for using the user-defined motor efficiency curve"
     annotation (Dialog(group="Efficiency"));
   parameter Real table[:,:]=[0.8,1]
-    "Table of motor power efficiency as a function of the wheel speed ratio (first column)"
+    "Table of user-defined motor efficiency curve:(first column:the wheel speed ratio, second column:motor power efficiency)"
     annotation (Dialog(group="Efficiency", enable = not defaultMotorEfficiencyCurve));
   final parameter
     Buildings.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters_yMot
@@ -14,7 +15,7 @@ model SpeedControlled
         Buildings.Fluid.Movers.BaseClasses.Characteristics.motorEfficiencyCurve(
           P_nominal=P_nominal,
           eta_max=1)
-    "default motor efficiency  vs. whell speed ratio";
+    "Default motor efficiency curve";
   final parameter Real xSpe[:] = if defaultMotorEfficiencyCurve then motorEfficiency_default.y else table[:,1]
     "x-axis support points of the power efficiency curve"
     annotation (Dialog(group="Efficiency"));
@@ -35,26 +36,24 @@ protected
       ySup=yeta))
     "Electric power consumption"
     annotation (Placement(transformation(extent={{60,-100},{80,-80}})));
-
 initial equation
-  assert(table[end,1] < 1,
+  assert(table[end,1] < 1 or defaultMotorEfficiencyCurve,
          "In " + getInstanceName() + ": Power efficiency curve is wrong. 
          No need to define efficiency for the nominal condition",
          level=AssertionLevel.error)
-         "Check if the effiency for the nominal conidtion is defined.";
-
+         "Check if the motor efficiency for the nominal condition is defined in the user-defined curve";
 equation
   connect(P, PEle.y)
     annotation (Line(points={{120,-90},{81,-90}}, color={0,0,127}));
   connect(effCal.uSpe, uSpe)
     annotation (Line(points={{-102,0},{-200,0}}, color={0,0,127}));
-  connect(hex.port_a2, port_a2) annotation (Line(points={{10,-6},{60,-6},{60,
-          -60},{100,-60},{100,-60}}, color={0,127,255}));
-  connect(hex.port_a1, port_a1) annotation (Line(points={{-10,6},{-32,6},{-32,
-          80},{-180,80}}, color={0,127,255}));
-    annotation (
-   defaultComponentName="whe",
-        Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
+  connect(hex.port_a2, port_a2)
+    annotation (Line(points={{10,-6},{60,-6},{60,-60},{100,-60},{100,-60}},
+    color={0,127,255}));
+  connect(hex.port_a1, port_a1)
+    annotation (Line(points={{-10,6},{-32,6},{-32,80},{-180,80}}, color={0,127,255}));
+annotation (
+   defaultComponentName="whe",Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
    graphics={
         Polygon(
           points={{0,100},{0,100}},
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/BypassDampers.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/BypassDampers.mo
index e464a6f385a..95f5205a17d 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/BypassDampers.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/BypassDampers.mo
@@ -80,22 +80,22 @@ equation
     annotation (Line(points={{-59,34},{-42,34}}, color={0,0,127}));
   connect(sou_1.ports[1],whe.port_a1)
     annotation (Line(points={{-20,30},{-14,30},{-14,6},{0,6}},
-                                                     color={0,127,255}));
+    color={0,127,255}));
   connect(whe.port_a2, sou_2.ports[1])
     annotation (Line(points={{20,-6},{30,-6},{30,-40},{70,-40}},
-        color={0,127,255}));
+    color={0,127,255}));
   connect(bypDamPos.y, whe.uBypDamPos) annotation (Line(points={{-59,0},{-2,0}},
-                             color={0,0,127}));
-  connect(opeSig.y, whe.uRot) annotation (Line(points={{-58,70},{-10,70},{-10,8},
-          {-2,8}}, color={255,0,255}));
+    color={0,0,127}));
+  connect(opeSig.y, whe.uRot) annotation (Line(points={{-58,70},{-10,70},{-10,8},{-2,8}}, 
+    color={255,0,255}));
   connect(senExhTem.port_b, sin_2.ports[1])
     annotation (Line(points={{-40,-40},{-58,-40}}, color={0,127,255}));
-  connect(senExhTem.port_a, whe.port_b2) annotation (Line(points={{-20,-40},{-8,
-          -40},{-8,-6},{0,-6}}, color={0,127,255}));
+  connect(senExhTem.port_a, whe.port_b2) annotation (Line(points={{-20,-40},{-8,-40},{-8,-6},{0,-6}}, 
+    color={0,127,255}));
   connect(senSupTem.port_b, sin_1.ports[1])
     annotation (Line(points={{60,30},{70,30}}, color={0,127,255}));
-  connect(senSupTem.port_a, whe.port_b1) annotation (Line(points={{40,30},{28,30},
-          {28,6},{20,6}}, color={0,127,255}));
+  connect(senSupTem.port_a, whe.port_b1) annotation (Line(points={{40,30},{28,30},{28,6},{20,6}}, 
+    color={0,127,255}));
 annotation(experiment(Tolerance=1e-6, StopTime=360),
 __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/BypassDampers.mos"
         "Simulate and plot"),
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mo
index 2365ce85809..abc048ba401 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mo
@@ -92,16 +92,17 @@ equation
     annotation (Line(points={{-20,31},{-10,31},{-10,30},{2,30}},
     color={0,127,255}));
   connect(wheUseDefCur.port_a2, sou_2.ports[1])
-    annotation (Line(points={{22,18},
-    {36,18},{36,-41},{70,-41}}, color={0,127,255}));
+    annotation (Line(points={{22,18},{36,18},{36,-41},{70,-41}},
+    color={0,127,255}));
   connect(wheSpe.y, wheUseDefCur.uSpe)
-    annotation (Line(points={{-59,0},{-10,0},
-    {-10,24},{0,24}}, color={0,0,127}));
+    annotation (Line(points={{-59,0},{-10,0},{-10,24},{0,24}},
+    color={0,0,127}));
   connect(senExhTem.port_b, sin_2.ports[1])
     annotation (Line(points={{-40,-40},{-50,-40},{-50,-41},{-58,-41}},
     color={0,127,255}));
   connect(senExhTem.port_a, wheUseDefCur.port_b2)
-    annotation (Line(points={{-20,-40},{-4,-40},{-4,18},{2,18}}, color={0,127,255}));
+    annotation (Line(points={{-20,-40},{-4,-40},{-4,18},{2,18}},
+    color={0,127,255}));
   connect(senSupTem.port_b, sin_1.ports[2])
     annotation (Line(points={{60,30},{66,30},{66,31},{70,31}},
     color={0,127,255}));
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Effectiveness.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Effectiveness.mo
index aa835c2e195..9b1800c3292 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Effectiveness.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Effectiveness.mo
@@ -60,7 +60,7 @@ protected
 
 equation
   // Check if the air flows are too unbalanced
-  assert(mSup_flow - 2*mExh_flow < 0 or mExh_flow - 2*mSup_flow < 0,
+  assert(mSup_flow - 2*mExh_flow <= 0 and mExh_flow - 2*mSup_flow <= 0,
     "In " + getInstanceName() + ": The ratio of the supply flow rate to the exhaust flow rate should be in the range of [0.5, 2].",
     level=AssertionLevel.warning);
   // Calculate the average volumetric air flow and flow rate ratio.
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/PartialWheel.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/PartialWheel.mo
index d1be1669176..dbebc406b53 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/PartialWheel.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/PartialWheel.mo
@@ -40,11 +40,11 @@ partial model PartialWheel
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput P(
     final unit="W") "Electric power consumption"
     annotation (Placement(transformation(extent={{100,-110},{140,-70}}),
-        iconTransformation(extent={{100,-110},{140,-70}})));
+    iconTransformation(extent={{100,-110},{140,-70}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput eps(final unit="1")
     "Sensible heat exchanger effectiveness"
     annotation (Placement(transformation(extent={{100,-20},{140,20}}),
-        iconTransformation(extent={{100,-20},{140,20}})));
+    iconTransformation(extent={{100,-20},{140,20}})));
   Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.BaseClasses.HeatExchangerWithInputEffectiveness
     hex(
     redeclare package Medium1 = Medium,
@@ -58,17 +58,17 @@ partial model PartialWheel
     redeclare final package Medium = Medium)
     "Fluid connector a1 of the supply air (positive design flow direction is from port_a1 to port_b1)"
     annotation (Placement(transformation(extent={{-190,70},{-170,90}}),
-        iconTransformation(extent={{-110,50},{-90,70}})));
+    iconTransformation(extent={{-110,50},{-90,70}})));
   Modelica.Fluid.Interfaces.FluidPort_b port_b2(
     redeclare final package Medium = Medium)
     "Fluid connector b2 of the exhaust air (positive design flow direction is from port_a2 to port_b2)"
     annotation (Placement(transformation(extent={{-170,-70},{-190,-50}}),
-        iconTransformation(extent={{-90,-70},{-110,-50}})));
+    iconTransformation(extent={{-90,-70},{-110,-50}})));
   Modelica.Fluid.Interfaces.FluidPort_b port_b1(
     redeclare final package Medium = Medium)
     "Fluid connector b1 of the supply air (positive design flow direction is from port_a1 to port_b1)"
     annotation (Placement(transformation(extent={{110,70},{90,90}}),
-        iconTransformation(extent={{110,50},{90,70}})));
+    iconTransformation(extent={{110,50},{90,70}})));
   Modelica.Fluid.Interfaces.FluidPort_a port_a2(
     redeclare final package Medium = Medium)
     "Fluid connector a2 of the exhaust air (positive design flow direction is from port_a2 to port_b2)"
@@ -117,27 +117,28 @@ protected
 equation
   connect(TSup.y, effCal.TSup)
     annotation (Line(points={{-139,20},{-110,20},{-110,-4},{-102,-4}},
-        color={0,0,127}));
+    color={0,0,127}));
   connect(TExh.y, effCal.TExh)
     annotation (Line(points={{-139,-40},{-110,-40},{-110,-8},{-102,-8}},
-        color={0,0,127}));
+    color={0,0,127}));
   connect(effCal.eps, hex.eps)
     annotation (Line(points={{-78,0},{-12,0}}, color={0,0,127}));
-  connect(effCal.eps, eps) annotation (Line(points={{-78,0},{-40,0},{-40,32},{
-          80,32},{80,0},{120,0}},
-                color={0,0,127}));
-  connect(senExhMasFlo.port_b, port_b2) annotation (Line(points={{-90,-34},{-100,
-          -34},{-100,-60},{-180,-60}}, color={0,127,255}));
-  connect(senExhMasFlo.port_a, hex.port_b2) annotation (Line(points={{-70,-34},{
-          -16,-34},{-16,-6},{-10,-6}}, color={0,127,255}));
+  connect(effCal.eps, eps) 
+    annotation (Line(points={{-78,0},{-40,0},{-40,32},{80,32},{80,0},{120,0}},
+    color={0,0,127}));
+  connect(senExhMasFlo.port_b, port_b2) 
+    annotation (Line(points={{-90,-34},{-100,-34},{-100,-60},{-180,-60}},
+    color={0,127,255}));
+  connect(senExhMasFlo.port_a, hex.port_b2) annotation (Line(points={{-70,-34},{-16,-34},{-16,-6},{-10,-6}}, 
+    color={0,127,255}));
   connect(hex.port_b1, senSupMasFlo.port_a)
     annotation (Line(points={{10,6},{32,6}}, color={0,127,255}));
-  connect(senSupMasFlo.port_b, port_b1) annotation (Line(points={{52,6},{60,6},{
-          60,80},{100,80}}, color={0,127,255}));
-  connect(senExhMasFlo.m_flow, effCal.mExh_flow) annotation (Line(points={{-80,-23},
-          {-80,-16},{-106,-16},{-106,4},{-102,4}}, color={0,0,127}));
-  connect(senSupMasFlo.m_flow, effCal.mSup_flow) annotation (Line(points={{42,17},
-          {42,26},{-106,26},{-106,8},{-102,8}}, color={0,0,127}));
+  connect(senSupMasFlo.port_b, port_b1) annotation (Line(points={{52,6},{60,6},{60,80},{100,80}},
+    color={0,127,255}));
+  connect(senExhMasFlo.m_flow, effCal.mExh_flow) annotation (Line(points={{-80,-23},{-80,-16},{-106,-16},{-106,4},{-102,4}}, 
+    color={0,0,127}));
+  connect(senSupMasFlo.m_flow, effCal.mSup_flow) annotation (Line(points={{42,17},{42,26},{-106,26},{-106,8},{-102,8}}, 
+    color={0,0,127}));
 annotation (
         defaultComponentName="whe",
         Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Validation/HeatExchangerWithInputEffectiveness.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Validation/HeatExchangerWithInputEffectiveness.mo
index 4a82323af2f..25dd1af3ce9 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Validation/HeatExchangerWithInputEffectiveness.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Validation/HeatExchangerWithInputEffectiveness.mo
@@ -67,7 +67,7 @@ equation
     annotation (Line(points={{-20,60},{-10,60},{-10,12},{6,12}}, color={0,127,255}));
   connect(hex.port_a2, sou_2.ports[1])
     annotation (Line(points={{26,5.55112e-16},{60,5.55112e-16},{60,-40},{40,-40}},
-      color={0,127,255}));
+    color={0,127,255}));
   connect(hex.port_b1, sin_1.ports[1])
     annotation (Line(points={{26,12},{40,12},{40,40},{60,40}}, color={0,127,255}));
   connect(hex.port_b2, sin_2.ports[1])
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo
index 0498760ef77..cf3a0329705 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo
@@ -3,7 +3,7 @@ model BypassDampers
   "Sensible heat recovery wheel with bypass dampers"
   extends
     Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.BaseClasses.PartialWheel;
-  parameter Modelica.Units.SI.PressureDifference dpDam_nominal(displayUnit="Pa") = 20
+  parameter Modelica.Units.SI.PressureDifference dpDamper_nominal(displayUnit="Pa") = 20
     "Nominal pressure drop of supply air dampers"
     annotation (Dialog(group="Nominal condition"));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput uBypDamPos(
@@ -20,27 +20,27 @@ model BypassDampers
   Buildings.Fluid.Actuators.Dampers.Exponential bypDamSup(
     redeclare package Medium = Medium,
     final m_flow_nominal=mSup_flow_nominal,
-    final dpDamper_nominal=dpDam_nominal)
+    final dpDamper_nominal=dpDamper_nominal)
     "Supply air bypass damper"
     annotation (Placement(transformation(extent={{-60,70},{-40,90}})));
   Buildings.Fluid.Actuators.Dampers.Exponential damSup(
     redeclare package Medium = Medium,
     final m_flow_nominal=mSup_flow_nominal,
-    final dpDamper_nominal=dpDam_nominal)
+    final dpDamper_nominal=dpDamper_nominal)
     "Supply air damper"
     annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},rotation=0,origin={-50,40})));
   Buildings.Fluid.Actuators.Dampers.Exponential damExh(
     redeclare package Medium = Medium,
     final m_flow_nominal=mExh_flow_nominal,
-    final dpDamper_nominal=dpDam_nominal)
+    final dpDamper_nominal=dpDamper_nominal)
     "Exhaust air damper"
     annotation (Placement(transformation(
         extent={{10,10},{-10,-10}},rotation=-90,origin={50,-40})));
   Buildings.Fluid.Actuators.Dampers.Exponential bypDamExh(
     redeclare package Medium = Medium,
     final m_flow_nominal=mExh_flow_nominal,
-    final dpDamper_nominal=dpDam_nominal)
+    final dpDamper_nominal=dpDamper_nominal)
     "Exhaust air bypass damper"
     annotation (Placement(transformation(extent={{0,-70},{-20,-50}})));
 protected
@@ -75,31 +75,31 @@ equation
     annotation (Line(points={{-50,92},{-50,140},{-202,140}}, color={0,0,127}));
   connect(damSup.port_b, hex.port_a1)
     annotation (Line(points={{-40,40},{-20,40},{-20,6},{-10,6}},
-        color={0,127,255}));
+    color={0,127,255}));
   connect(bypDamExh.y, uBypDamPos)
     annotation (Line(points={{-10,-48},{-10,-30},{30,-30},{30,140},{-202,140}},
-        color={0,0,127}));
+    color={0,0,127}));
   connect(hex.port_a2, damExh.port_b)
     annotation (Line(points={{10,-6},{50,-6},{50,-30}},
-        color={0,127,255}));
+    color={0,127,255}));
   connect(sub.u2, uBypDamPos)
     annotation (Line(points={{-102,94},{-160,94},{-160,140},{-202,140}},
-        color={0,0,127}));
+    color={0,0,127}));
   connect(uni.y, sub.u1)
     annotation (Line(points={{-119,120},{-110,120},{-110,106},{-102,106}},
-        color={0,0,127}));
+    color={0,0,127}));
   connect(uRot, booleanToReal.u)
     annotation (Line(points={{-200,0},{-162,0}}, color={255,0,255}));
   connect(booleanToReal.y, effCal.uSpe)
     annotation (Line(points={{-139,0},{-120,0},{-120,0},{-102,0}},
-        color={0,0,127}));
+    color={0,0,127}));
   connect(damSup.port_a, port_a1)
     annotation (Line(points={{-60,40},{-100,40},{-100,80},{-180,80}},
-        color={0,127,255}));
-  connect(uRot, PEle.u) annotation (Line(points={{-200,0},{-170,0},{-170,-80},{
-          -162,-80}}, color={255,0,255}));
-  connect(PEle.y, P) annotation (Line(points={{-139,-80},{80,-80},{80,-90},{120,
-          -90}}, color={0,0,127}));
+    color={0,127,255}));
+  connect(uRot, PEle.u) annotation (Line(points={{-200,0},{-170,0},{-170,-80},{-162,-80}}, 
+    color={255,0,255}));
+  connect(PEle.y, P) annotation (Line(points={{-139,-80},{80,-80},{80,-90},{120,-90}}, 
+    color={0,0,127}));
   connect(bypDamExh.port_b, port_b2)
     annotation (Line(points={{-20,-60},{-180,-60}}, color={0,127,255}));
 annotation (
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo
index e35e93dff4e..623dacf3309 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo
@@ -111,26 +111,24 @@ model SpaceCooling "Space cooling system"
   Buildings.Fluid.Sources.Boundary_pT sinWat(nPorts=1, redeclare package Medium =
         MediumW) "Sink for water circuit"
     annotation (Placement(transformation(extent={{-80,-76},{-60,-56}})));
-  BoundaryConditions.WeatherData.ReaderTMY3 weaDat(
+  Buildings.BoundaryConditions.WeatherData.ReaderTMY3 weaDat(
     pAtmSou=Buildings.BoundaryConditions.Types.DataSource.Parameter,
     TDryBul=TOut_nominal,
     filNam=Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos"),
     TDryBulSou=Buildings.BoundaryConditions.Types.DataSource.File)
     "Weather data reader"
     annotation (Placement(transformation(extent={{-160,40},{-140,60}})));
-  BoundaryConditions.WeatherData.Bus weaBus "Weather data bus"
+  Buildings.BoundaryConditions.WeatherData.Bus weaBus "Weather data bus"
     annotation (Placement(transformation(extent={{-120,40},{-100,60}})));
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant mAir_flow(k=mA_flow_nominal)
     "Fan air flow rate"
     annotation (Placement(transformation(extent={{0,0},{20,20}})));
   Buildings.Fluid.Sensors.TemperatureTwoPort senTemHXOut(redeclare package
-      Medium =
-        MediumA, m_flow_nominal=mA_flow_nominal)
+      Medium = MediumA, m_flow_nominal=mA_flow_nominal)
     "Temperature sensor for heat recovery outlet on supply side"
     annotation (Placement(transformation(extent={{-76,-26},{-64,-14}})));
   Buildings.Fluid.Sensors.TemperatureTwoPort senTemSupAir(redeclare package
-      Medium =
-        MediumA, m_flow_nominal=mA_flow_nominal)
+      Medium = MediumA, m_flow_nominal=mA_flow_nominal)
     "Temperature sensor for supply air"
     annotation (Placement(transformation(extent={{6,-26},{18,-14}})));
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant TRooSetPoi(k=TRooSet)
@@ -245,27 +243,33 @@ equation
       points={{-38,-100},{-30,-100},{-30,-92},{-22,-92}},
       color={0,0,127},
       smooth=Smooth.None));
-  connect(sub.y, con.u)
-    annotation (Line(points={{-108,-100},{-102,-100}}, color={0,0,127}));
-  connect(con.y, mWat_flow.u)
-    annotation (Line(points={{-78,-100},{-62,-100}}, color={255,0,255}));
-  connect(TRooSetPoi.y, sub.u1)
-    annotation (Line(points={{-148,-94},{-132,-94}}, color={0,0,127}));
-  connect(senTemRoo.T, sub.u2) annotation (Line(points={{91,80},{100,80},{100,-140},
-          {-140,-140},{-140,-106},{-132,-106}}, color={0,0,127}));
-  connect(whe.port_b2, out.ports[1]) annotation (Line(points={{-110,-32},{-116,-32},
-          {-116,-23},{-120,-23}}, color={0,127,255}));
-  connect(opeSig.y, whe.uRot) annotation (Line(points={{-150,20},{-116,20},{-116,
-          -18},{-112,-18}}, color={255,0,255}));
-  connect(bypDamPos.y, whe.uBypDamPos) annotation (Line(points={{-149,-50},{-118,
-          -50},{-118,-26},{-112,-26}}, color={0,0,127}));
+  connect(sub.y, con.u) annotation (Line(
+      points={{-108,-100},{-102,-100}},
+      color={0,0,127}));
+  connect(con.y, mWat_flow.u) annotation (Line(        points={{-78,-100},{-62,-100}},
+      color={255,0,255}));
+  connect(TRooSetPoi.y, sub.u1) annotation (Line(
+      points={{-148,-94},{-132,-94}},
+      color={0,0,127}));
+  connect(senTemRoo.T, sub.u2) annotation (Line(
+      points={{91,80},{100,80},{100,-140},{-140,-140},{-140,-106},{-132,-106}},
+      color={0,0,127}));
+  connect(whe.port_b2, out.ports[1]) annotation (Line(
+      points={{-110,-32},{-116,-32},{-116,-23},{-120,-23}},
+      color={0,127,255}));
+  connect(opeSig.y, whe.uRot) annotation (Line(
+      points={{-150,20},{-116,20},{-116,-18},{-112,-18}},
+      color={255,0,255}));
+  connect(bypDamPos.y, whe.uBypDamPos) annotation (Line(
+      points={{-149,-50},{-118,-50},{-118,-26},{-112,-26}},
+      color={0,0,127}));
   annotation (Documentation(info="<html>
 <p>
 This block is identical to
 <a href=\"modelica://Buildings.Examples.Tutorial.SpaceCooling.System3\">
 Buildings.Examples.Tutorial.SpaceCooling.System3</a>,
-except that the heat recovery device is modelled with <a href=\"modelica://Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BypassDampers\">
-Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BypassDampers</a>.
+except that the heat recovery device is modeled with <a href=\"modelica://Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.BypassDampers\">
+Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.BypassDampers</a>.
 </p>
 <p>
 The major input signals for the heat recovery device are configured as follows:
@@ -289,7 +293,7 @@ The outdoor temperature, <code>TOut.T</code>, and the temperature of the air lea
 becomes different at 6:00.
 </li>
 <li>
-Their difference becomes smaller and smaller after 6:00 and equals to <i>0</i> after 18:00.
+Their difference equals <i>0</i> after 18:00.
 </li>
 </ul>
 </html>", revisions="<html>
@@ -301,8 +305,7 @@ Buildings.Examples.Tutorial.SpaceCooling.System3</a>.
 </li>
 </ul>
 </html>"),
-    Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-180,-160},{120,
-            100}})),
+    Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-180,-160},{120,100}})),
     __Dymola_Commands(file=
      "modelica://Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mos"
         "Simulate and plot"),
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/SpeedControlled.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/SpeedControlled.mo
index cfa833f28a8..358fb5bc35c 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/SpeedControlled.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/SpeedControlled.mo
@@ -3,10 +3,11 @@ model SpeedControlled
   "Sensible heat recovery wheel with a variable speed drive"
   extends
     Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.BaseClasses.PartialWheel;
-  parameter Boolean defaultMotorEfficiencyCurve = true "= true, use the default motor efficiency curve"
+  parameter Boolean defaultMotorEfficiencyCurve = true
+    "Set to true for using the default motor efficiency curve, or false for using the user-defined motor efficiency curve"
     annotation (Dialog(group="Efficiency"));
   parameter Real table[:,:]=[0.8,1]
-    "Table of motor power efficiency as a function of the wheel speed ratio (first column)"
+    "Table of user-defined motor efficiency curve:(first column:the wheel speed ratio, second column:motor power efficiency)"
     annotation (Dialog(group="Efficiency", enable = not defaultMotorEfficiencyCurve));
   final parameter
     Buildings.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters_yMot
@@ -14,7 +15,7 @@ model SpeedControlled
         Buildings.Fluid.Movers.BaseClasses.Characteristics.motorEfficiencyCurve(
           P_nominal=P_nominal,
           eta_max=1)
-    "default motor efficiency  vs. whell speed ratio";
+    "Default motor efficiency curve";
   final parameter Real xSpe[:] = if defaultMotorEfficiencyCurve then motorEfficiency_default.y else table[:,1]
     "x-axis support points of the power efficiency curve"
     annotation (Dialog(group="Efficiency"));
@@ -37,18 +38,18 @@ protected
     annotation (Placement(transformation(extent={{60,-100},{80,-80}})));
 
 initial equation
-  assert(table[end,1] < 1,
+  assert(table[end,1] < 1 or defaultMotorEfficiencyCurve,
          "In " + getInstanceName() + ": Power efficiency curve is wrong. 
          No need to define efficiency for the nominal condition",
          level=AssertionLevel.error)
-         "Check if the effiency for the nominal conidtion is defined.";
+         "Check if the motor efficiency for the nominal condition is defined in the user-defined curve";
 equation
   connect(P, PEle.y)
     annotation (Line(points={{120,-90},{81,-90}}, color={0,0,127}));
-  connect(port_a1, hex.port_a1) annotation (Line(points={{-180,80},{-60,80},{-60,
-          6},{-10,6}}, color={0,127,255}));
+  connect(port_a1, hex.port_a1) annotation (Line(points={{-180,80},{-60,80},{-60,6},
+    {-10,6}}, color={0,127,255}));
   connect(hex.port_a2, port_a2) annotation (Line(points={{10,-6},{60,-6},{60,-60},
-          {100,-60}}, color={0,127,255}));
+    {100,-60}}, color={0,127,255}));
   connect(effCal.uSpe, uSpe)
     annotation (Line(points={{-102,0},{-200,0}}, color={0,0,127}));
 annotation (
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/BypassDampers.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/BypassDampers.mo
index 26c5447ac06..d456411dff7 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/BypassDampers.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/BypassDampers.mo
@@ -83,15 +83,15 @@ equation
   connect(bypDamPos.y, whe.uBypDamPos) annotation (Line(points={{-59,0},{-2,0}},
     color={0,0,127}));
   connect(opeSig.y, whe.uRot) annotation (Line(points={{-58,70},{-10,70},{-10,8},
-          {-2,8}}, color={255,0,255}));
+    {-2,8}}, color={255,0,255}));
   connect(whe.port_b2, senExhTem.port_a) annotation (Line(points={{0,-6},{-20,-6},
-          {-20,-34},{-30,-34}}, color={0,127,255}));
+    {-20,-34},{-30,-34}}, color={0,127,255}));
   connect(senExhTem.port_b, sin_2.ports[1])
     annotation (Line(points={{-50,-34},{-60,-34}}, color={0,127,255}));
   connect(senSupTem.port_a, sin_1.ports[1])
     annotation (Line(points={{60,30},{70,30}}, color={0,127,255}));
   connect(senSupTem.port_b, whe.port_b1) annotation (Line(points={{40,30},{30,30},
-          {30,6},{20,6}}, color={0,127,255}));
+    {30,6},{20,6}}, color={0,127,255}));
 annotation(experiment(Tolerance=1e-6, StopTime=360),
 __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/BypassDampers.mos"
         "Simulate and plot"),
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mo
index f6742ed3299..d58565ddfd7 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mo
@@ -76,31 +76,35 @@ model SpeedControlled
 equation
   connect(TSup.y, sou_1.T_in)
     annotation (Line(points={{-59,34},{-42,34}}, color={0,0,127}));
-  connect(sou_1.ports[1], wheUseDefCur.port_a1) annotation (Line(points={{-20,29},
-          {-10,29},{-10,16},{0,16}}, color={0,127,255}));
-  connect(wheUseDefCur.port_a2, sou_2.ports[1]) annotation (Line(points={{20,4},{
-          40,4},{40,-31},{70,-31}},  color={0,127,255}));
-  connect(wheSpe.y, wheUseDefCur.uSpe) annotation (Line(points={{-59,0},{-30,0},
-          {-30,10},{-2,10}}, color={0,0,127}));
-  connect(wheUseDefCur.port_b2, senExhTem.port_a) annotation (Line(points={{0,4},{
-          -6,4},{-6,-42},{-20,-42}},  color={0,127,255}));
+  connect(sou_1.ports[1], wheUseDefCur.port_a1) 
+    annotation (Line(points={{-20,29},
+    {-10,29},{-10,16},{0,16}}, color={0,127,255}));
+  connect(wheUseDefCur.port_a2, sou_2.ports[1]) 
+    annotation (Line(points={{20,4},{40,4},{40,-31},{70,-31}},
+    color={0,127,255}));
+  connect(wheSpe.y, wheUseDefCur.uSpe) 
+    annotation (Line(points={{-59,0},{-30,0},{-30,10},{-2,10}}, 
+    color={0,0,127}));
+  connect(wheUseDefCur.port_b2, senExhTem.port_a) 
+    annotation (Line(points={{0,4},{-6,4},{-6,-42},{-20,-42}},  color={0,127,255}));
   connect(senExhTem.port_b, sin_2.ports[1])
     annotation (Line(points={{-40,-42},{-48,-42},{-48,-41},{-58,-41}},
-                                                   color={0,127,255}));
-  connect(senSupTem.port_b, wheUseDefCur.port_b1) annotation (Line(points={{40,30},
-          {28,30},{28,16},{20,16}}, color={0,127,255}));
-  connect(wheDefCur.port_a1, sou_1.ports[2]) annotation (Line(points={{0,-14},{
-          -14,-14},{-14,31},{-20,31}}, color={0,127,255}));
-  connect(wheDefCur.port_b1, sin_1.ports[1]) annotation (Line(points={{20,-14},
-          {36,-14},{36,22},{64,22},{64,29},{72,29}}, color={0,127,255}));
-  connect(wheDefCur.port_b2, sin_2.ports[2]) annotation (Line(points={{0,-26},{
-          -48,-26},{-48,-39},{-58,-39}}, color={0,127,255}));
-  connect(wheDefCur.port_a2, sou_2.ports[2]) annotation (Line(points={{20,-26},
-          {52,-26},{52,-29},{70,-29}}, color={0,127,255}));
-  connect(wheDefCur.uSpe, wheSpe.y) annotation (Line(points={{-2,-20},{-30,-20},
-          {-30,0},{-59,0}}, color={0,0,127}));
-  connect(senSupTem.port_a, sin_1.ports[2]) annotation (Line(points={{60,30},{
-          66,30},{66,31},{72,31}}, color={0,127,255}));
+    color={0,127,255}));
+  connect(senSupTem.port_b, wheUseDefCur.port_b1) 
+    annotation (Line(points={{40,30},{28,30},{28,16},{20,16}}, color={0,127,255}));
+  connect(wheDefCur.port_a1, sou_1.ports[2]) 
+    annotation (Line(points={{0,-14},{-14,-14},{-14,31},{-20,31}}, color={0,127,255}));
+  connect(wheDefCur.port_b1, sin_1.ports[1]) \
+    annotation (Line(points={{20,-14},{36,-14},{36,22},{64,22},{64,29},{72,29}}, 
+    color={0,127,255}));
+  connect(wheDefCur.port_b2, sin_2.ports[2]) annotation (Line(points={{0,-26},{-48,-26},{-48,-39},{-58,-39}}, 
+    color={0,127,255}));
+  connect(wheDefCur.port_a2, sou_2.ports[2]) annotation (Line(points={{20,-26},{52,-26},{52,-29},{70,-29}}, 
+    color={0,127,255}));
+  connect(wheDefCur.uSpe, wheSpe.y) annotation (Line(points={{-2,-20},{-30,-20},{-30,0},{-59,0}},
+    color={0,0,127}));
+  connect(senSupTem.port_a, sin_1.ports[2]) annotation (Line(points={{60,30},{66,30},{66,31},{72,31}}, 
+    color={0,127,255}));
 annotation(experiment(Tolerance=1e-6, StopTime=360),
 __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mos"
         "Simulate and plot"),

From c803b24ae0570b4a5b6b30a09c787bb9944db598 Mon Sep 17 00:00:00 2001
From: SenHuang19 <jhy1987@gmail.com>
Date: Thu, 9 May 2024 14:11:33 -0400
Subject: [PATCH 04/27] update the scripts

---
 .../Latent/Examples/SpaceCooling.mos          | 23 +++++++++++++++++++
 .../Latent/Validation/SpeedControlled.mos     |  9 ++++----
 .../Sensible/Examples/SpaceCooling.mos        | 23 +++++++++++++++++++
 .../Sensible/Validation/SpeedControlled.mos   |  7 +++---
 ...malWheels.Latent.Examples.SpaceCooling.mos | 13 +++++++++++
 ...eels.Latent.Validation.SpeedControlled.mos | 12 ++++++----
 ...lWheels.Sensible.Examples.SpaceCooling.mos | 11 +++++++++
 ...ls.Sensible.Validation.SpeedControlled.mos | 10 ++++----
 8 files changed, 92 insertions(+), 16 deletions(-)
 create mode 100644 Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mos
 create mode 100644 Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mos
 create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.Examples.SpaceCooling.mos
 create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.Examples.SpaceCooling.mos

diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mos
new file mode 100644
index 00000000000..ff1f8fa6990
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mos
@@ -0,0 +1,23 @@
+simulateModel("Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.Examples.SpaceCooling", startTime=15552000, tolerance=1e-6, stopTime=15638400, method="CVode", resultFile="SpaceCooling");
+createPlot(id = 1,
+ position = {15, 10, 751, 680},
+ y = {"vol.T_start", "vol.T", "TOut.T", "cooCoi.sta_a2.T", "cooCoi.sta_b2.T"},
+ range = {0.0, 4000.0, 32.0, 16.0},
+ autoscale = true,
+ autoerase = true,
+ autoreplot = true,
+ description = false,
+ subPlot=101,
+ grid = true,
+ color = true,
+ online = false,
+ filename = "SpaceCoolingSystem3.mat",
+ leftTitleType = 1,
+ bottomTitleType = 1,
+ colors = {{0, 0, 255}, {255, 0, 0}, {0, 128, 0}, {255, 0, 255}, {0, 0, 0}},
+ patterns = {LinePattern.Solid, LinePattern.Solid, LinePattern.Solid, LinePattern.Dash,
+LinePattern.Dash},
+ thicknesses = {0.25, 0.5, 0.25, 0.25, 0.25});
+createPlot(id=1, position={15, 10, 751, 680}, y={"opeSig.y"}, range={15550000.0, 15640000.0, 10.0, 30.0}, autoscale=false, grid=true, subPlot=102, colors={{28,108,200}}, timeUnit="s");
+createPlot(id=1, position={15, 10, 751, 680}, y={"TOut.T", "senTemHXOut.T"}, range={15550000.0, 15640000.0, 10.0, 30.0}, grid=true, subPlot=103, colors={{0,128,0}, {28,108,200}}, timeUnit="s", displayUnits={"degC", "degC"});
+createPlot(id=2, position={95, 95, 734, 454}, y={"whe.port_a1.Xi_outflow[1]", "whe.port_b1.Xi_outflow[1]"}, range={15550000.0, 15640000.0, 0.007, 0.015}, grid=true, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"kg/kg", "kg/kg"});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mos
index 41adcd43e1b..01950890155 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mos
@@ -1,5 +1,6 @@
 simulateModel("Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.Validation.SpeedControlled", stopTime=360, method="CVode", tolerance=1e-06, resultFile="SpeedControlled");
-createPlot(id=1, position={15, 15, 890, 669}, y={"TSup.y", "senSupTem.T", "senExhTem.T", "sou_2.T"}, range={0.0, 360.0, 290.0, 320.0}, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="s", displayUnits={"K", "K", "K", "K"});
-createPlot(id=1, position={15, 15, 890, 669}, y={"whe.port_a1.m_flow", "whe.port_a2.m_flow"}, range={0.0, 360.0, 0.0, 20.0}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"kg/s", "kg/s"});
-createPlot(id=1, position={15, 15, 890, 669}, y={"whe.uSpe"}, range={0.0, 360.0, 0.6, 0.9}, grid=true, subPlot=103, colors={{28,108,200}}, timeUnit="s", displayUnits={"1"});
-createPlot(id=1, position={15, 15, 890, 669}, y={"whe.epsSen", "whe.epsLat"}, range={0.0, 360.0, 0.0, 1.0}, grid=true, subPlot=104, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"1", "1"});
+createPlot(id=1, position={35, -7, 1011, 711}, y={"TSup.y", "senSupTem.T", "senExhTem.T", "sou_2.T"}, range={0.0, 360.0, 280.0, 320.0}, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="s", displayUnits={"", "K", "K", "K"});
+createPlot(id=1, position={35, -7, 1011, 711}, y={"wheUseDefCur.port_a1.m_flow", "wheUseDefCur.port_a2.m_flow"}, range={0.0, 360.0, 4.0, 6.0}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"kg/s", "kg/s"});
+createPlot(id=1, position={35, -7, 1011, 711}, y={"wheUseDefCur.uSpe"}, range={0.0, 360.0, 0.6, 1.2}, grid=true, subPlot=103, colors={{28,108,200}}, timeUnit="s", displayUnits={"1"});
+createPlot(id=1, position={35, -7, 1011, 711}, y={"wheUseDefCur.epsSen", "wheUseDefCur.epsLat"}, range={0.0, 360.0, 0.4, 1.0}, grid=true, subPlot=104, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"1", "1"});
+createPlot(id=1, position={35, -7, 1011, 711}, y={"wheUseDefCur.P", "wheDefCur.P"}, range={0.0, 360.0, 50.0, 150.0}, grid=true, subPlot=105, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"W", "W"});
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mos
new file mode 100644
index 00000000000..6b7aac53d2c
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mos
@@ -0,0 +1,23 @@
+simulateModel("Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.Examples.SpaceCooling", startTime=15552000, tolerance=1e-6, stopTime=15638400, method="CVode", resultFile="SpaceCooling");
+createPlot(id = 1,
+ position = {15, 10, 751, 680},
+ y = {"vol.T_start", "vol.T", "TOut.T", "cooCoi.sta_a2.T", "cooCoi.sta_b2.T"},
+ range = {0.0, 4000.0, 32.0, 16.0},
+ autoscale = true,
+ autoerase = true,
+ autoreplot = true,
+ description = false,
+ subPlot=101,
+ grid = true,
+ color = true,
+ online = false,
+ filename = "SpaceCoolingSystem3.mat",
+ leftTitleType = 1,
+ bottomTitleType = 1,
+ colors = {{0, 0, 255}, {255, 0, 0}, {0, 128, 0}, {255, 0, 255}, {0, 0, 0}},
+ patterns = {LinePattern.Solid, LinePattern.Solid, LinePattern.Solid, LinePattern.Dash,
+LinePattern.Dash},
+ thicknesses = {0.25, 0.5, 0.25, 0.25, 0.25});
+createPlot(id=1, position={15, 10, 751, 680}, y={"opeSig.y"}, range={15550000.0, 15640000.0, 10.0, 30.0}, autoscale=false, grid=true, subPlot=102, colors={{28,108,200}}, timeUnit="s");
+createPlot(id=1, position={15, 10, 751, 680}, y={"TOut.T", "senTemHXOut.T"}, range={15550000.0, 15640000.0, 10.0, 30.0}, grid=true, subPlot=103, colors={{0,128,0}, {28,108,200}}, timeUnit="s", displayUnits={"degC", "degC"});
+
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mos
index 3494625e2f0..590fcfc2d06 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mos
@@ -1,5 +1,6 @@
 simulateModel("Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.Validation.SpeedControlled", stopTime=360, method="CVode", tolerance=1e-06, resultFile="SpeedControlled");
 createPlot(id=1, position={15, 15, 890, 669}, y={"TSup.y", "senSupTem.T", "senExhTem.T", "sou_2.T"}, range={0.0, 360.0, 290.0, 320.0}, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="s", displayUnits={"K", "K", "K", "K"});
-createPlot(id=1, position={15, 15, 890, 669}, y={"whe.port_a1.m_flow", "whe.port_a2.m_flow"}, range={0.0, 360.0, 0.0, 20.0}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"kg/s", "kg/s"});
-createPlot(id=1, position={15, 15, 890, 669}, y={"whe.uSpe"}, range={0.0, 360.0, 0.6, 0.9}, grid=true, subPlot=103, colors={{28,108,200}}, timeUnit="s", displayUnits={"1"});
-createPlot(id=1, position={15, 15, 890, 669}, y={"whe.eps"}, range={0.0, 360.0, 0.0, 1.0}, grid=true, subPlot=104, colors={{28,108,200}}, timeUnit="s", displayUnits={"1"});
+createPlot(id=1, position={15, 15, 890, 669}, y={"wheUseDefCur.port_a1.m_flow", "wheUseDefCur.port_a2.m_flow"}, range={0.0, 360.0, 0.0, 20.0}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"kg/s", "kg/s"});
+createPlot(id=1, position={15, 15, 890, 669}, y={"wheUseDefCur.uSpe"}, range={0.0, 360.0, 0.6, 0.9}, grid=true, subPlot=103, colors={{28,108,200}}, timeUnit="s", displayUnits={"1"});
+createPlot(id=1, position={15, 15, 890, 669}, y={"wheUseDefCur.eps"}, range={0.0, 360.0, 0.0, 1.0}, grid=true, subPlot=104, colors={{28,108,200}}, timeUnit="s", displayUnits={"1"});
+createPlot(id=1, position={15, 15, 890, 669}, y={"wheUseDefCur.P", "wheDefCur.P"}, range={0.0, 360.0, 50.0, 150.0}, grid=true, subPlot=105, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"W", "W"});
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.Examples.SpaceCooling.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.Examples.SpaceCooling.mos
new file mode 100644
index 00000000000..507659148d7
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.Examples.SpaceCooling.mos
@@ -0,0 +1,13 @@
+compareVars :=
+  {
+    "vol.T_start",
+    "vol.T",
+    "TOut.T",
+    "cooCoi.sta_a2.T",
+    "cooCoi.sta_b2.T",
+    "opeSig.y",
+    "TOut.T",
+    "senTemHXOut.T",
+    "whe.port_a1.Xi_outflow[1]",
+    "whe.port_b1.Xi_outflow[1]"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.Validation.SpeedControlled.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.Validation.SpeedControlled.mos
index bd070b4bf03..758478890b2 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.Validation.SpeedControlled.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.Validation.SpeedControlled.mos
@@ -4,9 +4,11 @@ compareVars :=
     "senSupTem.T",
     "senExhTem.T",
     "sou_2.T",
-    "whe.port_a1.m_flow",
-    "whe.port_a2.m_flow",
-    "whe.uSpe",
-    "whe.epsSen",
-    "whe.epsLat"
+    "wheUseDefCur.port_a1.m_flow",
+    "wheUseDefCur.port_a2.m_flow",
+    "wheUseDefCur.uSpe",
+    "wheUseDefCur.epsSen",
+    "wheUseDefCur.epsLat",
+    "wheUseDefCur.P",
+    "wheDefCur.P"
   };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.Examples.SpaceCooling.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.Examples.SpaceCooling.mos
new file mode 100644
index 00000000000..9898798bfa5
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.Examples.SpaceCooling.mos
@@ -0,0 +1,11 @@
+compareVars :=
+  {
+    "vol.T_start",
+    "vol.T",
+    "TOut.T",
+    "cooCoi.sta_a2.T",
+    "cooCoi.sta_b2.T",
+    "opeSig.y",
+    "TOut.T",
+    "senTemHXOut.T"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.Validation.SpeedControlled.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.Validation.SpeedControlled.mos
index 03c4d4f0c3d..0f53fb97d2e 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.Validation.SpeedControlled.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.Validation.SpeedControlled.mos
@@ -4,8 +4,10 @@ compareVars :=
     "senSupTem.T",
     "senExhTem.T",
     "sou_2.T",
-    "whe.port_a1.m_flow",
-    "whe.port_a2.m_flow",
-    "whe.uSpe",
-    "whe.eps"
+    "wheUseDefCur.port_a1.m_flow",
+    "wheUseDefCur.port_a2.m_flow",
+    "wheUseDefCur.uSpe",
+    "wheUseDefCur.eps",
+    "wheUseDefCur.P",
+    "wheDefCur.P"
   };

From a11281b6b1ad63872a6d84bb6539f0200c4e510f Mon Sep 17 00:00:00 2001
From: SenHuang19 <jhy1987@gmail.com>
Date: Thu, 9 May 2024 14:12:23 -0400
Subject: [PATCH 05/27] update the reference data

---
 ...malWheels_Latent_Examples_SpaceCooling.txt | 24 +++++++++++++++++++
 ...Wheels_Latent_Validation_BypassDampers.txt | 14 +++++------
 ...eels_Latent_Validation_SpeedControlled.txt | 20 +++++++++-------
 ...lWheels_Sensible_Examples_SpaceCooling.txt | 22 +++++++++++++++++
 ...eels_Sensible_Validation_BypassDampers.txt | 12 +++++-----
 ...ls_Sensible_Validation_SpeedControlled.txt | 18 +++++++-------
 6 files changed, 80 insertions(+), 30 deletions(-)
 create mode 100644 Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Latent_Examples_SpaceCooling.txt
 create mode 100644 Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Sensible_Examples_SpaceCooling.txt

diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Latent_Examples_SpaceCooling.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Latent_Examples_SpaceCooling.txt
new file mode 100644
index 00000000000..812286f3abe
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Latent_Examples_SpaceCooling.txt
@@ -0,0 +1,24 @@
+last-generated=2024-05-09
+statistics-initialization=
+{
+  "linear": "4, 4",
+  "nonlinear": "1, 1, 0, 0, 1, 0, 0",
+  "numerical Jacobians": "0"
+}
+statistics-simulation=
+{
+  "linear": "0, 0, 4, 4",
+  "nonlinear": "1, 2, 0, 1, 1, 1",
+  "number of continuous time states": "22",
+  "numerical Jacobians": "0"
+}
+time=[1.5552e+07, 1.56384e+07]
+vol.T_start=[2.931499938964844e+02, 2.931499938964844e+02]
+vol.T=[2.931499938964844e+02, 2.931558837890625e+02, 2.929799499511719e+02, 2.926975708007812e+02, 2.923731384277344e+02, 2.920772399902344e+02, 2.918045349121094e+02, 2.915382080078125e+02, 2.912736511230469e+02, 2.909941711425781e+02, 2.905767211914062e+02, 2.900142211914062e+02, 2.894204406738281e+02, 2.889404907226562e+02, 2.886464233398438e+02, 2.884886169433594e+02, 2.883844299316406e+02, 2.88242919921875e+02, 2.879859924316406e+02, 2.876162109375e+02, 2.871962585449219e+02, 2.868060607910156e+02, 2.86536376953125e+02, 2.864703369140625e+02, 2.866612243652344e+02, 2.871516418457031e+02, 2.885304870605469e+02, 2.899981689453125e+02, 2.916190795898438e+02, 2.932933654785156e+02, 2.948436279296875e+02, 2.962301330566406e+02, 2.974523620605469e+02, 2.974217834472656e+02, 2.975464477539062e+02, 2.975241394042969e+02, 2.971765441894531e+02, 2.975623474121094e+02, 2.965565795898438e+02, 2.974278564453125e+02, 2.971991882324219e+02, 2.972875366210938e+02, 2.976405029296875e+02, 2.966389465332031e+02, 2.972525329589844e+02, 2.970046997070312e+02, 2.972793579101562e+02, 2.968392944335938e+02, 2.974976806640625e+02, 2.966088562011719e+02, 2.976229553222656e+02, 2.969010009765625e+02, 2.971474914550781e+02, 2.974115905761719e+02, 2.966552429199219e+02, 2.975382385253906e+02, 2.970338439941406e+02, 2.969666442871094e+02, 2.976717529296875e+02, 2.967093200683594e+02, 2.972494506835938e+02, 2.973996887207031e+02, 2.967299499511719e+02, 2.975285339355469e+02, 2.970274353027344e+02, 2.976529846191406e+02, 2.972189025878906e+02, 2.971595458984375e+02, 2.973245239257812e+02, 2.9690771484375e+02, 2.974339294433594e+02, 2.967093200683594e+02, 2.975995788574219e+02, 2.966474304199219e+02, 2.976240844726562e+02, 2.967312927246094e+02, 2.973283081054688e+02, 2.969686584472656e+02, 2.966924133300781e+02, 2.958390502929688e+02, 2.950875854492188e+02, 2.944717712402344e+02, 2.939643249511719e+02, 2.935993347167969e+02, 2.934185791015625e+02, 2.933692932128906e+02, 2.933747253417969e+02, 2.933849182128906e+02, 2.933596496582031e+02, 2.933012084960938e+02, 2.932326965332031e+02, 2.931614685058594e+02, 2.930895690917969e+02, 2.93017578125e+02, 2.929456176757812e+02, 2.928736267089844e+02, 2.928015747070312e+02, 2.927294311523438e+02, 2.926572265625e+02, 2.925850219726562e+02, 2.925127868652344e+02]
+TOut.T=[2.914500122070312e+02, 2.913385009765625e+02, 2.910647583007812e+02, 2.907200927734375e+02, 2.903956909179688e+02, 2.901300048828125e+02, 2.898659973144531e+02, 2.896019897460938e+02, 2.893380126953125e+02, 2.89004150390625e+02, 2.884479370117188e+02, 2.878096618652344e+02, 2.872500610351562e+02, 2.869119262695312e+02, 2.867525024414062e+02, 2.866704406738281e+02, 2.865716247558594e+02, 2.86362060546875e+02, 2.860019836425781e+02, 2.855647583007812e+02, 2.851369323730469e+02, 2.848055419921875e+02, 2.84671142578125e+02, 2.847913513183594e+02, 2.852047729492188e+02, 2.859500122070312e+02, 2.872088317871094e+02, 2.889144592285156e+02, 2.907325744628906e+02, 2.923289794921875e+02, 2.935801696777344e+02, 2.946938171386719e+02, 2.956173706054688e+02, 2.962911987304688e+02, 2.964541015625e+02, 2.957337341308594e+02, 2.947459106445312e+02, 2.941705322265625e+02, 2.945262451171875e+02, 2.952189331054688e+02, 2.959844055175781e+02, 2.966857299804688e+02, 2.972068786621094e+02, 2.977020874023438e+02, 2.981768493652344e+02, 2.985576171875e+02, 2.987735900878906e+02, 2.989007568359375e+02, 2.990133361816406e+02, 2.991251220703125e+02, 2.9925e+02, 2.993937683105469e+02, 2.99545654296875e+02, 2.996946411132812e+02, 2.998296203613281e+02, 2.999126586914062e+02, 2.999144897460938e+02, 2.99878662109375e+02, 2.998501281738281e+02, 2.99885009765625e+02, 3.0001416015625e+02, 3.001783142089844e+02, 3.003133850097656e+02, 3.001267700195312e+02, 2.985876770019531e+02, 2.964372253417969e+02, 2.946898803710938e+02, 2.943067016601562e+02, 2.951251831054688e+02, 2.964444274902344e+02, 2.976576538085938e+02, 2.981753234863281e+02, 2.982959289550781e+02, 2.982947082519531e+02, 2.980774841308594e+02, 2.975499877929688e+02, 2.9660986328125e+02, 2.953994445800781e+02, 2.94191650390625e+02, 2.932594299316406e+02, 2.926542053222656e+02, 2.921209716796875e+02, 2.917095031738281e+02, 2.914774780273438e+02, 2.91437255859375e+02, 2.914543151855469e+02, 2.914801330566406e+02, 2.914757385253906e+02, 2.914140014648438e+02, 2.913420104980469e+02, 2.912699890136719e+02, 2.91197998046875e+02, 2.911260070800781e+02, 2.910539855957031e+02, 2.909819946289062e+02, 2.909100036621094e+02, 2.908380126953125e+02, 2.907659912109375e+02, 2.906940002441406e+02, 2.906220092773438e+02, 2.905499877929688e+02]
+cooCoi.sta_a2.T=[2.931499938964844e+02, 2.913385009765625e+02, 2.910647583007812e+02, 2.907200927734375e+02, 2.903956909179688e+02, 2.901300048828125e+02, 2.898659973144531e+02, 2.896019897460938e+02, 2.893380126953125e+02, 2.89004150390625e+02, 2.884479370117188e+02, 2.878096618652344e+02, 2.872500610351562e+02, 2.869119262695312e+02, 2.867525024414062e+02, 2.866704406738281e+02, 2.865716247558594e+02, 2.86362060546875e+02, 2.860019836425781e+02, 2.855647583007812e+02, 2.851369323730469e+02, 2.848055419921875e+02, 2.84671142578125e+02, 2.847913513183594e+02, 2.852047729492188e+02, 2.859500122070312e+02, 2.882718811035156e+02, 2.897934875488281e+02, 2.914603881835938e+02, 2.93123046875e+02, 2.946137390136719e+02, 2.959444885253906e+02, 2.97103759765625e+02, 2.972210693359375e+02, 2.973505554199219e+02, 2.97169189453125e+02, 2.966648864746094e+02, 2.968074035644531e+02, 2.960907592773438e+02, 2.968887023925781e+02, 2.96884033203125e+02, 2.971166381835938e+02, 2.97510498046875e+02, 2.969181213378906e+02, 2.975008239746094e+02, 2.974413757324219e+02, 2.9771240234375e+02, 2.974572448730469e+02, 2.979658508300781e+02, 2.974066162109375e+02, 2.981523742675781e+02, 2.977308044433594e+02, 2.97965576171875e+02, 2.982113037109375e+02, 2.978012084960938e+02, 2.984218139648438e+02, 2.981390380859375e+02, 2.981175842285156e+02, 2.985588989257812e+02, 2.98037353515625e+02, 2.984381408691406e+02, 2.9862890625e+02, 2.983634643554688e+02, 2.987514343261719e+02, 2.977904357910156e+02, 2.9705322265625e+02, 2.959219970703125e+02, 2.956488037109375e+02, 2.961235046386719e+02, 2.966474304199219e+02, 2.975633239746094e+02, 2.975844421386719e+02, 2.980278930664062e+02, 2.976885986328125e+02, 2.979187927246094e+02, 2.972754516601562e+02, 2.9660986328125e+02, 2.953994445800781e+02, 2.94191650390625e+02, 2.932594299316406e+02, 2.926542053222656e+02, 2.921209716796875e+02, 2.917095031738281e+02, 2.914774780273438e+02, 2.91437255859375e+02, 2.914543151855469e+02, 2.914801330566406e+02, 2.914757385253906e+02, 2.914140014648438e+02, 2.913420104980469e+02, 2.912699890136719e+02, 2.91197998046875e+02, 2.911260070800781e+02, 2.910539855957031e+02, 2.909819946289062e+02, 2.909100036621094e+02, 2.908380126953125e+02, 2.907659912109375e+02, 2.906940002441406e+02, 2.906220092773438e+02, 2.905499877929688e+02]
+cooCoi.sta_b2.T=[2.931499938964844e+02, 2.913454895019531e+02, 2.910758972167969e+02, 2.907322082519531e+02, 2.904056396484375e+02, 2.901391296386719e+02, 2.898751220703125e+02, 2.896111145019531e+02, 2.893471374511719e+02, 2.890198364257812e+02, 2.884694213867188e+02, 2.878313903808594e+02, 2.872664794921875e+02, 2.869200439453125e+02, 2.867562561035156e+02, 2.866730041503906e+02, 2.865762939453125e+02, 2.863719787597656e+02, 2.860161743164062e+02, 2.855802307128906e+02, 2.851506652832031e+02, 2.848144226074219e+02, 2.846719360351562e+02, 2.8478271484375e+02, 2.851853637695312e+02, 2.859184875488281e+02, 2.882224731445312e+02, 2.897380065917969e+02, 2.914016418457031e+02, 2.9306787109375e+02, 2.945647583007812e+02, 2.959010620117188e+02, 2.970667114257812e+02, 2.971738891601562e+02, 2.973086853027344e+02, 2.97143798828125e+02, 2.966510009765625e+02, 2.96805908203125e+02, 2.958389892578125e+02, 2.968620910644531e+02, 2.968407592773438e+02, 2.97064208984375e+02, 2.974566040039062e+02, 2.888204345703125e+02, 2.974221496582031e+02, 2.88370361328125e+02, 2.976245727539062e+02, 2.883406982421875e+02, 2.978820190429688e+02, 2.931131286621094e+02, 2.905702514648438e+02, 2.97401123046875e+02, 2.885141906738281e+02, 2.981112060546875e+02, 2.884112854003906e+02, 2.893487243652344e+02, 2.97895263671875e+02, 2.885043029785156e+02, 2.968394775390625e+02, 2.963664855957031e+02, 2.886547546386719e+02, 2.985144958496094e+02, 2.885540161132812e+02, 2.892370910644531e+02, 2.976696472167969e+02, 2.940033569335938e+02, 2.959406127929688e+02, 2.956458129882812e+02, 2.960962219238281e+02, 2.965836181640625e+02, 2.975038757324219e+02, 2.885430603027344e+02, 2.979823608398438e+02, 2.956427307128906e+02, 2.911068115234375e+02, 2.967340698242188e+02, 2.966481628417969e+02, 2.954428100585938e+02, 2.942305297851562e+02, 2.932843627929688e+02, 2.926741638183594e+02, 2.921377563476562e+02, 2.917211608886719e+02, 2.914820251464844e+02, 2.914373168945312e+02, 2.91453369140625e+02, 2.914795227050781e+02, 2.914767761230469e+02, 2.914164733886719e+02, 2.91344482421875e+02, 2.912724914550781e+02, 2.912005004882812e+02, 2.911284790039062e+02, 2.910564880371094e+02, 2.909844970703125e+02, 2.909124755859375e+02, 2.908404846191406e+02, 2.907684936523438e+02, 2.906965026855469e+02, 2.906244812011719e+02, 2.90552490234375e+02]
+opeSig.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, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+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]
+senTemHXOut.T=[2.931499938964844e+02, 2.913387145996094e+02, 2.910651550292969e+02, 2.907204895019531e+02, 2.903960266113281e+02, 2.901303100585938e+02, 2.898663024902344e+02, 2.89602294921875e+02, 2.893383178710938e+02, 2.890046997070312e+02, 2.884486694335938e+02, 2.878103942871094e+02, 2.872506103515625e+02, 2.869121704101562e+02, 2.867526245117188e+02, 2.866705322265625e+02, 2.8657177734375e+02, 2.863624267578125e+02, 2.860024719238281e+02, 2.855652770996094e+02, 2.851373901367188e+02, 2.848058471679688e+02, 2.846711730957031e+02, 2.847910461425781e+02, 2.852041015625e+02, 2.859489440917969e+02, 2.882702026367188e+02, 2.897916259765625e+02, 2.914584350585938e+02, 2.931212158203125e+02, 2.946120910644531e+02, 2.959430236816406e+02, 2.971025085449219e+02, 2.972195129394531e+02, 2.973492126464844e+02, 2.971683959960938e+02, 2.966644592285156e+02, 2.968073425292969e+02, 2.960899353027344e+02, 2.968878173828125e+02, 2.968825988769531e+02, 2.971149291992188e+02, 2.975087280273438e+02, 2.96921630859375e+02, 2.974983215332031e+02, 2.974449462890625e+02, 2.977096862792969e+02, 2.974605102539062e+02, 2.979631652832031e+02, 2.974064331054688e+02, 2.981546020507812e+02, 2.977277526855469e+02, 2.979685974121094e+02, 2.98208251953125e+02, 2.978035888671875e+02, 2.984243774414062e+02, 2.981358947753906e+02, 2.981201171875e+02, 2.985567321777344e+02, 2.980349731445312e+02, 2.984405212402344e+02, 2.986258239746094e+02, 2.983652648925781e+02, 2.987540283203125e+02, 2.977893371582031e+02, 2.970549621582031e+02, 2.959226379394531e+02, 2.956488037109375e+02, 2.961225891113281e+02, 2.966455383300781e+02, 2.975614013671875e+02, 2.975861511230469e+02, 2.980264587402344e+02, 2.976876831054688e+02, 2.979201965332031e+02, 2.972748718261719e+02, 2.966111755371094e+02, 2.954009094238281e+02, 2.941929626464844e+02, 2.932602233886719e+02, 2.926548767089844e+02, 2.921215209960938e+02, 2.917098693847656e+02, 2.914776306152344e+02, 2.91437255859375e+02, 2.914542846679688e+02, 2.914801025390625e+02, 2.914757690429688e+02, 2.914140930175781e+02, 2.913420715332031e+02, 2.912700805664062e+02, 2.911980895996094e+02, 2.911260681152344e+02, 2.910540771484375e+02, 2.909820861816406e+02, 2.909100952148438e+02, 2.908380737304688e+02, 2.907660827636719e+02, 2.90694091796875e+02, 2.906220703125e+02, 2.905500793457031e+02]
+whe.port_a1.Xi_outflow[1]=[1.020082738250494e-02, 1.041341479867697e-02, 1.020724046975374e-02, 9.99085046350956e-03, 9.836782701313496e-03, 9.757447056472301e-03, 9.679554961621761e-03, 9.601212106645107e-03, 9.5224529504776e-03, 9.400995448231697e-03, 9.147651493549347e-03, 8.851860649883747e-03, 8.607334457337856e-03, 8.489762432873249e-03, 8.471320383250713e-03, 8.495157584547997e-03, 8.509130217134953e-03, 8.46540741622448e-03, 8.389475755393505e-03, 8.302637375891209e-03, 8.214255794882774e-03, 8.137145079672337e-03, 8.122085593640804e-03, 8.206699043512344e-03, 8.411874994635582e-03, 8.763079531490803e-03, 9.398895315825939e-03, 1.034505292773247e-02, 1.143034640699625e-02, 1.241556368768215e-02, 1.315876096487045e-02, 1.378693338483572e-02, 1.425285078585148e-02, 1.450714096426964e-02, 1.438504923135042e-02, 1.369496528059244e-02, 1.286804024130106e-02, 1.230658404529095e-02, 1.217551529407501e-02, 1.168260723352432e-02, 1.085670199245214e-02, 9.97223611921072e-03, 9.36471950262785e-03, 8.902018889784813e-03, 8.507907390594482e-03, 8.223498240113258e-03, 8.098715916275978e-03, 8.165220730006695e-03, 8.340694941580296e-03, 8.511393330991268e-03, 8.560599759221077e-03, 8.413743227720261e-03, 8.153790608048439e-03, 7.901248522102833e-03, 7.781551219522953e-03, 7.89081584662199e-03, 8.167044259607792e-03, 8.504312485456467e-03, 8.799020200967789e-03, 8.933519944548607e-03, 8.86286236345768e-03, 8.718964643776417e-03, 8.648307994008064e-03, 8.916387334465981e-03, 9.894336573779583e-03, 1.078152004629374e-02, 1.121085416525602e-02, 1.130799576640129e-02, 1.129153650254011e-02, 1.117290556430817e-02, 1.099951472133398e-02, 1.098693627864122e-02, 1.109900698065758e-02, 1.121259294450283e-02, 1.130424998700619e-02, 1.134226564317942e-02, 1.133640669286251e-02, 1.128318440169096e-02, 1.116411294788122e-02, 1.101302076131105e-02, 1.081150863319635e-02, 1.049603335559368e-02, 1.014619320631027e-02, 9.83247347176075e-03, 9.509637020528316e-03, 8.962342515587807e-03, 8.377989754080772e-03, 7.978647947311401e-03, 7.945782504975796e-03, 8.121653459966183e-03, 8.370942436158657e-03, 8.589083328843117e-03, 8.67956131696701e-03, 8.672020398080349e-03, 8.644551038742065e-03, 8.661389350891113e-03, 8.783654309809208e-03, 8.967524394392967e-03, 9.165292605757713e-03, 9.370592422783375e-03, 9.577167220413685e-03]
+whe.port_b1.Xi_outflow[1]=[1.04016549885273e-02, 1.041341479867697e-02, 1.020724046975374e-02, 9.99085046350956e-03, 9.836782701313496e-03, 9.757447056472301e-03, 9.679554961621761e-03, 9.601212106645107e-03, 9.5224529504776e-03, 9.400995448231697e-03, 9.147651493549347e-03, 8.851860649883747e-03, 8.607334457337856e-03, 8.489762432873249e-03, 8.471320383250713e-03, 8.495157584547997e-03, 8.509130217134953e-03, 8.46540741622448e-03, 8.389475755393505e-03, 8.302637375891209e-03, 8.214255794882774e-03, 8.137145079672337e-03, 8.122085593640804e-03, 8.206699043512344e-03, 8.411874994635582e-03, 8.763079531490803e-03, 8.906236849725246e-03, 9.423477575182915e-03, 1.015867944806814e-02, 1.099905371665955e-02, 1.180578395724297e-02, 1.254896819591522e-02, 1.319347694516182e-02, 1.310206484049559e-02, 1.302237901836634e-02, 1.278854999691248e-02, 1.240640785545111e-02, 1.236945204436779e-02, 1.190402172505856e-02, 1.183162350207567e-02, 1.124472822993994e-02, 1.063371449708939e-02, 1.00359907373786e-02, 9.498973377048969e-03, 9.020349942147732e-03, 8.62618163228035e-03, 8.356102742254734e-03, 8.25079157948494e-03, 8.291857317090034e-03, 8.40683002024889e-03, 8.494958281517029e-03, 8.458990603685379e-03, 8.294863626360893e-03, 8.072606287896633e-03, 7.898933254182339e-03, 7.88478460162878e-03, 8.046445436775684e-03, 8.321952074766159e-03, 8.61900020390749e-03, 8.825396187603474e-03, 8.855554275214672e-03, 8.767503313720226e-03, 8.683688938617706e-03, 8.816281333565712e-03, 9.546718560159206e-03, 1.042464468628168e-02, 1.099913846701384e-02, 1.123059540987015e-02, 1.12784169614315e-02, 1.115166302770376e-02, 1.101284101605415e-02, 1.096661854535341e-02, 1.10597237944603e-02, 1.115125603973866e-02, 1.125604007393122e-02, 1.127875782549381e-02, 1.133640669286251e-02, 1.128318440169096e-02, 1.116411294788122e-02, 1.101302076131105e-02, 1.081150863319635e-02, 1.049603335559368e-02, 1.014619320631027e-02, 9.83247347176075e-03, 9.509637020528316e-03, 8.962342515587807e-03, 8.377989754080772e-03, 7.978647947311401e-03, 7.945782504975796e-03, 8.121653459966183e-03, 8.370942436158657e-03, 8.589083328843117e-03, 8.67956131696701e-03, 8.672020398080349e-03, 8.644551038742065e-03, 8.661389350891113e-03, 8.783654309809208e-03, 8.967524394392967e-03, 9.165292605757713e-03, 9.370592422783375e-03, 9.577167220413685e-03]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Latent_Validation_BypassDampers.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Latent_Validation_BypassDampers.txt
index 3c16656c231..676062f9035 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Latent_Validation_BypassDampers.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Latent_Validation_BypassDampers.txt
@@ -1,4 +1,4 @@
-last-generated=2024-01-10
+last-generated=2024-05-09
 statistics-initialization=
 {
   "nonlinear": "1, 0, 1, 0",
@@ -13,11 +13,11 @@ statistics-simulation=
 }
 time=[0e+00, 3.6e+02]
 TSup.y=[3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.033500059763645e+02, 3.039500116982971e+02, 3.045499875386664e+02, 3.051499938964844e+02, 3.057500002543024e+02, 3.063500066121204e+02, 3.069500116982971e+02, 3.075499875386664e+02, 3.081499938964844e+02, 3.087500002543024e+02, 3.093500066121204e+02, 3.099500116982971e+02, 3.105499875386664e+02, 3.111499938964844e+02, 3.117500002543024e+02, 3.123500066121204e+02, 3.129500116982971e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02]
-senSupTem.T=[2.931499938964844e+02, 3.030918884321161e+02, 3.031473083495285e+02, 3.031484680179096e+02, 3.031490783699329e+02, 3.031495361328125e+02, 3.031496582031735e+02, 3.031500854491217e+02, 3.031500854491864e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.032147826598053e+02, 3.037219538579238e+02, 3.043150937408084e+02, 3.049143981933594e+02, 2.970651850379469e+02, 2.96593933148413e+02, 2.967011412360915e+02, 2.968535460771917e+02, 2.970092163085938e+02, 2.971656189627116e+02, 2.973216859232115e+02, 2.974776304830385e+02, 2.976336669260249e+02, 2.977897338867188e+02, 2.979457703298345e+02, 2.981018067729502e+02, 2.982578734028311e+02, 2.983602905114337e+02, 2.983703918457031e+02, 2.983710632319045e+02, 2.983711853027344e+02, 2.983711853027344e+02, 2.983711853027344e+02, 2.983711853027344e+02, 2.983711853027344e+02, 2.983711853027344e+02, 2.983711853027344e+02, 2.983711853027344e+02, 2.983711853027344e+02, 2.983711853027344e+02, 2.983711853027344e+02, 2.983711853027344e+02, 2.983711853027344e+02, 2.983711853027344e+02, 2.983711853027344e+02, 2.983711853027344e+02, 2.983711853027344e+02, 2.983711853027344e+02, 2.983711853027344e+02, 2.983711853027344e+02, 2.983713989262986e+02, 2.983724060046952e+02, 2.983746337942365e+02, 2.983783264160156e+02, 2.983836059469419e+02, 2.9839041138355e+02, 2.983987731858571e+02, 2.984085693537878e+02, 2.984196472167969e+02, 2.984319762966285e+02, 2.984454345822127e+02, 2.984598998896674e+02, 2.984752502710455e+02, 2.984914245605469e+02, 2.98508331269595e+02, 2.985259398808704e+02, 2.985441284810916e+02, 2.985628967608532e+02, 2.985821838378906e+02, 2.986019591946259e+02, 2.986221617959027e+02, 2.986428223365089e+02, 2.986638794307493e+02, 2.986853637695312e+02, 2.987073058706916e+02, 2.987297057339716e+02, 2.987525940722681e+02, 2.987759704990829e+02, 2.987998962402344e+02, 2.988244323311374e+02, 2.988496703237503e+02, 2.988756409586509e+02, 2.989023743138855e+02, 2.98929931640625e+02, 2.989582824220675e+02, 2.989874266579542e+02, 2.990173035697596e+02, 2.990479431677505e+02, 2.990792236328125e+02, 2.991110534124698e+02, 2.99143188367391e+02, 2.991753235949822e+02, 2.992071838914416e+02, 2.992384948730469e+02]
-senExhTem.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.016079719554775e+02, 3.026803288353185e+02, 3.031736751493177e+02, 3.036217344300307e+02, 3.040665283203125e+02, 3.04510559270365e+02, 3.049549869490626e+02, 3.053994747208593e+02, 3.058439329170703e+02, 3.06288330078125e+02, 3.067327577566932e+02, 3.071771549178126e+02, 3.076215816544531e+02, 3.079133300325938e+02, 3.079420471191406e+02, 3.079439392076908e+02, 3.079442749024731e+02, 3.079443359375e+02, 3.079443054199219e+02, 3.079443054199219e+02, 3.079443054199219e+02, 3.079443054199219e+02, 3.079443054199219e+02, 3.079443054199219e+02, 3.079443054199219e+02, 3.079443054199219e+02, 3.079443054199219e+02, 3.079443054199219e+02, 3.079443054199219e+02, 3.079443054199219e+02, 3.079443054199219e+02, 3.079443054199219e+02, 3.079443054199219e+02, 3.079443054199219e+02, 3.079443054199219e+02, 3.079443054199219e+02, 3.079440612789088e+02, 3.07943084717961e+02, 3.079408569284197e+02, 3.079371643066406e+02, 3.079319152932924e+02, 3.079251098566844e+02, 3.079167480545067e+02, 3.079069824040247e+02, 3.078959350585938e+02, 3.078836364963402e+02, 3.078702087282048e+02, 3.078557739383282e+02, 3.078404235573382e+02, 3.078242797851562e+02, 3.078074035936863e+02, 3.07789825499989e+02, 3.077716674173459e+02, 3.077529296551625e+02, 3.077336730957031e+02, 3.077139587741241e+02, 3.076937866899081e+02, 3.076731566673974e+02, 3.076521300907351e+02, 3.076306762695312e+02, 3.07608764685949e+02, 3.075864258573079e+02, 3.075635680371069e+02, 3.075402221278702e+02, 3.075163269042969e+02, 3.07491821330972e+02, 3.074666443735153e+02, 3.074407347732536e+02, 3.074140014187951e+02, 3.073865051269531e+02, 3.073581543455106e+02, 3.073290711447802e+02, 3.072992247505529e+02, 3.072686461874595e+02, 3.072373962402344e+02, 3.072055969778965e+02, 3.071735230578728e+02, 3.071413878313164e+02, 3.071095885694959e+02, 3.070783081054688e+02]
+senSupTem.T=[2.931499938964844e+02, 3.031500549316527e+02, 3.031500854492188e+02, 3.031500244140464e+02, 3.031497497558109e+02, 3.031506958007812e+02, 3.031508178712554e+02, 3.031487121582678e+02, 3.031539306644829e+02, 3.03147583011111e+02, 3.031513061523438e+02, 3.031504516559524e+02, 3.031498107938937e+02, 3.031492614765173e+02, 3.031524353014408e+02, 3.031471862792969e+02, 3.031499023443321e+02, 3.032318114545262e+02, 3.037816767431804e+02, 3.04380126698952e+02, 3.049801940917969e+02, 2.960013120141687e+02, 2.958596497431861e+02, 2.959740294381822e+02, 2.960978087854392e+02, 2.962203063964844e+02, 2.963435059114385e+02, 2.964665833567267e+02, 2.96590148821137e+02, 2.967134093715707e+02, 2.96836669921875e+02, 2.969599609898222e+02, 2.97083282575218e+02, 2.972065733818132e+02, 2.972792968680151e+02, 2.972824096679688e+02, 2.972825317382812e+02, 2.972825927734375e+02, 2.972826232910156e+02, 2.972825622556007e+02, 2.972825317382812e+02, 2.972825317382812e+02, 2.972825622558594e+02, 2.972825927734375e+02, 2.972825927734375e+02, 2.972826232910156e+02, 2.972825622558594e+02, 2.972825622558594e+02, 2.972825317382812e+02, 2.972825317382812e+02, 2.972825317382812e+02, 2.972825317382812e+02, 2.972825317382812e+02, 2.972825317382812e+02, 2.972825317382812e+02, 2.972825317382812e+02, 2.972825317382812e+02, 2.972825622558594e+02, 2.972826843260425e+02, 2.97282928467573e+02, 2.972833557128906e+02, 2.972839355458402e+02, 2.97284729004553e+02, 2.972856750479227e+02, 2.972867736837102e+02, 2.972880554199219e+02, 2.972895202610849e+02, 2.972911376967353e+02, 2.972929077132915e+02, 2.972948608434655e+02, 2.972969970703125e+02, 2.972993469196889e+02, 2.973019409091729e+02, 2.973048706158168e+02, 2.97308166510115e+02, 2.973119812011719e+02, 2.97316497794456e+02, 2.973218688768231e+02, 2.973284302006165e+02, 2.973365173495064e+02, 2.973465881347656e+02, 2.973592223885677e+02, 2.973750304591119e+02, 2.973948365023566e+02, 2.974194641584116e+02, 2.974497680664062e+02, 2.974867553033143e+02, 2.975312803556317e+02, 2.975841371600202e+02, 2.976458436199462e+02, 2.977167358398438e+02, 2.97796661235444e+02, 2.978850399727628e+02, 2.979808658163782e+02, 2.980825502257791e+02, 2.981880798339844e+02, 2.982949216939098e+02, 2.984004513067717e+02, 2.985016482793203e+02, 2.985957337926243e+02, 2.986800231933594e+02]
+senExhTem.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.027366032796489e+02, 3.034788822598179e+02, 3.039648738614187e+02, 3.044414976006894e+02, 3.049193725585938e+02, 3.053965761301673e+02, 3.058738712538286e+02, 3.063507076034639e+02, 3.068278501395579e+02, 3.073049621582031e+02, 3.077820741767836e+02, 3.082591251603372e+02, 3.087362361679171e+02, 3.090179137913898e+02, 3.090299987792969e+02, 3.090304565427101e+02, 3.0903076171875e+02, 3.090308532716138e+02, 3.090305786130226e+02, 3.090304565429688e+02, 3.090304870605469e+02, 3.090305786134106e+02, 3.090307006835938e+02, 3.090307006838524e+02, 3.090307922363281e+02, 3.090306396484375e+02, 3.0903060913073e+02, 3.09030517578125e+02, 3.090304870602882e+02, 3.090304870605469e+02, 3.090304870605469e+02, 3.090304870605469e+02, 3.090304870605469e+02, 3.090304870605469e+02, 3.09030517578125e+02, 3.090304870605469e+02, 3.090304565429688e+02, 3.090303344727856e+02, 3.090300903315139e+02, 3.090296630859375e+02, 3.090290832529879e+02, 3.090283203117239e+02, 3.090273742683542e+02, 3.090262451151179e+02, 3.090249633789062e+02, 3.090235290553214e+02, 3.090219116196709e+02, 3.090201416031147e+02, 3.090181884731994e+02, 3.090160522460938e+02, 3.090137023967173e+02, 3.090111084077507e+02, 3.090082092181676e+02, 3.09004913324128e+02, 3.090010986328125e+02, 3.089966125571065e+02, 3.089912414747394e+02, 3.089847106680068e+02, 3.089766235196342e+02, 3.089665832519531e+02, 3.089539795154705e+02, 3.08938171445185e+02, 3.089183959200359e+02, 3.088938292986197e+02, 3.088635559082031e+02, 3.088266297061926e+02, 3.087821962063509e+02, 3.087294004381534e+02, 3.086677855307032e+02, 3.085969848632812e+02, 3.085171815377347e+02, 3.084289248704698e+02, 3.083332210982017e+02, 3.08231689276174e+02, 3.081262817382812e+02, 3.080195619484096e+02, 3.079141849231797e+02, 3.078131100214609e+02, 3.077191160608913e+02, 3.076349487304688e+02]
 sou_2.T=[2.931499938964844e+02, 2.931499938964844e+02]
-whe.port_a1.m_flow=[8.535533905029297e+00, 6.009464220310624e+00, 4.724926414500483e+00, 3.940942313279635e+00, 3.690239416742345e+00, 3.607042551040649e+00, 3.574299337898736e+00, 3.559397461362243e+00, 3.551025388457375e+00, 3.54165220584046e+00, 3.537287712097168e+00, 3.536006212007629e+00, 3.535670280495702e+00, 3.535578966131905e+00, 3.535551071174571e+00, 3.535541534423828e+00, 3.535537719726057e+00, 3.535536050796761e+00, 3.535535335541782e+00, 3.535534858703613e+00, 3.535534620285034e+00, 3.535534381866455e+00, 3.535534381866455e+00, 3.535534381866455e+00, 3.535534381866455e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535513878010129e+00, 3.534989355996208e+00, 3.533216716898294e+00, 3.5297272126813e+00, 3.524299144744873e+00, 3.516862406393331e+00, 3.507445803268855e+00, 3.49614192075345e+00, 3.483077263833103e+00, 3.468389987945557e+00, 3.452217130424946e+00, 3.434692128898178e+00, 3.415942208362617e+00, 3.3960868965244e+00, 3.375236034393311e+00, 3.353488005887647e+00, 3.330931979444833e+00, 3.307645717394972e+00, 3.283699948098597e+00, 3.259156942367554e+00, 3.23407201286149e+00, 3.20849546585007e+00, 3.18247213991804e+00, 3.156043007479614e+00, 3.129245758056641e+00, 3.102115200476694e+00, 3.07468542854606e+00, 3.04698886967542e+00, 3.019057941549949e+00, 2.990923643112183e+00, 2.962615061224641e+00, 2.934160806042037e+00, 2.90558590715567e+00, 2.876913260398984e+00, 2.848160982131958e+00, 2.819342900537188e+00, 2.790466406584564e+00, 2.761532446856376e+00, 2.732535551428335e+00, 2.70346212387085e+00, 2.674291898667351e+00, 2.644998888352381e+00, 2.615552802015744e+00, 2.585921237086025e+00, 2.556071996688843e+00]
-whe.port_a2.m_flow=[8.535533905029297e+00, 6.009464220310624e+00, 4.724926414500483e+00, 3.940942313279635e+00, 3.690239416742345e+00, 3.607042551040649e+00, 3.574299337898736e+00, 3.559397461362243e+00, 3.551025388457375e+00, 3.54165220584046e+00, 3.537287712097168e+00, 3.536006212007629e+00, 3.535670280495702e+00, 3.535578966131905e+00, 3.535551071174571e+00, 3.535541534423828e+00, 3.535537719726057e+00, 3.535536050796761e+00, 3.535535335541782e+00, 3.535534858703613e+00, 3.535534620285034e+00, 3.535534381866455e+00, 3.535534381866455e+00, 3.535534381866455e+00, 3.535534381866455e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535513878010129e+00, 3.534989355996208e+00, 3.533216716898294e+00, 3.5297272126813e+00, 3.524299144744873e+00, 3.516862406393331e+00, 3.507445803268855e+00, 3.49614192075345e+00, 3.483077263833103e+00, 3.468389987945557e+00, 3.452217130424946e+00, 3.434692128898178e+00, 3.415942208362617e+00, 3.3960868965244e+00, 3.375236034393311e+00, 3.353488005887647e+00, 3.330931979444833e+00, 3.307645717394972e+00, 3.283699948098597e+00, 3.259156942367554e+00, 3.23407201286149e+00, 3.20849546585007e+00, 3.18247213991804e+00, 3.156043007479614e+00, 3.129245758056641e+00, 3.102115200476694e+00, 3.07468542854606e+00, 3.04698886967542e+00, 3.019057941549949e+00, 2.990923643112183e+00, 2.962615061224641e+00, 2.934160806042037e+00, 2.90558590715567e+00, 2.876913260398984e+00, 2.848160982131958e+00, 2.819342900537188e+00, 2.790466406584564e+00, 2.761532446856376e+00, 2.732535551428335e+00, 2.70346212387085e+00, 2.674291898667351e+00, 2.644998888352381e+00, 2.615552802015744e+00, 2.585921237086025e+00, 2.556071996688843e+00]
+whe.port_a1.m_flow=[2.990290260314941e+01, 1.727255036485973e+01, 1.103538206654485e+01, 8.216103657843897e+00, 6.936291130297207e+00, 6.27985143661499e+00, 5.795115516079703e+00, 5.480855040526383e+00, 5.285025544314206e+00, 5.055537780873404e+00, 4.946742534637451e+00, 4.914711469707183e+00, 4.906315804504021e+00, 4.904027938622979e+00, 4.903334617793613e+00, 4.903095245361328e+00, 4.903001308417919e+00, 4.902959823614462e+00, 4.902939319622722e+00, 4.902928352359999e+00, 4.9029221534729e+00, 4.902918338773613e+00, 4.902915477750664e+00, 4.902914047241211e+00, 4.902912616730747e+00, 4.90291166305542e+00, 4.902911186218262e+00, 4.902910709381104e+00, 4.902910232545967e+00, 4.902910232543945e+00, 4.902909755706787e+00, 4.902909755706787e+00, 4.902909755706787e+00, 4.902909755706787e+00, 4.90290927887064e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902906894700006e+00, 4.902851104631231e+00, 4.902662277437937e+00, 4.902289389723189e+00, 4.901707172393799e+00, 4.900906087475756e+00, 4.899885176638136e+00, 4.898650170490225e+00, 4.89721059534835e+00, 4.895576000213623e+00, 4.893756869660536e+00, 4.891763208522109e+00, 4.889606954546855e+00, 4.887299056763172e+00, 4.884852886199951e+00, 4.882283215184636e+00, 4.879608640334061e+00, 4.876853456575207e+00, 4.874048228254356e+00, 4.87123441696167e+00, 4.868465905057537e+00, 4.865814694585005e+00, 4.863372795046126e+00, 4.86125707311456e+00, 4.85961389541626e+00, 4.858620167942716e+00, 4.858486174631659e+00, 4.859452730366471e+00, 4.86178923209808e+00, 4.86578369140625e+00, 4.871732223426503e+00, 4.879919497949486e+00, 4.890599769224769e+00, 4.903965975498227e+00, 4.920124053955078e+00, 4.939063515091379e+00, 4.960625572044519e+00, 4.98448952582825e+00, 5.010156199500897e+00, 5.036952018737793e+00, 5.064047290816715e+00, 5.090484531222953e+00, 5.115226824468631e+00, 5.137211833309209e+00, 5.155412197113037e+00]
+whe.port_a2.m_flow=[2.990290260314941e+01, 1.727255036485973e+01, 1.103538206654485e+01, 8.216103657843897e+00, 6.936291130297207e+00, 6.27985143661499e+00, 5.795115516079703e+00, 5.480855040526383e+00, 5.285025544314206e+00, 5.055537780873404e+00, 4.946742534637451e+00, 4.914711469707183e+00, 4.906315804504021e+00, 4.904027938622979e+00, 4.903334617793613e+00, 4.903095245361328e+00, 4.903001308417919e+00, 4.902959823614462e+00, 4.902939319622722e+00, 4.902928352359999e+00, 4.9029221534729e+00, 4.902918338773613e+00, 4.902915477750664e+00, 4.902914047241211e+00, 4.902912616730747e+00, 4.90291166305542e+00, 4.902911186218262e+00, 4.902910709381104e+00, 4.902910232545967e+00, 4.902910232543945e+00, 4.902909755706787e+00, 4.902909755706787e+00, 4.902909755706787e+00, 4.902909755706787e+00, 4.90290927887064e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902906894700006e+00, 4.902851104631231e+00, 4.902662277437937e+00, 4.902289389723189e+00, 4.901707172393799e+00, 4.900906087475756e+00, 4.899885176638136e+00, 4.898650170490225e+00, 4.89721059534835e+00, 4.895576000213623e+00, 4.893756869660536e+00, 4.891763208522109e+00, 4.889606954546855e+00, 4.887299056763172e+00, 4.884852886199951e+00, 4.882283215184636e+00, 4.879608640334061e+00, 4.876853456575207e+00, 4.874048228254356e+00, 4.87123441696167e+00, 4.868465905057537e+00, 4.865814694585005e+00, 4.863372795046126e+00, 4.86125707311456e+00, 4.85961389541626e+00, 4.858620167942716e+00, 4.858486174631659e+00, 4.859452730366471e+00, 4.86178923209808e+00, 4.86578369140625e+00, 4.871732223426503e+00, 4.879919497949486e+00, 4.890599769224769e+00, 4.903965975498227e+00, 4.920124053955078e+00, 4.939063515091379e+00, 4.960625572044519e+00, 4.98448952582825e+00, 5.010156199500897e+00, 5.036952018737793e+00, 5.064047290816715e+00, 5.090484531222953e+00, 5.115226824468631e+00, 5.137211833309209e+00, 5.155412197113037e+00]
 whe.uBypDamPos=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 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.999992465612479e-03, 6.500003948800676e-03, 1.099999612570312e-02, 1.550000737606466e-02, 1.999999955296516e-02, 2.449999172988142e-02, 2.900000298022717e-02, 3.349999701977283e-02, 3.800000640748921e-02, 4.250000044703484e-02, 4.699999076132177e-02, 5.150000387429688e-02, 5.59999979138425e-02, 6.050000730155885e-02, 6.499999761581417e-02, 6.949999165535983e-02, 7.399998569490546e-02, 7.850001788137323e-02, 8.300000447033823e-02, 8.749999850988388e-02, 9.199999254942953e-02, 9.649998658897513e-02, 1.010000187753166e-01, 1.05500005364408e-01, 1.099999994039536e-01, 1.144999934434992e-01, 1.189999874830448e-01, 1.23500012218932e-01, 1.280000137090582e-01, 1.324999928474426e-01, 1.369999868869883e-01, 1.414999809265339e-01, 1.460000131130016e-01, 1.505000071525472e-01, 1.550000011920929e-01, 1.594999952316385e-01, 1.639999892711841e-01, 1.685000214576519e-01, 1.730000005960363e-01, 1.77499994635582e-01, 1.819999886751276e-01, 1.864999827146732e-01, 1.91000014901141e-01, 1.955000089406866e-01, 2.000000029802322e-01]
-whe.epsSen=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 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.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414214015062599e-01, 7.414005398353665e-01, 7.413299680567129e-01, 7.411910888405252e-01, 7.40975022315979e-01, 7.406789666016863e-01, 7.403041716823086e-01, 7.398541573769655e-01, 7.39334045891258e-01, 7.387492656707764e-01, 7.381053578230604e-01, 7.374075048950454e-01, 7.366608387756554e-01, 7.35870002318332e-01, 7.350394725799561e-01, 7.341731205597145e-01, 7.33274403322457e-01, 7.323464123172879e-01, 7.31391905094625e-01, 7.304132580757141e-01, 7.29412676614222e-01, 7.283919488494921e-01, 7.27352794425927e-01, 7.262966018727972e-01, 7.252246141433716e-01, 7.241380233209453e-01, 7.230377234746849e-01, 7.219246587913771e-01, 7.207996826060108e-01, 7.196636199951172e-01, 7.185170669990806e-01, 7.173607388736384e-01, 7.161952217462049e-01, 7.150210718193429e-01, 7.138388156890869e-01, 7.12648989792187e-01, 7.114521305704462e-01, 7.10248645026601e-01, 7.090390900074387e-01, 7.078239917755127e-01, 7.066037079551547e-01, 7.053788345923072e-01, 7.041497784820392e-01, 7.029170373010286e-01, 7.016810178756714e-01]
-whe.epsLat=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 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.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828444361686707e-01, 5.828428268543777e-01, 5.828011035123383e-01, 5.826599599552837e-01, 5.823821419187688e-01, 5.819500684738159e-01, 5.813579570447253e-01, 5.806083076020829e-01, 5.797082789913967e-01, 5.786680560202343e-01, 5.774985551834106e-01, 5.76210679883334e-01, 5.748149740275565e-01, 5.733216417885239e-01, 5.717400880821562e-01, 5.7007896900177e-01, 5.683462053571475e-01, 5.665487708831376e-01, 5.646927888727995e-01, 5.627837744269685e-01, 5.608265399932861e-01, 5.58825377070302e-01, 5.567839811444762e-01, 5.547056126937119e-01, 5.525932275869471e-01, 5.504492521286011e-01, 5.482760108791038e-01, 5.460754111875934e-01, 5.438493414236015e-01, 5.415993890533743e-01, 5.393272638320923e-01, 5.370341578400191e-01, 5.347215611927689e-01, 5.32390467333257e-01, 5.300421674800385e-01, 5.276776552200317e-01, 5.252980034262319e-01, 5.229042253781057e-01, 5.204972542914258e-01, 5.180782038567354e-01, 5.156479477882385e-01, 5.132074397521673e-01, 5.107576930264723e-01, 5.082995808069467e-01, 5.058340388392703e-01, 5.033620595932007e-01]
+whe.epsSen=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 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.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961160540585802e-01, 7.961137890775313e-01, 7.961062193005293e-01, 7.960913180966398e-01, 7.960679531097412e-01, 7.960358858709796e-01, 7.959949373807326e-01, 7.959454060050524e-01, 7.958875893485433e-01, 7.958219051361084e-01, 7.95748710761169e-01, 7.956682442901285e-01, 7.955809236335779e-01, 7.954869864713856e-01, 7.953867316246033e-01, 7.952802779134595e-01, 7.95167863758049e-01, 7.950496073404395e-01, 7.949255106675793e-01, 7.947957515716553e-01, 7.946603300521622e-01, 7.945191269023368e-01, 7.9437226006121e-01, 7.942196128104928e-01, 7.940610647201538e-01, 7.938965561835272e-01, 7.937259679943549e-01, 7.935491794184307e-01, 7.933660146401159e-01, 7.931762933731079e-01, 7.929798368019565e-01, 7.927765257198985e-01, 7.925661198959372e-01, 7.923483248755986e-01, 7.92123019695282e-01, 7.918898467256029e-01, 7.916486271571745e-01, 7.913991204204663e-01, 7.911409731213005e-01, 7.908739447593689e-01, 7.905977373104373e-01, 7.903120527553239e-01, 7.900165309226109e-01, 7.897109384014896e-01, 7.893947958946228e-01]
+whe.epsLat=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 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.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922322511672974e-01, 6.922320723548788e-01, 6.922276019966679e-01, 6.922124624426639e-01, 6.92182600430998e-01, 6.921359896659851e-01, 6.920717359796777e-01, 6.919898986033232e-01, 6.918908358517101e-01, 6.917752621435894e-01, 6.916438341140747e-01, 6.914973857600566e-01, 6.91336512422115e-01, 6.911618711090136e-01, 6.909739967846291e-01, 6.907734274864197e-01, 6.905605796687767e-01, 6.903357513579559e-01, 6.900991789191028e-01, 6.898511047806508e-01, 6.895915269851685e-01, 6.893206243415375e-01, 6.890383372491552e-01, 6.887445439632672e-01, 6.884391898581987e-01, 6.881221532821655e-01, 6.877931362089122e-01, 6.874519598295572e-01, 6.870983230740745e-01, 6.86731993517445e-01, 6.86352550983429e-01, 6.859596974452656e-01, 6.855530752806445e-01, 6.851322040290875e-01, 6.846966735930551e-01, 6.842460036277771e-01, 6.837797172930637e-01, 6.832972781551964e-01, 6.827982050791565e-01, 6.822819700844588e-01, 6.817479133605957e-01, 6.811954984622272e-01, 6.806241293514952e-01, 6.800330856860692e-01, 6.794218410406977e-01, 6.787896156311035e-01]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Latent_Validation_SpeedControlled.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Latent_Validation_SpeedControlled.txt
index ac4e0a77d3c..7cc0dffece8 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Latent_Validation_SpeedControlled.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Latent_Validation_SpeedControlled.txt
@@ -1,7 +1,7 @@
-last-generated=2024-01-10
+last-generated=2024-05-09
 statistics-initialization=
 {
-  "nonlinear": "0, 0",
+  "nonlinear": "0, 0, 0, 0",
   "numerical Jacobians": "0"
 }
 statistics-simulation=
@@ -13,11 +13,13 @@ statistics-simulation=
 }
 time=[0e+00, 3.6e+02]
 TSup.y=[3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.033500059763645e+02, 3.039500116982971e+02, 3.045499875386664e+02, 3.051499938964844e+02, 3.057500002543024e+02, 3.063500066121204e+02, 3.069500116982971e+02, 3.075499875386664e+02, 3.081499938964844e+02, 3.087500002543024e+02, 3.093500066121204e+02, 3.099500116982971e+02, 3.105499875386664e+02, 3.111499938964844e+02, 3.117500002543024e+02, 3.123500066121204e+02, 3.129500116982971e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02]
-senSupTem.T=[2.931499938964844e+02, 2.974623718343856e+02, 2.975797424320691e+02, 2.975829467773195e+02, 2.975828247069989e+02, 2.975828552246094e+02, 2.975829467773438e+02, 2.975829467773438e+02, 2.975829467773438e+02, 2.975829467773438e+02, 2.975829467773438e+02, 2.975829467773438e+02, 2.975829467773438e+02, 2.975829467773438e+02, 2.975829467773438e+02, 2.975829467773438e+02, 2.975829467773438e+02, 2.976194762874447e+02, 2.978632505101983e+02, 2.981278685401972e+02, 2.983925170898438e+02, 2.986575318506865e+02, 2.989226076465562e+02, 2.991875913281825e+02, 2.994525755713178e+02, 2.997175598144531e+02, 2.999825440576531e+02, 3.002475588183019e+02, 3.005125424999282e+02, 3.007775267431281e+02, 3.010425109863281e+02, 3.013074952295281e+02, 3.01572479472728e+02, 3.018374631543544e+02, 3.019931030125331e+02, 3.019990234375e+02, 3.019993591300833e+02, 3.019995422361987e+02, 3.019994812013013e+02, 3.019994201657569e+02, 3.019993896484375e+02, 3.019993896484375e+02, 3.019994201660156e+02, 3.019994201660156e+02, 3.019994201660156e+02, 3.019994201660156e+02, 3.019994201660156e+02, 3.019994201660156e+02, 3.019994201660156e+02, 3.019994201660156e+02, 3.019994201660156e+02, 3.019994201660156e+02, 3.019994201660156e+02, 3.019994201660156e+02, 3.019994201660156e+02, 3.019994201660156e+02, 3.019756776169975e+02, 3.018736266183099e+02, 3.017662049251762e+02, 3.016585996711319e+02, 3.015509948730469e+02, 3.014433900749618e+02, 3.013357848207882e+02, 3.012281495052544e+02, 3.011204832160538e+02, 3.010128173828125e+02, 3.00905182067408e+02, 3.007976073305538e+02, 3.00689910979993e+02, 3.005822752079826e+02, 3.004746704101562e+02, 3.003670656120712e+02, 3.00259430296408e+02, 3.001517940688263e+02, 3.000441587531632e+02, 2.999365234375e+02, 2.998288881220955e+02, 2.997212528061737e+02, 2.996135860610138e+02, 2.995059507453507e+02, 2.993983154296875e+02, 2.992906495964462e+02, 2.991829837637223e+02, 2.990753170180451e+02, 2.989676511848038e+02, 2.988600158691406e+02, 2.987523500358993e+02, 2.98644684202658e+02, 2.985370174569808e+02, 2.984293516239982e+02, 2.983216552734375e+02, 2.982139894404549e+02, 2.981063236074723e+02, 2.979986568612777e+02, 2.978909605109757e+02, 2.977832946777344e+02, 2.976756288444931e+02, 2.97567932494191e+02, 2.974602352309357e+02, 2.973525693974357e+02, 2.97244873046875e+02]
-senExhTem.T=[2.931499938964844e+02, 2.985738525493903e+02, 2.987214660649948e+02, 2.987255249023033e+02, 2.987253417968265e+02, 2.987253723144531e+02, 2.987255249023276e+02, 2.987255249023438e+02, 2.987254943847656e+02, 2.987254943847656e+02, 2.987254943847656e+02, 2.987254943847656e+02, 2.987254943847656e+02, 2.987254943847656e+02, 2.987254943847656e+02, 2.987254943847656e+02, 2.987254943847656e+02, 2.987717589940747e+02, 2.990804135368935e+02, 2.99415466166632e+02, 2.997505493164062e+02, 3.000861207477539e+02, 3.004217226965503e+02, 3.007572628991528e+02, 3.010927732952795e+02, 3.014282836914062e+02, 3.01763794087533e+02, 3.020993044836597e+02, 3.024348141688134e+02, 3.027703550823889e+02, 3.031058654785156e+02, 3.034413758746423e+02, 3.037768862707691e+02, 3.041124264733716e+02, 3.043094482234964e+02, 3.043169555664062e+02, 3.043173828114652e+02, 3.043176269529956e+02, 3.0431753540052e+02, 3.043174438476562e+02, 3.043174438476562e+02, 3.043174438476562e+02, 3.043174438476562e+02, 3.043174438476562e+02, 3.043174438476562e+02, 3.043174438476562e+02, 3.043174438476562e+02, 3.043174438476562e+02, 3.043174438476562e+02, 3.043174438476562e+02, 3.043174438476562e+02, 3.043174438476562e+02, 3.043174438476562e+02, 3.043174438476562e+02, 3.043174438476562e+02, 3.043174438476562e+02, 3.043411863966743e+02, 3.044432068779132e+02, 3.045506285709175e+02, 3.046582033073837e+02, 3.047657775878906e+02, 3.048733518683975e+02, 3.049809266048637e+02, 3.050885314029488e+02, 3.051961366569931e+02, 3.053037414550781e+02, 3.054113462531632e+02, 3.055188904720512e+02, 3.056265257875851e+02, 3.057341005241806e+02, 3.058416442871094e+02, 3.059491880500382e+02, 3.060567623305451e+02, 3.061643070053924e+02, 3.062718507683212e+02, 3.063794250488281e+02, 3.064869688117569e+02, 3.065945430922638e+02, 3.067021182841719e+02, 3.068096620476181e+02, 3.069172058105469e+02, 3.070247800910538e+02, 3.071323238539826e+02, 3.072398685288299e+02, 3.073474428093368e+02, 3.074549865722656e+02, 3.075625303351944e+02, 3.076700740981232e+02, 3.077776187729705e+02, 3.078851625358993e+02, 3.079927062988281e+02, 3.081002500617569e+02, 3.08207763307625e+02, 3.083153079819549e+02, 3.084228517448837e+02, 3.085303649902344e+02, 3.086379087531632e+02, 3.087454219990312e+02, 3.088529666733612e+02, 3.089604799187118e+02, 3.090680236816406e+02]
+senSupTem.T=[2.931499938964844e+02, 2.974591369710882e+02, 2.975763854984834e+02, 2.975791320800862e+02, 2.975794677734536e+02, 2.9757958984375e+02, 2.975795593261719e+02, 2.975795593261719e+02, 2.975795288085938e+02, 2.975795288085938e+02, 2.975795288085938e+02, 2.975795288085938e+02, 2.975795288085938e+02, 2.975795288085938e+02, 2.975795288085938e+02, 2.975795288085938e+02, 2.975795288085938e+02, 2.976160278011812e+02, 2.978596189185308e+02, 2.981240538429962e+02, 2.983884887695312e+02, 2.986532899071978e+02, 2.989181520800206e+02, 2.991829526564369e+02, 2.994477232764606e+02, 2.997124938964844e+02, 2.999772950340862e+02, 3.0024206565411e+02, 3.005068357130775e+02, 3.007716368506794e+02, 3.010364074707031e+02, 3.01301208608305e+02, 3.015659792283287e+02, 3.01830779804745e+02, 3.019862670750978e+02, 3.019921875e+02, 3.019925231925833e+02, 3.019927062986987e+02, 3.019926452638013e+02, 3.019925842282569e+02, 3.019925537109375e+02, 3.019925537109375e+02, 3.019925842285156e+02, 3.019925842285156e+02, 3.019925842285156e+02, 3.019925842285156e+02, 3.019925842285156e+02, 3.019925842285156e+02, 3.019925842285156e+02, 3.019925842285156e+02, 3.019925842285156e+02, 3.019925842285156e+02, 3.019925842285156e+02, 3.019925842285156e+02, 3.019925842285156e+02, 3.019925842285156e+02, 3.019688416794975e+02, 3.018667296455243e+02, 3.01759216399915e+02, 3.01651550110585e+02, 3.015438842773438e+02, 3.014362184443611e+02, 3.013285216371945e+02, 3.012208252866337e+02, 3.01113128479467e+02, 3.010054016113281e+02, 3.008977052607674e+02, 3.007900084536006e+02, 3.006822815854618e+02, 3.005745847782951e+02, 3.004669494628906e+02, 3.003592225947518e+02, 3.00251526244191e+02, 3.001438289804183e+02, 3.000361326298576e+02, 2.999284362792969e+02, 2.998207399284775e+02, 2.997130130605973e+02, 2.996052852797638e+02, 2.994975889286857e+02, 2.993898620605469e+02, 2.99282135192408e+02, 2.991744083242692e+02, 2.990666805429183e+02, 2.989589536747795e+02, 2.988512268066406e+02, 2.987434999385018e+02, 2.986357730703629e+02, 2.985280452890121e+02, 2.984203184208732e+02, 2.983125610351562e+02, 2.982048341670174e+02, 2.980971072988785e+02, 2.979893489999496e+02, 2.978816221318107e+02, 2.977738647460938e+02, 2.976661378779549e+02, 2.975583804922379e+02, 2.97450622193309e+02, 2.97342864807592e+02, 2.97235107421875e+02]
+senExhTem.T=[2.931499938964844e+02, 2.985772705181363e+02, 2.98724945068901e+02, 2.987283935546956e+02, 2.987288208008136e+02, 2.987289733886719e+02, 2.987289123535318e+02, 2.987289428710938e+02, 2.987289123535156e+02, 2.987289123535156e+02, 2.987289123535156e+02, 2.987289123535156e+02, 2.987289123535156e+02, 2.987289123535156e+02, 2.987289123535156e+02, 2.987289123535156e+02, 2.987289123535156e+02, 2.987751769628247e+02, 2.99084045128561e+02, 2.994193113813463e+02, 2.997545776367188e+02, 3.00090362691178e+02, 3.004261782630859e+02, 3.007619015708984e+02, 3.010976255901367e+02, 3.01433349609375e+02, 3.017690736286133e+02, 3.021047671304028e+02, 3.024404904380859e+02, 3.027762144573242e+02, 3.031119384765625e+02, 3.034476624958655e+02, 3.037833865151684e+02, 3.041191098228516e+02, 3.043162841609964e+02, 3.043237915039062e+02, 3.043242187489652e+02, 3.043244628904956e+02, 3.0432437133802e+02, 3.043242797851562e+02, 3.043242492675781e+02, 3.043242797851562e+02, 3.043242797851562e+02, 3.043242797851562e+02, 3.043242797851562e+02, 3.043242797851562e+02, 3.043242797851562e+02, 3.043242797851562e+02, 3.043242797851562e+02, 3.043242797851562e+02, 3.043242797851562e+02, 3.043242797851562e+02, 3.043242797851562e+02, 3.043242797851562e+02, 3.043242797851562e+02, 3.043242797851562e+02, 3.043480223341743e+02, 3.044501343680182e+02, 3.0455758657873e+02, 3.046652528679306e+02, 3.047728881835938e+02, 3.048805234989982e+02, 3.049881897884575e+02, 3.050958251041206e+02, 3.052034913935799e+02, 3.053111877441406e+02, 3.054188230598038e+02, 3.055264588315556e+02, 3.056341246646675e+02, 3.057417909538681e+02, 3.05849365234375e+02, 3.059570005500382e+02, 3.060646358657013e+02, 3.06172272093283e+02, 3.062798768916268e+02, 3.063875122070312e+02, 3.064951475224357e+02, 3.066027828378402e+02, 3.067103885483612e+02, 3.068180238640243e+02, 3.069256286621094e+02, 3.070332639775139e+02, 3.071408687758576e+02, 3.072485050034393e+02, 3.073561098015243e+02, 3.074637145996094e+02, 3.075713499152725e+02, 3.076789547133576e+02, 3.077865604233612e+02, 3.078941652214462e+02, 3.080017700195312e+02, 3.081093748176163e+02, 3.082169796157013e+02, 3.083245853257049e+02, 3.0843219012379e+02, 3.08539794921875e+02, 3.086473692023819e+02, 3.08754974000467e+02, 3.088625491934098e+02, 3.089701539909775e+02, 3.090777282714844e+02]
 sou_2.T=[2.931499938964844e+02, 2.931499938964844e+02]
-whe.port_a1.m_flow=[5e+00, 5e+00]
-whe.port_a2.m_flow=[5e+00, 5e+00]
-whe.uSpe=[6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 7.029999976159558e-01, 7.09750002384115e-01, 7.164999785423986e-01, 7.232499833110633e-01, 7.300000190734863e-01, 7.367499952317699e-01, 7.434999999999292e-01, 7.502499761582129e-01, 7.57000040531017e-01, 7.637500166893005e-01, 7.704999928475842e-01, 7.772499976157435e-01, 7.839999737740271e-01, 7.907500381468311e-01, 7.975000143051147e-01, 8.042499904633983e-01, 8.109999666216818e-01, 8.177500000007276e-01, 8.245000357626453e-01, 8.31250011920929e-01, 8.379999880792126e-01, 8.44749964237496e-01, 8.514999976165418e-01, 8.582500333784596e-01, 8.650000095367432e-01, 8.717499856950268e-01, 8.784999618533103e-01, 8.85249995232356e-01, 8.920000309942737e-01, 8.987500071525574e-01, 9.05499983310841e-01, 9.122499594691245e-01, 9.190000524518045e-01, 9.257500286100879e-01, 9.325000047683716e-01, 9.392499809266552e-01, 9.459999570849387e-01, 9.527500500676187e-01, 9.595000262259021e-01, 9.662500023841858e-01, 9.729999785424693e-01, 9.797499547007529e-01, 9.865000476834329e-01, 9.932500238417163e-01, 1e+00]
-whe.epsSen=[5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.620548037586715e-01, 5.674514816255318e-01, 5.728481366186393e-01, 5.782448740901445e-01, 5.83641529083252e-01, 5.89038243680499e-01, 5.944349215478646e-01, 5.998315765409721e-01, 6.052283140124772e-01, 6.106249690055847e-01, 6.160216239986922e-01, 6.214183614701974e-01, 6.268150164633048e-01, 6.322116943306705e-01, 6.376084089279175e-01, 6.43005063921025e-01, 6.484017785177666e-01, 6.537984792593906e-01, 6.591951342530032e-01, 6.645918488502502e-01, 6.699885038433577e-01, 6.753851588364651e-01, 6.807819191817234e-01, 6.861785741748309e-01, 6.915752291679382e-01, 6.969719437651852e-01, 7.023685987587979e-01, 7.077652995004219e-01, 7.131620140971635e-01, 7.18558669090271e-01, 7.23955383687518e-01, 7.293520386811306e-01, 7.347487394227546e-01, 7.401454540194963e-01, 7.455421090126038e-01, 7.509387640057112e-01, 7.563354786024529e-01, 7.617321793440769e-01, 7.671288343376895e-01, 7.725255489349365e-01, 7.779222039280439e-01, 7.833188589211514e-01, 7.887156192664097e-01, 7.94112274259517e-01, 7.995089888572693e-01]
-whe.epsLat=[4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.893125593662262e-01, 4.914095917815388e-01, 4.961279670659762e-01, 5.008463223514169e-01, 5.055646976362334e-01, 5.102831125259399e-01, 5.150014678110018e-01, 5.197198430958181e-01, 5.244381983813853e-01, 5.291565736656964e-01, 5.338749289512634e-01, 5.385932842368305e-01, 5.433116595213943e-01, 5.480300744111009e-01, 5.527484496956646e-01, 5.574668049812317e-01, 5.621851602667988e-01, 5.669035155523658e-01, 5.71621910835421e-01, 5.763402661214934e-01, 5.810586214065552e-01, 5.857770362962618e-01, 5.904953915813236e-01, 5.952137868653893e-01, 5.999321421509564e-01, 6.046504974365234e-01, 6.093688527220905e-01, 6.140872080076576e-01, 6.188056032917233e-01, 6.235240181809246e-01, 6.282423734664917e-01, 6.329607287520588e-01, 6.376790840376259e-01, 6.42397479320681e-01, 6.471158346062481e-01, 6.518341898918152e-01, 6.565526047815218e-01, 6.612709600665836e-01, 6.659893553506493e-01, 6.707077106362164e-01, 6.754260659217834e-01, 6.801444212073505e-01, 6.848627764929176e-01, 6.895811717769833e-01, 6.942995866661846e-01, 6.990179419517517e-01]
+wheUseDefCur.port_a1.m_flow=[5e+00, 5e+00]
+wheUseDefCur.port_a2.m_flow=[5e+00, 5e+00]
+wheUseDefCur.uSpe=[6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 7.029999976159558e-01, 7.09750002384115e-01, 7.164999785423986e-01, 7.232499833110633e-01, 7.300000190734863e-01, 7.367499952317699e-01, 7.434999999999292e-01, 7.502499761582129e-01, 7.57000040531017e-01, 7.637500166893005e-01, 7.704999928475842e-01, 7.772499976157435e-01, 7.839999737740271e-01, 7.907500381468311e-01, 7.975000143051147e-01, 8.042499904633983e-01, 8.109999666216818e-01, 8.177500000007276e-01, 8.245000357626453e-01, 8.31250011920929e-01, 8.379999880792126e-01, 8.44749964237496e-01, 8.514999976165418e-01, 8.582500333784596e-01, 8.650000095367432e-01, 8.717499856950268e-01, 8.784999618533103e-01, 8.85249995232356e-01, 8.920000309942737e-01, 8.987500071525574e-01, 9.05499983310841e-01, 9.122499594691245e-01, 9.190000524518045e-01, 9.257500286100879e-01, 9.325000047683716e-01, 9.392499809266552e-01, 9.459999570849387e-01, 9.527500500676187e-01, 9.595000262259021e-01, 9.662500023841858e-01, 9.729999785424693e-01, 9.797499547007529e-01, 9.865000476834329e-01, 9.932500238417163e-01, 1e+00]
+wheUseDefCur.epsSen=[5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.623999742510077e-01, 5.677999899865652e-01, 5.731999828339694e-01, 5.785999985697795e-01, 5.839999914169312e-01, 5.893999842645881e-01, 5.947999999998929e-01, 6.001999928475498e-01, 6.056000085828546e-01, 6.110000014305115e-01, 6.163999942781684e-01, 6.218000100134732e-01, 6.272000028608774e-01, 6.326000185964349e-01, 6.380000114440918e-01, 6.434000042912433e-01, 6.48799997138395e-01, 6.542000357623584e-01, 6.596000286100152e-01, 6.650000214576721e-01, 6.704000143048238e-01, 6.758000071519753e-01, 6.812000457759387e-01, 6.866000386235956e-01, 6.919999718666077e-01, 6.973999647142646e-01, 7.027999575619214e-01, 7.081999961858848e-01, 7.135999890330363e-01, 7.18999981880188e-01, 7.243999747278449e-01, 7.297999675755017e-01, 7.352000061994651e-01, 7.405999990466167e-01, 7.459999918937683e-01, 7.513999847414252e-01, 7.56799977589082e-01, 7.622000162120349e-01, 7.676000090596917e-01, 7.730000019073486e-01, 7.783999947550054e-01, 7.837999876026623e-01, 7.892000262256152e-01, 7.94600019073272e-01, 8.00000011920929e-01]
+wheUseDefCur.epsLat=[4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.920999923706035e-01, 4.9682501358986e-01, 5.015500147818246e-01, 5.062750061986324e-01, 5.109999775886536e-01, 5.157250085828142e-01, 5.204500000001273e-01, 5.251749713898959e-01, 5.299000224110958e-01, 5.346249938011169e-01, 5.393499651911381e-01, 5.440750162123381e-01, 5.487999876023593e-01, 5.535249790194197e-01, 5.582500100135803e-01, 5.629749814036015e-01, 5.677000123972568e-01, 5.724250238413567e-01, 5.77149995231883e-01, 5.818750262260437e-01, 5.865999976155596e-01, 5.913249690060859e-01, 5.960500400538201e-01, 6.007750114438413e-01, 6.054999828338623e-01, 6.10225013828023e-01, 6.149499852185493e-01, 6.196749966626492e-01, 6.244000276563045e-01, 6.291249990463257e-01, 6.338499704363468e-01, 6.385750014300021e-01, 6.433000128751126e-01, 6.480249842646284e-01, 6.527500152587891e-01, 6.574749866488102e-01, 6.621999580388312e-01, 6.669250290865655e-01, 6.716500004770918e-01, 6.763749718666077e-01, 6.811000028607682e-01, 6.858249742512946e-01, 6.905500452990289e-01, 6.952750166890499e-01, 6.99999988079071e-01]
+wheUseDefCur.P=[7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7.030000190733247e+01, 7.097499904633376e+01, 7.165000095366622e+01, 7.232499809266753e+01, 7.3e+01, 7.367500190733246e+01, 7.434999904633376e+01, 7.502500095366624e+01, 7.569999809266754e+01, 7.6375e+01, 7.705000190733247e+01, 7.772499904633378e+01, 7.840000095366624e+01, 7.907499809266753e+01, 7.975e+01, 8.042500190733246e+01, 8.10999961852704e+01, 8.17750038147296e+01, 8.244999809266753e+01, 8.3125e+01, 8.380000190733247e+01, 8.44749961852704e+01, 8.51500038147296e+01, 8.582499809266754e+01, 8.65e+01, 8.717500190733247e+01, 8.78499961852704e+01, 8.85250038147296e+01, 8.919999809266753e+01, 8.9875e+01, 9.055000190733247e+01, 9.12249961852704e+01, 9.19000038147296e+01, 9.257499809266753e+01, 9.325e+01, 9.392500190733247e+01, 9.45999961852704e+01, 9.52750038147296e+01, 9.594999809266753e+01, 9.6625e+01, 9.730000190733246e+01, 9.79749961852704e+01, 9.86500038147296e+01, 9.932499809266753e+01, 1e+02]
+wheDefCur.P=[7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.707760526040832e+01, 7.76318745537873e+01, 7.818501234887661e+01, 7.873689363449135e+01, 7.928739929199219e+01, 7.983640196336229e+01, 8.038376663742224e+01, 8.092935134476362e+01, 8.147303101001151e+01, 8.20146484375e+01, 8.255407623541956e+01, 8.309114883051618e+01, 8.362572434020771e+01, 8.415764707824735e+01, 8.468675994873047e+01, 8.521113498221922e+01, 8.572463053687665e+01, 8.622763230105473e+01, 8.672117697536649e+01, 8.720632171630859e+01, 8.768415751960265e+01, 8.81557753858856e+01, 8.862228550857391e+01, 8.908480150116631e+01, 8.954447174072266e+01, 9.000243300107802e+01, 9.045984494541517e+01, 9.091787112408261e+01, 9.137769395857916e+01, 9.184049987792969e+01, 9.230747906334781e+01, 9.277985984017414e+01, 9.325886699608766e+01, 9.374574363222463e+01, 9.424174499511719e+01, 9.474816044972476e+01, 9.526628698354577e+01, 9.579747192256049e+01, 9.634306429519107e+01, 9.690444946289062e+01, 9.748306938025544e+01, 9.808039650755971e+01, 9.869793914910043e+01, 9.933726612195029e+01, 1e+02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Sensible_Examples_SpaceCooling.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Sensible_Examples_SpaceCooling.txt
new file mode 100644
index 00000000000..ed03322d38e
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Sensible_Examples_SpaceCooling.txt
@@ -0,0 +1,22 @@
+last-generated=2024-05-09
+statistics-initialization=
+{
+  "linear": "0, 0, 0, 0, 4",
+  "nonlinear": "1, 1, 0, 0, 1, 0, 0",
+  "numerical Jacobians": "0"
+}
+statistics-simulation=
+{
+  "linear": "0, 0, 0, 0, 0, 0, 4",
+  "nonlinear": "1, 2, 0, 1, 1, 1",
+  "number of continuous time states": "22",
+  "numerical Jacobians": "0"
+}
+time=[1.5552e+07, 1.56384e+07]
+vol.T_start=[2.931499938964844e+02, 2.931499938964844e+02]
+vol.T=[2.931499938964844e+02, 2.931558837890625e+02, 2.929799499511719e+02, 2.926975708007812e+02, 2.923731384277344e+02, 2.920772399902344e+02, 2.918045349121094e+02, 2.915382080078125e+02, 2.912736511230469e+02, 2.909941711425781e+02, 2.905767211914062e+02, 2.900142211914062e+02, 2.894204406738281e+02, 2.889404907226562e+02, 2.886464538574219e+02, 2.884886169433594e+02, 2.883844299316406e+02, 2.882429504394531e+02, 2.879859313964844e+02, 2.876162414550781e+02, 2.871962890625e+02, 2.868060607910156e+02, 2.865364074707031e+02, 2.864703674316406e+02, 2.866612243652344e+02, 2.871516723632812e+02, 2.885281677246094e+02, 2.899907836914062e+02, 2.916045227050781e+02, 2.93271240234375e+02, 2.948161010742188e+02, 2.961998901367188e+02, 2.974215393066406e+02, 2.973492431640625e+02, 2.97415771484375e+02, 2.973645629882812e+02, 2.970057067871094e+02, 2.974677429199219e+02, 2.974571228027344e+02, 2.97275634765625e+02, 2.970132446289062e+02, 2.971078491210938e+02, 2.974808349609375e+02, 2.969872436523438e+02, 2.97056396484375e+02, 2.972968139648438e+02, 2.970733947753906e+02, 2.97099365234375e+02, 2.972933654785156e+02, 2.967833862304688e+02, 2.976255187988281e+02, 2.966881408691406e+02, 2.973909301757812e+02, 2.971754760742188e+02, 2.968593444824219e+02, 2.976906127929688e+02, 2.967866516113281e+02, 2.971856384277344e+02, 2.974348754882812e+02, 2.966431274414062e+02, 2.974722900390625e+02, 2.971272277832031e+02, 2.969159240722656e+02, 2.976935119628906e+02, 2.968096618652344e+02, 2.975284423828125e+02, 2.971109313964844e+02, 2.971130676269531e+02, 2.973049926757812e+02, 2.968793640136719e+02, 2.974075012207031e+02, 2.967461853027344e+02, 2.975682983398438e+02, 2.966238708496094e+02, 2.976586608886719e+02, 2.966826477050781e+02, 2.972911376953125e+02, 2.969325561523438e+02, 2.966825256347656e+02, 2.958363342285156e+02, 2.950868530273438e+02, 2.944715881347656e+02, 2.939642944335938e+02, 2.935993347167969e+02, 2.934185791015625e+02, 2.933692932128906e+02, 2.933747253417969e+02, 2.933849182128906e+02, 2.933596496582031e+02, 2.933012084960938e+02, 2.932327270507812e+02, 2.931614990234375e+02, 2.93089599609375e+02, 2.93017578125e+02, 2.929456176757812e+02, 2.928736267089844e+02, 2.928015747070312e+02, 2.927294311523438e+02, 2.926572265625e+02, 2.925850219726562e+02, 2.925127868652344e+02]
+TOut.T=[2.914500122070312e+02, 2.913385009765625e+02, 2.910647583007812e+02, 2.907200927734375e+02, 2.903956909179688e+02, 2.901300048828125e+02, 2.898659973144531e+02, 2.896019897460938e+02, 2.893380126953125e+02, 2.89004150390625e+02, 2.884479370117188e+02, 2.878096618652344e+02, 2.872500610351562e+02, 2.869119262695312e+02, 2.867525024414062e+02, 2.866704406738281e+02, 2.865716247558594e+02, 2.86362060546875e+02, 2.860019836425781e+02, 2.855647583007812e+02, 2.851369323730469e+02, 2.848055419921875e+02, 2.84671142578125e+02, 2.847913513183594e+02, 2.852047729492188e+02, 2.859500122070312e+02, 2.872088317871094e+02, 2.889144592285156e+02, 2.907325744628906e+02, 2.923289794921875e+02, 2.935801696777344e+02, 2.946938171386719e+02, 2.956173706054688e+02, 2.962911987304688e+02, 2.964541015625e+02, 2.957337341308594e+02, 2.947459106445312e+02, 2.941705322265625e+02, 2.945262451171875e+02, 2.952189331054688e+02, 2.959844055175781e+02, 2.966857299804688e+02, 2.972068786621094e+02, 2.977020874023438e+02, 2.981768493652344e+02, 2.985576171875e+02, 2.987735900878906e+02, 2.989007568359375e+02, 2.990133361816406e+02, 2.991251220703125e+02, 2.9925e+02, 2.993937683105469e+02, 2.99545654296875e+02, 2.996946411132812e+02, 2.998296203613281e+02, 2.999126586914062e+02, 2.999144897460938e+02, 2.99878662109375e+02, 2.998501281738281e+02, 2.99885009765625e+02, 3.0001416015625e+02, 3.001783142089844e+02, 3.003133850097656e+02, 3.001267700195312e+02, 2.985876770019531e+02, 2.964372253417969e+02, 2.946898803710938e+02, 2.943067016601562e+02, 2.951251831054688e+02, 2.964444274902344e+02, 2.976576538085938e+02, 2.981753234863281e+02, 2.982959289550781e+02, 2.982947082519531e+02, 2.980774841308594e+02, 2.975499877929688e+02, 2.9660986328125e+02, 2.953994445800781e+02, 2.94191650390625e+02, 2.932594299316406e+02, 2.926542053222656e+02, 2.921209716796875e+02, 2.917095031738281e+02, 2.914774780273438e+02, 2.91437255859375e+02, 2.914543151855469e+02, 2.914801330566406e+02, 2.914757385253906e+02, 2.914140014648438e+02, 2.913420104980469e+02, 2.912699890136719e+02, 2.91197998046875e+02, 2.911260070800781e+02, 2.910539855957031e+02, 2.909819946289062e+02, 2.909100036621094e+02, 2.908380126953125e+02, 2.907659912109375e+02, 2.906940002441406e+02, 2.906220092773438e+02, 2.905499877929688e+02]
+cooCoi.sta_a2.T=[2.931499938964844e+02, 2.913385009765625e+02, 2.910647583007812e+02, 2.907200927734375e+02, 2.903956909179688e+02, 2.901300048828125e+02, 2.898659973144531e+02, 2.896019897460938e+02, 2.893380126953125e+02, 2.89004150390625e+02, 2.884479370117188e+02, 2.878096618652344e+02, 2.872500610351562e+02, 2.869119262695312e+02, 2.867525024414062e+02, 2.866704406738281e+02, 2.865716247558594e+02, 2.86362060546875e+02, 2.860019836425781e+02, 2.855647583007812e+02, 2.851369323730469e+02, 2.848055419921875e+02, 2.84671142578125e+02, 2.847913513183594e+02, 2.852047729492188e+02, 2.859500122070312e+02, 2.882640380859375e+02, 2.897752075195312e+02, 2.914298400878906e+02, 2.930824890136719e+02, 2.945685119628906e+02, 2.958979187011719e+02, 2.970586547851562e+02, 2.971351013183594e+02, 2.972189636230469e+02, 2.970245971679688e+02, 2.965215454101562e+02, 2.967350769042969e+02, 2.96777099609375e+02, 2.967764282226562e+02, 2.967528991699219e+02, 2.969973449707031e+02, 2.974074096679688e+02, 2.971829833984375e+02, 2.973701171875e+02, 2.976580505371094e+02, 2.975722045898438e+02, 2.976408996582031e+02, 2.97823486328125e+02, 2.975238342285156e+02, 2.981527099609375e+02, 2.975898132324219e+02, 2.981286315917969e+02, 2.980618896484375e+02, 2.979338989257812e+02, 2.985173645019531e+02, 2.979839172363281e+02, 2.982464904785156e+02, 2.984142150878906e+02, 2.979965209960938e+02, 2.985650329589844e+02, 2.984781188964844e+02, 2.984653625488281e+02, 2.988367309570312e+02, 2.976707458496094e+02, 2.969838256835938e+02, 2.958657836914062e+02, 2.956256408691406e+02, 2.961144409179688e+02, 2.966346130371094e+02, 2.97552490234375e+02, 2.975989074707031e+02, 2.980150146484375e+02, 2.976786193847656e+02, 2.979299621582031e+02, 2.972577514648438e+02, 2.9660986328125e+02, 2.953994445800781e+02, 2.94191650390625e+02, 2.932594299316406e+02, 2.926542053222656e+02, 2.921209716796875e+02, 2.917095031738281e+02, 2.914774780273438e+02, 2.91437255859375e+02, 2.914543151855469e+02, 2.914801330566406e+02, 2.914757385253906e+02, 2.914140014648438e+02, 2.913420104980469e+02, 2.912699890136719e+02, 2.91197998046875e+02, 2.911260070800781e+02, 2.910539855957031e+02, 2.909819946289062e+02, 2.909100036621094e+02, 2.908380126953125e+02, 2.907659912109375e+02, 2.906940002441406e+02, 2.906220092773438e+02, 2.905499877929688e+02]
+cooCoi.sta_b2.T=[2.931499938964844e+02, 2.913454895019531e+02, 2.910758972167969e+02, 2.907322082519531e+02, 2.904056396484375e+02, 2.901391296386719e+02, 2.898751220703125e+02, 2.896111145019531e+02, 2.893471374511719e+02, 2.890198364257812e+02, 2.884694213867188e+02, 2.878313903808594e+02, 2.872664794921875e+02, 2.869200439453125e+02, 2.867562561035156e+02, 2.866730041503906e+02, 2.865762939453125e+02, 2.863719787597656e+02, 2.860161743164062e+02, 2.855802307128906e+02, 2.851506652832031e+02, 2.848144226074219e+02, 2.846719360351562e+02, 2.8478271484375e+02, 2.851853637695312e+02, 2.859184875488281e+02, 2.882149353027344e+02, 2.897201538085938e+02, 2.913715209960938e+02, 2.930275573730469e+02, 2.945196533203125e+02, 2.958544921875e+02, 2.970215454101562e+02, 2.970871276855469e+02, 2.971749267578125e+02, 2.969962768554688e+02, 2.9650439453125e+02, 2.967317504882812e+02, 2.905662841796875e+02, 2.967467956542969e+02, 2.967057800292969e+02, 2.969409790039062e+02, 2.973504333496094e+02, 2.883258361816406e+02, 2.97274169921875e+02, 2.886420288085938e+02, 2.974552612304688e+02, 2.884390869140625e+02, 2.977313537597656e+02, 2.883526916503906e+02, 2.980684509277344e+02, 2.961152038574219e+02, 2.888097839355469e+02, 2.979241943359375e+02, 2.884501342773438e+02, 2.928273010253906e+02, 2.970706787109375e+02, 2.885835266113281e+02, 2.983150634765625e+02, 2.890511169433594e+02, 2.890296936035156e+02, 2.982669982910156e+02, 2.885836791992188e+02, 2.919594116210938e+02, 2.971886596679688e+02, 2.969928283691406e+02, 2.958826293945312e+02, 2.956220092773438e+02, 2.960868225097656e+02, 2.965665588378906e+02, 2.974925537109375e+02, 2.885558776855469e+02, 2.979689025878906e+02, 2.947523803710938e+02, 2.923420715332031e+02, 2.963597412109375e+02, 2.966483154296875e+02, 2.9544287109375e+02, 2.942304992675781e+02, 2.932843627929688e+02, 2.926741638183594e+02, 2.921377563476562e+02, 2.917211608886719e+02, 2.914820251464844e+02, 2.914373168945312e+02, 2.91453369140625e+02, 2.914795227050781e+02, 2.914767761230469e+02, 2.9141650390625e+02, 2.91344482421875e+02, 2.912724914550781e+02, 2.912005004882812e+02, 2.911284790039062e+02, 2.910564880371094e+02, 2.909844970703125e+02, 2.909124755859375e+02, 2.908404846191406e+02, 2.907684936523438e+02, 2.906965026855469e+02, 2.906244812011719e+02, 2.90552490234375e+02]
+opeSig.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, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+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]
+senTemHXOut.T=[2.931499938964844e+02, 2.913387145996094e+02, 2.910651550292969e+02, 2.907204895019531e+02, 2.903960266113281e+02, 2.901303100585938e+02, 2.898663024902344e+02, 2.89602294921875e+02, 2.893383178710938e+02, 2.890046997070312e+02, 2.884486694335938e+02, 2.878103942871094e+02, 2.872506103515625e+02, 2.869121704101562e+02, 2.867526245117188e+02, 2.866705322265625e+02, 2.8657177734375e+02, 2.863623962402344e+02, 2.860024719238281e+02, 2.855652770996094e+02, 2.851373901367188e+02, 2.848058471679688e+02, 2.846711730957031e+02, 2.847910461425781e+02, 2.852041015625e+02, 2.859489440917969e+02, 2.882623901367188e+02, 2.897733764648438e+02, 2.914278869628906e+02, 2.930806579589844e+02, 2.945668640136719e+02, 2.95896484375e+02, 2.970574340820312e+02, 2.97133544921875e+02, 2.97217529296875e+02, 2.97023681640625e+02, 2.9652099609375e+02, 2.967349548339844e+02, 2.967813110351562e+02, 2.967754516601562e+02, 2.967513427734375e+02, 2.969955139160156e+02, 2.97405517578125e+02, 2.971869201660156e+02, 2.973674926757812e+02, 2.976617431640625e+02, 2.975693664550781e+02, 2.976443786621094e+02, 2.978206787109375e+02, 2.975268859863281e+02, 2.981499938964844e+02, 2.975874633789062e+02, 2.981316833496094e+02, 2.980587463378906e+02, 2.979364624023438e+02, 2.985177612304688e+02, 2.979811096191406e+02, 2.982491760253906e+02, 2.984113159179688e+02, 2.9799853515625e+02, 2.985673828125e+02, 2.984749450683594e+02, 2.984673156738281e+02, 2.988379516601562e+02, 2.976697387695312e+02, 2.969841918945312e+02, 2.958663635253906e+02, 2.956255187988281e+02, 2.961134948730469e+02, 2.966327209472656e+02, 2.97550537109375e+02, 2.976006164550781e+02, 2.980135192871094e+02, 2.976780700683594e+02, 2.97930908203125e+02, 2.972572937011719e+02, 2.966111755371094e+02, 2.954009094238281e+02, 2.941929626464844e+02, 2.932602233886719e+02, 2.926548767089844e+02, 2.921215209960938e+02, 2.917098693847656e+02, 2.914776306152344e+02, 2.91437255859375e+02, 2.914542846679688e+02, 2.914801025390625e+02, 2.914757690429688e+02, 2.914140930175781e+02, 2.913420715332031e+02, 2.912700805664062e+02, 2.911980895996094e+02, 2.911260681152344e+02, 2.910540771484375e+02, 2.909820861816406e+02, 2.909100952148438e+02, 2.908380737304688e+02, 2.907660827636719e+02, 2.90694091796875e+02, 2.906220703125e+02, 2.905500793457031e+02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Sensible_Validation_BypassDampers.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Sensible_Validation_BypassDampers.txt
index ac72d469c6e..2ed1210b101 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Sensible_Validation_BypassDampers.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Sensible_Validation_BypassDampers.txt
@@ -1,4 +1,4 @@
-last-generated=2024-01-10
+last-generated=2024-05-09
 statistics-initialization=
 {
   "nonlinear": "1, 0, 1, 0",
@@ -13,10 +13,10 @@ statistics-simulation=
 }
 time=[0e+00, 3.6e+02]
 TSup.y=[3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.033500059763645e+02, 3.039500116982971e+02, 3.045499875386664e+02, 3.051499938964844e+02, 3.057500002543024e+02, 3.063500066121204e+02, 3.069500116982971e+02, 3.075499875386664e+02, 3.081499938964844e+02, 3.087500002543024e+02, 3.093500066121204e+02, 3.099500116982971e+02, 3.105499875386664e+02, 3.111499938964844e+02, 3.117500002543024e+02, 3.123500066121204e+02, 3.129500116982971e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02]
-senSupTem.T=[2.931499938964844e+02, 3.030918884321161e+02, 3.031473083495285e+02, 3.031484680179096e+02, 3.031490783699329e+02, 3.031495361328125e+02, 3.031496582031735e+02, 3.031500854491217e+02, 3.031500854491864e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.032147826598053e+02, 3.037219538579238e+02, 3.043150937408084e+02, 3.049143981933594e+02, 2.97044280495185e+02, 2.965711365171656e+02, 2.966780699472877e+02, 2.968303222003032e+02, 2.969857788085938e+02, 2.971420899099126e+02, 2.972980042824571e+02, 2.97453826772101e+02, 2.97609680109748e+02, 2.977655944824219e+02, 2.979214783375823e+02, 2.980773927101915e+02, 2.982332762349916e+02, 2.983356017907305e+02, 2.98345703125e+02, 2.983463439936232e+02, 2.983464660644531e+02, 2.983464965820312e+02, 2.983464965820312e+02, 2.983464660644531e+02, 2.983464660644531e+02, 2.983464660644531e+02, 2.983464660644531e+02, 2.983464660644531e+02, 2.983464660644531e+02, 2.983464660644531e+02, 2.983464660644531e+02, 2.983464660644531e+02, 2.983464660644531e+02, 2.983464660644531e+02, 2.983464660644531e+02, 2.983464660644531e+02, 2.983464660644531e+02, 2.983464660644531e+02, 2.983464660644531e+02, 2.983464965817726e+02, 2.983467102055955e+02, 2.983477172838627e+02, 2.983499450735334e+02, 2.983536376953125e+02, 2.983589172264975e+02, 2.983657836980031e+02, 2.983741760177589e+02, 2.983839721860778e+02, 2.983951110839844e+02, 2.984074706813942e+02, 2.984209594846858e+02, 2.984354858271674e+02, 2.984508667263823e+02, 2.984671020507812e+02, 2.984840697949856e+02, 2.985017394414173e+02, 2.985200195943729e+02, 2.985388489092907e+02, 2.985581665039062e+02, 2.985780028957977e+02, 2.985982970498089e+02, 2.986190186255714e+02, 2.986401367552268e+02, 2.986617126464844e+02, 2.98683715782801e+02, 2.987061766812372e+02, 2.987291260557248e+02, 2.987525940344979e+02, 2.98776611328125e+02, 2.988012389715037e+02, 2.988265379990142e+02, 2.988525696701058e+02, 2.988794250951355e+02, 2.989070434570312e+02, 2.989354857912081e+02, 2.989647215793118e+02, 2.989946900448863e+02, 2.99025421195353e+02, 2.990567932128906e+02, 2.990887145450236e+02, 2.991209105353597e+02, 2.991531678332635e+02, 2.991851196824572e+02, 2.992165222167969e+02]
-senExhTem.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.016342781100202e+02, 3.02709228982579e+02, 3.032031246116909e+02, 3.036516416563345e+02, 3.04096923828125e+02, 3.04541382024336e+02, 3.049861759142944e+02, 3.054311214489869e+02, 3.058760068914856e+02, 3.063208312988281e+02, 3.067656862237487e+02, 3.072105411486694e+02, 3.076553951307569e+02, 3.079474181673594e+02, 3.079761962890625e+02, 3.079780883776127e+02, 3.07978424072395e+02, 3.079784545898438e+02, 3.079784545898438e+02, 3.079784545898438e+02, 3.079784240725243e+02, 3.079784240722656e+02, 3.079784240722656e+02, 3.079784545898438e+02, 3.079784545898438e+02, 3.079784545898438e+02, 3.079784545898438e+02, 3.079784545898438e+02, 3.079784545898438e+02, 3.079784545898438e+02, 3.079784545898438e+02, 3.079784545898438e+02, 3.079784545898438e+02, 3.079784545898438e+02, 3.079784545898438e+02, 3.079784240725243e+02, 3.079782104487014e+02, 3.079772033704342e+02, 3.079749755807635e+02, 3.079712524414062e+02, 3.079659729104799e+02, 3.079591064387157e+02, 3.079507141189598e+02, 3.079408874330629e+02, 3.079297485351562e+02, 3.079173584201683e+02, 3.079038390992986e+02, 3.078892822392388e+02, 3.078738708224458e+02, 3.078576049804688e+02, 3.078406067186863e+02, 3.078229065551939e+02, 3.078046264017209e+02, 3.077857665689663e+02, 3.077663879394531e+02, 3.077465210302422e+02, 3.077261963589116e+02, 3.077054442650536e+02, 3.076842651005007e+02, 3.076626892089844e+02, 3.076406250377702e+02, 3.076181336214972e+02, 3.075951232123708e+02, 3.075716247155021e+02, 3.075475769042969e+02, 3.0752291874334e+02, 3.07497589197734e+02, 3.074714964920036e+02, 3.074446105493957e+02, 3.074169311523438e+02, 3.073884277832694e+02, 3.073591614773288e+02, 3.07329131976598e+02, 3.072983703085533e+02, 3.072669372558594e+02, 3.072349548885701e+02, 3.072026978635952e+02, 3.071704100470785e+02, 3.071383971632459e+02, 3.0710693359375e+02]
+senSupTem.T=[2.931499938964844e+02, 3.031500549316527e+02, 3.031500854492188e+02, 3.031500244140464e+02, 3.031497497558109e+02, 3.031506958007812e+02, 3.031508178712554e+02, 3.031487121582678e+02, 3.031539306644829e+02, 3.03147583011111e+02, 3.031513061523438e+02, 3.031504516559524e+02, 3.031498107938937e+02, 3.031492614765173e+02, 3.031524353014408e+02, 3.031471862792969e+02, 3.031499023443321e+02, 3.032318114545262e+02, 3.037816767431804e+02, 3.04380126698952e+02, 3.049801940917969e+02, 2.959758298355288e+02, 2.958330994503468e+02, 2.959474791452135e+02, 2.960702514123923e+02, 2.961935424804688e+02, 2.963165283725053e+02, 2.964392396067267e+02, 2.965627440357221e+02, 2.966861266567916e+02, 2.968090515136719e+02, 2.969322815463981e+02, 2.970556641668855e+02, 2.971788634208757e+02, 2.972512512137829e+02, 2.972543334960938e+02, 2.972544555664062e+02, 2.972545166015625e+02, 2.972545471191406e+02, 2.972544860837257e+02, 2.972544555664062e+02, 2.972544555664062e+02, 2.972544860839844e+02, 2.972545166015625e+02, 2.972545166015625e+02, 2.972545471191406e+02, 2.972544860839844e+02, 2.972544860839844e+02, 2.972544555664062e+02, 2.972544555664062e+02, 2.972544555664062e+02, 2.972544555664062e+02, 2.972544555664062e+02, 2.972544555664062e+02, 2.972544555664062e+02, 2.972544555664062e+02, 2.972544555664062e+02, 2.972544860839844e+02, 2.972546081541675e+02, 2.97254852295698e+02, 2.972552795410156e+02, 2.972558898912846e+02, 2.972566528328073e+02, 2.972575988760477e+02, 2.972587280294134e+02, 2.97260009765625e+02, 2.97261474606788e+02, 2.972630920424385e+02, 2.972648620589947e+02, 2.972668151891687e+02, 2.972689514160156e+02, 2.972713317829702e+02, 2.972739257719368e+02, 2.97276855479098e+02, 2.972801513733963e+02, 2.972839965820312e+02, 2.972884826579959e+02, 2.972938842576825e+02, 2.973004455819932e+02, 2.973085632479439e+02, 2.973186340332031e+02, 2.973312682872639e+02, 2.973471373921882e+02, 2.973669434359503e+02, 2.97391571092264e+02, 2.974219360351562e+02, 2.974589537896424e+02, 2.97503509359538e+02, 2.975563966815046e+02, 2.976181641765868e+02, 2.976891174316406e+02, 2.977691038623972e+02, 2.978575741519329e+02, 2.979534610317393e+02, 2.980552369933573e+02, 2.981608276367188e+02, 2.98267791566698e+02, 2.983733822149748e+02, 2.984746707407752e+02, 2.985688783238743e+02, 2.986532287597656e+02]
+senExhTem.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.027703862399268e+02, 3.035143436859872e+02, 3.040007930504838e+02, 3.044788205985423e+02, 3.049563293457031e+02, 3.054341432689039e+02, 3.059122623673685e+02, 3.063895259628389e+02, 3.068669431569421e+02, 3.073448181152344e+02, 3.078224184152589e+02, 3.082998356100734e+02, 3.087774348979978e+02, 3.090596923557783e+02, 3.090718078613281e+02, 3.090722961420607e+02, 3.090725708007812e+02, 3.09072662353645e+02, 3.090723876950538e+02, 3.09072265625e+02, 3.090722961425781e+02, 3.090723876954419e+02, 3.090725402830737e+02, 3.090725097658837e+02, 3.090726013183594e+02, 3.090724487304688e+02, 3.090724182127612e+02, 3.090723266601562e+02, 3.090722961425781e+02, 3.090722961425781e+02, 3.090722961425781e+02, 3.090722961425781e+02, 3.090723266601562e+02, 3.090723266601562e+02, 3.090723266601562e+02, 3.090722961428368e+02, 3.09072265625e+02, 3.090721435549462e+02, 3.090718994135451e+02, 3.090714721679688e+02, 3.090708923350192e+02, 3.09070098876177e+02, 3.090691528329367e+02, 3.09068023679571e+02, 3.090667419433594e+02, 3.090652771021964e+02, 3.090636596665459e+02, 3.090618896499897e+02, 3.090599060024963e+02, 3.090577697753906e+02, 3.090554199260142e+02, 3.090527954194695e+02, 3.090498657123082e+02, 3.0904656981801e+02, 3.09042724609375e+02, 3.090382080160909e+02, 3.090328064161456e+02, 3.090262145747741e+02, 3.090181274256256e+02, 3.090079956054688e+02, 3.08995361351408e+02, 3.089794617289056e+02, 3.089596251675653e+02, 3.089349364760953e+02, 3.08904541015625e+02, 3.08867492743302e+02, 3.088228456214482e+02, 3.087698667457124e+02, 3.087079771805763e+02, 3.086369018554688e+02, 3.085567933546584e+02, 3.084681704774907e+02, 3.083721310087589e+02, 3.082702024592504e+02, 3.081643981933594e+02, 3.080572511581701e+02, 3.079514774052006e+02, 3.078500362899574e+02, 3.077556761189677e+02, 3.076711730957031e+02]
 sou_2.T=[2.931499938964844e+02, 2.931499938964844e+02]
-whe.port_a1.m_flow=[8.535533905029297e+00, 6.009464220310624e+00, 4.724926414500483e+00, 3.940942313279635e+00, 3.690239416742345e+00, 3.607042551040649e+00, 3.574299337898736e+00, 3.559397461362243e+00, 3.551025388457375e+00, 3.54165220584046e+00, 3.537287712097168e+00, 3.536006212007629e+00, 3.535670280495702e+00, 3.535578966131905e+00, 3.535551071174571e+00, 3.535541534423828e+00, 3.535537719726057e+00, 3.535536050796761e+00, 3.535535335541782e+00, 3.535534858703613e+00, 3.535534620285034e+00, 3.535534381866455e+00, 3.535534381866455e+00, 3.535534381866455e+00, 3.535534381866455e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535513878010129e+00, 3.534989355996208e+00, 3.533216716898294e+00, 3.5297272126813e+00, 3.524299144744873e+00, 3.516862406393331e+00, 3.507445803268855e+00, 3.49614192075345e+00, 3.483077263833103e+00, 3.468389987945557e+00, 3.452217130424946e+00, 3.434692128898178e+00, 3.415942208362617e+00, 3.3960868965244e+00, 3.375236034393311e+00, 3.353488005887647e+00, 3.330931979444833e+00, 3.307645717394972e+00, 3.283699948098597e+00, 3.259156942367554e+00, 3.23407201286149e+00, 3.20849546585007e+00, 3.18247213991804e+00, 3.156043007479614e+00, 3.129245758056641e+00, 3.102115200476694e+00, 3.07468542854606e+00, 3.046988869671378e+00, 3.019057941549949e+00, 2.990923643112183e+00, 2.962615061224641e+00, 2.934160806042037e+00, 2.90558590715567e+00, 2.876913260398984e+00, 2.848160982131958e+00, 2.819342900537188e+00, 2.790466406584564e+00, 2.761532446856376e+00, 2.732535551428335e+00, 2.70346212387085e+00, 2.674291898667351e+00, 2.644998888352381e+00, 2.615552802015744e+00, 2.585921237086025e+00, 2.556071996688843e+00]
-whe.port_a2.m_flow=[8.535533905029297e+00, 6.009464220310624e+00, 4.724926414500483e+00, 3.940942313279635e+00, 3.690239416742345e+00, 3.607042551040649e+00, 3.574299337898736e+00, 3.559397461362243e+00, 3.551025388457375e+00, 3.54165220584046e+00, 3.537287712097168e+00, 3.536006212007629e+00, 3.535670280495702e+00, 3.535578966131905e+00, 3.535551071174571e+00, 3.535541534423828e+00, 3.535537719726057e+00, 3.535536050796761e+00, 3.535535335541782e+00, 3.535534858703613e+00, 3.535534620285034e+00, 3.535534381866455e+00, 3.535534381866455e+00, 3.535534381866455e+00, 3.535534381866455e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535534143447876e+00, 3.535513878010129e+00, 3.534989355996208e+00, 3.533216716898294e+00, 3.5297272126813e+00, 3.524299144744873e+00, 3.516862406393331e+00, 3.507445803268855e+00, 3.49614192075345e+00, 3.483077263833103e+00, 3.468389987945557e+00, 3.452217130424946e+00, 3.434692128898178e+00, 3.415942208362617e+00, 3.3960868965244e+00, 3.375236034393311e+00, 3.353488005887647e+00, 3.330931979444833e+00, 3.307645717394972e+00, 3.283699948098597e+00, 3.259156942367554e+00, 3.23407201286149e+00, 3.20849546585007e+00, 3.18247213991804e+00, 3.156043007479614e+00, 3.129245758056641e+00, 3.102115200476694e+00, 3.07468542854606e+00, 3.046988869671378e+00, 3.019057941549949e+00, 2.990923643112183e+00, 2.962615061224641e+00, 2.934160806042037e+00, 2.90558590715567e+00, 2.876913260398984e+00, 2.848160982131958e+00, 2.819342900537188e+00, 2.790466406584564e+00, 2.761532446856376e+00, 2.732535551428335e+00, 2.70346212387085e+00, 2.674291898667351e+00, 2.644998888352381e+00, 2.615552802015744e+00, 2.585921237086025e+00, 2.556071996688843e+00]
+whe.port_a1.m_flow=[2.990290260314941e+01, 1.727255036485973e+01, 1.103538206654485e+01, 8.216103657843897e+00, 6.936291130297207e+00, 6.27985143661499e+00, 5.795115516079703e+00, 5.480855040526383e+00, 5.285025544314206e+00, 5.055537780873404e+00, 4.946742534637451e+00, 4.914711469707183e+00, 4.906315804504021e+00, 4.904027938622979e+00, 4.903334617793613e+00, 4.903095245361328e+00, 4.903001308417919e+00, 4.902959823614462e+00, 4.902939319622722e+00, 4.902928352359999e+00, 4.9029221534729e+00, 4.902918338773613e+00, 4.902915477750664e+00, 4.902914047241211e+00, 4.902912616730747e+00, 4.90291166305542e+00, 4.902911186218262e+00, 4.902910709381104e+00, 4.902910232545967e+00, 4.902910232543945e+00, 4.902909755706787e+00, 4.902909755706787e+00, 4.902909755706787e+00, 4.902909755706787e+00, 4.90290927887064e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902906894700006e+00, 4.902851104631231e+00, 4.902662277437937e+00, 4.902289389723189e+00, 4.901707172393799e+00, 4.900906087475756e+00, 4.899885176638136e+00, 4.898650170490225e+00, 4.89721059534835e+00, 4.895576000213623e+00, 4.893756869660536e+00, 4.891763208522109e+00, 4.889606954546855e+00, 4.887299056763172e+00, 4.884852886199951e+00, 4.882283215184636e+00, 4.879608640334061e+00, 4.876853456575207e+00, 4.874048228254356e+00, 4.87123441696167e+00, 4.868465905057537e+00, 4.865814694585005e+00, 4.863372795046126e+00, 4.86125707311456e+00, 4.85961389541626e+00, 4.858620167942716e+00, 4.858486174631659e+00, 4.859452730366471e+00, 4.86178923209808e+00, 4.86578369140625e+00, 4.871732223426503e+00, 4.879919497949486e+00, 4.890599769224769e+00, 4.903965975498227e+00, 4.920124053955078e+00, 4.939063515091379e+00, 4.960625572044519e+00, 4.98448952582825e+00, 5.010156199500897e+00, 5.036952018737793e+00, 5.064047290816715e+00, 5.090484531222953e+00, 5.115226824468631e+00, 5.137211833309209e+00, 5.155412197113037e+00]
+whe.port_a2.m_flow=[2.990290260314941e+01, 1.727255036485973e+01, 1.103538206654485e+01, 8.216103657843897e+00, 6.936291130297207e+00, 6.27985143661499e+00, 5.795115516079703e+00, 5.480855040526383e+00, 5.285025544314206e+00, 5.055537780873404e+00, 4.946742534637451e+00, 4.914711469707183e+00, 4.906315804504021e+00, 4.904027938622979e+00, 4.903334617793613e+00, 4.903095245361328e+00, 4.903001308417919e+00, 4.902959823614462e+00, 4.902939319622722e+00, 4.902928352359999e+00, 4.9029221534729e+00, 4.902918338773613e+00, 4.902915477750664e+00, 4.902914047241211e+00, 4.902912616730747e+00, 4.90291166305542e+00, 4.902911186218262e+00, 4.902910709381104e+00, 4.902910232545967e+00, 4.902910232543945e+00, 4.902909755706787e+00, 4.902909755706787e+00, 4.902909755706787e+00, 4.902909755706787e+00, 4.90290927887064e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902909278869629e+00, 4.902906894700006e+00, 4.902851104631231e+00, 4.902662277437937e+00, 4.902289389723189e+00, 4.901707172393799e+00, 4.900906087475756e+00, 4.899885176638136e+00, 4.898650170490225e+00, 4.89721059534835e+00, 4.895576000213623e+00, 4.893756869660536e+00, 4.891763208522109e+00, 4.889606954546855e+00, 4.887299056763172e+00, 4.884852886199951e+00, 4.882283215184636e+00, 4.879608640334061e+00, 4.876853456575207e+00, 4.874048228254356e+00, 4.87123441696167e+00, 4.868465905057537e+00, 4.865814694585005e+00, 4.863372795046126e+00, 4.86125707311456e+00, 4.85961389541626e+00, 4.858620167942716e+00, 4.858486174631659e+00, 4.859452730366471e+00, 4.86178923209808e+00, 4.86578369140625e+00, 4.871732223426503e+00, 4.879919497949486e+00, 4.890599769224769e+00, 4.903965975498227e+00, 4.920124053955078e+00, 4.939063515091379e+00, 4.960625572044519e+00, 4.98448952582825e+00, 5.010156199500897e+00, 5.036952018737793e+00, 5.064047290816715e+00, 5.090484531222953e+00, 5.115226824468631e+00, 5.137211833309209e+00, 5.155412197113037e+00]
 whe.uBypDamPos=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 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.999992465612479e-03, 6.500003948800676e-03, 1.099999612570312e-02, 1.550000737606466e-02, 1.999999955296516e-02, 2.449999172988142e-02, 2.900000298022717e-02, 3.349999701977283e-02, 3.800000640748921e-02, 4.250000044703484e-02, 4.699999076132177e-02, 5.150000387429688e-02, 5.59999979138425e-02, 6.050000730155885e-02, 6.499999761581417e-02, 6.949999165535983e-02, 7.399998569490546e-02, 7.850001788137323e-02, 8.300000447033823e-02, 8.749999850988388e-02, 9.199999254942953e-02, 9.649998658897513e-02, 1.010000187753166e-01, 1.05500005364408e-01, 1.099999994039536e-01, 1.144999934434992e-01, 1.189999874830448e-01, 1.23500012218932e-01, 1.280000137090582e-01, 1.324999928474426e-01, 1.369999868869883e-01, 1.414999809265339e-01, 1.460000131130016e-01, 1.505000071525472e-01, 1.550000011920929e-01, 1.594999952316385e-01, 1.639999892711841e-01, 1.685000214576519e-01, 1.730000005960363e-01, 1.77499994635582e-01, 1.819999886751276e-01, 1.864999827146732e-01, 1.91000014901141e-01, 1.955000089406866e-01, 2.000000029802322e-01]
-whe.eps=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 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.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414222359657288e-01, 7.414214015062599e-01, 7.414005398353665e-01, 7.413299680567129e-01, 7.411910888405252e-01, 7.40975022315979e-01, 7.406789666016863e-01, 7.403041716823086e-01, 7.398541573769655e-01, 7.39334045891258e-01, 7.387492656707764e-01, 7.381053578230604e-01, 7.374075048950454e-01, 7.366608387756554e-01, 7.35870002318332e-01, 7.350394725799561e-01, 7.341731205597145e-01, 7.33274403322457e-01, 7.323464123172879e-01, 7.31391905094625e-01, 7.304132580757141e-01, 7.29412676614222e-01, 7.283919488494921e-01, 7.27352794425927e-01, 7.262966018727972e-01, 7.252246141433716e-01, 7.241380233209453e-01, 7.230377234746849e-01, 7.219246587913771e-01, 7.207996826060108e-01, 7.196636199951172e-01, 7.185170669990806e-01, 7.173607388736384e-01, 7.161952217462049e-01, 7.150210718193429e-01, 7.138388156890869e-01, 7.12648989792187e-01, 7.114521305704462e-01, 7.10248645026601e-01, 7.090390900074387e-01, 7.078239917755127e-01, 7.066037079551547e-01, 7.053788345923072e-01, 7.041497784820392e-01, 7.029170373010286e-01, 7.016810178756714e-01]
+whe.eps=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 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.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961161136627197e-01, 7.961160540585802e-01, 7.961137890775313e-01, 7.961062193005293e-01, 7.960913180966398e-01, 7.960679531097412e-01, 7.960358858709796e-01, 7.959949373807326e-01, 7.959454060050524e-01, 7.958875893485433e-01, 7.958219051361084e-01, 7.95748710761169e-01, 7.956682442901285e-01, 7.955809236335779e-01, 7.954869864713856e-01, 7.953867316246033e-01, 7.952802779134595e-01, 7.95167863758049e-01, 7.950496073404395e-01, 7.949255106675793e-01, 7.947957515716553e-01, 7.946603300521622e-01, 7.945191269023368e-01, 7.9437226006121e-01, 7.942196128104928e-01, 7.940610647201538e-01, 7.938965561835272e-01, 7.937259679943549e-01, 7.935491794184307e-01, 7.933660146401159e-01, 7.931762933731079e-01, 7.929798368019565e-01, 7.927765257198985e-01, 7.925661198959372e-01, 7.923483248755986e-01, 7.92123019695282e-01, 7.918898467256029e-01, 7.916486271571745e-01, 7.913991204204663e-01, 7.911409731213005e-01, 7.908739447593689e-01, 7.905977373104373e-01, 7.903120527553239e-01, 7.900165309226109e-01, 7.897109384014896e-01, 7.893947958946228e-01]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Sensible_Validation_SpeedControlled.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Sensible_Validation_SpeedControlled.txt
index 725dd89af9c..878f970ea7e 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Sensible_Validation_SpeedControlled.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Sensible_Validation_SpeedControlled.txt
@@ -1,7 +1,7 @@
-last-generated=2024-01-10
+last-generated=2024-05-09
 statistics-initialization=
 {
-  "nonlinear": "0, 0",
+  "nonlinear": "0, 0, 0, 0",
   "numerical Jacobians": "0"
 }
 statistics-simulation=
@@ -13,10 +13,12 @@ statistics-simulation=
 }
 time=[0e+00, 3.6e+02]
 TSup.y=[3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.033500059763645e+02, 3.039500116982971e+02, 3.045499875386664e+02, 3.051499938964844e+02, 3.057500002543024e+02, 3.063500066121204e+02, 3.069500116982971e+02, 3.075499875386664e+02, 3.081499938964844e+02, 3.087500002543024e+02, 3.093500066121204e+02, 3.099500116982971e+02, 3.105499875386664e+02, 3.111499938964844e+02, 3.117500002543024e+02, 3.123500066121204e+02, 3.129500116982971e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02]
-senSupTem.T=[2.931499938964844e+02, 2.974428100668237e+02, 2.975598449711235e+02, 2.975628662108971e+02, 2.975628662109214e+02, 2.975627136230469e+02, 2.97562774658187e+02, 2.975628356933594e+02, 2.975628662109375e+02, 2.975628662110022e+02, 2.975628662109375e+02, 2.975628356933594e+02, 2.975628356933594e+02, 2.975628356933594e+02, 2.975628356933594e+02, 2.975628356933594e+02, 2.975628356933594e+02, 2.975993652034927e+02, 2.978429258032965e+02, 2.981073302102484e+02, 2.983717651367188e+02, 2.986365662743853e+02, 2.9890139792963e+02, 2.991661985059169e+02, 2.994309386084919e+02, 2.996957092285156e+02, 2.999604798485394e+02, 3.002252504685631e+02, 3.004900205275306e+02, 3.007547911475544e+02, 3.010195617675781e+02, 3.012843323876019e+02, 3.015491030076256e+02, 3.018138730665931e+02, 3.0196939085433e+02, 3.019753112792969e+02, 3.019756469718802e+02, 3.019758300779956e+02, 3.0197573852552e+02, 3.019756774902344e+02, 3.019756774902344e+02, 3.019756774902344e+02, 3.019756774902344e+02, 3.019756774902344e+02, 3.019756774902344e+02, 3.019756774902344e+02, 3.019756774902344e+02, 3.019756774902344e+02, 3.019756774902344e+02, 3.019756774902344e+02, 3.019756774902344e+02, 3.019756774902344e+02, 3.019756774902344e+02, 3.019756774902344e+02, 3.019756774902344e+02, 3.019756774902344e+02, 3.019519349412163e+02, 3.018497313545087e+02, 3.017421875913212e+02, 3.016344297489982e+02, 3.015267028808594e+02, 3.014189760127205e+02, 3.013112181703976e+02, 3.012034607846805e+02, 3.010957029420989e+02, 3.009879150390625e+02, 3.008801881709236e+02, 3.007724303284713e+02, 3.006646424254349e+02, 3.005569151005607e+02, 3.004491882324219e+02, 3.003414308467049e+02, 3.002336734609879e+02, 3.001259456796371e+02, 3.000181882939201e+02, 2.999104309082031e+02, 2.998026735224861e+02, 2.996949466543473e+02, 2.995871883554183e+02, 2.994794309697014e+02, 2.993716735839844e+02, 2.992639161985261e+02, 2.991561588130678e+02, 2.990484310306822e+02, 2.989406736454826e+02, 2.988329162597656e+02, 2.987251588740486e+02, 2.986174014883317e+02, 2.985096431894027e+02, 2.984019163210052e+02, 2.982941589355469e+02, 2.981864015498299e+02, 2.980786441641129e+02, 2.97970885865184e+02, 2.97863128479467e+02, 2.977554016113281e+02, 2.976476442256111e+02, 2.975398868398942e+02, 2.974321285409652e+02, 2.973243711552482e+02, 2.972166137695312e+02]
-senExhTem.T=[2.931499938964844e+02, 2.985943298444254e+02, 2.98742767334518e+02, 2.987466125487715e+02, 2.987465820312339e+02, 2.987463989257812e+02, 2.987464599609214e+02, 2.987465515136719e+02, 2.987466125488281e+02, 2.987466125488281e+02, 2.9874658203125e+02, 2.9874658203125e+02, 2.9874658203125e+02, 2.9874658203125e+02, 2.987465515136719e+02, 2.987465515136719e+02, 2.987465515136719e+02, 2.987928771581049e+02, 2.991017758413223e+02, 2.994371031293932e+02, 2.997724609375e+02, 3.001083070271801e+02, 3.00444183634309e+02, 3.007799984945972e+02, 3.011157835490564e+02, 3.014515686035156e+02, 3.017873536579748e+02, 3.021231692298828e+02, 3.024589535727222e+02, 3.027947386271814e+02, 3.031305236816406e+02, 3.034663392536133e+02, 3.038021243081371e+02, 3.041379086509766e+02, 3.043351135066995e+02, 3.043426208496094e+02, 3.043430786122465e+02, 3.043432922361987e+02, 3.043432006837231e+02, 3.043431091308594e+02, 3.043431091308594e+02, 3.043431091308594e+02, 3.043431091308594e+02, 3.043431396484375e+02, 3.043431396484375e+02, 3.043431396484375e+02, 3.043431396484375e+02, 3.043431396484375e+02, 3.043431396484375e+02, 3.043431396484375e+02, 3.043431396484375e+02, 3.043431396484375e+02, 3.043431396484375e+02, 3.043431396484375e+02, 3.043431396484375e+02, 3.043431396484375e+02, 3.043669127150337e+02, 3.044692688898906e+02, 3.04577026275737e+02, 3.046849672239167e+02, 3.047928466796875e+02, 3.049007871706145e+02, 3.050087281187943e+02, 3.051166380921432e+02, 3.052246095579011e+02, 3.053325500488281e+02, 3.054404905397552e+02, 3.055484314879349e+02, 3.056563719787326e+02, 3.057642824094636e+02, 3.058721923828125e+02, 3.059801328737395e+02, 3.060880733641492e+02, 3.061959842530383e+02, 3.06303924743448e+02, 3.06411865234375e+02, 3.065197752077239e+02, 3.066277156986509e+02, 3.067356571040834e+02, 3.06843567077691e+02, 3.069515075683594e+02, 3.070594480592864e+02, 3.071673885502134e+02, 3.072753299556459e+02, 3.073832399292535e+02, 3.074911804199219e+02, 3.075991209108489e+02, 3.077070614012586e+02, 3.078150028072084e+02, 3.07922912780816e+02, 3.080308532714844e+02, 3.081387937624114e+02, 3.082467342528211e+02, 3.083546756587709e+02, 3.084625856323785e+02, 3.085705261230469e+02, 3.086784666139739e+02, 3.087864071043836e+02, 3.088943179932727e+02, 3.09002258483941e+02, 3.091101989746094e+02]
+senSupTem.T=[2.931499938964844e+02, 2.974394531332218e+02, 2.975563964847954e+02, 2.975594787597171e+02, 2.975594482421714e+02, 2.97559326171875e+02, 2.975593872070312e+02, 2.975594177246094e+02, 2.975594177246094e+02, 2.975594177246094e+02, 2.975594177246094e+02, 2.975594177246094e+02, 2.975594177246094e+02, 2.975594177246094e+02, 2.975594177246094e+02, 2.975594177246094e+02, 2.975594177246094e+02, 2.975958861996187e+02, 2.978392636941801e+02, 2.981034849954693e+02, 2.983677062988281e+02, 2.986322938133831e+02, 2.98896942362965e+02, 2.991614987991443e+02, 2.994260557961212e+02, 2.996906433105469e+02, 2.999552003074591e+02, 3.002197573043713e+02, 3.004843137405506e+02, 3.007489012550409e+02, 3.010134582519531e+02, 3.012780152488653e+02, 3.015425722457775e+02, 3.01807159199535e+02, 3.019625243993166e+02, 3.019684448242188e+02, 3.01968780516802e+02, 3.019689636229175e+02, 3.019688720704419e+02, 3.019688110351562e+02, 3.019688110351562e+02, 3.019688110351562e+02, 3.019688110351562e+02, 3.019688110351562e+02, 3.019688110351562e+02, 3.019688110351562e+02, 3.019688110351562e+02, 3.019688415527344e+02, 3.019688415527344e+02, 3.019688415527344e+02, 3.019688415527344e+02, 3.019688110354149e+02, 3.019688110351562e+02, 3.019688110351562e+02, 3.019688110351562e+02, 3.019688110351562e+02, 3.019450379688187e+02, 3.01842803864145e+02, 3.017351685484818e+02, 3.016273496708732e+02, 3.015195617675781e+02, 3.01411773864283e+02, 3.013039549866745e+02, 3.011961365659305e+02, 3.010882871706145e+02, 3.009804382324219e+02, 3.008726503291268e+02, 3.007648314515182e+02, 3.006569825133255e+02, 3.005491941530364e+02, 3.004413757324219e+02, 3.003335573118073e+02, 3.002257388911928e+02, 3.001179500736509e+02, 3.000101316530364e+02, 2.999023132324219e+02, 2.997944948115486e+02, 2.996866763906754e+02, 2.995788570560728e+02, 2.994710386354583e+02, 2.993632202148438e+02, 2.992554017942292e+02, 2.991475833730973e+02, 2.990397640384947e+02, 2.989319456178802e+02, 2.988241271972656e+02, 2.987163087763924e+02, 2.986084903555192e+02, 2.985006710209166e+02, 2.98392852600302e+02, 2.982850341796875e+02, 2.981772157588143e+02, 2.98069397337941e+02, 2.979615780033384e+02, 2.978537595827239e+02, 2.977459411621094e+02, 2.976381227412361e+02, 2.975303043203629e+02, 2.974224849857603e+02, 2.973146665651458e+02, 2.972068481445312e+02]
+senExhTem.T=[2.931499938964844e+02, 2.98597656260441e+02, 2.98746185303268e+02, 2.987500610350996e+02, 2.987500610351239e+02, 2.987499084472656e+02, 2.987499694824219e+02, 2.9875e+02, 2.9875e+02, 2.9875e+02, 2.9875e+02, 2.9875e+02, 2.9875e+02, 2.9875e+02, 2.9875e+02, 2.9875e+02, 2.9875e+02, 2.98796325644433e+02, 2.991054379505679e+02, 2.994409788616858e+02, 2.997765502929688e+02, 3.001125794881823e+02, 3.004486697184228e+02, 3.00784667683921e+02, 3.011206663614918e+02, 3.014566650390625e+02, 3.017926637166332e+02, 3.02128662394204e+02, 3.024646603597022e+02, 3.02800659037273e+02, 3.031366577148438e+02, 3.034726563924145e+02, 3.038086550699853e+02, 3.041446530354835e+02, 3.043419799617777e+02, 3.043495178222656e+02, 3.043499450673246e+02, 3.043501586912769e+02, 3.043500671388013e+02, 3.043500061032569e+02, 3.043499755859375e+02, 3.043499755859375e+02, 3.043500061035156e+02, 3.043500061035156e+02, 3.043500061035156e+02, 3.043500061035156e+02, 3.043500061035156e+02, 3.043500061035156e+02, 3.043500061035156e+02, 3.043500061035156e+02, 3.043500061035156e+02, 3.043500061035156e+02, 3.043500061035156e+02, 3.043500061035156e+02, 3.043500061035156e+02, 3.043500061035156e+02, 3.043738096874313e+02, 3.044762268977031e+02, 3.045840453185763e+02, 3.046920473020417e+02, 3.048000183105469e+02, 3.04907989319052e+02, 3.050159913025174e+02, 3.051239928284713e+02, 3.052320253296442e+02, 3.053400268554688e+02, 3.054480283812933e+02, 3.055560303650174e+02, 3.05664031890842e+02, 3.057720338743073e+02, 3.058800048828125e+02, 3.059880064086371e+02, 3.060960079344617e+02, 3.062040103755678e+02, 3.063120119016511e+02, 3.064199829101562e+02, 3.065279844362395e+02, 3.066359859618054e+02, 3.067439884034289e+02, 3.068519899292535e+02, 3.069599914550781e+02, 3.070679929809027e+02, 3.071759945067273e+02, 3.072839969483508e+02, 3.073919984741754e+02, 3.075e+02, 3.076080015258246e+02, 3.077160030516492e+02, 3.078240054932727e+02, 3.079320070190973e+02, 3.080400085449219e+02, 3.081480100707465e+02, 3.082560115965711e+02, 3.083640140376772e+02, 3.084720155637605e+02, 3.085799865722656e+02, 3.086879880983489e+02, 3.087959896244322e+02, 3.089039920655383e+02, 3.090119935913629e+02, 3.091199951171875e+02]
 sou_2.T=[2.931499938964844e+02, 2.931499938964844e+02]
-whe.port_a1.m_flow=[5e+00, 5e+00]
-whe.port_a2.m_flow=[5e+00, 5e+00]
-whe.uSpe=[6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 7.029999976159558e-01, 7.09750002384115e-01, 7.164999785423986e-01, 7.232499833110633e-01, 7.300000190734863e-01, 7.367499952317699e-01, 7.434999999999292e-01, 7.502499761582129e-01, 7.57000040531017e-01, 7.637500166893005e-01, 7.704999928475842e-01, 7.772499976157435e-01, 7.839999737740271e-01, 7.907500381468311e-01, 7.975000143051147e-01, 8.042499904633983e-01, 8.109999666216818e-01, 8.177500000007276e-01, 8.245000357626453e-01, 8.31250011920929e-01, 8.379999880792126e-01, 8.44749964237496e-01, 8.514999976165418e-01, 8.582500333784596e-01, 8.650000095367432e-01, 8.717499856950268e-01, 8.784999618533103e-01, 8.85249995232356e-01, 8.920000309942737e-01, 8.987500071525574e-01, 9.05499983310841e-01, 9.122499594691245e-01, 9.190000524518045e-01, 9.257500286100879e-01, 9.325000047683716e-01, 9.392499809266552e-01, 9.459999570849387e-01, 9.527500500676187e-01, 9.595000262259021e-01, 9.662500023841858e-01, 9.729999785424693e-01, 9.797499547007529e-01, 9.865000476834329e-01, 9.932500238417163e-01, 1e+00]
-whe.eps=[5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.596562623977661e-01, 5.620548037586715e-01, 5.674514816255318e-01, 5.728481366186393e-01, 5.782448740901445e-01, 5.83641529083252e-01, 5.89038243680499e-01, 5.944349215478646e-01, 5.998315765409721e-01, 6.052283140124772e-01, 6.106249690055847e-01, 6.160216239986922e-01, 6.214183614701974e-01, 6.268150164633048e-01, 6.322116943306705e-01, 6.376084089279175e-01, 6.43005063921025e-01, 6.484017785177666e-01, 6.537984792593906e-01, 6.591951342530032e-01, 6.645918488502502e-01, 6.699885038433577e-01, 6.753851588364651e-01, 6.807819191817234e-01, 6.861785741748309e-01, 6.915752291679382e-01, 6.969719437651852e-01, 7.023685987587979e-01, 7.077652995004219e-01, 7.131620140971635e-01, 7.18558669090271e-01, 7.23955383687518e-01, 7.293520386811306e-01, 7.347487394227546e-01, 7.401454540194963e-01, 7.455421090126038e-01, 7.509387640057112e-01, 7.563354786024529e-01, 7.617321793440769e-01, 7.671288343376895e-01, 7.725255489349365e-01, 7.779222039280439e-01, 7.833188589211514e-01, 7.887156192664097e-01, 7.94112274259517e-01, 7.995089888572693e-01]
+wheUseDefCur.port_a1.m_flow=[5e+00, 5e+00]
+wheUseDefCur.port_a2.m_flow=[5e+00, 5e+00]
+wheUseDefCur.uSpe=[6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 7.029999976159558e-01, 7.09750002384115e-01, 7.164999785423986e-01, 7.232499833110633e-01, 7.300000190734863e-01, 7.367499952317699e-01, 7.434999999999292e-01, 7.502499761582129e-01, 7.57000040531017e-01, 7.637500166893005e-01, 7.704999928475842e-01, 7.772499976157435e-01, 7.839999737740271e-01, 7.907500381468311e-01, 7.975000143051147e-01, 8.042499904633983e-01, 8.109999666216818e-01, 8.177500000007276e-01, 8.245000357626453e-01, 8.31250011920929e-01, 8.379999880792126e-01, 8.44749964237496e-01, 8.514999976165418e-01, 8.582500333784596e-01, 8.650000095367432e-01, 8.717499856950268e-01, 8.784999618533103e-01, 8.85249995232356e-01, 8.920000309942737e-01, 8.987500071525574e-01, 9.05499983310841e-01, 9.122499594691245e-01, 9.190000524518045e-01, 9.257500286100879e-01, 9.325000047683716e-01, 9.392499809266552e-01, 9.459999570849387e-01, 9.527500500676187e-01, 9.595000262259021e-01, 9.662500023841858e-01, 9.729999785424693e-01, 9.797499547007529e-01, 9.865000476834329e-01, 9.932500238417163e-01, 1e+00]
+wheUseDefCur.eps=[5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.623999742510077e-01, 5.677999899865652e-01, 5.731999828339694e-01, 5.785999985697795e-01, 5.839999914169312e-01, 5.893999842645881e-01, 5.947999999998929e-01, 6.001999928475498e-01, 6.056000085828546e-01, 6.110000014305115e-01, 6.163999942781684e-01, 6.218000100134732e-01, 6.272000028608774e-01, 6.326000185964349e-01, 6.380000114440918e-01, 6.434000042912433e-01, 6.48799997138395e-01, 6.542000357623584e-01, 6.596000286100152e-01, 6.650000214576721e-01, 6.704000143048238e-01, 6.758000071519753e-01, 6.812000457759387e-01, 6.866000386235956e-01, 6.919999718666077e-01, 6.973999647142646e-01, 7.027999575619214e-01, 7.081999961858848e-01, 7.135999890330363e-01, 7.18999981880188e-01, 7.243999747278449e-01, 7.297999675755017e-01, 7.352000061994651e-01, 7.405999990466167e-01, 7.459999918937683e-01, 7.513999847414252e-01, 7.56799977589082e-01, 7.622000162120349e-01, 7.676000090596917e-01, 7.730000019073486e-01, 7.783999947550054e-01, 7.837999876026623e-01, 7.892000262256152e-01, 7.94600019073272e-01, 8.00000011920929e-01]
+wheUseDefCur.P=[7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7.030000190733247e+01, 7.097499904633376e+01, 7.165000095366622e+01, 7.232499809266753e+01, 7.3e+01, 7.367500190733246e+01, 7.434999904633376e+01, 7.502500095366624e+01, 7.569999809266754e+01, 7.6375e+01, 7.705000190733247e+01, 7.772499904633378e+01, 7.840000095366624e+01, 7.907499809266753e+01, 7.975e+01, 8.042500190733246e+01, 8.10999961852704e+01, 8.17750038147296e+01, 8.244999809266753e+01, 8.3125e+01, 8.380000190733247e+01, 8.44749961852704e+01, 8.51500038147296e+01, 8.582499809266754e+01, 8.65e+01, 8.717500190733247e+01, 8.78499961852704e+01, 8.85250038147296e+01, 8.919999809266753e+01, 8.9875e+01, 9.055000190733247e+01, 9.12249961852704e+01, 9.19000038147296e+01, 9.257499809266753e+01, 9.325e+01, 9.392500190733247e+01, 9.45999961852704e+01, 9.52750038147296e+01, 9.594999809266753e+01, 9.6625e+01, 9.730000190733246e+01, 9.79749961852704e+01, 9.86500038147296e+01, 9.932499809266753e+01, 1e+02]
+wheDefCur.P=[7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.707760526040832e+01, 7.76318745537873e+01, 7.818501234887661e+01, 7.873689363449135e+01, 7.928739929199219e+01, 7.983640196336229e+01, 8.038376663742224e+01, 8.092935134476362e+01, 8.147303101001151e+01, 8.20146484375e+01, 8.255407623541956e+01, 8.309114883051618e+01, 8.362572434020771e+01, 8.415764707824735e+01, 8.468675994873047e+01, 8.521113498221922e+01, 8.572463053687665e+01, 8.622763230105473e+01, 8.672117697536649e+01, 8.720632171630859e+01, 8.768415751960265e+01, 8.81557753858856e+01, 8.862228550857391e+01, 8.908480150116631e+01, 8.954447174072266e+01, 9.000243300107802e+01, 9.045984494541517e+01, 9.091787112408261e+01, 9.137769395857916e+01, 9.184049987792969e+01, 9.230747906334781e+01, 9.277985984017414e+01, 9.325886699608766e+01, 9.374574363222463e+01, 9.424174499511719e+01, 9.474816044972476e+01, 9.526628698354577e+01, 9.579747192256049e+01, 9.634306429519107e+01, 9.690444946289062e+01, 9.748306938025544e+01, 9.808039650755971e+01, 9.869793914910043e+01, 9.933726612195029e+01, 1e+02]

From 8a14a338255c88fbabfb394f82b511244c149d27 Mon Sep 17 00:00:00 2001
From: SenHuang19 <jhy1987@gmail.com>
Date: Mon, 13 May 2024 14:54:38 -0400
Subject: [PATCH 06/27] model doc update and example improves

---
 .../ThermalWheels/Latent/BypassDampers.mo       |  6 +++---
 .../Latent/Examples/SpaceCooling.mo             | 16 ++++++++++------
 .../ThermalWheels/Latent/SpeedControlled.mo     |  4 ++--
 .../ThermalWheels/Sensible/BypassDampers.mo     |  6 +++---
 .../Sensible/Examples/SpaceCooling.mo           | 17 ++++++++++-------
 .../ThermalWheels/Sensible/SpeedControlled.mo   |  4 ++--
 .../Latent/Examples/SpaceCooling.mos            |  8 +-------
 .../Sensible/Examples/SpaceCooling.mos          |  8 +-------
 8 files changed, 32 insertions(+), 37 deletions(-)

diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo
index 7daad2bcf48..d54c4b505bf 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo
@@ -4,7 +4,7 @@ model BypassDampers
   extends
     Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BaseClasses.PartialWheel;
   parameter Modelica.Units.SI.PressureDifference dpDamper_nominal(displayUnit="Pa") = 20
-    "Nominal pressure drop of supply air dampers"
+    "Nominal pressure drop of dampers"
     annotation (Dialog(group="Nominal condition"));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput uBypDamPos(
     final unit="1",
@@ -84,9 +84,9 @@ equation
     color={0,0,127}));
   connect(PEle.y, P) annotation (Line(points={{-139,-80},{80,-80},{80,-90},{120,-90}},
     color={0,0,127}));
-  connect(PEle.u, uRot) annotation (Line(points={{-162,-80},{-168,-80},{-168,0},{-200,0}}, 
+  connect(PEle.u, uRot) annotation (Line(points={{-162,-80},{-168,-80},{-168,0},{-200,0}},
     color={255,0,255}));
-  connect(damSup.port_a, port_a1) annotation (Line(points={{-100,36},{-130,36},{-130,80},{-180,80}}, 
+  connect(damSup.port_a, port_a1) annotation (Line(points={{-100,36},{-130,36},{-130,80},{-180,80}},
     color={0,127,255}));
   connect(damExh.port_b, hex.port_a2)
     annotation (Line(points={{40,-34},{40,-6},{10,-6}}, color={0,127,255}));
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mo
index 2a50371b161..8e52d8bcc4e 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mo
@@ -68,6 +68,10 @@ model SpaceCooling "Space cooling system"
     annotation (Placement(transformation(extent={{20,70},{40,90}})));
   Buildings.Fluid.Movers.FlowControlled_m_flow fan(
     redeclare package Medium = MediumA,
+    per(etaHydMet=Buildings.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.NotProvided,
+        etaMotMet=Buildings.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.NotProvided),
+
+    nominalValuesDefineDefaultPressureCurve=true,
     m_flow_nominal=mA_flow_nominal,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
     "Supply air fan"
@@ -158,9 +162,9 @@ model SpaceCooling "Space cooling system"
     annotation (Placement(transformation(extent={{-172,10},{-152,30}})));
   Modelica.Blocks.Sources.Ramp bypDamPos(
     height=0.5,
-    duration=86400/2,
+    duration=86400/4,
     offset=0,
-    startTime=15552000 + 6*3600)
+    startTime=15552000 + 12*3600)
     "Bypass damper position"
     annotation (Placement(transformation(extent={{-170,-60},{-150,-40}})));
 equation
@@ -173,7 +177,7 @@ equation
       color={191,0,0},
       smooth=Smooth.None));
   connect(fan.port_b, vol.ports[1]) annotation (Line(
-      points={{60,-20},{69,-20},{69,20}},
+      points={{62,-20},{69,-20},{69,20}},
       color={0,127,255},
       smooth=Smooth.None));
   connect(vol.ports[2],whe. port_a2) annotation (Line(
@@ -279,12 +283,12 @@ The major input signals for the heat recovery device are configured as follows:
 </p>
 <ul>
 <li>
-The operating signal <i>uRot</i> changes from <code>false</code> to <code>true</code> at 6:00
-and from <code>false</code> to <code>true</code> at 18:00.
+The operating signal <i>uRot</i> changes from <code>false</code> to <code>true</code> at 6:00 (15552000+6*3600 seconds)
+and from <code>false</code> to <code>true</code> at 18:00 (15552000+18*3600 seconds).
 </li>
 <li>
 The bypass damper position <i>uBypDamPos</i> changes from <i>0</i> to <i>0.5</i> 
-during the period from 200 seconds to 360 seconds.
+during the period from 12:00 to 18:00.
 </li>
 </ul>
 <p>
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/SpeedControlled.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/SpeedControlled.mo
index d62ef6a769d..18170afcd9a 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/SpeedControlled.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/SpeedControlled.mo
@@ -7,7 +7,7 @@ model SpeedControlled
     "Set to true for using the default motor efficiency curve, or false for using the user-defined motor efficiency curve"
     annotation (Dialog(group="Efficiency"));
   parameter Real table[:,:]=[0.8,1]
-    "Table of user-defined motor efficiency curve:(first column:the wheel speed ratio, second column:motor power efficiency)"
+    "Table of user-defined motor efficiency curve:(first column:the wheel speed ratio, second column:the percent full-load efficiency)"
     annotation (Dialog(group="Efficiency", enable = not defaultMotorEfficiencyCurve));
   final parameter
     Buildings.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters_yMot
@@ -84,7 +84,7 @@ P = P_nominal * uSpe / eta,
 <p>
 where <code>P_nominal</code> is the nominal wheel power consumption,
 <code>uSpe</code> is the wheel speed ratio.
-The <code>eta</code> is the motor percent full-Load efficiency, i.e.,
+The <code>eta</code> is the motor percent full-load efficiency, i.e.,
 the ratio of the motor efficiency to that when the <code>uSpe</code> is <i>1</i>.   
 There are two ways to define <code>eta</code>:
 </p>
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo
index cf3a0329705..3508eab3cba 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo
@@ -4,7 +4,7 @@ model BypassDampers
   extends
     Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.BaseClasses.PartialWheel;
   parameter Modelica.Units.SI.PressureDifference dpDamper_nominal(displayUnit="Pa") = 20
-    "Nominal pressure drop of supply air dampers"
+    "Nominal pressure drop of dampers"
     annotation (Dialog(group="Nominal condition"));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput uBypDamPos(
     final unit="1",
@@ -96,9 +96,9 @@ equation
   connect(damSup.port_a, port_a1)
     annotation (Line(points={{-60,40},{-100,40},{-100,80},{-180,80}},
     color={0,127,255}));
-  connect(uRot, PEle.u) annotation (Line(points={{-200,0},{-170,0},{-170,-80},{-162,-80}}, 
+  connect(uRot, PEle.u) annotation (Line(points={{-200,0},{-170,0},{-170,-80},{-162,-80}},
     color={255,0,255}));
-  connect(PEle.y, P) annotation (Line(points={{-139,-80},{80,-80},{80,-90},{120,-90}}, 
+  connect(PEle.y, P) annotation (Line(points={{-139,-80},{80,-80},{80,-90},{120,-90}},
     color={0,0,127}));
   connect(bypDamExh.port_b, port_b2)
     annotation (Line(points={{-20,-60},{-180,-60}}, color={0,127,255}));
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo
index 623dacf3309..08d818d3178 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo
@@ -68,6 +68,9 @@ model SpaceCooling "Space cooling system"
     annotation (Placement(transformation(extent={{20,70},{40,90}})));
   Buildings.Fluid.Movers.FlowControlled_m_flow fan(
     redeclare package Medium = MediumA,
+    per(etaHydMet=Buildings.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.NotProvided,
+        etaMotMet=Buildings.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.NotProvided),
+    nominalValuesDefineDefaultPressureCurve=true,
     m_flow_nominal=mA_flow_nominal,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
     "Supply air fan"
@@ -108,8 +111,8 @@ model SpaceCooling "Space cooling system"
     use_m_flow_in=true,
     T=TWSup_nominal) "Source for water flow rate"
     annotation (Placement(transformation(extent={{-20,-110},{0,-90}})));
-  Buildings.Fluid.Sources.Boundary_pT sinWat(nPorts=1, redeclare package Medium =
-        MediumW) "Sink for water circuit"
+  Buildings.Fluid.Sources.Boundary_pT sinWat(nPorts=1, redeclare package Medium
+      = MediumW) "Sink for water circuit"
     annotation (Placement(transformation(extent={{-80,-76},{-60,-56}})));
   Buildings.BoundaryConditions.WeatherData.ReaderTMY3 weaDat(
     pAtmSou=Buildings.BoundaryConditions.Types.DataSource.Parameter,
@@ -156,9 +159,9 @@ model SpaceCooling "Space cooling system"
     annotation (Placement(transformation(extent={{-172,10},{-152,30}})));
   Modelica.Blocks.Sources.Ramp bypDamPos(
     height=0.5,
-    duration=86400/2,
+    duration=86400/4,
     offset=0,
-    startTime=15552000 + 6*3600)
+    startTime=15552000 + 12*3600)
     "Bypass damper position"
     annotation (Placement(transformation(extent={{-170,-60},{-150,-40}})));
 equation
@@ -276,12 +279,12 @@ The major input signals for the heat recovery device are configured as follows:
 </p>
 <ul>
 <li>
-The operating signal <i>uRot</i> changes from <code>false</code> to <code>true</code> at 6:00
-and from <code>false</code> to <code>true</code> at 18:00.
+The operating signal <i>uRot</i> changes from <code>false</code> to <code>true</code> at 6:00 (15552000+6*3600 seconds)
+and from <code>false</code> to <code>true</code> at 18:00 (15552000+18*3600 seconds).
 </li>
 <li>
 The bypass damper position <i>uBypDamPos</i> changes from <i>0</i> to <i>0.5</i> 
-during the period from 200 seconds to 360 seconds.
+during the period from 12:00 to 18:00.
 </li>
 </ul>
 <p>
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/SpeedControlled.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/SpeedControlled.mo
index 358fb5bc35c..ce22dd9316c 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/SpeedControlled.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/SpeedControlled.mo
@@ -7,7 +7,7 @@ model SpeedControlled
     "Set to true for using the default motor efficiency curve, or false for using the user-defined motor efficiency curve"
     annotation (Dialog(group="Efficiency"));
   parameter Real table[:,:]=[0.8,1]
-    "Table of user-defined motor efficiency curve:(first column:the wheel speed ratio, second column:motor power efficiency)"
+    "Table of user-defined motor efficiency curve:(first column:the wheel speed ratio, second column:the percent full-load efficiency)"
     annotation (Dialog(group="Efficiency", enable = not defaultMotorEfficiencyCurve));
   final parameter
     Buildings.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters_yMot
@@ -85,7 +85,7 @@ P = P_nominal * uSpe / eta,
 <p>
 where <code>P_nominal</code> is the nominal wheel power consumption,
 <code>uSpe</code> is the wheel speed ratio.
-The <code>eta</code> is the motor percent full-Load efficiency, i.e.,
+The <code>eta</code> is the motor percent full-load efficiency, i.e.,
 the ratio of the motor efficiency to that when the <code>uSpe</code> is <i>1</i>.   
 There are two ways to define <code>eta</code>:
 </p>
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mos
index ff1f8fa6990..f75e02aeac3 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mos
@@ -1,17 +1,11 @@
 simulateModel("Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.Examples.SpaceCooling", startTime=15552000, tolerance=1e-6, stopTime=15638400, method="CVode", resultFile="SpaceCooling");
-createPlot(id = 1,
- position = {15, 10, 751, 680},
- y = {"vol.T_start", "vol.T", "TOut.T", "cooCoi.sta_a2.T", "cooCoi.sta_b2.T"},
- range = {0.0, 4000.0, 32.0, 16.0},
- autoscale = true,
- autoerase = true,
+createPlot(id = 1,position = {15, 10, 751, 680}, y = {"vol.T_start", "vol.T", "TOut.T", "cooCoi.sta_a2.T", "cooCoi.sta_b2.T"},range = {0.0, 4000.0, 32.0, 16.0},autoscale = true,autoerase = true,
  autoreplot = true,
  description = false,
  subPlot=101,
  grid = true,
  color = true,
  online = false,
- filename = "SpaceCoolingSystem3.mat",
  leftTitleType = 1,
  bottomTitleType = 1,
  colors = {{0, 0, 255}, {255, 0, 0}, {0, 128, 0}, {255, 0, 255}, {0, 0, 0}},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mos
index 6b7aac53d2c..29333dbc6e5 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mos
@@ -1,17 +1,11 @@
 simulateModel("Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.Examples.SpaceCooling", startTime=15552000, tolerance=1e-6, stopTime=15638400, method="CVode", resultFile="SpaceCooling");
-createPlot(id = 1,
- position = {15, 10, 751, 680},
- y = {"vol.T_start", "vol.T", "TOut.T", "cooCoi.sta_a2.T", "cooCoi.sta_b2.T"},
- range = {0.0, 4000.0, 32.0, 16.0},
- autoscale = true,
- autoerase = true,
+createPlot(id = 1,position = {15, 10, 751, 680}, y = {"vol.T_start", "vol.T", "TOut.T", "cooCoi.sta_a2.T", "cooCoi.sta_b2.T"},range = {0.0, 4000.0, 32.0, 16.0},autoscale = true,autoerase = true,
  autoreplot = true,
  description = false,
  subPlot=101,
  grid = true,
  color = true,
  online = false,
- filename = "SpaceCoolingSystem3.mat",
  leftTitleType = 1,
  bottomTitleType = 1,
  colors = {{0, 0, 255}, {255, 0, 0}, {0, 128, 0}, {255, 0, 255}, {0, 0, 0}},

From cfdf906d3f22a4b08aed7412abddf243984014dc Mon Sep 17 00:00:00 2001
From: SenHuang19 <jhy1987@gmail.com>
Date: Sun, 9 Jun 2024 22:30:16 -0400
Subject: [PATCH 07/27] update the power calculation

---
 .../effectivenessParameters.mo                |  27 ++++
 .../BaseClasses/Characteristics/package.mo    |   9 ++
 .../BaseClasses/Characteristics/package.order |   1 +
 .../BaseClasses/Data/ASHRAE.mo                |  32 +++++
 .../BaseClasses/Data/Generic.mo               |  99 +++++++++++++++
 .../BaseClasses/Data/package.mo               |  10 ++
 .../BaseClasses/Data/package.order            |   2 +
 .../VariableSpeedWheel/BaseClasses/package.mo |  18 +++
 .../BaseClasses/package.order                 |   2 +
 .../BaseClasses/VariableSpeedWheel/Latent.mo  |  42 +++++++
 .../VariableSpeedWheel/Sensible.mo            |  97 ++++++++++++++
 .../Validation/VariableSpeedWheel.mo          |  86 +++++++++++++
 .../VariableSpeedWheel/Validation/package.mo  |  20 +++
 .../Validation/package.order                  |   1 +
 .../BaseClasses/VariableSpeedWheel/package.mo |  12 ++
 .../VariableSpeedWheel/package.order          |   4 +
 Buildings/Fluid/BaseClasses/package.order     |   1 +
 .../Latent/BaseClasses/Effectiveness.mo       |  16 +--
 .../Latent/BaseClasses/PartialWheel.mo        |  29 ++---
 .../BaseClasses/Validation/Effectiveness.mo   |   9 --
 .../ThermalWheels/Latent/BypassDampers.mo     |  73 +++++++----
 .../Latent/Examples/SpaceCooling.mo           |  50 ++++----
 .../ThermalWheels/Latent/SpeedControlled.mo   | 119 +++++++-----------
 .../Latent/Validation/SpeedControlled.mo      |  29 +++--
 .../Sensible/BaseClasses/Effectiveness.mo     |   9 +-
 .../Sensible/BaseClasses/PartialWheel.mo      |  20 +--
 .../BaseClasses/Validation/Effectiveness.mo   |   9 --
 .../ThermalWheels/Sensible/BypassDampers.mo   |  28 +++--
 .../Sensible/Examples/SpaceCooling.mo         |  37 +++---
 .../ThermalWheels/Sensible/SpeedControlled.mo | 102 +++++----------
 .../Sensible/Validation/SpeedControlled.mo    |  44 ++++---
 .../Validation/VariableSpeedWheel.mos         |   4 +
 .../BaseClasses/Validation/Effectiveness.mos  |   7 +-
 .../Latent/Examples/SpaceCooling.mos          |   3 +-
 .../BaseClasses/Validation/Effectiveness.mos  |   7 +-
 .../Sensible/Examples/SpaceCooling.mos        |   4 +-
 36 files changed, 735 insertions(+), 327 deletions(-)
 create mode 100644 Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Characteristics/effectivenessParameters.mo
 create mode 100644 Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Characteristics/package.mo
 create mode 100644 Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Characteristics/package.order
 create mode 100644 Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Data/ASHRAE.mo
 create mode 100644 Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Data/Generic.mo
 create mode 100644 Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Data/package.mo
 create mode 100644 Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Data/package.order
 create mode 100644 Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/package.mo
 create mode 100644 Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/package.order
 create mode 100644 Buildings/Fluid/BaseClasses/VariableSpeedWheel/Latent.mo
 create mode 100644 Buildings/Fluid/BaseClasses/VariableSpeedWheel/Sensible.mo
 create mode 100644 Buildings/Fluid/BaseClasses/VariableSpeedWheel/Validation/VariableSpeedWheel.mo
 create mode 100644 Buildings/Fluid/BaseClasses/VariableSpeedWheel/Validation/package.mo
 create mode 100644 Buildings/Fluid/BaseClasses/VariableSpeedWheel/Validation/package.order
 create mode 100644 Buildings/Fluid/BaseClasses/VariableSpeedWheel/package.mo
 create mode 100644 Buildings/Fluid/BaseClasses/VariableSpeedWheel/package.order
 create mode 100644 Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/VariableSpeedWheel/Validation/VariableSpeedWheel.mos

diff --git a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Characteristics/effectivenessParameters.mo b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Characteristics/effectivenessParameters.mo
new file mode 100644
index 00000000000..439c517fbf4
--- /dev/null
+++ b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Characteristics/effectivenessParameters.mo
@@ -0,0 +1,27 @@
+within Buildings.Fluid.BaseClasses.VariableSpeedWheel.BaseClasses.Characteristics;
+record effectivenessParameters
+  "Record for heat exchange effectiveness correction vs. wheel speed ratio"
+  extends Modelica.Icons.Record;
+  parameter Real uSpe[:](each min=0)
+    "Wheel speed ratio";
+  parameter Real epsCor[:]
+    "correction of the heat exchange effectiveness under a geiven speed ratio";
+  annotation (Documentation(info="<html>
+<p>
+Data record for performance data that describe wheel speed ratio versus
+heat exchange effectiveness corrections.
+The wheel speed ratio <code>uSpe</code> and the heat exchange effectiveness corrections 
+<code>epsCor</code> must be increasing, i.e.,<code>uSpe[i] &lt; uSpe[i+1]</code>,
+<code>epsCor[i] &lt; epsCor[i+1]</code>.
+Both vectors, <code>uSpe</code> and <code>uSpe</code>
+must have the same size.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+May 28, 2024, by Sen Huang:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end effectivenessParameters;
diff --git a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Characteristics/package.mo b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Characteristics/package.mo
new file mode 100644
index 00000000000..5944588fb46
--- /dev/null
+++ b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Characteristics/package.mo
@@ -0,0 +1,9 @@
+within Buildings.Fluid.BaseClasses.VariableSpeedWheel.BaseClasses;
+package Characteristics "Functions for wheel characteristics"
+
+annotation (Documentation(info="<html>
+<p>
+This package implements performance curves for wheels.
+</p>
+</html>"));
+end Characteristics;
diff --git a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Characteristics/package.order b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Characteristics/package.order
new file mode 100644
index 00000000000..cde6f8a1741
--- /dev/null
+++ b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Characteristics/package.order
@@ -0,0 +1 @@
+effectivenessParameters
diff --git a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Data/ASHRAE.mo b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Data/ASHRAE.mo
new file mode 100644
index 00000000000..9e665966e95
--- /dev/null
+++ b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Data/ASHRAE.mo
@@ -0,0 +1,32 @@
+within Buildings.Fluid.BaseClasses.VariableSpeedWheel.BaseClasses.Data;
+record ASHRAE =
+  Buildings.Fluid.BaseClasses.VariableSpeedWheel.BaseClasses.Data.Generic (
+    senHeatExchangeEffectiveness(uSpe={0.1,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,1},
+        epsCor={0.40,0.71,0.83,0.90,0.93,0.96,0.97,0.98,0.99,1}),
+    latHeatExchangeEffectiveness(uSpe={0.1,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,1},
+        epsCor={0.26,0.26,0.37,0.58,0.72,0.81,0.86,0.90,0.96,1}))
+      "Default data record for wheels"
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+        coordinateSystem(preserveAspectRatio=false)),
+  Documentation(revisions="<html>
+<ul>
+<li>
+May 28, 2024, by Sen Huang:<br/>
+First implementation.
+</li>
+</ul>
+</html>", info="<html>
+<p>
+Performance dataset for the variable-speed wheel model.
+</p>
+<p>
+It is developed based on Figure 7 in ASHRAE (2024).
+Note that nearest-neighbor extrapolations are used to make sure the dataset covers lower values 
+of speed ratio, i.e. <code> &lt;= 0.2</code>.
+</p>
+<h4>References</h4>
+<p>
+ASHRAE (2024).
+<i>Chapter 26, Air-to-Air Energy Recovery Equipment, ASHRAE Handbook—HVAC Systems and Equipment.</i>
+</p>
+</html>"));
diff --git a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Data/Generic.mo b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Data/Generic.mo
new file mode 100644
index 00000000000..8b45103a3ba
--- /dev/null
+++ b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Data/Generic.mo
@@ -0,0 +1,99 @@
+within Buildings.Fluid.BaseClasses.VariableSpeedWheel.BaseClasses.Data;
+record Generic "Generic data record for wheels"
+  extends Modelica.Icons.Record;
+  import cha = Buildings.Fluid.BaseClasses.VariableSpeedWheel.BaseClasses.Characteristics;
+  parameter Real P_nominal(final unit="W")=100
+    "Power consumption at the design condition";
+  parameter
+    cha.effectivenessParameters
+    senHeatExchangeEffectiveness(
+      uSpe={0},
+      epsCor={0.7})
+    "Sensible heat exchange effectiveness vs. wheel speed ratio"
+    annotation (Dialog(group="Heat exchange effectiveness computation"));
+  parameter
+    cha.effectivenessParameters
+    latHeatExchangeEffectiveness(
+      uSpe={0},
+      epsCor={0.7})
+    "Latent heat exchange effectiveness vs. wheel speed ratio"
+    annotation (Dialog(group="Heat exchange effectiveness computation",
+                enable=haveLatentHeatExchange));
+  parameter
+    Buildings.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters_yMot
+    motorEfficiency_uSpe(y={0}, eta={0.7})
+    "Motor efficiency vs. wheel speed ratio"
+    annotation (Dialog(group="Power computation", enable=useDefaultMotorEfficiencyCurve ==
+      false));
+  final parameter
+    Buildings.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters_yMot
+    motorEfficiency_default=
+    Buildings.Fluid.Movers.BaseClasses.Characteristics.motorEfficiencyCurve(
+         P_nominal=P_nominal,
+         eta_max=1)
+    "Motor efficiency vs. default wheel speed ratio"
+    annotation (Dialog(group="Power computation", enable=useDefaultMotorEfficiencyCurve ==
+      true));
+  parameter Boolean haveLatentHeatExchange = true
+   "= true, if latent heat exchange occurs";
+  parameter Boolean useDefaultMotorEfficiencyCurve = true
+   "= true, if default motor efficiency curve is adopted";
+
+  annotation (Documentation(revisions="<html>
+<ul>
+<li>
+May 28, 2024, by Sen Huang:<br/>
+First implementation.
+</li>
+</ul>
+</html>", info="<html>
+<p>
+Record containing power and heat exchange parameters for wheels.
+</p>
+<p>
+It is used as a template for performance data
+for the variable-speed wheel models in
+<a href=\"modelica://Buildings.Fluid.BaseClasses.VariableSpeedWheel\">
+Buildings.Fluid.BaseClasses.VariableSpeedWheel</a>.
+</p>
+<p>
+The record contains four curves:
+</p>
+<ul>
+<li>
+wheel speed ratio versus motor percent full-load 
+efficiency
+</li>
+<li>
+wheel speed ratio versus default motor percent full-load 
+efficiency (see <a href=
+\"modelica://Buildings.Fluid.Movers.BaseClasses.Characteristics.motorEfficiencyCurve\">
+Buildings.Fluid.Movers.BaseClasses.Characteristics.motorEfficiencyCurve</a>.)
+</li>
+<li>
+wheel speed ratio versus sensible heat exchange effectiveness 
+corrections
+</li>
+<li>
+wheel speed ratio versus latent heat exchange effectiveness 
+corrections
+</li>
+</ul>
+<p>
+Note that 
+</p>
+<ul>
+<li>
+When <code>haveLatentHeatExchange</code> is false,
+the curve of wheel speed ratio versus latent heat exchange effectiveness 
+corrections is disabled.
+</li>
+<li>
+When <code>useDefaultMotorEfficiencyCurve</code> is true,
+the curve of wheel speed ratio versus motor percent full-load 
+efficiency is disabled while the curve of wheel speed ratio 
+versus default motor percent full-load efficiency is enabled 
+</li>
+</ul>
+</html>"));
+end Generic;
diff --git a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Data/package.mo b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Data/package.mo
new file mode 100644
index 00000000000..2df406e64a9
--- /dev/null
+++ b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Data/package.mo
@@ -0,0 +1,10 @@
+within Buildings.Fluid.BaseClasses.VariableSpeedWheel.BaseClasses;
+package Data "Performance data for desiccant dehumidifier"
+extends Modelica.Icons.MaterialPropertiesPackage;
+
+annotation (Documentation(info="<html>
+<p>
+This package contains data for wheels.
+</p>
+</html>"));
+end Data;
diff --git a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Data/package.order b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Data/package.order
new file mode 100644
index 00000000000..acd917528b4
--- /dev/null
+++ b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Data/package.order
@@ -0,0 +1,2 @@
+Generic
+ASHRAE
diff --git a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/package.mo b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/package.mo
new file mode 100644
index 00000000000..514f4094779
--- /dev/null
+++ b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/package.mo
@@ -0,0 +1,18 @@
+within Buildings.Fluid.BaseClasses.VariableSpeedWheel;
+package BaseClasses "Package with base classes for the wheel model"
+extends Modelica.Icons.BasesPackage;
+
+annotation (Documentation(revisions="<html>
+<ul>
+<li>
+May 28, 2024, by Sen Huang:<br/>
+First implementation.
+</li>
+</ul>
+</html>", info="<html>
+<p>
+This package contains base classes that are used to construct the models in
+<a href=\"modelica://Buildings.Fluid.BaseClasses.VariableSpeedWheel\">Buildings.Fluid.BaseClasses.VariableSpeedWheel</a>.
+</p>
+</html>"));
+end BaseClasses;
diff --git a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/package.order b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/package.order
new file mode 100644
index 00000000000..73006f323ed
--- /dev/null
+++ b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/package.order
@@ -0,0 +1,2 @@
+Data
+Characteristics
diff --git a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/Latent.mo b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/Latent.mo
new file mode 100644
index 00000000000..35074676a4f
--- /dev/null
+++ b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/Latent.mo
@@ -0,0 +1,42 @@
+within Buildings.Fluid.BaseClasses.VariableSpeedWheel;
+model Latent "Enthalpy wheels"
+  extends Sensible;
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput epsLatCor(
+    final unit="1")
+    "Latent heat exchanger effectiveness correction" annotation (Placement(
+        transformation(extent={{100,-100},{140,-60}}), iconTransformation(
+          extent={{100,-100},{140,-60}})));
+equation
+  epsLatCor = Buildings.Utilities.Math.Functions.smoothInterpolation(
+                x=uSpe,
+                xSup=per.latHeatExchangeEffectiveness.uSpe,
+                ySup=per.latHeatExchangeEffectiveness.epsCor);
+
+  annotation (
+  defaultComponentName="latWhe",
+  Documentation(info="<html>
+<p>
+This model calculates the power consumption, the sensible 
+heat exchange effectiveness correction, and the latent 
+heat exchange effectiveness correction of an enthalpy wheel. 
+</p>
+<p>
+The calculation of the power consumption and the sensible 
+heat exchange effectiveness correction can be refered to
+<a href=\"modelica://Buildings.Fluid.BaseClasses.VariableSpeedWheel.Sensible\">
+Buildings.Fluid.BaseClasses.VariableSpeedWheel.Sensible</a>.
+</p>
+<p>
+The latent heat exchange effectiveness correction is calculated based 
+on the cubic hermite spline of the latent heat exchange effectiveness 
+correction curve in the performance dataset.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+May 28, 2024, by Sen Huang:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end Latent;
diff --git a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/Sensible.mo b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/Sensible.mo
new file mode 100644
index 00000000000..dce7b17fd40
--- /dev/null
+++ b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/Sensible.mo
@@ -0,0 +1,97 @@
+within Buildings.Fluid.BaseClasses.VariableSpeedWheel;
+model Sensible "Sensible heat wheels"
+  extends Modelica.Blocks.Icons.Block;
+  import whe = Buildings.Fluid.BaseClasses.VariableSpeedWheel;
+  final parameter Real xSpe[:] = if per.useDefaultMotorEfficiencyCurve
+    then per.motorEfficiency_default.y else per.motorEfficiency_uSpe.y
+    "x-axis support points of the power efficiency curve"
+    annotation (Dialog(group="Efficiency"));
+  final parameter Real[size(xSpe,1)] yeta = if per.useDefaultMotorEfficiencyCurve
+    then per.motorEfficiency_default.eta else per.motorEfficiency_uSpe.eta
+    "y-axis support points of the power efficiency curve"
+    annotation (Dialog(group="Efficiency"));
+  parameter whe.BaseClasses.Data.Generic per
+    "Record with performance data"
+    annotation (Placement(transformation(extent={{60,60},{80,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput uSpe(
+    final unit="1",
+    final max=1)
+    "Wheel speed ratio"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
+        iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput P(final unit="W")
+    "Electric power consumption"
+    annotation (Placement(transformation(extent={{100,60},{140,100}}),
+        iconTransformation(extent={{100,60},{140,100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput epsSenCor(final unit="1")
+    "Sensible heat exchanger effectiveness correction" annotation (Placement(
+        transformation(extent={{100,-20},{140,20}}), iconTransformation(extent={{100,-20},
+            {140,20}})));
+
+initial equation
+  for i in 1:size(yeta,1)-1 loop
+         assert(xSpe[i]/yeta[i]<1 + 1E-4,
+                  "In " + getInstanceName() + ": motor efficiency curve is wrong. 
+                  The ratio of the speed ratio of the motor efficiency
+                  to the motor percent full-load efficiency should be less than
+                  1",
+                  level=AssertionLevel.error)
+                  "Check if the motor efficiency curve is correct";
+  end for;
+  assert(abs(yeta[size(yeta,1)]-1) < 1E-4 and abs(yeta[size(yeta,1)]-1) < 1E-4,
+          "In " + getInstanceName() + ": motor efficiency curve is wrong. 
+          The ratio of the speed ratio of the motor efficiency
+          to the motor percent full-load efficiency should be less than
+          1",
+          level=AssertionLevel.error)
+          "Check if the motor efficiency curve is correct";
+equation
+  P = per.P_nominal*uSpe/Buildings.Utilities.Math.Functions.smoothInterpolation(
+        x=uSpe,
+        xSup=xSpe,
+        ySup=yeta);
+  epsSenCor = Buildings.Utilities.Math.Functions.smoothInterpolation(
+                x=uSpe,
+                xSup=per.senHeatExchangeEffectiveness.uSpe,
+                ySup=per.senHeatExchangeEffectiveness.epsCor);
+   annotation (
+   defaultComponentName="senWhe",
+   Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+        coordinateSystem(preserveAspectRatio=false)),
+    Documentation(info="<html>
+<p>
+This model calculates the power consumption and the sensible heat exchanger 
+effectiveness correction of a sensible heat wheel.
+Specifically, this calculation is configured as follows.
+</p>
+<ul>
+<li>
+The power consumption of this wheel is calculated by
+<p align=\"center\" style=\"font-style:italic;\">
+P = P_nominal * uSpe / eta,
+</p>
+<p>
+where <code>P_nominal</code> is the nominal wheel power consumption,
+<code>uSpe</code> is the wheel speed ratio.
+The <code>eta</code> is the motor percent full-load efficiency, i.e.,
+the ratio of the motor efficiency to that when the <code>uSpe</code> is <i>1</i>.
+The <code>eta</code> is obtained based on the cubic hermite spline interpolation of
+the motor percent full-load efficiency dataset.
+Please note that <code>uSpe/eta</code> should be less or equal to 1.
+</p>
+</li>
+<li>
+The sensible heat exchanger effectiveness correction is calculated based 
+on the cubic hermite spline interpolation of the sensible heat exchanger effectiveness 
+dataset.
+</li>
+</ul>
+</html>", revisions="<html>
+<ul>
+<li>
+May 28, 2024, by Sen Huang:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end Sensible;
diff --git a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/Validation/VariableSpeedWheel.mo b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/Validation/VariableSpeedWheel.mo
new file mode 100644
index 00000000000..ada9ace51f5
--- /dev/null
+++ b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/Validation/VariableSpeedWheel.mo
@@ -0,0 +1,86 @@
+within Buildings.Fluid.BaseClasses.VariableSpeedWheel.Validation;
+model VariableSpeedWheel
+  extends Modelica.Icons.Example;
+  Buildings.Fluid.BaseClasses.VariableSpeedWheel.Sensible senWhe(
+    per=perSenWhe)
+    "Sensible heat wheel"
+    annotation (Placement(transformation(extent={{-10,40},{10,60}})));
+  Buildings.Fluid.BaseClasses.VariableSpeedWheel.BaseClasses.Data.ASHRAE
+    perSenWhe(
+    motorEfficiency_uSpe(y={0.1,0.6,0.8,1}, eta={0.3,0.8,0.85,1}),
+      haveLatentHeatExchange=false,
+      useDefaultMotorEfficiencyCurve=false)
+    "Performance record for the sensible heat wheet"
+    annotation (Placement(transformation(extent={{-80,74},{-60,94}})));
+  Modelica.Blocks.Sources.Ramp uSpe(
+    duration=1,
+    startTime=0,
+    offset=0,
+    height=1) "Speed ratio"
+    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
+  Buildings.Fluid.BaseClasses.VariableSpeedWheel.Latent
+    latWhe(
+      per=perLatWhe)
+    "Enthalpy wheel"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+  Buildings.Fluid.BaseClasses.VariableSpeedWheel.Latent
+    latWheDefMotCur(
+      per=perLatWheDefMotCur)
+    "enthalpy wheel with default motor curve"
+    annotation (Placement(transformation(extent={{-10,-60},{10,-40}})));
+  BaseClasses.Data.ASHRAE perLatWhe(
+    motorEfficiency_uSpe(y={0.1,0.6,0.8,1}, eta={0.3,0.8,0.85,1}),
+      haveLatentHeatExchange=true,
+      useDefaultMotorEfficiencyCurve=false)
+    "Performance record for the enthalpy wheet"
+    annotation (Placement(transformation(extent={{-40,74},{-20,94}})));
+  BaseClasses.Data.ASHRAE perLatWheDefMotCur(haveLatentHeatExchange=true,
+      useDefaultMotorEfficiencyCurve=true)
+    "Performance record for the enthalpy wheet with default motor curve"
+    annotation (Placement(transformation(extent={{0,74},{20,94}})));
+equation
+  connect(uSpe.y, senWhe.uSpe) annotation (Line(points={{-39,0},{-28,0},{-28,50},
+          {-12,50}}, color={0,0,127}));
+  connect(latWhe.uSpe, uSpe.y)
+    annotation (Line(points={{-12,0},{-39,0}}, color={0,0,127}));
+  connect(latWheDefMotCur.uSpe, uSpe.y) annotation (Line(points={{-12,-50},{-28,
+          -50},{-28,0},{-39,0}}, color={0,0,127}));
+  annotation (
+    __Dymola_Commands(file=
+          "modelica://Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/VariableSpeedWheel/Validation/VariableSpeedWheel.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=1,
+      Tolerance=1e-06),
+    Documentation(info="<html>
+<p>
+Example for the model
+<a href=\"modelica://Buildings.Fluid.BaseClasses.VariableSpeedWheel.Sensible\">
+Buildings.Fluid.BaseClasses.VariableSpeedWheel.Sensible</a> and the model
+<a href=\"modelica://Buildings.Fluid.BaseClasses.VariableSpeedWheel.Latent\">
+Buildings.Fluid.BaseClasses.VariableSpeedWheel.latent</a>.
+</p>
+<p>
+The input signals are configured as follows:
+</p>
+<ul>
+<li>
+The wheel speed <code>uSpe</code> changes from <i>0</i> to <i>1</i> 
+during the period from 0 to 1 second.
+</li>
+</ul>
+<p>
+The expected outputs are:
+</p>
+<ul>
+<li>
+The power consumption of all three wheels increases by time
+and equals to the nominal value when <code>uSpe=1</code>.
+</li>
+<li>
+The heat exchange effectiveness corrections increase by time
+and equals to 1 when <code>uSpe=1</code>.
+</li>
+</ul>
+</html>"));
+end VariableSpeedWheel;
diff --git a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/Validation/package.mo b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/Validation/package.mo
new file mode 100644
index 00000000000..8a59acb3c98
--- /dev/null
+++ b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/Validation/package.mo
@@ -0,0 +1,20 @@
+within Buildings.Fluid.BaseClasses.VariableSpeedWheel;
+package Validation "Collection of validation models"
+extends Modelica.Icons.ExamplesPackage;
+
+  annotation (Documentation(info="<html>
+<p>
+This package contains validation models for the classes in
+<a href=\"modelica://Buildings.Fluid.BaseClasses.VariableSpeedWheel\">
+Buildings.Fluid.BaseClasses.VariableSpeedWheel</a>.
+</p>
+<p>
+Note that most validation models contain simple input data
+which may not be realistic, but for which the correct
+output can be obtained through an analytic solution.
+The examples plot various outputs, which have been verified against these
+solutions. These model outputs are stored as reference data and
+used for continuous validation whenever models in the library change.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/Validation/package.order b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/Validation/package.order
new file mode 100644
index 00000000000..d670ac2675b
--- /dev/null
+++ b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/Validation/package.order
@@ -0,0 +1 @@
+VariableSpeedWheel
diff --git a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/package.mo b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/package.mo
new file mode 100644
index 00000000000..6bfbe0f802e
--- /dev/null
+++ b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/package.mo
@@ -0,0 +1,12 @@
+within Buildings.Fluid.BaseClasses;
+package VariableSpeedWheel "Models of variable-speed wheels"
+  extends Modelica.Icons.BasesPackage;
+
+annotation (Documentation(info="<html>
+<p>
+This package contains models for representing the impacts of
+the wheel speed ratio on the power consumption and the heat
+exchange effectiveness of thermal wheels.
+</p>
+</html>"));
+end VariableSpeedWheel;
diff --git a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/package.order b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/package.order
new file mode 100644
index 00000000000..af108c1a1c3
--- /dev/null
+++ b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/package.order
@@ -0,0 +1,4 @@
+Sensible
+Latent
+BaseClasses
+Validation
diff --git a/Buildings/Fluid/BaseClasses/package.order b/Buildings/Fluid/BaseClasses/package.order
index 942b2276fe9..f6f6cfcc314 100644
--- a/Buildings/Fluid/BaseClasses/package.order
+++ b/Buildings/Fluid/BaseClasses/package.order
@@ -4,4 +4,5 @@ MassFlowRateMultiplier
 PartialResistance
 PartialThreeWayResistance
 FlowModels
+VariableSpeedWheel
 Validation
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Effectiveness.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Effectiveness.mo
index 4ac3be636af..0e5d48100e9 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Effectiveness.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Effectiveness.mo
@@ -39,11 +39,6 @@ model Effectiveness
   Buildings.Controls.OBC.CDL.Interfaces.RealInput mExh_flow(final unit="kg/s")
     "Exhaust air mass flow rate"
     annotation (Placement(transformation(extent={{-140,20},{-100,60}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput uSpe(
-    final unit="1",
-    final max=1)
-    "Wheel speed ratio"
-    annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput epsSen(final unit="1")
     "Sensible heat exchanger effectiveness"
     annotation (Placement(transformation(extent={{100,30},{140,70}}),
@@ -98,8 +93,8 @@ equation
 
   // Calculate effectiveness
   ratRes = Buildings.Utilities.Math.Functions.smoothLimit(x=rat, l=0.5, u=1.3, deltaX=0.01);
-  epsSen =uSpe*(epsSenPL + (epsSen_nominal - epsSenPL)*(ratRes - 0.75)/0.25);
-  epsLat =uSpe*(epsLatPL + (epsLat_nominal - epsLatPL)*(ratRes - 0.75)/0.25);
+  epsSen = (epsSenPL + (epsSen_nominal - epsSenPL)*(ratRes - 0.75)/0.25);
+  epsLat = (epsLatPL + (epsLat_nominal - epsLatPL)*(ratRes - 0.75)/0.25);
   assert(epsSen >= 0 and epsSen < 1,
     "In " + getInstanceName() + ": The sensible heat exchange effectiveness epsSen = " + String(epsSen) + ". It should be in the range of [0, 1].
     Check if the part load (75% of the nominal supply flow rate) or nominal sensible heat exchanger effectiveness is too high or too low.",
@@ -137,8 +132,8 @@ where <code>VSup_flow</code> is the flow rate of the supply air,
 It then calculates the sensible and latent heat exchanger effectiveness by:
 </p>
 <pre>
-  epsSen = uSpe * (epsSenPL + (epsSen_nominal - epsSenPL) * (rat - 0.75)/0.25),
-  epsLat = uSpe * (epsLatPL + (epsLat_nominal - epsLatPL) * (rat - 0.75)/0.25),
+  epsSen = (epsSenPL + (epsSen_nominal - epsSenPL) * (rat - 0.75)/0.25),
+  epsLat = (epsLatPL + (epsLat_nominal - epsLatPL) * (rat - 0.75)/0.25),
 </pre>
 <p>
 where <code>epsSen</code> and <code>epsLat</code> are the effectiveness
@@ -146,8 +141,7 @@ for the sensible and latent heat transfer, respectively,
 <code>epsSen_nominal</code> and <code>epsSenPL</code> are the effectiveness 
 for the sensible heat transfer when <code>rat</code> is 1 and 0.75, respectively,
 <code>epsLat_nominal</code> and <code>epsLatPL</code> are the effectiveness 
-for the latent heat transfer when <code>Rat</code> is 1 and 0.75, respectively, and
-<code>uSpe</code> is the speed ratio of a rotary wheel.
+for the latent heat transfer when <code>Rat</code> is 1 and 0.75, respectively.
 </p>
 <p>
 The parameters <code>epsSen_nominal</code>, <code>epsSenPL</code>, <code>epsLat_nominal</code>, and
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/PartialWheel.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/PartialWheel.mo
index aec23570544..966c328a06e 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/PartialWheel.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/PartialWheel.mo
@@ -17,9 +17,6 @@ partial model PartialWheel
   parameter Modelica.Units.SI.PressureDifference dpExh_nominal(displayUnit="Pa") = dpSup_nominal
     "Nominal exhaust air pressure drop"
     annotation (Dialog(group="Nominal condition"));
-  parameter Real P_nominal(final unit="W")
-    "Power consumption at the design condition"
-    annotation (Dialog(group="Nominal condition"));
   parameter Modelica.Units.SI.Efficiency epsSenCoo_nominal(
     final max=1) = 0.8
     "Nominal sensible heat exchanger effectiveness at the cooling mode"
@@ -71,7 +68,7 @@ partial model PartialWheel
     annotation (Placement(transformation(extent={{50,-4},{70,16}})));
   Buildings.Fluid.Sensors.MassFlowRate senExhMasFlo(redeclare package Medium = Medium)
     "Exhaust air mass flow rate"
-    annotation (Placement(transformation(extent={{-100,-50},{-120,-30}})));
+    annotation (Placement(transformation(extent={{-100,-54},{-120,-34}})));
   Modelica.Fluid.Interfaces.FluidPort_a port_a1(
     redeclare final package Medium = Medium)
     "Fluid connector a1 of the supply air (positive design flow direction is from port_a1 to port_b1)"
@@ -113,7 +110,7 @@ protected
     final dp1_nominal=dpSup_nominal,
     final dp2_nominal=dpExh_nominal)
     "Heat exchanger"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+    annotation (Placement(transformation(extent={{10,-10},{30,10}})));
   Modelica.Blocks.Sources.RealExpression TSup(
     final y(final unit="K")=Medium.temperature(
       Medium.setState_phX(
@@ -132,34 +129,24 @@ protected
     annotation (Placement(transformation(extent={{-160,-40},{-140,-20}})));
 
 equation
-  connect(effCal.epsSen, hex.epsSen)
-    annotation (Line(points={{-78,5},{-46,5},{-46,3},{-12,3}},
-                                               color={0,0,127}));
-  connect(effCal.epsLat, hex.epsLat)
-    annotation (Line(points={{-78,-5},{-46,-5},{-46,-3},{-12,-3}},
-                                                 color={0,0,127}));
   connect(TSup.y, effCal.TSup)
     annotation (Line(points={{-139,28},{-130,28},{-130,-4},{-102,-4}},
         color={0,0,127}));
   connect(TExh.y, effCal.TExh)
     annotation (Line(points={{-139,-30},{-130,-30},{-130,-8},{-102,-8}},
         color={0,0,127}));
-  connect(epsSen, effCal.epsSen) annotation (Line(points={{120,30},{-60,30},{
-          -60,5},{-78,5}}, color={0,0,127}));
-  connect(effCal.epsLat, epsLat) annotation (Line(points={{-78,-5},{-60,-5},{
-          -60,-16},{80,-16},{80,-30},{120,-30}}, color={0,0,127}));
   connect(senSupMasFlo.m_flow, effCal.mSup_flow) annotation (Line(points={{60,17},
           {60,60},{-110,60},{-110,8},{-102,8}}, color={0,0,127}));
   connect(senExhMasFlo.m_flow, effCal.mExh_flow) annotation (Line(points={{-110,
-          -29},{-110,4},{-102,4}},                 color={0,0,127}));
+          -33},{-110,4},{-102,4}},                 color={0,0,127}));
   connect(hex.port_b1, senSupMasFlo.port_a)
-    annotation (Line(points={{10,6},{50,6}}, color={0,127,255}));
+    annotation (Line(points={{30,6},{50,6}}, color={0,127,255}));
   connect(senSupMasFlo.port_b, port_b1) annotation (Line(points={{70,6},{80,6},
           {80,80},{100,80}}, color={0,127,255}));
-  connect(senExhMasFlo.port_a, hex.port_b2) annotation (Line(points={{-100,-40},
-          {-30,-40},{-30,-6},{-10,-6}}, color={0,127,255}));
-  connect(senExhMasFlo.port_b, port_b2) annotation (Line(points={{-120,-40},{
-          -160,-40},{-160,-60},{-180,-60}}, color={0,127,255}));
+  connect(senExhMasFlo.port_a, hex.port_b2) annotation (Line(points={{-100,-44},
+          {-30,-44},{-30,-6},{10,-6}},  color={0,127,255}));
+  connect(senExhMasFlo.port_b, port_b2) annotation (Line(points={{-120,-44},{-160,
+          -44},{-160,-60},{-180,-60}},      color={0,127,255}));
 annotation (
         defaultComponentName="whe",
         Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Validation/Effectiveness.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Validation/Effectiveness.mo
index d24f0385ac3..ef5ee46a20e 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Validation/Effectiveness.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Validation/Effectiveness.mo
@@ -15,13 +15,6 @@ model Effectiveness
     mSup_flow_nominal=1)
     "Effectiveness calculator"
     annotation (Placement(transformation(extent={{-12,-10},{8,10}})));
-  Modelica.Blocks.Sources.Ramp whSpe(
-    height=0.7,
-    duration=60,
-    offset=0.3,
-    startTime=60)
-    "Wheel speed"
-    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
   Modelica.Blocks.Sources.Ramp TSup(
     height=5,
     duration=60,
@@ -55,8 +48,6 @@ equation
     annotation (Line(points={{-59,70},{-28,70},{-28,8},{-14,8}}, color={0,0,127}));
   connect(VExh.y, epsCal.mExh_flow)
     annotation (Line(points={{-59,30},{-40,30},{-40,4},{-14,4}}, color={0,0,127}));
-  connect(whSpe.y, epsCal.uSpe)
-    annotation (Line(points={{-59,0},{-14,0}}, color={0,0,127}));
   connect(TSup.y, epsCal.TSup)
     annotation (Line(points={{-59,-40},{-40,-40},{-40,-4},{-14,-4}}, color={0,0,127}));
   connect(TExh.y, epsCal.TExh)
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo
index d54c4b505bf..67f723436bf 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo
@@ -3,15 +3,19 @@ model BypassDampers
   "Enthalpy recovery wheel with bypass dampers"
   extends
     Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BaseClasses.PartialWheel;
-  parameter Modelica.Units.SI.PressureDifference dpDamper_nominal(displayUnit="Pa") = 20
+  parameter Modelica.Units.SI.PressureDifference
+    dpDamper_nominal(displayUnit="Pa") = 20
     "Nominal pressure drop of dampers"
     annotation (Dialog(group="Nominal condition"));
+   parameter Real P_nominal(final unit="W")
+    "Power consumption at the design condition"
+    annotation (Dialog(group="Nominal condition"));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput uBypDamPos(
     final unit="1",
     final min=0,
     final max=1)
     "Bypass damper position"
-    annotation (Placement(transformation(extent={{-222,120},{-182,160}}),
+    annotation (Placement(transformation(extent={{-220,120},{-180,160}}),
       iconTransformation(extent={{-140,-20},{-100,20}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uRot
     "True when the wheel is operating"
@@ -22,7 +26,7 @@ model BypassDampers
     final m_flow_nominal=mSup_flow_nominal,
     final dpDamper_nominal=dpDamper_nominal)
     "Supply air bypass damper"
-    annotation (Placement(transformation(extent={{-60,70},{-40,90}})));
+    annotation (Placement(transformation(extent={{-48,70},{-28,90}})));
   Buildings.Fluid.Actuators.Dampers.Exponential damSup(
     redeclare package Medium = Medium,
     final m_flow_nominal=mSup_flow_nominal,
@@ -43,6 +47,14 @@ model BypassDampers
     final dpDamper_nominal=dpDamper_nominal)
     "Exhaust air bypass damper"
     annotation (Placement(transformation(extent={{0,-70},{-20,-50}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch swiepsSen
+    "Switch the sensible heat exchanger effectiveness 
+    based the wheel operation status"
+    annotation (Placement(transformation(extent={{-40,150},{-20,170}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch swiLat
+    "Switch the latent heat exchanger effectiveness 
+    based the wheel operation status"
+    annotation (Placement(transformation(extent={{-40,120},{-20,140}})));
 protected
   Modelica.Blocks.Sources.Constant uni(final k=1)
     "Unity signal"
@@ -50,46 +62,41 @@ protected
   Buildings.Controls.OBC.CDL.Reals.Subtract sub
     "Difference of the two inputs"
     annotation (Placement(transformation(extent={{-100,90},{-80,110}})));
-  Modelica.Blocks.Math.BooleanToReal booleanToReal
-    "Convert boolean input to real output"
-    annotation (Placement(transformation(extent={{-160,-10},{-140,10}})));
   Modelica.Blocks.Math.BooleanToReal PEle(
     final realTrue=P_nominal,
     final realFalse=0) "Electric power consumption for motor"
     annotation (Placement(transformation(extent={{-160,-90},{-140,-70}})));
+protected
+  Modelica.Blocks.Sources.Constant zero(final k=0) "Zero signal"
+    annotation (Placement(transformation(extent={{-140,150},{-120,170}})));
 equation
   connect(sub.y, damSup.y)
-    annotation (Line(points={{-78,100},{20,100},{20,54},{-90,54},{-90,48}},
+    annotation (Line(points={{-78,100},{0,100},{0,54},{-90,54},{-90,48}},
     color={0,0,127}));
   connect(damExh.y,sub. y)
-    annotation (Line(points={{28,-44},{20,-44},{20,100},{-78,100}}, color={0,0,127}));
+    annotation (Line(points={{28,-44},{0,-44},{0,100},{-78,100}},   color={0,0,127}));
   connect(bypDamSup.y, uBypDamPos)
-    annotation (Line(points={{-50,92},{-50,140},{-202,140}}, color={0,0,127}));
+    annotation (Line(points={{-38,92},{-38,98},{-72,98},{-72,84},{-160,84},{-160,
+          140},{-200,140}},                                  color={0,0,127}));
   connect(damSup.port_b, hex.port_a1)
-    annotation (Line(points={{-80,36},{-30,36},{-30,6},{-10,6}},
+    annotation (Line(points={{-80,36},{-30,36},{-30,6},{10,6}},
     color={0,127,255}));
   connect(bypDamExh.y, uBypDamPos)
-    annotation (Line(points={{-10,-48},{-10,-30},{30,-30},{30,140},{-202,140}},
+    annotation (Line(points={{-10,-48},{-10,-40},{-94,-40},{-94,-24},{-114,-24},
+          {-114,84},{-160,84},{-160,140},{-200,140}},
     color={0,0,127}));
   connect(sub.u2, uBypDamPos)
-    annotation (Line(points={{-102,94},{-160,94},{-160,140},{-202,140}},
+    annotation (Line(points={{-102,94},{-160,94},{-160,140},{-200,140}},
     color={0,0,127}));
   connect(uni.y, sub.u1)
     annotation (Line(points={{-119,120},{-110,120},{-110,106},{-102,106}},
     color={0,0,127}));
-  connect(uRot, booleanToReal.u)
-    annotation (Line(points={{-200,0},{-162,0}}, color={255,0,255}));
-  connect(booleanToReal.y, effCal.uSpe)
-    annotation (Line(points={{-139,0},{-120,0},{-120,0},{-102,0}},
-    color={0,0,127}));
   connect(PEle.y, P) annotation (Line(points={{-139,-80},{80,-80},{80,-90},{120,-90}},
     color={0,0,127}));
-  connect(PEle.u, uRot) annotation (Line(points={{-162,-80},{-168,-80},{-168,0},{-200,0}},
-    color={255,0,255}));
   connect(damSup.port_a, port_a1) annotation (Line(points={{-100,36},{-130,36},{-130,80},{-180,80}},
     color={0,127,255}));
   connect(damExh.port_b, hex.port_a2)
-    annotation (Line(points={{40,-34},{40,-6},{10,-6}}, color={0,127,255}));
+    annotation (Line(points={{40,-34},{40,-6},{30,-6}}, color={0,127,255}));
   connect(bypDamExh.port_b, port_b2)
     annotation (Line(points={{-20,-60},{-180,-60}}, color={0,127,255}));
   connect(damExh.port_a, port_a2)
@@ -97,9 +104,31 @@ equation
   connect(bypDamExh.port_a, port_a2)
     annotation (Line(points={{0,-60},{100,-60}}, color={0,127,255}));
   connect(bypDamSup.port_b, port_b1)
-    annotation (Line(points={{-40,80},{100,80}}, color={0,127,255}));
+    annotation (Line(points={{-28,80},{100,80}}, color={0,127,255}));
   connect(bypDamSup.port_a, port_a1)
-    annotation (Line(points={{-60,80},{-180,80}}, color={0,127,255}));
+    annotation (Line(points={{-48,80},{-180,80}}, color={0,127,255}));
+  connect(PEle.u, uRot) annotation (Line(points={{-162,-80},{-168,-80},{-168,0},
+          {-200,0}}, color={255,0,255}));
+  connect(zero.y, swiepsSen.u3) annotation (Line(points={{-119,160},{-60,160},{-60,
+          152},{-42,152}}, color={0,0,127}));
+  connect(swiLat.u3, zero.y) annotation (Line(points={{-42,122},{-60,122},{-60,160},
+          {-119,160}}, color={0,0,127}));
+  connect(effCal.epsSen, swiepsSen.u1) annotation (Line(points={{-78,5},{-68,5},
+          {-68,168},{-42,168}}, color={0,0,127}));
+  connect(effCal.epsLat, swiLat.u1) annotation (Line(points={{-78,-5},{-64,-5},{
+          -64,138},{-42,138}}, color={0,0,127}));
+  connect(swiepsSen.u2, uRot) annotation (Line(points={{-42,160},{-52,160},{-52,
+          176},{-168,176},{-168,0},{-200,0}}, color={255,0,255}));
+  connect(swiLat.u2, uRot) annotation (Line(points={{-42,130},{-52,130},{-52,176},
+          {-168,176},{-168,0},{-200,0}}, color={255,0,255}));
+  connect(swiepsSen.y, hex.epsSen) annotation (Line(points={{-18,160},{-6,160},{
+          -6,3},{8,3}}, color={0,0,127}));
+  connect(swiLat.y, hex.epsLat) annotation (Line(points={{-18,130},{-10,130},{-10,
+          -3},{8,-3}}, color={0,0,127}));
+  connect(swiepsSen.y, epsSen) annotation (Line(points={{-18,160},{38,160},{38,30},
+          {120,30}}, color={0,0,127}));
+  connect(swiLat.y, epsLat) annotation (Line(points={{-18,130},{88,130},{88,-30},
+          {120,-30}}, color={0,0,127}));
 annotation (
         defaultComponentName="whe",
         Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mo
index 8e52d8bcc4e..a3457eb4575 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mo
@@ -28,6 +28,8 @@ model SpaceCooling "Space cooling system"
     "Nominal air humidity ratio supplied to room [kg/kg] assuming 90% relative humidity";
   parameter Modelica.Units.SI.Temperature TRooSet=297.15
     "Nominal room air temperature";
+  parameter Modelica.Units.SI.Temperature TMixSet=297.15
+    "Nominal mixed air temperature";
   parameter Modelica.Units.SI.Temperature TOut_nominal=303.15
     "Design outlet air temperature";
   parameter Modelica.Units.SI.Temperature THeaRecLvg=TOut_nominal - eps*(
@@ -70,12 +72,12 @@ model SpaceCooling "Space cooling system"
     redeclare package Medium = MediumA,
     per(etaHydMet=Buildings.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.NotProvided,
         etaMotMet=Buildings.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.NotProvided),
-
     nominalValuesDefineDefaultPressureCurve=true,
     m_flow_nominal=mA_flow_nominal,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
     "Supply air fan"
     annotation (Placement(transformation(extent={{40,-30},{60,-10}})));
+
   Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BypassDampers whe(
     redeclare package Medium = MediumA,
     mSup_flow_nominal=mA_flow_nominal,
@@ -160,13 +162,16 @@ model SpaceCooling "Space cooling system"
     shift=0.25*86400)
     "Operating signal"
     annotation (Placement(transformation(extent={{-172,10},{-152,30}})));
-  Modelica.Blocks.Sources.Ramp bypDamPos(
-    height=0.5,
-    duration=86400/4,
-    offset=0,
-    startTime=15552000 + 12*3600)
-    "Bypass damper position"
-    annotation (Placement(transformation(extent={{-170,-60},{-150,-40}})));
+  Buildings.Controls.Continuous.LimPID conPID(k=0.1, Ti=60)
+    annotation (Placement(transformation(extent={{-58,10},{-38,30}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TMixSetPoi(k=TMixSet)
+    "Mixed air temperature set point"
+    annotation (Placement(transformation(extent={{-100,10},{-80,30}})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senTemRetAir(
+      redeclare package Medium = MediumA,
+      m_flow_nominal=mA_flow_nominal)
+      "Temperature sensor for return air"
+    annotation (Placement(transformation(extent={{54,-52},{42,-40}})));
 equation
   connect(theCon.port_b, vol.heatPort) annotation (Line(
       points={{40,50},{50,50},{50,30},{60,30}},
@@ -177,11 +182,7 @@ equation
       color={191,0,0},
       smooth=Smooth.None));
   connect(fan.port_b, vol.ports[1]) annotation (Line(
-      points={{62,-20},{69,-20},{69,20}},
-      color={0,127,255},
-      smooth=Smooth.None));
-  connect(vol.ports[2],whe. port_a2) annotation (Line(
-      points={{71,20},{71,-46},{-90,-46},{-90,-32}},
+      points={{60,-20},{69,-20},{69,20}},
       color={0,127,255},
       smooth=Smooth.None));
   connect(out.ports[2],whe. port_a1) annotation (Line(
@@ -267,9 +268,16 @@ equation
   connect(opeSig.y, whe.uRot) annotation (Line(
       points={{-150,20},{-116,20},{-116,-18},{-112,-18}},
       color={255,0,255}));
-  connect(bypDamPos.y, whe.uBypDamPos) annotation (Line(
-      points={{-149,-50},{-118,-50},{-118,-26},{-112,-26}},
-      color={0,0,127}));
+  connect(TMixSetPoi.y, conPID.u_s)
+    annotation (Line(points={{-78,20},{-60,20}}, color={0,0,127}));
+  connect(senTemHXOut.T, conPID.u_m) annotation (Line(points={{-70,-13.4},{-70,0},
+          {-48,0},{-48,8}}, color={0,0,127}));
+  connect(conPID.y, whe.uBypDamPos) annotation (Line(points={{-37,20},{-18,20},{
+          -18,-80},{-116,-80},{-116,-26},{-112,-26}}, color={0,0,127}));
+  connect(vol.ports[2], senTemRetAir.port_a)
+    annotation (Line(points={{71,20},{71,-46},{54,-46}}, color={0,127,255}));
+  connect(senTemRetAir.port_b, whe.port_a2) annotation (Line(points={{42,-46},{-90,
+          -46},{-90,-32}}, color={0,127,255}));
   annotation (Documentation(info="<html>
 <p>
 This block is identical to
@@ -287,8 +295,8 @@ The operating signal <i>uRot</i> changes from <code>false</code> to <code>true</
 and from <code>false</code> to <code>true</code> at 18:00 (15552000+18*3600 seconds).
 </li>
 <li>
-The bypass damper position <i>uBypDamPos</i> changes from <i>0</i> to <i>0.5</i> 
-during the period from 12:00 to 18:00.
+The bypass damper positions are controlled to maintain the temperature of the air leaving the thermal wheel, 
+<code>senTemHXOut.T</code>, at 297.15 K.
 </li>
 </ul>
 <p>
@@ -296,11 +304,11 @@ The expected outputs are:
 </p>
 <ul>
 <li>
-The outdoor temperature, <code>TOut.T</code>, and the temperature of the air leaving the exchanger, <code>senTemHXOut.T</code>,
-becomes different at 6:00.
+The outdoor temperature, <code>TOut.T</code>, and <code>senTemHXOut.T</code>
+are different during the period from 6:00 to 18:00.
 </li>
 <li>
-Their difference equals <i>0</i> after 18:00.
+During the same period, <code>senTemHXOut.T</code> is close to 297.15 K.
 </li>
 </ul>
 </html>", revisions="<html>
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/SpeedControlled.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/SpeedControlled.mo
index 18170afcd9a..83b3fb3a8ed 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/SpeedControlled.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/SpeedControlled.mo
@@ -3,55 +3,54 @@ model SpeedControlled
   "Enthalpy recovery wheel with a variable speed drive"
   extends
     Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BaseClasses.PartialWheel;
-  parameter Boolean defaultMotorEfficiencyCurve = true
-    "Set to true for using the default motor efficiency curve, or false for using the user-defined motor efficiency curve"
-    annotation (Dialog(group="Efficiency"));
-  parameter Real table[:,:]=[0.8,1]
-    "Table of user-defined motor efficiency curve:(first column:the wheel speed ratio, second column:the percent full-load efficiency)"
-    annotation (Dialog(group="Efficiency", enable = not defaultMotorEfficiencyCurve));
-  final parameter
-    Buildings.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters_yMot
-      motorEfficiency_default=
-        Buildings.Fluid.Movers.BaseClasses.Characteristics.motorEfficiencyCurve(
-          P_nominal=P_nominal,
-          eta_max=1)
-    "Default motor efficiency curve";
-  final parameter Real xSpe[:] = if defaultMotorEfficiencyCurve then motorEfficiency_default.y else table[:,1]
-    "x-axis support points of the power efficiency curve"
-    annotation (Dialog(group="Efficiency"));
-  final parameter Real[size(xSpe,1)] yeta = if defaultMotorEfficiencyCurve then motorEfficiency_default.eta else table[:,2]
-    "y-axis support points of the power efficiency curve"
-    annotation (Dialog(group="Efficiency"));
+  parameter
+    Buildings.Fluid.BaseClasses.VariableSpeedWheel.BaseClasses.Data.Generic
+    per
+    "Record with performance data"
+    annotation (Placement(transformation(extent={{60,120},{80,140}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput uSpe(
     final unit="1",
     final max=1)
     "Wheel speed ratio"
     annotation (Placement(transformation(extent={{-220,-20},{-180,20}}),
         iconTransformation(extent={{-140,-20},{-100,20}})));
-protected
-  Modelica.Blocks.Sources.RealExpression PEle(
-    final y=P_nominal*uSpe/Buildings.Utilities.Math.Functions.smoothInterpolation(
-      x=uSpe,
-      xSup=xSpe,
-      ySup=yeta))
-    "Electric power consumption"
-    annotation (Placement(transformation(extent={{60,-100},{80,-80}})));
-initial equation
-  assert(table[end,1] < 1 or defaultMotorEfficiencyCurve,
-         "In " + getInstanceName() + ": Power efficiency curve is wrong. 
-         No need to define efficiency for the nominal condition",
-         level=AssertionLevel.error)
-         "Check if the motor efficiency for the nominal condition is defined in the user-defined curve";
+  Buildings.Fluid.BaseClasses.VariableSpeedWheel.Latent latWhe(
+    final per=per) "Correct the wheel performance based on the wheel speed"
+    annotation (Placement(transformation(extent={{-120,110},{-100,130}})));
+
+  Buildings.Controls.OBC.CDL.Reals.Multiply mul
+    "Correct the sensible heat exchanger effectiveness"
+    annotation (Placement(transformation(extent={{-60,130},{-40,150}})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply mul1
+    "Correct the latent heat exchanger effectiveness"
+    annotation (Placement(transformation(extent={{-60,90},{-40,110}})));
+
 equation
-  connect(P, PEle.y)
-    annotation (Line(points={{120,-90},{81,-90}}, color={0,0,127}));
-  connect(effCal.uSpe, uSpe)
-    annotation (Line(points={{-102,0},{-200,0}}, color={0,0,127}));
   connect(hex.port_a2, port_a2)
-    annotation (Line(points={{10,-6},{60,-6},{60,-60},{100,-60},{100,-60}},
+    annotation (Line(points={{30,-6},{40,-6},{40,-60},{100,-60}},
     color={0,127,255}));
   connect(hex.port_a1, port_a1)
-    annotation (Line(points={{-10,6},{-32,6},{-32,80},{-180,80}}, color={0,127,255}));
+    annotation (Line(points={{10,6},{-32,6},{-32,80},{-180,80}},  color={0,127,255}));
+  connect(latWhe.epsSenCor, mul.u1) annotation (Line(points={{-98,120},{-80,120},
+          {-80,146},{-62,146}}, color={0,0,127}));
+  connect(latWhe.epsLatCor, mul1.u1) annotation (Line(points={{-98,112},{-80,112},
+          {-80,106},{-62,106}}, color={0,0,127}));
+  connect(effCal.epsSen, mul.u2) annotation (Line(points={{-78,5},{-70,5},{-70,134},
+          {-62,134}}, color={0,0,127}));
+  connect(effCal.epsLat, mul1.u2) annotation (Line(points={{-78,-5},{-64,-5},{-64,
+          94},{-62,94}}, color={0,0,127}));
+  connect(mul.y, hex.epsSen)
+    annotation (Line(points={{-38,140},{0,140},{0,3},{8,3}}, color={0,0,127}));
+  connect(hex.epsLat, mul1.y) annotation (Line(points={{8,-3},{-20,-3},{-20,100},
+          {-38,100}}, color={0,0,127}));
+  connect(mul.y, epsSen) annotation (Line(points={{-38,140},{20,140},{20,30},{120,
+          30}}, color={0,0,127}));
+  connect(mul1.y, epsLat) annotation (Line(points={{-38,100},{-10,100},{-10,-30},
+          {120,-30}}, color={0,0,127}));
+  connect(latWhe.P, P) annotation (Line(points={{-98,128},{-88,128},{-88,40},{-46,
+          40},{-46,-90},{120,-90}}, color={0,0,127}));
+  connect(latWhe.uSpe, uSpe) annotation (Line(points={{-122,120},{-168,120},{-168,
+          0},{-200,0}}, color={0,0,127}));
 annotation (
    defaultComponentName="whe",Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
    graphics={
@@ -61,7 +60,7 @@ annotation (
           fillColor={255,255,255},
           fillPattern=FillPattern.None)}),
           Diagram(
-        coordinateSystem(preserveAspectRatio=false, extent={{-180,-100},{100,100}})),
+        coordinateSystem(preserveAspectRatio=false, extent={{-180,-100},{100,160}})),
 Documentation(info="<html>
 <p>
 Model of an enthalpy recovery wheel, which has the 
@@ -74,43 +73,9 @@ heat exchanger effectiveness in both heating and cooling conditions.
 </p>
 <p>
 The operation of the heat recovery wheel is adjustable by modulating the wheel speed.
-</p>
-<p>
-Accordingly, the power consumption of this wheel is calculated by
-</p>
-<p align=\"center\" style=\"font-style:italic;\">
-P = P_nominal * uSpe / eta,
-</p>
-<p>
-where <code>P_nominal</code> is the nominal wheel power consumption,
-<code>uSpe</code> is the wheel speed ratio.
-The <code>eta</code> is the motor percent full-load efficiency, i.e.,
-the ratio of the motor efficiency to that when the <code>uSpe</code> is <i>1</i>.   
-There are two ways to define <code>eta</code>:
-</p>
-<ul>
-<li>
-Default curves in U.S. DOE (2014).
-</li>
-<li>
-Polynomial fit based on the user input data table.
-</li>
-</ul>
-<p>
-One can switch between those two options with the parameter <code>defaultMotorEfficiencyCurve</code>.
-</p>
-<p>
-The sensible and latent effectiveness is calculated with
-<a href=\"modelica://Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BaseClasses.Effectiveness\">
-Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BaseClasses.Effectiveness</a>.
-</p>
-<h4>References</h4>
-<p>
-U.S. DOE (2014).
-<i>Determining Electric Motor Load and Efficiency.</i>
-URL:
-<a href=\"https://www.energy.gov/sites/prod/files/2014/04/f15/10097517.pdf\">
-https://www.energy.gov/sites/prod/files/2014/04/f15/10097517.pdf</a>
+See details about the impacts of the wheel speed in 
+<a href=\"modelica://Buildings.Fluid.BaseClasses.VariableSpeedWheel.Latent\">
+Buildings.Fluid.BaseClasses.VariableSpeedWheel.Latent</a>.
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mo
index abc048ba401..069095e8ffc 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mo
@@ -42,29 +42,28 @@ model SpeedControlled
     nPorts=2)
     "Supply air source"
     annotation (Placement(transformation(extent={{-40,20},{-20,40}})));
-  Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.SpeedControlled wheUseDefCur(
+  Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.SpeedControlled
+    wheUseDefCur(
     redeclare package Medium = Medium,
     mSup_flow_nominal=5,
     mExh_flow_nominal=5,
-    P_nominal=100,
+    per=perLatWheDefMotCur,
     epsLatCoo_nominal=0.7,
     epsLatCooPL=0.6,
     epsLatHea_nominal=0.7,
-    epsLatHeaPL=0.6,
-    defaultMotorEfficiencyCurve=false,
-    table=[0.8,1])
+    epsLatHeaPL=0.6)
     "Wheel with a user-defined curve"
     annotation (Placement(transformation(extent={{2,14},{22,34}})));
-  Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.SpeedControlled wheDefCur(
+  Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.SpeedControlled
+    wheDefCur(
     redeclare package Medium = Medium,
     mSup_flow_nominal=5,
     mExh_flow_nominal=5,
-    P_nominal=100,
+    per=perLatWhe,
     epsLatCoo_nominal=0.7,
     epsLatCooPL=0.6,
     epsLatHea_nominal=0.7,
-    epsLatHeaPL=0.6,
-    defaultMotorEfficiencyCurve=true)
+    epsLatHeaPL=0.6)
     "Wheel with a default curve"
     annotation (Placement(transformation(extent={{2,-18},{22,2}})));
   Modelica.Blocks.Sources.Ramp wheSpe(
@@ -85,6 +84,18 @@ model SpeedControlled
       "Temperature of the supply air"
     annotation (Placement(transformation(extent={{40,20},{60,40}})));
 
+  Buildings.Fluid.BaseClasses.VariableSpeedWheel.BaseClasses.Data.ASHRAE
+                          perLatWhe(
+    motorEfficiency_uSpe(y={0.1,0.6,0.8,1}, eta={0.3,0.4,0.6,1}),
+    haveLatentHeatExchange=true,
+    useDefaultMotorEfficiencyCurve=false)
+    "Performance record for the enthalpy wheet"
+    annotation (Placement(transformation(extent={{-60,60},{-40,80}})));
+  Buildings.Fluid.BaseClasses.VariableSpeedWheel.BaseClasses.Data.ASHRAE
+                          perLatWheDefMotCur(haveLatentHeatExchange=true,
+      useDefaultMotorEfficiencyCurve=true)
+    "Performance record for the enthalpy wheet with default motor curve"
+    annotation (Placement(transformation(extent={{-20,60},{0,80}})));
 equation
   connect(TSup.y, sou_1.T_in)
     annotation (Line(points={{-59,34},{-42,34}}, color={0,0,127}));
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Effectiveness.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Effectiveness.mo
index 9b1800c3292..d41047b8d45 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Effectiveness.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Effectiveness.mo
@@ -31,11 +31,6 @@ model Effectiveness
   Buildings.Controls.OBC.CDL.Interfaces.RealInput mExh_flow(final unit="kg/s")
     "Exhaust air mass flow rate"
     annotation (Placement(transformation(extent={{-140,20},{-100,60}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput uSpe(
-    final unit="1",
-    final max=1)
-    "Wheel speed ratio"
-    annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput eps(final unit="1")
     "Sensible heat exchanger effectiveness"
     annotation (Placement(transformation(extent={{100,-20},{140,20}}),
@@ -70,7 +65,7 @@ equation
   epsPL = if equPL then epsCooPL else fraCoo*epsCooPL + (1-fraCoo) * epsHeaPL;
   eps_nominal = if equ_nominal then epsCoo_nominal else fraCoo*epsCoo_nominal + (1-fraCoo) * epsHea_nominal;
   // Calculate effectiveness
-  eps =uSpe*(epsPL + (eps_nominal - epsPL)*(
+  eps = (epsPL + (eps_nominal - epsPL)*(
     Buildings.Utilities.Math.Functions.smoothLimit(x=rat, l=0.5, u=1.3, deltaX=0.01) - 0.75)/0.25);
 
   assert(eps >= 0 and eps < 1,
@@ -106,7 +101,7 @@ where <code>VSup_flow</code> is the flow rate of the supply air,
 It then calculates the sensible heat exchanger effectiveness as
 </p>
 <pre>
-  eps = uSpe * (epsPL + (eps_nominal - epsPL) * (rat - 0.75)/0.25),
+  eps = (epsPL + (eps_nominal - epsPL) * (rat - 0.75)/0.25),
 </pre>
 <p>
 where <code>eps</code> is the effectiveness
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/PartialWheel.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/PartialWheel.mo
index dbebc406b53..083e2f20cb7 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/PartialWheel.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/PartialWheel.mo
@@ -17,9 +17,6 @@ partial model PartialWheel
   parameter Modelica.Units.SI.PressureDifference dpExh_nominal(displayUnit="Pa") = dpSup_nominal
     "Nominal exhaust air pressure drop"
     annotation (Dialog(group="Nominal condition"));
-  parameter Real P_nominal(final unit="W")
-    "Power consumption at the design condition"
-    annotation (Dialog(group="Nominal condition"));
   parameter Modelica.Units.SI.Efficiency epsCoo_nominal(
     final max=1) = 0.8
     "Nominal sensible heat exchanger effectiveness at the cooling mode"
@@ -104,7 +101,7 @@ protected
         h=inStream(port_a1.h_outflow),
         X=inStream(port_a1.Xi_outflow))))
     "Supply air temperature"
-    annotation (Placement(transformation(extent={{-160,10},{-140,30}})));
+    annotation (Placement(transformation(extent={{-160,50},{-140,70}})));
   Modelica.Blocks.Sources.RealExpression TExh(
     final y(final unit="K")=Medium.temperature(
       Medium.setState_phX(
@@ -116,28 +113,23 @@ protected
 
 equation
   connect(TSup.y, effCal.TSup)
-    annotation (Line(points={{-139,20},{-110,20},{-110,-4},{-102,-4}},
+    annotation (Line(points={{-139,60},{-110,60},{-110,-4},{-102,-4}},
     color={0,0,127}));
   connect(TExh.y, effCal.TExh)
     annotation (Line(points={{-139,-40},{-110,-40},{-110,-8},{-102,-8}},
     color={0,0,127}));
-  connect(effCal.eps, hex.eps)
-    annotation (Line(points={{-78,0},{-12,0}}, color={0,0,127}));
-  connect(effCal.eps, eps) 
-    annotation (Line(points={{-78,0},{-40,0},{-40,32},{80,32},{80,0},{120,0}},
-    color={0,0,127}));
-  connect(senExhMasFlo.port_b, port_b2) 
+  connect(senExhMasFlo.port_b, port_b2)
     annotation (Line(points={{-90,-34},{-100,-34},{-100,-60},{-180,-60}},
     color={0,127,255}));
-  connect(senExhMasFlo.port_a, hex.port_b2) annotation (Line(points={{-70,-34},{-16,-34},{-16,-6},{-10,-6}}, 
+  connect(senExhMasFlo.port_a, hex.port_b2) annotation (Line(points={{-70,-34},{-16,-34},{-16,-6},{-10,-6}},
     color={0,127,255}));
   connect(hex.port_b1, senSupMasFlo.port_a)
     annotation (Line(points={{10,6},{32,6}}, color={0,127,255}));
   connect(senSupMasFlo.port_b, port_b1) annotation (Line(points={{52,6},{60,6},{60,80},{100,80}},
     color={0,127,255}));
-  connect(senExhMasFlo.m_flow, effCal.mExh_flow) annotation (Line(points={{-80,-23},{-80,-16},{-106,-16},{-106,4},{-102,4}}, 
+  connect(senExhMasFlo.m_flow, effCal.mExh_flow) annotation (Line(points={{-80,-23},{-80,-16},{-106,-16},{-106,4},{-102,4}},
     color={0,0,127}));
-  connect(senSupMasFlo.m_flow, effCal.mSup_flow) annotation (Line(points={{42,17},{42,26},{-106,26},{-106,8},{-102,8}}, 
+  connect(senSupMasFlo.m_flow, effCal.mSup_flow) annotation (Line(points={{42,17},{42,26},{-106,26},{-106,8},{-102,8}},
     color={0,0,127}));
 annotation (
         defaultComponentName="whe",
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Validation/Effectiveness.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Validation/Effectiveness.mo
index 77eb07f8f58..abffcbe3716 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Validation/Effectiveness.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Validation/Effectiveness.mo
@@ -10,13 +10,6 @@ model Effectiveness
     epsHeaPL=0.6,
     mSup_flow_nominal=1) "Effectiveness calculator"
     annotation (Placement(transformation(extent={{-12,-10},{8,10}})));
-  Modelica.Blocks.Sources.Ramp whSpe(
-    height=0.7,
-    duration=60,
-    offset=0.3,
-    startTime=60)
-    "Wheel speed"
-    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
   Modelica.Blocks.Sources.Ramp TSup(
     height=5,
     duration=60,
@@ -50,8 +43,6 @@ equation
     annotation (Line(points={{-59,70},{-28,70},{-28,8},{-14,8}}, color={0,0,127}));
   connect(VExh.y,epsCal.mExh_flow)
     annotation (Line(points={{-59,30},{-40,30},{-40,4},{-14,4}}, color={0,0,127}));
-  connect(whSpe.y, epsCal.uSpe)
-    annotation (Line(points={{-59,0},{-14,0}}, color={0,0,127}));
   connect(TSup.y, epsCal.TSup)
     annotation (Line(points={{-59,-40},{-40,-40},{-40,-4},{-14,-4}}, color={0,0,127}));
   connect(TExh.y, epsCal.TExh)
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo
index 3508eab3cba..322608e9e67 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo
@@ -6,6 +6,9 @@ model BypassDampers
   parameter Modelica.Units.SI.PressureDifference dpDamper_nominal(displayUnit="Pa") = 20
     "Nominal pressure drop of dampers"
     annotation (Dialog(group="Nominal condition"));
+  parameter Real P_nominal(final unit="W")
+    "Power consumption at the design condition"
+    annotation (Dialog(group="Nominal condition"));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput uBypDamPos(
     final unit="1",
     final min=0,
@@ -43,6 +46,10 @@ model BypassDampers
     final dpDamper_nominal=dpDamper_nominal)
     "Exhaust air bypass damper"
     annotation (Placement(transformation(extent={{0,-70},{-20,-50}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch swiepsSen
+    "Switch the heat exchanger effectiveness 
+    based the wheel operation status"
+    annotation (Placement(transformation(extent={{-52,-22},{-32,-2}})));
 protected
   Modelica.Blocks.Sources.Constant uni(final k=1)
     "Unity signal"
@@ -50,14 +57,14 @@ protected
   Buildings.Controls.OBC.CDL.Reals.Subtract sub
     "Difference of the two inputs"
     annotation (Placement(transformation(extent={{-100,90},{-80,110}})));
-  Modelica.Blocks.Math.BooleanToReal booleanToReal
-    "Convert boolean input to real output"
-    annotation (Placement(transformation(extent={{-160,-10},{-140,10}})));
   Modelica.Blocks.Math.BooleanToReal PEle(
     final realTrue=P_nominal,
     final realFalse=0)
     "Electric power consumption for motor"
     annotation (Placement(transformation(extent={{-160,-90},{-140,-70}})));
+protected
+  Modelica.Blocks.Sources.Constant zero(final k=0) "Zero signal"
+    annotation (Placement(transformation(extent={{-160,22},{-140,42}})));
 equation
   connect(bypDamSup.port_a, port_a1)
     annotation (Line(points={{-60,80},{-180,80}}, color={0,127,255}));
@@ -88,11 +95,6 @@ equation
   connect(uni.y, sub.u1)
     annotation (Line(points={{-119,120},{-110,120},{-110,106},{-102,106}},
     color={0,0,127}));
-  connect(uRot, booleanToReal.u)
-    annotation (Line(points={{-200,0},{-162,0}}, color={255,0,255}));
-  connect(booleanToReal.y, effCal.uSpe)
-    annotation (Line(points={{-139,0},{-120,0},{-120,0},{-102,0}},
-    color={0,0,127}));
   connect(damSup.port_a, port_a1)
     annotation (Line(points={{-60,40},{-100,40},{-100,80},{-180,80}},
     color={0,127,255}));
@@ -102,6 +104,16 @@ equation
     color={0,0,127}));
   connect(bypDamExh.port_b, port_b2)
     annotation (Line(points={{-20,-60},{-180,-60}}, color={0,127,255}));
+  connect(swiepsSen.u2, uRot) annotation (Line(points={{-54,-12},{-60,-12},{-60,
+          -54},{-132,-54},{-132,0},{-200,0}}, color={255,0,255}));
+  connect(zero.y, swiepsSen.u3) annotation (Line(points={{-139,32},{-124,32},{-124,
+          -20},{-54,-20}}, color={0,0,127}));
+  connect(effCal.eps, swiepsSen.u1) annotation (Line(points={{-78,0},{-60,0},{-60,
+          -4},{-54,-4}}, color={0,0,127}));
+  connect(swiepsSen.y, hex.eps) annotation (Line(points={{-30,-12},{-20,-12},{-20,
+          0},{-12,0}}, color={0,0,127}));
+  connect(swiepsSen.y, eps) annotation (Line(points={{-30,-12},{-20,-12},{-20,-20},
+          {80,-20},{80,0},{120,0}}, color={0,0,127}));
 annotation (
         defaultComponentName="whe",
         Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo
index 08d818d3178..378e897947c 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo
@@ -28,6 +28,8 @@ model SpaceCooling "Space cooling system"
     "Nominal air humidity ratio supplied to room [kg/kg] assuming 90% relative humidity";
   parameter Modelica.Units.SI.Temperature TRooSet=297.15
     "Nominal room air temperature";
+  parameter Modelica.Units.SI.Temperature TMixSet=297.15
+    "Nominal mixed air temperature";
   parameter Modelica.Units.SI.Temperature TOut_nominal=303.15
     "Design outlet air temperature";
   parameter Modelica.Units.SI.Temperature THeaRecLvg=TOut_nominal - eps*(
@@ -111,8 +113,8 @@ model SpaceCooling "Space cooling system"
     use_m_flow_in=true,
     T=TWSup_nominal) "Source for water flow rate"
     annotation (Placement(transformation(extent={{-20,-110},{0,-90}})));
-  Buildings.Fluid.Sources.Boundary_pT sinWat(nPorts=1, redeclare package Medium
-      = MediumW) "Sink for water circuit"
+  Buildings.Fluid.Sources.Boundary_pT sinWat(nPorts=1, redeclare package Medium =
+        MediumW) "Sink for water circuit"
     annotation (Placement(transformation(extent={{-80,-76},{-60,-56}})));
   Buildings.BoundaryConditions.WeatherData.ReaderTMY3 weaDat(
     pAtmSou=Buildings.BoundaryConditions.Types.DataSource.Parameter,
@@ -157,13 +159,11 @@ model SpaceCooling "Space cooling system"
     shift=0.25*86400)
               "Operating signal"
     annotation (Placement(transformation(extent={{-172,10},{-152,30}})));
-  Modelica.Blocks.Sources.Ramp bypDamPos(
-    height=0.5,
-    duration=86400/4,
-    offset=0,
-    startTime=15552000 + 12*3600)
-    "Bypass damper position"
-    annotation (Placement(transformation(extent={{-170,-60},{-150,-40}})));
+  Buildings.Controls.Continuous.LimPID conPID(k=0.1, Ti=60)
+    annotation (Placement(transformation(extent={{-46,10},{-26,30}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TMixSetPoi(k=TMixSet)
+    "Mixed air temperature set point"
+    annotation (Placement(transformation(extent={{-88,10},{-68,30}})));
 equation
   connect(theCon.port_b, vol.heatPort) annotation (Line(
       points={{40,50},{50,50},{50,30},{60,30}},
@@ -263,9 +263,12 @@ equation
   connect(opeSig.y, whe.uRot) annotation (Line(
       points={{-150,20},{-116,20},{-116,-18},{-112,-18}},
       color={255,0,255}));
-  connect(bypDamPos.y, whe.uBypDamPos) annotation (Line(
-      points={{-149,-50},{-118,-50},{-118,-26},{-112,-26}},
-      color={0,0,127}));
+  connect(TMixSetPoi.y,conPID. u_s)
+    annotation (Line(points={{-66,20},{-48,20}}, color={0,0,127}));
+  connect(senTemHXOut.T,conPID. u_m) annotation (Line(points={{-70,-13.4},{-70,0},
+          {-36,0},{-36,8}}, color={0,0,127}));
+  connect(conPID.y, whe.uBypDamPos) annotation (Line(points={{-25,20},{-16,20},{
+          -16,-80},{-114,-80},{-114,-26},{-112,-26}}, color={0,0,127}));
   annotation (Documentation(info="<html>
 <p>
 This block is identical to
@@ -283,8 +286,8 @@ The operating signal <i>uRot</i> changes from <code>false</code> to <code>true</
 and from <code>false</code> to <code>true</code> at 18:00 (15552000+18*3600 seconds).
 </li>
 <li>
-The bypass damper position <i>uBypDamPos</i> changes from <i>0</i> to <i>0.5</i> 
-during the period from 12:00 to 18:00.
+The bypass damper positions are controlled to maintain the temperature of the air leaving the thermal wheel, 
+<code>senTemHXOut.T</code>, at 297.15 K.
 </li>
 </ul>
 <p>
@@ -292,11 +295,11 @@ The expected outputs are:
 </p>
 <ul>
 <li>
-The outdoor temperature, <code>TOut.T</code>, and the temperature of the air leaving the exchanger, senTemHXOut.T,
-becomes different at 6:00.
+The outdoor temperature, <code>TOut.T</code>, and <code>senTemHXOut.T</code>
+are different during the period from 6:00 to 18:00.
 </li>
 <li>
-Their difference equals <i>0</i> after 18:00.
+During the same period, <code>senTemHXOut.T</code> is close to 297.15 K.
 </li>
 </ul>
 </html>", revisions="<html>
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/SpeedControlled.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/SpeedControlled.mo
index ce22dd9316c..8623fc7dfbe 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/SpeedControlled.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/SpeedControlled.mo
@@ -3,55 +3,43 @@ model SpeedControlled
   "Sensible heat recovery wheel with a variable speed drive"
   extends
     Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.BaseClasses.PartialWheel;
-  parameter Boolean defaultMotorEfficiencyCurve = true
-    "Set to true for using the default motor efficiency curve, or false for using the user-defined motor efficiency curve"
-    annotation (Dialog(group="Efficiency"));
-  parameter Real table[:,:]=[0.8,1]
-    "Table of user-defined motor efficiency curve:(first column:the wheel speed ratio, second column:the percent full-load efficiency)"
-    annotation (Dialog(group="Efficiency", enable = not defaultMotorEfficiencyCurve));
-  final parameter
-    Buildings.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters_yMot
-      motorEfficiency_default=
-        Buildings.Fluid.Movers.BaseClasses.Characteristics.motorEfficiencyCurve(
-          P_nominal=P_nominal,
-          eta_max=1)
-    "Default motor efficiency curve";
-  final parameter Real xSpe[:] = if defaultMotorEfficiencyCurve then motorEfficiency_default.y else table[:,1]
-    "x-axis support points of the power efficiency curve"
-    annotation (Dialog(group="Efficiency"));
-  final parameter Real[size(xSpe,1)] yeta = if defaultMotorEfficiencyCurve then motorEfficiency_default.eta else table[:,2]
-    "y-axis support points of the power efficiency curve"
-    annotation (Dialog(group="Efficiency"));
+  parameter
+    Buildings.Fluid.BaseClasses.VariableSpeedWheel.BaseClasses.Data.Generic
+    per
+    "Record with performance data"
+    annotation (Placement(transformation(extent={{28,78},{48,98}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput uSpe(
     final unit="1",
     final max=1)
     "Wheel speed ratio"
     annotation (Placement(transformation(extent={{-220,-20},{-180,20}}),
         iconTransformation(extent={{-140,-20},{-100,20}})));
-protected
-  Modelica.Blocks.Sources.RealExpression PEle(
-    final y=P_nominal*uSpe/Buildings.Utilities.Math.Functions.smoothInterpolation(
-      x=uSpe,
-      xSup=xSpe,
-      ySup=yeta))
-    "Electric power consumption"
-    annotation (Placement(transformation(extent={{60,-100},{80,-80}})));
+  Buildings.Fluid.BaseClasses.VariableSpeedWheel.Sensible
+    senWhe(final per=per)
+    "Correct the wheel performance based on the wheel speed"
+    annotation (Placement(transformation(extent={{-140,-90},{-120,-70}})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply mul
+    "Correct the heat exchanger effectiveness"
+    annotation (Placement(transformation(extent={{-54,-24},{-34,-4}})));
+
 
-initial equation
-  assert(table[end,1] < 1 or defaultMotorEfficiencyCurve,
-         "In " + getInstanceName() + ": Power efficiency curve is wrong. 
-         No need to define efficiency for the nominal condition",
-         level=AssertionLevel.error)
-         "Check if the motor efficiency for the nominal condition is defined in the user-defined curve";
 equation
-  connect(P, PEle.y)
-    annotation (Line(points={{120,-90},{81,-90}}, color={0,0,127}));
   connect(port_a1, hex.port_a1) annotation (Line(points={{-180,80},{-60,80},{-60,6},
     {-10,6}}, color={0,127,255}));
   connect(hex.port_a2, port_a2) annotation (Line(points={{10,-6},{60,-6},{60,-60},
     {100,-60}}, color={0,127,255}));
-  connect(effCal.uSpe, uSpe)
-    annotation (Line(points={{-102,0},{-200,0}}, color={0,0,127}));
+  connect(senWhe.epsSenCor, mul.u2) annotation (Line(points={{-118,-80},{-64,-80},
+          {-64,-20},{-56,-20}}, color={0,0,127}));
+  connect(effCal.eps, mul.u1) annotation (Line(points={{-78,0},{-64,0},{-64,-8},
+          {-56,-8}}, color={0,0,127}));
+  connect(mul.y, hex.eps) annotation (Line(points={{-32,-14},{-20,-14},{-20,0},{
+          -12,0}}, color={0,0,127}));
+  connect(uSpe, senWhe.uSpe) annotation (Line(points={{-200,0},{-170,0},{-170,-80},
+          {-142,-80}}, color={0,0,127}));
+  connect(senWhe.P, P) annotation (Line(points={{-118,-72},{40,-72},{40,-90},{
+          120,-90}}, color={0,0,127}));
+  connect(eps, mul.y) annotation (Line(points={{120,0},{80,0},{80,-14},{-32,-14}},
+        color={0,0,127}));
 annotation (
         defaultComponentName="whe",
         Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
@@ -75,43 +63,9 @@ exchanger effectiveness in both heating and cooling conditions.
 </p>
 <p>
 The operation of the heat recovery wheel is adjustable by modulating the wheel speed.
-</p>
-<p>
-Accordingly, the power consumption of this wheel is calculated by
-</p>
-<p align=\"center\" style=\"font-style:italic;\">
-P = P_nominal * uSpe / eta,
-</p>
-<p>
-where <code>P_nominal</code> is the nominal wheel power consumption,
-<code>uSpe</code> is the wheel speed ratio.
-The <code>eta</code> is the motor percent full-load efficiency, i.e.,
-the ratio of the motor efficiency to that when the <code>uSpe</code> is <i>1</i>.   
-There are two ways to define <code>eta</code>:
-</p>
-<ul>
-<li>
-Default curves in U.S. DOE (2014).
-</li>
-<li>
-Polynomial fit based on the user input data table.
-</li>
-</ul>
-<p>
-One can switch between those two options with the parameter <code>defaultMotorEfficiencyCurve</code>.
-</p>
-<p>
-The sensible and latent effectiveness is calculated with
-<a href=\"modelica://Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BaseClasses.Effectiveness\">
-Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BaseClasses.Effectiveness</a>.
-</p>
-<h4>References</h4>
-<p>
-U.S. DOE (2014).
-<i>Determining Electric Motor Load and Efficiency.</i>
-URL:
-<a href=\"https://www.energy.gov/sites/prod/files/2014/04/f15/10097517.pdf\">
-https://www.energy.gov/sites/prod/files/2014/04/f15/10097517.pdf</a>
+See details about the impacts of the wheel speed in 
+<a href=\"modelica://Buildings.Fluid.BaseClasses.VariableSpeedWheel.Sensible\">
+Buildings.Fluid.BaseClasses.VariableSpeedWheel.Sensible</a>.
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mo
index d58565ddfd7..f2fb44e4f0e 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mo
@@ -42,12 +42,12 @@ model SpeedControlled
     nPorts=2)
     "Supply air source"
     annotation (Placement(transformation(extent={{-40,20},{-20,40}})));
-  Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.SpeedControlled wheUseDefCur(
+  Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.SpeedControlled
+    wheUseDefCur(
     redeclare package Medium = Medium,
     mSup_flow_nominal=5,
     mExh_flow_nominal=5,
-    P_nominal=100,
-    defaultMotorEfficiencyCurve=false)
+    per=per)
     "Wheel with a user-defined curve"
     annotation (Placement(transformation(extent={{0,0},{20,20}})));
   Modelica.Blocks.Sources.Ramp wheSpe(
@@ -67,43 +67,53 @@ model SpeedControlled
     m_flow_nominal=5)
     "Temperature of the supply air"
     annotation (Placement(transformation(extent={{60,20},{40,40}})));
-  Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.SpeedControlled wheDefCur(
+  Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.SpeedControlled
+    wheDefCur(
     redeclare package Medium = Medium,
     mSup_flow_nominal=5,
     mExh_flow_nominal=5,
-    P_nominal=100) "Wheel with a default curve"
+    per=perDefMotCur)    "Wheel with a default curve"
     annotation (Placement(transformation(extent={{0,-30},{20,-10}})));
+  Buildings.Fluid.BaseClasses.VariableSpeedWheel.BaseClasses.Data.ASHRAE per(
+    motorEfficiency_uSpe(y={0.1,0.6,0.8,1}, eta={0.3,0.4,0.6,1}),
+    haveLatentHeatExchange=false,
+    useDefaultMotorEfficiencyCurve=false)
+    "Performance record for the sensible heat wheet"
+    annotation (Placement(transformation(extent={{-34,60},{-14,80}})));
+  Buildings.Fluid.BaseClasses.VariableSpeedWheel.BaseClasses.Data.ASHRAE perDefMotCur(
+      haveLatentHeatExchange=true, useDefaultMotorEfficiencyCurve=true)
+    "Performance record for the sensible heat wheet with default motor curve"
+    annotation (Placement(transformation(extent={{6,60},{26,80}})));
 equation
   connect(TSup.y, sou_1.T_in)
     annotation (Line(points={{-59,34},{-42,34}}, color={0,0,127}));
-  connect(sou_1.ports[1], wheUseDefCur.port_a1) 
+  connect(sou_1.ports[1], wheUseDefCur.port_a1)
     annotation (Line(points={{-20,29},
     {-10,29},{-10,16},{0,16}}, color={0,127,255}));
-  connect(wheUseDefCur.port_a2, sou_2.ports[1]) 
+  connect(wheUseDefCur.port_a2, sou_2.ports[1])
     annotation (Line(points={{20,4},{40,4},{40,-31},{70,-31}},
     color={0,127,255}));
-  connect(wheSpe.y, wheUseDefCur.uSpe) 
-    annotation (Line(points={{-59,0},{-30,0},{-30,10},{-2,10}}, 
+  connect(wheSpe.y, wheUseDefCur.uSpe)
+    annotation (Line(points={{-59,0},{-30,0},{-30,10},{-2,10}},
     color={0,0,127}));
-  connect(wheUseDefCur.port_b2, senExhTem.port_a) 
+  connect(wheUseDefCur.port_b2, senExhTem.port_a)
     annotation (Line(points={{0,4},{-6,4},{-6,-42},{-20,-42}},  color={0,127,255}));
   connect(senExhTem.port_b, sin_2.ports[1])
     annotation (Line(points={{-40,-42},{-48,-42},{-48,-41},{-58,-41}},
     color={0,127,255}));
-  connect(senSupTem.port_b, wheUseDefCur.port_b1) 
+  connect(senSupTem.port_b, wheUseDefCur.port_b1)
     annotation (Line(points={{40,30},{28,30},{28,16},{20,16}}, color={0,127,255}));
-  connect(wheDefCur.port_a1, sou_1.ports[2]) 
+  connect(wheDefCur.port_a1, sou_1.ports[2])
     annotation (Line(points={{0,-14},{-14,-14},{-14,31},{-20,31}}, color={0,127,255}));
-  connect(wheDefCur.port_b1, sin_1.ports[1]) \
-    annotation (Line(points={{20,-14},{36,-14},{36,22},{64,22},{64,29},{72,29}}, 
+  connect(wheDefCur.port_b1, sin_1.ports[1])       annotation (Line(points={{20,-14},{36,-14},{36,22},{64,22},{64,29},{72,29}},
     color={0,127,255}));
-  connect(wheDefCur.port_b2, sin_2.ports[2]) annotation (Line(points={{0,-26},{-48,-26},{-48,-39},{-58,-39}}, 
+  connect(wheDefCur.port_b2, sin_2.ports[2]) annotation (Line(points={{0,-26},{-48,-26},{-48,-39},{-58,-39}},
     color={0,127,255}));
-  connect(wheDefCur.port_a2, sou_2.ports[2]) annotation (Line(points={{20,-26},{52,-26},{52,-29},{70,-29}}, 
+  connect(wheDefCur.port_a2, sou_2.ports[2]) annotation (Line(points={{20,-26},{52,-26},{52,-29},{70,-29}},
     color={0,127,255}));
   connect(wheDefCur.uSpe, wheSpe.y) annotation (Line(points={{-2,-20},{-30,-20},{-30,0},{-59,0}},
     color={0,0,127}));
-  connect(senSupTem.port_a, sin_1.ports[2]) annotation (Line(points={{60,30},{66,30},{66,31},{72,31}}, 
+  connect(senSupTem.port_a, sin_1.ports[2]) annotation (Line(points={{60,30},{66,30},{66,31},{72,31}},
     color={0,127,255}));
 annotation(experiment(Tolerance=1e-6, StopTime=360),
 __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mos"
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/VariableSpeedWheel/Validation/VariableSpeedWheel.mos b/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/VariableSpeedWheel/Validation/VariableSpeedWheel.mos
new file mode 100644
index 00000000000..3200d04dc3c
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/VariableSpeedWheel/Validation/VariableSpeedWheel.mos
@@ -0,0 +1,4 @@
+simulateModel("Buildings.Fluid.BaseClasses.VariableSpeedWheel.Validation.VariableSpeedWheel",method="CVode", startTime=0, stopTime=1, tolerance=1e-8, resultFile="VariableSpeedWheel");
+createPlot(id=1, position={55, 55, 820, 572}, y={"senWhe.uSpe"}, range={0.0, 1.0, -0.5, 1.5}, grid=true, subPlot=101, colors={{28,108,200}}, timeUnit="s", displayUnits={"1"});
+createPlot(id=1, position={55, 55, 820, 572}, y={"senWhe.P", "latWheDefMotCur.P"}, range={0.0, 1.0, -50.0, 150.0}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"W", "W"});
+createPlot(id=1, position={55, 55, 820, 572}, y={"latWheDefMotCur.epsSenCor", "latWheDefMotCur.epsLatCor"}, range={0.0, 1.0, 0.0, 1.5}, grid=true, subPlot=103, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"1", "1"});
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Validation/Effectiveness.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Validation/Effectiveness.mos
index 3f26ef8f7c6..b34c10b2176 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Validation/Effectiveness.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Validation/Effectiveness.mos
@@ -1,5 +1,4 @@
 simulateModel("Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BaseClasses.Validation.Effectiveness", stopTime=120, method="CVode", tolerance=1e-6, resultFile="Effectiveness");
-createPlot(id=1, position={55, 14, 975, 618}, y={"whSpe.y"}, range={0.0, 120.0, 0.0, 2.0}, grid=true, subPlot=101, colors={{28,108,200}}, timeUnit="s", displayUnits={"1"});
-createPlot(id=1, position={55, 14, 975, 618}, y={"TSup.y", "TExh.y"}, range={0.0, 120.0, 280.0, 320.0}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"K", "K"});
-createPlot(id=1, position={55, 14, 975, 618}, y={"VSup.y", "VExh.y"}, range={0.0, 120.0, 0.0, 2.0}, grid=true, subPlot=103, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"m3/s", "m3/s"});
-createPlot(id=1, position={55, 14, 975, 618}, y={"epsCal.epsSen", "epsCal.epsLat"}, range={0.0, 120.0, 0.0, 1.0}, grid=true, subPlot=104, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"1", "1"});
+createPlot(id=1, position={55, 14, 975, 618}, y={"TSup.y", "TExh.y"}, range={0.0, 120.0, 280.0, 320.0}, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"K", "K"});
+createPlot(id=1, position={55, 14, 975, 618}, y={"VSup.y", "VExh.y"}, range={0.0, 120.0, 0.0, 2.0}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"m3/s", "m3/s"});
+createPlot(id=1, position={55, 14, 975, 618}, y={"epsCal.epsSen", "epsCal.epsLat"}, range={0.0, 120.0, 0.0, 1.0}, grid=true, subPlot=103, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"1", "1"});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mos
index f75e02aeac3..9b2a30986a2 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mos
@@ -13,5 +13,6 @@ createPlot(id = 1,position = {15, 10, 751, 680}, y = {"vol.T_start", "vol.T", "T
 LinePattern.Dash},
  thicknesses = {0.25, 0.5, 0.25, 0.25, 0.25});
 createPlot(id=1, position={15, 10, 751, 680}, y={"opeSig.y"}, range={15550000.0, 15640000.0, 10.0, 30.0}, autoscale=false, grid=true, subPlot=102, colors={{28,108,200}}, timeUnit="s");
-createPlot(id=1, position={15, 10, 751, 680}, y={"TOut.T", "senTemHXOut.T"}, range={15550000.0, 15640000.0, 10.0, 30.0}, grid=true, subPlot=103, colors={{0,128,0}, {28,108,200}}, timeUnit="s", displayUnits={"degC", "degC"});
+createPlot(id=1, position={17, -11, 751, 680}, y={"TOut.T", "senTemHXOut.T", "TMixSetPoi.y"}, range={15550000.0, 15640000.0, 280.0, 305.0}, grid=true, subPlot=103, colors={{0,128,0}, {28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"K", "K", ""});
 createPlot(id=2, position={95, 95, 734, 454}, y={"whe.port_a1.Xi_outflow[1]", "whe.port_b1.Xi_outflow[1]"}, range={15550000.0, 15640000.0, 0.007, 0.015}, grid=true, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"kg/kg", "kg/kg"});
+createPlot(id=1, position={35, 0, 751, 680}, y={"whe.senSupMasFlo.m_flow"}, range={15550000.0, 15640000.0, -0.5, 1.0}, grid=true, subPlot=104, colors={{28,108,200}}, timeUnit="s", displayUnits={"kg/s"});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Validation/Effectiveness.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Validation/Effectiveness.mos
index 9ca08193496..8b787dafa73 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Validation/Effectiveness.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Validation/Effectiveness.mos
@@ -1,5 +1,4 @@
 simulateModel("Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.BaseClasses.Validation.Effectiveness", stopTime=120, method="CVode", tolerance=1e-6, resultFile="Effectiveness");
-createPlot(id=1, position={55, 14, 975, 618}, y={"whSpe.y"}, range={0.0, 120.0, 0.0, 2.0}, grid=true, subPlot=101, colors={{28,108,200}}, timeUnit="s", displayUnits={"1"});
-createPlot(id=1, position={55, 14, 975, 618}, y={"TSup.y", "TExh.y"}, range={0.0, 120.0, 280.0, 320.0}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"K", "K"});
-createPlot(id=1, position={55, 14, 975, 618}, y={"VSup.y", "VExh.y"}, range={0.0, 120.0, 0.0, 2.0}, grid=true, subPlot=103, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"m3/s", "m3/s"});
-createPlot(id=1, position={55, 14, 975, 618}, y={"epsCal.eps"}, range={0.0, 120.0, 0.0, 1.0}, grid=true, subPlot=104, colors={{28,108,200}}, timeUnit="s", displayUnits={"1"});
+createPlot(id=1, position={55, 14, 975, 618}, y={"TSup.y", "TExh.y"}, range={0.0, 120.0, 280.0, 320.0}, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"K", "K"});
+createPlot(id=1, position={55, 14, 975, 618}, y={"VSup.y", "VExh.y"}, range={0.0, 120.0, 0.0, 2.0}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"m3/s", "m3/s"});
+createPlot(id=1, position={55, 14, 975, 618}, y={"epsCal.eps"}, range={0.0, 120.0, 0.0, 1.0}, grid=true, subPlot=103, colors={{28,108,200}}, timeUnit="s", displayUnits={"1"});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mos
index 29333dbc6e5..5c6a6ac88d3 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mos
@@ -13,5 +13,5 @@ createPlot(id = 1,position = {15, 10, 751, 680}, y = {"vol.T_start", "vol.T", "T
 LinePattern.Dash},
  thicknesses = {0.25, 0.5, 0.25, 0.25, 0.25});
 createPlot(id=1, position={15, 10, 751, 680}, y={"opeSig.y"}, range={15550000.0, 15640000.0, 10.0, 30.0}, autoscale=false, grid=true, subPlot=102, colors={{28,108,200}}, timeUnit="s");
-createPlot(id=1, position={15, 10, 751, 680}, y={"TOut.T", "senTemHXOut.T"}, range={15550000.0, 15640000.0, 10.0, 30.0}, grid=true, subPlot=103, colors={{0,128,0}, {28,108,200}}, timeUnit="s", displayUnits={"degC", "degC"});
-
+createPlot(id=1, position={17, -11, 751, 680}, y={"TOut.T", "senTemHXOut.T", "TMixSetPoi.y"}, range={15550000.0, 15640000.0, 280.0, 305.0}, grid=true, subPlot=103, colors={{0,128,0}, {28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"K", "K", ""});
+createPlot(id=1, position={35, 0, 751, 680}, y={"whe.senSupMasFlo.m_flow"}, range={15550000.0, 15640000.0, -0.5, 1.0}, grid=true, subPlot=104, colors={{28,108,200}}, timeUnit="s", displayUnits={"kg/s"});

From 01c29ac4409b35ea4b67d3eff25022447cb093b2 Mon Sep 17 00:00:00 2001
From: SenHuang19 <jhy1987@gmail.com>
Date: Fri, 14 Jun 2024 14:13:13 -0400
Subject: [PATCH 08/27] update the model directory

---
 .../BaseClasses/Characteristics/package.order |  1 -
 .../Validation/package.order                  |  1 -
 Buildings/Fluid/BaseClasses/package.order     |  1 -
 .../effectivenessParameters.mo                |  7 ++-
 .../efficiencyParameters_yMot.mo              | 26 +++++++++++
 .../BaseClasses/Characteristics/package.mo    |  2 +-
 .../BaseClasses/Characteristics/package.order |  2 +
 .../BaseClasses/Data/ASHRAE.mo                | 12 +++---
 .../BaseClasses/Data/Generic.mo               | 14 +++---
 .../BaseClasses/Data/package.mo               |  2 +-
 .../BaseClasses/Data/package.order            |  0
 .../BaseClasses/package.mo                    |  4 +-
 .../BaseClasses/package.order                 |  0
 .../VariableSpeedThermalWheels}/Latent.mo     | 12 +++---
 .../VariableSpeedThermalWheels}/Sensible.mo   | 17 +++-----
 .../Validation/VariableSpeedThermalWheels.mo} | 43 +++++++++----------
 .../Validation/package.mo                     |  6 +--
 .../Validation/package.order                  |  1 +
 .../VariableSpeedThermalWheels}/package.mo    |  6 +--
 .../VariableSpeedThermalWheels}/package.order |  0
 20 files changed, 89 insertions(+), 68 deletions(-)
 delete mode 100644 Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Characteristics/package.order
 delete mode 100644 Buildings/Fluid/BaseClasses/VariableSpeedWheel/Validation/package.order
 rename Buildings/Fluid/{BaseClasses/VariableSpeedWheel => HeatExchangers/BaseClasses/VariableSpeedThermalWheels}/BaseClasses/Characteristics/effectivenessParameters.mo (70%)
 create mode 100644 Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/efficiencyParameters_yMot.mo
 rename Buildings/Fluid/{BaseClasses/VariableSpeedWheel => HeatExchangers/BaseClasses/VariableSpeedThermalWheels}/BaseClasses/Characteristics/package.mo (68%)
 create mode 100644 Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/package.order
 rename Buildings/Fluid/{BaseClasses/VariableSpeedWheel => HeatExchangers/BaseClasses/VariableSpeedThermalWheels}/BaseClasses/Data/ASHRAE.mo (60%)
 rename Buildings/Fluid/{BaseClasses/VariableSpeedWheel => HeatExchangers/BaseClasses/VariableSpeedThermalWheels}/BaseClasses/Data/Generic.mo (85%)
 rename Buildings/Fluid/{BaseClasses/VariableSpeedWheel => HeatExchangers/BaseClasses/VariableSpeedThermalWheels}/BaseClasses/Data/package.mo (70%)
 rename Buildings/Fluid/{BaseClasses/VariableSpeedWheel => HeatExchangers/BaseClasses/VariableSpeedThermalWheels}/BaseClasses/Data/package.order (100%)
 rename Buildings/Fluid/{BaseClasses/VariableSpeedWheel => HeatExchangers/BaseClasses/VariableSpeedThermalWheels}/BaseClasses/package.mo (59%)
 rename Buildings/Fluid/{BaseClasses/VariableSpeedWheel => HeatExchangers/BaseClasses/VariableSpeedThermalWheels}/BaseClasses/package.order (100%)
 rename Buildings/Fluid/{BaseClasses/VariableSpeedWheel => HeatExchangers/BaseClasses/VariableSpeedThermalWheels}/Latent.mo (70%)
 rename Buildings/Fluid/{BaseClasses/VariableSpeedWheel => HeatExchangers/BaseClasses/VariableSpeedThermalWheels}/Sensible.mo (86%)
 rename Buildings/Fluid/{BaseClasses/VariableSpeedWheel/Validation/VariableSpeedWheel.mo => HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/VariableSpeedThermalWheels.mo} (63%)
 rename Buildings/Fluid/{BaseClasses/VariableSpeedWheel => HeatExchangers/BaseClasses/VariableSpeedThermalWheels}/Validation/package.mo (71%)
 create mode 100644 Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/package.order
 rename Buildings/Fluid/{BaseClasses/VariableSpeedWheel => HeatExchangers/BaseClasses/VariableSpeedThermalWheels}/package.mo (63%)
 rename Buildings/Fluid/{BaseClasses/VariableSpeedWheel => HeatExchangers/BaseClasses/VariableSpeedThermalWheels}/package.order (100%)

diff --git a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Characteristics/package.order b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Characteristics/package.order
deleted file mode 100644
index cde6f8a1741..00000000000
--- a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Characteristics/package.order
+++ /dev/null
@@ -1 +0,0 @@
-effectivenessParameters
diff --git a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/Validation/package.order b/Buildings/Fluid/BaseClasses/VariableSpeedWheel/Validation/package.order
deleted file mode 100644
index d670ac2675b..00000000000
--- a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/Validation/package.order
+++ /dev/null
@@ -1 +0,0 @@
-VariableSpeedWheel
diff --git a/Buildings/Fluid/BaseClasses/package.order b/Buildings/Fluid/BaseClasses/package.order
index f6f6cfcc314..942b2276fe9 100644
--- a/Buildings/Fluid/BaseClasses/package.order
+++ b/Buildings/Fluid/BaseClasses/package.order
@@ -4,5 +4,4 @@ MassFlowRateMultiplier
 PartialResistance
 PartialThreeWayResistance
 FlowModels
-VariableSpeedWheel
 Validation
diff --git a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Characteristics/effectivenessParameters.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/effectivenessParameters.mo
similarity index 70%
rename from Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Characteristics/effectivenessParameters.mo
rename to Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/effectivenessParameters.mo
index 439c517fbf4..a759980147c 100644
--- a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Characteristics/effectivenessParameters.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/effectivenessParameters.mo
@@ -1,4 +1,4 @@
-within Buildings.Fluid.BaseClasses.VariableSpeedWheel.BaseClasses.Characteristics;
+within Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Characteristics;
 record effectivenessParameters
   "Record for heat exchange effectiveness correction vs. wheel speed ratio"
   extends Modelica.Icons.Record;
@@ -10,9 +10,8 @@ record effectivenessParameters
 <p>
 Data record for performance data that describe wheel speed ratio versus
 heat exchange effectiveness corrections.
-The wheel speed ratio <code>uSpe</code> and the heat exchange effectiveness corrections 
-<code>epsCor</code> must be increasing, i.e.,<code>uSpe[i] &lt; uSpe[i+1]</code>,
-<code>epsCor[i] &lt; epsCor[i+1]</code>.
+The wheel speed ratio <code>uSpe</code> must be increasing, 
+i.e.,<code>uSpe[i] &lt; uSpe[i+1]</code>.
 Both vectors, <code>uSpe</code> and <code>uSpe</code>
 must have the same size.
 </p>
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/efficiencyParameters_yMot.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/efficiencyParameters_yMot.mo
new file mode 100644
index 00000000000..d57d20e57d0
--- /dev/null
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/efficiencyParameters_yMot.mo
@@ -0,0 +1,26 @@
+within Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Characteristics;
+record efficiencyParameters_yMot
+  "Record for efficiency parameters vs. motor part load ratio"
+  extends Modelica.Icons.Record;
+  parameter Real y[:](each min=0)
+    "Part load ratio, y = PEle/PEle_nominal";
+  parameter Modelica.Units.SI.Efficiency eta[size(y, 1)](each max=1)
+    "Wheel motor efficiency at these part load ratios";
+  annotation (Documentation(info="<html>
+<p>
+This function is identical to
+<a href=\"modelica://Buildings.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters_yMot\">
+Buildings.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters_yMot</a>,
+with the original definition expanded to cover wheels.
+</p>
+</html>",
+revisions="<html>
+<ul>
+<li>
+June 11, 2024, by Sen Huang:<br/>
+First implementation based on <a href=\"modelica://Buildings.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters_yMot\">
+Buildings.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters_yMot</a>.
+</li>
+</ul>
+</html>"));
+end efficiencyParameters_yMot;
diff --git a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Characteristics/package.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/package.mo
similarity index 68%
rename from Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Characteristics/package.mo
rename to Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/package.mo
index 5944588fb46..9000c8d64a3 100644
--- a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Characteristics/package.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Fluid.BaseClasses.VariableSpeedWheel.BaseClasses;
+within Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses;
 package Characteristics "Functions for wheel characteristics"
 
 annotation (Documentation(info="<html>
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/package.order b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/package.order
new file mode 100644
index 00000000000..6d78b76079d
--- /dev/null
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/package.order
@@ -0,0 +1,2 @@
+effectivenessParameters
+efficiencyParameters_yMot
diff --git a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Data/ASHRAE.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/ASHRAE.mo
similarity index 60%
rename from Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Data/ASHRAE.mo
rename to Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/ASHRAE.mo
index 9e665966e95..1e564adb4e1 100644
--- a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Data/ASHRAE.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/ASHRAE.mo
@@ -1,10 +1,10 @@
-within Buildings.Fluid.BaseClasses.VariableSpeedWheel.BaseClasses.Data;
+within Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data;
 record ASHRAE =
-  Buildings.Fluid.BaseClasses.VariableSpeedWheel.BaseClasses.Data.Generic (
-    senHeatExchangeEffectiveness(uSpe={0.1,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,1},
-        epsCor={0.40,0.71,0.83,0.90,0.93,0.96,0.97,0.98,0.99,1}),
-    latHeatExchangeEffectiveness(uSpe={0.1,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,1},
-        epsCor={0.26,0.26,0.37,0.58,0.72,0.81,0.86,0.90,0.96,1}))
+  Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.Generic
+    (senHeatExchangeEffectiveness(uSpe={0,0.1,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,1},
+        epsCor={0,0.40,0.71,0.83,0.90,0.93,0.96,0.97,0.98,0.99,1}),
+      latHeatExchangeEffectiveness(uSpe={0,0.15,0.3,0.4,0.5,0.6,0.7,0.8,0.9,1},
+        epsCor={0,0.26,0.37,0.58,0.72,0.81,0.86,0.90,0.96,1}))
       "Default data record for wheels"
   annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
         coordinateSystem(preserveAspectRatio=false)),
diff --git a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Data/Generic.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/Generic.mo
similarity index 85%
rename from Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Data/Generic.mo
rename to Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/Generic.mo
index 8b45103a3ba..0d797d9a3a0 100644
--- a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Data/Generic.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/Generic.mo
@@ -1,7 +1,7 @@
-within Buildings.Fluid.BaseClasses.VariableSpeedWheel.BaseClasses.Data;
+within Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data;
 record Generic "Generic data record for wheels"
   extends Modelica.Icons.Record;
-  import cha = Buildings.Fluid.BaseClasses.VariableSpeedWheel.BaseClasses.Characteristics;
+  import cha = Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Characteristics;
   parameter Real P_nominal(final unit="W")=100
     "Power consumption at the design condition";
   parameter
@@ -20,13 +20,13 @@ record Generic "Generic data record for wheels"
     annotation (Dialog(group="Heat exchange effectiveness computation",
                 enable=haveLatentHeatExchange));
   parameter
-    Buildings.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters_yMot
+    cha.efficiencyParameters_yMot
     motorEfficiency_uSpe(y={0}, eta={0.7})
     "Motor efficiency vs. wheel speed ratio"
     annotation (Dialog(group="Power computation", enable=useDefaultMotorEfficiencyCurve ==
       false));
   final parameter
-    Buildings.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters_yMot
+    cha.efficiencyParameters_yMot
     motorEfficiency_default=
     Buildings.Fluid.Movers.BaseClasses.Characteristics.motorEfficiencyCurve(
          P_nominal=P_nominal,
@@ -53,8 +53,8 @@ Record containing power and heat exchange parameters for wheels.
 <p>
 It is used as a template for performance data
 for the variable-speed wheel models in
-<a href=\"modelica://Buildings.Fluid.BaseClasses.VariableSpeedWheel\">
-Buildings.Fluid.BaseClasses.VariableSpeedWheel</a>.
+<a href=\"modelica://Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels\">
+Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels</a>.
 </p>
 <p>
 The record contains four curves:
@@ -66,7 +66,7 @@ efficiency
 </li>
 <li>
 wheel speed ratio versus default motor percent full-load 
-efficiency (see <a href=
+efficiency (see the definition in <a href=
 \"modelica://Buildings.Fluid.Movers.BaseClasses.Characteristics.motorEfficiencyCurve\">
 Buildings.Fluid.Movers.BaseClasses.Characteristics.motorEfficiencyCurve</a>.)
 </li>
diff --git a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Data/package.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/package.mo
similarity index 70%
rename from Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Data/package.mo
rename to Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/package.mo
index 2df406e64a9..7228db38be2 100644
--- a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Data/package.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Fluid.BaseClasses.VariableSpeedWheel.BaseClasses;
+within Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses;
 package Data "Performance data for desiccant dehumidifier"
 extends Modelica.Icons.MaterialPropertiesPackage;
 
diff --git a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Data/package.order b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/package.order
similarity index 100%
rename from Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/Data/package.order
rename to Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/package.order
diff --git a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/package.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/package.mo
similarity index 59%
rename from Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/package.mo
rename to Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/package.mo
index 514f4094779..5e006e46664 100644
--- a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/package.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Fluid.BaseClasses.VariableSpeedWheel;
+within Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels;
 package BaseClasses "Package with base classes for the wheel model"
 extends Modelica.Icons.BasesPackage;
 
@@ -12,7 +12,7 @@ First implementation.
 </html>", info="<html>
 <p>
 This package contains base classes that are used to construct the models in
-<a href=\"modelica://Buildings.Fluid.BaseClasses.VariableSpeedWheel\">Buildings.Fluid.BaseClasses.VariableSpeedWheel</a>.
+<a href=\"modelica://Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels\">Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels</a>.
 </p>
 </html>"));
 end BaseClasses;
diff --git a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/package.order b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/package.order
similarity index 100%
rename from Buildings/Fluid/BaseClasses/VariableSpeedWheel/BaseClasses/package.order
rename to Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/package.order
diff --git a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/Latent.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Latent.mo
similarity index 70%
rename from Buildings/Fluid/BaseClasses/VariableSpeedWheel/Latent.mo
rename to Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Latent.mo
index 35074676a4f..41cf80ec4d6 100644
--- a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/Latent.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Latent.mo
@@ -1,4 +1,4 @@
-within Buildings.Fluid.BaseClasses.VariableSpeedWheel;
+within Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels;
 model Latent "Enthalpy wheels"
   extends Sensible;
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput epsLatCor(
@@ -22,14 +22,14 @@ heat exchange effectiveness correction of an enthalpy wheel.
 </p>
 <p>
 The calculation of the power consumption and the sensible 
-heat exchange effectiveness correction can be refered to
-<a href=\"modelica://Buildings.Fluid.BaseClasses.VariableSpeedWheel.Sensible\">
-Buildings.Fluid.BaseClasses.VariableSpeedWheel.Sensible</a>.
+heat exchange effectiveness correction can be referred to
+<a href=\"modelica://Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Sensible\">
+Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Sensible</a>.
 </p>
 <p>
 The latent heat exchange effectiveness correction is calculated based 
-on the cubic hermite spline of the latent heat exchange effectiveness 
-correction curve in the performance dataset.
+on the cubic hermite spline interpolation of the latent heat exchange 
+effectiveness correction curve in the performance dataset.
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/Sensible.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Sensible.mo
similarity index 86%
rename from Buildings/Fluid/BaseClasses/VariableSpeedWheel/Sensible.mo
rename to Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Sensible.mo
index dce7b17fd40..987d296ae51 100644
--- a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/Sensible.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Sensible.mo
@@ -1,7 +1,7 @@
-within Buildings.Fluid.BaseClasses.VariableSpeedWheel;
+within Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels;
 model Sensible "Sensible heat wheels"
   extends Modelica.Blocks.Icons.Block;
-  import whe = Buildings.Fluid.BaseClasses.VariableSpeedWheel;
+  import whe = Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels;
   final parameter Real xSpe[:] = if per.useDefaultMotorEfficiencyCurve
     then per.motorEfficiency_default.y else per.motorEfficiency_uSpe.y
     "x-axis support points of the power efficiency curve"
@@ -30,19 +30,16 @@ model Sensible "Sensible heat wheels"
 
 initial equation
   for i in 1:size(yeta,1)-1 loop
-         assert(xSpe[i]/yeta[i]<1 + 1E-4,
+         assert(xSpe[i]/yeta[i] < 1 + 1E-4,
                   "In " + getInstanceName() + ": motor efficiency curve is wrong. 
-                  The ratio of the speed ratio of the motor efficiency
-                  to the motor percent full-load efficiency should be less than
-                  1",
+                  The ratio of the speed ratio to the motor percent 
+                  full-load efficiency should be less than 1",
                   level=AssertionLevel.error)
                   "Check if the motor efficiency curve is correct";
   end for;
-  assert(abs(yeta[size(yeta,1)]-1) < 1E-4 and abs(yeta[size(yeta,1)]-1) < 1E-4,
+  assert(abs(yeta[size(yeta,1)]-1) < 1E-4,
           "In " + getInstanceName() + ": motor efficiency curve is wrong. 
-          The ratio of the speed ratio of the motor efficiency
-          to the motor percent full-load efficiency should be less than
-          1",
+          The  motor percent full-load efficiency at the full seepd should be 1",
           level=AssertionLevel.error)
           "Check if the motor efficiency curve is correct";
 equation
diff --git a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/Validation/VariableSpeedWheel.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/VariableSpeedThermalWheels.mo
similarity index 63%
rename from Buildings/Fluid/BaseClasses/VariableSpeedWheel/Validation/VariableSpeedWheel.mo
rename to Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/VariableSpeedThermalWheels.mo
index ada9ace51f5..46e73f4c500 100644
--- a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/Validation/VariableSpeedWheel.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/VariableSpeedThermalWheels.mo
@@ -1,15 +1,16 @@
-within Buildings.Fluid.BaseClasses.VariableSpeedWheel.Validation;
-model VariableSpeedWheel
+within Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Validation;
+model VariableSpeedThermalWheels
+  "Model that tests the variable-speed thermal wheels"
   extends Modelica.Icons.Example;
-  Buildings.Fluid.BaseClasses.VariableSpeedWheel.Sensible senWhe(
-    per=perSenWhe)
+  Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Sensible
+    senWhe(per=perSenWhe)
     "Sensible heat wheel"
     annotation (Placement(transformation(extent={{-10,40},{10,60}})));
-  Buildings.Fluid.BaseClasses.VariableSpeedWheel.BaseClasses.Data.ASHRAE
+  Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.ASHRAE
     perSenWhe(
     motorEfficiency_uSpe(y={0.1,0.6,0.8,1}, eta={0.3,0.8,0.85,1}),
-      haveLatentHeatExchange=false,
-      useDefaultMotorEfficiencyCurve=false)
+    haveLatentHeatExchange=false,
+    useDefaultMotorEfficiencyCurve=false)
     "Performance record for the sensible heat wheet"
     annotation (Placement(transformation(extent={{-80,74},{-60,94}})));
   Modelica.Blocks.Sources.Ramp uSpe(
@@ -18,15 +19,11 @@ model VariableSpeedWheel
     offset=0,
     height=1) "Speed ratio"
     annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
-  Buildings.Fluid.BaseClasses.VariableSpeedWheel.Latent
-    latWhe(
-      per=perLatWhe)
-    "Enthalpy wheel"
+  Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Latent latWhe(per=
+        perLatWhe) "Enthalpy wheel"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
-  Buildings.Fluid.BaseClasses.VariableSpeedWheel.Latent
-    latWheDefMotCur(
-      per=perLatWheDefMotCur)
-    "enthalpy wheel with default motor curve"
+  Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Latent latWheDefMotCur(per=
+        perLatWheDefMotCur) "enthalpy wheel with default motor curve"
     annotation (Placement(transformation(extent={{-10,-60},{10,-40}})));
   BaseClasses.Data.ASHRAE perLatWhe(
     motorEfficiency_uSpe(y={0.1,0.6,0.8,1}, eta={0.3,0.8,0.85,1}),
@@ -39,15 +36,17 @@ model VariableSpeedWheel
     "Performance record for the enthalpy wheet with default motor curve"
     annotation (Placement(transformation(extent={{0,74},{20,94}})));
 equation
-  connect(uSpe.y, senWhe.uSpe) annotation (Line(points={{-39,0},{-28,0},{-28,50},
+  connect(uSpe.y, senWhe.uSpe)
+     annotation (Line(points={{-39,0},{-28,0},{-28,50},
           {-12,50}}, color={0,0,127}));
   connect(latWhe.uSpe, uSpe.y)
     annotation (Line(points={{-12,0},{-39,0}}, color={0,0,127}));
-  connect(latWheDefMotCur.uSpe, uSpe.y) annotation (Line(points={{-12,-50},{-28,
+  connect(latWheDefMotCur.uSpe, uSpe.y)
+    annotation (Line(points={{-12,-50},{-28,
           -50},{-28,0},{-39,0}}, color={0,0,127}));
   annotation (
     __Dymola_Commands(file=
-          "modelica://Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/VariableSpeedWheel/Validation/VariableSpeedWheel.mos"
+          "modelica://Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/VariableSpeedThermalWheels.mos"
         "Simulate and plot"),
     experiment(
       StopTime=1,
@@ -74,13 +73,13 @@ The expected outputs are:
 </p>
 <ul>
 <li>
-The power consumption of all three wheels increases by time
-and equals to the nominal value when <code>uSpe=1</code>.
+The power consumption of all three wheels increases over time
+and equals the nominal value when <code>uSpe=1</code>.
 </li>
 <li>
 The heat exchange effectiveness corrections increase by time
-and equals to 1 when <code>uSpe=1</code>.
+and equal 1 when <code>uSpe=1</code>.
 </li>
 </ul>
 </html>"));
-end VariableSpeedWheel;
+end VariableSpeedThermalWheels;
diff --git a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/Validation/package.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/package.mo
similarity index 71%
rename from Buildings/Fluid/BaseClasses/VariableSpeedWheel/Validation/package.mo
rename to Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/package.mo
index 8a59acb3c98..98f08caf3d6 100644
--- a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/Validation/package.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/package.mo
@@ -1,12 +1,12 @@
-within Buildings.Fluid.BaseClasses.VariableSpeedWheel;
+within Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels;
 package Validation "Collection of validation models"
 extends Modelica.Icons.ExamplesPackage;
 
   annotation (Documentation(info="<html>
 <p>
 This package contains validation models for the classes in
-<a href=\"modelica://Buildings.Fluid.BaseClasses.VariableSpeedWheel\">
-Buildings.Fluid.BaseClasses.VariableSpeedWheel</a>.
+<a href=\"modelica://Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels\">
+Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels</a>.
 </p>
 <p>
 Note that most validation models contain simple input data
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/package.order b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/package.order
new file mode 100644
index 00000000000..e4cf2e38509
--- /dev/null
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/package.order
@@ -0,0 +1 @@
+VariableSpeedThermalWheels
diff --git a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/package.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/package.mo
similarity index 63%
rename from Buildings/Fluid/BaseClasses/VariableSpeedWheel/package.mo
rename to Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/package.mo
index 6bfbe0f802e..68c52e909e2 100644
--- a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/package.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/package.mo
@@ -1,5 +1,5 @@
-within Buildings.Fluid.BaseClasses;
-package VariableSpeedWheel "Models of variable-speed wheels"
+within Buildings.Fluid.HeatExchangers.BaseClasses;
+package VariableSpeedThermalWheels "Models of variable-speed wheels"
   extends Modelica.Icons.BasesPackage;
 
 annotation (Documentation(info="<html>
@@ -9,4 +9,4 @@ the wheel speed ratio on the power consumption and the heat
 exchange effectiveness of thermal wheels.
 </p>
 </html>"));
-end VariableSpeedWheel;
+end VariableSpeedThermalWheels;
diff --git a/Buildings/Fluid/BaseClasses/VariableSpeedWheel/package.order b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/package.order
similarity index 100%
rename from Buildings/Fluid/BaseClasses/VariableSpeedWheel/package.order
rename to Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/package.order

From 0c728c6b4eeb83d5b9830932e1361b510ed7b300 Mon Sep 17 00:00:00 2001
From: SenHuang19 <jhy1987@gmail.com>
Date: Fri, 14 Jun 2024 14:15:50 -0400
Subject: [PATCH 09/27] update the thermal wheels

---
 .../HeatExchangers/BaseClasses/package.order  |  1 +
 .../Latent/BaseClasses/PartialWheel.mo        | 55 ++++-------
 .../ThermalWheels/Latent/BypassDampers.mo     | 60 ++++++------
 .../Latent/Examples/SpaceCooling.mo           | 86 ++++++++--------
 .../ThermalWheels/Latent/SpeedControlled.mo   | 31 +++---
 .../Latent/Validation/BypassDampers.mo        | 12 ++-
 .../Latent/Validation/SpeedControlled.mo      | 31 +++---
 .../Sensible/BaseClasses/PartialWheel.mo      | 45 ++++-----
 .../ThermalWheels/Sensible/BypassDampers.mo   | 55 ++++++-----
 .../Sensible/Examples/SpaceCooling.mo         | 97 +++++++++----------
 .../ThermalWheels/Sensible/SpeedControlled.mo | 23 ++---
 .../Sensible/Validation/SpeedControlled.mo    | 29 +++---
 12 files changed, 253 insertions(+), 272 deletions(-)

diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/package.order b/Buildings/Fluid/HeatExchangers/BaseClasses/package.order
index aced07a5558..daf367f9f80 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/package.order
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/package.order
@@ -20,6 +20,7 @@ PipeManifoldFixedResistance
 PipeManifoldFlowDistributor
 PipeManifoldNoResistance
 RayleighNumber
+VariableSpeedThermalWheels
 WetCoilDryRegime
 WetCoilDryWetRegime
 WetCoilUARated
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/PartialWheel.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/PartialWheel.mo
index 966c328a06e..5c827e49155 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/PartialWheel.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/PartialWheel.mo
@@ -49,20 +49,16 @@ partial model PartialWheel
     final max=1) = 0.75
     "Part load (75% of the nominal supply mass flow rate) latent heat exchanger effectiveness at the heating mode"
     annotation (Dialog(group="Part load effectiveness"));
-
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput P(
     final unit="W")
     "Electric power consumption"
-    annotation (Placement(transformation(extent={{100,-110},{140,-70}}),
-        iconTransformation(extent={{100,-110},{140,-70}})));
+    annotation (Placement(transformation(extent={{100,-60},{140,-20}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput epsSen(final unit="1")
     "Sensible heat exchanger effectiveness"
-    annotation (Placement(transformation(extent={{100,10},{140,50}}),
-        iconTransformation(extent={{100,10},{140,50}})));
+    annotation (Placement(transformation(extent={{100,20},{140,60}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput epsLat(final unit="1")
     "Latent heat exchanger effectiveness"
-    annotation (Placement(transformation(extent={{100,-50},{140,-10}}),
-        iconTransformation(extent={{100,-50},{140,-10}})));
+    annotation (Placement(transformation(extent={{100,-20},{140,20}})));
   Buildings.Fluid.Sensors.MassFlowRate senSupMasFlo(redeclare package Medium = Medium)
     "Supply air mass flow rate"
     annotation (Placement(transformation(extent={{50,-4},{70,16}})));
@@ -73,21 +69,20 @@ partial model PartialWheel
     redeclare final package Medium = Medium)
     "Fluid connector a1 of the supply air (positive design flow direction is from port_a1 to port_b1)"
     annotation (Placement(transformation(extent={{-190,70},{-170,90}}),
-        iconTransformation(extent={{-110,50},{-90,70}})));
+        iconTransformation(extent={{-110,68},{-90,88}})));
   Modelica.Fluid.Interfaces.FluidPort_b port_b2(
     redeclare final package Medium = Medium)
     "Fluid connector b2 of the exhaust air (positive design flow direction is from port_a2 to port_b2)"
-    annotation (Placement(transformation(extent={{-170,-70},{-190,-50}}),
-        iconTransformation(extent={{-90,-70},{-110,-50}})));
+    annotation (Placement(transformation(extent={{-170,-90},{-190,-70}}),
+        iconTransformation(extent={{-90,-90},{-110,-70}})));
   Modelica.Fluid.Interfaces.FluidPort_b port_b1(
     redeclare final package Medium = Medium)
     "Fluid connector b1 of the supply air (positive design flow direction is from port_a1 to port_b1)"
-    annotation (Placement(transformation(extent={{110,70},{90,90}}),
-        iconTransformation(extent={{110,50},{90,70}})));
+    annotation (Placement(transformation(extent={{110,70},{90,90}})));
   Modelica.Fluid.Interfaces.FluidPort_a port_a2(
     redeclare final package Medium = Medium)
     "Fluid connector a2 of the exhaust air (positive design flow direction is from port_a2 to port_b2)"
-    annotation (Placement(transformation(extent={{90,-70},{110,-50}})));
+    annotation (Placement(transformation(extent={{90,-90},{110,-70}})));
 
 protected
   Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BaseClasses.Effectiveness effCal(
@@ -145,37 +140,37 @@ equation
           {80,80},{100,80}}, color={0,127,255}));
   connect(senExhMasFlo.port_a, hex.port_b2) annotation (Line(points={{-100,-44},
           {-30,-44},{-30,-6},{10,-6}},  color={0,127,255}));
-  connect(senExhMasFlo.port_b, port_b2) annotation (Line(points={{-120,-44},{-160,
-          -44},{-160,-60},{-180,-60}},      color={0,127,255}));
+  connect(senExhMasFlo.port_b, port_b2) annotation (Line(points={{-120,-44},{-166,
+          -44},{-166,-80},{-180,-80}},      color={0,127,255}));
 annotation (
         defaultComponentName="whe",
         Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
         graphics={
         Rectangle(
-          extent={{26,-56},{94,-64}},
+          extent={{24,-76},{94,-84}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid),
         Rectangle(
-          extent={{32,64},{94,56}},
+          extent={{26,84},{92,76}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid),
         Rectangle(
-          extent={{-92,-55},{-30,-64}},
+          extent={{-92,-75},{-24,-84}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid),
         Rectangle(
-          extent={{-94,65},{-28,56}},
+          extent={{-94,85},{-22,76}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid),
-        Ellipse(extent={{8,78},{38,-74}},
+        Ellipse(extent={{6,94},{34,-90}},
           lineColor={0,0,0},
           fillColor={255,255,255},
           fillPattern=FillPattern.Solid),
@@ -185,29 +180,17 @@ annotation (
           fillColor={255,255,255},
           fillPattern=FillPattern.None),
         Rectangle(
-          extent={{-6,78},{22,-74}},
+          extent={{-8,96},{22,-94}},
           fillColor={255,255,255},
           fillPattern=FillPattern.Solid,
           pattern=LinePattern.None),
         Ellipse(
-          extent={{-38,78},{-6,-74}},
+          extent={{-40,94},{0,-88}},
           lineColor={28,108,200},
           fillColor={0,140,72},
           fillPattern=FillPattern.Solid),
-        Line(points={{-22,-74},{22,-74}}, color={0,0,0}),
-        Line(points={{-22,78},{22,78}}, color={0,0,0}),
-        Text(
-          extent={{46,46},{96,22}},
-          textColor={0,0,127},
-          textString="epsSen"),
-        Text(
-          extent={{46,-16},{96,-40}},
-          textColor={0,0,127},
-          textString="epsLat"),
-        Text(
-          extent={{52,-76},{102,-100}},
-          textColor={0,0,127},
-          textString="P")}),
+        Line(points={{-22,-88},{22,-88}}, color={0,0,0}),
+        Line(points={{-22,94},{22,94}}, color={0,0,0})}),
           Diagram(
         coordinateSystem(preserveAspectRatio=true, extent={{-180,-100},{100,100}})),
 Documentation(info="<html>
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo
index 67f723436bf..aea35329f56 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo
@@ -16,11 +16,11 @@ model BypassDampers
     final max=1)
     "Bypass damper position"
     annotation (Placement(transformation(extent={{-220,120},{-180,160}}),
-      iconTransformation(extent={{-140,-20},{-100,20}})));
+      iconTransformation(extent={{-140,20},{-100,60}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uRot
     "True when the wheel is operating"
     annotation (Placement(transformation(extent={{-220,-20},{-180,20}}),
-      iconTransformation(extent={{-140,60},{-100,100}})));
+      iconTransformation(extent={{-140,-60},{-100,-20}})));
   Buildings.Fluid.Actuators.Dampers.Exponential bypDamSup(
     redeclare package Medium = Medium,
     final m_flow_nominal=mSup_flow_nominal,
@@ -65,7 +65,7 @@ protected
   Modelica.Blocks.Math.BooleanToReal PEle(
     final realTrue=P_nominal,
     final realFalse=0) "Electric power consumption for motor"
-    annotation (Placement(transformation(extent={{-160,-90},{-140,-70}})));
+    annotation (Placement(transformation(extent={{-122,-110},{-102,-90}})));
 protected
   Modelica.Blocks.Sources.Constant zero(final k=0) "Zero signal"
     annotation (Placement(transformation(extent={{-140,150},{-120,170}})));
@@ -91,24 +91,25 @@ equation
   connect(uni.y, sub.u1)
     annotation (Line(points={{-119,120},{-110,120},{-110,106},{-102,106}},
     color={0,0,127}));
-  connect(PEle.y, P) annotation (Line(points={{-139,-80},{80,-80},{80,-90},{120,-90}},
+  connect(PEle.y, P) annotation (Line(points={{-101,-100},{80,-100},{80,-40},{120,
+          -40}},
     color={0,0,127}));
   connect(damSup.port_a, port_a1) annotation (Line(points={{-100,36},{-130,36},{-130,80},{-180,80}},
     color={0,127,255}));
   connect(damExh.port_b, hex.port_a2)
     annotation (Line(points={{40,-34},{40,-6},{30,-6}}, color={0,127,255}));
   connect(bypDamExh.port_b, port_b2)
-    annotation (Line(points={{-20,-60},{-180,-60}}, color={0,127,255}));
+    annotation (Line(points={{-20,-60},{-100,-60},{-100,-80},{-180,-80}},
+                                                    color={0,127,255}));
   connect(damExh.port_a, port_a2)
-    annotation (Line(points={{40,-54},{40,-60},{100,-60}}, color={0,127,255}));
+    annotation (Line(points={{40,-54},{40,-80},{100,-80}}, color={0,127,255}));
   connect(bypDamExh.port_a, port_a2)
-    annotation (Line(points={{0,-60},{100,-60}}, color={0,127,255}));
+    annotation (Line(points={{0,-60},{50,-60},{50,-80},{100,-80}},
+                                                 color={0,127,255}));
   connect(bypDamSup.port_b, port_b1)
     annotation (Line(points={{-28,80},{100,80}}, color={0,127,255}));
   connect(bypDamSup.port_a, port_a1)
     annotation (Line(points={{-48,80},{-180,80}}, color={0,127,255}));
-  connect(PEle.u, uRot) annotation (Line(points={{-162,-80},{-168,-80},{-168,0},
-          {-200,0}}, color={255,0,255}));
   connect(zero.y, swiepsSen.u3) annotation (Line(points={{-119,160},{-60,160},{-60,
           152},{-42,152}}, color={0,0,127}));
   connect(swiLat.u3, zero.y) annotation (Line(points={{-42,122},{-60,122},{-60,160},
@@ -125,10 +126,13 @@ equation
           -6,3},{8,3}}, color={0,0,127}));
   connect(swiLat.y, hex.epsLat) annotation (Line(points={{-18,130},{-10,130},{-10,
           -3},{8,-3}}, color={0,0,127}));
-  connect(swiepsSen.y, epsSen) annotation (Line(points={{-18,160},{38,160},{38,30},
-          {120,30}}, color={0,0,127}));
-  connect(swiLat.y, epsLat) annotation (Line(points={{-18,130},{88,130},{88,-30},
-          {120,-30}}, color={0,0,127}));
+  connect(swiepsSen.y, epsSen) annotation (Line(points={{-18,160},{38,160},{38,
+          40},{120,40}},
+                     color={0,0,127}));
+  connect(swiLat.y, epsLat) annotation (Line(points={{-18,130},{88,130},{88,0},
+          {120,0}},   color={0,0,127}));
+  connect(PEle.u, uRot) annotation (Line(points={{-124,-100},{-172,-100},{-172,0},
+          {-200,0}}, color={255,0,255}));
 annotation (
         defaultComponentName="whe",
         Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
@@ -139,51 +143,53 @@ annotation (
           fillColor={255,255,255},
           fillPattern=FillPattern.None),
         Rectangle(
-          extent={{-58,94},{64,86}},
+          extent={{-60,100},{62,96}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,0},
-          fillPattern=FillPattern.Solid),
+          fillPattern=FillPattern.Solid,
+          lineThickness=0.5),
         Rectangle(
-          extent={{-18,4},{18,-4}},
+          extent={{-11,4},{11,-4}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid,
-          origin={60,76},
+          origin={58,87},
           rotation=90),
         Rectangle(
-          extent={{-18.5,3.5},{18.5,-3.5}},
+          extent={{-11.5,3.5},{11.5,-3.5}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid,
-          origin={-54.5,74.5},
+          origin={-56.5,87.5},
           rotation=90),
         Rectangle(
-          extent={{-16.5,3.5},{16.5,-3.5}},
+          extent={{-9,3},{9,-3}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid,
-          origin={-54.5,-73.5},
+          origin={-55,-85},
           rotation=90),
         Rectangle(
-          extent={{-58,-84},{64,-92}},
+          extent={{-9,4},{9,-4}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,0},
-          fillPattern=FillPattern.Solid),
+          fillPattern=FillPattern.Solid,
+          origin={60,-85},
+          rotation=90),
         Rectangle(
-          extent={{-18,4},{18,-4}},
+          extent={{-58,-92},{64,-96}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid,
-          origin={60,-74},
-          rotation=90)}),
+          lineThickness=0.5)}),
           Diagram(
-        coordinateSystem(preserveAspectRatio=true, extent={{-180,-100},{100,180}})),
+        coordinateSystem(preserveAspectRatio=true, extent={{-180,-120},{100,180}})),
 Documentation(info="<html>
 <p>
 Model of an enthalpy recovery wheel, which consists of
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mo
index a3457eb4575..3a49758a3c7 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mo
@@ -88,7 +88,7 @@ model SpaceCooling "Space cooling system"
     epsLatCoo_nominal=eps,
     epsSenHea_nominal=eps,
     epsLatHea_nominal=eps) "Heat recovery"
-    annotation (Placement(transformation(extent={{-110,-36},{-90,-16}})));
+    annotation (Placement(transformation(extent={{-102,-40},{-80,-18}})));
   Buildings.Fluid.HeatExchangers.WetCoilEffectivenessNTU cooCoi(
     redeclare package Medium1 = MediumW,
     redeclare package Medium2 = MediumA,
@@ -128,41 +128,36 @@ model SpaceCooling "Space cooling system"
     annotation (Placement(transformation(extent={{-160,40},{-140,60}})));
   Buildings.BoundaryConditions.WeatherData.Bus weaBus "Weather data bus"
     annotation (Placement(transformation(extent={{-120,40},{-100,60}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant mAir_flow(k=mA_flow_nominal)
+  Buildings.Controls.OBC.CDL.Reals.Sources.Pulse mAir_flow(
+    amplitude=-mA_flow_nominal,
+    width=0.5,
+    period=87600,
+    shift=0.24*87600,
+    offset=mA_flow_nominal)
     "Fan air flow rate"
     annotation (Placement(transformation(extent={{0,0},{20,20}})));
   Buildings.Fluid.Sensors.TemperatureTwoPort senTemHXOut(redeclare package
       Medium = MediumA, m_flow_nominal=mA_flow_nominal)
     "Temperature sensor for heat recovery outlet on supply side"
-    annotation (Placement(transformation(extent={{-76,-26},{-64,-14}})));
+    annotation (Placement(transformation(extent={{-62,-26},{-50,-14}})));
   Buildings.Fluid.Sensors.TemperatureTwoPort senTemSupAir(redeclare package
       Medium = MediumA, m_flow_nominal=mA_flow_nominal)
     "Temperature sensor for supply air"
     annotation (Placement(transformation(extent={{6,-26},{18,-14}})));
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant TRooSetPoi(k=TRooSet)
     "Room temperature set point"
-    annotation (Placement(transformation(extent={{-170,-104},{-150,-84}})));
+    annotation (Placement(transformation(extent={{-160,-110},{-140,-90}})));
   Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor senTemRoo
     "Room temperature sensor"
     annotation (Placement(transformation(extent={{70,70},{90,90}})));
-  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal mWat_flow(realTrue=0, realFalse=
-        mW_flow_nominal) "Conversion from boolean to real for water flow rate"
-    annotation (Placement(transformation(extent={{-60,-110},{-40,-90}})));
-  Buildings.Controls.OBC.CDL.Reals.Subtract sub
-    "Inputs different"
-    annotation (Placement(transformation(extent={{-130,-110},{-110,-90}})));
-  Buildings.Controls.OBC.CDL.Reals.Hysteresis con(
-    final uLow=-0.5,
-    final uHigh=0.5)
-    "Controller for coil water flow rate"
-    annotation (Placement(transformation(extent={{-100,-110},{-80,-90}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse opeSig(
     width=0.5,
     period=86400,
     shift=0.25*86400)
     "Operating signal"
-    annotation (Placement(transformation(extent={{-172,10},{-152,30}})));
-  Buildings.Controls.Continuous.LimPID conPID(k=0.1, Ti=60)
+    annotation (Placement(transformation(extent={{-160,-70},{-140,-50}})));
+  Buildings.Controls.Continuous.LimPID conHX(k=0.1, Ti=60)
+    "Heat recovery controller"
     annotation (Placement(transformation(extent={{-58,10},{-38,30}})));
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant TMixSetPoi(k=TMixSet)
     "Mixed air temperature set point"
@@ -172,6 +167,12 @@ model SpaceCooling "Space cooling system"
       m_flow_nominal=mA_flow_nominal)
       "Temperature sensor for return air"
     annotation (Placement(transformation(extent={{54,-52},{42,-40}})));
+  Buildings.Controls.Continuous.LimPID conRoo(
+    k=0.1,
+    Ti=60,
+    yMax=mW_flow_nominal,
+    reverseActing=false) "Room controller"
+    annotation (Placement(transformation(extent={{-90,-110},{-70,-90}})));
 equation
   connect(theCon.port_b, vol.heatPort) annotation (Line(
       points={{40,50},{50,50},{50,30},{60,30}},
@@ -186,7 +187,7 @@ equation
       color={0,127,255},
       smooth=Smooth.None));
   connect(out.ports[2],whe. port_a1) annotation (Line(
-      points={{-120,-21},{-116,-21},{-116,-20},{-110,-20}},
+      points={{-120,-21},{-116,-21},{-116,-20.42},{-102,-20.42}},
       color={0,127,255},
       smooth=Smooth.None));
   connect(souWat.ports[1], cooCoi.port_a1)   annotation (Line(
@@ -222,12 +223,8 @@ equation
       points={{50,-8},{50,10},{22,10}},
       color={0,0,127},
       smooth=Smooth.None));
-  connect(whe.port_b1, senTemHXOut.port_a) annotation (Line(
-      points={{-90,-20},{-76,-20}},
-      color={0,127,255},
-      smooth=Smooth.None));
   connect(senTemHXOut.port_b, cooCoi.port_a2) annotation (Line(
-      points={{-64,-20},{-40,-20}},
+      points={{-50,-20},{-40,-20}},
       color={0,127,255},
       smooth=Smooth.None));
   connect(cooCoi.port_b2, senTemSupAir.port_a) annotation (Line(
@@ -246,38 +243,31 @@ equation
       points={{60,30},{50,30},{50,80},{70,80}},
       color={191,0,0},
       smooth=Smooth.None));
-  connect(mWat_flow.y, souWat.m_flow_in) annotation (Line(
-      points={{-38,-100},{-30,-100},{-30,-92},{-22,-92}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(sub.y, con.u) annotation (Line(
-      points={{-108,-100},{-102,-100}},
-      color={0,0,127}));
-  connect(con.y, mWat_flow.u) annotation (Line(
-      points={{-78,-100},{-62,-100}},
-      color={255,0,255}));
-  connect(TRooSetPoi.y, sub.u1) annotation (Line(
-      points={{-148,-94},{-132,-94}},
-      color={0,0,127}));
-  connect(senTemRoo.T, sub.u2) annotation (Line(
-      points={{91,80},{100,80},{100,-140},{-140,-140},{-140,-106},{-132,-106}},
-      color={0,0,127}));
   connect(whe.port_b2, out.ports[1]) annotation (Line(
-      points={{-110,-32},{-116,-32},{-116,-23},{-120,-23}},
+      points={{-102,-37.8},{-116,-37.8},{-116,-23},{-120,-23}},
       color={0,127,255}));
   connect(opeSig.y, whe.uRot) annotation (Line(
-      points={{-150,20},{-116,20},{-116,-18},{-112,-18}},
+      points={{-138,-60},{-108,-60},{-108,-33.4},{-104.2,-33.4}},
       color={255,0,255}));
-  connect(TMixSetPoi.y, conPID.u_s)
+  connect(TMixSetPoi.y, conHX.u_s)
     annotation (Line(points={{-78,20},{-60,20}}, color={0,0,127}));
-  connect(senTemHXOut.T, conPID.u_m) annotation (Line(points={{-70,-13.4},{-70,0},
-          {-48,0},{-48,8}}, color={0,0,127}));
-  connect(conPID.y, whe.uBypDamPos) annotation (Line(points={{-37,20},{-18,20},{
-          -18,-80},{-116,-80},{-116,-26},{-112,-26}}, color={0,0,127}));
+  connect(senTemHXOut.T, conHX.u_m) annotation (Line(points={{-56,-13.4},{-56,2},
+          {-48,2},{-48,8}}, color={0,0,127}));
+  connect(conHX.y, whe.uBypDamPos) annotation (Line(points={{-37,20},{-14,20},{
+          -14,-80},{-112,-80},{-112,-24.6},{-104.2,-24.6}},
+                                                  color={0,0,127}));
   connect(vol.ports[2], senTemRetAir.port_a)
     annotation (Line(points={{71,20},{71,-46},{54,-46}}, color={0,127,255}));
-  connect(senTemRetAir.port_b, whe.port_a2) annotation (Line(points={{42,-46},{-90,
-          -46},{-90,-32}}, color={0,127,255}));
+  connect(conRoo.u_m, senTemRoo.T) annotation (Line(points={{-80,-112},{-80,-140},
+          {100,-140},{100,80},{91,80}}, color={0,0,127}));
+  connect(TRooSetPoi.y, conRoo.u_s)
+    annotation (Line(points={{-138,-100},{-92,-100}}, color={0,0,127}));
+  connect(conRoo.y, souWat.m_flow_in) annotation (Line(points={{-69,-100},{-30,-100},
+          {-30,-92},{-22,-92}}, color={0,0,127}));
+  connect(whe.port_a2, senTemRetAir.port_b) annotation (Line(points={{-80,-37.8},
+          {-60,-37.8},{-60,-46},{42,-46}}, color={0,127,255}));
+  connect(whe.port_b1, senTemHXOut.port_a) annotation (Line(points={{-80,-20.2},
+          {-80,-20},{-62,-20}}, color={0,127,255}));
   annotation (Documentation(info="<html>
 <p>
 This block is identical to
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/SpeedControlled.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/SpeedControlled.mo
index 83b3fb3a8ed..7a4c2e4aff3 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/SpeedControlled.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/SpeedControlled.mo
@@ -4,9 +4,8 @@ model SpeedControlled
   extends
     Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BaseClasses.PartialWheel;
   parameter
-    Buildings.Fluid.BaseClasses.VariableSpeedWheel.BaseClasses.Data.Generic
-    per
-    "Record with performance data"
+    Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.Generic
+    per "Record with performance data"
     annotation (Placement(transformation(extent={{60,120},{80,140}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput uSpe(
     final unit="1",
@@ -14,10 +13,10 @@ model SpeedControlled
     "Wheel speed ratio"
     annotation (Placement(transformation(extent={{-220,-20},{-180,20}}),
         iconTransformation(extent={{-140,-20},{-100,20}})));
-  Buildings.Fluid.BaseClasses.VariableSpeedWheel.Latent latWhe(
-    final per=per) "Correct the wheel performance based on the wheel speed"
+  Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Latent
+    latWhe(final per=per)
+    "Correct the wheel performance based on the wheel speed"
     annotation (Placement(transformation(extent={{-120,110},{-100,130}})));
-
   Buildings.Controls.OBC.CDL.Reals.Multiply mul
     "Correct the sensible heat exchanger effectiveness"
     annotation (Placement(transformation(extent={{-60,130},{-40,150}})));
@@ -27,7 +26,7 @@ model SpeedControlled
 
 equation
   connect(hex.port_a2, port_a2)
-    annotation (Line(points={{30,-6},{40,-6},{40,-60},{100,-60}},
+    annotation (Line(points={{30,-6},{40,-6},{40,-80},{100,-80}},
     color={0,127,255}));
   connect(hex.port_a1, port_a1)
     annotation (Line(points={{10,6},{-32,6},{-32,80},{-180,80}},  color={0,127,255}));
@@ -43,12 +42,14 @@ equation
     annotation (Line(points={{-38,140},{0,140},{0,3},{8,3}}, color={0,0,127}));
   connect(hex.epsLat, mul1.y) annotation (Line(points={{8,-3},{-20,-3},{-20,100},
           {-38,100}}, color={0,0,127}));
-  connect(mul.y, epsSen) annotation (Line(points={{-38,140},{20,140},{20,30},{120,
-          30}}, color={0,0,127}));
-  connect(mul1.y, epsLat) annotation (Line(points={{-38,100},{-10,100},{-10,-30},
-          {120,-30}}, color={0,0,127}));
-  connect(latWhe.P, P) annotation (Line(points={{-98,128},{-88,128},{-88,40},{-46,
-          40},{-46,-90},{120,-90}}, color={0,0,127}));
+  connect(mul.y, epsSen) annotation (Line(points={{-38,140},{20,140},{20,40},{
+          120,40}},
+                color={0,0,127}));
+  connect(mul1.y, epsLat) annotation (Line(points={{-38,100},{-10,100},{-10,0},
+          {120,0}},   color={0,0,127}));
+  connect(latWhe.P, P) annotation (Line(points={{-98,128},{-88,128},{-88,40},{
+          -46,40},{-46,-40},{120,-40}},
+                                    color={0,0,127}));
   connect(latWhe.uSpe, uSpe) annotation (Line(points={{-122,120},{-168,120},{-168,
           0},{-200,0}}, color={0,0,127}));
 annotation (
@@ -74,8 +75,8 @@ heat exchanger effectiveness in both heating and cooling conditions.
 <p>
 The operation of the heat recovery wheel is adjustable by modulating the wheel speed.
 See details about the impacts of the wheel speed in 
-<a href=\"modelica://Buildings.Fluid.BaseClasses.VariableSpeedWheel.Latent\">
-Buildings.Fluid.BaseClasses.VariableSpeedWheel.Latent</a>.
+<a href=\"modelica://Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Latent\">
+Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Latent</a>.
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/BypassDampers.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/BypassDampers.mo
index 95f5205a17d..7edef93646f 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/BypassDampers.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/BypassDampers.mo
@@ -79,22 +79,24 @@ equation
   connect(TSup.y, sou_1.T_in)
     annotation (Line(points={{-59,34},{-42,34}}, color={0,0,127}));
   connect(sou_1.ports[1],whe.port_a1)
-    annotation (Line(points={{-20,30},{-14,30},{-14,6},{0,6}},
+    annotation (Line(points={{-20,30},{-14,30},{-14,7.8},{0,7.8}},
     color={0,127,255}));
   connect(whe.port_a2, sou_2.ports[1])
-    annotation (Line(points={{20,-6},{30,-6},{30,-40},{70,-40}},
+    annotation (Line(points={{20,-8},{30,-8},{30,-40},{70,-40}},
     color={0,127,255}));
   connect(bypDamPos.y, whe.uBypDamPos) annotation (Line(points={{-59,0},{-2,0}},
     color={0,0,127}));
-  connect(opeSig.y, whe.uRot) annotation (Line(points={{-58,70},{-10,70},{-10,8},{-2,8}}, 
+  connect(opeSig.y, whe.uRot) annotation (Line(points={{-58,70},{-10,70},{-10,8},{-2,8}},
     color={255,0,255}));
   connect(senExhTem.port_b, sin_2.ports[1])
     annotation (Line(points={{-40,-40},{-58,-40}}, color={0,127,255}));
-  connect(senExhTem.port_a, whe.port_b2) annotation (Line(points={{-20,-40},{-8,-40},{-8,-6},{0,-6}}, 
+  connect(senExhTem.port_a, whe.port_b2) annotation (Line(points={{-20,-40},{-8,
+          -40},{-8,-8},{0,-8}},
     color={0,127,255}));
   connect(senSupTem.port_b, sin_1.ports[1])
     annotation (Line(points={{60,30},{70,30}}, color={0,127,255}));
-  connect(senSupTem.port_a, whe.port_b1) annotation (Line(points={{40,30},{28,30},{28,6},{20,6}}, 
+  connect(senSupTem.port_a, whe.port_b1) annotation (Line(points={{40,30},{28,
+          30},{28,8},{20,8}},
     color={0,127,255}));
 annotation(experiment(Tolerance=1e-6, StopTime=360),
 __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/BypassDampers.mos"
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mo
index 069095e8ffc..5f3d0dcec08 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mo
@@ -83,27 +83,26 @@ model SpeedControlled
       m_flow_nominal=5)
       "Temperature of the supply air"
     annotation (Placement(transformation(extent={{40,20},{60,40}})));
-
-  Buildings.Fluid.BaseClasses.VariableSpeedWheel.BaseClasses.Data.ASHRAE
-                          perLatWhe(
-    motorEfficiency_uSpe(y={0.1,0.6,0.8,1}, eta={0.3,0.4,0.6,1}),
+  Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.ASHRAE
+    perLatWhe(
+    motorEfficiency_uSpe(y={0.1,0.6,0.8,1}, eta={0.3,0.8,0.9,1}),
     haveLatentHeatExchange=true,
     useDefaultMotorEfficiencyCurve=false)
     "Performance record for the enthalpy wheet"
     annotation (Placement(transformation(extent={{-60,60},{-40,80}})));
-  Buildings.Fluid.BaseClasses.VariableSpeedWheel.BaseClasses.Data.ASHRAE
-                          perLatWheDefMotCur(haveLatentHeatExchange=true,
-      useDefaultMotorEfficiencyCurve=true)
+  Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.ASHRAE
+    perLatWheDefMotCur(haveLatentHeatExchange=true,
+    useDefaultMotorEfficiencyCurve=true)
     "Performance record for the enthalpy wheet with default motor curve"
     annotation (Placement(transformation(extent={{-20,60},{0,80}})));
 equation
   connect(TSup.y, sou_1.T_in)
     annotation (Line(points={{-59,34},{-42,34}}, color={0,0,127}));
   connect(sou_1.ports[2], wheUseDefCur.port_a1)
-    annotation (Line(points={{-20,31},{-10,31},{-10,30},{2,30}},
+    annotation (Line(points={{-20,31},{-10,31},{-10,31.8},{2,31.8}},
     color={0,127,255}));
   connect(wheUseDefCur.port_a2, sou_2.ports[1])
-    annotation (Line(points={{22,18},{36,18},{36,-41},{70,-41}},
+    annotation (Line(points={{22,16},{36,16},{36,-41},{70,-41}},
     color={0,127,255}));
   connect(wheSpe.y, wheUseDefCur.uSpe)
     annotation (Line(points={{-59,0},{-10,0},{-10,24},{0,24}},
@@ -112,21 +111,23 @@ equation
     annotation (Line(points={{-40,-40},{-50,-40},{-50,-41},{-58,-41}},
     color={0,127,255}));
   connect(senExhTem.port_a, wheUseDefCur.port_b2)
-    annotation (Line(points={{-20,-40},{-4,-40},{-4,18},{2,18}},
+    annotation (Line(points={{-20,-40},{-4,-40},{-4,16},{2,16}},
     color={0,127,255}));
   connect(senSupTem.port_b, sin_1.ports[2])
     annotation (Line(points={{60,30},{66,30},{66,31},{70,31}},
     color={0,127,255}));
   connect(senSupTem.port_a, wheUseDefCur.port_b1)
-    annotation (Line(points={{40,30},{22,30}}, color={0,127,255}));
+    annotation (Line(points={{40,30},{32,30},{32,32},{22,32}},
+                                               color={0,127,255}));
   connect(wheDefCur.port_a1, sou_1.ports[1])
-    annotation (Line(points={{2,-2},{-16,-2},{-16,29},{-20,29}}, color={0,127,255}));
+    annotation (Line(points={{2,-0.2},{-16,-0.2},{-16,29},{-20,29}},
+                                                                 color={0,127,255}));
   connect(wheDefCur.port_b2, sin_2.ports[2])
-    annotation (Line(points={{2,-14},{-50,-14},{-50,-39},{-58,-39}}, color={0,127,255}));
+    annotation (Line(points={{2,-16},{-50,-16},{-50,-39},{-58,-39}}, color={0,127,255}));
   connect(wheDefCur.port_a2, sou_2.ports[2])
-    annotation (Line(points={{22,-14},{60,-14},{60,-39},{70,-39}}, color={0,127,255}));
+    annotation (Line(points={{22,-16},{60,-16},{60,-39},{70,-39}}, color={0,127,255}));
   connect(wheDefCur.port_b1, sin_1.ports[1])
-    annotation (Line(points={{22,-2},{62,-2},{62,29},{70,29}}, color={0,127,255}));
+    annotation (Line(points={{22,0},{62,0},{62,29},{70,29}},   color={0,127,255}));
   connect(wheDefCur.uSpe, wheSpe.y)
     annotation (Line(points={{0,-8},{-50,-8},{-50,0},{-59,0}}, color={0,0,127}));
 annotation(experiment(Tolerance=1e-6, StopTime=360),
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/PartialWheel.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/PartialWheel.mo
index 083e2f20cb7..d5236f4def9 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/PartialWheel.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/PartialWheel.mo
@@ -36,12 +36,10 @@ partial model PartialWheel
 
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput P(
     final unit="W") "Electric power consumption"
-    annotation (Placement(transformation(extent={{100,-110},{140,-70}}),
-    iconTransformation(extent={{100,-110},{140,-70}})));
+    annotation (Placement(transformation(extent={{100,-60},{140,-20}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput eps(final unit="1")
     "Sensible heat exchanger effectiveness"
-    annotation (Placement(transformation(extent={{100,-20},{140,20}}),
-    iconTransformation(extent={{100,-20},{140,20}})));
+    annotation (Placement(transformation(extent={{100,20},{140,60}})));
   Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.BaseClasses.HeatExchangerWithInputEffectiveness
     hex(
     redeclare package Medium1 = Medium,
@@ -55,21 +53,22 @@ partial model PartialWheel
     redeclare final package Medium = Medium)
     "Fluid connector a1 of the supply air (positive design flow direction is from port_a1 to port_b1)"
     annotation (Placement(transformation(extent={{-190,70},{-170,90}}),
-    iconTransformation(extent={{-110,50},{-90,70}})));
+    iconTransformation(extent={{-110,70},{-90,90}})));
   Modelica.Fluid.Interfaces.FluidPort_b port_b2(
     redeclare final package Medium = Medium)
     "Fluid connector b2 of the exhaust air (positive design flow direction is from port_a2 to port_b2)"
-    annotation (Placement(transformation(extent={{-170,-70},{-190,-50}}),
-    iconTransformation(extent={{-90,-70},{-110,-50}})));
+    annotation (Placement(transformation(extent={{-170,-90},{-190,-70}}),
+    iconTransformation(extent={{-90,-88},{-110,-68}})));
   Modelica.Fluid.Interfaces.FluidPort_b port_b1(
     redeclare final package Medium = Medium)
     "Fluid connector b1 of the supply air (positive design flow direction is from port_a1 to port_b1)"
     annotation (Placement(transformation(extent={{110,70},{90,90}}),
-    iconTransformation(extent={{110,50},{90,70}})));
+    iconTransformation(extent={{110,68},{90,88}})));
   Modelica.Fluid.Interfaces.FluidPort_a port_a2(
     redeclare final package Medium = Medium)
     "Fluid connector a2 of the exhaust air (positive design flow direction is from port_a2 to port_b2)"
-    annotation (Placement(transformation(extent={{90,-70},{110,-50}})));
+    annotation (Placement(transformation(extent={{90,-90},{110,-70}}),
+        iconTransformation(extent={{90,-90},{110,-70}})));
 
   Buildings.Fluid.Sensors.MassFlowRate senSupMasFlo(
     redeclare package Medium = Medium)
@@ -119,7 +118,7 @@ equation
     annotation (Line(points={{-139,-40},{-110,-40},{-110,-8},{-102,-8}},
     color={0,0,127}));
   connect(senExhMasFlo.port_b, port_b2)
-    annotation (Line(points={{-90,-34},{-100,-34},{-100,-60},{-180,-60}},
+    annotation (Line(points={{-90,-34},{-108,-34},{-108,-80},{-180,-80}},
     color={0,127,255}));
   connect(senExhMasFlo.port_a, hex.port_b2) annotation (Line(points={{-70,-34},{-16,-34},{-16,-6},{-10,-6}},
     color={0,127,255}));
@@ -140,54 +139,46 @@ annotation (
           lineColor={28,108,200},
           fillColor={255,255,255},
           fillPattern=FillPattern.None),
-        Text(
-          extent={{44,14},{94,-10}},
-          textColor={0,0,127},
-          textString="epsSen"),
-        Text(
-          extent={{46,-74},{96,-98}},
-          textColor={0,0,127},
-          textString="P"),
         Rectangle(
-          extent={{26,-56},{94,-64}},
+          extent={{24,-74},{92,-82}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid),
         Rectangle(
-          extent={{32,64},{94,56}},
+          extent={{24,82},{92,74}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid),
         Rectangle(
-          extent={{-92,-55},{-30,-64}},
+          extent={{-92,-73},{-30,-82}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid),
         Rectangle(
-          extent={{-94,65},{-28,56}},
+          extent={{-94,83},{-28,74}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid),
-        Ellipse(extent={{8,78},{38,-74}},
+        Ellipse(extent={{8,90},{34,-90}},
           lineColor={0,0,0},
           fillColor={255,255,255},
           fillPattern=FillPattern.Solid),
         Rectangle(
-          extent={{-6,78},{22,-74}},
+          extent={{-6,90},{20,-90}},
           fillColor={255,255,255},
           fillPattern=FillPattern.Solid,
           pattern=LinePattern.None),
         Ellipse(
-          extent={{-38,78},{-6,-74}},
+          extent={{-38,90},{-8,-90}},
           lineColor={28,108,200},
           fillColor={28,108,200},
           fillPattern=FillPattern.Solid),
-        Line(points={{-22,-74},{22,-74}}, color={0,0,0}),
-        Line(points={{-22,78},{22,78}}, color={0,0,0})}),
+        Line(points={{-24,-90},{20,-90}}, color={0,0,0}),
+        Line(points={{-22,90},{22,90}}, color={0,0,0})}),
           Diagram(
         coordinateSystem(preserveAspectRatio=true, extent={{-180,-100},{100,100}})),
 Documentation(info="<html>
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo
index 322608e9e67..46d92825586 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo
@@ -15,11 +15,11 @@ model BypassDampers
     final max=1)
     "Bypass damper position"
     annotation (Placement(transformation(extent={{-222,120},{-182,160}}),
-        iconTransformation(extent={{-140,-20},{-100,20}})));
+        iconTransformation(extent={{-140,20},{-100,60}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uRot
     "True when the wheel is operating"
     annotation (Placement(transformation(extent={{-220,-20},{-180,20}}),
-        iconTransformation(extent={{-140,60},{-100,100}})));
+        iconTransformation(extent={{-140,-62},{-100,-22}})));
   Buildings.Fluid.Actuators.Dampers.Exponential bypDamSup(
     redeclare package Medium = Medium,
     final m_flow_nominal=mSup_flow_nominal,
@@ -61,7 +61,7 @@ protected
     final realTrue=P_nominal,
     final realFalse=0)
     "Electric power consumption for motor"
-    annotation (Placement(transformation(extent={{-160,-90},{-140,-70}})));
+    annotation (Placement(transformation(extent={{-160,-110},{-140,-90}})));
 protected
   Modelica.Blocks.Sources.Constant zero(final k=0) "Zero signal"
     annotation (Placement(transformation(extent={{-160,22},{-140,42}})));
@@ -71,9 +71,10 @@ equation
   connect(bypDamSup.port_b, port_b1)
     annotation (Line(points={{-40,80},{100,80}}, color={0,127,255}));
   connect(bypDamExh.port_a, port_a2)
-    annotation (Line(points={{0,-60},{100,-60}},  color={0,127,255}));
+    annotation (Line(points={{0,-60},{50,-60},{50,-80},{100,-80}},
+                                                  color={0,127,255}));
   connect(damExh.port_a, port_a2)
-    annotation (Line(points={{50,-50},{50,-60},{100,-60}}, color={0,127,255}));
+    annotation (Line(points={{50,-50},{50,-80},{100,-80}}, color={0,127,255}));
   connect(sub.y, damSup.y)
     annotation (Line(points={{-78,100},{20,100},{20,60},{-50,60},{-50,52}}, color={0,0,127}));
   connect(damExh.y,sub. y)
@@ -84,10 +85,10 @@ equation
     annotation (Line(points={{-40,40},{-20,40},{-20,6},{-10,6}},
     color={0,127,255}));
   connect(bypDamExh.y, uBypDamPos)
-    annotation (Line(points={{-10,-48},{-10,-30},{30,-30},{30,140},{-202,140}},
+    annotation (Line(points={{-10,-48},{-10,-30},{12,-30},{12,140},{-202,140}},
     color={0,0,127}));
   connect(hex.port_a2, damExh.port_b)
-    annotation (Line(points={{10,-6},{50,-6},{50,-30}},
+    annotation (Line(points={{10,-6},{16,-6},{16,-16},{50,-16},{50,-30}},
     color={0,127,255}));
   connect(sub.u2, uBypDamPos)
     annotation (Line(points={{-102,94},{-160,94},{-160,140},{-202,140}},
@@ -98,12 +99,15 @@ equation
   connect(damSup.port_a, port_a1)
     annotation (Line(points={{-60,40},{-100,40},{-100,80},{-180,80}},
     color={0,127,255}));
-  connect(uRot, PEle.u) annotation (Line(points={{-200,0},{-170,0},{-170,-80},{-162,-80}},
+  connect(uRot, PEle.u) annotation (Line(points={{-200,0},{-132,0},{-132,-84},{-164,
+          -84},{-164,-94},{-168,-94},{-168,-100},{-162,-100}},
     color={255,0,255}));
-  connect(PEle.y, P) annotation (Line(points={{-139,-80},{80,-80},{80,-90},{120,-90}},
+  connect(PEle.y, P) annotation (Line(points={{-139,-100},{82,-100},{82,-40},{120,
+          -40}},
     color={0,0,127}));
   connect(bypDamExh.port_b, port_b2)
-    annotation (Line(points={{-20,-60},{-180,-60}}, color={0,127,255}));
+    annotation (Line(points={{-20,-60},{-100,-60},{-100,-80},{-180,-80}},
+                                                    color={0,127,255}));
   connect(swiepsSen.u2, uRot) annotation (Line(points={{-54,-12},{-60,-12},{-60,
           -54},{-132,-54},{-132,0},{-200,0}}, color={255,0,255}));
   connect(zero.y, swiepsSen.u3) annotation (Line(points={{-139,32},{-124,32},{-124,
@@ -113,7 +117,8 @@ equation
   connect(swiepsSen.y, hex.eps) annotation (Line(points={{-30,-12},{-20,-12},{-20,
           0},{-12,0}}, color={0,0,127}));
   connect(swiepsSen.y, eps) annotation (Line(points={{-30,-12},{-20,-12},{-20,-20},
-          {80,-20},{80,0},{120,0}}, color={0,0,127}));
+          {80,-20},{80,40},{120,40}},
+                                    color={0,0,127}));
 annotation (
         defaultComponentName="whe",
         Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
@@ -124,51 +129,51 @@ annotation (
           fillColor={255,255,255},
           fillPattern=FillPattern.None),
         Rectangle(
-          extent={{-64,94},{58,86}},
+          extent={{-64,96},{58,92}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid),
         Rectangle(
-          extent={{-18.5,3.5},{18.5,-3.5}},
+          extent={{-10.5,3.5},{10.5,-3.5}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid,
-          origin={-60.5,74.5},
+          origin={-60.5,84.5},
           rotation=90),
         Rectangle(
-          extent={{-18,4},{18,-4}},
+          extent={{-9,3},{9,-3}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid,
-          origin={54,76},
+          origin={55,85},
           rotation=90),
         Rectangle(
-          extent={{-18,4},{18,-4}},
+          extent={{-8,3},{8,-3}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid,
-          origin={54,-74},
+          origin={55,-84},
           rotation=90),
         Rectangle(
-          extent={{-64,-84},{58,-92}},
+          extent={{-9,3},{9,-3}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,0},
-          fillPattern=FillPattern.Solid),
+          fillPattern=FillPattern.Solid,
+          origin={-61,-83},
+          rotation=90),
         Rectangle(
-          extent={{-16.5,3.5},{16.5,-3.5}},
+          extent={{-64,-92},{58,-96}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,0},
-          fillPattern=FillPattern.Solid,
-          origin={-60.5,-73.5},
-          rotation=90)}),
+          fillPattern=FillPattern.Solid)}),
           Diagram(
-        coordinateSystem(preserveAspectRatio=true, extent={{-180,-100},{100,180}})),
+        coordinateSystem(preserveAspectRatio=true, extent={{-180,-120},{100,180}})),
 Documentation(info="<html>
 <p>
 Model of a sensible heat recovery wheel, which consists of
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo
index 378e897947c..d0e9c8c45b9 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo
@@ -85,7 +85,7 @@ model SpaceCooling "Space cooling system"
     dpSup_nominal=200,
     epsCoo_nominal=eps,
     epsHea_nominal=eps) "Heat recovery"
-    annotation (Placement(transformation(extent={{-110,-36},{-90,-16}})));
+    annotation (Placement(transformation(extent={{-100,-38},{-80,-18}})));
   Buildings.Fluid.HeatExchangers.WetCoilEffectivenessNTU cooCoi(
     redeclare package Medium1 = MediumW,
     redeclare package Medium2 = MediumA,
@@ -125,45 +125,51 @@ model SpaceCooling "Space cooling system"
     annotation (Placement(transformation(extent={{-160,40},{-140,60}})));
   Buildings.BoundaryConditions.WeatherData.Bus weaBus "Weather data bus"
     annotation (Placement(transformation(extent={{-120,40},{-100,60}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant mAir_flow(k=mA_flow_nominal)
-    "Fan air flow rate"
-    annotation (Placement(transformation(extent={{0,0},{20,20}})));
   Buildings.Fluid.Sensors.TemperatureTwoPort senTemHXOut(redeclare package
       Medium = MediumA, m_flow_nominal=mA_flow_nominal)
     "Temperature sensor for heat recovery outlet on supply side"
-    annotation (Placement(transformation(extent={{-76,-26},{-64,-14}})));
+    annotation (Placement(transformation(extent={{-64,-26},{-52,-14}})));
   Buildings.Fluid.Sensors.TemperatureTwoPort senTemSupAir(redeclare package
       Medium = MediumA, m_flow_nominal=mA_flow_nominal)
     "Temperature sensor for supply air"
     annotation (Placement(transformation(extent={{6,-26},{18,-14}})));
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant TRooSetPoi(k=TRooSet)
     "Room temperature set point"
-    annotation (Placement(transformation(extent={{-170,-104},{-150,-84}})));
+    annotation (Placement(transformation(extent={{-160,-110},{-140,-90}})));
   Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor senTemRoo
     "Room temperature sensor"
     annotation (Placement(transformation(extent={{70,70},{90,90}})));
-  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal mWat_flow(realTrue=0, realFalse=
-        mW_flow_nominal) "Conversion from boolean to real for water flow rate"
-    annotation (Placement(transformation(extent={{-60,-110},{-40,-90}})));
-  Buildings.Controls.OBC.CDL.Reals.Subtract sub
-    "Inputs different"
-    annotation (Placement(transformation(extent={{-130,-110},{-110,-90}})));
-  Buildings.Controls.OBC.CDL.Reals.Hysteresis con(
-    final uLow=-0.5,
-    final uHigh=0.5)
-    "Controller for coil water flow rate"
-    annotation (Placement(transformation(extent={{-100,-110},{-80,-90}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse opeSig(
     width=0.5,
     period=86400,
     shift=0.25*86400)
-              "Operating signal"
-    annotation (Placement(transformation(extent={{-172,10},{-152,30}})));
+    "Operating signal"
+    annotation (Placement(transformation(extent={{-160,-70},{-140,-50}})));
   Buildings.Controls.Continuous.LimPID conPID(k=0.1, Ti=60)
     annotation (Placement(transformation(extent={{-46,10},{-26,30}})));
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant TMixSetPoi(k=TMixSet)
     "Mixed air temperature set point"
     annotation (Placement(transformation(extent={{-88,10},{-68,30}})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senTemRetAir(
+    redeclare package Medium = MediumA,
+    m_flow_nominal=mA_flow_nominal)
+    "Temperature sensor for return air"
+    annotation (Placement(transformation(extent={{58,-66},{46,-54}})));
+  Buildings.Controls.Continuous.LimPID conRoo(
+    k=0.1,
+    Ti=60,
+    yMax=mW_flow_nominal,
+    reverseActing=false)
+    "Room controller"
+    annotation (Placement(transformation(extent={{-80,-110},{-60,-90}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Pulse mAir_flow(
+    amplitude=-mA_flow_nominal,
+    width=0.5,
+    period=87600,
+    shift=0.24*87600,
+    offset=mA_flow_nominal)
+    "Fan air flow rate"
+    annotation (Placement(transformation(extent={{0,0},{20,20}})));
 equation
   connect(theCon.port_b, vol.heatPort) annotation (Line(
       points={{40,50},{50,50},{50,30},{60,30}},
@@ -177,12 +183,8 @@ equation
       points={{60,-20},{69,-20},{69,20}},
       color={0,127,255},
       smooth=Smooth.None));
-  connect(vol.ports[2],whe. port_a2) annotation (Line(
-      points={{71,20},{71,-46},{-90,-46},{-90,-32}},
-      color={0,127,255},
-      smooth=Smooth.None));
   connect(out.ports[2],whe. port_a1) annotation (Line(
-      points={{-120,-21},{-116,-21},{-116,-20},{-110,-20}},
+      points={{-120,-21},{-110,-21},{-110,-20},{-100,-20}},
       color={0,127,255},
       smooth=Smooth.None));
   connect(souWat.ports[1], cooCoi.port_a1)   annotation (Line(
@@ -214,16 +216,12 @@ equation
       textString="%first",
       index=-1,
       extent={{-6,3},{-6,3}}));
-  connect(fan.m_flow_in, mAir_flow.y) annotation (Line(
-      points={{50,-8},{50,10},{22,10}},
-      color={0,0,127},
-      smooth=Smooth.None));
   connect(whe.port_b1, senTemHXOut.port_a) annotation (Line(
-      points={{-90,-20},{-76,-20}},
+      points={{-80,-20.2},{-80,-20},{-64,-20}},
       color={0,127,255},
       smooth=Smooth.None));
   connect(senTemHXOut.port_b, cooCoi.port_a2) annotation (Line(
-      points={{-64,-20},{-40,-20}},
+      points={{-52,-20},{-40,-20}},
       color={0,127,255},
       smooth=Smooth.None));
   connect(cooCoi.port_b2, senTemSupAir.port_a) annotation (Line(
@@ -242,33 +240,30 @@ equation
       points={{60,30},{50,30},{50,80},{70,80}},
       color={191,0,0},
       smooth=Smooth.None));
-  connect(mWat_flow.y, souWat.m_flow_in) annotation (Line(
-      points={{-38,-100},{-30,-100},{-30,-92},{-22,-92}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(sub.y, con.u) annotation (Line(
-      points={{-108,-100},{-102,-100}},
-      color={0,0,127}));
-  connect(con.y, mWat_flow.u) annotation (Line(        points={{-78,-100},{-62,-100}},
-      color={255,0,255}));
-  connect(TRooSetPoi.y, sub.u1) annotation (Line(
-      points={{-148,-94},{-132,-94}},
-      color={0,0,127}));
-  connect(senTemRoo.T, sub.u2) annotation (Line(
-      points={{91,80},{100,80},{100,-140},{-140,-140},{-140,-106},{-132,-106}},
-      color={0,0,127}));
   connect(whe.port_b2, out.ports[1]) annotation (Line(
-      points={{-110,-32},{-116,-32},{-116,-23},{-120,-23}},
+      points={{-100,-35.8},{-112,-35.8},{-112,-23},{-120,-23}},
       color={0,127,255}));
   connect(opeSig.y, whe.uRot) annotation (Line(
-      points={{-150,20},{-116,20},{-116,-18},{-112,-18}},
+      points={{-138,-60},{-106,-60},{-106,-32.2},{-102,-32.2}},
       color={255,0,255}));
   connect(TMixSetPoi.y,conPID. u_s)
     annotation (Line(points={{-66,20},{-48,20}}, color={0,0,127}));
-  connect(senTemHXOut.T,conPID. u_m) annotation (Line(points={{-70,-13.4},{-70,0},
-          {-36,0},{-36,8}}, color={0,0,127}));
-  connect(conPID.y, whe.uBypDamPos) annotation (Line(points={{-25,20},{-16,20},{
-          -16,-80},{-114,-80},{-114,-26},{-112,-26}}, color={0,0,127}));
+  connect(senTemHXOut.T,conPID. u_m) annotation (Line(points={{-58,-13.4},{-58,2},
+          {-36,2},{-36,8}}, color={0,0,127}));
+  connect(senTemRetAir.port_a, vol.ports[2])
+    annotation (Line(points={{58,-60},{71,-60},{71,20}}, color={0,127,255}));
+  connect(senTemRetAir.port_b, whe.port_a2) annotation (Line(points={{46,-60},{-40,
+          -60},{-40,-36},{-80,-36}}, color={0,127,255}));
+  connect(conRoo.y, souWat.m_flow_in) annotation (Line(points={{-59,-100},{-32,-100},
+          {-32,-92},{-22,-92}}, color={0,0,127}));
+  connect(TRooSetPoi.y, conRoo.u_s)
+    annotation (Line(points={{-138,-100},{-82,-100}}, color={0,0,127}));
+  connect(conRoo.u_m, senTemRoo.T) annotation (Line(points={{-70,-112},{-70,-140},
+          {100,-140},{100,80},{91,80}}, color={0,0,127}));
+  connect(mAir_flow.y, fan.m_flow_in)
+    annotation (Line(points={{22,10},{50,10},{50,-8}}, color={0,0,127}));
+  connect(conPID.y, whe.uBypDamPos) annotation (Line(points={{-25,20},{-10,20},{
+          -10,-54},{-110,-54},{-110,-24},{-102,-24}}, color={0,0,127}));
   annotation (Documentation(info="<html>
 <p>
 This block is identical to
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/SpeedControlled.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/SpeedControlled.mo
index 8623fc7dfbe..2c39916c860 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/SpeedControlled.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/SpeedControlled.mo
@@ -4,9 +4,8 @@ model SpeedControlled
   extends
     Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.BaseClasses.PartialWheel;
   parameter
-    Buildings.Fluid.BaseClasses.VariableSpeedWheel.BaseClasses.Data.Generic
-    per
-    "Record with performance data"
+    Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.Generic
+    per "Record with performance data"
     annotation (Placement(transformation(extent={{28,78},{48,98}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput uSpe(
     final unit="1",
@@ -14,7 +13,7 @@ model SpeedControlled
     "Wheel speed ratio"
     annotation (Placement(transformation(extent={{-220,-20},{-180,20}}),
         iconTransformation(extent={{-140,-20},{-100,20}})));
-  Buildings.Fluid.BaseClasses.VariableSpeedWheel.Sensible
+  Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Sensible
     senWhe(final per=per)
     "Correct the wheel performance based on the wheel speed"
     annotation (Placement(transformation(extent={{-140,-90},{-120,-70}})));
@@ -26,8 +25,9 @@ model SpeedControlled
 equation
   connect(port_a1, hex.port_a1) annotation (Line(points={{-180,80},{-60,80},{-60,6},
     {-10,6}}, color={0,127,255}));
-  connect(hex.port_a2, port_a2) annotation (Line(points={{10,-6},{60,-6},{60,-60},
-    {100,-60}}, color={0,127,255}));
+  connect(hex.port_a2, port_a2) annotation (Line(points={{10,-6},{60,-6},{60,
+          -80},{100,-80}},
+                color={0,127,255}));
   connect(senWhe.epsSenCor, mul.u2) annotation (Line(points={{-118,-80},{-64,-80},
           {-64,-20},{-56,-20}}, color={0,0,127}));
   connect(effCal.eps, mul.u1) annotation (Line(points={{-78,0},{-64,0},{-64,-8},
@@ -36,9 +36,10 @@ equation
           -12,0}}, color={0,0,127}));
   connect(uSpe, senWhe.uSpe) annotation (Line(points={{-200,0},{-170,0},{-170,-80},
           {-142,-80}}, color={0,0,127}));
-  connect(senWhe.P, P) annotation (Line(points={{-118,-72},{40,-72},{40,-90},{
-          120,-90}}, color={0,0,127}));
-  connect(eps, mul.y) annotation (Line(points={{120,0},{80,0},{80,-14},{-32,-14}},
+  connect(senWhe.P, P) annotation (Line(points={{-118,-72},{40,-72},{40,-40},{
+          120,-40}}, color={0,0,127}));
+  connect(eps, mul.y) annotation (Line(points={{120,40},{80,40},{80,-14},{-32,
+          -14}},
         color={0,0,127}));
 annotation (
         defaultComponentName="whe",
@@ -64,8 +65,8 @@ exchanger effectiveness in both heating and cooling conditions.
 <p>
 The operation of the heat recovery wheel is adjustable by modulating the wheel speed.
 See details about the impacts of the wheel speed in 
-<a href=\"modelica://Buildings.Fluid.BaseClasses.VariableSpeedWheel.Sensible\">
-Buildings.Fluid.BaseClasses.VariableSpeedWheel.Sensible</a>.
+<a href=\"modelica://Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Sensible\">
+Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Sensible</a>.
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mo
index f2fb44e4f0e..40e98bbb460 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mo
@@ -74,13 +74,13 @@ model SpeedControlled
     mExh_flow_nominal=5,
     per=perDefMotCur)    "Wheel with a default curve"
     annotation (Placement(transformation(extent={{0,-30},{20,-10}})));
-  Buildings.Fluid.BaseClasses.VariableSpeedWheel.BaseClasses.Data.ASHRAE per(
-    motorEfficiency_uSpe(y={0.1,0.6,0.8,1}, eta={0.3,0.4,0.6,1}),
+  Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.ASHRAE per(
+    motorEfficiency_uSpe(y={0.1,0.6,0.8,1}, eta={0.3,0.8,0.9,1}),
     haveLatentHeatExchange=false,
     useDefaultMotorEfficiencyCurve=false)
     "Performance record for the sensible heat wheet"
     annotation (Placement(transformation(extent={{-34,60},{-14,80}})));
-  Buildings.Fluid.BaseClasses.VariableSpeedWheel.BaseClasses.Data.ASHRAE perDefMotCur(
+  Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.ASHRAE perDefMotCur(
       haveLatentHeatExchange=true, useDefaultMotorEfficiencyCurve=true)
     "Performance record for the sensible heat wheet with default motor curve"
     annotation (Placement(transformation(extent={{6,60},{26,80}})));
@@ -88,28 +88,33 @@ equation
   connect(TSup.y, sou_1.T_in)
     annotation (Line(points={{-59,34},{-42,34}}, color={0,0,127}));
   connect(sou_1.ports[1], wheUseDefCur.port_a1)
-    annotation (Line(points={{-20,29},
-    {-10,29},{-10,16},{0,16}}, color={0,127,255}));
+    annotation (Line(points={{-20,29},{-10,29},{-10,18},{0,18}},
+                               color={0,127,255}));
   connect(wheUseDefCur.port_a2, sou_2.ports[1])
-    annotation (Line(points={{20,4},{40,4},{40,-31},{70,-31}},
+    annotation (Line(points={{20,2},{40,2},{40,-31},{70,-31}},
     color={0,127,255}));
   connect(wheSpe.y, wheUseDefCur.uSpe)
     annotation (Line(points={{-59,0},{-30,0},{-30,10},{-2,10}},
     color={0,0,127}));
   connect(wheUseDefCur.port_b2, senExhTem.port_a)
-    annotation (Line(points={{0,4},{-6,4},{-6,-42},{-20,-42}},  color={0,127,255}));
+    annotation (Line(points={{0,2.2},{-6,2.2},{-6,-42},{-20,-42}},
+                                                                color={0,127,255}));
   connect(senExhTem.port_b, sin_2.ports[1])
     annotation (Line(points={{-40,-42},{-48,-42},{-48,-41},{-58,-41}},
     color={0,127,255}));
   connect(senSupTem.port_b, wheUseDefCur.port_b1)
-    annotation (Line(points={{40,30},{28,30},{28,16},{20,16}}, color={0,127,255}));
+    annotation (Line(points={{40,30},{28,30},{28,17.8},{20,17.8}},
+                                                               color={0,127,255}));
   connect(wheDefCur.port_a1, sou_1.ports[2])
-    annotation (Line(points={{0,-14},{-14,-14},{-14,31},{-20,31}}, color={0,127,255}));
-  connect(wheDefCur.port_b1, sin_1.ports[1])       annotation (Line(points={{20,-14},{36,-14},{36,22},{64,22},{64,29},{72,29}},
+    annotation (Line(points={{0,-12},{-14,-12},{-14,31},{-20,31}}, color={0,127,255}));
+  connect(wheDefCur.port_b1, sin_1.ports[1])       annotation (Line(points={{20,
+          -12.2},{36,-12.2},{36,22},{64,22},{64,29},{72,29}},
     color={0,127,255}));
-  connect(wheDefCur.port_b2, sin_2.ports[2]) annotation (Line(points={{0,-26},{-48,-26},{-48,-39},{-58,-39}},
+  connect(wheDefCur.port_b2, sin_2.ports[2]) annotation (Line(points={{0,-27.8},
+          {-48,-27.8},{-48,-39},{-58,-39}},
     color={0,127,255}));
-  connect(wheDefCur.port_a2, sou_2.ports[2]) annotation (Line(points={{20,-26},{52,-26},{52,-29},{70,-29}},
+  connect(wheDefCur.port_a2, sou_2.ports[2]) annotation (Line(points={{20,-28},{
+          52,-28},{52,-29},{70,-29}},
     color={0,127,255}));
   connect(wheDefCur.uSpe, wheSpe.y) annotation (Line(points={{-2,-20},{-30,-20},{-30,0},{-59,0}},
     color={0,0,127}));

From 4c757ae18f70b9169081393ac0d6568fccad02dc Mon Sep 17 00:00:00 2001
From: SenHuang19 <jhy1987@gmail.com>
Date: Fri, 14 Jun 2024 14:18:35 -0400
Subject: [PATCH 10/27] update scripts

---
 .../Validation/VariableSpeedThermalWheels.mos}            | 2 +-
 ...hermalWheels.Validation.VariableSpeedThermalWheels.mos | 8 ++++++++
 ...Wheels.Latent.BaseClasses.Validation.Effectiveness.mos | 1 -
 ...hangers.ThermalWheels.Latent.Examples.SpaceCooling.mos | 4 +++-
 ...eels.Sensible.BaseClasses.Validation.Effectiveness.mos | 1 -
 ...ngers.ThermalWheels.Sensible.Examples.SpaceCooling.mos | 4 +++-
 6 files changed, 15 insertions(+), 5 deletions(-)
 rename Buildings/Resources/Scripts/Dymola/Fluid/{BaseClasses/VariableSpeedWheel/Validation/VariableSpeedWheel.mos => HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/VariableSpeedThermalWheels.mos} (73%)
 create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Validation.VariableSpeedThermalWheels.mos

diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/VariableSpeedWheel/Validation/VariableSpeedWheel.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/VariableSpeedThermalWheels.mos
similarity index 73%
rename from Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/VariableSpeedWheel/Validation/VariableSpeedWheel.mos
rename to Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/VariableSpeedThermalWheels.mos
index 3200d04dc3c..96687b63990 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/VariableSpeedWheel/Validation/VariableSpeedWheel.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/VariableSpeedThermalWheels.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.BaseClasses.VariableSpeedWheel.Validation.VariableSpeedWheel",method="CVode", startTime=0, stopTime=1, tolerance=1e-8, resultFile="VariableSpeedWheel");
+simulateModel("Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Validation.VariableSpeedThermalWheels",method="CVode", startTime=0, stopTime=1, tolerance=1e-8, resultFile="VariableSpeedThermalWheels");
 createPlot(id=1, position={55, 55, 820, 572}, y={"senWhe.uSpe"}, range={0.0, 1.0, -0.5, 1.5}, grid=true, subPlot=101, colors={{28,108,200}}, timeUnit="s", displayUnits={"1"});
 createPlot(id=1, position={55, 55, 820, 572}, y={"senWhe.P", "latWheDefMotCur.P"}, range={0.0, 1.0, -50.0, 150.0}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"W", "W"});
 createPlot(id=1, position={55, 55, 820, 572}, y={"latWheDefMotCur.epsSenCor", "latWheDefMotCur.epsLatCor"}, range={0.0, 1.0, 0.0, 1.5}, grid=true, subPlot=103, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"1", "1"});
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Validation.VariableSpeedThermalWheels.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Validation.VariableSpeedThermalWheels.mos
new file mode 100644
index 00000000000..2904e14da59
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Validation.VariableSpeedThermalWheels.mos
@@ -0,0 +1,8 @@
+compareVars :=
+  {
+    "senWhe.uSpe",
+    "senWhe.P",
+    "latWheDefMotCur.P",
+    "latWheDefMotCur.epsSenCor",
+    "latWheDefMotCur.epsLatCor"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BaseClasses.Validation.Effectiveness.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BaseClasses.Validation.Effectiveness.mos
index 92fee4abf5b..b34334f33f8 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BaseClasses.Validation.Effectiveness.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BaseClasses.Validation.Effectiveness.mos
@@ -1,6 +1,5 @@
 compareVars :=
   {
-    "whSpe.y",
     "TSup.y",
     "TExh.y",
     "VSup.y",
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.Examples.SpaceCooling.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.Examples.SpaceCooling.mos
index 507659148d7..89999319d3f 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.Examples.SpaceCooling.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.Examples.SpaceCooling.mos
@@ -8,6 +8,8 @@ compareVars :=
     "opeSig.y",
     "TOut.T",
     "senTemHXOut.T",
+    "TMixSetPoi.y",
     "whe.port_a1.Xi_outflow[1]",
-    "whe.port_b1.Xi_outflow[1]"
+    "whe.port_b1.Xi_outflow[1]",
+    "whe.senSupMasFlo.m_flow"
   };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.BaseClasses.Validation.Effectiveness.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.BaseClasses.Validation.Effectiveness.mos
index 24b24a5495f..b5d6d634e34 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.BaseClasses.Validation.Effectiveness.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.BaseClasses.Validation.Effectiveness.mos
@@ -1,6 +1,5 @@
 compareVars :=
   {
-    "whSpe.y",
     "TSup.y",
     "TExh.y",
     "VSup.y",
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.Examples.SpaceCooling.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.Examples.SpaceCooling.mos
index 9898798bfa5..ff1abdb9da7 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.Examples.SpaceCooling.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatExchangers.ThermalWheels.Sensible.Examples.SpaceCooling.mos
@@ -7,5 +7,7 @@ compareVars :=
     "cooCoi.sta_b2.T",
     "opeSig.y",
     "TOut.T",
-    "senTemHXOut.T"
+    "senTemHXOut.T",
+    "TMixSetPoi.y",
+    "whe.senSupMasFlo.m_flow"
   };

From d60cb279b372a48222ca1f2841609eb913d40ae0 Mon Sep 17 00:00:00 2001
From: SenHuang19 <jhy1987@gmail.com>
Date: Fri, 14 Jun 2024 14:19:04 -0400
Subject: [PATCH 11/27] update the reference dataset

---
 ..._Validation_VariableSpeedThermalWheels.txt | 13 ++++++++++++
 ...t_BaseClasses_Validation_Effectiveness.txt |  7 +++----
 ...malWheels_Latent_Examples_SpaceCooling.txt | 20 ++++++++++---------
 ...eels_Latent_Validation_SpeedControlled.txt | 14 ++++++-------
 ...e_BaseClasses_Validation_Effectiveness.txt |  5 ++---
 ...lWheels_Sensible_Examples_SpaceCooling.txt | 16 ++++++++-------
 ...ls_Sensible_Validation_SpeedControlled.txt | 10 +++++-----
 7 files changed, 50 insertions(+), 35 deletions(-)
 create mode 100644 Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_BaseClasses_VariableSpeedThermalWheels_Validation_VariableSpeedThermalWheels.txt

diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_BaseClasses_VariableSpeedThermalWheels_Validation_VariableSpeedThermalWheels.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_BaseClasses_VariableSpeedThermalWheels_Validation_VariableSpeedThermalWheels.txt
new file mode 100644
index 00000000000..c641cbdccd6
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_BaseClasses_VariableSpeedThermalWheels_Validation_VariableSpeedThermalWheels.txt
@@ -0,0 +1,13 @@
+last-generated=2024-06-14
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 1e+00]
+senWhe.uSpe=[0e+00, 1e-02, 2e-02, 3e-02, 4e-02, 5e-02, 6e-02, 7.000000000000001e-02, 8e-02, 9e-02, 1e-01, 1.1e-01, 1.2e-01, 1.3e-01, 1.4e-01, 1.5e-01, 1.6e-01, 1.7e-01, 1.8e-01, 1.9e-01, 2e-01, 2.1e-01, 2.2e-01, 2.3e-01, 2.4e-01, 2.5e-01, 2.6e-01, 2.7e-01, 2.8e-01, 2.9e-01, 3e-01, 3.1e-01, 3.2e-01, 3.3e-01, 3.4e-01, 3.5e-01, 3.6e-01, 3.7e-01, 3.8e-01, 3.9e-01, 4e-01, 4.1e-01, 4.2e-01, 4.3e-01, 4.4e-01, 4.5e-01, 4.6e-01, 4.7e-01, 4.8e-01, 4.9e-01, 5e-01, 5.1e-01, 5.2e-01, 5.3e-01, 5.4e-01, 5.5e-01, 5.600000000000001e-01, 5.7e-01, 5.8e-01, 5.9e-01, 6e-01, 6.1e-01, 6.2e-01, 6.3e-01, 6.4e-01, 6.5e-01, 6.6e-01, 6.7e-01, 6.8e-01, 6.899999999999999e-01, 7e-01, 7.1e-01, 7.2e-01, 7.3e-01, 7.4e-01, 7.5e-01, 7.6e-01, 7.7e-01, 7.8e-01, 7.9e-01, 8e-01, 8.100000000000001e-01, 8.2e-01, 8.3e-01, 8.4e-01, 8.5e-01, 8.6e-01, 8.7e-01, 8.8e-01, 8.9e-01, 9e-01, 9.1e-01, 9.2e-01, 9.3e-01, 9.399999999999999e-01, 9.5e-01, 9.6e-01, 9.7e-01, 9.8e-01, 9.9e-01, 1e+00]
+senWhe.P=[0e+00, 4.761904816903842e+00, 9.090909187272429e+00, 1.304347826341612e+01, 1.666666633875906e+01, 1.999999975965896e+01, 2.307692376410838e+01, 2.592592612612359e+01, 2.857142875187252e+01, 3.103448209954504e+01, 3.333333172841002e+01, 3.54745789794508e+01, 3.746274617664584e+01, 3.931042564801476e+01, 4.102926625788584e+01, 4.263003828764391e+01, 4.412267736143927e+01, 4.551635336467738e+01, 4.68195143207113e+01, 4.803994397496933e+01, 4.918481412044957e+01, 5.0260727608799e+01, 5.12737733099268e+01, 5.222955664759944e+01, 5.313324784464676e+01, 5.398962020874023e+01, 5.48030746359894e+01, 5.557767405035094e+01, 5.631719580574799e+01, 5.702511272819967e+01, 5.770465389618291e+01, 5.835882934458218e+01, 5.899041792334175e+01, 5.960201565667445e+01, 6.019604852644531e+01, 6.077478061347414e+01, 6.13403312290773e+01, 6.189469501955735e+01, 6.243974711429421e+01, 6.297725372368795e+01, 6.35088879289212e+01, 6.403624744134193e+01, 6.456084510799016e+01, 6.508412895936711e+01, 6.560749066447872e+01, 6.613225618147645e+01, 6.665973619197847e+01, 6.71911774318604e+01, 6.772779904156569e+01, 6.827081246772391e+01, 6.882138824462891e+01, 6.938070732595767e+01, 6.994990649343123e+01, 7.053015304768698e+01, 7.112260308780594e+01, 7.172842334336343e+01, 7.234878525103149e+01, 7.298489426091636e+01, 7.363795581972352e+01, 7.430923640970529e+01, 7.499999833374297e+01, 7.573636517912414e+01, 7.653903158781699e+01, 7.740133709679509e+01, 7.831676618250172e+01, 7.927878042944958e+01, 8.028075905331171e+01, 8.131591622182215e+01, 8.237719650032545e+01, 8.345725276184173e+01, 8.454838692458335e+01, 8.564252706293917e+01, 8.67311980694228e+01, 8.780555521694428e+01, 8.885636802758603e+01, 8.987408447265625e+01, 9.084888548337698e+01, 9.177073838349366e+01, 9.262952656693645e+01, 9.341514425627803e+01, 9.411764446869601e+01, 9.474130997730934e+01, 9.530007208964075e+01, 9.57988212716005e+01, 9.624262345895097e+01, 9.663665681991611e+01, 9.698615217264965e+01, 9.729636368954255e+01, 9.757250225924663e+01, 9.781974825685558e+01, 9.80431676180184e+01, 9.824772592070774e+01, 9.843829314648045e+01, 9.861959826084455e+01, 9.87962265433749e+01, 9.897264883305984e+01, 9.915322152711325e+01, 9.934215490354318e+01, 9.954358633536991e+01, 9.976155068824664e+01, 1e+02]
+latWheDefMotCur.P=[0e+00, 3.11453666601348e+01, 3.080411337557445e+01, 3.056472586376242e+01, 3.042285536962657e+01, 3.037587738106814e+01, 3.042293168505145e+01, 3.056490325389966e+01, 3.08044682085457e+01, 3.114622865292136e+01, 3.159693138356497e+01, 3.213144687188576e+01, 3.270808808096321e+01, 3.331371718325803e+01, 3.393801113190678e+01, 3.457237587181439e+01, 3.520926688981853e+01, 3.584182346536181e+01, 3.646359971811033e+01, 3.706844725419495e+01, 3.765042478697854e+01, 3.821939124281827e+01, 3.879053122679566e+01, 3.93658673738078e+01, 3.994725068044981e+01, 4.053639602661133e+01, 4.113491497499373e+01, 4.17443383303507e+01, 4.23661650863725e+01, 4.300185448080428e+01, 4.365284650628359e+01, 4.432350905425515e+01, 4.501612522966013e+01, 4.572912121669752e+01, 4.646096393858679e+01, 4.721014449532776e+01, 4.79751614031979e+01, 4.875448952451628e+01, 4.954656257582896e+01, 5.034976693509036e+01, 5.116241787909311e+01, 5.198524504776e+01, 5.281960406902093e+01, 5.366467605890043e+01, 5.45195886755951e+01, 5.538340862839022e+01, 5.625514148204832e+01, 5.713372050311615e+01, 5.801801395235213e+01, 5.890680609675282e+01, 5.979881286621094e+01, 6.069266213829189e+01, 6.158691195256713e+01, 6.248002116697582e+01, 6.337038230904864e+01, 6.425630845582747e+01, 6.513602426604761e+01, 6.600767579028113e+01, 6.686934804522519e+01, 6.771904975352929e+01, 6.855471603982443e+01, 6.938301730841891e+01, 7.021182974388226e+01, 7.104093972644172e+01, 7.187011837355196e+01, 7.269910628501677e+01, 7.352762386547005e+01, 7.435539107519226e+01, 7.518208253895773e+01, 7.600738545044149e+01, 7.68309412268643e+01, 7.76523836564877e+01, 7.847133402483773e+01, 7.928739773787395e+01, 8.010015791765764e+01, 8.09091796875e+01, 8.171401291094095e+01, 8.251419982365378e+01, 8.330925214318799e+01, 8.409867690007326e+01, 8.488197996532593e+01, 8.564924603524692e+01, 8.639314322331872e+01, 8.711706662038689e+01, 8.782449524168612e+01, 8.85189955468619e+01, 8.920419976850296e+01, 8.988380399787822e+01, 9.056153139032357e+01, 9.124119665500059e+01, 9.192662975922336e+01, 9.262172515416221e+01, 9.333047365995137e+01, 9.40568918696861e+01, 9.480513018683867e+01, 9.557940768213886e+01, 9.638408837887896e+01, 9.722368377303566e+01, 9.810289593465842e+01, 9.902661805848105e+01, 1e+02]
+latWheDefMotCur.epsSenCor=[0e+00, 4.040500240384478e-02, 8.144000357214523e-02, 1.228350056218291e-01, 1.643200106698413e-01, 2.056249945485461e-01, 2.464800084262337e-01, 2.866150128906282e-01, 3.257600137767976e-01, 3.636449739994973e-01, 4.000000006439947e-01, 4.354999980585507e-01, 4.708000217506637e-01, 5.05599991973862e-01, 5.39600012683391e-01, 5.724999711585603e-01, 6.039999832610895e-01, 6.338000245604575e-01, 6.615999744454618e-01, 6.870999989480593e-01, 7.099999720490463e-01, 7.299200415235746e-01, 7.469599861498926e-01, 7.615399899555593e-01, 7.740799846356462e-01, 7.850000262260437e-01, 7.947200028274146e-01, 8.036599661637472e-01, 8.12240003521817e-01, 8.208800032169413e-01, 8.299999720898313e-01, 8.392050244874313e-01, 8.478400170608915e-01, 8.559349671905349e-01, 8.635200235647158e-01, 8.706250231445327e-01, 8.77279987598958e-01, 8.835149974468722e-01, 8.893600133057989e-01, 8.94845016406278e-01, 8.999999731600131e-01, 9.046199932788183e-01, 9.085599827091759e-01, 9.119399763216951e-01, 9.148799783537371e-01, 9.175000220307592e-01, 9.199200252791795e-01, 9.222599866801312e-01, 9.246400025024517e-01, 9.271799896881754e-01, 9.300000071525574e-01, 9.330899745785982e-01, 9.36320013117673e-01, 9.39629981512676e-01, 9.429600167479109e-01, 9.462500175717797e-01, 9.494400016938346e-01, 9.524700066381445e-01, 9.552800103569684e-01, 9.578099908092625e-01, 9.599999736801662e-01, 9.618099904092338e-01, 9.632800215012873e-01, 9.644700293770456e-01, 9.654399764984379e-01, 9.662500041491441e-01, 9.669600111174523e-01, 9.676300276090661e-01, 9.683200115829267e-01, 9.690899850951692e-01, 9.700000298021447e-01, 9.710000178810737e-01, 9.720000000004263e-01, 9.729999880793553e-01, 9.739999761582842e-01, 9.750000238418579e-01, 9.760000119207869e-01, 9.769999999997158e-01, 9.779999880794974e-01, 9.789999701979973e-01, 9.800000178812158e-01, 9.810000059604218e-01, 9.819999940396421e-01, 9.829999821188552e-01, 9.840000298019316e-01, 9.850000119205737e-01, 9.860000000002132e-01, 9.869999880791421e-01, 9.879999761582131e-01, 9.890000238416448e-01, 9.900000119205737e-01, 9.909999940399263e-01, 9.919999821188552e-01, 9.929999701977842e-01, 9.94000017881365e-01, 9.950000059602868e-01, 9.959999940398553e-01, 9.969999761585684e-01, 9.980000238415737e-01, 9.990000119207868e-01, 1e+00]
+latWheDefMotCur.epsLatCor=[0e+00, 1.764444488255172e-02, 3.58222246962385e-02, 5.440000197911111e-02, 7.324444671980562e-02, 9.222221978015534e-02, 1.111999999027247e-01, 1.300444448364026e-01, 1.486222180770196e-01, 1.668000007918546e-01, 1.844444397987303e-01, 2.014222303938282e-01, 2.176000070795809e-01, 2.328444491032401e-01, 2.470222256351055e-01, 2.599999830331265e-01, 2.712636923989818e-01, 2.805985196878438e-01, 2.88319999824562e-01, 2.947437180957494e-01, 3.001851722227928e-01, 3.049600153952288e-01, 3.093836908759922e-01, 3.137718420536884e-01, 3.184399929508784e-01, 3.237037062644958e-01, 3.298785155871694e-01, 3.372799966679341e-01, 3.462237108187184e-01, 3.570251863461857e-01, 3.699999881745678e-01, 3.857800025929035e-01, 4.043733620704367e-01, 4.251599625746469e-01, 4.475199796531963e-01, 4.708333454206473e-01, 4.944799800425673e-01, 5.17840016795753e-01, 5.402933462316715e-01, 5.612200184885122e-01, 5.799999727175946e-01, 5.970600306556997e-01, 6.132800189455673e-01, 6.287199746545091e-01, 6.434400115762531e-01, 6.575000449302972e-01, 6.709599980545005e-01, 6.838799730089247e-01, 6.963200103766402e-01, 7.083399778686841e-01, 7.200000286102295e-01, 7.312049969272559e-01, 7.418400245782178e-01, 7.519350331800561e-01, 7.615200079694944e-01, 7.706249845981812e-01, 7.792800048631559e-01, 7.875149903269714e-01, 7.953600414675015e-01, 8.028450203187028e-01, 8.099999856234769e-01, 8.166649845984028e-01, 8.227199884259635e-01, 8.282550002395653e-01, 8.333600233358947e-01, 8.381250014317194e-01, 8.426399710656918e-01, 8.46994988873399e-01, 8.51279970923651e-01, 8.555849800960678e-01, 8.600000196223713e-01, 8.643149821836074e-01, 8.683199770854528e-01, 8.721049953104575e-01, 8.757600153689412e-01, 8.793749809265137e-01, 8.830400144905718e-01, 8.86845000130607e-01, 8.908800007223711e-01, 8.952349923751586e-01, 8.999999702568293e-01, 9.052799927017334e-01, 9.110400123559954e-01, 9.171599850611259e-01, 9.235200455093184e-01, 9.299999916573036e-01, 9.364799764858701e-01, 9.428399771294035e-01, 9.489600090613896e-01, 9.547200281491064e-01, 9.599999903691115e-01, 9.648100015384894e-01, 9.692799972441953e-01, 9.734699696835845e-01, 9.774400005017559e-01, 9.812499925380065e-01, 9.849600274770666e-01, 9.886299862814738e-01, 9.923199940444709e-01, 9.960899912677567e-01, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Latent_BaseClasses_Validation_Effectiveness.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Latent_BaseClasses_Validation_Effectiveness.txt
index 9a2919fad27..cade70ec516 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Latent_BaseClasses_Validation_Effectiveness.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Latent_BaseClasses_Validation_Effectiveness.txt
@@ -1,4 +1,4 @@
-last-generated=2023-11-13
+last-generated=2024-06-14
 statistics-simulation=
 {
   "linear": " ",
@@ -6,10 +6,9 @@ statistics-simulation=
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.2e+02]
-whSpe.y=[3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.140000015894636e-01, 3.279999912579981e-01, 3.42000025431113e-01, 3.559999705956332e-01, 3.700000047683716e-01, 3.840000389407312e-01, 3.979999841053471e-01, 4.120000182788385e-01, 4.259999634434546e-01, 4.399999976158142e-01, 4.540000317885527e-01, 4.679999769527899e-01, 4.820000111264706e-01, 4.959999562908972e-01, 5.099999904632568e-01, 5.240000246356165e-01, 5.379999698002326e-01, 5.52000003973724e-01, 5.659999491383398e-01, 5.799999833106995e-01, 5.940000174838168e-01, 6.07999962647675e-01, 6.219999968215454e-01, 6.359999419857825e-01, 6.499999761581421e-01, 6.640000103312595e-01, 6.779999554951178e-01, 6.919999896689881e-01, 7.059999348332253e-01, 7.200000286102295e-01, 7.340000627825891e-01, 7.480000079468261e-01, 7.620000421206964e-01, 7.759999872845547e-01, 7.900000214576721e-01, 8.040000556300317e-01, 8.180000007942688e-01, 8.32000034968139e-01, 8.459999801327551e-01, 8.600000143051147e-01, 8.740000484774744e-01, 8.879999936420905e-01, 9.020000278155819e-01, 9.159999729801978e-01, 9.300000071525574e-01, 9.440000413249168e-01, 9.579999864895329e-01, 9.720000206630243e-01, 9.859999658276404e-01, 1e+00]
 TSup.y=[2.931499938964844e+02, 2.932499999960285e+02, 2.933500060955606e+02, 2.934500122149742e+02, 2.935499877770829e+02, 2.936499938964844e+02, 2.937500000158858e+02, 2.938500061352872e+02, 2.939500121752112e+02, 2.940499877770829e+02, 2.941499938964844e+02, 2.942500000158859e+02, 2.943500061352872e+02, 2.944500121752112e+02, 2.945499878566087e+02, 2.946499938964844e+02, 2.947499999364571e+02, 2.948500061352873e+02, 2.94950012175211e+02, 2.950499878566087e+02, 2.951499938964844e+02, 2.952499999364571e+02, 2.953500061352873e+02, 2.95450012175211e+02, 2.955499878566087e+02, 2.956499938964844e+02, 2.957499999364571e+02, 2.958500059762358e+02, 2.959500123341171e+02, 2.960499878566087e+02, 2.961499938964844e+02, 2.962499999364571e+02, 2.963500059762358e+02, 2.964500123341171e+02, 2.965499878566087e+02, 2.966499938964844e+02, 2.967499999364571e+02, 2.968500059762358e+02, 2.969500123341171e+02, 2.970499878566087e+02, 2.971499938964844e+02, 2.972499999364571e+02, 2.973500059762358e+02, 2.974500123341171e+02, 2.975499878566087e+02, 2.976499938964844e+02, 2.977499999364571e+02, 2.978500059762358e+02, 2.979500123341171e+02, 2.980499878566087e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02]
 TExh.y=[2.881499938964844e+02, 2.885499877770769e+02, 2.889500121752353e+02, 2.893500061352995e+02, 2.897499999364325e+02, 2.901499938964844e+02, 2.905499878565606e+02, 2.909500123341661e+02, 2.913500059763323e+02, 2.917499999364323e+02, 2.921499938964844e+02, 2.925499878565607e+02, 2.929500123341661e+02, 2.933500059763323e+02, 2.937500002542687e+02, 2.941499938964844e+02, 2.945499875387001e+02, 2.949500123341666e+02, 2.953500059763318e+02, 2.957500002542687e+02, 2.961499938964844e+02, 2.965499875387001e+02, 2.969500123341666e+02, 2.973500059763318e+02, 2.977500002542687e+02, 2.981499938964844e+02, 2.985499875387001e+02, 2.989500116982999e+02, 2.99350006612053e+02, 2.997500002542687e+02, 3.001499938964844e+02, 3.005499875387001e+02, 3.009500116982999e+02, 3.01350006612053e+02, 3.017500002542687e+02, 3.021499938964844e+02, 3.025499875387001e+02, 3.029500116982999e+02, 3.03350006612053e+02, 3.037500002542687e+02, 3.041499938964844e+02, 3.045499875387001e+02, 3.049500116982999e+02, 3.05350006612053e+02, 3.057500002542687e+02, 3.061499938964844e+02, 3.065499875387001e+02, 3.069500116982999e+02, 3.07350006612053e+02, 3.077500002542687e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02]
 VSup.y=[6.000000238418579e-01, 6.079999801317916e-01, 6.1599999602637e-01, 6.240000135103732e-01, 6.320000278154807e-01, 6.399999856948853e-01, 6.480000031789346e-01, 6.560000206628842e-01, 6.639999721845584e-01, 6.719999896685529e-01, 6.800000071525574e-01, 6.880000246365618e-01, 6.959999825160063e-01, 7.039999936422306e-01, 7.120000174838902e-01, 7.200000286102295e-01, 7.27999980131924e-01, 7.360000039736885e-01, 7.440000150997979e-01, 7.51999979337107e-01, 7.599999904632568e-01, 7.680000015894066e-01, 7.760000254312658e-01, 7.8399997695292e-01, 7.920000007947791e-01, 8.00000011920929e-01, 8.080000230470789e-01, 8.159999745689628e-01, 8.240000111263014e-01, 8.320000222522618e-01, 8.399999737739563e-01, 8.479999849002956e-01, 8.55999996026256e-01, 8.640000325835946e-01, 8.719999841054786e-01, 8.799999952316284e-01, 8.880000063577782e-01, 8.960000174839281e-01, 9.039999944370009e-01, 9.120000055631508e-01, 9.200000166893005e-01, 9.279999682109951e-01, 9.359999793373344e-01, 9.440000158942941e-01, 9.520000270206334e-01, 9.599999785423279e-01, 9.679999896686672e-01, 9.760000007946276e-01, 9.840000373519662e-01, 9.919999888738501e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 VExh.y=[8.00000011920929e-01, 8.040000198682122e-01, 8.080000278154955e-01, 8.119999769528761e-01, 8.15999984105418e-01, 8.199999928474426e-01, 8.240000015894673e-01, 8.280000103314894e-01, 8.320000158945543e-01, 8.360000246365752e-01, 8.399999737739563e-01, 8.439999825159822e-01, 8.479999912580031e-01, 8.51999996821068e-01, 8.560000087420399e-01, 8.600000143051147e-01, 8.640000198681896e-01, 8.679999721845219e-01, 8.719999777476712e-01, 8.759999896685535e-01, 8.799999952316284e-01, 8.840000007947033e-01, 8.880000127156803e-01, 8.92000018278735e-01, 8.960000301995225e-01, 8.999999761581421e-01, 9.03999981721217e-01, 9.07999987284292e-01, 9.120000055631508e-01, 9.160000111262256e-01, 9.200000166893005e-01, 9.240000222523754e-01, 9.279999682111846e-01, 9.319999864896644e-01, 9.359999920527393e-01, 9.399999976158142e-01, 9.440000031788891e-01, 9.48000008741964e-01, 9.520000270204438e-01, 9.55999972979253e-01, 9.599999785423279e-01, 9.639999841054028e-01, 9.679999896684777e-01, 9.720000079473365e-01, 9.760000135104114e-01, 9.800000190734863e-01, 9.840000246365612e-01, 9.879999705953704e-01, 9.919999888738501e-01, 9.959999944369251e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-epsCal.epsSen=[2.220000028610229e-01, 2.223599999999995e-01, 2.227199971389761e-01, 2.230799943494806e-01, 2.234400063180905e-01, 2.23800003528595e-01, 2.241600007390994e-01, 2.245199979496037e-01, 2.248799948739971e-01, 2.252400069856624e-01, 2.25600004196167e-01, 2.259600014066716e-01, 2.263199986171757e-01, 2.266799955415691e-01, 2.270399930381836e-01, 2.27400004863739e-01, 2.277600017881333e-01, 1.862400027418215e-01, 1.869599965906301e-01, 1.876800064849501e-01, 1.88400000333786e-01, 1.891199941826219e-01, 1.898400040769419e-01, 1.905599979257505e-01, 1.912800078200942e-01, 1.920000016689301e-01, 1.927199955177659e-01, 1.934400042676683e-01, 1.941600004053358e-01, 1.948799942541244e-01, 1.956000030040741e-01, 1.9631999685291e-01, 1.970400056028123e-01, 1.977600017404799e-01, 1.984799955892684e-01, 1.992000043392181e-01, 1.999199981880067e-01, 2.0063999203689e-01, 2.013600030756239e-01, 2.020799969244124e-01, 2.028000056743622e-01, 2.035199995231507e-01, 2.04239993372034e-01, 2.049600044106732e-01, 2.056799982595565e-01, 2.064000070095062e-01, 2.071200008582948e-01, 2.07839994707178e-01, 2.085600057458173e-01, 2.092799995947005e-01, 2.099999934434891e-01, 2.197999891917524e-01, 2.295999849400157e-01, 2.394000118413336e-01, 2.491999764369384e-01, 2.590000033378601e-01, 2.688000153378102e-01, 2.785999948340938e-01, 2.884000068348362e-01, 2.981999863311198e-01, 3.079999983310699e-01, 3.178000103310201e-01, 3.275999898273037e-01, 3.37400001828046e-01, 3.471999813243297e-01, 3.569999933242798e-01, 3.668000351261734e-01, 3.765999848205135e-01, 3.864000266233888e-01, 3.961999763175395e-01, 4.059999883174896e-01, 4.15800030119762e-01, 4.255999798139128e-01, 4.354000216165986e-01, 4.451999713107493e-01, 4.550000131130219e-01, 4.64800025112972e-01, 4.745999748071227e-01, 4.84400016609998e-01, 4.941999663043382e-01, 5.040000081062317e-01, 5.138000499081252e-01, 5.235999698003324e-01, 5.334000116030183e-01, 5.431999910991124e-01, 5.529999732971191e-01, 5.628000150997706e-01, 5.725999945958647e-01, 5.824000363985505e-01, 5.921999562907578e-01, 6.019999980926514e-01, 6.118000398945449e-01, 6.215999597867522e-01, 6.31400001589817e-01, 6.411999810862901e-01, 6.510000228881836e-01, 6.608000050861902e-01, 6.705999845822843e-01, 6.804000263849702e-01, 6.901999462771775e-01, 6.99999988079071e-01]
-epsCal.epsLat=[2.160000056028366e-01, 2.152799964237223e-01, 2.145600021457691e-01, 2.138399928236048e-01, 2.131199986887015e-01, 2.124000042676926e-01, 2.116799949455342e-01, 2.109600005245139e-01, 2.102400066757035e-01, 2.095199973535577e-01, 2.088000029325485e-01, 2.0807999361039e-01, 2.073599991893699e-01, 2.066400053405595e-01, 2.059199954462404e-01, 2.052000015974045e-01, 2.044800077485686e-01, 1.562400015497286e-01, 1.569599953985372e-01, 1.576800052928572e-01, 1.583999991416931e-01, 1.59119992990529e-01, 1.59840002884849e-01, 1.605599967336813e-01, 1.612800066280013e-01, 1.620000004768372e-01, 1.627199943256731e-01, 1.634400030755754e-01, 1.64159999213243e-01, 1.648799930620315e-01, 1.656000018119812e-01, 1.663199956608171e-01, 1.670400044107195e-01, 1.67760000548387e-01, 1.684799943971755e-01, 1.692000031471252e-01, 1.699199969959138e-01, 1.706400057458635e-01, 1.71360001883531e-01, 1.720799957323196e-01, 1.728000044822693e-01, 1.735199983310578e-01, 1.742399921799411e-01, 1.749600032186751e-01, 1.756799970674636e-01, 1.764000058174133e-01, 1.771199996662019e-01, 1.778399935150851e-01, 1.785600045537244e-01, 1.792799984026076e-01, 1.800000071525574e-01, 1.883999949932421e-01, 1.967999828340215e-01, 2.052000122784924e-01, 2.135999734167969e-01, 2.220000028610229e-01, 2.304000174040879e-01, 2.387999934433837e-01, 2.472000079871277e-01, 2.555999840262341e-01, 2.639999985694885e-01, 2.72400013112743e-01, 2.808000040529158e-01, 2.892000185966597e-01, 2.975999797350786e-01, 3.059999942779541e-01, 3.144000088212086e-01, 3.227999997613814e-01, 3.312000143051254e-01, 3.395999754435442e-01, 3.479999899864197e-01, 3.564000343316174e-01, 3.647999954698469e-01, 3.732000100135909e-01, 3.815999711520098e-01, 3.899999856948853e-01, 3.984000300400831e-01, 4.067999911783125e-01, 4.15200005722246e-01, 4.235999668604755e-01, 4.320000112056732e-01, 4.404000257485487e-01, 4.487999868869675e-01, 4.572000014307115e-01, 4.655999923708843e-01, 4.740000069141388e-01, 4.824000214570143e-01, 4.907999825954332e-01, 4.991999971391771e-01, 5.075999880793499e-01, 5.15999972820282e-01, 5.244000171658588e-01, 5.328000081060317e-01, 5.411999928476428e-01, 5.495999837878155e-01, 5.580000281333923e-01, 5.664000128743243e-01, 5.748000038144971e-01, 5.831999885561082e-01, 5.915999794962811e-01, 6.000000238418579e-01]
+epsCal.epsSen=[7.400000095367432e-01, 7.411999701976839e-01, 7.423999904632694e-01, 7.43600010967242e-01, 7.447999713897959e-01, 7.459999918937683e-01, 7.472000123977407e-01, 7.483999732971623e-01, 7.495999928474941e-01, 7.508000133514181e-01, 7.519999742507935e-01, 7.531999947548136e-01, 7.544000152587376e-01, 7.555999752045193e-01, 7.567999966622233e-01, 7.580000162124634e-01, 7.591999761582482e-01, 6.20800019073481e-01, 6.231999985694938e-01, 6.255999818801653e-01, 6.28000020980835e-01, 6.304000004768598e-01, 6.327999837875313e-01, 6.352000228881889e-01, 6.376000061988603e-01, 6.399999856948853e-01, 6.424000247953655e-01, 6.448000042915799e-01, 6.471999914168857e-01, 6.496000305175553e-01, 6.520000100135803e-01, 6.543999895096053e-01, 6.567999690056302e-01, 6.592000157355807e-01, 6.615999952316057e-01, 6.639999747276306e-01, 6.664000138283003e-01, 6.687999933243253e-01, 6.71199980449631e-01, 6.736000195503008e-01, 6.759999990463257e-01, 6.783999785423506e-01, 6.808000176430203e-01, 6.832000047683261e-01, 6.85599984264351e-01, 6.880000233650208e-01, 6.904000028610457e-01, 6.927999823570706e-01, 6.952000290870212e-01, 6.97600008583046e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01]
+epsCal.epsLat=[7.200000286102295e-01, 7.175999880790702e-01, 7.152000071525558e-01, 7.128000257492081e-01, 7.103999856948818e-01, 7.080000042915344e-01, 7.05600022888187e-01, 7.031999818801963e-01, 7.008000023841775e-01, 6.984000209808323e-01, 6.959999799728394e-01, 6.935999985694912e-01, 6.91200017166146e-01, 6.887999780654824e-01, 6.863999947548139e-01, 6.840000152587891e-01, 6.815999761581194e-01, 5.207999952316231e-01, 5.231999747276359e-01, 5.256000176429522e-01, 5.279999971389771e-01, 5.303999766350019e-01, 5.328000195503182e-01, 5.35199999046331e-01, 5.375999823570023e-01, 5.400000214576721e-01, 5.424000009536971e-01, 5.44799980449722e-01, 5.472000271796725e-01, 5.496000066756974e-01, 5.519999861717224e-01, 5.544000252722027e-01, 5.568000047684171e-01, 5.591999918937228e-01, 5.616000309943926e-01, 5.640000104904175e-01, 5.663999899864424e-01, 5.687999694824674e-01, 5.712000162124179e-01, 5.735999957084429e-01, 5.759999752044678e-01, 5.784000143051374e-01, 5.807999938011624e-01, 5.831999809264682e-01, 5.856000200271378e-01, 5.879999995231628e-01, 5.903999790191878e-01, 5.928000181198575e-01, 5.952000052451633e-01, 5.975999847411881e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01, 6.000000238418579e-01]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Latent_Examples_SpaceCooling.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Latent_Examples_SpaceCooling.txt
index 812286f3abe..287ea592754 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Latent_Examples_SpaceCooling.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Latent_Examples_SpaceCooling.txt
@@ -1,4 +1,4 @@
-last-generated=2024-05-09
+last-generated=2024-06-14
 statistics-initialization=
 {
   "linear": "4, 4",
@@ -8,17 +8,19 @@ statistics-initialization=
 statistics-simulation=
 {
   "linear": "0, 0, 4, 4",
-  "nonlinear": "1, 2, 0, 1, 1, 1",
-  "number of continuous time states": "22",
+  "nonlinear": "1, 2, 1, 0, 1, 1",
+  "number of continuous time states": "25",
   "numerical Jacobians": "0"
 }
 time=[1.5552e+07, 1.56384e+07]
 vol.T_start=[2.931499938964844e+02, 2.931499938964844e+02]
-vol.T=[2.931499938964844e+02, 2.931558837890625e+02, 2.929799499511719e+02, 2.926975708007812e+02, 2.923731384277344e+02, 2.920772399902344e+02, 2.918045349121094e+02, 2.915382080078125e+02, 2.912736511230469e+02, 2.909941711425781e+02, 2.905767211914062e+02, 2.900142211914062e+02, 2.894204406738281e+02, 2.889404907226562e+02, 2.886464233398438e+02, 2.884886169433594e+02, 2.883844299316406e+02, 2.88242919921875e+02, 2.879859924316406e+02, 2.876162109375e+02, 2.871962585449219e+02, 2.868060607910156e+02, 2.86536376953125e+02, 2.864703369140625e+02, 2.866612243652344e+02, 2.871516418457031e+02, 2.885304870605469e+02, 2.899981689453125e+02, 2.916190795898438e+02, 2.932933654785156e+02, 2.948436279296875e+02, 2.962301330566406e+02, 2.974523620605469e+02, 2.974217834472656e+02, 2.975464477539062e+02, 2.975241394042969e+02, 2.971765441894531e+02, 2.975623474121094e+02, 2.965565795898438e+02, 2.974278564453125e+02, 2.971991882324219e+02, 2.972875366210938e+02, 2.976405029296875e+02, 2.966389465332031e+02, 2.972525329589844e+02, 2.970046997070312e+02, 2.972793579101562e+02, 2.968392944335938e+02, 2.974976806640625e+02, 2.966088562011719e+02, 2.976229553222656e+02, 2.969010009765625e+02, 2.971474914550781e+02, 2.974115905761719e+02, 2.966552429199219e+02, 2.975382385253906e+02, 2.970338439941406e+02, 2.969666442871094e+02, 2.976717529296875e+02, 2.967093200683594e+02, 2.972494506835938e+02, 2.973996887207031e+02, 2.967299499511719e+02, 2.975285339355469e+02, 2.970274353027344e+02, 2.976529846191406e+02, 2.972189025878906e+02, 2.971595458984375e+02, 2.973245239257812e+02, 2.9690771484375e+02, 2.974339294433594e+02, 2.967093200683594e+02, 2.975995788574219e+02, 2.966474304199219e+02, 2.976240844726562e+02, 2.967312927246094e+02, 2.973283081054688e+02, 2.969686584472656e+02, 2.966924133300781e+02, 2.958390502929688e+02, 2.950875854492188e+02, 2.944717712402344e+02, 2.939643249511719e+02, 2.935993347167969e+02, 2.934185791015625e+02, 2.933692932128906e+02, 2.933747253417969e+02, 2.933849182128906e+02, 2.933596496582031e+02, 2.933012084960938e+02, 2.932326965332031e+02, 2.931614685058594e+02, 2.930895690917969e+02, 2.93017578125e+02, 2.929456176757812e+02, 2.928736267089844e+02, 2.928015747070312e+02, 2.927294311523438e+02, 2.926572265625e+02, 2.925850219726562e+02, 2.925127868652344e+02]
+vol.T=[2.931499938964844e+02, 2.935960388183594e+02, 2.938107299804688e+02, 2.938359985351562e+02, 2.93731201171875e+02, 2.935613708496094e+02, 2.933581237792969e+02, 2.931333312988281e+02, 2.928946228027344e+02, 2.926404418945312e+02, 2.923136596679688e+02, 2.918851318359375e+02, 2.913924560546875e+02, 2.909156799316406e+02, 2.90525634765625e+02, 2.902348937988281e+02, 2.900177612304688e+02, 2.898243103027344e+02, 2.895953369140625e+02, 2.893026428222656e+02, 2.889579467773438e+02, 2.88469482421875e+02, 2.866667175292969e+02, 2.861806030273438e+02, 2.862569885253906e+02, 2.867163391113281e+02, 2.875852661132812e+02, 2.889466552734375e+02, 2.906258544921875e+02, 2.923321228027344e+02, 2.937963562011719e+02, 2.950487670898438e+02, 2.961231079101562e+02, 2.969854431152344e+02, 2.971490783691406e+02, 2.971314697265625e+02, 2.966197204589844e+02, 2.958956909179688e+02, 2.956756591796875e+02, 2.960534057617188e+02, 2.966995849609375e+02, 2.971622619628906e+02, 2.971523132324219e+02, 2.971963500976562e+02, 2.97169921875e+02, 2.971585083007812e+02, 2.971520690917969e+02, 2.971513061523438e+02, 2.971513061523438e+02, 2.971514282226562e+02, 2.971517028808594e+02, 2.971518859863281e+02, 2.971519775390625e+02, 2.971519470214844e+02, 2.971517639160156e+02, 2.971504821777344e+02, 2.971497192382812e+02, 2.971494750976562e+02, 2.971498107910156e+02, 2.971512145996094e+02, 2.971521911621094e+02, 2.9715234375e+02, 2.971515808105469e+02, 2.971393737792969e+02, 2.971258239746094e+02, 2.971295166015625e+02, 2.967927856445312e+02, 2.959302978515625e+02, 2.95977294921875e+02, 2.968339538574219e+02, 2.971593933105469e+02, 2.971351318359375e+02, 2.978196411132812e+02, 2.990572509765625e+02, 2.998171691894531e+02, 3.001743469238281e+02, 3.001406860351562e+02, 2.997261962890625e+02, 2.990216674804688e+02, 2.981830749511719e+02, 2.973835144042969e+02, 2.966660461425781e+02, 2.960353698730469e+02, 2.955148620605469e+02, 2.951361083984375e+02, 2.948906860351562e+02, 2.947411499023438e+02, 2.946492004394531e+02, 2.945771179199219e+02, 2.945055541992188e+02, 2.944338684082031e+02, 2.94362060546875e+02, 2.942901916503906e+02, 2.9421826171875e+02, 2.941463012695312e+02, 2.940743408203125e+02, 2.940023498535156e+02, 2.939303894042969e+02, 2.938583984375e+02, 2.93786376953125e+02, 2.937143859863281e+02]
 TOut.T=[2.914500122070312e+02, 2.913385009765625e+02, 2.910647583007812e+02, 2.907200927734375e+02, 2.903956909179688e+02, 2.901300048828125e+02, 2.898659973144531e+02, 2.896019897460938e+02, 2.893380126953125e+02, 2.89004150390625e+02, 2.884479370117188e+02, 2.878096618652344e+02, 2.872500610351562e+02, 2.869119262695312e+02, 2.867525024414062e+02, 2.866704406738281e+02, 2.865716247558594e+02, 2.86362060546875e+02, 2.860019836425781e+02, 2.855647583007812e+02, 2.851369323730469e+02, 2.848055419921875e+02, 2.84671142578125e+02, 2.847913513183594e+02, 2.852047729492188e+02, 2.859500122070312e+02, 2.872088317871094e+02, 2.889144592285156e+02, 2.907325744628906e+02, 2.923289794921875e+02, 2.935801696777344e+02, 2.946938171386719e+02, 2.956173706054688e+02, 2.962911987304688e+02, 2.964541015625e+02, 2.957337341308594e+02, 2.947459106445312e+02, 2.941705322265625e+02, 2.945262451171875e+02, 2.952189331054688e+02, 2.959844055175781e+02, 2.966857299804688e+02, 2.972068786621094e+02, 2.977020874023438e+02, 2.981768493652344e+02, 2.985576171875e+02, 2.987735900878906e+02, 2.989007568359375e+02, 2.990133361816406e+02, 2.991251220703125e+02, 2.9925e+02, 2.993937683105469e+02, 2.99545654296875e+02, 2.996946411132812e+02, 2.998296203613281e+02, 2.999126586914062e+02, 2.999144897460938e+02, 2.99878662109375e+02, 2.998501281738281e+02, 2.99885009765625e+02, 3.0001416015625e+02, 3.001783142089844e+02, 3.003133850097656e+02, 3.001267700195312e+02, 2.985876770019531e+02, 2.964372253417969e+02, 2.946898803710938e+02, 2.943067016601562e+02, 2.951251831054688e+02, 2.964444274902344e+02, 2.976576538085938e+02, 2.981753234863281e+02, 2.982959289550781e+02, 2.982947082519531e+02, 2.980774841308594e+02, 2.975499877929688e+02, 2.9660986328125e+02, 2.953994445800781e+02, 2.94191650390625e+02, 2.932594299316406e+02, 2.926542053222656e+02, 2.921209716796875e+02, 2.917095031738281e+02, 2.914774780273438e+02, 2.91437255859375e+02, 2.914543151855469e+02, 2.914801330566406e+02, 2.914757385253906e+02, 2.914140014648438e+02, 2.913420104980469e+02, 2.912699890136719e+02, 2.91197998046875e+02, 2.911260070800781e+02, 2.910539855957031e+02, 2.909819946289062e+02, 2.909100036621094e+02, 2.908380126953125e+02, 2.907659912109375e+02, 2.906940002441406e+02, 2.906220092773438e+02, 2.905499877929688e+02]
-cooCoi.sta_a2.T=[2.931499938964844e+02, 2.913385009765625e+02, 2.910647583007812e+02, 2.907200927734375e+02, 2.903956909179688e+02, 2.901300048828125e+02, 2.898659973144531e+02, 2.896019897460938e+02, 2.893380126953125e+02, 2.89004150390625e+02, 2.884479370117188e+02, 2.878096618652344e+02, 2.872500610351562e+02, 2.869119262695312e+02, 2.867525024414062e+02, 2.866704406738281e+02, 2.865716247558594e+02, 2.86362060546875e+02, 2.860019836425781e+02, 2.855647583007812e+02, 2.851369323730469e+02, 2.848055419921875e+02, 2.84671142578125e+02, 2.847913513183594e+02, 2.852047729492188e+02, 2.859500122070312e+02, 2.882718811035156e+02, 2.897934875488281e+02, 2.914603881835938e+02, 2.93123046875e+02, 2.946137390136719e+02, 2.959444885253906e+02, 2.97103759765625e+02, 2.972210693359375e+02, 2.973505554199219e+02, 2.97169189453125e+02, 2.966648864746094e+02, 2.968074035644531e+02, 2.960907592773438e+02, 2.968887023925781e+02, 2.96884033203125e+02, 2.971166381835938e+02, 2.97510498046875e+02, 2.969181213378906e+02, 2.975008239746094e+02, 2.974413757324219e+02, 2.9771240234375e+02, 2.974572448730469e+02, 2.979658508300781e+02, 2.974066162109375e+02, 2.981523742675781e+02, 2.977308044433594e+02, 2.97965576171875e+02, 2.982113037109375e+02, 2.978012084960938e+02, 2.984218139648438e+02, 2.981390380859375e+02, 2.981175842285156e+02, 2.985588989257812e+02, 2.98037353515625e+02, 2.984381408691406e+02, 2.9862890625e+02, 2.983634643554688e+02, 2.987514343261719e+02, 2.977904357910156e+02, 2.9705322265625e+02, 2.959219970703125e+02, 2.956488037109375e+02, 2.961235046386719e+02, 2.966474304199219e+02, 2.975633239746094e+02, 2.975844421386719e+02, 2.980278930664062e+02, 2.976885986328125e+02, 2.979187927246094e+02, 2.972754516601562e+02, 2.9660986328125e+02, 2.953994445800781e+02, 2.94191650390625e+02, 2.932594299316406e+02, 2.926542053222656e+02, 2.921209716796875e+02, 2.917095031738281e+02, 2.914774780273438e+02, 2.91437255859375e+02, 2.914543151855469e+02, 2.914801330566406e+02, 2.914757385253906e+02, 2.914140014648438e+02, 2.913420104980469e+02, 2.912699890136719e+02, 2.91197998046875e+02, 2.911260070800781e+02, 2.910539855957031e+02, 2.909819946289062e+02, 2.909100036621094e+02, 2.908380126953125e+02, 2.907659912109375e+02, 2.906940002441406e+02, 2.906220092773438e+02, 2.905499877929688e+02]
-cooCoi.sta_b2.T=[2.931499938964844e+02, 2.913454895019531e+02, 2.910758972167969e+02, 2.907322082519531e+02, 2.904056396484375e+02, 2.901391296386719e+02, 2.898751220703125e+02, 2.896111145019531e+02, 2.893471374511719e+02, 2.890198364257812e+02, 2.884694213867188e+02, 2.878313903808594e+02, 2.872664794921875e+02, 2.869200439453125e+02, 2.867562561035156e+02, 2.866730041503906e+02, 2.865762939453125e+02, 2.863719787597656e+02, 2.860161743164062e+02, 2.855802307128906e+02, 2.851506652832031e+02, 2.848144226074219e+02, 2.846719360351562e+02, 2.8478271484375e+02, 2.851853637695312e+02, 2.859184875488281e+02, 2.882224731445312e+02, 2.897380065917969e+02, 2.914016418457031e+02, 2.9306787109375e+02, 2.945647583007812e+02, 2.959010620117188e+02, 2.970667114257812e+02, 2.971738891601562e+02, 2.973086853027344e+02, 2.97143798828125e+02, 2.966510009765625e+02, 2.96805908203125e+02, 2.958389892578125e+02, 2.968620910644531e+02, 2.968407592773438e+02, 2.97064208984375e+02, 2.974566040039062e+02, 2.888204345703125e+02, 2.974221496582031e+02, 2.88370361328125e+02, 2.976245727539062e+02, 2.883406982421875e+02, 2.978820190429688e+02, 2.931131286621094e+02, 2.905702514648438e+02, 2.97401123046875e+02, 2.885141906738281e+02, 2.981112060546875e+02, 2.884112854003906e+02, 2.893487243652344e+02, 2.97895263671875e+02, 2.885043029785156e+02, 2.968394775390625e+02, 2.963664855957031e+02, 2.886547546386719e+02, 2.985144958496094e+02, 2.885540161132812e+02, 2.892370910644531e+02, 2.976696472167969e+02, 2.940033569335938e+02, 2.959406127929688e+02, 2.956458129882812e+02, 2.960962219238281e+02, 2.965836181640625e+02, 2.975038757324219e+02, 2.885430603027344e+02, 2.979823608398438e+02, 2.956427307128906e+02, 2.911068115234375e+02, 2.967340698242188e+02, 2.966481628417969e+02, 2.954428100585938e+02, 2.942305297851562e+02, 2.932843627929688e+02, 2.926741638183594e+02, 2.921377563476562e+02, 2.917211608886719e+02, 2.914820251464844e+02, 2.914373168945312e+02, 2.91453369140625e+02, 2.914795227050781e+02, 2.914767761230469e+02, 2.914164733886719e+02, 2.91344482421875e+02, 2.912724914550781e+02, 2.912005004882812e+02, 2.911284790039062e+02, 2.910564880371094e+02, 2.909844970703125e+02, 2.909124755859375e+02, 2.908404846191406e+02, 2.907684936523438e+02, 2.906965026855469e+02, 2.906244812011719e+02, 2.90552490234375e+02]
+cooCoi.sta_a2.T=[2.931499938964844e+02, 2.917807006835938e+02, 2.915738830566406e+02, 2.913134155273438e+02, 2.910682983398438e+02, 2.908675231933594e+02, 2.906680297851562e+02, 2.904685668945312e+02, 2.902690734863281e+02, 2.900168762207031e+02, 2.895967102050781e+02, 2.891145935058594e+02, 2.886919555664062e+02, 2.884365844726562e+02, 2.88316162109375e+02, 2.882541198730469e+02, 2.88179443359375e+02, 2.880211486816406e+02, 2.877491455078125e+02, 2.874189147949219e+02, 2.870957641601562e+02, 2.848055419921875e+02, 2.84671142578125e+02, 2.847913513183594e+02, 2.852047729492188e+02, 2.859500122070312e+02, 2.872088317871094e+02, 2.889144592285156e+02, 2.907325744628906e+02, 2.923289794921875e+02, 2.935801696777344e+02, 2.946938171386719e+02, 2.956173706054688e+02, 2.962911987304688e+02, 2.964541015625e+02, 2.957337341308594e+02, 2.947459106445312e+02, 2.941705322265625e+02, 2.945262451171875e+02, 2.952189331054688e+02, 2.959844055175781e+02, 2.966857299804688e+02, 2.972068786621094e+02, 2.975813293457031e+02, 2.97391845703125e+02, 2.974312133789062e+02, 2.974703979492188e+02, 2.974984741210938e+02, 2.975244140625e+02, 2.975490417480469e+02, 2.9757373046875e+02, 2.975995788574219e+02, 2.976268005371094e+02, 2.976547241210938e+02, 2.976822814941406e+02, 2.977013854980469e+02, 2.977057495117188e+02, 2.977022399902344e+02, 2.976984558105469e+02, 2.977051696777344e+02, 2.977279052734375e+02, 2.977574462890625e+02, 2.977830200195312e+02, 2.977406921386719e+02, 2.974342651367188e+02, 2.970108337402344e+02, 2.946898803710938e+02, 2.943067016601562e+02, 2.951251831054688e+02, 2.964444274902344e+02, 2.976466979980469e+02, 2.974203796386719e+02, 2.935564880371094e+02, 2.935564880371094e+02, 2.935564880371094e+02, 2.965751342773438e+02, 2.935564880371094e+02, 2.935564880371094e+02, 2.935564880371094e+02, 2.933319396972656e+02, 2.935564880371094e+02, 2.924715881347656e+02, 2.935564880371094e+02, 2.935564880371094e+02, 2.935564880371094e+02, 2.935564880371094e+02, 2.935564880371094e+02, 2.935564880371094e+02, 2.919381408691406e+02, 2.935564880371094e+02, 2.918292236328125e+02, 2.917747497558594e+02, 2.917203063964844e+02, 2.916659240722656e+02, 2.935564880371094e+02, 2.935564880371094e+02, 2.935564880371094e+02, 2.935564880371094e+02, 2.935564880371094e+02, 2.913392333984375e+02, 2.935564880371094e+02]
+cooCoi.sta_b2.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.850066223144531e+02, 2.846719360351562e+02, 2.847826843261719e+02, 2.851853332519531e+02, 2.859185180664062e+02, 2.871560974121094e+02, 2.888516235351562e+02, 2.906712646484375e+02, 2.922807006835938e+02, 2.935388488769531e+02, 2.94657958984375e+02, 2.955890502929688e+02, 2.962724914550781e+02, 2.957260437011719e+02, 2.957597351074219e+02, 2.947773742675781e+02, 2.941767578125e+02, 2.945053405761719e+02, 2.951929931640625e+02, 2.959581298828125e+02, 2.951271667480469e+02, 2.952107238769531e+02, 2.941292419433594e+02, 2.939965515136719e+02, 2.937931823730469e+02, 2.937021789550781e+02, 2.93649169921875e+02, 2.935955810546875e+02, 2.935401306152344e+02, 2.934774169921875e+02, 2.934044189453125e+02, 2.933267517089844e+02, 2.932501525878906e+02, 2.93180419921875e+02, 2.931352844238281e+02, 2.931338806152344e+02, 2.931529541015625e+02, 2.9316943359375e+02, 2.931556701660156e+02, 2.930903930664062e+02, 2.930059509277344e+02, 2.929348449707031e+02, 2.929651184082031e+02, 2.937670593261719e+02, 2.9486767578125e+02, 2.947335510253906e+02, 2.942952880859375e+02, 2.950852661132812e+02, 2.963969421386719e+02, 2.950999145507812e+02, 2.943717651367188e+02, 2.935564880371094e+02, 2.93821044921875e+02, 2.93821044921875e+02, 2.935564880371094e+02, 2.93821044921875e+02, 2.93821044921875e+02, 2.93821044921875e+02, 2.935564880371094e+02, 2.93821044921875e+02, 2.935564880371094e+02, 2.93821044921875e+02, 2.93821044921875e+02, 2.93821044921875e+02, 2.93821044921875e+02, 2.93821044921875e+02, 2.93821044921875e+02, 2.935564880371094e+02, 2.93821044921875e+02, 2.935564880371094e+02, 2.935564880371094e+02, 2.935564880371094e+02, 2.935564880371094e+02, 2.93821044921875e+02, 2.93821044921875e+02, 2.93821044921875e+02, 2.93821044921875e+02, 2.93821044921875e+02, 2.935564880371094e+02, 2.93821044921875e+02]
 opeSig.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, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+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]
-senTemHXOut.T=[2.931499938964844e+02, 2.913387145996094e+02, 2.910651550292969e+02, 2.907204895019531e+02, 2.903960266113281e+02, 2.901303100585938e+02, 2.898663024902344e+02, 2.89602294921875e+02, 2.893383178710938e+02, 2.890046997070312e+02, 2.884486694335938e+02, 2.878103942871094e+02, 2.872506103515625e+02, 2.869121704101562e+02, 2.867526245117188e+02, 2.866705322265625e+02, 2.8657177734375e+02, 2.863624267578125e+02, 2.860024719238281e+02, 2.855652770996094e+02, 2.851373901367188e+02, 2.848058471679688e+02, 2.846711730957031e+02, 2.847910461425781e+02, 2.852041015625e+02, 2.859489440917969e+02, 2.882702026367188e+02, 2.897916259765625e+02, 2.914584350585938e+02, 2.931212158203125e+02, 2.946120910644531e+02, 2.959430236816406e+02, 2.971025085449219e+02, 2.972195129394531e+02, 2.973492126464844e+02, 2.971683959960938e+02, 2.966644592285156e+02, 2.968073425292969e+02, 2.960899353027344e+02, 2.968878173828125e+02, 2.968825988769531e+02, 2.971149291992188e+02, 2.975087280273438e+02, 2.96921630859375e+02, 2.974983215332031e+02, 2.974449462890625e+02, 2.977096862792969e+02, 2.974605102539062e+02, 2.979631652832031e+02, 2.974064331054688e+02, 2.981546020507812e+02, 2.977277526855469e+02, 2.979685974121094e+02, 2.98208251953125e+02, 2.978035888671875e+02, 2.984243774414062e+02, 2.981358947753906e+02, 2.981201171875e+02, 2.985567321777344e+02, 2.980349731445312e+02, 2.984405212402344e+02, 2.986258239746094e+02, 2.983652648925781e+02, 2.987540283203125e+02, 2.977893371582031e+02, 2.970549621582031e+02, 2.959226379394531e+02, 2.956488037109375e+02, 2.961225891113281e+02, 2.966455383300781e+02, 2.975614013671875e+02, 2.975861511230469e+02, 2.980264587402344e+02, 2.976876831054688e+02, 2.979201965332031e+02, 2.972748718261719e+02, 2.966111755371094e+02, 2.954009094238281e+02, 2.941929626464844e+02, 2.932602233886719e+02, 2.926548767089844e+02, 2.921215209960938e+02, 2.917098693847656e+02, 2.914776306152344e+02, 2.91437255859375e+02, 2.914542846679688e+02, 2.914801025390625e+02, 2.914757690429688e+02, 2.914140930175781e+02, 2.913420715332031e+02, 2.912700805664062e+02, 2.911980895996094e+02, 2.911260681152344e+02, 2.910540771484375e+02, 2.909820861816406e+02, 2.909100952148438e+02, 2.908380737304688e+02, 2.907660827636719e+02, 2.90694091796875e+02, 2.906220703125e+02, 2.905500793457031e+02]
-whe.port_a1.Xi_outflow[1]=[1.020082738250494e-02, 1.041341479867697e-02, 1.020724046975374e-02, 9.99085046350956e-03, 9.836782701313496e-03, 9.757447056472301e-03, 9.679554961621761e-03, 9.601212106645107e-03, 9.5224529504776e-03, 9.400995448231697e-03, 9.147651493549347e-03, 8.851860649883747e-03, 8.607334457337856e-03, 8.489762432873249e-03, 8.471320383250713e-03, 8.495157584547997e-03, 8.509130217134953e-03, 8.46540741622448e-03, 8.389475755393505e-03, 8.302637375891209e-03, 8.214255794882774e-03, 8.137145079672337e-03, 8.122085593640804e-03, 8.206699043512344e-03, 8.411874994635582e-03, 8.763079531490803e-03, 9.398895315825939e-03, 1.034505292773247e-02, 1.143034640699625e-02, 1.241556368768215e-02, 1.315876096487045e-02, 1.378693338483572e-02, 1.425285078585148e-02, 1.450714096426964e-02, 1.438504923135042e-02, 1.369496528059244e-02, 1.286804024130106e-02, 1.230658404529095e-02, 1.217551529407501e-02, 1.168260723352432e-02, 1.085670199245214e-02, 9.97223611921072e-03, 9.36471950262785e-03, 8.902018889784813e-03, 8.507907390594482e-03, 8.223498240113258e-03, 8.098715916275978e-03, 8.165220730006695e-03, 8.340694941580296e-03, 8.511393330991268e-03, 8.560599759221077e-03, 8.413743227720261e-03, 8.153790608048439e-03, 7.901248522102833e-03, 7.781551219522953e-03, 7.89081584662199e-03, 8.167044259607792e-03, 8.504312485456467e-03, 8.799020200967789e-03, 8.933519944548607e-03, 8.86286236345768e-03, 8.718964643776417e-03, 8.648307994008064e-03, 8.916387334465981e-03, 9.894336573779583e-03, 1.078152004629374e-02, 1.121085416525602e-02, 1.130799576640129e-02, 1.129153650254011e-02, 1.117290556430817e-02, 1.099951472133398e-02, 1.098693627864122e-02, 1.109900698065758e-02, 1.121259294450283e-02, 1.130424998700619e-02, 1.134226564317942e-02, 1.133640669286251e-02, 1.128318440169096e-02, 1.116411294788122e-02, 1.101302076131105e-02, 1.081150863319635e-02, 1.049603335559368e-02, 1.014619320631027e-02, 9.83247347176075e-03, 9.509637020528316e-03, 8.962342515587807e-03, 8.377989754080772e-03, 7.978647947311401e-03, 7.945782504975796e-03, 8.121653459966183e-03, 8.370942436158657e-03, 8.589083328843117e-03, 8.67956131696701e-03, 8.672020398080349e-03, 8.644551038742065e-03, 8.661389350891113e-03, 8.783654309809208e-03, 8.967524394392967e-03, 9.165292605757713e-03, 9.370592422783375e-03, 9.577167220413685e-03]
-whe.port_b1.Xi_outflow[1]=[1.04016549885273e-02, 1.041341479867697e-02, 1.020724046975374e-02, 9.99085046350956e-03, 9.836782701313496e-03, 9.757447056472301e-03, 9.679554961621761e-03, 9.601212106645107e-03, 9.5224529504776e-03, 9.400995448231697e-03, 9.147651493549347e-03, 8.851860649883747e-03, 8.607334457337856e-03, 8.489762432873249e-03, 8.471320383250713e-03, 8.495157584547997e-03, 8.509130217134953e-03, 8.46540741622448e-03, 8.389475755393505e-03, 8.302637375891209e-03, 8.214255794882774e-03, 8.137145079672337e-03, 8.122085593640804e-03, 8.206699043512344e-03, 8.411874994635582e-03, 8.763079531490803e-03, 8.906236849725246e-03, 9.423477575182915e-03, 1.015867944806814e-02, 1.099905371665955e-02, 1.180578395724297e-02, 1.254896819591522e-02, 1.319347694516182e-02, 1.310206484049559e-02, 1.302237901836634e-02, 1.278854999691248e-02, 1.240640785545111e-02, 1.236945204436779e-02, 1.190402172505856e-02, 1.183162350207567e-02, 1.124472822993994e-02, 1.063371449708939e-02, 1.00359907373786e-02, 9.498973377048969e-03, 9.020349942147732e-03, 8.62618163228035e-03, 8.356102742254734e-03, 8.25079157948494e-03, 8.291857317090034e-03, 8.40683002024889e-03, 8.494958281517029e-03, 8.458990603685379e-03, 8.294863626360893e-03, 8.072606287896633e-03, 7.898933254182339e-03, 7.88478460162878e-03, 8.046445436775684e-03, 8.321952074766159e-03, 8.61900020390749e-03, 8.825396187603474e-03, 8.855554275214672e-03, 8.767503313720226e-03, 8.683688938617706e-03, 8.816281333565712e-03, 9.546718560159206e-03, 1.042464468628168e-02, 1.099913846701384e-02, 1.123059540987015e-02, 1.12784169614315e-02, 1.115166302770376e-02, 1.101284101605415e-02, 1.096661854535341e-02, 1.10597237944603e-02, 1.115125603973866e-02, 1.125604007393122e-02, 1.127875782549381e-02, 1.133640669286251e-02, 1.128318440169096e-02, 1.116411294788122e-02, 1.101302076131105e-02, 1.081150863319635e-02, 1.049603335559368e-02, 1.014619320631027e-02, 9.83247347176075e-03, 9.509637020528316e-03, 8.962342515587807e-03, 8.377989754080772e-03, 7.978647947311401e-03, 7.945782504975796e-03, 8.121653459966183e-03, 8.370942436158657e-03, 8.589083328843117e-03, 8.67956131696701e-03, 8.672020398080349e-03, 8.644551038742065e-03, 8.661389350891113e-03, 8.783654309809208e-03, 8.967524394392967e-03, 9.165292605757713e-03, 9.370592422783375e-03, 9.577167220413685e-03]
+senTemHXOut.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.848058471679688e+02, 2.846711730957031e+02, 2.847910461425781e+02, 2.852041015625e+02, 2.859490661621094e+02, 2.8720703125e+02, 2.88912353515625e+02, 2.907305603027344e+02, 2.923273620605469e+02, 2.935787963867188e+02, 2.94692626953125e+02, 2.956164245605469e+02, 2.962905883789062e+02, 2.964544982910156e+02, 2.957348327636719e+02, 2.947469482421875e+02, 2.941707153320312e+02, 2.945255432128906e+02, 2.952180786132812e+02, 2.959835205078125e+02, 2.966849975585938e+02, 2.972063293457031e+02, 2.975814208984375e+02, 2.973921203613281e+02, 2.974311828613281e+02, 2.974703674316406e+02, 2.974984436035156e+02, 2.975243835449219e+02, 2.975490112304688e+02, 2.9757373046875e+02, 2.975995483398438e+02, 2.976267700195312e+02, 2.976546936035156e+02, 2.976822509765625e+02, 2.977013549804688e+02, 2.977057495117188e+02, 2.977022399902344e+02, 2.976984558105469e+02, 2.977051391601562e+02, 2.977278747558594e+02, 2.977574157714844e+02, 2.977830200195312e+02, 2.977409057617188e+02, 2.974347229003906e+02, 2.970113220214844e+02, 2.946912841796875e+02, 2.943062744140625e+02, 2.951238403320312e+02, 2.964428405761719e+02, 2.97645751953125e+02, 2.974203186035156e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02]
+TMixSetPoi.y=[2.971499938964844e+02, 2.971499938964844e+02]
+whe.port_a1.Xi_outflow[1]=[1.020082738250494e-02, 1.01562337949872e-02, 1.00783184170723e-02, 9.996542707085609e-03, 9.938318282365799e-03, 9.908336214721203e-03, 9.878899902105331e-03, 9.84929408878088e-03, 9.819529950618744e-03, 9.77362971752882e-03, 9.6778878942132e-03, 9.566104970872402e-03, 9.473696351051331e-03, 9.429263882339001e-03, 9.422294795513153e-03, 9.431302547454834e-03, 9.436583146452904e-03, 9.420059621334076e-03, 9.391364641487598e-03, 9.358547627925873e-03, 9.325146675109863e-03, 8.137145079672337e-03, 8.122085593640804e-03, 8.206699043512344e-03, 8.411874994635582e-03, 8.763079531490803e-03, 9.398895315825939e-03, 1.034505292773247e-02, 1.143034640699625e-02, 1.241556368768215e-02, 1.315876096487045e-02, 1.378693338483572e-02, 1.425285078585148e-02, 1.450714096426964e-02, 1.438504923135042e-02, 1.369496528059244e-02, 1.286804024130106e-02, 1.230658404529095e-02, 1.217551529407501e-02, 1.168260723352432e-02, 1.085670199245214e-02, 9.97223611921072e-03, 9.36471950262785e-03, 8.902018889784813e-03, 8.507907390594482e-03, 8.223498240113258e-03, 8.098715916275978e-03, 8.165220730006695e-03, 8.340694941580296e-03, 8.511393330991268e-03, 8.560599759221077e-03, 8.413743227720261e-03, 8.153790608048439e-03, 7.901248522102833e-03, 7.781551219522953e-03, 7.89081584662199e-03, 8.167044259607792e-03, 8.504312485456467e-03, 8.799020200967789e-03, 8.933519944548607e-03, 8.86286236345768e-03, 8.718964643776417e-03, 8.648307994008064e-03, 8.916387334465981e-03, 9.894336573779583e-03, 1.078152004629374e-02, 1.121085416525602e-02, 1.130799576640129e-02, 1.129153650254011e-02, 1.117290556430817e-02, 1.099951472133398e-02, 1.098693627864122e-02, 1.105138566344976e-02, 1.109431125223637e-02, 1.112894993275404e-02, 1.114331837743521e-02, 1.114110182970762e-02, 1.112098898738623e-02, 1.107599027454853e-02, 1.101889088749886e-02, 1.094273664057255e-02, 1.0823511518538e-02, 1.069130096584558e-02, 1.057273987680674e-02, 1.045074500143528e-02, 1.02439159527421e-02, 1.002308167517185e-02, 9.872145019471645e-03, 9.859723038971424e-03, 9.926189668476582e-03, 1.002039853483438e-02, 1.010283827781677e-02, 1.013703178614378e-02, 1.013418193906546e-02, 1.012380234897137e-02, 1.013018190860748e-02, 1.017637178301811e-02, 1.024587452411652e-02, 1.032060012221336e-02, 1.039818581193686e-02, 1.047625485807657e-02]
+whe.port_b1.Xi_outflow[1]=[1.04016549885273e-02, 1.03124687448144e-02, 1.015663705766201e-02, 9.993084706366062e-03, 9.876636788249016e-03, 9.816672652959824e-03, 9.757800027728081e-03, 9.698587469756603e-03, 9.639059193432331e-03, 9.547258727252483e-03, 9.355776011943817e-03, 9.132210165262222e-03, 8.947391994297504e-03, 8.858527988195419e-03, 8.844588883221149e-03, 8.862605318427086e-03, 8.873166516423225e-03, 8.84011946618557e-03, 8.78272857517004e-03, 8.717095479369164e-03, 8.650294505059719e-03, 8.137145079672337e-03, 8.122085593640804e-03, 8.206699043512344e-03, 8.411874994635582e-03, 8.763079531490803e-03, 9.398895315825939e-03, 1.034505292773247e-02, 1.143034640699625e-02, 1.241556368768215e-02, 1.315876096487045e-02, 1.378693338483572e-02, 1.425285078585148e-02, 1.450714096426964e-02, 1.438504923135042e-02, 1.369496528059244e-02, 1.286804024130106e-02, 1.230658404529095e-02, 1.217551529407501e-02, 1.168260723352432e-02, 1.085670199245214e-02, 9.97223611921072e-03, 9.36471950262785e-03, 8.954343385994434e-03, 8.773695677518845e-03, 8.571792393922806e-03, 8.390087634325027e-03, 8.298454806208611e-03, 8.308558724820614e-03, 8.382918313145638e-03, 8.453937247395515e-03, 8.446881547570229e-03, 8.34345631301403e-03, 8.179881609976292e-03, 8.026242256164551e-03, 7.966140285134315e-03, 8.032466284930706e-03, 8.203096687793732e-03, 8.424727246165276e-03, 8.621234446763992e-03, 8.718830533325672e-03, 8.722729049623013e-03, 8.692436851561069e-03, 8.751447312533855e-03, 9.152897633612156e-03, 9.760832414031029e-03, 1.121085416525602e-02, 1.130799576640129e-02, 1.129153650254011e-02, 1.117290556430817e-02, 1.100112032145262e-02, 1.099402271211147e-02, 1.108031533658504e-02, 1.116616558283567e-02, 1.123544201254845e-02, 1.126418076455593e-02, 1.125974766910076e-02, 1.12195210531354e-02, 1.112952362746e-02, 1.101532485336065e-02, 1.086301729083061e-02, 1.062456611543894e-02, 1.036014407873154e-02, 1.012302190065384e-02, 9.879033081233501e-03, 9.465374983847141e-03, 9.023707360029221e-03, 8.721830323338509e-03, 8.69698915630579e-03, 8.829919621348381e-03, 9.018341079354286e-03, 9.183220565319061e-03, 9.251606650650501e-03, 9.245906956493855e-03, 9.225144982337952e-03, 9.237906895577908e-03, 9.330284781754017e-03, 9.469292126595974e-03, 9.61874146014452e-03, 9.773914702236652e-03, 9.930051863193512e-03]
+whe.senSupMasFlo.m_flow=[0e+00, 1.074869526157037e-24, 1.749790123241094e-24, 1.750498520333982e-24, 1.750510944893239e-24, 1.750507986664845e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 5.743309117178796e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 1.376729699131829e-07, 2.181302756071091e-01, 6.285740733146667e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.460658311843872e-01, 5.748720610654345e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 2.018535882234573e-02, 5.955579876899719e-01, -9.835485697369181e-14, -9.835485697369181e-14, -9.835485697369181e-14, 4.467078020421039e-13, -9.835485697369181e-14, -9.835485697369181e-14, -9.835485697369181e-14, 4.467078020421039e-13, -9.835485697369181e-14, 4.467078020421039e-13, -6.434175024369604e-13, -6.434175024369604e-13, -9.835485697369181e-14, -9.835485697369181e-14, -9.835485697369181e-14, -6.434175024369604e-13, 4.467078020421039e-13, -6.434175024369604e-13, 4.467078020421039e-13, 4.467078020421039e-13, 4.467078020421039e-13, 4.467078020421039e-13, -6.434175024369604e-13, -9.835485697369181e-14, -6.434175024369604e-13, -9.835485697369181e-14, -6.434175024369604e-13, 4.467078020421039e-13, -6.434175024369604e-13]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Latent_Validation_SpeedControlled.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Latent_Validation_SpeedControlled.txt
index 7cc0dffece8..c415e8ca35c 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Latent_Validation_SpeedControlled.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Latent_Validation_SpeedControlled.txt
@@ -1,4 +1,4 @@
-last-generated=2024-05-09
+last-generated=2024-06-14
 statistics-initialization=
 {
   "nonlinear": "0, 0, 0, 0",
@@ -13,13 +13,13 @@ statistics-simulation=
 }
 time=[0e+00, 3.6e+02]
 TSup.y=[3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.033500059763645e+02, 3.039500116982971e+02, 3.045499875386664e+02, 3.051499938964844e+02, 3.057500002543024e+02, 3.063500066121204e+02, 3.069500116982971e+02, 3.075499875386664e+02, 3.081499938964844e+02, 3.087500002543024e+02, 3.093500066121204e+02, 3.099500116982971e+02, 3.105499875386664e+02, 3.111499938964844e+02, 3.117500002543024e+02, 3.123500066121204e+02, 3.129500116982971e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02]
-senSupTem.T=[2.931499938964844e+02, 2.974591369710882e+02, 2.975763854984834e+02, 2.975791320800862e+02, 2.975794677734536e+02, 2.9757958984375e+02, 2.975795593261719e+02, 2.975795593261719e+02, 2.975795288085938e+02, 2.975795288085938e+02, 2.975795288085938e+02, 2.975795288085938e+02, 2.975795288085938e+02, 2.975795288085938e+02, 2.975795288085938e+02, 2.975795288085938e+02, 2.975795288085938e+02, 2.976160278011812e+02, 2.978596189185308e+02, 2.981240538429962e+02, 2.983884887695312e+02, 2.986532899071978e+02, 2.989181520800206e+02, 2.991829526564369e+02, 2.994477232764606e+02, 2.997124938964844e+02, 2.999772950340862e+02, 3.0024206565411e+02, 3.005068357130775e+02, 3.007716368506794e+02, 3.010364074707031e+02, 3.01301208608305e+02, 3.015659792283287e+02, 3.01830779804745e+02, 3.019862670750978e+02, 3.019921875e+02, 3.019925231925833e+02, 3.019927062986987e+02, 3.019926452638013e+02, 3.019925842282569e+02, 3.019925537109375e+02, 3.019925537109375e+02, 3.019925842285156e+02, 3.019925842285156e+02, 3.019925842285156e+02, 3.019925842285156e+02, 3.019925842285156e+02, 3.019925842285156e+02, 3.019925842285156e+02, 3.019925842285156e+02, 3.019925842285156e+02, 3.019925842285156e+02, 3.019925842285156e+02, 3.019925842285156e+02, 3.019925842285156e+02, 3.019925842285156e+02, 3.019688416794975e+02, 3.018667296455243e+02, 3.01759216399915e+02, 3.01651550110585e+02, 3.015438842773438e+02, 3.014362184443611e+02, 3.013285216371945e+02, 3.012208252866337e+02, 3.01113128479467e+02, 3.010054016113281e+02, 3.008977052607674e+02, 3.007900084536006e+02, 3.006822815854618e+02, 3.005745847782951e+02, 3.004669494628906e+02, 3.003592225947518e+02, 3.00251526244191e+02, 3.001438289804183e+02, 3.000361326298576e+02, 2.999284362792969e+02, 2.998207399284775e+02, 2.997130130605973e+02, 2.996052852797638e+02, 2.994975889286857e+02, 2.993898620605469e+02, 2.99282135192408e+02, 2.991744083242692e+02, 2.990666805429183e+02, 2.989589536747795e+02, 2.988512268066406e+02, 2.987434999385018e+02, 2.986357730703629e+02, 2.985280452890121e+02, 2.984203184208732e+02, 2.983125610351562e+02, 2.982048341670174e+02, 2.980971072988785e+02, 2.979893489999496e+02, 2.978816221318107e+02, 2.977738647460938e+02, 2.976661378779549e+02, 2.975583804922379e+02, 2.97450622193309e+02, 2.97342864807592e+02, 2.97235107421875e+02]
-senExhTem.T=[2.931499938964844e+02, 2.985772705181363e+02, 2.98724945068901e+02, 2.987283935546956e+02, 2.987288208008136e+02, 2.987289733886719e+02, 2.987289123535318e+02, 2.987289428710938e+02, 2.987289123535156e+02, 2.987289123535156e+02, 2.987289123535156e+02, 2.987289123535156e+02, 2.987289123535156e+02, 2.987289123535156e+02, 2.987289123535156e+02, 2.987289123535156e+02, 2.987289123535156e+02, 2.987751769628247e+02, 2.99084045128561e+02, 2.994193113813463e+02, 2.997545776367188e+02, 3.00090362691178e+02, 3.004261782630859e+02, 3.007619015708984e+02, 3.010976255901367e+02, 3.01433349609375e+02, 3.017690736286133e+02, 3.021047671304028e+02, 3.024404904380859e+02, 3.027762144573242e+02, 3.031119384765625e+02, 3.034476624958655e+02, 3.037833865151684e+02, 3.041191098228516e+02, 3.043162841609964e+02, 3.043237915039062e+02, 3.043242187489652e+02, 3.043244628904956e+02, 3.0432437133802e+02, 3.043242797851562e+02, 3.043242492675781e+02, 3.043242797851562e+02, 3.043242797851562e+02, 3.043242797851562e+02, 3.043242797851562e+02, 3.043242797851562e+02, 3.043242797851562e+02, 3.043242797851562e+02, 3.043242797851562e+02, 3.043242797851562e+02, 3.043242797851562e+02, 3.043242797851562e+02, 3.043242797851562e+02, 3.043242797851562e+02, 3.043242797851562e+02, 3.043242797851562e+02, 3.043480223341743e+02, 3.044501343680182e+02, 3.0455758657873e+02, 3.046652528679306e+02, 3.047728881835938e+02, 3.048805234989982e+02, 3.049881897884575e+02, 3.050958251041206e+02, 3.052034913935799e+02, 3.053111877441406e+02, 3.054188230598038e+02, 3.055264588315556e+02, 3.056341246646675e+02, 3.057417909538681e+02, 3.05849365234375e+02, 3.059570005500382e+02, 3.060646358657013e+02, 3.06172272093283e+02, 3.062798768916268e+02, 3.063875122070312e+02, 3.064951475224357e+02, 3.066027828378402e+02, 3.067103885483612e+02, 3.068180238640243e+02, 3.069256286621094e+02, 3.070332639775139e+02, 3.071408687758576e+02, 3.072485050034393e+02, 3.073561098015243e+02, 3.074637145996094e+02, 3.075713499152725e+02, 3.076789547133576e+02, 3.077865604233612e+02, 3.078941652214462e+02, 3.080017700195312e+02, 3.081093748176163e+02, 3.082169796157013e+02, 3.083245853257049e+02, 3.0843219012379e+02, 3.08539794921875e+02, 3.086473692023819e+02, 3.08754974000467e+02, 3.088625491934098e+02, 3.089701539909775e+02, 3.090777282714844e+02]
+senSupTem.T=[2.931499938964844e+02, 2.953635559124151e+02, 2.954236450197738e+02, 2.954255065917807e+02, 2.954255676269531e+02, 2.954255676269531e+02, 2.954255676269531e+02, 2.954255676269531e+02, 2.954255981445312e+02, 2.954255981445312e+02, 2.954256591796875e+02, 2.954256591796228e+02, 2.954255981445312e+02, 2.954255676269531e+02, 2.954255676268884e+02, 2.954255981445312e+02, 2.954255981445312e+02, 2.954442443689849e+02, 2.955687254723681e+02, 2.957037658119032e+02, 2.958390808105469e+02, 2.959744263267687e+02, 2.961097108080929e+02, 2.962450560376102e+02, 2.963803405188698e+02, 2.965156555175781e+02, 2.966509705163512e+02, 2.967862855151242e+02, 2.969216002271926e+02, 2.97056915225901e+02, 2.971922607421875e+02, 2.973275757408958e+02, 2.974628602221554e+02, 2.975981749340946e+02, 2.976776733323414e+02, 2.976806945800781e+02, 2.97680908203125e+02, 2.976808776855469e+02, 2.97680908203125e+02, 2.97680908203125e+02, 2.97680908203125e+02, 2.97680908203125e+02, 2.97680908203125e+02, 2.97680908203125e+02, 2.97680908203125e+02, 2.97680908203125e+02, 2.97680908203125e+02, 2.97680908203125e+02, 2.97680908203125e+02, 2.97680908203125e+02, 2.97680908203125e+02, 2.97680908203125e+02, 2.97680908203125e+02, 2.97680908203125e+02, 2.97680908203125e+02, 2.97680908203125e+02, 2.976786193964072e+02, 2.976684875396443e+02, 2.976577148528045e+02, 2.97646972638141e+02, 2.976362609863281e+02, 2.976255493345153e+02, 2.976148071198517e+02, 2.976040954680389e+02, 2.975933837709535e+02, 2.975826721191406e+02, 2.975719299500083e+02, 2.975612182526642e+02, 2.975505371184295e+02, 2.975398559389222e+02, 2.975291442871094e+02, 2.975184631528746e+02, 2.975077820186399e+02, 2.97497070276282e+02, 2.974863891420472e+02, 2.974756774902344e+02, 2.974649963559996e+02, 2.974543152217649e+02, 2.974436645145632e+02, 2.974329833803285e+02, 2.974223022460938e+02, 2.97411621111859e+02, 2.974009399776243e+02, 2.973902587528445e+02, 2.973796081361879e+02, 2.973689270019531e+02, 2.973582153501403e+02, 2.973475036983274e+02, 2.97336791955452e+02, 2.973260497865785e+02, 2.973153381347656e+02, 2.973046264832115e+02, 2.972939148316573e+02, 2.97283203088782e+02, 2.972724914369691e+02, 2.972617797851562e+02, 2.972510681333434e+02, 2.972403259644698e+02, 2.972296142215945e+02, 2.972189025697816e+02, 2.972081909179688e+02]
+senExhTem.T=[2.931499938964844e+02, 3.006711425924424e+02, 3.008752746590358e+02, 3.008816528319746e+02, 3.00881805419938e+02, 3.008818969726562e+02, 3.008818969726562e+02, 3.008818969726562e+02, 3.008819580078125e+02, 3.008819274902991e+02, 3.008821411132812e+02, 3.008822021482435e+02, 3.008819580078448e+02, 3.008818359374677e+02, 3.008818054198572e+02, 3.008819274902344e+02, 3.008819274902991e+02, 3.009460143500668e+02, 3.013739009770675e+02, 3.018380430162138e+02, 3.0230322265625e+02, 3.027684022964803e+02, 3.032333988320179e+02, 3.036986080043076e+02, 3.041636960919329e+02, 3.046287536621094e+02, 3.050938722675068e+02, 3.05559021390353e+02, 3.060241390100376e+02, 3.064892576153704e+02, 3.069544067382812e+02, 3.07419525343614e+02, 3.078846134312392e+02, 3.08349670015897e+02, 3.086229552963309e+02, 3.086332702636719e+02, 3.086340637204444e+02, 3.086339721680981e+02, 3.086340637207031e+02, 3.086340942382812e+02, 3.086340637207031e+02, 3.08634033203125e+02, 3.08634033203125e+02, 3.08634033203125e+02, 3.08634033203125e+02, 3.08634033203125e+02, 3.08634033203125e+02, 3.08634033203125e+02, 3.08634033203125e+02, 3.08634033203125e+02, 3.08634033203125e+02, 3.08634033203125e+02, 3.08634033203125e+02, 3.08634033203125e+02, 3.08634033203125e+02, 3.08634033203125e+02, 3.086362914925234e+02, 3.086464233488983e+02, 3.086571350007111e+02, 3.086678161802184e+02, 3.086785278320312e+02, 3.08689208966266e+02, 3.086998901457733e+02, 3.08710571280008e+02, 3.087212524595153e+02, 3.0873193359375e+02, 3.087426147279847e+02, 3.087532653899139e+02, 3.087639160065705e+02, 3.087745666684996e+02, 3.087852172851562e+02, 3.087958373844934e+02, 3.088064880008914e+02, 3.088171387075756e+02, 3.088277588071715e+02, 3.088384094238281e+02, 3.088490600404847e+02, 3.088596496225025e+02, 3.088702698116086e+02, 3.088808899106871e+02, 3.088915100097656e+02, 3.089021301088441e+02, 3.089127196908619e+02, 3.08923339879968e+02, 3.089339599790465e+02, 3.08944580078125e+02, 3.089552612123597e+02, 3.089659118290164e+02, 3.089765930537961e+02, 3.089872436704528e+02, 3.089979248046875e+02, 3.090085754213441e+02, 3.090192565555789e+02, 3.090299072627805e+02, 3.090405883970153e+02, 3.0905126953125e+02, 3.090619506654847e+02, 3.090726012821414e+02, 3.090832825069211e+02, 3.090939636411559e+02, 3.091046447753906e+02]
 sou_2.T=[2.931499938964844e+02, 2.931499938964844e+02]
 wheUseDefCur.port_a1.m_flow=[5e+00, 5e+00]
 wheUseDefCur.port_a2.m_flow=[5e+00, 5e+00]
 wheUseDefCur.uSpe=[6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 7.029999976159558e-01, 7.09750002384115e-01, 7.164999785423986e-01, 7.232499833110633e-01, 7.300000190734863e-01, 7.367499952317699e-01, 7.434999999999292e-01, 7.502499761582129e-01, 7.57000040531017e-01, 7.637500166893005e-01, 7.704999928475842e-01, 7.772499976157435e-01, 7.839999737740271e-01, 7.907500381468311e-01, 7.975000143051147e-01, 8.042499904633983e-01, 8.109999666216818e-01, 8.177500000007276e-01, 8.245000357626453e-01, 8.31250011920929e-01, 8.379999880792126e-01, 8.44749964237496e-01, 8.514999976165418e-01, 8.582500333784596e-01, 8.650000095367432e-01, 8.717499856950268e-01, 8.784999618533103e-01, 8.85249995232356e-01, 8.920000309942737e-01, 8.987500071525574e-01, 9.05499983310841e-01, 9.122499594691245e-01, 9.190000524518045e-01, 9.257500286100879e-01, 9.325000047683716e-01, 9.392499809266552e-01, 9.459999570849387e-01, 9.527500500676187e-01, 9.595000262259021e-01, 9.662500023841858e-01, 9.729999785424693e-01, 9.797499547007529e-01, 9.865000476834329e-01, 9.932500238417163e-01, 1e+00]
-wheUseDefCur.epsSen=[5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.623999742510077e-01, 5.677999899865652e-01, 5.731999828339694e-01, 5.785999985697795e-01, 5.839999914169312e-01, 5.893999842645881e-01, 5.947999999998929e-01, 6.001999928475498e-01, 6.056000085828546e-01, 6.110000014305115e-01, 6.163999942781684e-01, 6.218000100134732e-01, 6.272000028608774e-01, 6.326000185964349e-01, 6.380000114440918e-01, 6.434000042912433e-01, 6.48799997138395e-01, 6.542000357623584e-01, 6.596000286100152e-01, 6.650000214576721e-01, 6.704000143048238e-01, 6.758000071519753e-01, 6.812000457759387e-01, 6.866000386235956e-01, 6.919999718666077e-01, 6.973999647142646e-01, 7.027999575619214e-01, 7.081999961858848e-01, 7.135999890330363e-01, 7.18999981880188e-01, 7.243999747278449e-01, 7.297999675755017e-01, 7.352000061994651e-01, 7.405999990466167e-01, 7.459999918937683e-01, 7.513999847414252e-01, 7.56799977589082e-01, 7.622000162120349e-01, 7.676000090596917e-01, 7.730000019073486e-01, 7.783999947550054e-01, 7.837999876026623e-01, 7.892000262256152e-01, 7.94600019073272e-01, 8.00000011920929e-01]
-wheUseDefCur.epsLat=[4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.920999923706035e-01, 4.9682501358986e-01, 5.015500147818246e-01, 5.062750061986324e-01, 5.109999775886536e-01, 5.157250085828142e-01, 5.204500000001273e-01, 5.251749713898959e-01, 5.299000224110958e-01, 5.346249938011169e-01, 5.393499651911381e-01, 5.440750162123381e-01, 5.487999876023593e-01, 5.535249790194197e-01, 5.582500100135803e-01, 5.629749814036015e-01, 5.677000123972568e-01, 5.724250238413567e-01, 5.77149995231883e-01, 5.818750262260437e-01, 5.865999976155596e-01, 5.913249690060859e-01, 5.960500400538201e-01, 6.007750114438413e-01, 6.054999828338623e-01, 6.10225013828023e-01, 6.149499852185493e-01, 6.196749966626492e-01, 6.244000276563045e-01, 6.291249990463257e-01, 6.338499704363468e-01, 6.385750014300021e-01, 6.433000128751126e-01, 6.480249842646284e-01, 6.527500152587891e-01, 6.574749866488102e-01, 6.621999580388312e-01, 6.669250290865655e-01, 6.716500004770918e-01, 6.763749718666077e-01, 6.811000028607682e-01, 6.858249742512946e-01, 6.905500452990289e-01, 6.952750166890499e-01, 6.99999988079071e-01]
-wheUseDefCur.P=[7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7.030000190733247e+01, 7.097499904633376e+01, 7.165000095366622e+01, 7.232499809266753e+01, 7.3e+01, 7.367500190733246e+01, 7.434999904633376e+01, 7.502500095366624e+01, 7.569999809266754e+01, 7.6375e+01, 7.705000190733247e+01, 7.772499904633378e+01, 7.840000095366624e+01, 7.907499809266753e+01, 7.975e+01, 8.042500190733246e+01, 8.10999961852704e+01, 8.17750038147296e+01, 8.244999809266753e+01, 8.3125e+01, 8.380000190733247e+01, 8.44749961852704e+01, 8.51500038147296e+01, 8.582499809266754e+01, 8.65e+01, 8.717500190733247e+01, 8.78499961852704e+01, 8.85250038147296e+01, 8.919999809266753e+01, 8.9875e+01, 9.055000190733247e+01, 9.12249961852704e+01, 9.19000038147296e+01, 9.257499809266753e+01, 9.325e+01, 9.392500190733247e+01, 9.45999961852704e+01, 9.52750038147296e+01, 9.594999809266753e+01, 9.6625e+01, 9.730000190733246e+01, 9.79749961852704e+01, 9.86500038147296e+01, 9.932499809266753e+01, 1e+02]
-wheDefCur.P=[7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.707760526040832e+01, 7.76318745537873e+01, 7.818501234887661e+01, 7.873689363449135e+01, 7.928739929199219e+01, 7.983640196336229e+01, 8.038376663742224e+01, 8.092935134476362e+01, 8.147303101001151e+01, 8.20146484375e+01, 8.255407623541956e+01, 8.309114883051618e+01, 8.362572434020771e+01, 8.415764707824735e+01, 8.468675994873047e+01, 8.521113498221922e+01, 8.572463053687665e+01, 8.622763230105473e+01, 8.672117697536649e+01, 8.720632171630859e+01, 8.768415751960265e+01, 8.81557753858856e+01, 8.862228550857391e+01, 8.908480150116631e+01, 8.954447174072266e+01, 9.000243300107802e+01, 9.045984494541517e+01, 9.091787112408261e+01, 9.137769395857916e+01, 9.184049987792969e+01, 9.230747906334781e+01, 9.277985984017414e+01, 9.325886699608766e+01, 9.374574363222463e+01, 9.424174499511719e+01, 9.474816044972476e+01, 9.526628698354577e+01, 9.579747192256049e+01, 9.634306429519107e+01, 9.690444946289062e+01, 9.748306938025544e+01, 9.808039650755971e+01, 9.869793914910043e+01, 9.933726612195029e+01, 1e+02]
+wheUseDefCur.epsSen=[7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.762399902724929e-01, 7.767800097274926e-01, 7.773200268936011e-01, 7.778599867439561e-01, 7.784000039100647e-01, 7.789400210761733e-01, 7.794799809265283e-01, 7.800199980926368e-01, 7.805600175476365e-01, 7.810999751091003e-01, 7.81639992275209e-01, 7.821800117302087e-01, 7.827200288963172e-01, 7.832599887466721e-01, 7.838000059127808e-01, 7.843400230788894e-01, 7.848799806403531e-01, 7.85420002384244e-01, 7.859600195503526e-01, 7.864999771118164e-01, 7.87039994277925e-01, 7.875800114440336e-01, 7.881199735832797e-01, 7.886599907493882e-01, 7.892000079154968e-01, 7.897400250816055e-01, 7.902799826430692e-01, 7.908200043869601e-01, 7.913600215530686e-01, 7.918999791145325e-01, 7.924399962806411e-01, 7.929800134467496e-01, 7.935199755859957e-01, 7.940599927521043e-01, 7.946000099182129e-01, 7.951400270843215e-01, 7.956799846457853e-01, 7.962200063896762e-01, 7.967600235557847e-01, 7.972999811172485e-01, 7.978399982833572e-01, 7.983800154494657e-01, 7.989199775887118e-01, 7.994599947548203e-01, 8.00000011920929e-01]
+wheUseDefCur.epsLat=[6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.019999980926514e-01, 6.029326880417263e-01, 6.049478666645854e-01, 6.068634970938573e-01, 6.086989075590937e-01, 6.104735136032104e-01, 6.12206634940882e-01, 6.139176502386136e-01, 6.156259760647749e-01, 6.173509388918269e-01, 6.19111955165863e-01, 6.209284035902736e-01, 6.228196041379278e-01, 6.248049718833528e-01, 6.269039548565604e-01, 6.2913578748703e-01, 6.315243798507223e-01, 6.340854674975617e-01, 6.367958282613918e-01, 6.396296669476536e-01, 6.425610184669495e-01, 6.455641933639108e-01, 6.48613263717094e-01, 6.516824468758715e-01, 6.547458819580458e-01, 6.57777726650238e-01, 6.607521722453469e-01, 6.636434100726508e-01, 6.664255353158747e-01, 6.690727515622436e-01, 6.715592741966248e-01, 6.738837918819692e-01, 6.760902927496139e-01, 6.781926224454343e-01, 6.802037391551236e-01, 6.821365356445312e-01, 6.840040056428484e-01, 6.858189641097955e-01, 6.875943601118807e-01, 6.893431573781578e-01, 6.91078245639801e-01, 6.92812499439449e-01, 6.94558912527009e-01, 6.963303745952542e-01, 6.981397302316558e-01, 6.99999988079071e-01]
+wheUseDefCur.P=[7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.707760526040832e+01, 7.76318745537873e+01, 7.818501234887661e+01, 7.873689363449135e+01, 7.928739929199219e+01, 7.983640196336229e+01, 8.038376663742224e+01, 8.092935134476362e+01, 8.147303101001151e+01, 8.20146484375e+01, 8.255407623541956e+01, 8.309114883051618e+01, 8.362572434020771e+01, 8.415764707824735e+01, 8.468675994873047e+01, 8.521113498221922e+01, 8.572463053687665e+01, 8.622763230105473e+01, 8.672117697536649e+01, 8.720632171630859e+01, 8.768415751960265e+01, 8.81557753858856e+01, 8.862228550857391e+01, 8.908480150116631e+01, 8.954447174072266e+01, 9.000243300107802e+01, 9.045984494541517e+01, 9.091787112408261e+01, 9.137769395857916e+01, 9.184049987792969e+01, 9.230747906334781e+01, 9.277985984017414e+01, 9.325886699608766e+01, 9.374574363222463e+01, 9.424174499511719e+01, 9.474816044972476e+01, 9.526628698354577e+01, 9.579747192256049e+01, 9.634306429519107e+01, 9.690444946289062e+01, 9.748306938025544e+01, 9.808039650755971e+01, 9.869793914910043e+01, 9.933726612195029e+01, 1e+02]
+wheDefCur.P=[8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.197704992171833e+01, 8.248475690049486e+01, 8.299291949113903e+01, 8.350048914045828e+01, 8.400641632080078e+01, 8.45096198156387e+01, 8.500902599473282e+01, 8.550352436295755e+01, 8.599201284516981e+01, 8.647337341308594e+01, 8.694647900127786e+01, 8.741019478486139e+01, 8.786338005174248e+01, 8.83048942294606e+01, 8.873358917236328e+01, 8.915061880317118e+01, 8.956377271216392e+01, 8.997387070803565e+01, 9.038092872659404e+01, 9.078498077392578e+01, 9.118607262516923e+01, 9.158422716947811e+01, 9.197947826308696e+01, 9.237185735179051e+01, 9.276139068603516e+01, 9.314812404102395e+01, 9.353207267645139e+01, 9.391327795939716e+01, 9.429175631519453e+01, 9.466754150390625e+01, 9.504067167140548e+01, 9.541116207732203e+01, 9.577905397652438e+01, 9.614435639073191e+01, 9.650711822509766e+01, 9.686734710824003e+01, 9.722507355851326e+01, 9.758033872400725e+01, 9.793314421144471e+01, 9.828353118896484e+01, 9.863152254397511e+01, 9.897714116530588e+01, 9.932041284136484e+01, 9.966135464067887e+01, 1e+02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Sensible_BaseClasses_Validation_Effectiveness.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Sensible_BaseClasses_Validation_Effectiveness.txt
index 228bf8f113e..c72be752c18 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Sensible_BaseClasses_Validation_Effectiveness.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Sensible_BaseClasses_Validation_Effectiveness.txt
@@ -1,4 +1,4 @@
-last-generated=2024-01-10
+last-generated=2024-06-14
 statistics-simulation=
 {
   "linear": " ",
@@ -6,9 +6,8 @@ statistics-simulation=
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.2e+02]
-whSpe.y=[3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.00000011920929e-01, 3.140000015894636e-01, 3.279999912579981e-01, 3.42000025431113e-01, 3.559999705956332e-01, 3.700000047683716e-01, 3.840000389407312e-01, 3.979999841053471e-01, 4.120000182788385e-01, 4.259999634434546e-01, 4.399999976158142e-01, 4.540000317885527e-01, 4.679999769527899e-01, 4.820000111264706e-01, 4.959999562908972e-01, 5.099999904632568e-01, 5.240000246356165e-01, 5.379999698002326e-01, 5.52000003973724e-01, 5.659999491383398e-01, 5.799999833106995e-01, 5.940000174838168e-01, 6.07999962647675e-01, 6.219999968215454e-01, 6.359999419857825e-01, 6.499999761581421e-01, 6.640000103312595e-01, 6.779999554951178e-01, 6.919999896689881e-01, 7.059999348332253e-01, 7.200000286102295e-01, 7.340000627825891e-01, 7.480000079468261e-01, 7.620000421206964e-01, 7.759999872845547e-01, 7.900000214576721e-01, 8.040000556300317e-01, 8.180000007942688e-01, 8.32000034968139e-01, 8.459999801327551e-01, 8.600000143051147e-01, 8.740000484774744e-01, 8.879999936420905e-01, 9.020000278155819e-01, 9.159999729801978e-01, 9.300000071525574e-01, 9.440000413249168e-01, 9.579999864895329e-01, 9.720000206630243e-01, 9.859999658276404e-01, 1e+00]
 TSup.y=[2.931499938964844e+02, 2.932499999960285e+02, 2.933500060955606e+02, 2.934500122149742e+02, 2.935499877770829e+02, 2.936499938964844e+02, 2.937500000158858e+02, 2.938500061352872e+02, 2.939500121752112e+02, 2.940499877770829e+02, 2.941499938964844e+02, 2.942500000158859e+02, 2.943500061352872e+02, 2.944500121752112e+02, 2.945499878566087e+02, 2.946499938964844e+02, 2.947499999364571e+02, 2.948500061352873e+02, 2.94950012175211e+02, 2.950499878566087e+02, 2.951499938964844e+02, 2.952499999364571e+02, 2.953500061352873e+02, 2.95450012175211e+02, 2.955499878566087e+02, 2.956499938964844e+02, 2.957499999364571e+02, 2.958500059762358e+02, 2.959500123341171e+02, 2.960499878566087e+02, 2.961499938964844e+02, 2.962499999364571e+02, 2.963500059762358e+02, 2.964500123341171e+02, 2.965499878566087e+02, 2.966499938964844e+02, 2.967499999364571e+02, 2.968500059762358e+02, 2.969500123341171e+02, 2.970499878566087e+02, 2.971499938964844e+02, 2.972499999364571e+02, 2.973500059762358e+02, 2.974500123341171e+02, 2.975499878566087e+02, 2.976499938964844e+02, 2.977499999364571e+02, 2.978500059762358e+02, 2.979500123341171e+02, 2.980499878566087e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02]
 TExh.y=[2.881499938964844e+02, 2.885499877770769e+02, 2.889500121752353e+02, 2.893500061352995e+02, 2.897499999364325e+02, 2.901499938964844e+02, 2.905499878565606e+02, 2.909500123341661e+02, 2.913500059763323e+02, 2.917499999364323e+02, 2.921499938964844e+02, 2.925499878565607e+02, 2.929500123341661e+02, 2.933500059763323e+02, 2.937500002542687e+02, 2.941499938964844e+02, 2.945499875387001e+02, 2.949500123341666e+02, 2.953500059763318e+02, 2.957500002542687e+02, 2.961499938964844e+02, 2.965499875387001e+02, 2.969500123341666e+02, 2.973500059763318e+02, 2.977500002542687e+02, 2.981499938964844e+02, 2.985499875387001e+02, 2.989500116982999e+02, 2.99350006612053e+02, 2.997500002542687e+02, 3.001499938964844e+02, 3.005499875387001e+02, 3.009500116982999e+02, 3.01350006612053e+02, 3.017500002542687e+02, 3.021499938964844e+02, 3.025499875387001e+02, 3.029500116982999e+02, 3.03350006612053e+02, 3.037500002542687e+02, 3.041499938964844e+02, 3.045499875387001e+02, 3.049500116982999e+02, 3.05350006612053e+02, 3.057500002542687e+02, 3.061499938964844e+02, 3.065499875387001e+02, 3.069500116982999e+02, 3.07350006612053e+02, 3.077500002542687e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02, 3.081499938964844e+02]
 VSup.y=[6.000000238418579e-01, 6.079999801317916e-01, 6.1599999602637e-01, 6.240000135103732e-01, 6.320000278154807e-01, 6.399999856948853e-01, 6.480000031789346e-01, 6.560000206628842e-01, 6.639999721845584e-01, 6.719999896685529e-01, 6.800000071525574e-01, 6.880000246365618e-01, 6.959999825160063e-01, 7.039999936422306e-01, 7.120000174838902e-01, 7.200000286102295e-01, 7.27999980131924e-01, 7.360000039736885e-01, 7.440000150997979e-01, 7.51999979337107e-01, 7.599999904632568e-01, 7.680000015894066e-01, 7.760000254312658e-01, 7.8399997695292e-01, 7.920000007947791e-01, 8.00000011920929e-01, 8.080000230470789e-01, 8.159999745689628e-01, 8.240000111263014e-01, 8.320000222522618e-01, 8.399999737739563e-01, 8.479999849002956e-01, 8.55999996026256e-01, 8.640000325835946e-01, 8.719999841054786e-01, 8.799999952316284e-01, 8.880000063577782e-01, 8.960000174839281e-01, 9.039999944370009e-01, 9.120000055631508e-01, 9.200000166893005e-01, 9.279999682109951e-01, 9.359999793373344e-01, 9.440000158942941e-01, 9.520000270206334e-01, 9.599999785423279e-01, 9.679999896686672e-01, 9.760000007946276e-01, 9.840000373519662e-01, 9.919999888738501e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 VExh.y=[8.00000011920929e-01, 8.040000198682122e-01, 8.080000278154955e-01, 8.119999769528761e-01, 8.15999984105418e-01, 8.199999928474426e-01, 8.240000015894673e-01, 8.280000103314894e-01, 8.320000158945543e-01, 8.360000246365752e-01, 8.399999737739563e-01, 8.439999825159822e-01, 8.479999912580031e-01, 8.51999996821068e-01, 8.560000087420399e-01, 8.600000143051147e-01, 8.640000198681896e-01, 8.679999721845219e-01, 8.719999777476712e-01, 8.759999896685535e-01, 8.799999952316284e-01, 8.840000007947033e-01, 8.880000127156803e-01, 8.92000018278735e-01, 8.960000301995225e-01, 8.999999761581421e-01, 9.03999981721217e-01, 9.07999987284292e-01, 9.120000055631508e-01, 9.160000111262256e-01, 9.200000166893005e-01, 9.240000222523754e-01, 9.279999682111846e-01, 9.319999864896644e-01, 9.359999920527393e-01, 9.399999976158142e-01, 9.440000031788891e-01, 9.48000008741964e-01, 9.520000270204438e-01, 9.55999972979253e-01, 9.599999785423279e-01, 9.639999841054028e-01, 9.679999896684777e-01, 9.720000079473365e-01, 9.760000135104114e-01, 9.800000190734863e-01, 9.840000246365612e-01, 9.879999705953704e-01, 9.919999888738501e-01, 9.959999944369251e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-epsCal.eps=[2.220000028610229e-01, 2.223599999999995e-01, 2.227199971389761e-01, 2.230799943494806e-01, 2.234400063180905e-01, 2.23800003528595e-01, 2.241600007390994e-01, 2.245199979496037e-01, 2.248799948739971e-01, 2.252400069856624e-01, 2.25600004196167e-01, 2.259600014066716e-01, 2.263199986171757e-01, 2.266799955415691e-01, 2.270399930381836e-01, 2.27400004863739e-01, 2.277600017881333e-01, 1.862400027418215e-01, 1.869599965906301e-01, 1.876800064849501e-01, 1.88400000333786e-01, 1.891199941826219e-01, 1.898400040769419e-01, 1.905599979257505e-01, 1.912800078200942e-01, 1.920000016689301e-01, 1.927199955177659e-01, 1.934400042676683e-01, 1.941600004053358e-01, 1.948799942541244e-01, 1.956000030040741e-01, 1.9631999685291e-01, 1.970400056028123e-01, 1.977600017404799e-01, 1.984799955892684e-01, 1.992000043392181e-01, 1.999199981880067e-01, 2.0063999203689e-01, 2.013600030756239e-01, 2.020799969244124e-01, 2.028000056743622e-01, 2.035199995231507e-01, 2.04239993372034e-01, 2.049600044106732e-01, 2.056799982595565e-01, 2.064000070095062e-01, 2.071200008582948e-01, 2.07839994707178e-01, 2.085600057458173e-01, 2.092799995947005e-01, 2.099999934434891e-01, 2.197999891917524e-01, 2.295999849400157e-01, 2.394000118413336e-01, 2.491999764369384e-01, 2.590000033378601e-01, 2.688000153378102e-01, 2.785999948340938e-01, 2.884000068348362e-01, 2.981999863311198e-01, 3.079999983310699e-01, 3.178000103310201e-01, 3.275999898273037e-01, 3.37400001828046e-01, 3.471999813243297e-01, 3.569999933242798e-01, 3.668000351261734e-01, 3.765999848205135e-01, 3.864000266233888e-01, 3.961999763175395e-01, 4.059999883174896e-01, 4.15800030119762e-01, 4.255999798139128e-01, 4.354000216165986e-01, 4.451999713107493e-01, 4.550000131130219e-01, 4.64800025112972e-01, 4.745999748071227e-01, 4.84400016609998e-01, 4.941999663043382e-01, 5.040000081062317e-01, 5.138000499081252e-01, 5.235999698003324e-01, 5.334000116030183e-01, 5.431999910991124e-01, 5.529999732971191e-01, 5.628000150997706e-01, 5.725999945958647e-01, 5.824000363985505e-01, 5.921999562907578e-01, 6.019999980926514e-01, 6.118000398945449e-01, 6.215999597867522e-01, 6.31400001589817e-01, 6.411999810862901e-01, 6.510000228881836e-01, 6.608000050861902e-01, 6.705999845822843e-01, 6.804000263849702e-01, 6.901999462771775e-01, 6.99999988079071e-01]
+epsCal.eps=[7.400000095367432e-01, 7.411999701976839e-01, 7.423999904632694e-01, 7.43600010967242e-01, 7.447999713897959e-01, 7.459999918937683e-01, 7.472000123977407e-01, 7.483999732971623e-01, 7.495999928474941e-01, 7.508000133514181e-01, 7.519999742507935e-01, 7.531999947548136e-01, 7.544000152587376e-01, 7.555999752045193e-01, 7.567999966622233e-01, 7.580000162124634e-01, 7.591999761582482e-01, 6.20800019073481e-01, 6.231999985694938e-01, 6.255999818801653e-01, 6.28000020980835e-01, 6.304000004768598e-01, 6.327999837875313e-01, 6.352000228881889e-01, 6.376000061988603e-01, 6.399999856948853e-01, 6.424000247953655e-01, 6.448000042915799e-01, 6.471999914168857e-01, 6.496000305175553e-01, 6.520000100135803e-01, 6.543999895096053e-01, 6.567999690056302e-01, 6.592000157355807e-01, 6.615999952316057e-01, 6.639999747276306e-01, 6.664000138283003e-01, 6.687999933243253e-01, 6.71199980449631e-01, 6.736000195503008e-01, 6.759999990463257e-01, 6.783999785423506e-01, 6.808000176430203e-01, 6.832000047683261e-01, 6.85599984264351e-01, 6.880000233650208e-01, 6.904000028610457e-01, 6.927999823570706e-01, 6.952000290870212e-01, 6.97600008583046e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Sensible_Examples_SpaceCooling.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Sensible_Examples_SpaceCooling.txt
index ed03322d38e..40ced10ae17 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Sensible_Examples_SpaceCooling.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Sensible_Examples_SpaceCooling.txt
@@ -1,4 +1,4 @@
-last-generated=2024-05-09
+last-generated=2024-06-14
 statistics-initialization=
 {
   "linear": "0, 0, 0, 0, 4",
@@ -8,15 +8,17 @@ statistics-initialization=
 statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 4",
-  "nonlinear": "1, 2, 0, 1, 1, 1",
-  "number of continuous time states": "22",
+  "nonlinear": "1, 2, 1, 0, 1, 1",
+  "number of continuous time states": "25",
   "numerical Jacobians": "0"
 }
 time=[1.5552e+07, 1.56384e+07]
 vol.T_start=[2.931499938964844e+02, 2.931499938964844e+02]
-vol.T=[2.931499938964844e+02, 2.931558837890625e+02, 2.929799499511719e+02, 2.926975708007812e+02, 2.923731384277344e+02, 2.920772399902344e+02, 2.918045349121094e+02, 2.915382080078125e+02, 2.912736511230469e+02, 2.909941711425781e+02, 2.905767211914062e+02, 2.900142211914062e+02, 2.894204406738281e+02, 2.889404907226562e+02, 2.886464538574219e+02, 2.884886169433594e+02, 2.883844299316406e+02, 2.882429504394531e+02, 2.879859313964844e+02, 2.876162414550781e+02, 2.871962890625e+02, 2.868060607910156e+02, 2.865364074707031e+02, 2.864703674316406e+02, 2.866612243652344e+02, 2.871516723632812e+02, 2.885281677246094e+02, 2.899907836914062e+02, 2.916045227050781e+02, 2.93271240234375e+02, 2.948161010742188e+02, 2.961998901367188e+02, 2.974215393066406e+02, 2.973492431640625e+02, 2.97415771484375e+02, 2.973645629882812e+02, 2.970057067871094e+02, 2.974677429199219e+02, 2.974571228027344e+02, 2.97275634765625e+02, 2.970132446289062e+02, 2.971078491210938e+02, 2.974808349609375e+02, 2.969872436523438e+02, 2.97056396484375e+02, 2.972968139648438e+02, 2.970733947753906e+02, 2.97099365234375e+02, 2.972933654785156e+02, 2.967833862304688e+02, 2.976255187988281e+02, 2.966881408691406e+02, 2.973909301757812e+02, 2.971754760742188e+02, 2.968593444824219e+02, 2.976906127929688e+02, 2.967866516113281e+02, 2.971856384277344e+02, 2.974348754882812e+02, 2.966431274414062e+02, 2.974722900390625e+02, 2.971272277832031e+02, 2.969159240722656e+02, 2.976935119628906e+02, 2.968096618652344e+02, 2.975284423828125e+02, 2.971109313964844e+02, 2.971130676269531e+02, 2.973049926757812e+02, 2.968793640136719e+02, 2.974075012207031e+02, 2.967461853027344e+02, 2.975682983398438e+02, 2.966238708496094e+02, 2.976586608886719e+02, 2.966826477050781e+02, 2.972911376953125e+02, 2.969325561523438e+02, 2.966825256347656e+02, 2.958363342285156e+02, 2.950868530273438e+02, 2.944715881347656e+02, 2.939642944335938e+02, 2.935993347167969e+02, 2.934185791015625e+02, 2.933692932128906e+02, 2.933747253417969e+02, 2.933849182128906e+02, 2.933596496582031e+02, 2.933012084960938e+02, 2.932327270507812e+02, 2.931614990234375e+02, 2.93089599609375e+02, 2.93017578125e+02, 2.929456176757812e+02, 2.928736267089844e+02, 2.928015747070312e+02, 2.927294311523438e+02, 2.926572265625e+02, 2.925850219726562e+02, 2.925127868652344e+02]
+vol.T=[2.931499938964844e+02, 2.935960388183594e+02, 2.938107299804688e+02, 2.938359985351562e+02, 2.93731201171875e+02, 2.935613708496094e+02, 2.933581237792969e+02, 2.931333312988281e+02, 2.928946228027344e+02, 2.926404418945312e+02, 2.923136596679688e+02, 2.918851318359375e+02, 2.913924255371094e+02, 2.909156799316406e+02, 2.90525634765625e+02, 2.902349243164062e+02, 2.900177917480469e+02, 2.898243103027344e+02, 2.895953369140625e+02, 2.893026733398438e+02, 2.889579467773438e+02, 2.88469482421875e+02, 2.866667175292969e+02, 2.861806030273438e+02, 2.862569885253906e+02, 2.867163391113281e+02, 2.875852661132812e+02, 2.889466552734375e+02, 2.906258544921875e+02, 2.923321228027344e+02, 2.937963562011719e+02, 2.950487670898438e+02, 2.961231079101562e+02, 2.969854431152344e+02, 2.971490478515625e+02, 2.971314392089844e+02, 2.966196899414062e+02, 2.958956298828125e+02, 2.956756286621094e+02, 2.960533752441406e+02, 2.966995849609375e+02, 2.971622924804688e+02, 2.971523132324219e+02, 2.971964416503906e+02, 2.971701965332031e+02, 2.971583557128906e+02, 2.971519775390625e+02, 2.971512756347656e+02, 2.971512756347656e+02, 2.971514282226562e+02, 2.971517333984375e+02, 2.971519775390625e+02, 2.971520385742188e+02, 2.971519775390625e+02, 2.971517333984375e+02, 2.971504821777344e+02, 2.97149658203125e+02, 2.971494140625e+02, 2.971498107910156e+02, 2.971512451171875e+02, 2.971522216796875e+02, 2.971523742675781e+02, 2.971515808105469e+02, 2.971392211914062e+02, 2.971256713867188e+02, 2.971298522949219e+02, 2.967710876464844e+02, 2.959244079589844e+02, 2.959757080078125e+02, 2.968335266113281e+02, 2.971592102050781e+02, 2.971351318359375e+02, 2.978196716308594e+02, 2.990572509765625e+02, 2.998171997070312e+02, 3.001743774414062e+02, 3.001407165527344e+02, 2.997261962890625e+02, 2.990216674804688e+02, 2.981830749511719e+02, 2.973834838867188e+02, 2.96666015625e+02, 2.960353393554688e+02, 2.955148620605469e+02, 2.951360473632812e+02, 2.948906555175781e+02, 2.947411193847656e+02, 2.946492004394531e+02, 2.945771484375e+02, 2.945055847167969e+02, 2.944338684082031e+02, 2.94362060546875e+02, 2.942901916503906e+02, 2.9421826171875e+02, 2.941463012695312e+02, 2.940743408203125e+02, 2.940023498535156e+02, 2.939303894042969e+02, 2.938583984375e+02, 2.93786376953125e+02, 2.937143859863281e+02]
 TOut.T=[2.914500122070312e+02, 2.913385009765625e+02, 2.910647583007812e+02, 2.907200927734375e+02, 2.903956909179688e+02, 2.901300048828125e+02, 2.898659973144531e+02, 2.896019897460938e+02, 2.893380126953125e+02, 2.89004150390625e+02, 2.884479370117188e+02, 2.878096618652344e+02, 2.872500610351562e+02, 2.869119262695312e+02, 2.867525024414062e+02, 2.866704406738281e+02, 2.865716247558594e+02, 2.86362060546875e+02, 2.860019836425781e+02, 2.855647583007812e+02, 2.851369323730469e+02, 2.848055419921875e+02, 2.84671142578125e+02, 2.847913513183594e+02, 2.852047729492188e+02, 2.859500122070312e+02, 2.872088317871094e+02, 2.889144592285156e+02, 2.907325744628906e+02, 2.923289794921875e+02, 2.935801696777344e+02, 2.946938171386719e+02, 2.956173706054688e+02, 2.962911987304688e+02, 2.964541015625e+02, 2.957337341308594e+02, 2.947459106445312e+02, 2.941705322265625e+02, 2.945262451171875e+02, 2.952189331054688e+02, 2.959844055175781e+02, 2.966857299804688e+02, 2.972068786621094e+02, 2.977020874023438e+02, 2.981768493652344e+02, 2.985576171875e+02, 2.987735900878906e+02, 2.989007568359375e+02, 2.990133361816406e+02, 2.991251220703125e+02, 2.9925e+02, 2.993937683105469e+02, 2.99545654296875e+02, 2.996946411132812e+02, 2.998296203613281e+02, 2.999126586914062e+02, 2.999144897460938e+02, 2.99878662109375e+02, 2.998501281738281e+02, 2.99885009765625e+02, 3.0001416015625e+02, 3.001783142089844e+02, 3.003133850097656e+02, 3.001267700195312e+02, 2.985876770019531e+02, 2.964372253417969e+02, 2.946898803710938e+02, 2.943067016601562e+02, 2.951251831054688e+02, 2.964444274902344e+02, 2.976576538085938e+02, 2.981753234863281e+02, 2.982959289550781e+02, 2.982947082519531e+02, 2.980774841308594e+02, 2.975499877929688e+02, 2.9660986328125e+02, 2.953994445800781e+02, 2.94191650390625e+02, 2.932594299316406e+02, 2.926542053222656e+02, 2.921209716796875e+02, 2.917095031738281e+02, 2.914774780273438e+02, 2.91437255859375e+02, 2.914543151855469e+02, 2.914801330566406e+02, 2.914757385253906e+02, 2.914140014648438e+02, 2.913420104980469e+02, 2.912699890136719e+02, 2.91197998046875e+02, 2.911260070800781e+02, 2.910539855957031e+02, 2.909819946289062e+02, 2.909100036621094e+02, 2.908380126953125e+02, 2.907659912109375e+02, 2.906940002441406e+02, 2.906220092773438e+02, 2.905499877929688e+02]
-cooCoi.sta_a2.T=[2.931499938964844e+02, 2.913385009765625e+02, 2.910647583007812e+02, 2.907200927734375e+02, 2.903956909179688e+02, 2.901300048828125e+02, 2.898659973144531e+02, 2.896019897460938e+02, 2.893380126953125e+02, 2.89004150390625e+02, 2.884479370117188e+02, 2.878096618652344e+02, 2.872500610351562e+02, 2.869119262695312e+02, 2.867525024414062e+02, 2.866704406738281e+02, 2.865716247558594e+02, 2.86362060546875e+02, 2.860019836425781e+02, 2.855647583007812e+02, 2.851369323730469e+02, 2.848055419921875e+02, 2.84671142578125e+02, 2.847913513183594e+02, 2.852047729492188e+02, 2.859500122070312e+02, 2.882640380859375e+02, 2.897752075195312e+02, 2.914298400878906e+02, 2.930824890136719e+02, 2.945685119628906e+02, 2.958979187011719e+02, 2.970586547851562e+02, 2.971351013183594e+02, 2.972189636230469e+02, 2.970245971679688e+02, 2.965215454101562e+02, 2.967350769042969e+02, 2.96777099609375e+02, 2.967764282226562e+02, 2.967528991699219e+02, 2.969973449707031e+02, 2.974074096679688e+02, 2.971829833984375e+02, 2.973701171875e+02, 2.976580505371094e+02, 2.975722045898438e+02, 2.976408996582031e+02, 2.97823486328125e+02, 2.975238342285156e+02, 2.981527099609375e+02, 2.975898132324219e+02, 2.981286315917969e+02, 2.980618896484375e+02, 2.979338989257812e+02, 2.985173645019531e+02, 2.979839172363281e+02, 2.982464904785156e+02, 2.984142150878906e+02, 2.979965209960938e+02, 2.985650329589844e+02, 2.984781188964844e+02, 2.984653625488281e+02, 2.988367309570312e+02, 2.976707458496094e+02, 2.969838256835938e+02, 2.958657836914062e+02, 2.956256408691406e+02, 2.961144409179688e+02, 2.966346130371094e+02, 2.97552490234375e+02, 2.975989074707031e+02, 2.980150146484375e+02, 2.976786193847656e+02, 2.979299621582031e+02, 2.972577514648438e+02, 2.9660986328125e+02, 2.953994445800781e+02, 2.94191650390625e+02, 2.932594299316406e+02, 2.926542053222656e+02, 2.921209716796875e+02, 2.917095031738281e+02, 2.914774780273438e+02, 2.91437255859375e+02, 2.914543151855469e+02, 2.914801330566406e+02, 2.914757385253906e+02, 2.914140014648438e+02, 2.913420104980469e+02, 2.912699890136719e+02, 2.91197998046875e+02, 2.911260070800781e+02, 2.910539855957031e+02, 2.909819946289062e+02, 2.909100036621094e+02, 2.908380126953125e+02, 2.907659912109375e+02, 2.906940002441406e+02, 2.906220092773438e+02, 2.905499877929688e+02]
-cooCoi.sta_b2.T=[2.931499938964844e+02, 2.913454895019531e+02, 2.910758972167969e+02, 2.907322082519531e+02, 2.904056396484375e+02, 2.901391296386719e+02, 2.898751220703125e+02, 2.896111145019531e+02, 2.893471374511719e+02, 2.890198364257812e+02, 2.884694213867188e+02, 2.878313903808594e+02, 2.872664794921875e+02, 2.869200439453125e+02, 2.867562561035156e+02, 2.866730041503906e+02, 2.865762939453125e+02, 2.863719787597656e+02, 2.860161743164062e+02, 2.855802307128906e+02, 2.851506652832031e+02, 2.848144226074219e+02, 2.846719360351562e+02, 2.8478271484375e+02, 2.851853637695312e+02, 2.859184875488281e+02, 2.882149353027344e+02, 2.897201538085938e+02, 2.913715209960938e+02, 2.930275573730469e+02, 2.945196533203125e+02, 2.958544921875e+02, 2.970215454101562e+02, 2.970871276855469e+02, 2.971749267578125e+02, 2.969962768554688e+02, 2.9650439453125e+02, 2.967317504882812e+02, 2.905662841796875e+02, 2.967467956542969e+02, 2.967057800292969e+02, 2.969409790039062e+02, 2.973504333496094e+02, 2.883258361816406e+02, 2.97274169921875e+02, 2.886420288085938e+02, 2.974552612304688e+02, 2.884390869140625e+02, 2.977313537597656e+02, 2.883526916503906e+02, 2.980684509277344e+02, 2.961152038574219e+02, 2.888097839355469e+02, 2.979241943359375e+02, 2.884501342773438e+02, 2.928273010253906e+02, 2.970706787109375e+02, 2.885835266113281e+02, 2.983150634765625e+02, 2.890511169433594e+02, 2.890296936035156e+02, 2.982669982910156e+02, 2.885836791992188e+02, 2.919594116210938e+02, 2.971886596679688e+02, 2.969928283691406e+02, 2.958826293945312e+02, 2.956220092773438e+02, 2.960868225097656e+02, 2.965665588378906e+02, 2.974925537109375e+02, 2.885558776855469e+02, 2.979689025878906e+02, 2.947523803710938e+02, 2.923420715332031e+02, 2.963597412109375e+02, 2.966483154296875e+02, 2.9544287109375e+02, 2.942304992675781e+02, 2.932843627929688e+02, 2.926741638183594e+02, 2.921377563476562e+02, 2.917211608886719e+02, 2.914820251464844e+02, 2.914373168945312e+02, 2.91453369140625e+02, 2.914795227050781e+02, 2.914767761230469e+02, 2.9141650390625e+02, 2.91344482421875e+02, 2.912724914550781e+02, 2.912005004882812e+02, 2.911284790039062e+02, 2.910564880371094e+02, 2.909844970703125e+02, 2.909124755859375e+02, 2.908404846191406e+02, 2.907684936523438e+02, 2.906965026855469e+02, 2.906244812011719e+02, 2.90552490234375e+02]
+cooCoi.sta_a2.T=[2.931499938964844e+02, 2.917807006835938e+02, 2.915738830566406e+02, 2.913134155273438e+02, 2.910682983398438e+02, 2.908675231933594e+02, 2.906680297851562e+02, 2.904685668945312e+02, 2.902690734863281e+02, 2.900168762207031e+02, 2.895967102050781e+02, 2.891145935058594e+02, 2.886919555664062e+02, 2.884365844726562e+02, 2.88316162109375e+02, 2.882541198730469e+02, 2.88179443359375e+02, 2.880211486816406e+02, 2.877491455078125e+02, 2.874189147949219e+02, 2.870957641601562e+02, 2.848055419921875e+02, 2.84671142578125e+02, 2.847913513183594e+02, 2.852047729492188e+02, 2.859500122070312e+02, 2.872088317871094e+02, 2.889144592285156e+02, 2.907325744628906e+02, 2.923289794921875e+02, 2.935801696777344e+02, 2.946938171386719e+02, 2.956173706054688e+02, 2.962911987304688e+02, 2.964541015625e+02, 2.957337341308594e+02, 2.947459106445312e+02, 2.941705322265625e+02, 2.945262451171875e+02, 2.952189331054688e+02, 2.959844055175781e+02, 2.966857299804688e+02, 2.972068786621094e+02, 2.975822448730469e+02, 2.973943786621094e+02, 2.974382019042969e+02, 2.97476318359375e+02, 2.975011901855469e+02, 2.975237731933594e+02, 2.975462646484375e+02, 2.975714111328125e+02, 2.976003112792969e+02, 2.976307678222656e+02, 2.976604919433594e+02, 2.976873168945312e+02, 2.977030334472656e+02, 2.977028503417969e+02, 2.976955261230469e+02, 2.976900939941406e+02, 2.976980895996094e+02, 2.97724609375e+02, 2.97757568359375e+02, 2.97783935546875e+02, 2.97737060546875e+02, 2.974184875488281e+02, 2.969909973144531e+02, 2.946898803710938e+02, 2.943067016601562e+02, 2.951251831054688e+02, 2.964444274902344e+02, 2.976467590332031e+02, 2.974203186035156e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02]
+cooCoi.sta_b2.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.850066223144531e+02, 2.846719360351562e+02, 2.847826843261719e+02, 2.851853332519531e+02, 2.859185180664062e+02, 2.871560974121094e+02, 2.888516235351562e+02, 2.906712646484375e+02, 2.922807006835938e+02, 2.935388488769531e+02, 2.94657958984375e+02, 2.955890502929688e+02, 2.962724914550781e+02, 2.9572607421875e+02, 2.95759765625e+02, 2.947773742675781e+02, 2.941767578125e+02, 2.945053405761719e+02, 2.951929931640625e+02, 2.959581298828125e+02, 2.951267700195312e+02, 2.952107543945312e+02, 2.941287231445312e+02, 2.939949340820312e+02, 2.937916259765625e+02, 2.937012939453125e+02, 2.936488952636719e+02, 2.93595703125e+02, 2.935404968261719e+02, 2.934779052734375e+02, 2.93404296875e+02, 2.933260498046875e+02, 2.932490234375e+02, 2.931792297363281e+02, 2.93134765625e+02, 2.931340942382812e+02, 2.931538696289062e+02, 2.931707458496094e+02, 2.9315673828125e+02, 2.930909729003906e+02, 2.930059814453125e+02, 2.929346008300781e+02, 2.929650268554688e+02, 2.93768798828125e+02, 2.948639831542969e+02, 2.947334289550781e+02, 2.942953796386719e+02, 2.950852661132812e+02, 2.963969421386719e+02, 2.951000671386719e+02, 2.94371826171875e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02]
 opeSig.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, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+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]
-senTemHXOut.T=[2.931499938964844e+02, 2.913387145996094e+02, 2.910651550292969e+02, 2.907204895019531e+02, 2.903960266113281e+02, 2.901303100585938e+02, 2.898663024902344e+02, 2.89602294921875e+02, 2.893383178710938e+02, 2.890046997070312e+02, 2.884486694335938e+02, 2.878103942871094e+02, 2.872506103515625e+02, 2.869121704101562e+02, 2.867526245117188e+02, 2.866705322265625e+02, 2.8657177734375e+02, 2.863623962402344e+02, 2.860024719238281e+02, 2.855652770996094e+02, 2.851373901367188e+02, 2.848058471679688e+02, 2.846711730957031e+02, 2.847910461425781e+02, 2.852041015625e+02, 2.859489440917969e+02, 2.882623901367188e+02, 2.897733764648438e+02, 2.914278869628906e+02, 2.930806579589844e+02, 2.945668640136719e+02, 2.95896484375e+02, 2.970574340820312e+02, 2.97133544921875e+02, 2.97217529296875e+02, 2.97023681640625e+02, 2.9652099609375e+02, 2.967349548339844e+02, 2.967813110351562e+02, 2.967754516601562e+02, 2.967513427734375e+02, 2.969955139160156e+02, 2.97405517578125e+02, 2.971869201660156e+02, 2.973674926757812e+02, 2.976617431640625e+02, 2.975693664550781e+02, 2.976443786621094e+02, 2.978206787109375e+02, 2.975268859863281e+02, 2.981499938964844e+02, 2.975874633789062e+02, 2.981316833496094e+02, 2.980587463378906e+02, 2.979364624023438e+02, 2.985177612304688e+02, 2.979811096191406e+02, 2.982491760253906e+02, 2.984113159179688e+02, 2.9799853515625e+02, 2.985673828125e+02, 2.984749450683594e+02, 2.984673156738281e+02, 2.988379516601562e+02, 2.976697387695312e+02, 2.969841918945312e+02, 2.958663635253906e+02, 2.956255187988281e+02, 2.961134948730469e+02, 2.966327209472656e+02, 2.97550537109375e+02, 2.976006164550781e+02, 2.980135192871094e+02, 2.976780700683594e+02, 2.97930908203125e+02, 2.972572937011719e+02, 2.966111755371094e+02, 2.954009094238281e+02, 2.941929626464844e+02, 2.932602233886719e+02, 2.926548767089844e+02, 2.921215209960938e+02, 2.917098693847656e+02, 2.914776306152344e+02, 2.91437255859375e+02, 2.914542846679688e+02, 2.914801025390625e+02, 2.914757690429688e+02, 2.914140930175781e+02, 2.913420715332031e+02, 2.912700805664062e+02, 2.911980895996094e+02, 2.911260681152344e+02, 2.910540771484375e+02, 2.909820861816406e+02, 2.909100952148438e+02, 2.908380737304688e+02, 2.907660827636719e+02, 2.90694091796875e+02, 2.906220703125e+02, 2.905500793457031e+02]
+senTemHXOut.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.848058471679688e+02, 2.846711730957031e+02, 2.847910461425781e+02, 2.852041015625e+02, 2.859490661621094e+02, 2.8720703125e+02, 2.88912353515625e+02, 2.907305603027344e+02, 2.923273620605469e+02, 2.935787963867188e+02, 2.94692626953125e+02, 2.956164245605469e+02, 2.962905883789062e+02, 2.964544982910156e+02, 2.957348327636719e+02, 2.947469482421875e+02, 2.941707153320312e+02, 2.945255432128906e+02, 2.952180786132812e+02, 2.959835205078125e+02, 2.966849975585938e+02, 2.972063293457031e+02, 2.975823059082031e+02, 2.973946228027344e+02, 2.974381713867188e+02, 2.974762878417969e+02, 2.975011901855469e+02, 2.975237426757812e+02, 2.975462341308594e+02, 2.975713806152344e+02, 2.976002807617188e+02, 2.976307373046875e+02, 2.976604614257812e+02, 2.976872863769531e+02, 2.977030029296875e+02, 2.977028503417969e+02, 2.976955261230469e+02, 2.976900939941406e+02, 2.976980590820312e+02, 2.977245788574219e+02, 2.977575378417969e+02, 2.977839050292969e+02, 2.977373046875e+02, 2.974189453125e+02, 2.969914855957031e+02, 2.946912841796875e+02, 2.943062744140625e+02, 2.951238403320312e+02, 2.964428405761719e+02, 2.976458129882812e+02, 2.97420166015625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02]
+TMixSetPoi.y=[2.971499938964844e+02, 2.971499938964844e+02]
+whe.senSupMasFlo.m_flow=[0e+00, 1.074869526157037e-24, 1.749790123241094e-24, 1.750498520333982e-24, 1.750510944893239e-24, 1.750507986664845e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 5.743309117178796e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 1.375971976358414e-07, 2.184830754995346e-01, 6.306771636009216e-01, 6.461225748062134e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.459726095199585e-01, 5.744390207951255e-08, 5.74331693314889e-08, 5.743316577877522e-08, 5.743316577877522e-08, 2.018366567790508e-02, 5.956582427024841e-01, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Sensible_Validation_SpeedControlled.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Sensible_Validation_SpeedControlled.txt
index 878f970ea7e..09c2845b6e2 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Sensible_Validation_SpeedControlled.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Sensible_Validation_SpeedControlled.txt
@@ -1,4 +1,4 @@
-last-generated=2024-05-09
+last-generated=2024-06-14
 statistics-initialization=
 {
   "nonlinear": "0, 0, 0, 0",
@@ -13,12 +13,12 @@ statistics-simulation=
 }
 time=[0e+00, 3.6e+02]
 TSup.y=[3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.033500059763645e+02, 3.039500116982971e+02, 3.045499875386664e+02, 3.051499938964844e+02, 3.057500002543024e+02, 3.063500066121204e+02, 3.069500116982971e+02, 3.075499875386664e+02, 3.081499938964844e+02, 3.087500002543024e+02, 3.093500066121204e+02, 3.099500116982971e+02, 3.105499875386664e+02, 3.111499938964844e+02, 3.117500002543024e+02, 3.123500066121204e+02, 3.129500116982971e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02]
-senSupTem.T=[2.931499938964844e+02, 2.974394531332218e+02, 2.975563964847954e+02, 2.975594787597171e+02, 2.975594482421714e+02, 2.97559326171875e+02, 2.975593872070312e+02, 2.975594177246094e+02, 2.975594177246094e+02, 2.975594177246094e+02, 2.975594177246094e+02, 2.975594177246094e+02, 2.975594177246094e+02, 2.975594177246094e+02, 2.975594177246094e+02, 2.975594177246094e+02, 2.975594177246094e+02, 2.975958861996187e+02, 2.978392636941801e+02, 2.981034849954693e+02, 2.983677062988281e+02, 2.986322938133831e+02, 2.98896942362965e+02, 2.991614987991443e+02, 2.994260557961212e+02, 2.996906433105469e+02, 2.999552003074591e+02, 3.002197573043713e+02, 3.004843137405506e+02, 3.007489012550409e+02, 3.010134582519531e+02, 3.012780152488653e+02, 3.015425722457775e+02, 3.01807159199535e+02, 3.019625243993166e+02, 3.019684448242188e+02, 3.01968780516802e+02, 3.019689636229175e+02, 3.019688720704419e+02, 3.019688110351562e+02, 3.019688110351562e+02, 3.019688110351562e+02, 3.019688110351562e+02, 3.019688110351562e+02, 3.019688110351562e+02, 3.019688110351562e+02, 3.019688110351562e+02, 3.019688415527344e+02, 3.019688415527344e+02, 3.019688415527344e+02, 3.019688415527344e+02, 3.019688110354149e+02, 3.019688110351562e+02, 3.019688110351562e+02, 3.019688110351562e+02, 3.019688110351562e+02, 3.019450379688187e+02, 3.01842803864145e+02, 3.017351685484818e+02, 3.016273496708732e+02, 3.015195617675781e+02, 3.01411773864283e+02, 3.013039549866745e+02, 3.011961365659305e+02, 3.010882871706145e+02, 3.009804382324219e+02, 3.008726503291268e+02, 3.007648314515182e+02, 3.006569825133255e+02, 3.005491941530364e+02, 3.004413757324219e+02, 3.003335573118073e+02, 3.002257388911928e+02, 3.001179500736509e+02, 3.000101316530364e+02, 2.999023132324219e+02, 2.997944948115486e+02, 2.996866763906754e+02, 2.995788570560728e+02, 2.994710386354583e+02, 2.993632202148438e+02, 2.992554017942292e+02, 2.991475833730973e+02, 2.990397640384947e+02, 2.989319456178802e+02, 2.988241271972656e+02, 2.987163087763924e+02, 2.986084903555192e+02, 2.985006710209166e+02, 2.98392852600302e+02, 2.982850341796875e+02, 2.981772157588143e+02, 2.98069397337941e+02, 2.979615780033384e+02, 2.978537595827239e+02, 2.977459411621094e+02, 2.976381227412361e+02, 2.975303043203629e+02, 2.974224849857603e+02, 2.973146665651458e+02, 2.972068481445312e+02]
-senExhTem.T=[2.931499938964844e+02, 2.98597656260441e+02, 2.98746185303268e+02, 2.987500610350996e+02, 2.987500610351239e+02, 2.987499084472656e+02, 2.987499694824219e+02, 2.9875e+02, 2.9875e+02, 2.9875e+02, 2.9875e+02, 2.9875e+02, 2.9875e+02, 2.9875e+02, 2.9875e+02, 2.9875e+02, 2.9875e+02, 2.98796325644433e+02, 2.991054379505679e+02, 2.994409788616858e+02, 2.997765502929688e+02, 3.001125794881823e+02, 3.004486697184228e+02, 3.00784667683921e+02, 3.011206663614918e+02, 3.014566650390625e+02, 3.017926637166332e+02, 3.02128662394204e+02, 3.024646603597022e+02, 3.02800659037273e+02, 3.031366577148438e+02, 3.034726563924145e+02, 3.038086550699853e+02, 3.041446530354835e+02, 3.043419799617777e+02, 3.043495178222656e+02, 3.043499450673246e+02, 3.043501586912769e+02, 3.043500671388013e+02, 3.043500061032569e+02, 3.043499755859375e+02, 3.043499755859375e+02, 3.043500061035156e+02, 3.043500061035156e+02, 3.043500061035156e+02, 3.043500061035156e+02, 3.043500061035156e+02, 3.043500061035156e+02, 3.043500061035156e+02, 3.043500061035156e+02, 3.043500061035156e+02, 3.043500061035156e+02, 3.043500061035156e+02, 3.043500061035156e+02, 3.043500061035156e+02, 3.043500061035156e+02, 3.043738096874313e+02, 3.044762268977031e+02, 3.045840453185763e+02, 3.046920473020417e+02, 3.048000183105469e+02, 3.04907989319052e+02, 3.050159913025174e+02, 3.051239928284713e+02, 3.052320253296442e+02, 3.053400268554688e+02, 3.054480283812933e+02, 3.055560303650174e+02, 3.05664031890842e+02, 3.057720338743073e+02, 3.058800048828125e+02, 3.059880064086371e+02, 3.060960079344617e+02, 3.062040103755678e+02, 3.063120119016511e+02, 3.064199829101562e+02, 3.065279844362395e+02, 3.066359859618054e+02, 3.067439884034289e+02, 3.068519899292535e+02, 3.069599914550781e+02, 3.070679929809027e+02, 3.071759945067273e+02, 3.072839969483508e+02, 3.073919984741754e+02, 3.075e+02, 3.076080015258246e+02, 3.077160030516492e+02, 3.078240054932727e+02, 3.079320070190973e+02, 3.080400085449219e+02, 3.081480100707465e+02, 3.082560115965711e+02, 3.083640140376772e+02, 3.084720155637605e+02, 3.085799865722656e+02, 3.086879880983489e+02, 3.087959896244322e+02, 3.089039920655383e+02, 3.090119935913629e+02, 3.091199951171875e+02]
+senSupTem.T=[2.931499938964844e+02, 2.953416442912809e+02, 2.954011230471094e+02, 2.954029846191164e+02, 2.954030151367188e+02, 2.954030456542969e+02, 2.954030456542969e+02, 2.954030456542969e+02, 2.954030456542969e+02, 2.95403076171875e+02, 2.954030456542969e+02, 2.954030456542969e+02, 2.954030456542969e+02, 2.954030456542969e+02, 2.954030456542969e+02, 2.954030456542969e+02, 2.954030456542969e+02, 2.954216613612048e+02, 2.955460509119505e+02, 2.956809386635304e+02, 2.958161315917969e+02, 2.959513245201281e+02, 2.960864564135617e+02, 2.962216795728958e+02, 2.963568419837135e+02, 2.964920043945312e+02, 2.966271973229271e+02, 2.96762390251323e+02, 2.968975523756301e+02, 2.97032745304026e+02, 2.971679077148438e+02, 2.973031006432396e+02, 2.974382630540574e+02, 2.975734251783645e+02, 2.976528625412611e+02, 2.976558532714844e+02, 2.976560974121094e+02, 2.976560668945312e+02, 2.976560974121094e+02, 2.976560974121094e+02, 2.976560974121094e+02, 2.976560974121094e+02, 2.976560668945312e+02, 2.976560974121094e+02, 2.976560668945312e+02, 2.976560974121094e+02, 2.976560974121094e+02, 2.976560974121094e+02, 2.976560974121094e+02, 2.976560974121094e+02, 2.976560974121094e+02, 2.976560974121094e+02, 2.976560974121094e+02, 2.976560974121094e+02, 2.976560974121094e+02, 2.976560974121094e+02, 2.976537780878134e+02, 2.976435851957649e+02, 2.976327514738983e+02, 2.976219482238198e+02, 2.976111755371094e+02, 2.976003723328208e+02, 2.975895996001911e+02, 2.975788269133514e+02, 2.975680236635316e+02, 2.975572509765625e+02, 2.975464782895934e+02, 2.975356750397736e+02, 2.975249023529339e+02, 2.975141296203042e+02, 2.975033264160156e+02, 2.974925537293052e+02, 2.974817810425948e+02, 2.974710082640458e+02, 2.97460205060016e+02, 2.974494323730469e+02, 2.974386596860778e+02, 2.97427856482048e+02, 2.974170837034989e+02, 2.974063110167885e+02, 2.973955078125e+02, 2.973847351257896e+02, 2.973739624390792e+02, 2.973631896605302e+02, 2.973523864565004e+02, 2.973416137695312e+02, 2.973308410825621e+02, 2.973200378785323e+02, 2.973092650999833e+02, 2.972984924132729e+02, 2.972877197265625e+02, 2.97276916522274e+02, 2.972661438355636e+02, 2.972553710570145e+02, 2.972445678529847e+02, 2.972337951660156e+02, 2.972230224790465e+02, 2.972122192750167e+02, 2.972014464964677e+02, 2.971906738097573e+02, 2.971799011230469e+02]
+senExhTem.T=[2.931499938964844e+02, 3.00698486342495e+02, 3.009033508309108e+02, 3.009097595214197e+02, 3.009099121093911e+02, 3.009100036621094e+02, 3.009100036621094e+02, 3.009100341796552e+02, 3.009100341796875e+02, 3.009100646972656e+02, 3.009100341796875e+02, 3.009100036621094e+02, 3.009100036621094e+02, 3.00910003662077e+02, 3.009099731445312e+02, 3.009100036621094e+02, 3.009100036621094e+02, 3.009741820745792e+02, 3.014025264648313e+02, 3.018671262679728e+02, 3.02332763671875e+02, 3.027984010760359e+02, 3.032638858929528e+02, 3.037295833455871e+02, 3.041951291972076e+02, 3.046606750488281e+02, 3.051262514180914e+02, 3.055918583049329e+02, 3.060574642049621e+02, 3.065230710916742e+02, 3.069886474609375e+02, 3.074542543477143e+02, 3.079198001993348e+02, 3.08385314546759e+02, 3.086589050032975e+02, 3.086692199707031e+02, 3.086700134277344e+02, 3.086699218751294e+02, 3.086700134277344e+02, 3.086700439453125e+02, 3.086700134277344e+02, 3.086700134277344e+02, 3.086699829101562e+02, 3.086699829101562e+02, 3.086699829101562e+02, 3.086699829101562e+02, 3.086699829101562e+02, 3.086700134277344e+02, 3.086700134277344e+02, 3.086700134277344e+02, 3.086700134277344e+02, 3.086700134277344e+02, 3.086700134277344e+02, 3.086700134277344e+02, 3.086700134277344e+02, 3.086700134277344e+02, 3.086723022344522e+02, 3.086825256440789e+02, 3.086933898833943e+02, 3.087041931336021e+02, 3.087149963378906e+02, 3.087257995421792e+02, 3.08736602792387e+02, 3.087474059966755e+02, 3.087582092466246e+02, 3.087690124511719e+02, 3.08779785138141e+02, 3.087905883880901e+02, 3.088013915923786e+02, 3.088121948425865e+02, 3.08822998046875e+02, 3.088338012511635e+02, 3.08844604455452e+02, 3.088554077515792e+02, 3.08866210955609e+02, 3.088770141601562e+02, 3.088877868471254e+02, 3.088985900516726e+02, 3.089093933472823e+02, 3.089201965515708e+02, 3.089309997558594e+02, 3.089418029601479e+02, 3.089526061644364e+02, 3.089634094600461e+02, 3.089742126645934e+02, 3.089849853515625e+02, 3.089957885561097e+02, 3.090065917601395e+02, 3.090173950562667e+02, 3.090281982605552e+02, 3.090390014648438e+02, 3.090498046691323e+02, 3.090606078734208e+02, 3.090714111690305e+02, 3.090822143735778e+02, 3.090929870605469e+02, 3.091037902650941e+02, 3.091145934691239e+02, 3.091253967652511e+02, 3.091361999695396e+02, 3.091470031738281e+02]
 sou_2.T=[2.931499938964844e+02, 2.931499938964844e+02]
 wheUseDefCur.port_a1.m_flow=[5e+00, 5e+00]
 wheUseDefCur.port_a2.m_flow=[5e+00, 5e+00]
 wheUseDefCur.uSpe=[6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 7.029999976159558e-01, 7.09750002384115e-01, 7.164999785423986e-01, 7.232499833110633e-01, 7.300000190734863e-01, 7.367499952317699e-01, 7.434999999999292e-01, 7.502499761582129e-01, 7.57000040531017e-01, 7.637500166893005e-01, 7.704999928475842e-01, 7.772499976157435e-01, 7.839999737740271e-01, 7.907500381468311e-01, 7.975000143051147e-01, 8.042499904633983e-01, 8.109999666216818e-01, 8.177500000007276e-01, 8.245000357626453e-01, 8.31250011920929e-01, 8.379999880792126e-01, 8.44749964237496e-01, 8.514999976165418e-01, 8.582500333784596e-01, 8.650000095367432e-01, 8.717499856950268e-01, 8.784999618533103e-01, 8.85249995232356e-01, 8.920000309942737e-01, 8.987500071525574e-01, 9.05499983310841e-01, 9.122499594691245e-01, 9.190000524518045e-01, 9.257500286100879e-01, 9.325000047683716e-01, 9.392499809266552e-01, 9.459999570849387e-01, 9.527500500676187e-01, 9.595000262259021e-01, 9.662500023841858e-01, 9.729999785424693e-01, 9.797499547007529e-01, 9.865000476834329e-01, 9.932500238417163e-01, 1e+00]
-wheUseDefCur.eps=[5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.623999742510077e-01, 5.677999899865652e-01, 5.731999828339694e-01, 5.785999985697795e-01, 5.839999914169312e-01, 5.893999842645881e-01, 5.947999999998929e-01, 6.001999928475498e-01, 6.056000085828546e-01, 6.110000014305115e-01, 6.163999942781684e-01, 6.218000100134732e-01, 6.272000028608774e-01, 6.326000185964349e-01, 6.380000114440918e-01, 6.434000042912433e-01, 6.48799997138395e-01, 6.542000357623584e-01, 6.596000286100152e-01, 6.650000214576721e-01, 6.704000143048238e-01, 6.758000071519753e-01, 6.812000457759387e-01, 6.866000386235956e-01, 6.919999718666077e-01, 6.973999647142646e-01, 7.027999575619214e-01, 7.081999961858848e-01, 7.135999890330363e-01, 7.18999981880188e-01, 7.243999747278449e-01, 7.297999675755017e-01, 7.352000061994651e-01, 7.405999990466167e-01, 7.459999918937683e-01, 7.513999847414252e-01, 7.56799977589082e-01, 7.622000162120349e-01, 7.676000090596917e-01, 7.730000019073486e-01, 7.783999947550054e-01, 7.837999876026623e-01, 7.892000262256152e-01, 7.94600019073272e-01, 8.00000011920929e-01]
-wheUseDefCur.P=[7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7e+01, 7.030000190733247e+01, 7.097499904633376e+01, 7.165000095366622e+01, 7.232499809266753e+01, 7.3e+01, 7.367500190733246e+01, 7.434999904633376e+01, 7.502500095366624e+01, 7.569999809266754e+01, 7.6375e+01, 7.705000190733247e+01, 7.772499904633378e+01, 7.840000095366624e+01, 7.907499809266753e+01, 7.975e+01, 8.042500190733246e+01, 8.10999961852704e+01, 8.17750038147296e+01, 8.244999809266753e+01, 8.3125e+01, 8.380000190733247e+01, 8.44749961852704e+01, 8.51500038147296e+01, 8.582499809266754e+01, 8.65e+01, 8.717500190733247e+01, 8.78499961852704e+01, 8.85250038147296e+01, 8.919999809266753e+01, 8.9875e+01, 9.055000190733247e+01, 9.12249961852704e+01, 9.19000038147296e+01, 9.257499809266753e+01, 9.325e+01, 9.392500190733247e+01, 9.45999961852704e+01, 9.52750038147296e+01, 9.594999809266753e+01, 9.6625e+01, 9.730000190733246e+01, 9.79749961852704e+01, 9.86500038147296e+01, 9.932499809266753e+01, 1e+02]
+wheUseDefCur.eps=[7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.760000228881836e-01, 7.762399902724929e-01, 7.767800097274926e-01, 7.773200268936011e-01, 7.778599867439561e-01, 7.784000039100647e-01, 7.789400210761733e-01, 7.794799809265283e-01, 7.800199980926368e-01, 7.805600175476365e-01, 7.810999751091003e-01, 7.81639992275209e-01, 7.821800117302087e-01, 7.827200288963172e-01, 7.832599887466721e-01, 7.838000059127808e-01, 7.843400230788894e-01, 7.848799806403531e-01, 7.85420002384244e-01, 7.859600195503526e-01, 7.864999771118164e-01, 7.87039994277925e-01, 7.875800114440336e-01, 7.881199735832797e-01, 7.886599907493882e-01, 7.892000079154968e-01, 7.897400250816055e-01, 7.902799826430692e-01, 7.908200043869601e-01, 7.913600215530686e-01, 7.918999791145325e-01, 7.924399962806411e-01, 7.929800134467496e-01, 7.935199755859957e-01, 7.940599927521043e-01, 7.946000099182129e-01, 7.951400270843215e-01, 7.956799846457853e-01, 7.962200063896762e-01, 7.967600235557847e-01, 7.972999811172485e-01, 7.978399982833572e-01, 7.983800154494657e-01, 7.989199775887118e-01, 7.994599947548203e-01, 8.00000011920929e-01]
+wheUseDefCur.P=[8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.175182342529297e+01, 8.197704992171833e+01, 8.248475690049486e+01, 8.299291949113903e+01, 8.350048914045828e+01, 8.400641632080078e+01, 8.45096198156387e+01, 8.500902599473282e+01, 8.550352436295755e+01, 8.599201284516981e+01, 8.647337341308594e+01, 8.694647900127786e+01, 8.741019478486139e+01, 8.786338005174248e+01, 8.83048942294606e+01, 8.873358917236328e+01, 8.915061880317118e+01, 8.956377271216392e+01, 8.997387070803565e+01, 9.038092872659404e+01, 9.078498077392578e+01, 9.118607262516923e+01, 9.158422716947811e+01, 9.197947826308696e+01, 9.237185735179051e+01, 9.276139068603516e+01, 9.314812404102395e+01, 9.353207267645139e+01, 9.391327795939716e+01, 9.429175631519453e+01, 9.466754150390625e+01, 9.504067167140548e+01, 9.541116207732203e+01, 9.577905397652438e+01, 9.614435639073191e+01, 9.650711822509766e+01, 9.686734710824003e+01, 9.722507355851326e+01, 9.758033872400725e+01, 9.793314421144471e+01, 9.828353118896484e+01, 9.863152254397511e+01, 9.897714116530588e+01, 9.932041284136484e+01, 9.966135464067887e+01, 1e+02]
 wheDefCur.P=[7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.683094024658203e+01, 7.707760526040832e+01, 7.76318745537873e+01, 7.818501234887661e+01, 7.873689363449135e+01, 7.928739929199219e+01, 7.983640196336229e+01, 8.038376663742224e+01, 8.092935134476362e+01, 8.147303101001151e+01, 8.20146484375e+01, 8.255407623541956e+01, 8.309114883051618e+01, 8.362572434020771e+01, 8.415764707824735e+01, 8.468675994873047e+01, 8.521113498221922e+01, 8.572463053687665e+01, 8.622763230105473e+01, 8.672117697536649e+01, 8.720632171630859e+01, 8.768415751960265e+01, 8.81557753858856e+01, 8.862228550857391e+01, 8.908480150116631e+01, 8.954447174072266e+01, 9.000243300107802e+01, 9.045984494541517e+01, 9.091787112408261e+01, 9.137769395857916e+01, 9.184049987792969e+01, 9.230747906334781e+01, 9.277985984017414e+01, 9.325886699608766e+01, 9.374574363222463e+01, 9.424174499511719e+01, 9.474816044972476e+01, 9.526628698354577e+01, 9.579747192256049e+01, 9.634306429519107e+01, 9.690444946289062e+01, 9.748306938025544e+01, 9.808039650755971e+01, 9.869793914910043e+01, 9.933726612195029e+01, 1e+02]

From 206d94f91ac49e47481b9b0a6bdc51b80941953b Mon Sep 17 00:00:00 2001
From: SenHuang19 <jhy1987@gmail.com>
Date: Mon, 17 Jun 2024 13:48:06 -0400
Subject: [PATCH 12/27] improve the model doc

---
 .../effectivenessParameters.mo                |  2 +-
 .../BaseClasses/Data/ASHRAE.mo                |  6 ++-
 .../BaseClasses/Data/Generic.mo               |  6 +--
 .../VariableSpeedThermalWheels/Latent.mo      |  4 +-
 .../VariableSpeedThermalWheels/Sensible.mo    |  7 ++-
 .../Validation/VariableSpeedThermalWheels.mo  | 45 ++++++++++++-------
 .../VariableSpeedThermalWheels/package.mo     |  4 +-
 .../ThermalWheels/Latent/BypassDampers.mo     | 37 +++++++--------
 .../ThermalWheels/Latent/SpeedControlled.mo   |  7 +--
 9 files changed, 69 insertions(+), 49 deletions(-)

diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/effectivenessParameters.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/effectivenessParameters.mo
index a759980147c..baea5714638 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/effectivenessParameters.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/effectivenessParameters.mo
@@ -8,7 +8,7 @@ record effectivenessParameters
     "correction of the heat exchange effectiveness under a geiven speed ratio";
   annotation (Documentation(info="<html>
 <p>
-Data record for performance data that describe wheel speed ratio versus
+Data record that describes wheel speed ratio versus
 heat exchange effectiveness corrections.
 The wheel speed ratio <code>uSpe</code> must be increasing, 
 i.e.,<code>uSpe[i] &lt; uSpe[i+1]</code>.
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/ASHRAE.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/ASHRAE.mo
index 1e564adb4e1..5f576ec7657 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/ASHRAE.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/ASHRAE.mo
@@ -21,8 +21,10 @@ Performance dataset for the variable-speed wheel model.
 </p>
 <p>
 It is developed based on Figure 7 in ASHRAE (2024).
-Note that nearest-neighbor extrapolations are used to make sure the dataset covers lower values 
-of speed ratio, i.e. <code> &lt;= 0.2</code>.
+However, the original data set was extrapolated to cover lower values 
+of speed ratio, i.e. <code> &lt;= 0.2</code>, by setting the heat exchange effectiveness 
+corrections to 0 when the speed ratio is 0.
+exchanger 
 </p>
 <h4>References</h4>
 <p>
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/Generic.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/Generic.mo
index 0d797d9a3a0..e09db647243 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/Generic.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/Generic.mo
@@ -51,13 +51,13 @@ First implementation.
 Record containing power and heat exchange parameters for wheels.
 </p>
 <p>
-It is used as a template for performance data
+It is used as a template of performance data
 for the variable-speed wheel models in
 <a href=\"modelica://Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels\">
 Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels</a>.
 </p>
 <p>
-The record contains four curves:
+The record contains four datasets:
 </p>
 <ul>
 <li>
@@ -85,7 +85,7 @@ Note that
 <ul>
 <li>
 When <code>haveLatentHeatExchange</code> is false,
-the curve of wheel speed ratio versus latent heat exchange effectiveness 
+the dataset of wheel speed ratio versus latent heat exchange effectiveness 
 corrections is disabled.
 </li>
 <li>
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Latent.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Latent.mo
index 41cf80ec4d6..8cee9026955 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Latent.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Latent.mo
@@ -29,7 +29,9 @@ Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Sensible</
 <p>
 The latent heat exchange effectiveness correction is calculated based 
 on the cubic hermite spline interpolation of the latent heat exchange 
-effectiveness correction curve in the performance dataset.
+effectiveness dataset (see 
+<a href="modelica://Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Characteristics.effectivenessParameters\">
+Buildings.Fluid.HeatExchangers.BaseClasses.BaseClasses.VariableSpeedThermalWheels.Characteristics.effectivenessParameters</a>).
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Sensible.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Sensible.mo
index 987d296ae51..25779888c58 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Sensible.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Sensible.mo
@@ -73,14 +73,17 @@ where <code>P_nominal</code> is the nominal wheel power consumption,
 The <code>eta</code> is the motor percent full-load efficiency, i.e.,
 the ratio of the motor efficiency to that when the <code>uSpe</code> is <i>1</i>.
 The <code>eta</code> is obtained based on the cubic hermite spline interpolation of
-the motor percent full-load efficiency dataset.
+the motor percent full-load efficiency dataset (see  
+<a href=\"modelica://Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Characteristics.efficiencyParameters_yMot\">
+Buildings.Fluid.HeatExchangers.BaseClasses.BaseClasses.VariableSpeedThermalWheels.Characteristics.efficiencyParameters_yMot</a>.).
 Please note that <code>uSpe/eta</code> should be less or equal to 1.
 </p>
 </li>
 <li>
 The sensible heat exchanger effectiveness correction is calculated based 
 on the cubic hermite spline interpolation of the sensible heat exchanger effectiveness 
-dataset.
+dataset (see  <a href=\"modelica://Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Characteristics.effectivenessParameters\">
+Buildings.Fluid.HeatExchangers.BaseClasses.BaseClasses.VariableSpeedThermalWheels.Characteristics.effectivenessParameters</a>).
 </li>
 </ul>
 </html>", revisions="<html>
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/VariableSpeedThermalWheels.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/VariableSpeedThermalWheels.mo
index 46e73f4c500..cee0cfe0e53 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/VariableSpeedThermalWheels.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/VariableSpeedThermalWheels.mo
@@ -17,27 +17,31 @@ model VariableSpeedThermalWheels
     duration=1,
     startTime=0,
     offset=0,
-    height=1) "Speed ratio"
+    height=1)
+    "Speed ratio"
     annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
-  Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Latent latWhe(per=
-        perLatWhe) "Enthalpy wheel"
+  Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Latent latWhe(
+    per=perLatWhe)
+    "Enthalpy wheel"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
-  Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Latent latWheDefMotCur(per=
-        perLatWheDefMotCur) "enthalpy wheel with default motor curve"
+  Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Latent latWheDefMotCur(
+    per=perLatWheDefMotCur)
+    "Enthalpy wheel with default motor curve"
     annotation (Placement(transformation(extent={{-10,-60},{10,-40}})));
-  BaseClasses.Data.ASHRAE perLatWhe(
+  Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.ASHRAE perLatWhe(
     motorEfficiency_uSpe(y={0.1,0.6,0.8,1}, eta={0.3,0.8,0.85,1}),
-      haveLatentHeatExchange=true,
-      useDefaultMotorEfficiencyCurve=false)
+    haveLatentHeatExchange=true,
+    useDefaultMotorEfficiencyCurve=false)
     "Performance record for the enthalpy wheet"
     annotation (Placement(transformation(extent={{-40,74},{-20,94}})));
-  BaseClasses.Data.ASHRAE perLatWheDefMotCur(haveLatentHeatExchange=true,
-      useDefaultMotorEfficiencyCurve=true)
-    "Performance record for the enthalpy wheet with default motor curve"
+  Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.ASHRAE perLatWheDefMotCur(
+    haveLatentHeatExchange=true,
+    useDefaultMotorEfficiencyCurve=true)
+    "Performance record for the enthalpy wheet with default motor dataset"
     annotation (Placement(transformation(extent={{0,74},{20,94}})));
 equation
   connect(uSpe.y, senWhe.uSpe)
-     annotation (Line(points={{-39,0},{-28,0},{-28,50},
+    annotation (Line(points={{-39,0},{-28,0},{-28,50},
           {-12,50}}, color={0,0,127}));
   connect(latWhe.uSpe, uSpe.y)
     annotation (Line(points={{-12,0},{-39,0}}, color={0,0,127}));
@@ -46,7 +50,7 @@ equation
           -50},{-28,0},{-39,0}}, color={0,0,127}));
   annotation (
     __Dymola_Commands(file=
-          "modelica://Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/VariableSpeedThermalWheels.mos"
+        "modelica://Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/VariableSpeedThermalWheels.mos"
         "Simulate and plot"),
     experiment(
       StopTime=1,
@@ -54,10 +58,10 @@ equation
     Documentation(info="<html>
 <p>
 Example for the model
-<a href=\"modelica://Buildings.Fluid.BaseClasses.VariableSpeedWheel.Sensible\">
-Buildings.Fluid.BaseClasses.VariableSpeedWheel.Sensible</a> and the model
-<a href=\"modelica://Buildings.Fluid.BaseClasses.VariableSpeedWheel.Latent\">
-Buildings.Fluid.BaseClasses.VariableSpeedWheel.latent</a>.
+<a href=\"modelica://Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Sensible\">
+Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Sensible</a> and the model
+<a href=\"modelica://Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Latent\">
+Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.latent</a>.
 </p>
 <p>
 The input signals are configured as follows:
@@ -81,5 +85,12 @@ The heat exchange effectiveness corrections increase by time
 and equal 1 when <code>uSpe=1</code>.
 </li>
 </ul>
+</html>", revisions="<html>
+<ul>
+<li>
+May 28, 2024, by Sen Huang:<br/>
+First implementation.
+</li>
+</ul>
 </html>"));
 end VariableSpeedThermalWheels;
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/package.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/package.mo
index 68c52e909e2..91c160335a0 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/package.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/package.mo
@@ -1,10 +1,10 @@
 within Buildings.Fluid.HeatExchangers.BaseClasses;
-package VariableSpeedThermalWheels "Models of variable-speed wheels"
+package VariableSpeedThermalWheels "Models of variable-speed thermal wheels"
   extends Modelica.Icons.BasesPackage;
 
 annotation (Documentation(info="<html>
 <p>
-This package contains models for representing the impacts of
+This package contains models for capturing the impacts of
 the wheel speed ratio on the power consumption and the heat
 exchange effectiveness of thermal wheels.
 </p>
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo
index aea35329f56..c73521e2717 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo
@@ -48,15 +48,14 @@ model BypassDampers
     "Exhaust air bypass damper"
     annotation (Placement(transformation(extent={{0,-70},{-20,-50}})));
   Buildings.Controls.OBC.CDL.Reals.Switch swiepsSen
-    "Switch the sensible heat exchanger effectiveness 
-    based the wheel operation status"
+    "Switch the sensible heat exchanger effectiveness based the wheel operation status"
     annotation (Placement(transformation(extent={{-40,150},{-20,170}})));
-  Buildings.Controls.OBC.CDL.Reals.Switch swiLat
-    "Switch the latent heat exchanger effectiveness 
-    based the wheel operation status"
+  Buildings.Controls.OBC.CDL.Reals.Switch swiepsLat
+    "Switch the latent heat exchanger effectiveness based the wheel operation status"
     annotation (Placement(transformation(extent={{-40,120},{-20,140}})));
 protected
-  Modelica.Blocks.Sources.Constant uni(final k=1)
+  Modelica.Blocks.Sources.Constant uni(
+    final k=1)
     "Unity signal"
     annotation (Placement(transformation(extent={{-140,110},{-120,130}})));
   Buildings.Controls.OBC.CDL.Reals.Subtract sub
@@ -64,10 +63,12 @@ protected
     annotation (Placement(transformation(extent={{-100,90},{-80,110}})));
   Modelica.Blocks.Math.BooleanToReal PEle(
     final realTrue=P_nominal,
-    final realFalse=0) "Electric power consumption for motor"
+    final realFalse=0)
+    "Electric power consumption for motor"
     annotation (Placement(transformation(extent={{-122,-110},{-102,-90}})));
 protected
-  Modelica.Blocks.Sources.Constant zero(final k=0) "Zero signal"
+  Modelica.Blocks.Sources.Constant zero(final k=0)
+    "Zero signal"
     annotation (Placement(transformation(extent={{-140,150},{-120,170}})));
 equation
   connect(sub.y, damSup.y)
@@ -112,25 +113,25 @@ equation
     annotation (Line(points={{-48,80},{-180,80}}, color={0,127,255}));
   connect(zero.y, swiepsSen.u3) annotation (Line(points={{-119,160},{-60,160},{-60,
           152},{-42,152}}, color={0,0,127}));
-  connect(swiLat.u3, zero.y) annotation (Line(points={{-42,122},{-60,122},{-60,160},
-          {-119,160}}, color={0,0,127}));
+  connect(swiepsLat.u3, zero.y) annotation (Line(points={{-42,122},{-60,122},{-60,
+          160},{-119,160}}, color={0,0,127}));
   connect(effCal.epsSen, swiepsSen.u1) annotation (Line(points={{-78,5},{-68,5},
           {-68,168},{-42,168}}, color={0,0,127}));
-  connect(effCal.epsLat, swiLat.u1) annotation (Line(points={{-78,-5},{-64,-5},{
-          -64,138},{-42,138}}, color={0,0,127}));
+  connect(effCal.epsLat, swiepsLat.u1) annotation (Line(points={{-78,-5},{-64,-5},
+          {-64,138},{-42,138}}, color={0,0,127}));
   connect(swiepsSen.u2, uRot) annotation (Line(points={{-42,160},{-52,160},{-52,
           176},{-168,176},{-168,0},{-200,0}}, color={255,0,255}));
-  connect(swiLat.u2, uRot) annotation (Line(points={{-42,130},{-52,130},{-52,176},
-          {-168,176},{-168,0},{-200,0}}, color={255,0,255}));
+  connect(swiepsLat.u2, uRot) annotation (Line(points={{-42,130},{-52,130},{-52,
+          176},{-168,176},{-168,0},{-200,0}}, color={255,0,255}));
   connect(swiepsSen.y, hex.epsSen) annotation (Line(points={{-18,160},{-6,160},{
           -6,3},{8,3}}, color={0,0,127}));
-  connect(swiLat.y, hex.epsLat) annotation (Line(points={{-18,130},{-10,130},{-10,
-          -3},{8,-3}}, color={0,0,127}));
+  connect(swiepsLat.y, hex.epsLat) annotation (Line(points={{-18,130},{-10,130},
+          {-10,-3},{8,-3}}, color={0,0,127}));
   connect(swiepsSen.y, epsSen) annotation (Line(points={{-18,160},{38,160},{38,
           40},{120,40}},
                      color={0,0,127}));
-  connect(swiLat.y, epsLat) annotation (Line(points={{-18,130},{88,130},{88,0},
-          {120,0}},   color={0,0,127}));
+  connect(swiepsLat.y, epsLat) annotation (Line(points={{-18,130},{88,130},{88,0},
+          {120,0}}, color={0,0,127}));
   connect(PEle.u, uRot) annotation (Line(points={{-124,-100},{-172,-100},{-172,0},
           {-200,0}}, color={255,0,255}));
 annotation (
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/SpeedControlled.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/SpeedControlled.mo
index 7a4c2e4aff3..3b560c36cd9 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/SpeedControlled.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/SpeedControlled.mo
@@ -5,7 +5,8 @@ model SpeedControlled
     Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BaseClasses.PartialWheel;
   parameter
     Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.Generic
-    per "Record with performance data"
+    per
+    "Record with performance data"
     annotation (Placement(transformation(extent={{60,120},{80,140}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput uSpe(
     final unit="1",
@@ -45,8 +46,8 @@ equation
   connect(mul.y, epsSen) annotation (Line(points={{-38,140},{20,140},{20,40},{
           120,40}},
                 color={0,0,127}));
-  connect(mul1.y, epsLat) annotation (Line(points={{-38,100},{-10,100},{-10,0},
-          {120,0}},   color={0,0,127}));
+  connect(mul1.y, epsLat) annotation (Line(points={{-38,100},{90,100},{90,0},{
+          120,0}},    color={0,0,127}));
   connect(latWhe.P, P) annotation (Line(points={{-98,128},{-88,128},{-88,40},{
           -46,40},{-46,-40},{120,-40}},
                                     color={0,0,127}));

From c63596a5a4e85b0922fc2081cdcb46bf6a83ef57 Mon Sep 17 00:00:00 2001
From: SenHuang19 <jhy1987@gmail.com>
Date: Thu, 20 Jun 2024 12:23:59 -0400
Subject: [PATCH 13/27] model doc improve and typo fix

---
 .../effectivenessParameters.mo                |  2 +-
 .../BaseClasses/Data/ASHRAE.mo                |  1 -
 .../BaseClasses/Data/Generic.mo               |  2 +-
 .../VariableSpeedThermalWheels/Latent.mo      | 13 ++---
 .../VariableSpeedThermalWheels/Sensible.mo    |  2 +-
 .../Validation/VariableSpeedThermalWheels.mo  |  6 +-
 .../VariableSpeedThermalWheels/package.order  |  2 +-
 .../Latent/BaseClasses/PartialWheel.mo        |  2 +-
 .../ThermalWheels/Latent/BypassDampers.mo     |  4 +-
 .../Latent/Examples/SpaceCooling.mo           | 16 ++---
 .../Latent/Validation/SpeedControlled.mo      |  4 +-
 .../Sensible/BaseClasses/PartialWheel.mo      | 29 ++++++----
 .../ThermalWheels/Sensible/BypassDampers.mo   | 58 +++++++++----------
 .../Sensible/Examples/SpaceCooling.mo         | 16 ++---
 .../ThermalWheels/Sensible/SpeedControlled.mo | 29 +++++-----
 .../Sensible/Validation/BypassDampers.mo      | 24 ++++----
 .../Sensible/Validation/SpeedControlled.mo    |  4 +-
 17 files changed, 107 insertions(+), 107 deletions(-)

diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/effectivenessParameters.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/effectivenessParameters.mo
index baea5714638..a08ca8ef16b 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/effectivenessParameters.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/effectivenessParameters.mo
@@ -5,7 +5,7 @@ record effectivenessParameters
   parameter Real uSpe[:](each min=0)
     "Wheel speed ratio";
   parameter Real epsCor[:]
-    "correction of the heat exchange effectiveness under a geiven speed ratio";
+    "correction of the heat exchange effectiveness under a given speed ratio";
   annotation (Documentation(info="<html>
 <p>
 Data record that describes wheel speed ratio versus
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/ASHRAE.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/ASHRAE.mo
index 5f576ec7657..78b00b00bdb 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/ASHRAE.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/ASHRAE.mo
@@ -24,7 +24,6 @@ It is developed based on Figure 7 in ASHRAE (2024).
 However, the original data set was extrapolated to cover lower values 
 of speed ratio, i.e. <code> &lt;= 0.2</code>, by setting the heat exchange effectiveness 
 corrections to 0 when the speed ratio is 0.
-exchanger 
 </p>
 <h4>References</h4>
 <p>
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/Generic.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/Generic.mo
index e09db647243..b38a831b3c8 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/Generic.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/Generic.mo
@@ -66,7 +66,7 @@ efficiency
 </li>
 <li>
 wheel speed ratio versus default motor percent full-load 
-efficiency (see the definition in <a href=
+efficiency (see <a href=
 \"modelica://Buildings.Fluid.Movers.BaseClasses.Characteristics.motorEfficiencyCurve\">
 Buildings.Fluid.Movers.BaseClasses.Characteristics.motorEfficiencyCurve</a>.)
 </li>
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Latent.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Latent.mo
index 8cee9026955..cea782d7bf6 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Latent.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Latent.mo
@@ -30,15 +30,10 @@ Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Sensible</
 The latent heat exchange effectiveness correction is calculated based 
 on the cubic hermite spline interpolation of the latent heat exchange 
 effectiveness dataset (see 
-<a href="modelica://Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Characteristics.effectivenessParameters\">
+<a href=\"modelica://Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Characteristics.effectivenessParameters\">
 Buildings.Fluid.HeatExchangers.BaseClasses.BaseClasses.VariableSpeedThermalWheels.Characteristics.effectivenessParameters</a>).
 </p>
-</html>", revisions="<html>
-<ul>
-<li>
-May 28, 2024, by Sen Huang:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
+</html>")
+       ", revisions=",
+    Error);
 end Latent;
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Sensible.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Sensible.mo
index 25779888c58..61446a2ed08 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Sensible.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Sensible.mo
@@ -82,7 +82,7 @@ Please note that <code>uSpe/eta</code> should be less or equal to 1.
 <li>
 The sensible heat exchanger effectiveness correction is calculated based 
 on the cubic hermite spline interpolation of the sensible heat exchanger effectiveness 
-dataset (see  <a href=\"modelica://Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Characteristics.effectivenessParameters\">
+dataset (see <a href=\"modelica://Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Characteristics.effectivenessParameters\">
 Buildings.Fluid.HeatExchangers.BaseClasses.BaseClasses.VariableSpeedThermalWheels.Characteristics.effectivenessParameters</a>).
 </li>
 </ul>
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/VariableSpeedThermalWheels.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/VariableSpeedThermalWheels.mo
index cee0cfe0e53..b473f2025b4 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/VariableSpeedThermalWheels.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/VariableSpeedThermalWheels.mo
@@ -11,7 +11,7 @@ model VariableSpeedThermalWheels
     motorEfficiency_uSpe(y={0.1,0.6,0.8,1}, eta={0.3,0.8,0.85,1}),
     haveLatentHeatExchange=false,
     useDefaultMotorEfficiencyCurve=false)
-    "Performance record for the sensible heat wheet"
+    "Performance record for the sensible heat wheel"
     annotation (Placement(transformation(extent={{-80,74},{-60,94}})));
   Modelica.Blocks.Sources.Ramp uSpe(
     duration=1,
@@ -32,12 +32,12 @@ model VariableSpeedThermalWheels
     motorEfficiency_uSpe(y={0.1,0.6,0.8,1}, eta={0.3,0.8,0.85,1}),
     haveLatentHeatExchange=true,
     useDefaultMotorEfficiencyCurve=false)
-    "Performance record for the enthalpy wheet"
+    "Performance record for the enthalpy wheel"
     annotation (Placement(transformation(extent={{-40,74},{-20,94}})));
   Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.ASHRAE perLatWheDefMotCur(
     haveLatentHeatExchange=true,
     useDefaultMotorEfficiencyCurve=true)
-    "Performance record for the enthalpy wheet with default motor dataset"
+    "Performance record for the enthalpy wheel with default motor dataset"
     annotation (Placement(transformation(extent={{0,74},{20,94}})));
 equation
   connect(uSpe.y, senWhe.uSpe)
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/package.order b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/package.order
index af108c1a1c3..4e09a41bf7e 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/package.order
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/package.order
@@ -1,4 +1,4 @@
-Sensible
 Latent
+Sensible
 BaseClasses
 Validation
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/PartialWheel.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/PartialWheel.mo
index 5c827e49155..dd7e4bb72bc 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/PartialWheel.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/PartialWheel.mo
@@ -95,7 +95,7 @@ protected
     final epsSenHeaPL=epsSenHeaPL,
     final epsLatHeaPL=epsLatHeaPL,
     final mSup_flow_nominal=mSup_flow_nominal)
-    "Calculates the effectiveness of heat exchange"
+    "Calculate the effectiveness of heat exchanger"
     annotation (Placement(transformation(extent={{-100,-10},{-80,10}})));
   Buildings.Fluid.HeatExchangers.ThermalWheels.Latent.BaseClasses.HeatExchangerWithInputEffectiveness hex(
     redeclare package Medium1 = Medium,
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo
index c73521e2717..b8938b9c08b 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo
@@ -48,10 +48,10 @@ model BypassDampers
     "Exhaust air bypass damper"
     annotation (Placement(transformation(extent={{0,-70},{-20,-50}})));
   Buildings.Controls.OBC.CDL.Reals.Switch swiepsSen
-    "Switch the sensible heat exchanger effectiveness based the wheel operation status"
+    "Switch the sensible heat exchanger effectiveness based on the wheel operation status"
     annotation (Placement(transformation(extent={{-40,150},{-20,170}})));
   Buildings.Controls.OBC.CDL.Reals.Switch swiepsLat
-    "Switch the latent heat exchanger effectiveness based the wheel operation status"
+    "Switch the latent heat exchanger effectiveness based on the wheel operation status"
     annotation (Placement(transformation(extent={{-40,120},{-20,140}})));
 protected
   Modelica.Blocks.Sources.Constant uni(
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mo
index 3a49758a3c7..7dff98a7795 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mo
@@ -28,7 +28,7 @@ model SpaceCooling "Space cooling system"
     "Nominal air humidity ratio supplied to room [kg/kg] assuming 90% relative humidity";
   parameter Modelica.Units.SI.Temperature TRooSet=297.15
     "Nominal room air temperature";
-  parameter Modelica.Units.SI.Temperature TMixSet=297.15
+  parameter Modelica.Units.SI.Temperature TMixSet=298.15
     "Nominal mixed air temperature";
   parameter Modelica.Units.SI.Temperature TOut_nominal=303.15
     "Design outlet air temperature";
@@ -282,11 +282,15 @@ The major input signals for the heat recovery device are configured as follows:
 <ul>
 <li>
 The operating signal <i>uRot</i> changes from <code>false</code> to <code>true</code> at 6:00 (15552000+6*3600 seconds)
-and from <code>false</code> to <code>true</code> at 18:00 (15552000+18*3600 seconds).
+and from <code>true</code> to <code>false</code> at 18:00 (15552000+18*3600 seconds).
+</li>
+<li>
+The supply air flow rate <i>mAir_flow</i> changes from <i>0</i> to <i>0.646</i> at around 5:00
+and from <i>0.646</i> to <i>0</i> at around 17:00.
 </li>
 <li>
 The bypass damper positions are controlled to maintain the temperature of the air leaving the thermal wheel, 
-<code>senTemHXOut.T</code>, at 297.15 K.
+<code>senTemHXOut.T</code>, at 298.15 K.
 </li>
 </ul>
 <p>
@@ -294,11 +298,7 @@ The expected outputs are:
 </p>
 <ul>
 <li>
-The outdoor temperature, <code>TOut.T</code>, and <code>senTemHXOut.T</code>
-are different during the period from 6:00 to 18:00.
-</li>
-<li>
-During the same period, <code>senTemHXOut.T</code> is close to 297.15 K.
+<code>senTemHXOut.T</code> is less or equal to 298.15 K.
 </li>
 </ul>
 </html>", revisions="<html>
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mo
index 5f3d0dcec08..9a67d5c8f02 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mo
@@ -88,12 +88,12 @@ model SpeedControlled
     motorEfficiency_uSpe(y={0.1,0.6,0.8,1}, eta={0.3,0.8,0.9,1}),
     haveLatentHeatExchange=true,
     useDefaultMotorEfficiencyCurve=false)
-    "Performance record for the enthalpy wheet"
+    "Performance record for the enthalpy wheel"
     annotation (Placement(transformation(extent={{-60,60},{-40,80}})));
   Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.ASHRAE
     perLatWheDefMotCur(haveLatentHeatExchange=true,
     useDefaultMotorEfficiencyCurve=true)
-    "Performance record for the enthalpy wheet with default motor curve"
+    "Performance record for the enthalpy wheel with default motor curve"
     annotation (Placement(transformation(extent={{-20,60},{0,80}})));
 equation
   connect(TSup.y, sou_1.T_in)
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/PartialWheel.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/PartialWheel.mo
index d5236f4def9..e1823150fc3 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/PartialWheel.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/PartialWheel.mo
@@ -73,11 +73,11 @@ partial model PartialWheel
   Buildings.Fluid.Sensors.MassFlowRate senSupMasFlo(
     redeclare package Medium = Medium)
     "Supply air mass flow rate"
-    annotation (Placement(transformation(extent={{32,-4},{52,16}})));
+    annotation (Placement(transformation(extent={{30,10},{50,30}})));
   Buildings.Fluid.Sensors.MassFlowRate senExhMasFlo(
      redeclare package Medium = Medium)
     "Exhaust air mass flow rate"
-    annotation (Placement(transformation(extent={{-70,-44},{-90,-24}})));
+    annotation (Placement(transformation(extent={{-70,-50},{-90,-30}})));
 protected
   parameter Medium.ThermodynamicState sta_nominal=Medium.setState_pTX(
       T=Buildings.Utilities.Psychrometrics.Constants.T_ref,
@@ -91,7 +91,7 @@ protected
     final epsHea_nominal=epsHea_nominal,
     final epsHeaPL=epsHeaPL,
     final mSup_flow_nominal=mSup_flow_nominal)
-    "Calculates the effectiveness of heat exchange"
+    "Calculate the effectiveness of heat exchanger"
     annotation (Placement(transformation(extent={{-100,-10},{-80,10}})));
   Modelica.Blocks.Sources.RealExpression TSup(
     final y(final unit="K")=Medium.temperature(
@@ -108,27 +108,32 @@ protected
         h=inStream(port_a2.h_outflow),
         X=inStream(port_a2.Xi_outflow))))
     "Exhaust air temperature"
-    annotation (Placement(transformation(extent={{-160,-50},{-140,-30}})));
+    annotation (Placement(transformation(extent={{-160,-70},{-140,-50}})));
 
 equation
   connect(TSup.y, effCal.TSup)
-    annotation (Line(points={{-139,60},{-110,60},{-110,-4},{-102,-4}},
+    annotation (Line(points={{-139,60},{-120,60},{-120,-4},{-102,-4}},
     color={0,0,127}));
   connect(TExh.y, effCal.TExh)
-    annotation (Line(points={{-139,-40},{-110,-40},{-110,-8},{-102,-8}},
+    annotation (Line(points={{-139,-60},{-120,-60},{-120,-8},{-102,-8}},
     color={0,0,127}));
   connect(senExhMasFlo.port_b, port_b2)
-    annotation (Line(points={{-90,-34},{-108,-34},{-108,-80},{-180,-80}},
+    annotation (Line(points={{-90,-40},{-108,-40},{-108,-80},{-180,-80}},
     color={0,127,255}));
-  connect(senExhMasFlo.port_a, hex.port_b2) annotation (Line(points={{-70,-34},{-16,-34},{-16,-6},{-10,-6}},
+  connect(senExhMasFlo.port_a, hex.port_b2) annotation (Line(points={{-70,-40},{
+          -16,-40},{-16,-6},{-10,-6}},
     color={0,127,255}));
   connect(hex.port_b1, senSupMasFlo.port_a)
-    annotation (Line(points={{10,6},{32,6}}, color={0,127,255}));
-  connect(senSupMasFlo.port_b, port_b1) annotation (Line(points={{52,6},{60,6},{60,80},{100,80}},
+    annotation (Line(points={{10,6},{20,6},{20,20},{30,20}},
+                                             color={0,127,255}));
+  connect(senSupMasFlo.port_b, port_b1) annotation (Line(points={{50,20},{60,20},
+          {60,80},{100,80}},
     color={0,127,255}));
-  connect(senExhMasFlo.m_flow, effCal.mExh_flow) annotation (Line(points={{-80,-23},{-80,-16},{-106,-16},{-106,4},{-102,4}},
+  connect(senExhMasFlo.m_flow, effCal.mExh_flow) annotation (Line(points={{-80,-29},
+          {-80,-20},{-130,-20},{-130,4},{-102,4}},
     color={0,0,127}));
-  connect(senSupMasFlo.m_flow, effCal.mSup_flow) annotation (Line(points={{42,17},{42,26},{-106,26},{-106,8},{-102,8}},
+  connect(senSupMasFlo.m_flow, effCal.mSup_flow) annotation (Line(points={{40,31},
+          {40,40},{-130,40},{-130,8},{-102,8}},
     color={0,0,127}));
 annotation (
         defaultComponentName="whe",
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo
index 46d92825586..a860654a639 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo
@@ -32,7 +32,7 @@ model BypassDampers
     final dpDamper_nominal=dpDamper_nominal)
     "Supply air damper"
     annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},rotation=0,origin={-50,40})));
+        extent={{-10,-10},{10,10}},rotation=0,origin={-48,20})));
   Buildings.Fluid.Actuators.Dampers.Exponential damExh(
     redeclare package Medium = Medium,
     final m_flow_nominal=mExh_flow_nominal,
@@ -45,11 +45,10 @@ model BypassDampers
     final m_flow_nominal=mExh_flow_nominal,
     final dpDamper_nominal=dpDamper_nominal)
     "Exhaust air bypass damper"
-    annotation (Placement(transformation(extent={{0,-70},{-20,-50}})));
+    annotation (Placement(transformation(extent={{0,-90},{-20,-70}})));
   Buildings.Controls.OBC.CDL.Reals.Switch swiepsSen
-    "Switch the heat exchanger effectiveness 
-    based the wheel operation status"
-    annotation (Placement(transformation(extent={{-52,-22},{-32,-2}})));
+    "Switch the heat exchanger effectiveness based on the wheel operation status"
+    annotation (Placement(transformation(extent={{-60,180},{-40,200}})));
 protected
   Modelica.Blocks.Sources.Constant uni(final k=1)
     "Unity signal"
@@ -61,31 +60,30 @@ protected
     final realTrue=P_nominal,
     final realFalse=0)
     "Electric power consumption for motor"
-    annotation (Placement(transformation(extent={{-160,-110},{-140,-90}})));
+    annotation (Placement(transformation(extent={{-60,150},{-40,170}})));
 protected
   Modelica.Blocks.Sources.Constant zero(final k=0) "Zero signal"
-    annotation (Placement(transformation(extent={{-160,22},{-140,42}})));
+    annotation (Placement(transformation(extent={{-160,-40},{-140,-20}})));
 equation
   connect(bypDamSup.port_a, port_a1)
     annotation (Line(points={{-60,80},{-180,80}}, color={0,127,255}));
   connect(bypDamSup.port_b, port_b1)
     annotation (Line(points={{-40,80},{100,80}}, color={0,127,255}));
   connect(bypDamExh.port_a, port_a2)
-    annotation (Line(points={{0,-60},{50,-60},{50,-80},{100,-80}},
-                                                  color={0,127,255}));
+    annotation (Line(points={{0,-80},{100,-80}},  color={0,127,255}));
   connect(damExh.port_a, port_a2)
     annotation (Line(points={{50,-50},{50,-80},{100,-80}}, color={0,127,255}));
   connect(sub.y, damSup.y)
-    annotation (Line(points={{-78,100},{20,100},{20,60},{-50,60},{-50,52}}, color={0,0,127}));
+    annotation (Line(points={{-78,100},{20,100},{20,60},{-48,60},{-48,32}}, color={0,0,127}));
   connect(damExh.y,sub. y)
     annotation (Line(points={{38,-40},{20,-40},{20,100},{-78,100}}, color={0,0,127}));
   connect(bypDamSup.y, uBypDamPos)
     annotation (Line(points={{-50,92},{-50,140},{-202,140}}, color={0,0,127}));
   connect(damSup.port_b, hex.port_a1)
-    annotation (Line(points={{-40,40},{-20,40},{-20,6},{-10,6}},
+    annotation (Line(points={{-38,20},{-16,20},{-16,6},{-10,6}},
     color={0,127,255}));
   connect(bypDamExh.y, uBypDamPos)
-    annotation (Line(points={{-10,-48},{-10,-30},{12,-30},{12,140},{-202,140}},
+    annotation (Line(points={{-10,-68},{-10,-60},{-20,-60},{-20,140},{-202,140}},
     color={0,0,127}));
   connect(hex.port_a2, damExh.port_b)
     annotation (Line(points={{10,-6},{16,-6},{16,-16},{50,-16},{50,-30}},
@@ -97,28 +95,26 @@ equation
     annotation (Line(points={{-119,120},{-110,120},{-110,106},{-102,106}},
     color={0,0,127}));
   connect(damSup.port_a, port_a1)
-    annotation (Line(points={{-60,40},{-100,40},{-100,80},{-180,80}},
+    annotation (Line(points={{-58,20},{-166,20},{-166,80},{-180,80}},
     color={0,127,255}));
-  connect(uRot, PEle.u) annotation (Line(points={{-200,0},{-132,0},{-132,-84},{-164,
-          -84},{-164,-94},{-168,-94},{-168,-100},{-162,-100}},
-    color={255,0,255}));
-  connect(PEle.y, P) annotation (Line(points={{-139,-100},{82,-100},{82,-40},{120,
-          -40}},
+  connect(PEle.y, P) annotation (Line(points={{-39,160},{70,160},{70,-40},{120,-40}},
     color={0,0,127}));
   connect(bypDamExh.port_b, port_b2)
-    annotation (Line(points={{-20,-60},{-100,-60},{-100,-80},{-180,-80}},
-                                                    color={0,127,255}));
-  connect(swiepsSen.u2, uRot) annotation (Line(points={{-54,-12},{-60,-12},{-60,
-          -54},{-132,-54},{-132,0},{-200,0}}, color={255,0,255}));
-  connect(zero.y, swiepsSen.u3) annotation (Line(points={{-139,32},{-124,32},{-124,
-          -20},{-54,-20}}, color={0,0,127}));
-  connect(effCal.eps, swiepsSen.u1) annotation (Line(points={{-78,0},{-60,0},{-60,
-          -4},{-54,-4}}, color={0,0,127}));
-  connect(swiepsSen.y, hex.eps) annotation (Line(points={{-30,-12},{-20,-12},{-20,
+    annotation (Line(points={{-20,-80},{-180,-80}}, color={0,127,255}));
+  connect(zero.y, swiepsSen.u3) annotation (Line(points={{-139,-30},{-116,-30},{
+          -116,82},{-68,82},{-68,182},{-62,182}},
+                           color={0,0,127}));
+  connect(effCal.eps, swiepsSen.u1) annotation (Line(points={{-78,0},{-74,0},{-74,
+          198},{-62,198}},
+                         color={0,0,127}));
+  connect(swiepsSen.y, hex.eps) annotation (Line(points={{-38,190},{-32,190},{-32,
           0},{-12,0}}, color={0,0,127}));
-  connect(swiepsSen.y, eps) annotation (Line(points={{-30,-12},{-20,-12},{-20,-20},
-          {80,-20},{80,40},{120,40}},
-                                    color={0,0,127}));
+  connect(swiepsSen.y, eps) annotation (Line(points={{-38,190},{80,190},{80,40},
+          {120,40}},                color={0,0,127}));
+  connect(uRot, swiepsSen.u2) annotation (Line(points={{-200,0},{-170,0},{-170,190},
+          {-62,190}}, color={255,0,255}));
+  connect(PEle.u, uRot) annotation (Line(points={{-62,160},{-120,160},{-120,190},
+          {-170,190},{-170,0},{-200,0}}, color={255,0,255}));
 annotation (
         defaultComponentName="whe",
         Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
@@ -173,7 +169,7 @@ annotation (
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid)}),
           Diagram(
-        coordinateSystem(preserveAspectRatio=true, extent={{-180,-120},{100,180}})),
+        coordinateSystem(preserveAspectRatio=true, extent={{-180,-120},{100,220}})),
 Documentation(info="<html>
 <p>
 Model of a sensible heat recovery wheel, which consists of
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo
index d0e9c8c45b9..69832fa285f 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo
@@ -28,7 +28,7 @@ model SpaceCooling "Space cooling system"
     "Nominal air humidity ratio supplied to room [kg/kg] assuming 90% relative humidity";
   parameter Modelica.Units.SI.Temperature TRooSet=297.15
     "Nominal room air temperature";
-  parameter Modelica.Units.SI.Temperature TMixSet=297.15
+  parameter Modelica.Units.SI.Temperature TMixSet=298.15
     "Nominal mixed air temperature";
   parameter Modelica.Units.SI.Temperature TOut_nominal=303.15
     "Design outlet air temperature";
@@ -278,11 +278,15 @@ The major input signals for the heat recovery device are configured as follows:
 <ul>
 <li>
 The operating signal <i>uRot</i> changes from <code>false</code> to <code>true</code> at 6:00 (15552000+6*3600 seconds)
-and from <code>false</code> to <code>true</code> at 18:00 (15552000+18*3600 seconds).
+and from <code>true</code> to <code>false</code> at 18:00 (15552000+18*3600 seconds).
+</li>
+<li>
+The supply air flow rate <i>mAir_flow</i> changes from <i>0</i> to <i>0.646</i> at around 5:00
+and from <i>0.646</i> to <i>0</i> at around 17:00.
 </li>
 <li>
 The bypass damper positions are controlled to maintain the temperature of the air leaving the thermal wheel, 
-<code>senTemHXOut.T</code>, at 297.15 K.
+<code>senTemHXOut.T</code>, at 298.15 K.
 </li>
 </ul>
 <p>
@@ -290,11 +294,7 @@ The expected outputs are:
 </p>
 <ul>
 <li>
-The outdoor temperature, <code>TOut.T</code>, and <code>senTemHXOut.T</code>
-are different during the period from 6:00 to 18:00.
-</li>
-<li>
-During the same period, <code>senTemHXOut.T</code> is close to 297.15 K.
+<code>senTemHXOut.T</code> is less or equal to 298.15 K.
 </li>
 </ul>
 </html>", revisions="<html>
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/SpeedControlled.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/SpeedControlled.mo
index 2c39916c860..f489865cd50 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/SpeedControlled.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/SpeedControlled.mo
@@ -16,10 +16,10 @@ model SpeedControlled
   Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Sensible
     senWhe(final per=per)
     "Correct the wheel performance based on the wheel speed"
-    annotation (Placement(transformation(extent={{-140,-90},{-120,-70}})));
+    annotation (Placement(transformation(extent={{-160,-10},{-140,10}})));
   Buildings.Controls.OBC.CDL.Reals.Multiply mul
     "Correct the heat exchanger effectiveness"
-    annotation (Placement(transformation(extent={{-54,-24},{-34,-4}})));
+    annotation (Placement(transformation(extent={{-52,-20},{-32,0}})));
 
 
 equation
@@ -28,18 +28,19 @@ equation
   connect(hex.port_a2, port_a2) annotation (Line(points={{10,-6},{60,-6},{60,
           -80},{100,-80}},
                 color={0,127,255}));
-  connect(senWhe.epsSenCor, mul.u2) annotation (Line(points={{-118,-80},{-64,-80},
-          {-64,-20},{-56,-20}}, color={0,0,127}));
-  connect(effCal.eps, mul.u1) annotation (Line(points={{-78,0},{-64,0},{-64,-8},
-          {-56,-8}}, color={0,0,127}));
-  connect(mul.y, hex.eps) annotation (Line(points={{-32,-14},{-20,-14},{-20,0},{
-          -12,0}}, color={0,0,127}));
-  connect(uSpe, senWhe.uSpe) annotation (Line(points={{-200,0},{-170,0},{-170,-80},
-          {-142,-80}}, color={0,0,127}));
-  connect(senWhe.P, P) annotation (Line(points={{-118,-72},{40,-72},{40,-40},{
-          120,-40}}, color={0,0,127}));
-  connect(eps, mul.y) annotation (Line(points={{120,40},{80,40},{80,-14},{-32,
-          -14}},
+  connect(senWhe.epsSenCor, mul.u2) annotation (Line(points={{-138,0},{-114,0},
+          {-114,-16},{-54,-16}},color={0,0,127}));
+  connect(effCal.eps, mul.u1) annotation (Line(points={{-78,0},{-62,0},{-62,-4},
+          {-54,-4}}, color={0,0,127}));
+  connect(mul.y, hex.eps) annotation (Line(points={{-30,-10},{-26,-10},{-26,0},
+          {-12,0}},color={0,0,127}));
+  connect(uSpe, senWhe.uSpe) annotation (Line(points={{-200,0},{-162,0}},
+                       color={0,0,127}));
+  connect(senWhe.P, P) annotation (Line(points={{-138,8},{-134,8},{-134,68},{88,
+          68},{88,-40},{120,-40}},
+                     color={0,0,127}));
+  connect(eps, mul.y) annotation (Line(points={{120,40},{80,40},{80,-20},{-26,
+          -20},{-26,-10},{-30,-10}},
         color={0,0,127}));
 annotation (
         defaultComponentName="whe",
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/BypassDampers.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/BypassDampers.mo
index d456411dff7..79da1c1c8ee 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/BypassDampers.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/BypassDampers.mo
@@ -76,22 +76,26 @@ equation
   connect(TSup.y, sou_1.T_in)
     annotation (Line(points={{-59,40},{-42,40}}, color={0,0,127}));
   connect(sou_1.ports[1],whe.port_a1)
-    annotation (Line(points={{-20,36},{-14,36},{-14,6},{0,6}},
+    annotation (Line(points={{-20,36},{-14,36},{-14,8},{0,8}},
     color={0,127,255}));
   connect(whe.port_a2, sou_2.ports[1])
-    annotation (Line(points={{20,-6},{40,-6},{40,-30},{70,-30}}, color={0,127,255}));
-  connect(bypDamPos.y, whe.uBypDamPos) annotation (Line(points={{-59,0},{-2,0}},
+    annotation (Line(points={{20,-8},{40,-8},{40,-30},{70,-30}}, color={0,127,255}));
+  connect(bypDamPos.y, whe.uBypDamPos) annotation (Line(points={{-59,0},{-30,0},
+          {-30,4},{-2,4}},
     color={0,0,127}));
-  connect(opeSig.y, whe.uRot) annotation (Line(points={{-58,70},{-10,70},{-10,8},
-    {-2,8}}, color={255,0,255}));
-  connect(whe.port_b2, senExhTem.port_a) annotation (Line(points={{0,-6},{-20,-6},
-    {-20,-34},{-30,-34}}, color={0,127,255}));
+  connect(opeSig.y, whe.uRot) annotation (Line(points={{-58,70},{-10,70},{-10,
+          -4.2},{-2,-4.2}},
+             color={255,0,255}));
+  connect(whe.port_b2, senExhTem.port_a) annotation (Line(points={{0,-7.8},{-20,
+          -7.8},{-20,-34},{-30,-34}},
+                          color={0,127,255}));
   connect(senExhTem.port_b, sin_2.ports[1])
     annotation (Line(points={{-50,-34},{-60,-34}}, color={0,127,255}));
   connect(senSupTem.port_a, sin_1.ports[1])
     annotation (Line(points={{60,30},{70,30}}, color={0,127,255}));
-  connect(senSupTem.port_b, whe.port_b1) annotation (Line(points={{40,30},{30,30},
-    {30,6},{20,6}}, color={0,127,255}));
+  connect(senSupTem.port_b, whe.port_b1) annotation (Line(points={{40,30},{30,
+          30},{30,7.8},{20,7.8}},
+                    color={0,127,255}));
 annotation(experiment(Tolerance=1e-6, StopTime=360),
 __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/BypassDampers.mos"
         "Simulate and plot"),
@@ -128,7 +132,7 @@ The expected outputs are:
 <li>
 The sensible heat exchanger effectiveness <code>eps</code> is 0 at the beginning.
 They become positive at 72 seconds and keep constant until 200 seconds.
-After the 200 seconds, it decrease.
+After the 200 seconds, it decreases.
 </li>
 <li>
 Before 72 seconds, the temperature of the leaving supply air is equal to <i>TSup</i>.
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mo
index 40e98bbb460..fcafac3c3a0 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mo
@@ -78,11 +78,11 @@ model SpeedControlled
     motorEfficiency_uSpe(y={0.1,0.6,0.8,1}, eta={0.3,0.8,0.9,1}),
     haveLatentHeatExchange=false,
     useDefaultMotorEfficiencyCurve=false)
-    "Performance record for the sensible heat wheet"
+    "Performance record for the sensible heat wheel"
     annotation (Placement(transformation(extent={{-34,60},{-14,80}})));
   Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.ASHRAE perDefMotCur(
       haveLatentHeatExchange=true, useDefaultMotorEfficiencyCurve=true)
-    "Performance record for the sensible heat wheet with default motor curve"
+    "Performance record for the sensible heat wheel with default motor curve"
     annotation (Placement(transformation(extent={{6,60},{26,80}})));
 equation
   connect(TSup.y, sou_1.T_in)

From 030d1cc923830ac38086e4dbfc025e0992bd6f92 Mon Sep 17 00:00:00 2001
From: SenHuang19 <jhy1987@gmail.com>
Date: Thu, 20 Jun 2024 12:24:17 -0400
Subject: [PATCH 14/27] reference data update

---
 ...rmalWheels_Latent_Examples_SpaceCooling.txt | 18 +++++++++---------
 ...alWheels_Sensible_Examples_SpaceCooling.txt | 14 +++++++-------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Latent_Examples_SpaceCooling.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Latent_Examples_SpaceCooling.txt
index 287ea592754..b5c22ba1242 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Latent_Examples_SpaceCooling.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Latent_Examples_SpaceCooling.txt
@@ -1,4 +1,4 @@
-last-generated=2024-06-14
+last-generated=2024-06-20
 statistics-initialization=
 {
   "linear": "4, 4",
@@ -14,13 +14,13 @@ statistics-simulation=
 }
 time=[1.5552e+07, 1.56384e+07]
 vol.T_start=[2.931499938964844e+02, 2.931499938964844e+02]
-vol.T=[2.931499938964844e+02, 2.935960388183594e+02, 2.938107299804688e+02, 2.938359985351562e+02, 2.93731201171875e+02, 2.935613708496094e+02, 2.933581237792969e+02, 2.931333312988281e+02, 2.928946228027344e+02, 2.926404418945312e+02, 2.923136596679688e+02, 2.918851318359375e+02, 2.913924560546875e+02, 2.909156799316406e+02, 2.90525634765625e+02, 2.902348937988281e+02, 2.900177612304688e+02, 2.898243103027344e+02, 2.895953369140625e+02, 2.893026428222656e+02, 2.889579467773438e+02, 2.88469482421875e+02, 2.866667175292969e+02, 2.861806030273438e+02, 2.862569885253906e+02, 2.867163391113281e+02, 2.875852661132812e+02, 2.889466552734375e+02, 2.906258544921875e+02, 2.923321228027344e+02, 2.937963562011719e+02, 2.950487670898438e+02, 2.961231079101562e+02, 2.969854431152344e+02, 2.971490783691406e+02, 2.971314697265625e+02, 2.966197204589844e+02, 2.958956909179688e+02, 2.956756591796875e+02, 2.960534057617188e+02, 2.966995849609375e+02, 2.971622619628906e+02, 2.971523132324219e+02, 2.971963500976562e+02, 2.97169921875e+02, 2.971585083007812e+02, 2.971520690917969e+02, 2.971513061523438e+02, 2.971513061523438e+02, 2.971514282226562e+02, 2.971517028808594e+02, 2.971518859863281e+02, 2.971519775390625e+02, 2.971519470214844e+02, 2.971517639160156e+02, 2.971504821777344e+02, 2.971497192382812e+02, 2.971494750976562e+02, 2.971498107910156e+02, 2.971512145996094e+02, 2.971521911621094e+02, 2.9715234375e+02, 2.971515808105469e+02, 2.971393737792969e+02, 2.971258239746094e+02, 2.971295166015625e+02, 2.967927856445312e+02, 2.959302978515625e+02, 2.95977294921875e+02, 2.968339538574219e+02, 2.971593933105469e+02, 2.971351318359375e+02, 2.978196411132812e+02, 2.990572509765625e+02, 2.998171691894531e+02, 3.001743469238281e+02, 3.001406860351562e+02, 2.997261962890625e+02, 2.990216674804688e+02, 2.981830749511719e+02, 2.973835144042969e+02, 2.966660461425781e+02, 2.960353698730469e+02, 2.955148620605469e+02, 2.951361083984375e+02, 2.948906860351562e+02, 2.947411499023438e+02, 2.946492004394531e+02, 2.945771179199219e+02, 2.945055541992188e+02, 2.944338684082031e+02, 2.94362060546875e+02, 2.942901916503906e+02, 2.9421826171875e+02, 2.941463012695312e+02, 2.940743408203125e+02, 2.940023498535156e+02, 2.939303894042969e+02, 2.938583984375e+02, 2.93786376953125e+02, 2.937143859863281e+02]
+vol.T=[2.931499938964844e+02, 2.935960388183594e+02, 2.938107299804688e+02, 2.938359985351562e+02, 2.93731201171875e+02, 2.935613708496094e+02, 2.933581237792969e+02, 2.931333312988281e+02, 2.928946228027344e+02, 2.926404418945312e+02, 2.923136596679688e+02, 2.918851318359375e+02, 2.913924560546875e+02, 2.909156494140625e+02, 2.90525634765625e+02, 2.902348937988281e+02, 2.900177612304688e+02, 2.898242797851562e+02, 2.895953369140625e+02, 2.893026733398438e+02, 2.889579467773438e+02, 2.88469482421875e+02, 2.866667175292969e+02, 2.861806030273438e+02, 2.862569885253906e+02, 2.867163391113281e+02, 2.875852661132812e+02, 2.889466552734375e+02, 2.906258544921875e+02, 2.923321228027344e+02, 2.937963562011719e+02, 2.950487670898438e+02, 2.961231079101562e+02, 2.969854431152344e+02, 2.971490173339844e+02, 2.971314697265625e+02, 2.966196899414062e+02, 2.958956604003906e+02, 2.956756591796875e+02, 2.960534057617188e+02, 2.966995849609375e+02, 2.971622924804688e+02, 2.97152099609375e+02, 2.971595764160156e+02, 2.971593017578125e+02, 2.971734924316406e+02, 2.971483764648438e+02, 2.971504516601562e+02, 2.971506652832031e+02, 2.971507568359375e+02, 2.971508483886719e+02, 2.971510620117188e+02, 2.971512145996094e+02, 2.971512451171875e+02, 2.971510925292969e+02, 2.971501159667969e+02, 2.97149658203125e+02, 2.971495666503906e+02, 2.971499328613281e+02, 2.971510620117188e+02, 2.971516418457031e+02, 2.971516418457031e+02, 2.971510009765625e+02, 2.971400756835938e+02, 2.971357727050781e+02, 2.971393737792969e+02, 2.967124938964844e+02, 2.959083862304688e+02, 2.959713134765625e+02, 2.968323059082031e+02, 2.971472473144531e+02, 2.971554260253906e+02, 2.978629150390625e+02, 2.990851745605469e+02, 2.998351745605469e+02, 3.001858825683594e+02, 3.001480712890625e+02, 2.997308959960938e+02, 2.990249633789062e+02, 2.981852722167969e+02, 2.973849487304688e+02, 2.966669616699219e+02, 2.960359802246094e+02, 2.955152587890625e+02, 2.951363525390625e+02, 2.948908386230469e+02, 2.947412719726562e+02, 2.946492919921875e+02, 2.945771789550781e+02, 2.94505615234375e+02, 2.944338989257812e+02, 2.94362060546875e+02, 2.942901916503906e+02, 2.9421826171875e+02, 2.941463012695312e+02, 2.940743408203125e+02, 2.940023498535156e+02, 2.939303894042969e+02, 2.938583984375e+02, 2.93786376953125e+02, 2.937143859863281e+02]
 TOut.T=[2.914500122070312e+02, 2.913385009765625e+02, 2.910647583007812e+02, 2.907200927734375e+02, 2.903956909179688e+02, 2.901300048828125e+02, 2.898659973144531e+02, 2.896019897460938e+02, 2.893380126953125e+02, 2.89004150390625e+02, 2.884479370117188e+02, 2.878096618652344e+02, 2.872500610351562e+02, 2.869119262695312e+02, 2.867525024414062e+02, 2.866704406738281e+02, 2.865716247558594e+02, 2.86362060546875e+02, 2.860019836425781e+02, 2.855647583007812e+02, 2.851369323730469e+02, 2.848055419921875e+02, 2.84671142578125e+02, 2.847913513183594e+02, 2.852047729492188e+02, 2.859500122070312e+02, 2.872088317871094e+02, 2.889144592285156e+02, 2.907325744628906e+02, 2.923289794921875e+02, 2.935801696777344e+02, 2.946938171386719e+02, 2.956173706054688e+02, 2.962911987304688e+02, 2.964541015625e+02, 2.957337341308594e+02, 2.947459106445312e+02, 2.941705322265625e+02, 2.945262451171875e+02, 2.952189331054688e+02, 2.959844055175781e+02, 2.966857299804688e+02, 2.972068786621094e+02, 2.977020874023438e+02, 2.981768493652344e+02, 2.985576171875e+02, 2.987735900878906e+02, 2.989007568359375e+02, 2.990133361816406e+02, 2.991251220703125e+02, 2.9925e+02, 2.993937683105469e+02, 2.99545654296875e+02, 2.996946411132812e+02, 2.998296203613281e+02, 2.999126586914062e+02, 2.999144897460938e+02, 2.99878662109375e+02, 2.998501281738281e+02, 2.99885009765625e+02, 3.0001416015625e+02, 3.001783142089844e+02, 3.003133850097656e+02, 3.001267700195312e+02, 2.985876770019531e+02, 2.964372253417969e+02, 2.946898803710938e+02, 2.943067016601562e+02, 2.951251831054688e+02, 2.964444274902344e+02, 2.976576538085938e+02, 2.981753234863281e+02, 2.982959289550781e+02, 2.982947082519531e+02, 2.980774841308594e+02, 2.975499877929688e+02, 2.9660986328125e+02, 2.953994445800781e+02, 2.94191650390625e+02, 2.932594299316406e+02, 2.926542053222656e+02, 2.921209716796875e+02, 2.917095031738281e+02, 2.914774780273438e+02, 2.91437255859375e+02, 2.914543151855469e+02, 2.914801330566406e+02, 2.914757385253906e+02, 2.914140014648438e+02, 2.913420104980469e+02, 2.912699890136719e+02, 2.91197998046875e+02, 2.911260070800781e+02, 2.910539855957031e+02, 2.909819946289062e+02, 2.909100036621094e+02, 2.908380126953125e+02, 2.907659912109375e+02, 2.906940002441406e+02, 2.906220092773438e+02, 2.905499877929688e+02]
-cooCoi.sta_a2.T=[2.931499938964844e+02, 2.917807006835938e+02, 2.915738830566406e+02, 2.913134155273438e+02, 2.910682983398438e+02, 2.908675231933594e+02, 2.906680297851562e+02, 2.904685668945312e+02, 2.902690734863281e+02, 2.900168762207031e+02, 2.895967102050781e+02, 2.891145935058594e+02, 2.886919555664062e+02, 2.884365844726562e+02, 2.88316162109375e+02, 2.882541198730469e+02, 2.88179443359375e+02, 2.880211486816406e+02, 2.877491455078125e+02, 2.874189147949219e+02, 2.870957641601562e+02, 2.848055419921875e+02, 2.84671142578125e+02, 2.847913513183594e+02, 2.852047729492188e+02, 2.859500122070312e+02, 2.872088317871094e+02, 2.889144592285156e+02, 2.907325744628906e+02, 2.923289794921875e+02, 2.935801696777344e+02, 2.946938171386719e+02, 2.956173706054688e+02, 2.962911987304688e+02, 2.964541015625e+02, 2.957337341308594e+02, 2.947459106445312e+02, 2.941705322265625e+02, 2.945262451171875e+02, 2.952189331054688e+02, 2.959844055175781e+02, 2.966857299804688e+02, 2.972068786621094e+02, 2.975813293457031e+02, 2.97391845703125e+02, 2.974312133789062e+02, 2.974703979492188e+02, 2.974984741210938e+02, 2.975244140625e+02, 2.975490417480469e+02, 2.9757373046875e+02, 2.975995788574219e+02, 2.976268005371094e+02, 2.976547241210938e+02, 2.976822814941406e+02, 2.977013854980469e+02, 2.977057495117188e+02, 2.977022399902344e+02, 2.976984558105469e+02, 2.977051696777344e+02, 2.977279052734375e+02, 2.977574462890625e+02, 2.977830200195312e+02, 2.977406921386719e+02, 2.974342651367188e+02, 2.970108337402344e+02, 2.946898803710938e+02, 2.943067016601562e+02, 2.951251831054688e+02, 2.964444274902344e+02, 2.976466979980469e+02, 2.974203796386719e+02, 2.935564880371094e+02, 2.935564880371094e+02, 2.935564880371094e+02, 2.965751342773438e+02, 2.935564880371094e+02, 2.935564880371094e+02, 2.935564880371094e+02, 2.933319396972656e+02, 2.935564880371094e+02, 2.924715881347656e+02, 2.935564880371094e+02, 2.935564880371094e+02, 2.935564880371094e+02, 2.935564880371094e+02, 2.935564880371094e+02, 2.935564880371094e+02, 2.919381408691406e+02, 2.935564880371094e+02, 2.918292236328125e+02, 2.917747497558594e+02, 2.917203063964844e+02, 2.916659240722656e+02, 2.935564880371094e+02, 2.935564880371094e+02, 2.935564880371094e+02, 2.935564880371094e+02, 2.935564880371094e+02, 2.913392333984375e+02, 2.935564880371094e+02]
-cooCoi.sta_b2.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.850066223144531e+02, 2.846719360351562e+02, 2.847826843261719e+02, 2.851853332519531e+02, 2.859185180664062e+02, 2.871560974121094e+02, 2.888516235351562e+02, 2.906712646484375e+02, 2.922807006835938e+02, 2.935388488769531e+02, 2.94657958984375e+02, 2.955890502929688e+02, 2.962724914550781e+02, 2.957260437011719e+02, 2.957597351074219e+02, 2.947773742675781e+02, 2.941767578125e+02, 2.945053405761719e+02, 2.951929931640625e+02, 2.959581298828125e+02, 2.951271667480469e+02, 2.952107238769531e+02, 2.941292419433594e+02, 2.939965515136719e+02, 2.937931823730469e+02, 2.937021789550781e+02, 2.93649169921875e+02, 2.935955810546875e+02, 2.935401306152344e+02, 2.934774169921875e+02, 2.934044189453125e+02, 2.933267517089844e+02, 2.932501525878906e+02, 2.93180419921875e+02, 2.931352844238281e+02, 2.931338806152344e+02, 2.931529541015625e+02, 2.9316943359375e+02, 2.931556701660156e+02, 2.930903930664062e+02, 2.930059509277344e+02, 2.929348449707031e+02, 2.929651184082031e+02, 2.937670593261719e+02, 2.9486767578125e+02, 2.947335510253906e+02, 2.942952880859375e+02, 2.950852661132812e+02, 2.963969421386719e+02, 2.950999145507812e+02, 2.943717651367188e+02, 2.935564880371094e+02, 2.93821044921875e+02, 2.93821044921875e+02, 2.935564880371094e+02, 2.93821044921875e+02, 2.93821044921875e+02, 2.93821044921875e+02, 2.935564880371094e+02, 2.93821044921875e+02, 2.935564880371094e+02, 2.93821044921875e+02, 2.93821044921875e+02, 2.93821044921875e+02, 2.93821044921875e+02, 2.93821044921875e+02, 2.93821044921875e+02, 2.935564880371094e+02, 2.93821044921875e+02, 2.935564880371094e+02, 2.935564880371094e+02, 2.935564880371094e+02, 2.935564880371094e+02, 2.93821044921875e+02, 2.93821044921875e+02, 2.93821044921875e+02, 2.93821044921875e+02, 2.93821044921875e+02, 2.935564880371094e+02, 2.93821044921875e+02]
+cooCoi.sta_a2.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.848055419921875e+02, 2.84671142578125e+02, 2.847913513183594e+02, 2.852047729492188e+02, 2.859500122070312e+02, 2.872088317871094e+02, 2.889144592285156e+02, 2.907325744628906e+02, 2.923289794921875e+02, 2.935801696777344e+02, 2.946938171386719e+02, 2.956173706054688e+02, 2.962911987304688e+02, 2.964541015625e+02, 2.957337341308594e+02, 2.947459106445312e+02, 2.941705322265625e+02, 2.945262451171875e+02, 2.952189331054688e+02, 2.959844055175781e+02, 2.966857299804688e+02, 2.972068786621094e+02, 2.977020874023438e+02, 2.981768493652344e+02, 2.984267272949219e+02, 2.982018737792969e+02, 2.981682739257812e+02, 2.98164306640625e+02, 2.981634521484375e+02, 2.981642761230469e+02, 2.981651916503906e+02, 2.981649780273438e+02, 2.981639404296875e+02, 2.981622619628906e+02, 2.981559143066406e+02, 2.981495666503906e+02, 2.981468505859375e+02, 2.981481018066406e+02, 2.981552124023438e+02, 2.981621398925781e+02, 2.981636962890625e+02, 2.981602478027344e+02, 2.981087341308594e+02, 2.979300842285156e+02, 2.964372253417969e+02, 2.946898803710938e+02, 2.943067016601562e+02, 2.951251831054688e+02, 2.964444274902344e+02, 2.976576538085938e+02, 2.981753234863281e+02, 2.972942504882812e+02, 2.972933654785156e+02, 2.971294250488281e+02, 2.967357177734375e+02, 2.941932983398438e+02, 2.951637573242188e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.921409301757812e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.919304809570312e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.916584167480469e+02, 2.916039123535156e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.914403991699219e+02]
+cooCoi.sta_b2.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.850066223144531e+02, 2.846719360351562e+02, 2.847826843261719e+02, 2.851853332519531e+02, 2.859185180664062e+02, 2.871560974121094e+02, 2.888516235351562e+02, 2.906712646484375e+02, 2.922807006835938e+02, 2.935388488769531e+02, 2.94657958984375e+02, 2.955890502929688e+02, 2.962724914550781e+02, 2.957261657714844e+02, 2.957597045898438e+02, 2.947773742675781e+02, 2.941767578125e+02, 2.945053405761719e+02, 2.951929931640625e+02, 2.959581298828125e+02, 2.951268615722656e+02, 2.952117004394531e+02, 2.949648742675781e+02, 2.947083435058594e+02, 2.940654296875e+02, 2.93455078125e+02, 2.933719177246094e+02, 2.933251342773438e+02, 2.93288818359375e+02, 2.932528076171875e+02, 2.932095336914062e+02, 2.931567993164062e+02, 2.931007080078125e+02, 2.930479431152344e+02, 2.930150756835938e+02, 2.930166320800781e+02, 2.930333557128906e+02, 2.930465698242188e+02, 2.930337524414062e+02, 2.929794006347656e+02, 2.929098510742188e+02, 2.928515014648438e+02, 2.928837280273438e+02, 2.93494873046875e+02, 2.955596618652344e+02, 2.947333984375e+02, 2.942952270507812e+02, 2.950852966308594e+02, 2.963969421386719e+02, 2.952404174804688e+02, 2.947373962402344e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.944198913574219e+02, 2.941932983398438e+02, 2.944198913574219e+02, 2.944198913574219e+02, 2.944198913574219e+02, 2.944198913574219e+02, 2.944198913574219e+02, 2.941932983398438e+02, 2.944198913574219e+02, 2.944198913574219e+02, 2.944198913574219e+02, 2.944198913574219e+02, 2.944198913574219e+02, 2.944198913574219e+02, 2.944198913574219e+02, 2.941932983398438e+02, 2.944198913574219e+02, 2.944198913574219e+02, 2.944198913574219e+02, 2.944198913574219e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.944198913574219e+02, 2.944198913574219e+02, 2.941932983398438e+02]
 opeSig.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, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+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]
-senTemHXOut.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.848058471679688e+02, 2.846711730957031e+02, 2.847910461425781e+02, 2.852041015625e+02, 2.859490661621094e+02, 2.8720703125e+02, 2.88912353515625e+02, 2.907305603027344e+02, 2.923273620605469e+02, 2.935787963867188e+02, 2.94692626953125e+02, 2.956164245605469e+02, 2.962905883789062e+02, 2.964544982910156e+02, 2.957348327636719e+02, 2.947469482421875e+02, 2.941707153320312e+02, 2.945255432128906e+02, 2.952180786132812e+02, 2.959835205078125e+02, 2.966849975585938e+02, 2.972063293457031e+02, 2.975814208984375e+02, 2.973921203613281e+02, 2.974311828613281e+02, 2.974703674316406e+02, 2.974984436035156e+02, 2.975243835449219e+02, 2.975490112304688e+02, 2.9757373046875e+02, 2.975995483398438e+02, 2.976267700195312e+02, 2.976546936035156e+02, 2.976822509765625e+02, 2.977013549804688e+02, 2.977057495117188e+02, 2.977022399902344e+02, 2.976984558105469e+02, 2.977051391601562e+02, 2.977278747558594e+02, 2.977574157714844e+02, 2.977830200195312e+02, 2.977409057617188e+02, 2.974347229003906e+02, 2.970113220214844e+02, 2.946912841796875e+02, 2.943062744140625e+02, 2.951238403320312e+02, 2.964428405761719e+02, 2.97645751953125e+02, 2.974203186035156e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02, 2.974650573730469e+02]
-TMixSetPoi.y=[2.971499938964844e+02, 2.971499938964844e+02]
-whe.port_a1.Xi_outflow[1]=[1.020082738250494e-02, 1.01562337949872e-02, 1.00783184170723e-02, 9.996542707085609e-03, 9.938318282365799e-03, 9.908336214721203e-03, 9.878899902105331e-03, 9.84929408878088e-03, 9.819529950618744e-03, 9.77362971752882e-03, 9.6778878942132e-03, 9.566104970872402e-03, 9.473696351051331e-03, 9.429263882339001e-03, 9.422294795513153e-03, 9.431302547454834e-03, 9.436583146452904e-03, 9.420059621334076e-03, 9.391364641487598e-03, 9.358547627925873e-03, 9.325146675109863e-03, 8.137145079672337e-03, 8.122085593640804e-03, 8.206699043512344e-03, 8.411874994635582e-03, 8.763079531490803e-03, 9.398895315825939e-03, 1.034505292773247e-02, 1.143034640699625e-02, 1.241556368768215e-02, 1.315876096487045e-02, 1.378693338483572e-02, 1.425285078585148e-02, 1.450714096426964e-02, 1.438504923135042e-02, 1.369496528059244e-02, 1.286804024130106e-02, 1.230658404529095e-02, 1.217551529407501e-02, 1.168260723352432e-02, 1.085670199245214e-02, 9.97223611921072e-03, 9.36471950262785e-03, 8.902018889784813e-03, 8.507907390594482e-03, 8.223498240113258e-03, 8.098715916275978e-03, 8.165220730006695e-03, 8.340694941580296e-03, 8.511393330991268e-03, 8.560599759221077e-03, 8.413743227720261e-03, 8.153790608048439e-03, 7.901248522102833e-03, 7.781551219522953e-03, 7.89081584662199e-03, 8.167044259607792e-03, 8.504312485456467e-03, 8.799020200967789e-03, 8.933519944548607e-03, 8.86286236345768e-03, 8.718964643776417e-03, 8.648307994008064e-03, 8.916387334465981e-03, 9.894336573779583e-03, 1.078152004629374e-02, 1.121085416525602e-02, 1.130799576640129e-02, 1.129153650254011e-02, 1.117290556430817e-02, 1.099951472133398e-02, 1.098693627864122e-02, 1.105138566344976e-02, 1.109431125223637e-02, 1.112894993275404e-02, 1.114331837743521e-02, 1.114110182970762e-02, 1.112098898738623e-02, 1.107599027454853e-02, 1.101889088749886e-02, 1.094273664057255e-02, 1.0823511518538e-02, 1.069130096584558e-02, 1.057273987680674e-02, 1.045074500143528e-02, 1.02439159527421e-02, 1.002308167517185e-02, 9.872145019471645e-03, 9.859723038971424e-03, 9.926189668476582e-03, 1.002039853483438e-02, 1.010283827781677e-02, 1.013703178614378e-02, 1.013418193906546e-02, 1.012380234897137e-02, 1.013018190860748e-02, 1.017637178301811e-02, 1.024587452411652e-02, 1.032060012221336e-02, 1.039818581193686e-02, 1.047625485807657e-02]
-whe.port_b1.Xi_outflow[1]=[1.04016549885273e-02, 1.03124687448144e-02, 1.015663705766201e-02, 9.993084706366062e-03, 9.876636788249016e-03, 9.816672652959824e-03, 9.757800027728081e-03, 9.698587469756603e-03, 9.639059193432331e-03, 9.547258727252483e-03, 9.355776011943817e-03, 9.132210165262222e-03, 8.947391994297504e-03, 8.858527988195419e-03, 8.844588883221149e-03, 8.862605318427086e-03, 8.873166516423225e-03, 8.84011946618557e-03, 8.78272857517004e-03, 8.717095479369164e-03, 8.650294505059719e-03, 8.137145079672337e-03, 8.122085593640804e-03, 8.206699043512344e-03, 8.411874994635582e-03, 8.763079531490803e-03, 9.398895315825939e-03, 1.034505292773247e-02, 1.143034640699625e-02, 1.241556368768215e-02, 1.315876096487045e-02, 1.378693338483572e-02, 1.425285078585148e-02, 1.450714096426964e-02, 1.438504923135042e-02, 1.369496528059244e-02, 1.286804024130106e-02, 1.230658404529095e-02, 1.217551529407501e-02, 1.168260723352432e-02, 1.085670199245214e-02, 9.97223611921072e-03, 9.36471950262785e-03, 8.954343385994434e-03, 8.773695677518845e-03, 8.571792393922806e-03, 8.390087634325027e-03, 8.298454806208611e-03, 8.308558724820614e-03, 8.382918313145638e-03, 8.453937247395515e-03, 8.446881547570229e-03, 8.34345631301403e-03, 8.179881609976292e-03, 8.026242256164551e-03, 7.966140285134315e-03, 8.032466284930706e-03, 8.203096687793732e-03, 8.424727246165276e-03, 8.621234446763992e-03, 8.718830533325672e-03, 8.722729049623013e-03, 8.692436851561069e-03, 8.751447312533855e-03, 9.152897633612156e-03, 9.760832414031029e-03, 1.121085416525602e-02, 1.130799576640129e-02, 1.129153650254011e-02, 1.117290556430817e-02, 1.100112032145262e-02, 1.099402271211147e-02, 1.108031533658504e-02, 1.116616558283567e-02, 1.123544201254845e-02, 1.126418076455593e-02, 1.125974766910076e-02, 1.12195210531354e-02, 1.112952362746e-02, 1.101532485336065e-02, 1.086301729083061e-02, 1.062456611543894e-02, 1.036014407873154e-02, 1.012302190065384e-02, 9.879033081233501e-03, 9.465374983847141e-03, 9.023707360029221e-03, 8.721830323338509e-03, 8.69698915630579e-03, 8.829919621348381e-03, 9.018341079354286e-03, 9.183220565319061e-03, 9.251606650650501e-03, 9.245906956493855e-03, 9.225144982337952e-03, 9.237906895577908e-03, 9.330284781754017e-03, 9.469292126595974e-03, 9.61874146014452e-03, 9.773914702236652e-03, 9.930051863193512e-03]
-whe.senSupMasFlo.m_flow=[0e+00, 1.074869526157037e-24, 1.749790123241094e-24, 1.750498520333982e-24, 1.750510944893239e-24, 1.750507986664845e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 5.743309117178796e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 1.376729699131829e-07, 2.181302756071091e-01, 6.285740733146667e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.460658311843872e-01, 5.748720610654345e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 2.018535882234573e-02, 5.955579876899719e-01, -9.835485697369181e-14, -9.835485697369181e-14, -9.835485697369181e-14, 4.467078020421039e-13, -9.835485697369181e-14, -9.835485697369181e-14, -9.835485697369181e-14, 4.467078020421039e-13, -9.835485697369181e-14, 4.467078020421039e-13, -6.434175024369604e-13, -6.434175024369604e-13, -9.835485697369181e-14, -9.835485697369181e-14, -9.835485697369181e-14, -6.434175024369604e-13, 4.467078020421039e-13, -6.434175024369604e-13, 4.467078020421039e-13, 4.467078020421039e-13, 4.467078020421039e-13, 4.467078020421039e-13, -6.434175024369604e-13, -9.835485697369181e-14, -6.434175024369604e-13, -9.835485697369181e-14, -6.434175024369604e-13, 4.467078020421039e-13, -6.434175024369604e-13]
+senTemHXOut.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.848058471679688e+02, 2.846711730957031e+02, 2.847910461425781e+02, 2.852041015625e+02, 2.859490356445312e+02, 2.8720703125e+02, 2.88912353515625e+02, 2.907305603027344e+02, 2.923273620605469e+02, 2.935787963867188e+02, 2.94692626953125e+02, 2.956164245605469e+02, 2.962905883789062e+02, 2.964544982910156e+02, 2.957348327636719e+02, 2.947469482421875e+02, 2.941707153320312e+02, 2.945255432128906e+02, 2.952180786132812e+02, 2.959835205078125e+02, 2.966849975585938e+02, 2.972063293457031e+02, 2.977015075683594e+02, 2.981763610839844e+02, 2.984269714355469e+02, 2.982019653320312e+02, 2.981682739257812e+02, 2.98164306640625e+02, 2.981634521484375e+02, 2.981642761230469e+02, 2.981651916503906e+02, 2.981649780273438e+02, 2.981639404296875e+02, 2.981622619628906e+02, 2.981559143066406e+02, 2.981495666503906e+02, 2.981468505859375e+02, 2.981481018066406e+02, 2.981552124023438e+02, 2.981621398925781e+02, 2.981636962890625e+02, 2.981602478027344e+02, 2.9810888671875e+02, 2.979305419921875e+02, 2.964396667480469e+02, 2.946912841796875e+02, 2.943062744140625e+02, 2.951238403320312e+02, 2.964428405761719e+02, 2.976565551757812e+02, 2.981751403808594e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02]
+TMixSetPoi.y=[2.981499938964844e+02, 2.981499938964844e+02]
+whe.port_a1.Xi_outflow[1]=[1.020082738250494e-02, 1.01562337949872e-02, 1.00783184170723e-02, 9.996542707085609e-03, 9.938318282365799e-03, 9.908336214721203e-03, 9.878899902105331e-03, 9.84929408878088e-03, 9.819529950618744e-03, 9.77362971752882e-03, 9.6778878942132e-03, 9.566104970872402e-03, 9.473696351051331e-03, 9.429263882339001e-03, 9.422294795513153e-03, 9.431302547454834e-03, 9.436560794711113e-03, 9.420059621334076e-03, 9.391364641487598e-03, 9.358547627925873e-03, 9.325146675109863e-03, 8.137145079672337e-03, 8.122085593640804e-03, 8.206699043512344e-03, 8.411874994635582e-03, 8.763079531490803e-03, 9.398895315825939e-03, 1.034505292773247e-02, 1.143034640699625e-02, 1.241556368768215e-02, 1.315876096487045e-02, 1.378693338483572e-02, 1.425285078585148e-02, 1.450714096426964e-02, 1.438504923135042e-02, 1.369496528059244e-02, 1.286804024130106e-02, 1.230658404529095e-02, 1.217551529407501e-02, 1.168260723352432e-02, 1.085670199245214e-02, 9.97223611921072e-03, 9.36471950262785e-03, 8.902018889784813e-03, 8.507907390594482e-03, 8.223498240113258e-03, 8.098715916275978e-03, 8.165220730006695e-03, 8.340694941580296e-03, 8.511393330991268e-03, 8.560599759221077e-03, 8.413743227720261e-03, 8.153790608048439e-03, 7.901248522102833e-03, 7.781551219522953e-03, 7.89081584662199e-03, 8.167044259607792e-03, 8.504312485456467e-03, 8.799020200967789e-03, 8.933519944548607e-03, 8.86286236345768e-03, 8.718964643776417e-03, 8.648307994008064e-03, 8.916387334465981e-03, 9.894336573779583e-03, 1.078152004629374e-02, 1.121085416525602e-02, 1.130799576640129e-02, 1.129153650254011e-02, 1.117290556430817e-02, 1.099951472133398e-02, 1.098693627864122e-02, 1.106338948011398e-02, 1.110631413757801e-02, 1.114096026867628e-02, 1.11555652692914e-02, 1.115310564637184e-02, 1.114236563444138e-02, 1.108799315989017e-02, 1.10308937728405e-02, 1.095473859459162e-02, 1.083551906049252e-02, 1.070331037044525e-02, 1.058470457792282e-02, 1.0462686419487e-02, 1.025591883808374e-02, 1.003508549183607e-02, 9.884104132652283e-03, 9.871749207377434e-03, 9.938213042914867e-03, 1.003242190927267e-02, 1.011484116315842e-02, 1.014900207519531e-02, 1.014620251953602e-02, 1.013580523431301e-02, 1.01421857252717e-02, 1.018837280571461e-02, 1.025786157697439e-02, 1.033260300755501e-02, 1.041018962860107e-02, 1.048825681209564e-02]
+whe.port_b1.Xi_outflow[1]=[1.04016549885273e-02, 1.03124687448144e-02, 1.015663705766201e-02, 9.993084706366062e-03, 9.876636788249016e-03, 9.816672652959824e-03, 9.757800027728081e-03, 9.698587469756603e-03, 9.639059193432331e-03, 9.547258727252483e-03, 9.355776011943817e-03, 9.132210165262222e-03, 8.947391994297504e-03, 8.858527988195419e-03, 8.844588883221149e-03, 8.862605318427086e-03, 8.873116225004196e-03, 8.84011946618557e-03, 8.78272857517004e-03, 8.717095479369164e-03, 8.650294505059719e-03, 8.137145079672337e-03, 8.122085593640804e-03, 8.206699043512344e-03, 8.411874994635582e-03, 8.763079531490803e-03, 9.398895315825939e-03, 1.034505292773247e-02, 1.143034640699625e-02, 1.241556368768215e-02, 1.315876096487045e-02, 1.378693338483572e-02, 1.425285078585148e-02, 1.450714096426964e-02, 1.438504923135042e-02, 1.369496528059244e-02, 1.286804024130106e-02, 1.230658404529095e-02, 1.217551529407501e-02, 1.168260723352432e-02, 1.085670199245214e-02, 9.97223611921072e-03, 9.36471950262785e-03, 8.902018889784813e-03, 8.507907390594482e-03, 8.234995417296886e-03, 8.123492822051048e-03, 8.151986636221409e-03, 8.289935998618603e-03, 8.449546061456203e-03, 8.531374856829643e-03, 8.459034375846386e-03, 8.267165161669254e-03, 8.041513152420521e-03, 7.881222292780876e-03, 7.877963595092297e-03, 8.037080988287926e-03, 8.303587324917316e-03, 8.593156933784485e-03, 8.798799477517605e-03, 8.841468021273613e-03, 8.776242844760418e-03, 8.704190142452717e-03, 8.789260871708393e-03, 9.568498469889164e-03, 1.078152004629374e-02, 1.121085416525602e-02, 1.130799576640129e-02, 1.129153650254011e-02, 1.117290556430817e-02, 1.099951472133398e-02, 1.098693627864122e-02, 1.108502689749002e-02, 1.117087714374065e-02, 1.124016754329205e-02, 1.12693514674902e-02, 1.126445923000574e-02, 1.123600080609322e-02, 1.113423518836498e-02, 1.102003641426563e-02, 1.086772512644529e-02, 1.062928512692451e-02, 1.036486867815256e-02, 1.012765895575285e-02, 9.883587248623371e-03, 9.470086544752121e-03, 9.0284189209342e-03, 8.726434782147408e-03, 8.7017472833395e-03, 8.834674023091793e-03, 9.0230917558074e-03, 9.187931194901466e-03, 9.256236255168915e-03, 9.25065390765667e-03, 9.229856543242931e-03, 9.242618456482887e-03, 9.334995411336422e-03, 9.473972022533417e-03, 9.6234530210495e-03, 9.778626263141632e-03, 9.934762492775917e-03]
+whe.senSupMasFlo.m_flow=[0e+00, 0e+00, -6.431433905326276e-30, -1.165375153782612e-28, -2.646439595881945e-29, -4.444476657679377e-29, -4.445450155080954e-29, -4.413999117236003e-29, -4.413764093597477e-29, -4.413761686185046e-29, -4.413770413055107e-29, -4.413760482478831e-29, -4.413771917687876e-29, -4.413801107563596e-29, -4.413818561303717e-29, -4.413773422320645e-29, -9.64341617619168e-21, -4.413434879947608e-29, -4.413440597552131e-29, -4.417609333102068e-29, -4.417606022909976e-29, 5.743309117178796e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 7.269910184959372e-08, 8.69821310043335e-02, 3.234779834747314e-01, 3.773662745952606e-01, 4.063303768634796e-01, 4.299194812774658e-01, 4.519365429878235e-01, 4.736229181289673e-01, 4.936095178127289e-01, 5.109586715698242e-01, 5.253400206565857e-01, 5.350459218025208e-01, 5.372900366783142e-01, 5.351210236549377e-01, 5.322843194007874e-01, 5.335095524787903e-01, 5.425741672515869e-01, 5.547639727592468e-01, 5.650573968887329e-01, 5.624150633811951e-01, 4.075564742088318e-01, 5.74331693314889e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 9.731658678902022e-08, 2.73678833417147e-16, 5.262562232336173e-16, 1.575180551315405e-13, 3.514106757321334e-12, -6.453782549608461e-14, 2.349164439363616e-11, -8.931635135265778e-14, -9.589402297401073e-14, -6.409635734498653e-13, -9.59013752199929e-14, -9.59013752199929e-14, 9.942239089302807e-13, -1.731089338714853e-12, -9.59013752199929e-14, -9.59013752199929e-14, -1.186026645817739e-12, -9.59013752199929e-14, -9.59013752199929e-14, -9.59013752199929e-14, 4.491612702432757e-13, -1.186026645817739e-12, -9.59013752199929e-14, -6.409640071307343e-13, -9.59013752199929e-14, 4.491612702432757e-13, 4.491612702432757e-13, -6.409640071307343e-13, -6.409640071307343e-13, 4.491612702432757e-13]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Sensible_Examples_SpaceCooling.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Sensible_Examples_SpaceCooling.txt
index 40ced10ae17..5b20a82bfe8 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Sensible_Examples_SpaceCooling.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Sensible_Examples_SpaceCooling.txt
@@ -1,4 +1,4 @@
-last-generated=2024-06-14
+last-generated=2024-06-20
 statistics-initialization=
 {
   "linear": "0, 0, 0, 0, 4",
@@ -14,11 +14,11 @@ statistics-simulation=
 }
 time=[1.5552e+07, 1.56384e+07]
 vol.T_start=[2.931499938964844e+02, 2.931499938964844e+02]
-vol.T=[2.931499938964844e+02, 2.935960388183594e+02, 2.938107299804688e+02, 2.938359985351562e+02, 2.93731201171875e+02, 2.935613708496094e+02, 2.933581237792969e+02, 2.931333312988281e+02, 2.928946228027344e+02, 2.926404418945312e+02, 2.923136596679688e+02, 2.918851318359375e+02, 2.913924255371094e+02, 2.909156799316406e+02, 2.90525634765625e+02, 2.902349243164062e+02, 2.900177917480469e+02, 2.898243103027344e+02, 2.895953369140625e+02, 2.893026733398438e+02, 2.889579467773438e+02, 2.88469482421875e+02, 2.866667175292969e+02, 2.861806030273438e+02, 2.862569885253906e+02, 2.867163391113281e+02, 2.875852661132812e+02, 2.889466552734375e+02, 2.906258544921875e+02, 2.923321228027344e+02, 2.937963562011719e+02, 2.950487670898438e+02, 2.961231079101562e+02, 2.969854431152344e+02, 2.971490478515625e+02, 2.971314392089844e+02, 2.966196899414062e+02, 2.958956298828125e+02, 2.956756286621094e+02, 2.960533752441406e+02, 2.966995849609375e+02, 2.971622924804688e+02, 2.971523132324219e+02, 2.971964416503906e+02, 2.971701965332031e+02, 2.971583557128906e+02, 2.971519775390625e+02, 2.971512756347656e+02, 2.971512756347656e+02, 2.971514282226562e+02, 2.971517333984375e+02, 2.971519775390625e+02, 2.971520385742188e+02, 2.971519775390625e+02, 2.971517333984375e+02, 2.971504821777344e+02, 2.97149658203125e+02, 2.971494140625e+02, 2.971498107910156e+02, 2.971512451171875e+02, 2.971522216796875e+02, 2.971523742675781e+02, 2.971515808105469e+02, 2.971392211914062e+02, 2.971256713867188e+02, 2.971298522949219e+02, 2.967710876464844e+02, 2.959244079589844e+02, 2.959757080078125e+02, 2.968335266113281e+02, 2.971592102050781e+02, 2.971351318359375e+02, 2.978196716308594e+02, 2.990572509765625e+02, 2.998171997070312e+02, 3.001743774414062e+02, 3.001407165527344e+02, 2.997261962890625e+02, 2.990216674804688e+02, 2.981830749511719e+02, 2.973834838867188e+02, 2.96666015625e+02, 2.960353393554688e+02, 2.955148620605469e+02, 2.951360473632812e+02, 2.948906555175781e+02, 2.947411193847656e+02, 2.946492004394531e+02, 2.945771484375e+02, 2.945055847167969e+02, 2.944338684082031e+02, 2.94362060546875e+02, 2.942901916503906e+02, 2.9421826171875e+02, 2.941463012695312e+02, 2.940743408203125e+02, 2.940023498535156e+02, 2.939303894042969e+02, 2.938583984375e+02, 2.93786376953125e+02, 2.937143859863281e+02]
+vol.T=[2.931499938964844e+02, 2.935960388183594e+02, 2.938107299804688e+02, 2.938359985351562e+02, 2.93731201171875e+02, 2.935613708496094e+02, 2.933581237792969e+02, 2.931333312988281e+02, 2.928946228027344e+02, 2.926404418945312e+02, 2.923136596679688e+02, 2.918851318359375e+02, 2.913924560546875e+02, 2.909156799316406e+02, 2.905256652832031e+02, 2.902349243164062e+02, 2.900177917480469e+02, 2.898243103027344e+02, 2.895953369140625e+02, 2.893026428222656e+02, 2.889579162597656e+02, 2.88469482421875e+02, 2.866667175292969e+02, 2.861806030273438e+02, 2.862569885253906e+02, 2.867163391113281e+02, 2.875852661132812e+02, 2.889466552734375e+02, 2.906258544921875e+02, 2.923321228027344e+02, 2.937963562011719e+02, 2.950487670898438e+02, 2.961231079101562e+02, 2.969854431152344e+02, 2.971490173339844e+02, 2.971314697265625e+02, 2.966197204589844e+02, 2.958956909179688e+02, 2.956756286621094e+02, 2.960533752441406e+02, 2.966995849609375e+02, 2.971622924804688e+02, 2.971521301269531e+02, 2.971595764160156e+02, 2.971593017578125e+02, 2.971735229492188e+02, 2.971483459472656e+02, 2.971504516601562e+02, 2.971506958007812e+02, 2.971507568359375e+02, 2.971508483886719e+02, 2.971510620117188e+02, 2.971512145996094e+02, 2.971512451171875e+02, 2.97151123046875e+02, 2.97150146484375e+02, 2.97149658203125e+02, 2.971495971679688e+02, 2.971499328613281e+02, 2.971510620117188e+02, 2.97151611328125e+02, 2.971516418457031e+02, 2.971510009765625e+02, 2.971400756835938e+02, 2.971358032226562e+02, 2.971388244628906e+02, 2.967125854492188e+02, 2.95908447265625e+02, 2.959713439941406e+02, 2.968323364257812e+02, 2.971472473144531e+02, 2.971554565429688e+02, 2.978629150390625e+02, 2.990851440429688e+02, 2.998352661132812e+02, 3.001859741210938e+02, 3.001481323242188e+02, 2.997310180664062e+02, 2.990249938964844e+02, 2.98185302734375e+02, 2.973849487304688e+02, 2.966669616699219e+02, 2.960359802246094e+02, 2.955152587890625e+02, 2.951363525390625e+02, 2.948908386230469e+02, 2.947412414550781e+02, 2.946492919921875e+02, 2.945771789550781e+02, 2.94505615234375e+02, 2.944338989257812e+02, 2.943620910644531e+02, 2.942901916503906e+02, 2.9421826171875e+02, 2.941463012695312e+02, 2.940743408203125e+02, 2.940023803710938e+02, 2.939303894042969e+02, 2.938583984375e+02, 2.937864074707031e+02, 2.9371435546875e+02]
 TOut.T=[2.914500122070312e+02, 2.913385009765625e+02, 2.910647583007812e+02, 2.907200927734375e+02, 2.903956909179688e+02, 2.901300048828125e+02, 2.898659973144531e+02, 2.896019897460938e+02, 2.893380126953125e+02, 2.89004150390625e+02, 2.884479370117188e+02, 2.878096618652344e+02, 2.872500610351562e+02, 2.869119262695312e+02, 2.867525024414062e+02, 2.866704406738281e+02, 2.865716247558594e+02, 2.86362060546875e+02, 2.860019836425781e+02, 2.855647583007812e+02, 2.851369323730469e+02, 2.848055419921875e+02, 2.84671142578125e+02, 2.847913513183594e+02, 2.852047729492188e+02, 2.859500122070312e+02, 2.872088317871094e+02, 2.889144592285156e+02, 2.907325744628906e+02, 2.923289794921875e+02, 2.935801696777344e+02, 2.946938171386719e+02, 2.956173706054688e+02, 2.962911987304688e+02, 2.964541015625e+02, 2.957337341308594e+02, 2.947459106445312e+02, 2.941705322265625e+02, 2.945262451171875e+02, 2.952189331054688e+02, 2.959844055175781e+02, 2.966857299804688e+02, 2.972068786621094e+02, 2.977020874023438e+02, 2.981768493652344e+02, 2.985576171875e+02, 2.987735900878906e+02, 2.989007568359375e+02, 2.990133361816406e+02, 2.991251220703125e+02, 2.9925e+02, 2.993937683105469e+02, 2.99545654296875e+02, 2.996946411132812e+02, 2.998296203613281e+02, 2.999126586914062e+02, 2.999144897460938e+02, 2.99878662109375e+02, 2.998501281738281e+02, 2.99885009765625e+02, 3.0001416015625e+02, 3.001783142089844e+02, 3.003133850097656e+02, 3.001267700195312e+02, 2.985876770019531e+02, 2.964372253417969e+02, 2.946898803710938e+02, 2.943067016601562e+02, 2.951251831054688e+02, 2.964444274902344e+02, 2.976576538085938e+02, 2.981753234863281e+02, 2.982959289550781e+02, 2.982947082519531e+02, 2.980774841308594e+02, 2.975499877929688e+02, 2.9660986328125e+02, 2.953994445800781e+02, 2.94191650390625e+02, 2.932594299316406e+02, 2.926542053222656e+02, 2.921209716796875e+02, 2.917095031738281e+02, 2.914774780273438e+02, 2.91437255859375e+02, 2.914543151855469e+02, 2.914801330566406e+02, 2.914757385253906e+02, 2.914140014648438e+02, 2.913420104980469e+02, 2.912699890136719e+02, 2.91197998046875e+02, 2.911260070800781e+02, 2.910539855957031e+02, 2.909819946289062e+02, 2.909100036621094e+02, 2.908380126953125e+02, 2.907659912109375e+02, 2.906940002441406e+02, 2.906220092773438e+02, 2.905499877929688e+02]
-cooCoi.sta_a2.T=[2.931499938964844e+02, 2.917807006835938e+02, 2.915738830566406e+02, 2.913134155273438e+02, 2.910682983398438e+02, 2.908675231933594e+02, 2.906680297851562e+02, 2.904685668945312e+02, 2.902690734863281e+02, 2.900168762207031e+02, 2.895967102050781e+02, 2.891145935058594e+02, 2.886919555664062e+02, 2.884365844726562e+02, 2.88316162109375e+02, 2.882541198730469e+02, 2.88179443359375e+02, 2.880211486816406e+02, 2.877491455078125e+02, 2.874189147949219e+02, 2.870957641601562e+02, 2.848055419921875e+02, 2.84671142578125e+02, 2.847913513183594e+02, 2.852047729492188e+02, 2.859500122070312e+02, 2.872088317871094e+02, 2.889144592285156e+02, 2.907325744628906e+02, 2.923289794921875e+02, 2.935801696777344e+02, 2.946938171386719e+02, 2.956173706054688e+02, 2.962911987304688e+02, 2.964541015625e+02, 2.957337341308594e+02, 2.947459106445312e+02, 2.941705322265625e+02, 2.945262451171875e+02, 2.952189331054688e+02, 2.959844055175781e+02, 2.966857299804688e+02, 2.972068786621094e+02, 2.975822448730469e+02, 2.973943786621094e+02, 2.974382019042969e+02, 2.97476318359375e+02, 2.975011901855469e+02, 2.975237731933594e+02, 2.975462646484375e+02, 2.975714111328125e+02, 2.976003112792969e+02, 2.976307678222656e+02, 2.976604919433594e+02, 2.976873168945312e+02, 2.977030334472656e+02, 2.977028503417969e+02, 2.976955261230469e+02, 2.976900939941406e+02, 2.976980895996094e+02, 2.97724609375e+02, 2.97757568359375e+02, 2.97783935546875e+02, 2.97737060546875e+02, 2.974184875488281e+02, 2.969909973144531e+02, 2.946898803710938e+02, 2.943067016601562e+02, 2.951251831054688e+02, 2.964444274902344e+02, 2.976467590332031e+02, 2.974203186035156e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02, 2.935619812011719e+02]
-cooCoi.sta_b2.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.850066223144531e+02, 2.846719360351562e+02, 2.847826843261719e+02, 2.851853332519531e+02, 2.859185180664062e+02, 2.871560974121094e+02, 2.888516235351562e+02, 2.906712646484375e+02, 2.922807006835938e+02, 2.935388488769531e+02, 2.94657958984375e+02, 2.955890502929688e+02, 2.962724914550781e+02, 2.9572607421875e+02, 2.95759765625e+02, 2.947773742675781e+02, 2.941767578125e+02, 2.945053405761719e+02, 2.951929931640625e+02, 2.959581298828125e+02, 2.951267700195312e+02, 2.952107543945312e+02, 2.941287231445312e+02, 2.939949340820312e+02, 2.937916259765625e+02, 2.937012939453125e+02, 2.936488952636719e+02, 2.93595703125e+02, 2.935404968261719e+02, 2.934779052734375e+02, 2.93404296875e+02, 2.933260498046875e+02, 2.932490234375e+02, 2.931792297363281e+02, 2.93134765625e+02, 2.931340942382812e+02, 2.931538696289062e+02, 2.931707458496094e+02, 2.9315673828125e+02, 2.930909729003906e+02, 2.930059814453125e+02, 2.929346008300781e+02, 2.929650268554688e+02, 2.93768798828125e+02, 2.948639831542969e+02, 2.947334289550781e+02, 2.942953796386719e+02, 2.950852661132812e+02, 2.963969421386719e+02, 2.951000671386719e+02, 2.94371826171875e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02, 2.93822021484375e+02]
+cooCoi.sta_a2.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.902690734863281e+02, 2.900168762207031e+02, 2.895967102050781e+02, 2.891142272949219e+02, 2.886919555664062e+02, 2.884365844726562e+02, 2.88316162109375e+02, 2.882541198730469e+02, 2.881775512695312e+02, 2.880211486816406e+02, 2.877491455078125e+02, 2.874183654785156e+02, 2.870957641601562e+02, 2.848055419921875e+02, 2.84671142578125e+02, 2.847913513183594e+02, 2.852047729492188e+02, 2.859500122070312e+02, 2.872088317871094e+02, 2.889144592285156e+02, 2.907325744628906e+02, 2.923289794921875e+02, 2.935801696777344e+02, 2.946938171386719e+02, 2.956173706054688e+02, 2.962911987304688e+02, 2.964541015625e+02, 2.957337341308594e+02, 2.947459106445312e+02, 2.941705322265625e+02, 2.945262451171875e+02, 2.952189331054688e+02, 2.959844055175781e+02, 2.966857299804688e+02, 2.972068786621094e+02, 2.977020874023438e+02, 2.981768493652344e+02, 2.984268798828125e+02, 2.982018432617188e+02, 2.981680603027344e+02, 2.981641540527344e+02, 2.981634521484375e+02, 2.981645202636719e+02, 2.981655883789062e+02, 2.98165283203125e+02, 2.981640319824219e+02, 2.981619873046875e+02, 2.981553039550781e+02, 2.981489868164062e+02, 2.981465454101562e+02, 2.981481628417969e+02, 2.981557006835938e+02, 2.981626892089844e+02, 2.981640625e+02, 2.981601257324219e+02, 2.98107177734375e+02, 2.979295043945312e+02, 2.964372253417969e+02, 2.946898803710938e+02, 2.943067016601562e+02, 2.951251831054688e+02, 2.964444274902344e+02, 2.976576538085938e+02, 2.981753234863281e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.9602001953125e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.93487548828125e+02, 2.930301818847656e+02, 2.926272583007812e+02, 2.923164367675781e+02, 2.921412353515625e+02, 2.921109924316406e+02, 2.921241149902344e+02, 2.921438598632812e+02, 2.921406860351562e+02, 2.920940856933594e+02, 2.920396118164062e+02, 2.919851379394531e+02, 2.919306335449219e+02, 2.918761901855469e+02, 2.918218078613281e+02, 2.917674255371094e+02, 2.917130126953125e+02, 2.916585693359375e+02, 2.916040649414062e+02, 2.91549560546875e+02, 2.914950561523438e+02, 2.914405517578125e+02]
+cooCoi.sta_b2.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.850066223144531e+02, 2.846719360351562e+02, 2.847826843261719e+02, 2.851853332519531e+02, 2.859185180664062e+02, 2.871560974121094e+02, 2.888516235351562e+02, 2.906712646484375e+02, 2.922807006835938e+02, 2.935388488769531e+02, 2.94657958984375e+02, 2.955890502929688e+02, 2.962724914550781e+02, 2.957259826660156e+02, 2.95759765625e+02, 2.947773742675781e+02, 2.941767578125e+02, 2.945053405761719e+02, 2.951929931640625e+02, 2.959581298828125e+02, 2.951268920898438e+02, 2.952115173339844e+02, 2.949647827148438e+02, 2.947084045410156e+02, 2.940651245117188e+02, 2.934549865722656e+02, 2.933719787597656e+02, 2.93324951171875e+02, 2.932884521484375e+02, 2.932525024414062e+02, 2.932096557617188e+02, 2.931571350097656e+02, 2.931011352539062e+02, 2.9304833984375e+02, 2.930151672363281e+02, 2.930163879394531e+02, 2.930328674316406e+02, 2.930459289550781e+02, 2.930332641601562e+02, 2.92979248046875e+02, 2.929098815917969e+02, 2.928516235351562e+02, 2.928836669921875e+02, 2.934917602539062e+02, 2.955537109375e+02, 2.947334594726562e+02, 2.942952880859375e+02, 2.950852661132812e+02, 2.963969421386719e+02, 2.9524072265625e+02, 2.947373352050781e+02, 2.944199829101562e+02, 2.944199829101562e+02, 2.944199829101562e+02, 2.944199829101562e+02, 2.941937255859375e+02, 2.944199829101562e+02, 2.944199829101562e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02]
 opeSig.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, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+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]
-senTemHXOut.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.848058471679688e+02, 2.846711730957031e+02, 2.847910461425781e+02, 2.852041015625e+02, 2.859490661621094e+02, 2.8720703125e+02, 2.88912353515625e+02, 2.907305603027344e+02, 2.923273620605469e+02, 2.935787963867188e+02, 2.94692626953125e+02, 2.956164245605469e+02, 2.962905883789062e+02, 2.964544982910156e+02, 2.957348327636719e+02, 2.947469482421875e+02, 2.941707153320312e+02, 2.945255432128906e+02, 2.952180786132812e+02, 2.959835205078125e+02, 2.966849975585938e+02, 2.972063293457031e+02, 2.975823059082031e+02, 2.973946228027344e+02, 2.974381713867188e+02, 2.974762878417969e+02, 2.975011901855469e+02, 2.975237426757812e+02, 2.975462341308594e+02, 2.975713806152344e+02, 2.976002807617188e+02, 2.976307373046875e+02, 2.976604614257812e+02, 2.976872863769531e+02, 2.977030029296875e+02, 2.977028503417969e+02, 2.976955261230469e+02, 2.976900939941406e+02, 2.976980590820312e+02, 2.977245788574219e+02, 2.977575378417969e+02, 2.977839050292969e+02, 2.977373046875e+02, 2.974189453125e+02, 2.969914855957031e+02, 2.946912841796875e+02, 2.943062744140625e+02, 2.951238403320312e+02, 2.964428405761719e+02, 2.976458129882812e+02, 2.97420166015625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02, 2.974761962890625e+02]
-TMixSetPoi.y=[2.971499938964844e+02, 2.971499938964844e+02]
-whe.senSupMasFlo.m_flow=[0e+00, 1.074869526157037e-24, 1.749790123241094e-24, 1.750498520333982e-24, 1.750510944893239e-24, 1.750507986664845e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 1.750507789449619e-24, 5.743309117178796e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 1.375971976358414e-07, 2.184830754995346e-01, 6.306771636009216e-01, 6.461225748062134e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.461226344108582e-01, 6.459726095199585e-01, 5.744390207951255e-08, 5.74331693314889e-08, 5.743316577877522e-08, 5.743316577877522e-08, 2.018366567790508e-02, 5.956582427024841e-01, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14, -1.954894274615922e-14]
+senTemHXOut.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.848058471679688e+02, 2.846711730957031e+02, 2.847910461425781e+02, 2.852041015625e+02, 2.859490661621094e+02, 2.8720703125e+02, 2.88912353515625e+02, 2.907305603027344e+02, 2.923273620605469e+02, 2.935787963867188e+02, 2.94692626953125e+02, 2.956164245605469e+02, 2.962905883789062e+02, 2.964544982910156e+02, 2.957348327636719e+02, 2.947469482421875e+02, 2.941707153320312e+02, 2.945255432128906e+02, 2.952180786132812e+02, 2.959835205078125e+02, 2.966849975585938e+02, 2.972063293457031e+02, 2.977015075683594e+02, 2.981763610839844e+02, 2.984271240234375e+02, 2.982019348144531e+02, 2.981680908203125e+02, 2.981641540527344e+02, 2.981634521484375e+02, 2.981645202636719e+02, 2.981655883789062e+02, 2.981653137207031e+02, 2.981640319824219e+02, 2.981619873046875e+02, 2.981553039550781e+02, 2.981489868164062e+02, 2.981465454101562e+02, 2.981481628417969e+02, 2.981557006835938e+02, 2.981626892089844e+02, 2.981640625e+02, 2.981601257324219e+02, 2.981073303222656e+02, 2.979299926757812e+02, 2.964396667480469e+02, 2.946912841796875e+02, 2.943062744140625e+02, 2.951238403320312e+02, 2.964428405761719e+02, 2.976565551757812e+02, 2.981751403808594e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02]
+TMixSetPoi.y=[2.981499938964844e+02, 2.981499938964844e+02]
+whe.senSupMasFlo.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.484671949667417e-39, 1.190687688775063e-32, 1.199573397509722e-32, 9.64341617619168e-21, 1.408186102429849e-32, 1.387074370825874e-32, 1.380611943695435e-32, 1.360324380568181e-32, 1.928683235238336e-20, 8.141630361480616e-33, 8.191026838154077e-33, 9.64341617619168e-21, 1.458067323586229e-32, 5.743309117178796e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 7.270976709605748e-08, 8.702646195888519e-02, 3.237918317317963e-01, 3.773355782032013e-01, 4.059529602527618e-01, 4.294154644012451e-01, 4.516304731369019e-01, 4.738048017024994e-01, 4.942177534103394e-01, 5.117353796958923e-01, 5.259471535682678e-01, 5.351343750953674e-01, 5.367643237113953e-01, 5.341477990150452e-01, 5.311824679374695e-01, 5.326873660087585e-01, 5.423303246498108e-01, 5.549526214599609e-01, 5.653319954872131e-01, 5.621629953384399e-01, 4.042332768440247e-01, 5.743316222606154e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 9.724735861027511e-08, -1.558182486829902e-16, -2.671767649920507e-15, -1.910148403924498e-14, -6.380397078731281e-12, 3.535883981171505e-16, -1.814892637216903e-12, -2.739144089498879e-13, 1.519172903251785e-14, 1.515335844000723e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14]

From 49341ae57fd11b2338a43f053e7a1279bed88d3a Mon Sep 17 00:00:00 2001
From: SenHuang19 <jhy1987@gmail.com>
Date: Thu, 20 Jun 2024 12:41:19 -0400
Subject: [PATCH 15/27] model doc update

---
 .../BaseClasses/VariableSpeedThermalWheels/Sensible.mo      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Sensible.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Sensible.mo
index 61446a2ed08..4a0979429e3 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Sensible.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Sensible.mo
@@ -31,7 +31,7 @@ model Sensible "Sensible heat wheels"
 initial equation
   for i in 1:size(yeta,1)-1 loop
          assert(xSpe[i]/yeta[i] < 1 + 1E-4,
-                  "In " + getInstanceName() + ": motor efficiency curve is wrong. 
+                  "In " + getInstanceName() + ": the motor efficiency curve is wrong. 
                   The ratio of the speed ratio to the motor percent 
                   full-load efficiency should be less than 1",
                   level=AssertionLevel.error)
@@ -39,9 +39,9 @@ initial equation
   end for;
   assert(abs(yeta[size(yeta,1)]-1) < 1E-4,
           "In " + getInstanceName() + ": motor efficiency curve is wrong. 
-          The  motor percent full-load efficiency at the full seepd should be 1",
+          The motor percent full-load efficiency at the full seepd should be 1",
           level=AssertionLevel.error)
-          "Check if the motor efficiency curve is correct";
+          "Check if the motor efficiency curve is consistent with the nominal condition";
 equation
   P = per.P_nominal*uSpe/Buildings.Utilities.Math.Functions.smoothInterpolation(
         x=uSpe,

From 3a28f6db340f84c8ec2f65449cf0c8a0b281dd69 Mon Sep 17 00:00:00 2001
From: SenHuang19 <jhy1987@gmail.com>
Date: Thu, 20 Jun 2024 23:41:48 -0400
Subject: [PATCH 16/27] model doc improve

---
 ...> heatExchangerEffectivenessParameters.mo} | 13 ++---
 ...s_yMot.mo => motorEfficiencyParameters.mo} | 14 +++---
 .../BaseClasses/Characteristics/package.order |  4 +-
 .../BaseClasses/Data/ASHRAE.mo                |  6 +--
 .../BaseClasses/Data/Generic.mo               | 48 ++++++++-----------
 .../BaseClasses/Data/package.mo               |  4 +-
 .../BaseClasses/Data/package.order            |  2 +-
 .../BaseClasses/package.mo                    |  2 +-
 .../BaseClasses/package.order                 |  2 +-
 .../VariableSpeedThermalWheels/Latent.mo      | 20 +++++---
 .../VariableSpeedThermalWheels/Sensible.mo    | 30 ++++++------
 .../Validation/VariableSpeedThermalWheels.mo  |  4 +-
 .../VariableSpeedThermalWheels/package.order  |  2 +-
 .../Latent/Examples/SpaceCooling.mo           |  2 +-
 .../Latent/Validation/SpeedControlled.mo      |  2 +-
 .../BaseClasses/Validation/Effectiveness.mo   |  3 +-
 .../Sensible/Examples/SpaceCooling.mo         | 24 +++++-----
 .../Sensible/Validation/SpeedControlled.mo    |  2 +-
 18 files changed, 95 insertions(+), 89 deletions(-)
 rename Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/{effectivenessParameters.mo => heatExchangerEffectivenessParameters.mo} (60%)
 rename Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/{efficiencyParameters_yMot.mo => motorEfficiencyParameters.mo} (69%)

diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/effectivenessParameters.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/heatExchangerEffectivenessParameters.mo
similarity index 60%
rename from Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/effectivenessParameters.mo
rename to Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/heatExchangerEffectivenessParameters.mo
index a08ca8ef16b..40a0c059147 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/effectivenessParameters.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/heatExchangerEffectivenessParameters.mo
@@ -1,15 +1,16 @@
 within Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Characteristics;
-record effectivenessParameters
-  "Record for heat exchange effectiveness correction vs. wheel speed ratio"
+record heatExchangerEffectivenessParameters
+  "Record for heat exchanger effectiveness correction vs. wheel speed ratio"
   extends Modelica.Icons.Record;
   parameter Real uSpe[:](each min=0)
     "Wheel speed ratio";
-  parameter Real epsCor[:]
-    "correction of the heat exchange effectiveness under a given speed ratio";
+  parameter Real epsCor[:](each max=1)
+    "Correction of the heat exchange effectiveness under a given speed ratio";
   annotation (Documentation(info="<html>
 <p>
 Data record that describes wheel speed ratio versus
-heat exchange effectiveness corrections.
+heat exchange effectiveness corrections, i.e., the ratio of the heat exchange effectiveness 
+to that when the <code>uSpe</code> is <i>1</i>.
 The wheel speed ratio <code>uSpe</code> must be increasing, 
 i.e.,<code>uSpe[i] &lt; uSpe[i+1]</code>.
 Both vectors, <code>uSpe</code> and <code>uSpe</code>
@@ -23,4 +24,4 @@ First implementation.
 </li>
 </ul>
 </html>"));
-end effectivenessParameters;
+end heatExchangerEffectivenessParameters;
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/efficiencyParameters_yMot.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/motorEfficiencyParameters.mo
similarity index 69%
rename from Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/efficiencyParameters_yMot.mo
rename to Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/motorEfficiencyParameters.mo
index d57d20e57d0..9abaa59cc25 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/efficiencyParameters_yMot.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/motorEfficiencyParameters.mo
@@ -1,11 +1,11 @@
 within Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Characteristics;
-record efficiencyParameters_yMot
-  "Record for efficiency parameters vs. motor part load ratio"
+record motorEfficiencyParameters
+  "Record for motor efficiency parameters vs. wheel speed ratio"
   extends Modelica.Icons.Record;
-  parameter Real y[:](each min=0)
-    "Part load ratio, y = PEle/PEle_nominal";
-  parameter Modelica.Units.SI.Efficiency eta[size(y, 1)](each max=1)
-    "Wheel motor efficiency at these part load ratios";
+  parameter Real uSpe[:](each min=0)
+    "Wheel speed ratio";
+  parameter Modelica.Units.SI.Efficiency eta[size(uSpe, 1)](each max=1)
+    "Wheel motor efficiency at wheel speed ratios";
   annotation (Documentation(info="<html>
 <p>
 This function is identical to
@@ -23,4 +23,4 @@ Buildings.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters_yMot</a>
 </li>
 </ul>
 </html>"));
-end efficiencyParameters_yMot;
+end motorEfficiencyParameters;
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/package.order b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/package.order
index 6d78b76079d..5c5b0653564 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/package.order
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/package.order
@@ -1,2 +1,2 @@
-effectivenessParameters
-efficiencyParameters_yMot
+heatExchangerEffectivenessParameters
+motorEfficiencyParameters
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/ASHRAE.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/ASHRAE.mo
index 78b00b00bdb..8d4e0a889ef 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/ASHRAE.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/ASHRAE.mo
@@ -1,11 +1,11 @@
-within Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data;
+within Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data;
 record ASHRAE =
   Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.Generic
     (senHeatExchangeEffectiveness(uSpe={0,0.1,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,1},
         epsCor={0,0.40,0.71,0.83,0.90,0.93,0.96,0.97,0.98,0.99,1}),
       latHeatExchangeEffectiveness(uSpe={0,0.15,0.3,0.4,0.5,0.6,0.7,0.8,0.9,1},
         epsCor={0,0.26,0.37,0.58,0.72,0.81,0.86,0.90,0.96,1}))
-      "Default data record for wheels"
+      "ASHRAE data record for variable-speed thermal wheels"
   annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
         coordinateSystem(preserveAspectRatio=false)),
   Documentation(revisions="<html>
@@ -17,7 +17,7 @@ First implementation.
 </ul>
 </html>", info="<html>
 <p>
-Performance dataset for the variable-speed wheel model.
+ASHRAE performance dataset for the variable-speed wheel model.
 </p>
 <p>
 It is developed based on Figure 7 in ASHRAE (2024).
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/Generic.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/Generic.mo
index b38a831b3c8..bbb85460a44 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/Generic.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/Generic.mo
@@ -1,32 +1,26 @@
 within Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data;
-record Generic "Generic data record for wheels"
+record Generic "Generic data record for variable-speed wheels"
   extends Modelica.Icons.Record;
   import cha = Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Characteristics;
   parameter Real P_nominal(final unit="W")=100
     "Power consumption at the design condition";
-  parameter
-    cha.effectivenessParameters
-    senHeatExchangeEffectiveness(
-      uSpe={0},
-      epsCor={0.7})
+  parameter cha.heatExchangerEffectivenessParameters
+    senHeatExchangeEffectiveness(uSpe={0}, epsCor={0.7})
     "Sensible heat exchange effectiveness vs. wheel speed ratio"
     annotation (Dialog(group="Heat exchange effectiveness computation"));
+  parameter cha.heatExchangerEffectivenessParameters
+    latHeatExchangeEffectiveness(uSpe={0}, epsCor={0.7})
+    "Latent heat exchange effectiveness vs. wheel speed ratio" annotation (
+      Dialog(group="Heat exchange effectiveness computation", enable=
+          haveLatentHeatExchange));
   parameter
-    cha.effectivenessParameters
-    latHeatExchangeEffectiveness(
-      uSpe={0},
-      epsCor={0.7})
-    "Latent heat exchange effectiveness vs. wheel speed ratio"
-    annotation (Dialog(group="Heat exchange effectiveness computation",
-                enable=haveLatentHeatExchange));
-  parameter
-    cha.efficiencyParameters_yMot
-    motorEfficiency_uSpe(y={0}, eta={0.7})
+    cha.motorEfficiencyParameters
+    motorEfficiency(uSpe={0}, eta={0.7})
     "Motor efficiency vs. wheel speed ratio"
     annotation (Dialog(group="Power computation", enable=useDefaultMotorEfficiencyCurve ==
       false));
   final parameter
-    cha.efficiencyParameters_yMot
+    Buildings.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters_yMot
     motorEfficiency_default=
     Buildings.Fluid.Movers.BaseClasses.Characteristics.motorEfficiencyCurve(
          P_nominal=P_nominal,
@@ -48,7 +42,7 @@ First implementation.
 </ul>
 </html>", info="<html>
 <p>
-Record containing power and heat exchange parameters for wheels.
+Record containing power and heat exchange parameters for variable-speed thermal wheels.
 </p>
 <p>
 It is used as a template of performance data
@@ -61,22 +55,22 @@ The record contains four datasets:
 </p>
 <ul>
 <li>
-wheel speed ratio versus motor percent full-load 
-efficiency
+wheel speed ratio versus motor percent full-load
+efficiency,
 </li>
 <li>
 wheel speed ratio versus default motor percent full-load 
 efficiency (see <a href=
 \"modelica://Buildings.Fluid.Movers.BaseClasses.Characteristics.motorEfficiencyCurve\">
-Buildings.Fluid.Movers.BaseClasses.Characteristics.motorEfficiencyCurve</a>.)
+Buildings.Fluid.Movers.BaseClasses.Characteristics.motorEfficiencyCurve</a>),
 </li>
 <li>
-wheel speed ratio versus sensible heat exchange effectiveness 
-corrections
+wheel speed ratio versus sensible heat exchange effectiveness
+corrections,
 </li>
 <li>
-wheel speed ratio versus latent heat exchange effectiveness 
-corrections
+wheel speed ratio versus latent heat exchange effectiveness
+corrections.
 </li>
 </ul>
 <p>
@@ -86,13 +80,13 @@ Note that
 <li>
 When <code>haveLatentHeatExchange</code> is false,
 the dataset of wheel speed ratio versus latent heat exchange effectiveness 
-corrections is disabled.
+corrections is disabled,
 </li>
 <li>
 When <code>useDefaultMotorEfficiencyCurve</code> is true,
 the curve of wheel speed ratio versus motor percent full-load 
 efficiency is disabled while the curve of wheel speed ratio 
-versus default motor percent full-load efficiency is enabled 
+versus default motor percent full-load efficiency is enabled. 
 </li>
 </ul>
 </html>"));
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/package.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/package.mo
index 7228db38be2..8189a7930bd 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/package.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/package.mo
@@ -1,10 +1,10 @@
 within Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses;
-package Data "Performance data for desiccant dehumidifier"
+package Data "Performance data for variable-speed wheels"
 extends Modelica.Icons.MaterialPropertiesPackage;
 
 annotation (Documentation(info="<html>
 <p>
-This package contains data for wheels.
+This package contains performance data sets for variable-speed thermal wheels.
 </p>
 </html>"));
 end Data;
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/package.order b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/package.order
index acd917528b4..6f0d8f2a121 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/package.order
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/package.order
@@ -1,2 +1,2 @@
-Generic
 ASHRAE
+Generic
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/package.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/package.mo
index 5e006e46664..9d91622d4a1 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/package.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/package.mo
@@ -1,5 +1,5 @@
 within Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels;
-package BaseClasses "Package with base classes for the wheel model"
+package BaseClasses "Package with base classes for the variable-speed thermal wheel model"
 extends Modelica.Icons.BasesPackage;
 
 annotation (Documentation(revisions="<html>
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/package.order b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/package.order
index 73006f323ed..007bddaaa4e 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/package.order
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/package.order
@@ -1,2 +1,2 @@
-Data
 Characteristics
+Data
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Latent.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Latent.mo
index cea782d7bf6..a6e6ce60ab7 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Latent.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Latent.mo
@@ -10,7 +10,8 @@ equation
   epsLatCor = Buildings.Utilities.Math.Functions.smoothInterpolation(
                 x=uSpe,
                 xSup=per.latHeatExchangeEffectiveness.uSpe,
-                ySup=per.latHeatExchangeEffectiveness.epsCor);
+                ySup=per.latHeatExchangeEffectiveness.epsCor)
+                "Calculate the latent heat exchanger effectiveness correction";
 
   annotation (
   defaultComponentName="latWhe",
@@ -23,17 +24,22 @@ heat exchange effectiveness correction of an enthalpy wheel.
 <p>
 The calculation of the power consumption and the sensible 
 heat exchange effectiveness correction can be referred to
-<a href=\"modelica://Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Sensible\">
+<a href=\"modelica://Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Sensible\"> 
 Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Sensible</a>.
 </p>
 <p>
 The latent heat exchange effectiveness correction is calculated based 
 on the cubic hermite spline interpolation of the latent heat exchange 
 effectiveness dataset (see 
-<a href=\"modelica://Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Characteristics.effectivenessParameters\">
-Buildings.Fluid.HeatExchangers.BaseClasses.BaseClasses.VariableSpeedThermalWheels.Characteristics.effectivenessParameters</a>).
+<a href=\"modelica://Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Characteristics.heatExchangerEffectivenessParameters\">
+Buildings.Fluid.HeatExchangers.BaseClasses.BaseClasses.VariableSpeedThermalWheels.Characteristics.heatExchangerEffectivenessParameters</a>).
 </p>
-</html>")
-       ", revisions=",
-    Error);
+</html>", revisions="<html>
+<ul>
+<li>
+May 28, 2024, by Sen Huang:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
 end Latent;
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Sensible.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Sensible.mo
index 4a0979429e3..2555d88401c 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Sensible.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Sensible.mo
@@ -3,11 +3,11 @@ model Sensible "Sensible heat wheels"
   extends Modelica.Blocks.Icons.Block;
   import whe = Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels;
   final parameter Real xSpe[:] = if per.useDefaultMotorEfficiencyCurve
-    then per.motorEfficiency_default.y else per.motorEfficiency_uSpe.y
+    then per.motorEfficiency_default.y else per.motorEfficiency.uSpe
     "x-axis support points of the power efficiency curve"
     annotation (Dialog(group="Efficiency"));
   final parameter Real[size(xSpe,1)] yeta = if per.useDefaultMotorEfficiencyCurve
-    then per.motorEfficiency_default.eta else per.motorEfficiency_uSpe.eta
+    then per.motorEfficiency_default.eta else per.motorEfficiency.eta
     "y-axis support points of the power efficiency curve"
     annotation (Dialog(group="Efficiency"));
   parameter whe.BaseClasses.Data.Generic per
@@ -24,9 +24,9 @@ model Sensible "Sensible heat wheels"
     annotation (Placement(transformation(extent={{100,60},{140,100}}),
         iconTransformation(extent={{100,60},{140,100}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput epsSenCor(final unit="1")
-    "Sensible heat exchanger effectiveness correction" annotation (Placement(
-        transformation(extent={{100,-20},{140,20}}), iconTransformation(extent={{100,-20},
-            {140,20}})));
+    "Sensible heat exchanger effectiveness correction"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}}),
+    iconTransformation(extent={{100,-20},{140,20}})));
 
 initial equation
   for i in 1:size(yeta,1)-1 loop
@@ -46,11 +46,13 @@ equation
   P = per.P_nominal*uSpe/Buildings.Utilities.Math.Functions.smoothInterpolation(
         x=uSpe,
         xSup=xSpe,
-        ySup=yeta);
+        ySup=yeta)
+        "Calculate the wheel power consumption";
   epsSenCor = Buildings.Utilities.Math.Functions.smoothInterpolation(
                 x=uSpe,
                 xSup=per.senHeatExchangeEffectiveness.uSpe,
-                ySup=per.senHeatExchangeEffectiveness.epsCor);
+                ySup=per.senHeatExchangeEffectiveness.epsCor)
+                "Calculate the sensible heat exchanger effectiveness correction";
    annotation (
    defaultComponentName="senWhe",
    Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
@@ -69,21 +71,21 @@ P = P_nominal * uSpe / eta,
 </p>
 <p>
 where <code>P_nominal</code> is the nominal wheel power consumption,
-<code>uSpe</code> is the wheel speed ratio.
-The <code>eta</code> is the motor percent full-load efficiency, i.e.,
+<code>uSpe</code> is the wheel speed ratio, 
+and the <code>eta</code> is the motor percent full-load efficiency, i.e.,
 the ratio of the motor efficiency to that when the <code>uSpe</code> is <i>1</i>.
 The <code>eta</code> is obtained based on the cubic hermite spline interpolation of
-the motor percent full-load efficiency dataset (see  
-<a href=\"modelica://Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Characteristics.efficiencyParameters_yMot\">
-Buildings.Fluid.HeatExchangers.BaseClasses.BaseClasses.VariableSpeedThermalWheels.Characteristics.efficiencyParameters_yMot</a>.).
+the motor percent full-load efficiency dataset (see 
+<a href=\"modelica://Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Characteristics.motorEfficiencyParameters\">
+Buildings.Fluid.HeatExchangers.BaseClasses.BaseClasses.VariableSpeedThermalWheels.Characteristics.motorEfficiencyParameters</a>.).
 Please note that <code>uSpe/eta</code> should be less or equal to 1.
 </p>
 </li>
 <li>
 The sensible heat exchanger effectiveness correction is calculated based 
 on the cubic hermite spline interpolation of the sensible heat exchanger effectiveness 
-dataset (see <a href=\"modelica://Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Characteristics.effectivenessParameters\">
-Buildings.Fluid.HeatExchangers.BaseClasses.BaseClasses.VariableSpeedThermalWheels.Characteristics.effectivenessParameters</a>).
+dataset (see <a href=\"modelica://Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Characteristics.heatExchangerEffectivenessParameters\">
+Buildings.Fluid.HeatExchangers.BaseClasses.BaseClasses.VariableSpeedThermalWheels.Characteristics.heatExchangerEffectivenessParameters</a>).
 </li>
 </ul>
 </html>", revisions="<html>
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/VariableSpeedThermalWheels.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/VariableSpeedThermalWheels.mo
index b473f2025b4..442c6d78773 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/VariableSpeedThermalWheels.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/VariableSpeedThermalWheels.mo
@@ -8,7 +8,7 @@ model VariableSpeedThermalWheels
     annotation (Placement(transformation(extent={{-10,40},{10,60}})));
   Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.ASHRAE
     perSenWhe(
-    motorEfficiency_uSpe(y={0.1,0.6,0.8,1}, eta={0.3,0.8,0.85,1}),
+    motorEfficiency(uSpe={0.1,0.6,0.8,1}, eta={0.3,0.8,0.85,1}),
     haveLatentHeatExchange=false,
     useDefaultMotorEfficiencyCurve=false)
     "Performance record for the sensible heat wheel"
@@ -29,7 +29,7 @@ model VariableSpeedThermalWheels
     "Enthalpy wheel with default motor curve"
     annotation (Placement(transformation(extent={{-10,-60},{10,-40}})));
   Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.ASHRAE perLatWhe(
-    motorEfficiency_uSpe(y={0.1,0.6,0.8,1}, eta={0.3,0.8,0.85,1}),
+    motorEfficiency(uSpe={0.1,0.6,0.8,1}, eta={0.3,0.8,0.85,1}),
     haveLatentHeatExchange=true,
     useDefaultMotorEfficiencyCurve=false)
     "Performance record for the enthalpy wheel"
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/package.order b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/package.order
index 4e09a41bf7e..4a24277e3d0 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/package.order
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/package.order
@@ -1,4 +1,4 @@
 Latent
 Sensible
 BaseClasses
-Validation
+Validation
\ No newline at end of file
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mo
index 7dff98a7795..674d8051a47 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mo
@@ -294,7 +294,7 @@ The bypass damper positions are controlled to maintain the temperature of the ai
 </li>
 </ul>
 <p>
-The expected outputs are:
+The expected output is:
 </p>
 <ul>
 <li>
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mo
index 9a67d5c8f02..30eee994ee9 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mo
@@ -85,7 +85,7 @@ model SpeedControlled
     annotation (Placement(transformation(extent={{40,20},{60,40}})));
   Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.ASHRAE
     perLatWhe(
-    motorEfficiency_uSpe(y={0.1,0.6,0.8,1}, eta={0.3,0.8,0.9,1}),
+    motorEfficiency(uSpe={0.1,0.6,0.8,1}, eta={0.3,0.8,0.9,1}),
     haveLatentHeatExchange=true,
     useDefaultMotorEfficiencyCurve=false)
     "Performance record for the enthalpy wheel"
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Validation/Effectiveness.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Validation/Effectiveness.mo
index abffcbe3716..de8f406914b 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Validation/Effectiveness.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Validation/Effectiveness.mo
@@ -8,7 +8,8 @@ model Effectiveness
     epsCooPL=0.75,
     epsHea_nominal=0.7,
     epsHeaPL=0.6,
-    mSup_flow_nominal=1) "Effectiveness calculator"
+    mSup_flow_nominal=1)
+    "Effectiveness calculator"
     annotation (Placement(transformation(extent={{-12,-10},{8,10}})));
   Modelica.Blocks.Sources.Ramp TSup(
     height=5,
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo
index 69832fa285f..3a35e2ccb72 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo
@@ -128,7 +128,7 @@ model SpaceCooling "Space cooling system"
   Buildings.Fluid.Sensors.TemperatureTwoPort senTemHXOut(redeclare package
       Medium = MediumA, m_flow_nominal=mA_flow_nominal)
     "Temperature sensor for heat recovery outlet on supply side"
-    annotation (Placement(transformation(extent={{-64,-26},{-52,-14}})));
+    annotation (Placement(transformation(extent={{-66,-26},{-54,-14}})));
   Buildings.Fluid.Sensors.TemperatureTwoPort senTemSupAir(redeclare package
       Medium = MediumA, m_flow_nominal=mA_flow_nominal)
     "Temperature sensor for supply air"
@@ -146,10 +146,11 @@ model SpaceCooling "Space cooling system"
     "Operating signal"
     annotation (Placement(transformation(extent={{-160,-70},{-140,-50}})));
   Buildings.Controls.Continuous.LimPID conPID(k=0.1, Ti=60)
-    annotation (Placement(transformation(extent={{-46,10},{-26,30}})));
+    "Heat recovery controller"
+    annotation (Placement(transformation(extent={{-50,10},{-30,30}})));
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant TMixSetPoi(k=TMixSet)
     "Mixed air temperature set point"
-    annotation (Placement(transformation(extent={{-88,10},{-68,30}})));
+    annotation (Placement(transformation(extent={{-100,10},{-80,30}})));
   Buildings.Fluid.Sensors.TemperatureTwoPort senTemRetAir(
     redeclare package Medium = MediumA,
     m_flow_nominal=mA_flow_nominal)
@@ -217,11 +218,11 @@ equation
       index=-1,
       extent={{-6,3},{-6,3}}));
   connect(whe.port_b1, senTemHXOut.port_a) annotation (Line(
-      points={{-80,-20.2},{-80,-20},{-64,-20}},
+      points={{-80,-20.2},{-80,-20},{-66,-20}},
       color={0,127,255},
       smooth=Smooth.None));
   connect(senTemHXOut.port_b, cooCoi.port_a2) annotation (Line(
-      points={{-52,-20},{-40,-20}},
+      points={{-54,-20},{-40,-20}},
       color={0,127,255},
       smooth=Smooth.None));
   connect(cooCoi.port_b2, senTemSupAir.port_a) annotation (Line(
@@ -247,9 +248,10 @@ equation
       points={{-138,-60},{-106,-60},{-106,-32.2},{-102,-32.2}},
       color={255,0,255}));
   connect(TMixSetPoi.y,conPID. u_s)
-    annotation (Line(points={{-66,20},{-48,20}}, color={0,0,127}));
-  connect(senTemHXOut.T,conPID. u_m) annotation (Line(points={{-58,-13.4},{-58,2},
-          {-36,2},{-36,8}}, color={0,0,127}));
+    annotation (Line(points={{-78,20},{-52,20}}, color={0,0,127}));
+  connect(senTemHXOut.T,conPID. u_m) annotation (Line(points={{-60,-13.4},{-60,
+          0},{-40,0},{-40,8}},
+                            color={0,0,127}));
   connect(senTemRetAir.port_a, vol.ports[2])
     annotation (Line(points={{58,-60},{71,-60},{71,20}}, color={0,127,255}));
   connect(senTemRetAir.port_b, whe.port_a2) annotation (Line(points={{46,-60},{-40,
@@ -262,8 +264,8 @@ equation
           {100,-140},{100,80},{91,80}}, color={0,0,127}));
   connect(mAir_flow.y, fan.m_flow_in)
     annotation (Line(points={{22,10},{50,10},{50,-8}}, color={0,0,127}));
-  connect(conPID.y, whe.uBypDamPos) annotation (Line(points={{-25,20},{-10,20},{
-          -10,-54},{-110,-54},{-110,-24},{-102,-24}}, color={0,0,127}));
+  connect(conPID.y, whe.uBypDamPos) annotation (Line(points={{-29,20},{-10,20},
+          {-10,-54},{-110,-54},{-110,-24},{-102,-24}},color={0,0,127}));
   annotation (Documentation(info="<html>
 <p>
 This block is identical to
@@ -290,7 +292,7 @@ The bypass damper positions are controlled to maintain the temperature of the ai
 </li>
 </ul>
 <p>
-The expected outputs are:
+The expected output is:
 </p>
 <ul>
 <li>
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mo
index fcafac3c3a0..80647a67b8a 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mo
@@ -75,7 +75,7 @@ model SpeedControlled
     per=perDefMotCur)    "Wheel with a default curve"
     annotation (Placement(transformation(extent={{0,-30},{20,-10}})));
   Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.ASHRAE per(
-    motorEfficiency_uSpe(y={0.1,0.6,0.8,1}, eta={0.3,0.8,0.9,1}),
+    motorEfficiency(uSpe={0.1,0.6,0.8,1}, eta={0.3,0.8,0.9,1}),
     haveLatentHeatExchange=false,
     useDefaultMotorEfficiencyCurve=false)
     "Performance record for the sensible heat wheel"

From 84f9d01f0e2b65872ef5a4bb21ae4545d3d6dd6c Mon Sep 17 00:00:00 2001
From: SenHuang19 <jhy1987@gmail.com>
Date: Fri, 21 Jun 2024 23:44:05 -0400
Subject: [PATCH 17/27] format update

---
 .../Latent/BaseClasses/PartialWheel.mo        |  4 ++--
 .../ThermalWheels/Latent/BypassDampers.mo     | 19 +++++++--------
 .../Latent/Examples/SpaceCooling.mo           |  2 +-
 .../ThermalWheels/Latent/SpeedControlled.mo   | 10 ++++----
 .../Latent/Validation/BypassDampers.mo        |  3 +--
 .../Latent/Validation/SpeedControlled.mo      |  6 ++---
 .../Sensible/BaseClasses/PartialWheel.mo      | 11 ++++-----
 .../ThermalWheels/Sensible/BypassDampers.mo   | 16 ++++++-------
 .../Sensible/Examples/SpaceCooling.mo         |  9 +++----
 .../ThermalWheels/Sensible/SpeedControlled.mo | 14 ++++-------
 .../Sensible/Validation/BypassDampers.mo      | 12 ++++------
 .../Sensible/Validation/SpeedControlled.mo    | 24 +++++++++----------
 12 files changed, 56 insertions(+), 74 deletions(-)

diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/PartialWheel.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/PartialWheel.mo
index dd7e4bb72bc..c9a2c73d82c 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/PartialWheel.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/PartialWheel.mo
@@ -133,7 +133,7 @@ equation
   connect(senSupMasFlo.m_flow, effCal.mSup_flow) annotation (Line(points={{60,17},
           {60,60},{-110,60},{-110,8},{-102,8}}, color={0,0,127}));
   connect(senExhMasFlo.m_flow, effCal.mExh_flow) annotation (Line(points={{-110,
-          -33},{-110,4},{-102,4}},                 color={0,0,127}));
+          -33},{-110,4},{-102,4}}, color={0,0,127}));
   connect(hex.port_b1, senSupMasFlo.port_a)
     annotation (Line(points={{30,6},{50,6}}, color={0,127,255}));
   connect(senSupMasFlo.port_b, port_b1) annotation (Line(points={{70,6},{80,6},
@@ -141,7 +141,7 @@ equation
   connect(senExhMasFlo.port_a, hex.port_b2) annotation (Line(points={{-100,-44},
           {-30,-44},{-30,-6},{10,-6}},  color={0,127,255}));
   connect(senExhMasFlo.port_b, port_b2) annotation (Line(points={{-120,-44},{-166,
-          -44},{-166,-80},{-180,-80}},      color={0,127,255}));
+          -44},{-166,-80},{-180,-80}},color={0,127,255}));
 annotation (
         defaultComponentName="whe",
         Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo
index b8938b9c08b..4482c7980d3 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo
@@ -33,14 +33,14 @@ model BypassDampers
     final dpDamper_nominal=dpDamper_nominal)
     "Supply air damper"
     annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},rotation=0,origin={-90,36})));
+    extent={{-10,-10},{10,10}},rotation=0,origin={-90,36})));
   Buildings.Fluid.Actuators.Dampers.Exponential damExh(
     redeclare package Medium = Medium,
     final m_flow_nominal=mExh_flow_nominal,
     final dpDamper_nominal=dpDamper_nominal)
     "Exhaust air damper"
     annotation (Placement(transformation(
-        extent={{10,10},{-10,-10}},rotation=-90,origin={40,-44})));
+    extent={{10,10},{-10,-10}},rotation=-90,origin={40,-44})));
   Buildings.Fluid.Actuators.Dampers.Exponential bypDamExh(
     redeclare package Medium = Medium,
     final m_flow_nominal=mExh_flow_nominal,
@@ -66,7 +66,6 @@ protected
     final realFalse=0)
     "Electric power consumption for motor"
     annotation (Placement(transformation(extent={{-122,-110},{-102,-90}})));
-protected
   Modelica.Blocks.Sources.Constant zero(final k=0)
     "Zero signal"
     annotation (Placement(transformation(extent={{-140,150},{-120,170}})));
@@ -78,13 +77,13 @@ equation
     annotation (Line(points={{28,-44},{0,-44},{0,100},{-78,100}},   color={0,0,127}));
   connect(bypDamSup.y, uBypDamPos)
     annotation (Line(points={{-38,92},{-38,98},{-72,98},{-72,84},{-160,84},{-160,
-          140},{-200,140}},                                  color={0,0,127}));
+          140},{-200,140}},color={0,0,127}));
   connect(damSup.port_b, hex.port_a1)
     annotation (Line(points={{-80,36},{-30,36},{-30,6},{10,6}},
     color={0,127,255}));
   connect(bypDamExh.y, uBypDamPos)
     annotation (Line(points={{-10,-48},{-10,-40},{-94,-40},{-94,-24},{-114,-24},
-          {-114,84},{-160,84},{-160,140},{-200,140}},
+    {-114,84},{-160,84},{-160,140},{-200,140}},
     color={0,0,127}));
   connect(sub.u2, uBypDamPos)
     annotation (Line(points={{-102,94},{-160,94},{-160,140},{-200,140}},
@@ -93,20 +92,19 @@ equation
     annotation (Line(points={{-119,120},{-110,120},{-110,106},{-102,106}},
     color={0,0,127}));
   connect(PEle.y, P) annotation (Line(points={{-101,-100},{80,-100},{80,-40},{120,
-          -40}},
-    color={0,0,127}));
+    -40}},color={0,0,127}));
   connect(damSup.port_a, port_a1) annotation (Line(points={{-100,36},{-130,36},{-130,80},{-180,80}},
     color={0,127,255}));
   connect(damExh.port_b, hex.port_a2)
     annotation (Line(points={{40,-34},{40,-6},{30,-6}}, color={0,127,255}));
   connect(bypDamExh.port_b, port_b2)
     annotation (Line(points={{-20,-60},{-100,-60},{-100,-80},{-180,-80}},
-                                                    color={0,127,255}));
+    color={0,127,255}));
   connect(damExh.port_a, port_a2)
     annotation (Line(points={{40,-54},{40,-80},{100,-80}}, color={0,127,255}));
   connect(bypDamExh.port_a, port_a2)
     annotation (Line(points={{0,-60},{50,-60},{50,-80},{100,-80}},
-                                                 color={0,127,255}));
+    color={0,127,255}));
   connect(bypDamSup.port_b, port_b1)
     annotation (Line(points={{-28,80},{100,80}}, color={0,127,255}));
   connect(bypDamSup.port_a, port_a1)
@@ -128,8 +126,7 @@ equation
   connect(swiepsLat.y, hex.epsLat) annotation (Line(points={{-18,130},{-10,130},
           {-10,-3},{8,-3}}, color={0,0,127}));
   connect(swiepsSen.y, epsSen) annotation (Line(points={{-18,160},{38,160},{38,
-          40},{120,40}},
-                     color={0,0,127}));
+          40},{120,40}}, color={0,0,127}));
   connect(swiepsLat.y, epsLat) annotation (Line(points={{-18,130},{88,130},{88,0},
           {120,0}}, color={0,0,127}));
   connect(PEle.u, uRot) annotation (Line(points={{-124,-100},{-172,-100},{-172,0},
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mo
index 674d8051a47..79ceef3f751 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Examples/SpaceCooling.mo
@@ -255,7 +255,7 @@ equation
           {-48,2},{-48,8}}, color={0,0,127}));
   connect(conHX.y, whe.uBypDamPos) annotation (Line(points={{-37,20},{-14,20},{
           -14,-80},{-112,-80},{-112,-24.6},{-104.2,-24.6}},
-                                                  color={0,0,127}));
+          color={0,0,127}));
   connect(vol.ports[2], senTemRetAir.port_a)
     annotation (Line(points={{71,20},{71,-46},{54,-46}}, color={0,127,255}));
   connect(conRoo.u_m, senTemRoo.T) annotation (Line(points={{-80,-112},{-80,-140},
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/SpeedControlled.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/SpeedControlled.mo
index 3b560c36cd9..9f8e05ecaba 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/SpeedControlled.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/SpeedControlled.mo
@@ -13,7 +13,7 @@ model SpeedControlled
     final max=1)
     "Wheel speed ratio"
     annotation (Placement(transformation(extent={{-220,-20},{-180,20}}),
-        iconTransformation(extent={{-140,-20},{-100,20}})));
+    iconTransformation(extent={{-140,-20},{-100,20}})));
   Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Latent
     latWhe(final per=per)
     "Correct the wheel performance based on the wheel speed"
@@ -44,13 +44,11 @@ equation
   connect(hex.epsLat, mul1.y) annotation (Line(points={{8,-3},{-20,-3},{-20,100},
           {-38,100}}, color={0,0,127}));
   connect(mul.y, epsSen) annotation (Line(points={{-38,140},{20,140},{20,40},{
-          120,40}},
-                color={0,0,127}));
+          120,40}},color={0,0,127}));
   connect(mul1.y, epsLat) annotation (Line(points={{-38,100},{90,100},{90,0},{
-          120,0}},    color={0,0,127}));
+          120,0}},color={0,0,127}));
   connect(latWhe.P, P) annotation (Line(points={{-98,128},{-88,128},{-88,40},{
-          -46,40},{-46,-40},{120,-40}},
-                                    color={0,0,127}));
+          -46,40},{-46,-40},{120,-40}},color={0,0,127}));
   connect(latWhe.uSpe, uSpe) annotation (Line(points={{-122,120},{-168,120},{-168,
           0},{-200,0}}, color={0,0,127}));
 annotation (
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/BypassDampers.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/BypassDampers.mo
index 7edef93646f..1a20f7f9a79 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/BypassDampers.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/BypassDampers.mo
@@ -91,8 +91,7 @@ equation
   connect(senExhTem.port_b, sin_2.ports[1])
     annotation (Line(points={{-40,-40},{-58,-40}}, color={0,127,255}));
   connect(senExhTem.port_a, whe.port_b2) annotation (Line(points={{-20,-40},{-8,
-          -40},{-8,-8},{0,-8}},
-    color={0,127,255}));
+          -40},{-8,-8},{0,-8}},color={0,127,255}));
   connect(senSupTem.port_b, sin_1.ports[1])
     annotation (Line(points={{60,30},{70,30}}, color={0,127,255}));
   connect(senSupTem.port_a, whe.port_b1) annotation (Line(points={{40,30},{28,
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mo
index 30eee994ee9..d0d14cff651 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mo
@@ -118,10 +118,10 @@ equation
     color={0,127,255}));
   connect(senSupTem.port_a, wheUseDefCur.port_b1)
     annotation (Line(points={{40,30},{32,30},{32,32},{22,32}},
-                                               color={0,127,255}));
+    color={0,127,255}));
   connect(wheDefCur.port_a1, sou_1.ports[1])
     annotation (Line(points={{2,-0.2},{-16,-0.2},{-16,29},{-20,29}},
-                                                                 color={0,127,255}));
+    color={0,127,255}));
   connect(wheDefCur.port_b2, sin_2.ports[2])
     annotation (Line(points={{2,-16},{-50,-16},{-50,-39},{-58,-39}}, color={0,127,255}));
   connect(wheDefCur.port_a2, sou_2.ports[2])
@@ -179,7 +179,7 @@ and the leaving exhaust air temperature increases.
 <li>
 The power consumption of the instance <code>wheUseDefCur</code> is higher than that of the instance <code>wheDefCur</code>
 when <i>uSpe</i> is less than 1.
-The power consumption of those two instances are identical when <i>uSpe</i> equals to <i>1</i>.
+The power consumption of those two instances are identical when <i>uSpe</i> equals <i>1</i>.
 </li>
 </ul>
 </html>", revisions="<html>
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/PartialWheel.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/PartialWheel.mo
index e1823150fc3..87b7824f177 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/PartialWheel.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/PartialWheel.mo
@@ -125,16 +125,13 @@ equation
     color={0,127,255}));
   connect(hex.port_b1, senSupMasFlo.port_a)
     annotation (Line(points={{10,6},{20,6},{20,20},{30,20}},
-                                             color={0,127,255}));
-  connect(senSupMasFlo.port_b, port_b1) annotation (Line(points={{50,20},{60,20},
-          {60,80},{100,80}},
     color={0,127,255}));
+  connect(senSupMasFlo.port_b, port_b1) annotation (Line(points={{50,20},{60,20},
+    {60,80},{100,80}}, color={0,127,255}));
   connect(senExhMasFlo.m_flow, effCal.mExh_flow) annotation (Line(points={{-80,-29},
-          {-80,-20},{-130,-20},{-130,4},{-102,4}},
-    color={0,0,127}));
+    {-80,-20},{-130,-20},{-130,4},{-102,4}}, color={0,0,127}));
   connect(senSupMasFlo.m_flow, effCal.mSup_flow) annotation (Line(points={{40,31},
-          {40,40},{-130,40},{-130,8},{-102,8}},
-    color={0,0,127}));
+    {40,40},{-130,40},{-130,8},{-102,8}}, color={0,0,127}));
 annotation (
         defaultComponentName="whe",
         Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo
index a860654a639..5c408187442 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo
@@ -61,8 +61,8 @@ protected
     final realFalse=0)
     "Electric power consumption for motor"
     annotation (Placement(transformation(extent={{-60,150},{-40,170}})));
-protected
-  Modelica.Blocks.Sources.Constant zero(final k=0) "Zero signal"
+  Modelica.Blocks.Sources.Constant zero(final k=0) 
+    "Zero signal"
     annotation (Placement(transformation(extent={{-160,-40},{-140,-20}})));
 equation
   connect(bypDamSup.port_a, port_a1)
@@ -70,7 +70,7 @@ equation
   connect(bypDamSup.port_b, port_b1)
     annotation (Line(points={{-40,80},{100,80}}, color={0,127,255}));
   connect(bypDamExh.port_a, port_a2)
-    annotation (Line(points={{0,-80},{100,-80}},  color={0,127,255}));
+    annotation (Line(points={{0,-80},{100,-80}}, color={0,127,255}));
   connect(damExh.port_a, port_a2)
     annotation (Line(points={{50,-50},{50,-80},{100,-80}}, color={0,127,255}));
   connect(sub.y, damSup.y)
@@ -102,15 +102,13 @@ equation
   connect(bypDamExh.port_b, port_b2)
     annotation (Line(points={{-20,-80},{-180,-80}}, color={0,127,255}));
   connect(zero.y, swiepsSen.u3) annotation (Line(points={{-139,-30},{-116,-30},{
-          -116,82},{-68,82},{-68,182},{-62,182}},
-                           color={0,0,127}));
+          -116,82},{-68,82},{-68,182},{-62,182}}, color={0,0,127}));
   connect(effCal.eps, swiepsSen.u1) annotation (Line(points={{-78,0},{-74,0},{-74,
-          198},{-62,198}},
-                         color={0,0,127}));
+          198},{-62,198}}, color={0,0,127}));
   connect(swiepsSen.y, hex.eps) annotation (Line(points={{-38,190},{-32,190},{-32,
           0},{-12,0}}, color={0,0,127}));
   connect(swiepsSen.y, eps) annotation (Line(points={{-38,190},{80,190},{80,40},
-          {120,40}},                color={0,0,127}));
+          {120,40}}, color={0,0,127}));
   connect(uRot, swiepsSen.u2) annotation (Line(points={{-200,0},{-170,0},{-170,190},
           {-62,190}}, color={255,0,255}));
   connect(PEle.u, uRot) annotation (Line(points={{-62,160},{-120,160},{-120,190},
@@ -173,7 +171,7 @@ annotation (
 Documentation(info="<html>
 <p>
 Model of a sensible heat recovery wheel, which consists of
-a heat exchanger and two dampers to bypass the supply and exhaust airflow.
+a heat exchanger and two dampers to bypass the supply and exhaust airflow, respectively.
 </p>
 <p>
 This model does not require geometric data. The performance is defined by specifying the
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo
index 3a35e2ccb72..2c6f5bf5d7a 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo
@@ -113,8 +113,10 @@ model SpaceCooling "Space cooling system"
     use_m_flow_in=true,
     T=TWSup_nominal) "Source for water flow rate"
     annotation (Placement(transformation(extent={{-20,-110},{0,-90}})));
-  Buildings.Fluid.Sources.Boundary_pT sinWat(nPorts=1, redeclare package Medium =
-        MediumW) "Sink for water circuit"
+  Buildings.Fluid.Sources.Boundary_pT sinWat(
+    nPorts=1, 
+    redeclare package Medium =MediumW) 
+    "Sink for water circuit"
     annotation (Placement(transformation(extent={{-80,-76},{-60,-56}})));
   Buildings.BoundaryConditions.WeatherData.ReaderTMY3 weaDat(
     pAtmSou=Buildings.BoundaryConditions.Types.DataSource.Parameter,
@@ -250,8 +252,7 @@ equation
   connect(TMixSetPoi.y,conPID. u_s)
     annotation (Line(points={{-78,20},{-52,20}}, color={0,0,127}));
   connect(senTemHXOut.T,conPID. u_m) annotation (Line(points={{-60,-13.4},{-60,
-          0},{-40,0},{-40,8}},
-                            color={0,0,127}));
+          0},{-40,0},{-40,8}}, color={0,0,127}));
   connect(senTemRetAir.port_a, vol.ports[2])
     annotation (Line(points={{58,-60},{71,-60},{71,20}}, color={0,127,255}));
   connect(senTemRetAir.port_b, whe.port_a2) annotation (Line(points={{46,-60},{-40,
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/SpeedControlled.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/SpeedControlled.mo
index f489865cd50..fbc031bba11 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/SpeedControlled.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/SpeedControlled.mo
@@ -18,16 +18,14 @@ model SpeedControlled
     "Correct the wheel performance based on the wheel speed"
     annotation (Placement(transformation(extent={{-160,-10},{-140,10}})));
   Buildings.Controls.OBC.CDL.Reals.Multiply mul
-    "Correct the heat exchanger effectiveness"
+    "Calculate the heat exchanger effectiveness"
     annotation (Placement(transformation(extent={{-52,-20},{-32,0}})));
 
-
 equation
   connect(port_a1, hex.port_a1) annotation (Line(points={{-180,80},{-60,80},{-60,6},
     {-10,6}}, color={0,127,255}));
   connect(hex.port_a2, port_a2) annotation (Line(points={{10,-6},{60,-6},{60,
-          -80},{100,-80}},
-                color={0,127,255}));
+          -80},{100,-80}}, color={0,127,255}));
   connect(senWhe.epsSenCor, mul.u2) annotation (Line(points={{-138,0},{-114,0},
           {-114,-16},{-54,-16}},color={0,0,127}));
   connect(effCal.eps, mul.u1) annotation (Line(points={{-78,0},{-62,0},{-62,-4},
@@ -35,13 +33,11 @@ equation
   connect(mul.y, hex.eps) annotation (Line(points={{-30,-10},{-26,-10},{-26,0},
           {-12,0}},color={0,0,127}));
   connect(uSpe, senWhe.uSpe) annotation (Line(points={{-200,0},{-162,0}},
-                       color={0,0,127}));
+          color={0,0,127}));
   connect(senWhe.P, P) annotation (Line(points={{-138,8},{-134,8},{-134,68},{88,
-          68},{88,-40},{120,-40}},
-                     color={0,0,127}));
+          68},{88,-40},{120,-40}}, color={0,0,127}));
   connect(eps, mul.y) annotation (Line(points={{120,40},{80,40},{80,-20},{-26,
-          -20},{-26,-10},{-30,-10}},
-        color={0,0,127}));
+          -20},{-26,-10},{-30,-10}}, color={0,0,127}));
 annotation (
         defaultComponentName="whe",
         Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/BypassDampers.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/BypassDampers.mo
index 79da1c1c8ee..544a21af3b4 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/BypassDampers.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/BypassDampers.mo
@@ -81,21 +81,17 @@ equation
   connect(whe.port_a2, sou_2.ports[1])
     annotation (Line(points={{20,-8},{40,-8},{40,-30},{70,-30}}, color={0,127,255}));
   connect(bypDamPos.y, whe.uBypDamPos) annotation (Line(points={{-59,0},{-30,0},
-          {-30,4},{-2,4}},
-    color={0,0,127}));
+          {-30,4},{-2,4}},color={0,0,127}));
   connect(opeSig.y, whe.uRot) annotation (Line(points={{-58,70},{-10,70},{-10,
-          -4.2},{-2,-4.2}},
-             color={255,0,255}));
+          -4.2},{-2,-4.2}},color={255,0,255}));
   connect(whe.port_b2, senExhTem.port_a) annotation (Line(points={{0,-7.8},{-20,
-          -7.8},{-20,-34},{-30,-34}},
-                          color={0,127,255}));
+          -7.8},{-20,-34},{-30,-34}},color={0,127,255}));
   connect(senExhTem.port_b, sin_2.ports[1])
     annotation (Line(points={{-50,-34},{-60,-34}}, color={0,127,255}));
   connect(senSupTem.port_a, sin_1.ports[1])
     annotation (Line(points={{60,30},{70,30}}, color={0,127,255}));
   connect(senSupTem.port_b, whe.port_b1) annotation (Line(points={{40,30},{30,
-          30},{30,7.8},{20,7.8}},
-                    color={0,127,255}));
+          30},{30,7.8},{20,7.8}},color={0,127,255}));
 annotation(experiment(Tolerance=1e-6, StopTime=360),
 __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/BypassDampers.mos"
         "Simulate and plot"),
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mo
index 80647a67b8a..6eb1dbe036c 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mo
@@ -72,7 +72,8 @@ model SpeedControlled
     redeclare package Medium = Medium,
     mSup_flow_nominal=5,
     mExh_flow_nominal=5,
-    per=perDefMotCur)    "Wheel with a default curve"
+    per=perDefMotCur)    
+    "Wheel with a default curve"
     annotation (Placement(transformation(extent={{0,-30},{20,-10}})));
   Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.ASHRAE per(
     motorEfficiency(uSpe={0.1,0.6,0.8,1}, eta={0.3,0.8,0.9,1}),
@@ -81,7 +82,8 @@ model SpeedControlled
     "Performance record for the sensible heat wheel"
     annotation (Placement(transformation(extent={{-34,60},{-14,80}})));
   Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.ASHRAE perDefMotCur(
-      haveLatentHeatExchange=true, useDefaultMotorEfficiencyCurve=true)
+      haveLatentHeatExchange=true, 
+      useDefaultMotorEfficiencyCurve=true)
     "Performance record for the sensible heat wheel with default motor curve"
     annotation (Placement(transformation(extent={{6,60},{26,80}})));
 equation
@@ -89,7 +91,7 @@ equation
     annotation (Line(points={{-59,34},{-42,34}}, color={0,0,127}));
   connect(sou_1.ports[1], wheUseDefCur.port_a1)
     annotation (Line(points={{-20,29},{-10,29},{-10,18},{0,18}},
-                               color={0,127,255}));
+    color={0,127,255}));
   connect(wheUseDefCur.port_a2, sou_2.ports[1])
     annotation (Line(points={{20,2},{40,2},{40,-31},{70,-31}},
     color={0,127,255}));
@@ -98,24 +100,22 @@ equation
     color={0,0,127}));
   connect(wheUseDefCur.port_b2, senExhTem.port_a)
     annotation (Line(points={{0,2.2},{-6,2.2},{-6,-42},{-20,-42}},
-                                                                color={0,127,255}));
+    color={0,127,255}));
   connect(senExhTem.port_b, sin_2.ports[1])
     annotation (Line(points={{-40,-42},{-48,-42},{-48,-41},{-58,-41}},
     color={0,127,255}));
   connect(senSupTem.port_b, wheUseDefCur.port_b1)
     annotation (Line(points={{40,30},{28,30},{28,17.8},{20,17.8}},
-                                                               color={0,127,255}));
+    color={0,127,255}));
   connect(wheDefCur.port_a1, sou_1.ports[2])
     annotation (Line(points={{0,-12},{-14,-12},{-14,31},{-20,31}}, color={0,127,255}));
-  connect(wheDefCur.port_b1, sin_1.ports[1])       annotation (Line(points={{20,
-          -12.2},{36,-12.2},{36,22},{64,22},{64,29},{72,29}},
+  connect(wheDefCur.port_b1, sin_1.ports[1])
+    annotation (Line(points={{20,-12.2},{36,-12.2},{36,22},{64,22},{64,29},{72,29}},
     color={0,127,255}));
   connect(wheDefCur.port_b2, sin_2.ports[2]) annotation (Line(points={{0,-27.8},
-          {-48,-27.8},{-48,-39},{-58,-39}},
-    color={0,127,255}));
+    {-48,-27.8},{-48,-39},{-58,-39}},color={0,127,255}));
   connect(wheDefCur.port_a2, sou_2.ports[2]) annotation (Line(points={{20,-28},{
-          52,-28},{52,-29},{70,-29}},
-    color={0,127,255}));
+    52,-28},{52,-29},{70,-29}}, color={0,127,255}));
   connect(wheDefCur.uSpe, wheSpe.y) annotation (Line(points={{-2,-20},{-30,-20},{-30,0},{-59,0}},
     color={0,0,127}));
   connect(senSupTem.port_a, sin_1.ports[2]) annotation (Line(points={{60,30},{66,30},{66,31},{72,31}},
@@ -168,7 +168,7 @@ and the leaving exhaust air temperature increases.
 <li>
 The power consumption of the instance <code>wheUseDefCur</code> is higher than that of the instance <code>wheDefCur</code>
 when <i>uSpe</i> is less than 1.
-The power consumption of those two instances are identical when <i>uSpe</i> equals to <i>1</i>.
+The power consumption of those two instances are identical when <i>uSpe</i> equals <i>1</i>.
 </li>
 </ul>
 </html>", revisions="<html>

From 822e498ce2ed7f8719e52f86a0bfcdae315ad79b Mon Sep 17 00:00:00 2001
From: SenHuang19 <jhy1987@gmail.com>
Date: Sat, 22 Jun 2024 16:43:09 -0400
Subject: [PATCH 18/27] format update

---
 .../BaseClasses/Characteristics/motorEfficiencyParameters.mo  | 2 +-
 .../ThermalWheels/Sensible/BaseClasses/Effectiveness.mo       | 4 ++--
 Buildings/Fluid/HeatExchangers/ThermalWheels/package.mo       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/motorEfficiencyParameters.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/motorEfficiencyParameters.mo
index 9abaa59cc25..f7621ad4e5b 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/motorEfficiencyParameters.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/motorEfficiencyParameters.mo
@@ -8,7 +8,7 @@ record motorEfficiencyParameters
     "Wheel motor efficiency at wheel speed ratios";
   annotation (Documentation(info="<html>
 <p>
-This function is identical to
+This model is identical to
 <a href=\"modelica://Buildings.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters_yMot\">
 Buildings.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters_yMot</a>,
 with the original definition expanded to cover wheels.
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Effectiveness.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Effectiveness.mo
index d41047b8d45..db9e02e640b 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Effectiveness.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Effectiveness.mo
@@ -23,8 +23,8 @@ model Effectiveness
     final min=0,
     final unit="K",
     displayUnit="degC")
-    "Exhaust air temperature
-    " annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
+    "Exhaust air temperature" 
+    annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput mSup_flow(final unit="kg/s")
     "Supply air mass flow rate"
     annotation (Placement(transformation(extent={{-140,60},{-100,100}})));
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/package.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/package.mo
index ab2f62a6fb7..9d228dc16f7 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/package.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/package.mo
@@ -4,7 +4,7 @@ package ThermalWheels "Package with thermal wheels (both enthalpy and sensible h
 
 annotation (preferredView="info", Documentation(info="<html>
 <p>
-This package contains component models for thermal recovery wheels. 
+This package contains component models for thermal recovery wheels.
 </p>
 </html>"),
     Icon(graphics={

From 5711f57b0d05a9011bf451d4930c41d03518e420 Mon Sep 17 00:00:00 2001
From: SenHuang19 <jhy1987@gmail.com>
Date: Mon, 24 Jun 2024 00:08:36 -0400
Subject: [PATCH 19/27] minor changes to model implementation

---
 .../VariableSpeedThermalWheels/BaseClasses/package.mo | 10 ++--------
 .../ThermalWheels/Latent/BaseClasses/Effectiveness.mo |  8 +++-----
 .../Sensible/BaseClasses/Effectiveness.mo             | 11 ++++-------
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/package.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/package.mo
index 9d91622d4a1..3c7450fe791 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/package.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/package.mo
@@ -2,14 +2,8 @@ within Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels;
 package BaseClasses "Package with base classes for the variable-speed thermal wheel model"
 extends Modelica.Icons.BasesPackage;
 
-annotation (Documentation(revisions="<html>
-<ul>
-<li>
-May 28, 2024, by Sen Huang:<br/>
-First implementation.
-</li>
-</ul>
-</html>", info="<html>
+annotation (Documentation(revisions="",
+          info="<html>
 <p>
 This package contains base classes that are used to construct the models in
 <a href=\"modelica://Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels\">Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels</a>.
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Effectiveness.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Effectiveness.mo
index 0e5d48100e9..342066dd122 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Effectiveness.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Effectiveness.mo
@@ -23,14 +23,12 @@ model Effectiveness
 
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TSup(
     final min=0,
-    final unit="K",
-    displayUnit="degC")
+    final unit="K")
     "Supply air temperature"
     annotation (Placement(transformation(extent={{-140,-60},{-100,-20}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TExh(
     final min=0,
-    final unit="K",
-    displayUnit="degC")
+    final unit="K")
     "Exhaust air temperature"
     annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput mSup_flow(final unit="kg/s")
@@ -77,7 +75,7 @@ protected
 
 equation
   // Check if the air flows are too unbalanced
-  assert(mSup_flow - 2*mExh_flow <= 0 and mExh_flow - 2*mSup_flow <= 0,
+  assert(mSup_flow - 2*mExh_flow <= 1e-5 and mExh_flow - 2*mSup_flow <= 1e-5,
     "In " + getInstanceName() + ": The ratio of the supply flow rate to the exhaust flow rate should be in the range of [0.5, 2].",
     level=AssertionLevel.warning);
   // Calculate the average volumetric air flow and flow rate ratio.
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Effectiveness.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Effectiveness.mo
index db9e02e640b..dbfcafa9132 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Effectiveness.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Effectiveness.mo
@@ -15,14 +15,12 @@ model Effectiveness
 
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TSup(
     final min=0,
-    final unit="K",
-    displayUnit="degC")
+    final unit="K")
     "Supply air temperature"
     annotation (Placement(transformation(extent={{-140,-60},{-100,-20}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TExh(
     final min=0,
-    final unit="K",
-    displayUnit="degC")
+    final unit="K")
     "Exhaust air temperature" 
     annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput mSup_flow(final unit="kg/s")
@@ -55,7 +53,7 @@ protected
 
 equation
   // Check if the air flows are too unbalanced
-  assert(mSup_flow - 2*mExh_flow <= 0 and mExh_flow - 2*mSup_flow <= 0,
+  assert(mSup_flow - 2*mExh_flow < 1e-5 and mExh_flow - 2*mSup_flow <= 1e-5,
     "In " + getInstanceName() + ": The ratio of the supply flow rate to the exhaust flow rate should be in the range of [0.5, 2].",
     level=AssertionLevel.warning);
   // Calculate the average volumetric air flow and flow rate ratio.
@@ -107,8 +105,7 @@ It then calculates the sensible heat exchanger effectiveness as
 where <code>eps</code> is the effectiveness
 for the sensible heat transfer, respectively,
 <code>eps_nominal</code> and <code>epsPL</code> are the effectiveness 
-for the sensible heat transfer when <code>rat</code> is 1 and 0.75, respectively, and
-<code>uSpe</code> is the speed ratio of a rotary wheel.
+for the sensible heat transfer when <code>rat</code> is 1 and 0.75, respectively.
 </p>
 <p>
 The parameters <code>eps_nominal</code> and <code>epsPL</code>

From 81b0f2827e9f3aebd5caa3d088be2f98ac559cb9 Mon Sep 17 00:00:00 2001
From: SenHuang19 <jhy1987@gmail.com>
Date: Mon, 24 Jun 2024 00:08:58 -0400
Subject: [PATCH 20/27] reference data update

---
 ...hermalWheels_Latent_Examples_SpaceCooling.txt | 16 ++++++++--------
 ...rmalWheels_Sensible_Examples_SpaceCooling.txt | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Latent_Examples_SpaceCooling.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Latent_Examples_SpaceCooling.txt
index b5c22ba1242..19e224e9d37 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Latent_Examples_SpaceCooling.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Latent_Examples_SpaceCooling.txt
@@ -1,4 +1,4 @@
-last-generated=2024-06-20
+last-generated=2024-06-23
 statistics-initialization=
 {
   "linear": "4, 4",
@@ -14,13 +14,13 @@ statistics-simulation=
 }
 time=[1.5552e+07, 1.56384e+07]
 vol.T_start=[2.931499938964844e+02, 2.931499938964844e+02]
-vol.T=[2.931499938964844e+02, 2.935960388183594e+02, 2.938107299804688e+02, 2.938359985351562e+02, 2.93731201171875e+02, 2.935613708496094e+02, 2.933581237792969e+02, 2.931333312988281e+02, 2.928946228027344e+02, 2.926404418945312e+02, 2.923136596679688e+02, 2.918851318359375e+02, 2.913924560546875e+02, 2.909156494140625e+02, 2.90525634765625e+02, 2.902348937988281e+02, 2.900177612304688e+02, 2.898242797851562e+02, 2.895953369140625e+02, 2.893026733398438e+02, 2.889579467773438e+02, 2.88469482421875e+02, 2.866667175292969e+02, 2.861806030273438e+02, 2.862569885253906e+02, 2.867163391113281e+02, 2.875852661132812e+02, 2.889466552734375e+02, 2.906258544921875e+02, 2.923321228027344e+02, 2.937963562011719e+02, 2.950487670898438e+02, 2.961231079101562e+02, 2.969854431152344e+02, 2.971490173339844e+02, 2.971314697265625e+02, 2.966196899414062e+02, 2.958956604003906e+02, 2.956756591796875e+02, 2.960534057617188e+02, 2.966995849609375e+02, 2.971622924804688e+02, 2.97152099609375e+02, 2.971595764160156e+02, 2.971593017578125e+02, 2.971734924316406e+02, 2.971483764648438e+02, 2.971504516601562e+02, 2.971506652832031e+02, 2.971507568359375e+02, 2.971508483886719e+02, 2.971510620117188e+02, 2.971512145996094e+02, 2.971512451171875e+02, 2.971510925292969e+02, 2.971501159667969e+02, 2.97149658203125e+02, 2.971495666503906e+02, 2.971499328613281e+02, 2.971510620117188e+02, 2.971516418457031e+02, 2.971516418457031e+02, 2.971510009765625e+02, 2.971400756835938e+02, 2.971357727050781e+02, 2.971393737792969e+02, 2.967124938964844e+02, 2.959083862304688e+02, 2.959713134765625e+02, 2.968323059082031e+02, 2.971472473144531e+02, 2.971554260253906e+02, 2.978629150390625e+02, 2.990851745605469e+02, 2.998351745605469e+02, 3.001858825683594e+02, 3.001480712890625e+02, 2.997308959960938e+02, 2.990249633789062e+02, 2.981852722167969e+02, 2.973849487304688e+02, 2.966669616699219e+02, 2.960359802246094e+02, 2.955152587890625e+02, 2.951363525390625e+02, 2.948908386230469e+02, 2.947412719726562e+02, 2.946492919921875e+02, 2.945771789550781e+02, 2.94505615234375e+02, 2.944338989257812e+02, 2.94362060546875e+02, 2.942901916503906e+02, 2.9421826171875e+02, 2.941463012695312e+02, 2.940743408203125e+02, 2.940023498535156e+02, 2.939303894042969e+02, 2.938583984375e+02, 2.93786376953125e+02, 2.937143859863281e+02]
+vol.T=[2.931499938964844e+02, 2.935960388183594e+02, 2.938107299804688e+02, 2.938359985351562e+02, 2.93731201171875e+02, 2.935613708496094e+02, 2.933581237792969e+02, 2.931333312988281e+02, 2.928946228027344e+02, 2.926404418945312e+02, 2.923136596679688e+02, 2.918851318359375e+02, 2.913924560546875e+02, 2.909156494140625e+02, 2.90525634765625e+02, 2.902348937988281e+02, 2.900177612304688e+02, 2.898242797851562e+02, 2.895953369140625e+02, 2.893026733398438e+02, 2.889579467773438e+02, 2.88469482421875e+02, 2.866667175292969e+02, 2.861806030273438e+02, 2.862569885253906e+02, 2.867163391113281e+02, 2.875852355957031e+02, 2.889466552734375e+02, 2.906258544921875e+02, 2.923321533203125e+02, 2.937963562011719e+02, 2.950487670898438e+02, 2.961231079101562e+02, 2.969854125976562e+02, 2.971490173339844e+02, 2.971314697265625e+02, 2.966196899414062e+02, 2.958956909179688e+02, 2.956756591796875e+02, 2.960534057617188e+02, 2.966995849609375e+02, 2.971622924804688e+02, 2.97152099609375e+02, 2.971595764160156e+02, 2.971593017578125e+02, 2.971735229492188e+02, 2.971483764648438e+02, 2.971504516601562e+02, 2.971506958007812e+02, 2.971507568359375e+02, 2.971508483886719e+02, 2.971510620117188e+02, 2.971512451171875e+02, 2.971512451171875e+02, 2.971510925292969e+02, 2.971501159667969e+02, 2.971496276855469e+02, 2.971495666503906e+02, 2.971499328613281e+02, 2.971510620117188e+02, 2.971516418457031e+02, 2.971516418457031e+02, 2.971510009765625e+02, 2.971400756835938e+02, 2.971357727050781e+02, 2.971393737792969e+02, 2.967124938964844e+02, 2.959083862304688e+02, 2.959713439941406e+02, 2.968323364257812e+02, 2.971472473144531e+02, 2.971554260253906e+02, 2.978629150390625e+02, 2.990851745605469e+02, 2.998351745605469e+02, 3.001859436035156e+02, 3.001481628417969e+02, 2.997308959960938e+02, 2.990248413085938e+02, 2.981851806640625e+02, 2.973848876953125e+02, 2.966669311523438e+02, 2.960359497070312e+02, 2.955152587890625e+02, 2.951362915039062e+02, 2.948908081054688e+02, 2.947412414550781e+02, 2.946492614746094e+02, 2.945771789550781e+02, 2.94505615234375e+02, 2.944338989257812e+02, 2.94362060546875e+02, 2.942901916503906e+02, 2.9421826171875e+02, 2.941463012695312e+02, 2.940743408203125e+02, 2.940023498535156e+02, 2.939303894042969e+02, 2.938583984375e+02, 2.93786376953125e+02, 2.937143859863281e+02]
 TOut.T=[2.914500122070312e+02, 2.913385009765625e+02, 2.910647583007812e+02, 2.907200927734375e+02, 2.903956909179688e+02, 2.901300048828125e+02, 2.898659973144531e+02, 2.896019897460938e+02, 2.893380126953125e+02, 2.89004150390625e+02, 2.884479370117188e+02, 2.878096618652344e+02, 2.872500610351562e+02, 2.869119262695312e+02, 2.867525024414062e+02, 2.866704406738281e+02, 2.865716247558594e+02, 2.86362060546875e+02, 2.860019836425781e+02, 2.855647583007812e+02, 2.851369323730469e+02, 2.848055419921875e+02, 2.84671142578125e+02, 2.847913513183594e+02, 2.852047729492188e+02, 2.859500122070312e+02, 2.872088317871094e+02, 2.889144592285156e+02, 2.907325744628906e+02, 2.923289794921875e+02, 2.935801696777344e+02, 2.946938171386719e+02, 2.956173706054688e+02, 2.962911987304688e+02, 2.964541015625e+02, 2.957337341308594e+02, 2.947459106445312e+02, 2.941705322265625e+02, 2.945262451171875e+02, 2.952189331054688e+02, 2.959844055175781e+02, 2.966857299804688e+02, 2.972068786621094e+02, 2.977020874023438e+02, 2.981768493652344e+02, 2.985576171875e+02, 2.987735900878906e+02, 2.989007568359375e+02, 2.990133361816406e+02, 2.991251220703125e+02, 2.9925e+02, 2.993937683105469e+02, 2.99545654296875e+02, 2.996946411132812e+02, 2.998296203613281e+02, 2.999126586914062e+02, 2.999144897460938e+02, 2.99878662109375e+02, 2.998501281738281e+02, 2.99885009765625e+02, 3.0001416015625e+02, 3.001783142089844e+02, 3.003133850097656e+02, 3.001267700195312e+02, 2.985876770019531e+02, 2.964372253417969e+02, 2.946898803710938e+02, 2.943067016601562e+02, 2.951251831054688e+02, 2.964444274902344e+02, 2.976576538085938e+02, 2.981753234863281e+02, 2.982959289550781e+02, 2.982947082519531e+02, 2.980774841308594e+02, 2.975499877929688e+02, 2.9660986328125e+02, 2.953994445800781e+02, 2.94191650390625e+02, 2.932594299316406e+02, 2.926542053222656e+02, 2.921209716796875e+02, 2.917095031738281e+02, 2.914774780273438e+02, 2.91437255859375e+02, 2.914543151855469e+02, 2.914801330566406e+02, 2.914757385253906e+02, 2.914140014648438e+02, 2.913420104980469e+02, 2.912699890136719e+02, 2.91197998046875e+02, 2.911260070800781e+02, 2.910539855957031e+02, 2.909819946289062e+02, 2.909100036621094e+02, 2.908380126953125e+02, 2.907659912109375e+02, 2.906940002441406e+02, 2.906220092773438e+02, 2.905499877929688e+02]
-cooCoi.sta_a2.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.848055419921875e+02, 2.84671142578125e+02, 2.847913513183594e+02, 2.852047729492188e+02, 2.859500122070312e+02, 2.872088317871094e+02, 2.889144592285156e+02, 2.907325744628906e+02, 2.923289794921875e+02, 2.935801696777344e+02, 2.946938171386719e+02, 2.956173706054688e+02, 2.962911987304688e+02, 2.964541015625e+02, 2.957337341308594e+02, 2.947459106445312e+02, 2.941705322265625e+02, 2.945262451171875e+02, 2.952189331054688e+02, 2.959844055175781e+02, 2.966857299804688e+02, 2.972068786621094e+02, 2.977020874023438e+02, 2.981768493652344e+02, 2.984267272949219e+02, 2.982018737792969e+02, 2.981682739257812e+02, 2.98164306640625e+02, 2.981634521484375e+02, 2.981642761230469e+02, 2.981651916503906e+02, 2.981649780273438e+02, 2.981639404296875e+02, 2.981622619628906e+02, 2.981559143066406e+02, 2.981495666503906e+02, 2.981468505859375e+02, 2.981481018066406e+02, 2.981552124023438e+02, 2.981621398925781e+02, 2.981636962890625e+02, 2.981602478027344e+02, 2.981087341308594e+02, 2.979300842285156e+02, 2.964372253417969e+02, 2.946898803710938e+02, 2.943067016601562e+02, 2.951251831054688e+02, 2.964444274902344e+02, 2.976576538085938e+02, 2.981753234863281e+02, 2.972942504882812e+02, 2.972933654785156e+02, 2.971294250488281e+02, 2.967357177734375e+02, 2.941932983398438e+02, 2.951637573242188e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.921409301757812e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.919304809570312e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.916584167480469e+02, 2.916039123535156e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.914403991699219e+02]
-cooCoi.sta_b2.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.850066223144531e+02, 2.846719360351562e+02, 2.847826843261719e+02, 2.851853332519531e+02, 2.859185180664062e+02, 2.871560974121094e+02, 2.888516235351562e+02, 2.906712646484375e+02, 2.922807006835938e+02, 2.935388488769531e+02, 2.94657958984375e+02, 2.955890502929688e+02, 2.962724914550781e+02, 2.957261657714844e+02, 2.957597045898438e+02, 2.947773742675781e+02, 2.941767578125e+02, 2.945053405761719e+02, 2.951929931640625e+02, 2.959581298828125e+02, 2.951268615722656e+02, 2.952117004394531e+02, 2.949648742675781e+02, 2.947083435058594e+02, 2.940654296875e+02, 2.93455078125e+02, 2.933719177246094e+02, 2.933251342773438e+02, 2.93288818359375e+02, 2.932528076171875e+02, 2.932095336914062e+02, 2.931567993164062e+02, 2.931007080078125e+02, 2.930479431152344e+02, 2.930150756835938e+02, 2.930166320800781e+02, 2.930333557128906e+02, 2.930465698242188e+02, 2.930337524414062e+02, 2.929794006347656e+02, 2.929098510742188e+02, 2.928515014648438e+02, 2.928837280273438e+02, 2.93494873046875e+02, 2.955596618652344e+02, 2.947333984375e+02, 2.942952270507812e+02, 2.950852966308594e+02, 2.963969421386719e+02, 2.952404174804688e+02, 2.947373962402344e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.944198913574219e+02, 2.941932983398438e+02, 2.944198913574219e+02, 2.944198913574219e+02, 2.944198913574219e+02, 2.944198913574219e+02, 2.944198913574219e+02, 2.941932983398438e+02, 2.944198913574219e+02, 2.944198913574219e+02, 2.944198913574219e+02, 2.944198913574219e+02, 2.944198913574219e+02, 2.944198913574219e+02, 2.944198913574219e+02, 2.941932983398438e+02, 2.944198913574219e+02, 2.944198913574219e+02, 2.944198913574219e+02, 2.944198913574219e+02, 2.941932983398438e+02, 2.941932983398438e+02, 2.944198913574219e+02, 2.944198913574219e+02, 2.941932983398438e+02]
+cooCoi.sta_a2.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.848055419921875e+02, 2.84671142578125e+02, 2.847913513183594e+02, 2.852047729492188e+02, 2.859500122070312e+02, 2.872088317871094e+02, 2.889144592285156e+02, 2.907325744628906e+02, 2.923289794921875e+02, 2.935801696777344e+02, 2.946938171386719e+02, 2.956173706054688e+02, 2.962911987304688e+02, 2.964541015625e+02, 2.957337341308594e+02, 2.947459106445312e+02, 2.941705322265625e+02, 2.945262451171875e+02, 2.952189331054688e+02, 2.959844055175781e+02, 2.966857299804688e+02, 2.972068786621094e+02, 2.977020874023438e+02, 2.981768493652344e+02, 2.984267272949219e+02, 2.982018737792969e+02, 2.981682739257812e+02, 2.98164306640625e+02, 2.981634521484375e+02, 2.981642761230469e+02, 2.981651916503906e+02, 2.981649780273438e+02, 2.981639404296875e+02, 2.981622619628906e+02, 2.981559143066406e+02, 2.981495666503906e+02, 2.981468505859375e+02, 2.981481018066406e+02, 2.981552124023438e+02, 2.981621398925781e+02, 2.981636962890625e+02, 2.981602478027344e+02, 2.981087341308594e+02, 2.979300231933594e+02, 2.964372253417969e+02, 2.946898803710938e+02, 2.943067016601562e+02, 2.951251831054688e+02, 2.964444274902344e+02, 2.976576538085938e+02, 2.981753234863281e+02, 2.94193603515625e+02, 2.94193603515625e+02, 2.980774841308594e+02, 2.94193603515625e+02, 2.966021423339844e+02, 2.953994445800781e+02, 2.94193603515625e+02, 2.94193603515625e+02, 2.94193603515625e+02, 2.94193603515625e+02, 2.94193603515625e+02, 2.94193603515625e+02, 2.94193603515625e+02, 2.94193603515625e+02, 2.94193603515625e+02, 2.94193603515625e+02, 2.94193603515625e+02, 2.94193603515625e+02, 2.94193603515625e+02, 2.94193603515625e+02, 2.94193603515625e+02, 2.94193603515625e+02, 2.91767333984375e+02, 2.94193603515625e+02, 2.94193603515625e+02, 2.94193603515625e+02, 2.94193603515625e+02, 2.94193603515625e+02, 2.94193603515625e+02]
+cooCoi.sta_b2.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.850066223144531e+02, 2.846719360351562e+02, 2.847826843261719e+02, 2.851853332519531e+02, 2.859184265136719e+02, 2.871560974121094e+02, 2.888516235351562e+02, 2.906712646484375e+02, 2.922807006835938e+02, 2.935388488769531e+02, 2.94657958984375e+02, 2.955890502929688e+02, 2.962724914550781e+02, 2.9572607421875e+02, 2.957597045898438e+02, 2.947773742675781e+02, 2.941767578125e+02, 2.945053405761719e+02, 2.951929931640625e+02, 2.959581298828125e+02, 2.951268310546875e+02, 2.95211669921875e+02, 2.949648132324219e+02, 2.947083435058594e+02, 2.940654602050781e+02, 2.934548950195312e+02, 2.933718566894531e+02, 2.933250732421875e+02, 2.932887878417969e+02, 2.932527465820312e+02, 2.932095031738281e+02, 2.931567993164062e+02, 2.931006774902344e+02, 2.930479431152344e+02, 2.930150146484375e+02, 2.930165710449219e+02, 2.930333251953125e+02, 2.930465087890625e+02, 2.930337829589844e+02, 2.929794616699219e+02, 2.929098510742188e+02, 2.928515014648438e+02, 2.928837585449219e+02, 2.934948425292969e+02, 2.955594482421875e+02, 2.947333984375e+02, 2.942952575683594e+02, 2.950852661132812e+02, 2.963969421386719e+02, 2.95240478515625e+02, 2.947373962402344e+02, 2.944200134277344e+02, 2.944200134277344e+02, 2.94193603515625e+02, 2.944200134277344e+02, 2.94193603515625e+02, 2.94193603515625e+02, 2.944200134277344e+02, 2.944200134277344e+02, 2.944200134277344e+02, 2.944200134277344e+02, 2.944200134277344e+02, 2.944200134277344e+02, 2.944200134277344e+02, 2.944200134277344e+02, 2.944200134277344e+02, 2.944200134277344e+02, 2.944200134277344e+02, 2.944200134277344e+02, 2.944200134277344e+02, 2.944200134277344e+02, 2.944200134277344e+02, 2.944200134277344e+02, 2.94193603515625e+02, 2.944200134277344e+02, 2.944200134277344e+02, 2.944200134277344e+02, 2.944200134277344e+02, 2.944200134277344e+02, 2.944200134277344e+02]
 opeSig.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, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+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]
-senTemHXOut.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.848058471679688e+02, 2.846711730957031e+02, 2.847910461425781e+02, 2.852041015625e+02, 2.859490356445312e+02, 2.8720703125e+02, 2.88912353515625e+02, 2.907305603027344e+02, 2.923273620605469e+02, 2.935787963867188e+02, 2.94692626953125e+02, 2.956164245605469e+02, 2.962905883789062e+02, 2.964544982910156e+02, 2.957348327636719e+02, 2.947469482421875e+02, 2.941707153320312e+02, 2.945255432128906e+02, 2.952180786132812e+02, 2.959835205078125e+02, 2.966849975585938e+02, 2.972063293457031e+02, 2.977015075683594e+02, 2.981763610839844e+02, 2.984269714355469e+02, 2.982019653320312e+02, 2.981682739257812e+02, 2.98164306640625e+02, 2.981634521484375e+02, 2.981642761230469e+02, 2.981651916503906e+02, 2.981649780273438e+02, 2.981639404296875e+02, 2.981622619628906e+02, 2.981559143066406e+02, 2.981495666503906e+02, 2.981468505859375e+02, 2.981481018066406e+02, 2.981552124023438e+02, 2.981621398925781e+02, 2.981636962890625e+02, 2.981602478027344e+02, 2.9810888671875e+02, 2.979305419921875e+02, 2.964396667480469e+02, 2.946912841796875e+02, 2.943062744140625e+02, 2.951238403320312e+02, 2.964428405761719e+02, 2.976565551757812e+02, 2.981751403808594e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02, 2.98253662109375e+02]
+senTemHXOut.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.848058471679688e+02, 2.846711730957031e+02, 2.847910461425781e+02, 2.852041015625e+02, 2.859489440917969e+02, 2.8720703125e+02, 2.88912353515625e+02, 2.907305603027344e+02, 2.923273620605469e+02, 2.935787963867188e+02, 2.94692626953125e+02, 2.956164245605469e+02, 2.962905883789062e+02, 2.964544982910156e+02, 2.957348327636719e+02, 2.947469482421875e+02, 2.941707153320312e+02, 2.945255432128906e+02, 2.952180786132812e+02, 2.959835205078125e+02, 2.966849975585938e+02, 2.972063293457031e+02, 2.977015075683594e+02, 2.981763610839844e+02, 2.984269714355469e+02, 2.982019653320312e+02, 2.981682739257812e+02, 2.98164306640625e+02, 2.981634521484375e+02, 2.981642761230469e+02, 2.981651916503906e+02, 2.981650085449219e+02, 2.981639404296875e+02, 2.981622619628906e+02, 2.981559143066406e+02, 2.981495666503906e+02, 2.981468505859375e+02, 2.981481018066406e+02, 2.981552124023438e+02, 2.981621398925781e+02, 2.981636962890625e+02, 2.981602478027344e+02, 2.9810888671875e+02, 2.979303894042969e+02, 2.964396667480469e+02, 2.946912841796875e+02, 2.943062744140625e+02, 2.951238403320312e+02, 2.964428405761719e+02, 2.976565551757812e+02, 2.981751403808594e+02, 2.982535705566406e+02, 2.982535400390625e+02, 2.982535400390625e+02, 2.982534790039062e+02, 2.982534790039062e+02, 2.982534790039062e+02, 2.982534790039062e+02, 2.982534790039062e+02, 2.982534790039062e+02, 2.982534790039062e+02, 2.982534790039062e+02, 2.982534790039062e+02, 2.982534790039062e+02, 2.982534790039062e+02, 2.982534790039062e+02, 2.982534790039062e+02, 2.982534790039062e+02, 2.982534790039062e+02, 2.982534790039062e+02, 2.982534790039062e+02, 2.982534790039062e+02, 2.982534790039062e+02, 2.982534790039062e+02, 2.982534790039062e+02, 2.982534790039062e+02, 2.982534790039062e+02, 2.982534790039062e+02, 2.982534790039062e+02, 2.982534790039062e+02]
 TMixSetPoi.y=[2.981499938964844e+02, 2.981499938964844e+02]
-whe.port_a1.Xi_outflow[1]=[1.020082738250494e-02, 1.01562337949872e-02, 1.00783184170723e-02, 9.996542707085609e-03, 9.938318282365799e-03, 9.908336214721203e-03, 9.878899902105331e-03, 9.84929408878088e-03, 9.819529950618744e-03, 9.77362971752882e-03, 9.6778878942132e-03, 9.566104970872402e-03, 9.473696351051331e-03, 9.429263882339001e-03, 9.422294795513153e-03, 9.431302547454834e-03, 9.436560794711113e-03, 9.420059621334076e-03, 9.391364641487598e-03, 9.358547627925873e-03, 9.325146675109863e-03, 8.137145079672337e-03, 8.122085593640804e-03, 8.206699043512344e-03, 8.411874994635582e-03, 8.763079531490803e-03, 9.398895315825939e-03, 1.034505292773247e-02, 1.143034640699625e-02, 1.241556368768215e-02, 1.315876096487045e-02, 1.378693338483572e-02, 1.425285078585148e-02, 1.450714096426964e-02, 1.438504923135042e-02, 1.369496528059244e-02, 1.286804024130106e-02, 1.230658404529095e-02, 1.217551529407501e-02, 1.168260723352432e-02, 1.085670199245214e-02, 9.97223611921072e-03, 9.36471950262785e-03, 8.902018889784813e-03, 8.507907390594482e-03, 8.223498240113258e-03, 8.098715916275978e-03, 8.165220730006695e-03, 8.340694941580296e-03, 8.511393330991268e-03, 8.560599759221077e-03, 8.413743227720261e-03, 8.153790608048439e-03, 7.901248522102833e-03, 7.781551219522953e-03, 7.89081584662199e-03, 8.167044259607792e-03, 8.504312485456467e-03, 8.799020200967789e-03, 8.933519944548607e-03, 8.86286236345768e-03, 8.718964643776417e-03, 8.648307994008064e-03, 8.916387334465981e-03, 9.894336573779583e-03, 1.078152004629374e-02, 1.121085416525602e-02, 1.130799576640129e-02, 1.129153650254011e-02, 1.117290556430817e-02, 1.099951472133398e-02, 1.098693627864122e-02, 1.106338948011398e-02, 1.110631413757801e-02, 1.114096026867628e-02, 1.11555652692914e-02, 1.115310564637184e-02, 1.114236563444138e-02, 1.108799315989017e-02, 1.10308937728405e-02, 1.095473859459162e-02, 1.083551906049252e-02, 1.070331037044525e-02, 1.058470457792282e-02, 1.0462686419487e-02, 1.025591883808374e-02, 1.003508549183607e-02, 9.884104132652283e-03, 9.871749207377434e-03, 9.938213042914867e-03, 1.003242190927267e-02, 1.011484116315842e-02, 1.014900207519531e-02, 1.014620251953602e-02, 1.013580523431301e-02, 1.01421857252717e-02, 1.018837280571461e-02, 1.025786157697439e-02, 1.033260300755501e-02, 1.041018962860107e-02, 1.048825681209564e-02]
-whe.port_b1.Xi_outflow[1]=[1.04016549885273e-02, 1.03124687448144e-02, 1.015663705766201e-02, 9.993084706366062e-03, 9.876636788249016e-03, 9.816672652959824e-03, 9.757800027728081e-03, 9.698587469756603e-03, 9.639059193432331e-03, 9.547258727252483e-03, 9.355776011943817e-03, 9.132210165262222e-03, 8.947391994297504e-03, 8.858527988195419e-03, 8.844588883221149e-03, 8.862605318427086e-03, 8.873116225004196e-03, 8.84011946618557e-03, 8.78272857517004e-03, 8.717095479369164e-03, 8.650294505059719e-03, 8.137145079672337e-03, 8.122085593640804e-03, 8.206699043512344e-03, 8.411874994635582e-03, 8.763079531490803e-03, 9.398895315825939e-03, 1.034505292773247e-02, 1.143034640699625e-02, 1.241556368768215e-02, 1.315876096487045e-02, 1.378693338483572e-02, 1.425285078585148e-02, 1.450714096426964e-02, 1.438504923135042e-02, 1.369496528059244e-02, 1.286804024130106e-02, 1.230658404529095e-02, 1.217551529407501e-02, 1.168260723352432e-02, 1.085670199245214e-02, 9.97223611921072e-03, 9.36471950262785e-03, 8.902018889784813e-03, 8.507907390594482e-03, 8.234995417296886e-03, 8.123492822051048e-03, 8.151986636221409e-03, 8.289935998618603e-03, 8.449546061456203e-03, 8.531374856829643e-03, 8.459034375846386e-03, 8.267165161669254e-03, 8.041513152420521e-03, 7.881222292780876e-03, 7.877963595092297e-03, 8.037080988287926e-03, 8.303587324917316e-03, 8.593156933784485e-03, 8.798799477517605e-03, 8.841468021273613e-03, 8.776242844760418e-03, 8.704190142452717e-03, 8.789260871708393e-03, 9.568498469889164e-03, 1.078152004629374e-02, 1.121085416525602e-02, 1.130799576640129e-02, 1.129153650254011e-02, 1.117290556430817e-02, 1.099951472133398e-02, 1.098693627864122e-02, 1.108502689749002e-02, 1.117087714374065e-02, 1.124016754329205e-02, 1.12693514674902e-02, 1.126445923000574e-02, 1.123600080609322e-02, 1.113423518836498e-02, 1.102003641426563e-02, 1.086772512644529e-02, 1.062928512692451e-02, 1.036486867815256e-02, 1.012765895575285e-02, 9.883587248623371e-03, 9.470086544752121e-03, 9.0284189209342e-03, 8.726434782147408e-03, 8.7017472833395e-03, 8.834674023091793e-03, 9.0230917558074e-03, 9.187931194901466e-03, 9.256236255168915e-03, 9.25065390765667e-03, 9.229856543242931e-03, 9.242618456482887e-03, 9.334995411336422e-03, 9.473972022533417e-03, 9.6234530210495e-03, 9.778626263141632e-03, 9.934762492775917e-03]
-whe.senSupMasFlo.m_flow=[0e+00, 0e+00, -6.431433905326276e-30, -1.165375153782612e-28, -2.646439595881945e-29, -4.444476657679377e-29, -4.445450155080954e-29, -4.413999117236003e-29, -4.413764093597477e-29, -4.413761686185046e-29, -4.413770413055107e-29, -4.413760482478831e-29, -4.413771917687876e-29, -4.413801107563596e-29, -4.413818561303717e-29, -4.413773422320645e-29, -9.64341617619168e-21, -4.413434879947608e-29, -4.413440597552131e-29, -4.417609333102068e-29, -4.417606022909976e-29, 5.743309117178796e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 7.269910184959372e-08, 8.69821310043335e-02, 3.234779834747314e-01, 3.773662745952606e-01, 4.063303768634796e-01, 4.299194812774658e-01, 4.519365429878235e-01, 4.736229181289673e-01, 4.936095178127289e-01, 5.109586715698242e-01, 5.253400206565857e-01, 5.350459218025208e-01, 5.372900366783142e-01, 5.351210236549377e-01, 5.322843194007874e-01, 5.335095524787903e-01, 5.425741672515869e-01, 5.547639727592468e-01, 5.650573968887329e-01, 5.624150633811951e-01, 4.075564742088318e-01, 5.74331693314889e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 9.731658678902022e-08, 2.73678833417147e-16, 5.262562232336173e-16, 1.575180551315405e-13, 3.514106757321334e-12, -6.453782549608461e-14, 2.349164439363616e-11, -8.931635135265778e-14, -9.589402297401073e-14, -6.409635734498653e-13, -9.59013752199929e-14, -9.59013752199929e-14, 9.942239089302807e-13, -1.731089338714853e-12, -9.59013752199929e-14, -9.59013752199929e-14, -1.186026645817739e-12, -9.59013752199929e-14, -9.59013752199929e-14, -9.59013752199929e-14, 4.491612702432757e-13, -1.186026645817739e-12, -9.59013752199929e-14, -6.409640071307343e-13, -9.59013752199929e-14, 4.491612702432757e-13, 4.491612702432757e-13, -6.409640071307343e-13, -6.409640071307343e-13, 4.491612702432757e-13]
+whe.port_a1.Xi_outflow[1]=[1.020082738250494e-02, 1.01562337949872e-02, 1.00783184170723e-02, 9.996542707085609e-03, 9.938318282365799e-03, 9.908336214721203e-03, 9.878899902105331e-03, 9.84929408878088e-03, 9.819529950618744e-03, 9.77362971752882e-03, 9.6778878942132e-03, 9.566104970872402e-03, 9.473696351051331e-03, 9.429263882339001e-03, 9.422294795513153e-03, 9.431302547454834e-03, 9.436560794711113e-03, 9.420059621334076e-03, 9.391364641487598e-03, 9.358547627925873e-03, 9.325146675109863e-03, 8.137145079672337e-03, 8.122085593640804e-03, 8.206699043512344e-03, 8.411874994635582e-03, 8.763079531490803e-03, 9.398895315825939e-03, 1.034505292773247e-02, 1.143034640699625e-02, 1.241556368768215e-02, 1.315876096487045e-02, 1.378693338483572e-02, 1.425285078585148e-02, 1.450714096426964e-02, 1.438504923135042e-02, 1.369496528059244e-02, 1.286804024130106e-02, 1.230658404529095e-02, 1.217551529407501e-02, 1.168260723352432e-02, 1.085670199245214e-02, 9.97223611921072e-03, 9.36471950262785e-03, 8.902018889784813e-03, 8.507907390594482e-03, 8.223498240113258e-03, 8.098715916275978e-03, 8.165220730006695e-03, 8.340694941580296e-03, 8.511393330991268e-03, 8.560599759221077e-03, 8.413743227720261e-03, 8.153790608048439e-03, 7.901248522102833e-03, 7.781551219522953e-03, 7.89081584662199e-03, 8.167044259607792e-03, 8.504312485456467e-03, 8.799020200967789e-03, 8.933519944548607e-03, 8.86286236345768e-03, 8.718964643776417e-03, 8.648307994008064e-03, 8.916387334465981e-03, 9.894336573779583e-03, 1.078152004629374e-02, 1.121085416525602e-02, 1.130799576640129e-02, 1.129153650254011e-02, 1.117290556430817e-02, 1.099951472133398e-02, 1.098693627864122e-02, 1.104177813977003e-02, 1.104177813977003e-02, 1.130424998700619e-02, 1.104177907109261e-02, 1.125229708850384e-02, 1.12228337675333e-02, 1.108800992369652e-02, 1.103091053664684e-02, 1.095475722104311e-02, 1.083553582429886e-02, 1.070332713425159e-02, 1.05847604572773e-02, 1.046275533735752e-02, 1.025589276105165e-02, 1.003510225564241e-02, 9.884187020361423e-03, 9.871766902506351e-03, 9.93822980672121e-03, 1.003243867307901e-02, 1.011487748473883e-02, 1.014907006174326e-02, 1.014622021466494e-02, 1.013581920415163e-02, 1.014218665659428e-02, 1.018839236348867e-02, 1.02578941732645e-02, 1.033263374119997e-02, 1.041021849960089e-02, 1.048828568309546e-02]
+whe.port_b1.Xi_outflow[1]=[1.04016549885273e-02, 1.03124687448144e-02, 1.015663705766201e-02, 9.993084706366062e-03, 9.876636788249016e-03, 9.816672652959824e-03, 9.757800027728081e-03, 9.698587469756603e-03, 9.639059193432331e-03, 9.547258727252483e-03, 9.355776011943817e-03, 9.132210165262222e-03, 8.947391994297504e-03, 8.858527988195419e-03, 8.844588883221149e-03, 8.862605318427086e-03, 8.873116225004196e-03, 8.84011946618557e-03, 8.78272857517004e-03, 8.717095479369164e-03, 8.650294505059719e-03, 8.137145079672337e-03, 8.122085593640804e-03, 8.206699043512344e-03, 8.411874994635582e-03, 8.763079531490803e-03, 9.398895315825939e-03, 1.034505292773247e-02, 1.143034640699625e-02, 1.241556368768215e-02, 1.315876096487045e-02, 1.378693338483572e-02, 1.425285078585148e-02, 1.450714096426964e-02, 1.438504923135042e-02, 1.369496528059244e-02, 1.286804024130106e-02, 1.230658404529095e-02, 1.217551529407501e-02, 1.168260723352432e-02, 1.085670199245214e-02, 9.97223611921072e-03, 9.36471950262785e-03, 8.902018889784813e-03, 8.507907390594482e-03, 8.234996348619461e-03, 8.123490959405899e-03, 8.151985704898834e-03, 8.289935998618603e-03, 8.449546061456203e-03, 8.531374856829643e-03, 8.459028787910938e-03, 8.267147466540337e-03, 8.041501045227051e-03, 7.881230674684048e-03, 7.877910509705544e-03, 8.037068881094456e-03, 8.303587324917316e-03, 8.593153208494186e-03, 8.798796683549881e-03, 8.841470815241337e-03, 8.776245638728142e-03, 8.704192005097866e-03, 8.789260871708393e-03, 9.568466804921627e-03, 1.078152004629374e-02, 1.121085416525602e-02, 1.130799576640129e-02, 1.129153650254011e-02, 1.117290556430817e-02, 1.099951472133398e-02, 1.098693627864122e-02, 1.105920504778624e-02, 1.109369285404682e-02, 1.130424998700619e-02, 1.104177907109261e-02, 1.133546512573957e-02, 1.128318440169096e-02, 1.1134241707623e-02, 1.102004293352365e-02, 1.086773537099361e-02, 1.062929164618254e-02, 1.036487519741058e-02, 1.012774091213942e-02, 9.883728809654713e-03, 9.46999154984951e-03, 9.028425440192223e-03, 8.726594969630241e-03, 8.701753802597523e-03, 8.83468147367239e-03, 9.023099206387997e-03, 9.187975898385048e-03, 9.256360121071339e-03, 9.250660426914692e-03, 9.22986026853323e-03, 9.242591448128223e-03, 9.335003793239594e-03, 9.474010206758976e-03, 9.62348747998476e-03, 9.778657928109169e-03, 9.93479136377573e-03]
+whe.senSupMasFlo.m_flow=[0e+00, 0e+00, -6.431433905326276e-30, -1.165375153782612e-28, -2.646439595881945e-29, -4.444476657679377e-29, -4.445450155080954e-29, -4.413999117236003e-29, -4.413764093597477e-29, -4.413761686185046e-29, -4.413770413055107e-29, -4.413760482478831e-29, -4.413771917687876e-29, -4.413801107563596e-29, -4.413818561303717e-29, -4.413773422320645e-29, -9.64341617619168e-21, -4.413434879947608e-29, -4.413440597552131e-29, -4.417609333102068e-29, -4.417606022909976e-29, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 7.264736012757567e-08, 8.697431534528732e-02, 3.234831392765045e-01, 3.773669898509979e-01, 4.063314199447632e-01, 4.299204051494598e-01, 4.519346058368683e-01, 4.736232459545135e-01, 4.936091601848602e-01, 5.109587907791138e-01, 5.2534019947052e-01, 5.350477695465088e-01, 5.372903943061829e-01, 5.35120964050293e-01, 5.322847962379456e-01, 5.335088968276978e-01, 5.425737500190735e-01, 5.547636747360229e-01, 5.650571584701538e-01, 5.624149441719055e-01, 4.075742959976196e-01, 5.743325814933087e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 9.725631855417305e-08, -4.278613054131686e-12, -1.966870459904624e-12, 1.54991963707829e-09, -8.040196775027653e-08, 5.539538272536504e-11, 1.569000623868888e-10, -8.525052544320136e-14, -6.299643424099999e-13, -8.490839867140998e-14, -8.490862906437163e-14, -8.490862906437163e-14, -6.299712813039038e-13, -6.299712813039038e-13, -1.175033919990909e-12, -8.490862906437163e-14, -8.490862906437163e-14, -8.490862906437163e-14, -8.490862906437163e-14, -8.490862906437163e-14, -8.490862906437163e-14, -8.490862906437163e-14, -8.490862906437163e-14, 4.601539960701062e-13, -6.299712813039038e-13, -6.299712813039038e-13, -8.490862906437163e-14, -8.490862906437163e-14, -8.490862906437163e-14, -8.490862906437163e-14]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Sensible_Examples_SpaceCooling.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Sensible_Examples_SpaceCooling.txt
index 5b20a82bfe8..fe2e528b581 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Sensible_Examples_SpaceCooling.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_ThermalWheels_Sensible_Examples_SpaceCooling.txt
@@ -1,4 +1,4 @@
-last-generated=2024-06-20
+last-generated=2024-06-23
 statistics-initialization=
 {
   "linear": "0, 0, 0, 0, 4",
@@ -14,11 +14,11 @@ statistics-simulation=
 }
 time=[1.5552e+07, 1.56384e+07]
 vol.T_start=[2.931499938964844e+02, 2.931499938964844e+02]
-vol.T=[2.931499938964844e+02, 2.935960388183594e+02, 2.938107299804688e+02, 2.938359985351562e+02, 2.93731201171875e+02, 2.935613708496094e+02, 2.933581237792969e+02, 2.931333312988281e+02, 2.928946228027344e+02, 2.926404418945312e+02, 2.923136596679688e+02, 2.918851318359375e+02, 2.913924560546875e+02, 2.909156799316406e+02, 2.905256652832031e+02, 2.902349243164062e+02, 2.900177917480469e+02, 2.898243103027344e+02, 2.895953369140625e+02, 2.893026428222656e+02, 2.889579162597656e+02, 2.88469482421875e+02, 2.866667175292969e+02, 2.861806030273438e+02, 2.862569885253906e+02, 2.867163391113281e+02, 2.875852661132812e+02, 2.889466552734375e+02, 2.906258544921875e+02, 2.923321228027344e+02, 2.937963562011719e+02, 2.950487670898438e+02, 2.961231079101562e+02, 2.969854431152344e+02, 2.971490173339844e+02, 2.971314697265625e+02, 2.966197204589844e+02, 2.958956909179688e+02, 2.956756286621094e+02, 2.960533752441406e+02, 2.966995849609375e+02, 2.971622924804688e+02, 2.971521301269531e+02, 2.971595764160156e+02, 2.971593017578125e+02, 2.971735229492188e+02, 2.971483459472656e+02, 2.971504516601562e+02, 2.971506958007812e+02, 2.971507568359375e+02, 2.971508483886719e+02, 2.971510620117188e+02, 2.971512145996094e+02, 2.971512451171875e+02, 2.97151123046875e+02, 2.97150146484375e+02, 2.97149658203125e+02, 2.971495971679688e+02, 2.971499328613281e+02, 2.971510620117188e+02, 2.97151611328125e+02, 2.971516418457031e+02, 2.971510009765625e+02, 2.971400756835938e+02, 2.971358032226562e+02, 2.971388244628906e+02, 2.967125854492188e+02, 2.95908447265625e+02, 2.959713439941406e+02, 2.968323364257812e+02, 2.971472473144531e+02, 2.971554565429688e+02, 2.978629150390625e+02, 2.990851440429688e+02, 2.998352661132812e+02, 3.001859741210938e+02, 3.001481323242188e+02, 2.997310180664062e+02, 2.990249938964844e+02, 2.98185302734375e+02, 2.973849487304688e+02, 2.966669616699219e+02, 2.960359802246094e+02, 2.955152587890625e+02, 2.951363525390625e+02, 2.948908386230469e+02, 2.947412414550781e+02, 2.946492919921875e+02, 2.945771789550781e+02, 2.94505615234375e+02, 2.944338989257812e+02, 2.943620910644531e+02, 2.942901916503906e+02, 2.9421826171875e+02, 2.941463012695312e+02, 2.940743408203125e+02, 2.940023803710938e+02, 2.939303894042969e+02, 2.938583984375e+02, 2.937864074707031e+02, 2.9371435546875e+02]
+vol.T=[2.931499938964844e+02, 2.935960388183594e+02, 2.938107299804688e+02, 2.938359985351562e+02, 2.93731201171875e+02, 2.935613708496094e+02, 2.933581237792969e+02, 2.931333312988281e+02, 2.928946228027344e+02, 2.926404418945312e+02, 2.923136596679688e+02, 2.918851318359375e+02, 2.913924560546875e+02, 2.909156799316406e+02, 2.905256652832031e+02, 2.902349243164062e+02, 2.900177917480469e+02, 2.898243103027344e+02, 2.895953369140625e+02, 2.893026428222656e+02, 2.889579162597656e+02, 2.884694519042969e+02, 2.866667175292969e+02, 2.861805725097656e+02, 2.862569580078125e+02, 2.8671630859375e+02, 2.875852355957031e+02, 2.889466552734375e+02, 2.906258544921875e+02, 2.923321228027344e+02, 2.937963562011719e+02, 2.950487670898438e+02, 2.961231079101562e+02, 2.969854431152344e+02, 2.971490173339844e+02, 2.971314697265625e+02, 2.966197204589844e+02, 2.958956909179688e+02, 2.956756591796875e+02, 2.960534057617188e+02, 2.966995849609375e+02, 2.971622924804688e+02, 2.971521301269531e+02, 2.971595764160156e+02, 2.971593017578125e+02, 2.971735229492188e+02, 2.971483459472656e+02, 2.971504516601562e+02, 2.971506958007812e+02, 2.971507263183594e+02, 2.971508483886719e+02, 2.971510620117188e+02, 2.971512145996094e+02, 2.971512451171875e+02, 2.97151123046875e+02, 2.971501159667969e+02, 2.97149658203125e+02, 2.971495666503906e+02, 2.971499328613281e+02, 2.971510620117188e+02, 2.97151611328125e+02, 2.971516418457031e+02, 2.971510009765625e+02, 2.971400756835938e+02, 2.971358032226562e+02, 2.971388244628906e+02, 2.967125549316406e+02, 2.959084777832031e+02, 2.959713439941406e+02, 2.968323364257812e+02, 2.971472778320312e+02, 2.971554565429688e+02, 2.978628845214844e+02, 2.990851440429688e+02, 2.998351745605469e+02, 3.001859741210938e+02, 3.001482238769531e+02, 2.997310180664062e+02, 2.990248718261719e+02, 2.981852111816406e+02, 2.973848876953125e+02, 2.966669311523438e+02, 2.960359497070312e+02, 2.955152587890625e+02, 2.951363525390625e+02, 2.948908386230469e+02, 2.947412719726562e+02, 2.946492919921875e+02, 2.945772094726562e+02, 2.94505615234375e+02, 2.944338989257812e+02, 2.943620910644531e+02, 2.942901916503906e+02, 2.9421826171875e+02, 2.941463012695312e+02, 2.940743408203125e+02, 2.940023498535156e+02, 2.939303894042969e+02, 2.938583984375e+02, 2.93786376953125e+02, 2.937143859863281e+02]
 TOut.T=[2.914500122070312e+02, 2.913385009765625e+02, 2.910647583007812e+02, 2.907200927734375e+02, 2.903956909179688e+02, 2.901300048828125e+02, 2.898659973144531e+02, 2.896019897460938e+02, 2.893380126953125e+02, 2.89004150390625e+02, 2.884479370117188e+02, 2.878096618652344e+02, 2.872500610351562e+02, 2.869119262695312e+02, 2.867525024414062e+02, 2.866704406738281e+02, 2.865716247558594e+02, 2.86362060546875e+02, 2.860019836425781e+02, 2.855647583007812e+02, 2.851369323730469e+02, 2.848055419921875e+02, 2.84671142578125e+02, 2.847913513183594e+02, 2.852047729492188e+02, 2.859500122070312e+02, 2.872088317871094e+02, 2.889144592285156e+02, 2.907325744628906e+02, 2.923289794921875e+02, 2.935801696777344e+02, 2.946938171386719e+02, 2.956173706054688e+02, 2.962911987304688e+02, 2.964541015625e+02, 2.957337341308594e+02, 2.947459106445312e+02, 2.941705322265625e+02, 2.945262451171875e+02, 2.952189331054688e+02, 2.959844055175781e+02, 2.966857299804688e+02, 2.972068786621094e+02, 2.977020874023438e+02, 2.981768493652344e+02, 2.985576171875e+02, 2.987735900878906e+02, 2.989007568359375e+02, 2.990133361816406e+02, 2.991251220703125e+02, 2.9925e+02, 2.993937683105469e+02, 2.99545654296875e+02, 2.996946411132812e+02, 2.998296203613281e+02, 2.999126586914062e+02, 2.999144897460938e+02, 2.99878662109375e+02, 2.998501281738281e+02, 2.99885009765625e+02, 3.0001416015625e+02, 3.001783142089844e+02, 3.003133850097656e+02, 3.001267700195312e+02, 2.985876770019531e+02, 2.964372253417969e+02, 2.946898803710938e+02, 2.943067016601562e+02, 2.951251831054688e+02, 2.964444274902344e+02, 2.976576538085938e+02, 2.981753234863281e+02, 2.982959289550781e+02, 2.982947082519531e+02, 2.980774841308594e+02, 2.975499877929688e+02, 2.9660986328125e+02, 2.953994445800781e+02, 2.94191650390625e+02, 2.932594299316406e+02, 2.926542053222656e+02, 2.921209716796875e+02, 2.917095031738281e+02, 2.914774780273438e+02, 2.91437255859375e+02, 2.914543151855469e+02, 2.914801330566406e+02, 2.914757385253906e+02, 2.914140014648438e+02, 2.913420104980469e+02, 2.912699890136719e+02, 2.91197998046875e+02, 2.911260070800781e+02, 2.910539855957031e+02, 2.909819946289062e+02, 2.909100036621094e+02, 2.908380126953125e+02, 2.907659912109375e+02, 2.906940002441406e+02, 2.906220092773438e+02, 2.905499877929688e+02]
-cooCoi.sta_a2.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.902690734863281e+02, 2.900168762207031e+02, 2.895967102050781e+02, 2.891142272949219e+02, 2.886919555664062e+02, 2.884365844726562e+02, 2.88316162109375e+02, 2.882541198730469e+02, 2.881775512695312e+02, 2.880211486816406e+02, 2.877491455078125e+02, 2.874183654785156e+02, 2.870957641601562e+02, 2.848055419921875e+02, 2.84671142578125e+02, 2.847913513183594e+02, 2.852047729492188e+02, 2.859500122070312e+02, 2.872088317871094e+02, 2.889144592285156e+02, 2.907325744628906e+02, 2.923289794921875e+02, 2.935801696777344e+02, 2.946938171386719e+02, 2.956173706054688e+02, 2.962911987304688e+02, 2.964541015625e+02, 2.957337341308594e+02, 2.947459106445312e+02, 2.941705322265625e+02, 2.945262451171875e+02, 2.952189331054688e+02, 2.959844055175781e+02, 2.966857299804688e+02, 2.972068786621094e+02, 2.977020874023438e+02, 2.981768493652344e+02, 2.984268798828125e+02, 2.982018432617188e+02, 2.981680603027344e+02, 2.981641540527344e+02, 2.981634521484375e+02, 2.981645202636719e+02, 2.981655883789062e+02, 2.98165283203125e+02, 2.981640319824219e+02, 2.981619873046875e+02, 2.981553039550781e+02, 2.981489868164062e+02, 2.981465454101562e+02, 2.981481628417969e+02, 2.981557006835938e+02, 2.981626892089844e+02, 2.981640625e+02, 2.981601257324219e+02, 2.98107177734375e+02, 2.979295043945312e+02, 2.964372253417969e+02, 2.946898803710938e+02, 2.943067016601562e+02, 2.951251831054688e+02, 2.964444274902344e+02, 2.976576538085938e+02, 2.981753234863281e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.9602001953125e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.93487548828125e+02, 2.930301818847656e+02, 2.926272583007812e+02, 2.923164367675781e+02, 2.921412353515625e+02, 2.921109924316406e+02, 2.921241149902344e+02, 2.921438598632812e+02, 2.921406860351562e+02, 2.920940856933594e+02, 2.920396118164062e+02, 2.919851379394531e+02, 2.919306335449219e+02, 2.918761901855469e+02, 2.918218078613281e+02, 2.917674255371094e+02, 2.917130126953125e+02, 2.916585693359375e+02, 2.916040649414062e+02, 2.91549560546875e+02, 2.914950561523438e+02, 2.914405517578125e+02]
-cooCoi.sta_b2.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.850066223144531e+02, 2.846719360351562e+02, 2.847826843261719e+02, 2.851853332519531e+02, 2.859185180664062e+02, 2.871560974121094e+02, 2.888516235351562e+02, 2.906712646484375e+02, 2.922807006835938e+02, 2.935388488769531e+02, 2.94657958984375e+02, 2.955890502929688e+02, 2.962724914550781e+02, 2.957259826660156e+02, 2.95759765625e+02, 2.947773742675781e+02, 2.941767578125e+02, 2.945053405761719e+02, 2.951929931640625e+02, 2.959581298828125e+02, 2.951268920898438e+02, 2.952115173339844e+02, 2.949647827148438e+02, 2.947084045410156e+02, 2.940651245117188e+02, 2.934549865722656e+02, 2.933719787597656e+02, 2.93324951171875e+02, 2.932884521484375e+02, 2.932525024414062e+02, 2.932096557617188e+02, 2.931571350097656e+02, 2.931011352539062e+02, 2.9304833984375e+02, 2.930151672363281e+02, 2.930163879394531e+02, 2.930328674316406e+02, 2.930459289550781e+02, 2.930332641601562e+02, 2.92979248046875e+02, 2.929098815917969e+02, 2.928516235351562e+02, 2.928836669921875e+02, 2.934917602539062e+02, 2.955537109375e+02, 2.947334594726562e+02, 2.942952880859375e+02, 2.950852661132812e+02, 2.963969421386719e+02, 2.9524072265625e+02, 2.947373352050781e+02, 2.944199829101562e+02, 2.944199829101562e+02, 2.944199829101562e+02, 2.944199829101562e+02, 2.941937255859375e+02, 2.944199829101562e+02, 2.944199829101562e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02, 2.941937255859375e+02]
+cooCoi.sta_a2.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.902690734863281e+02, 2.900168762207031e+02, 2.895967102050781e+02, 2.891142272949219e+02, 2.886919555664062e+02, 2.884365844726562e+02, 2.88316162109375e+02, 2.882541198730469e+02, 2.881775512695312e+02, 2.880211486816406e+02, 2.877491455078125e+02, 2.874183654785156e+02, 2.870957641601562e+02, 2.848055419921875e+02, 2.84671142578125e+02, 2.847913513183594e+02, 2.852047729492188e+02, 2.859500122070312e+02, 2.872088317871094e+02, 2.889144592285156e+02, 2.907325744628906e+02, 2.923289794921875e+02, 2.935801696777344e+02, 2.946938171386719e+02, 2.956173706054688e+02, 2.962911987304688e+02, 2.964541015625e+02, 2.957337341308594e+02, 2.947459106445312e+02, 2.941705322265625e+02, 2.945262451171875e+02, 2.952189331054688e+02, 2.959844055175781e+02, 2.966857299804688e+02, 2.972068786621094e+02, 2.977020874023438e+02, 2.981768493652344e+02, 2.984269409179688e+02, 2.982018127441406e+02, 2.981680603027344e+02, 2.981641540527344e+02, 2.981634521484375e+02, 2.981645202636719e+02, 2.981655883789062e+02, 2.98165283203125e+02, 2.981640319824219e+02, 2.981619873046875e+02, 2.981553039550781e+02, 2.981489868164062e+02, 2.981465454101562e+02, 2.981481628417969e+02, 2.981557006835938e+02, 2.981626892089844e+02, 2.981640625e+02, 2.981601257324219e+02, 2.98107177734375e+02, 2.979295349121094e+02, 2.964372253417969e+02, 2.946898803710938e+02, 2.943067016601562e+02, 2.951251831054688e+02, 2.964444274902344e+02, 2.976576538085938e+02, 2.981753234863281e+02, 2.941943969726562e+02, 2.941943969726562e+02, 2.980774841308594e+02, 2.967308044433594e+02, 2.9660986328125e+02, 2.941943969726562e+02, 2.941923217773438e+02, 2.941943969726562e+02, 2.941943969726562e+02, 2.926271057128906e+02, 2.923165893554688e+02, 2.921413879394531e+02, 2.941943969726562e+02, 2.921242370605469e+02, 2.921440124511719e+02, 2.921406860351562e+02, 2.941943969726562e+02, 2.941943969726562e+02, 2.941943969726562e+02, 2.941943969726562e+02, 2.918763427734375e+02, 2.941943969726562e+02, 2.941943969726562e+02, 2.917131652832031e+02, 2.916585388183594e+02, 2.941943969726562e+02, 2.915497131347656e+02, 2.941943969726562e+02, 2.941943969726562e+02]
+cooCoi.sta_b2.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.850065307617188e+02, 2.846719360351562e+02, 2.847826843261719e+02, 2.851853332519531e+02, 2.859185180664062e+02, 2.871560974121094e+02, 2.888516235351562e+02, 2.906712646484375e+02, 2.922807006835938e+02, 2.935388488769531e+02, 2.94657958984375e+02, 2.955890502929688e+02, 2.962724914550781e+02, 2.957259826660156e+02, 2.95759521484375e+02, 2.947773742675781e+02, 2.941767578125e+02, 2.945053405761719e+02, 2.951929931640625e+02, 2.959581298828125e+02, 2.951267700195312e+02, 2.952116394042969e+02, 2.949649353027344e+02, 2.947083740234375e+02, 2.940653381347656e+02, 2.93454833984375e+02, 2.933719177246094e+02, 2.933248901367188e+02, 2.932884216308594e+02, 2.9325244140625e+02, 2.932096252441406e+02, 2.931571350097656e+02, 2.931011352539062e+02, 2.9304833984375e+02, 2.930151672363281e+02, 2.930163879394531e+02, 2.930328369140625e+02, 2.930459289550781e+02, 2.930332641601562e+02, 2.929792175292969e+02, 2.929098815917969e+02, 2.928516235351562e+02, 2.928837280273438e+02, 2.934918518066406e+02, 2.955535888671875e+02, 2.947333984375e+02, 2.942952880859375e+02, 2.950852661132812e+02, 2.963969421386719e+02, 2.952407531738281e+02, 2.947372131347656e+02, 2.944201049804688e+02, 2.944201049804688e+02, 2.941943969726562e+02, 2.941943969726562e+02, 2.941943969726562e+02, 2.944201049804688e+02, 2.941943969726562e+02, 2.944201049804688e+02, 2.944201049804688e+02, 2.941943969726562e+02, 2.941943969726562e+02, 2.941943969726562e+02, 2.944201049804688e+02, 2.941943969726562e+02, 2.941943969726562e+02, 2.941943969726562e+02, 2.944201049804688e+02, 2.944201049804688e+02, 2.944201049804688e+02, 2.944201049804688e+02, 2.941943969726562e+02, 2.944201049804688e+02, 2.944201049804688e+02, 2.941943969726562e+02, 2.941943969726562e+02, 2.944201049804688e+02, 2.941943969726562e+02, 2.944201049804688e+02, 2.944201049804688e+02]
 opeSig.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, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+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]
-senTemHXOut.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.848058471679688e+02, 2.846711730957031e+02, 2.847910461425781e+02, 2.852041015625e+02, 2.859490661621094e+02, 2.8720703125e+02, 2.88912353515625e+02, 2.907305603027344e+02, 2.923273620605469e+02, 2.935787963867188e+02, 2.94692626953125e+02, 2.956164245605469e+02, 2.962905883789062e+02, 2.964544982910156e+02, 2.957348327636719e+02, 2.947469482421875e+02, 2.941707153320312e+02, 2.945255432128906e+02, 2.952180786132812e+02, 2.959835205078125e+02, 2.966849975585938e+02, 2.972063293457031e+02, 2.977015075683594e+02, 2.981763610839844e+02, 2.984271240234375e+02, 2.982019348144531e+02, 2.981680908203125e+02, 2.981641540527344e+02, 2.981634521484375e+02, 2.981645202636719e+02, 2.981655883789062e+02, 2.981653137207031e+02, 2.981640319824219e+02, 2.981619873046875e+02, 2.981553039550781e+02, 2.981489868164062e+02, 2.981465454101562e+02, 2.981481628417969e+02, 2.981557006835938e+02, 2.981626892089844e+02, 2.981640625e+02, 2.981601257324219e+02, 2.981073303222656e+02, 2.979299926757812e+02, 2.964396667480469e+02, 2.946912841796875e+02, 2.943062744140625e+02, 2.951238403320312e+02, 2.964428405761719e+02, 2.976565551757812e+02, 2.981751403808594e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02]
+senTemHXOut.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.848058471679688e+02, 2.846711730957031e+02, 2.847910461425781e+02, 2.852041015625e+02, 2.859490356445312e+02, 2.8720703125e+02, 2.88912353515625e+02, 2.907305603027344e+02, 2.923273620605469e+02, 2.935787963867188e+02, 2.94692626953125e+02, 2.956164245605469e+02, 2.962905883789062e+02, 2.964544982910156e+02, 2.957348327636719e+02, 2.947469482421875e+02, 2.941707153320312e+02, 2.945255432128906e+02, 2.952180786132812e+02, 2.959835205078125e+02, 2.966849975585938e+02, 2.972063293457031e+02, 2.977015075683594e+02, 2.981763610839844e+02, 2.984271850585938e+02, 2.98201904296875e+02, 2.981680908203125e+02, 2.981641235351562e+02, 2.981634521484375e+02, 2.981645202636719e+02, 2.981656188964844e+02, 2.98165283203125e+02, 2.981640319824219e+02, 2.981619873046875e+02, 2.981553039550781e+02, 2.981489868164062e+02, 2.981465454101562e+02, 2.981481628417969e+02, 2.981556701660156e+02, 2.981626892089844e+02, 2.981640625e+02, 2.981601257324219e+02, 2.981073303222656e+02, 2.979300537109375e+02, 2.964396667480469e+02, 2.946912841796875e+02, 2.943062744140625e+02, 2.951238403320312e+02, 2.964428405761719e+02, 2.976565551757812e+02, 2.981751403808594e+02, 2.982535400390625e+02, 2.982535400390625e+02, 2.982535400390625e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02, 2.982535705566406e+02]
 TMixSetPoi.y=[2.981499938964844e+02, 2.981499938964844e+02]
-whe.senSupMasFlo.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.484671949667417e-39, 1.190687688775063e-32, 1.199573397509722e-32, 9.64341617619168e-21, 1.408186102429849e-32, 1.387074370825874e-32, 1.380611943695435e-32, 1.360324380568181e-32, 1.928683235238336e-20, 8.141630361480616e-33, 8.191026838154077e-33, 9.64341617619168e-21, 1.458067323586229e-32, 5.743309117178796e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 7.270976709605748e-08, 8.702646195888519e-02, 3.237918317317963e-01, 3.773355782032013e-01, 4.059529602527618e-01, 4.294154644012451e-01, 4.516304731369019e-01, 4.738048017024994e-01, 4.942177534103394e-01, 5.117353796958923e-01, 5.259471535682678e-01, 5.351343750953674e-01, 5.367643237113953e-01, 5.341477990150452e-01, 5.311824679374695e-01, 5.326873660087585e-01, 5.423303246498108e-01, 5.549526214599609e-01, 5.653319954872131e-01, 5.621629953384399e-01, 4.042332768440247e-01, 5.743316222606154e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 9.724735861027511e-08, -1.558182486829902e-16, -2.671767649920507e-15, -1.910148403924498e-14, -6.380397078731281e-12, 3.535883981171505e-16, -1.814892637216903e-12, -2.739144089498879e-13, 1.519172903251785e-14, 1.515335844000723e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14, 1.514518118393444e-14]
+whe.senSupMasFlo.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.484671949667417e-39, 1.190687688775063e-32, 1.199573397509722e-32, 9.64341617619168e-21, 1.408186102429849e-32, 1.387074370825874e-32, 1.380611943695435e-32, 1.360324380568181e-32, 1.928683235238336e-20, 8.141630361480616e-33, 8.191026838154077e-33, 9.64341617619168e-21, 1.458067323586229e-32, 5.74331693314889e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 7.271409430131826e-08, 8.702292293310165e-02, 3.238081336021423e-01, 3.773366808891296e-01, 4.059539139270782e-01, 4.294155240058899e-01, 4.516304135322571e-01, 4.738050401210785e-01, 4.942173361778259e-01, 5.117358565330505e-01, 5.259470343589783e-01, 5.351342558860779e-01, 5.367643237113953e-01, 5.341478586196899e-01, 5.311825275421143e-01, 5.32687783241272e-01, 5.42330801486969e-01, 5.5495285987854e-01, 5.653319358825684e-01, 5.621614456176758e-01, 4.042231738567352e-01, 5.743317288420258e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 5.743316577877522e-08, 9.726815619615081e-08, -1.336427090716798e-15, -3.149891805720451e-12, 4.251921037479178e-10, 2.77262428646655e-14, 7.773979376901607e-11, -1.104984159727707e-11, 2.703484408995288e-13, -1.906280580436792e-13, -1.905982695889902e-13, 1.444589673577079e-12, 3.544643962030691e-13, 3.544643962030691e-13, -1.905982695889902e-13, 3.544643962030691e-13, 3.544643962030691e-13, 8.995270348900741e-13, -1.905982695889902e-13, -1.905982695889902e-13, -7.356609353810495e-13, -7.356609353810495e-13, 3.544643962030691e-13, -7.356609353810495e-13, -7.356609353810495e-13, 3.544643962030691e-13, 8.995270348900741e-13, -1.905982695889902e-13, 3.544643962030691e-13, -1.905982695889902e-13, -7.356609353810495e-13]

From 1af8bcbb9859fd5569fc65b19ead18b87398ff38 Mon Sep 17 00:00:00 2001
From: SenHuang19 <jhy1987@gmail.com>
Date: Mon, 24 Jun 2024 08:06:29 -0400
Subject: [PATCH 21/27] minor change

---
 .../ThermalWheels/Latent/BaseClasses/Effectiveness.mo           | 2 --
 .../ThermalWheels/Sensible/BaseClasses/Effectiveness.mo         | 2 --
 2 files changed, 4 deletions(-)

diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Effectiveness.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Effectiveness.mo
index 342066dd122..c1a66c4e1fc 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Effectiveness.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BaseClasses/Effectiveness.mo
@@ -22,12 +22,10 @@ model Effectiveness
     "Nominal supply air mass flow rate";
 
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TSup(
-    final min=0,
     final unit="K")
     "Supply air temperature"
     annotation (Placement(transformation(extent={{-140,-60},{-100,-20}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TExh(
-    final min=0,
     final unit="K")
     "Exhaust air temperature"
     annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Effectiveness.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Effectiveness.mo
index dbfcafa9132..eab917f931a 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Effectiveness.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Effectiveness.mo
@@ -14,12 +14,10 @@ model Effectiveness
     "Nominal supply air mass flow rate";
 
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TSup(
-    final min=0,
     final unit="K")
     "Supply air temperature"
     annotation (Placement(transformation(extent={{-140,-60},{-100,-20}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TExh(
-    final min=0,
     final unit="K")
     "Exhaust air temperature" 
     annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));

From 3b4309d4746d5b5a9976ebf2edda2f61b839e5b6 Mon Sep 17 00:00:00 2001
From: SenHuang19 <jhy1987@gmail.com>
Date: Fri, 5 Jul 2024 11:28:09 -0400
Subject: [PATCH 22/27] model doc update

---
 .../Characteristics/heatExchangerEffectivenessParameters.mo | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/heatExchangerEffectivenessParameters.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/heatExchangerEffectivenessParameters.mo
index 40a0c059147..d29d74a63dd 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/heatExchangerEffectivenessParameters.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/heatExchangerEffectivenessParameters.mo
@@ -8,12 +8,12 @@ record heatExchangerEffectivenessParameters
     "Correction of the heat exchange effectiveness under a given speed ratio";
   annotation (Documentation(info="<html>
 <p>
-Data record that describes wheel speed ratio versus
-heat exchange effectiveness corrections, i.e., the ratio of the heat exchange effectiveness 
+Data record that describes wheel speed ratio <code>uSpe</code> versus
+heat exchange effectiveness corrections <code>epsCor</code>, i.e., the ratio of the heat exchange effectiveness 
 to that when the <code>uSpe</code> is <i>1</i>.
 The wheel speed ratio <code>uSpe</code> must be increasing, 
 i.e.,<code>uSpe[i] &lt; uSpe[i+1]</code>.
-Both vectors, <code>uSpe</code> and <code>uSpe</code>
+Both vectors, <code>uSpe</code> and <code>epsCor</code>
 must have the same size.
 </p>
 </html>", revisions="<html>

From df18e6bc3fb53057bb707cfd0ca46c429f13e7ca Mon Sep 17 00:00:00 2001
From: SenHuang19 <jhy1987@gmail.com>
Date: Wed, 14 Aug 2024 16:41:49 -0400
Subject: [PATCH 23/27] improve the model doc

---
 .../heatExchangerEffectivenessParameters.mo      |  6 +++---
 .../Characteristics/motorEfficiencyParameters.mo |  2 +-
 .../BaseClasses/Data/Generic.mo                  | 16 ++++++++--------
 .../VariableSpeedThermalWheels/Sensible.mo       |  9 +++++++--
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/heatExchangerEffectivenessParameters.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/heatExchangerEffectivenessParameters.mo
index d29d74a63dd..5c53123665a 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/heatExchangerEffectivenessParameters.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/heatExchangerEffectivenessParameters.mo
@@ -1,17 +1,17 @@
 within Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Characteristics;
 record heatExchangerEffectivenessParameters
-  "Record for heat exchanger effectiveness correction vs. wheel speed ratio"
+  "Parameters for defining heat exchanger effectiveness at different wheel speed ratio"
   extends Modelica.Icons.Record;
   parameter Real uSpe[:](each min=0)
     "Wheel speed ratio";
   parameter Real epsCor[:](each max=1)
-    "Correction of the heat exchange effectiveness under a given speed ratio";
+    "Correction of the heat exchange effectiveness at a given speed ratio";
   annotation (Documentation(info="<html>
 <p>
 Data record that describes wheel speed ratio <code>uSpe</code> versus
 heat exchange effectiveness corrections <code>epsCor</code>, i.e., the ratio of the heat exchange effectiveness 
 to that when the <code>uSpe</code> is <i>1</i>.
-The wheel speed ratio <code>uSpe</code> must be increasing, 
+The elements of the vector <code>uSpe</code> should be in ascending order, 
 i.e.,<code>uSpe[i] &lt; uSpe[i+1]</code>.
 Both vectors, <code>uSpe</code> and <code>epsCor</code>
 must have the same size.
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/motorEfficiencyParameters.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/motorEfficiencyParameters.mo
index f7621ad4e5b..93b2e0202f9 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/motorEfficiencyParameters.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/motorEfficiencyParameters.mo
@@ -1,6 +1,6 @@
 within Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Characteristics;
 record motorEfficiencyParameters
-  "Record for motor efficiency parameters vs. wheel speed ratio"
+  "Parameters for defining motor efficiency at different wheel speed ratio"
   extends Modelica.Icons.Record;
   parameter Real uSpe[:](each min=0)
     "Wheel speed ratio";
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/Generic.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/Generic.mo
index bbb85460a44..c78a05ac690 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/Generic.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/Generic.mo
@@ -55,22 +55,22 @@ The record contains four datasets:
 </p>
 <ul>
 <li>
-wheel speed ratio versus motor percent full-load
-efficiency,
+the motor efficiency versus wheel speed ratio,
 </li>
 <li>
-wheel speed ratio versus default motor percent full-load 
+the default motor percent full-load 
 efficiency (see <a href=
 \"modelica://Buildings.Fluid.Movers.BaseClasses.Characteristics.motorEfficiencyCurve\">
-Buildings.Fluid.Movers.BaseClasses.Characteristics.motorEfficiencyCurve</a>),
+Buildings.Fluid.Movers.BaseClasses.Characteristics.motorEfficiencyCurve</a>)
+versus wheel speed ratio,
 </li>
 <li>
-wheel speed ratio versus sensible heat exchange effectiveness
-corrections,
+the sensible heat exchange effectiveness
+corrections versus wheel speed ratio,
 </li>
 <li>
-wheel speed ratio versus latent heat exchange effectiveness
-corrections.
+the latent heat exchange effectiveness
+corrections versus wheel speed ratio .
 </li>
 </ul>
 <p>
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Sensible.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Sensible.mo
index 2555d88401c..802fc730580 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Sensible.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Sensible.mo
@@ -72,8 +72,13 @@ P = P_nominal * uSpe / eta,
 <p>
 where <code>P_nominal</code> is the nominal wheel power consumption,
 <code>uSpe</code> is the wheel speed ratio, 
-and the <code>eta</code> is the motor percent full-load efficiency, i.e.,
-the ratio of the motor efficiency to that when the <code>uSpe</code> is <i>1</i>.
+and <code>eta</code> is the motor percent full-load efficiency, 
+which is calculated by
+<p align=\"center\" style=\"font-style:italic;\">
+eta = eff(uSpe=x) / eff(uSpe=1),
+</p>
+<p>
+where <code>eff(uSpe=x)</code> is the motor efficiency when the speed ratio is <code>x</code>.
 The <code>eta</code> is obtained based on the cubic hermite spline interpolation of
 the motor percent full-load efficiency dataset (see 
 <a href=\"modelica://Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Characteristics.motorEfficiencyParameters\">

From 37f3c7d4a0e53f3d827d38a26097bc59828fd64c Mon Sep 17 00:00:00 2001
From: SenHuang19 <jhy1987@gmail.com>
Date: Fri, 30 Aug 2024 00:06:27 -0400
Subject: [PATCH 24/27] model doc improve

---
 .../motorEfficiencyParameters.mo              |  9 ++++---
 .../BaseClasses/Data/Generic.mo               | 10 ++++----
 .../VariableSpeedThermalWheels/Sensible.mo    |  4 +--
 .../Validation/VariableSpeedThermalWheels.mo  | 11 ++++----
 .../Latent/Validation/SpeedControlled.mo      | 24 +++++++++---------
 .../Sensible/Validation/SpeedControlled.mo    | 25 ++++++++++---------
 6 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/motorEfficiencyParameters.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/motorEfficiencyParameters.mo
index 93b2e0202f9..86e6c17fc83 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/motorEfficiencyParameters.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/motorEfficiencyParameters.mo
@@ -8,10 +8,13 @@ record motorEfficiencyParameters
     "Wheel motor efficiency at wheel speed ratios";
   annotation (Documentation(info="<html>
 <p>
-This model is identical to
+This model describes wheel speed ratio <code>uSpe</code> versus
+the motor percent full-load efficiency (see 
+<a href=\"modelica://Buildings.Fluid.Movers.BaseClasses.Characteristics.motorEfficiencyCurve\">
+Buildings.Fluid.Movers.BaseClasses.Characteristics.motorEfficiencyCurve</a>).
+It is developed based on
 <a href=\"modelica://Buildings.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters_yMot\">
-Buildings.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters_yMot</a>,
-with the original definition expanded to cover wheels.
+Buildings.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters_yMot</a>.
 </p>
 </html>",
 revisions="<html>
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/Generic.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/Generic.mo
index c78a05ac690..5b842acdbe1 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/Generic.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Data/Generic.mo
@@ -79,14 +79,14 @@ Note that
 <ul>
 <li>
 When <code>haveLatentHeatExchange</code> is false,
-the dataset of wheel speed ratio versus latent heat exchange effectiveness 
-corrections is disabled,
+the dataset of the latent heat exchange effectiveness
+corrections versus wheel speed ratio is disabled,
 </li>
 <li>
 When <code>useDefaultMotorEfficiencyCurve</code> is true,
-the curve of wheel speed ratio versus motor percent full-load 
-efficiency is disabled while the curve of wheel speed ratio 
-versus default motor percent full-load efficiency is enabled. 
+the motor efficiency versus wheel speed ratio is disabled 
+while the default motor percent full-load 
+efficiency versus wheel speed ratio is enabled. 
 </li>
 </ul>
 </html>"));
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Sensible.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Sensible.mo
index 802fc730580..3057f9a9fb0 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Sensible.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Sensible.mo
@@ -82,8 +82,8 @@ where <code>eff(uSpe=x)</code> is the motor efficiency when the speed ratio is <
 The <code>eta</code> is obtained based on the cubic hermite spline interpolation of
 the motor percent full-load efficiency dataset (see 
 <a href=\"modelica://Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Characteristics.motorEfficiencyParameters\">
-Buildings.Fluid.HeatExchangers.BaseClasses.BaseClasses.VariableSpeedThermalWheels.Characteristics.motorEfficiencyParameters</a>.).
-Please note that <code>uSpe/eta</code> should be less or equal to 1.
+Buildings.Fluid.HeatExchangers.BaseClasses.BaseClasses.VariableSpeedThermalWheels.Characteristics.motorEfficiencyParameters</a>).
+Please note that <code>uSpe/eta</code> must be less or equal to 1.
 </p>
 </li>
 <li>
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/VariableSpeedThermalWheels.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/VariableSpeedThermalWheels.mo
index 442c6d78773..ace01b2a6b2 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/VariableSpeedThermalWheels.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/VariableSpeedThermalWheels.mo
@@ -2,17 +2,18 @@ within Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Val
 model VariableSpeedThermalWheels
   "Model that tests the variable-speed thermal wheels"
   extends Modelica.Icons.Example;
-  Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Sensible
-    senWhe(per=perSenWhe)
-    "Sensible heat wheel"
-    annotation (Placement(transformation(extent={{-10,40},{10,60}})));
-  Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.ASHRAE
+  parameter Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.ASHRAE
     perSenWhe(
     motorEfficiency(uSpe={0.1,0.6,0.8,1}, eta={0.3,0.8,0.85,1}),
     haveLatentHeatExchange=false,
     useDefaultMotorEfficiencyCurve=false)
     "Performance record for the sensible heat wheel"
     annotation (Placement(transformation(extent={{-80,74},{-60,94}})));
+  Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Sensible
+    senWhe(per=perSenWhe)
+    "Sensible heat wheel"
+    annotation (Placement(transformation(extent={{-10,40},{10,60}})));
+
   Modelica.Blocks.Sources.Ramp uSpe(
     duration=1,
     startTime=0,
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mo
index d0d14cff651..6c185a0db8c 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/Validation/SpeedControlled.mo
@@ -4,6 +4,18 @@ model SpeedControlled
   extends Modelica.Icons.Example;
   package Medium = Buildings.Media.Air
     "Air";
+  parameter Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.ASHRAE
+    perLatWhe(
+    motorEfficiency(uSpe={0.1,0.6,0.8,1}, eta={0.3,0.8,0.9,1}),
+    haveLatentHeatExchange=true,
+    useDefaultMotorEfficiencyCurve=false)
+    "Performance record for the enthalpy wheel"
+    annotation (Placement(transformation(extent={{-60,60},{-40,80}})));
+  parameter Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.ASHRAE
+    perLatWheDefMotCur(haveLatentHeatExchange=true,
+    useDefaultMotorEfficiencyCurve=true)
+    "Performance record for the enthalpy wheel with default motor curve"
+    annotation (Placement(transformation(extent={{-20,60},{0,80}})));
   Buildings.Fluid.Sources.Boundary_pT sin_2(
     redeclare package Medium = Medium,
     p(displayUnit="Pa") = 101325,
@@ -83,18 +95,6 @@ model SpeedControlled
       m_flow_nominal=5)
       "Temperature of the supply air"
     annotation (Placement(transformation(extent={{40,20},{60,40}})));
-  Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.ASHRAE
-    perLatWhe(
-    motorEfficiency(uSpe={0.1,0.6,0.8,1}, eta={0.3,0.8,0.9,1}),
-    haveLatentHeatExchange=true,
-    useDefaultMotorEfficiencyCurve=false)
-    "Performance record for the enthalpy wheel"
-    annotation (Placement(transformation(extent={{-60,60},{-40,80}})));
-  Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.ASHRAE
-    perLatWheDefMotCur(haveLatentHeatExchange=true,
-    useDefaultMotorEfficiencyCurve=true)
-    "Performance record for the enthalpy wheel with default motor curve"
-    annotation (Placement(transformation(extent={{-20,60},{0,80}})));
 equation
   connect(TSup.y, sou_1.T_in)
     annotation (Line(points={{-59,34},{-42,34}}, color={0,0,127}));
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mo
index 6eb1dbe036c..7966446d569 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Validation/SpeedControlled.mo
@@ -4,6 +4,17 @@ model SpeedControlled
   extends Modelica.Icons.Example;
   package Medium = Buildings.Media.Air
     "Air";
+  parameter Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.ASHRAE per(
+    motorEfficiency(uSpe={0.1,0.6,0.8,1}, eta={0.3,0.8,0.9,1}),
+    haveLatentHeatExchange=false,
+    useDefaultMotorEfficiencyCurve=false)
+    "Performance record for the sensible heat wheel"
+    annotation (Placement(transformation(extent={{-34,60},{-14,80}})));
+  parameter Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.ASHRAE perDefMotCur(
+      haveLatentHeatExchange=true,
+      useDefaultMotorEfficiencyCurve=true)
+    "Performance record for the sensible heat wheel with default motor curve"
+    annotation (Placement(transformation(extent={{6,60},{26,80}})));
   Buildings.Fluid.Sources.Boundary_pT sin_2(
     redeclare package Medium = Medium,
     p(displayUnit="Pa") = 101325,
@@ -72,20 +83,10 @@ model SpeedControlled
     redeclare package Medium = Medium,
     mSup_flow_nominal=5,
     mExh_flow_nominal=5,
-    per=perDefMotCur)    
+    per=perDefMotCur)
     "Wheel with a default curve"
     annotation (Placement(transformation(extent={{0,-30},{20,-10}})));
-  Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.ASHRAE per(
-    motorEfficiency(uSpe={0.1,0.6,0.8,1}, eta={0.3,0.8,0.9,1}),
-    haveLatentHeatExchange=false,
-    useDefaultMotorEfficiencyCurve=false)
-    "Performance record for the sensible heat wheel"
-    annotation (Placement(transformation(extent={{-34,60},{-14,80}})));
-  Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.ASHRAE perDefMotCur(
-      haveLatentHeatExchange=true, 
-      useDefaultMotorEfficiencyCurve=true)
-    "Performance record for the sensible heat wheel with default motor curve"
-    annotation (Placement(transformation(extent={{6,60},{26,80}})));
+
 equation
   connect(TSup.y, sou_1.T_in)
     annotation (Line(points={{-59,34},{-42,34}}, color={0,0,127}));

From ee21c9fb223167a985f9ef2149fbe509bec5d112 Mon Sep 17 00:00:00 2001
From: SenHuang19 <jhy1987@gmail.com>
Date: Mon, 2 Sep 2024 21:29:15 -0400
Subject: [PATCH 25/27] model doc update

---
 .../heatExchangerEffectivenessParameters.mo            |  6 +++---
 .../Characteristics/motorEfficiencyParameters.mo       | 10 +++++-----
 .../BaseClasses/VariableSpeedThermalWheels/Latent.mo   |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/heatExchangerEffectivenessParameters.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/heatExchangerEffectivenessParameters.mo
index 5c53123665a..03001bdd155 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/heatExchangerEffectivenessParameters.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/heatExchangerEffectivenessParameters.mo
@@ -1,10 +1,10 @@
 within Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Characteristics;
 record heatExchangerEffectivenessParameters
-  "Parameters for defining heat exchanger effectiveness at different wheel speed ratio"
+  "Parameters for defining heat exchanger effectiveness at different wheel speed ratios"
   extends Modelica.Icons.Record;
-  parameter Real uSpe[:](each min=0)
+  parameter Real uSpe[:](each final min=0)
     "Wheel speed ratio";
-  parameter Real epsCor[:](each max=1)
+  parameter Real epsCor[:](each final max=1)
     "Correction of the heat exchange effectiveness at a given speed ratio";
   annotation (Documentation(info="<html>
 <p>
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/motorEfficiencyParameters.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/motorEfficiencyParameters.mo
index 86e6c17fc83..6d1059a0c04 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/motorEfficiencyParameters.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/BaseClasses/Characteristics/motorEfficiencyParameters.mo
@@ -1,18 +1,18 @@
 within Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Characteristics;
 record motorEfficiencyParameters
-  "Parameters for defining motor efficiency at different wheel speed ratio"
+  "Parameters for defining motor efficiency at different wheel speed ratios"
   extends Modelica.Icons.Record;
-  parameter Real uSpe[:](each min=0)
+  parameter Real uSpe[:](each final min=0)
     "Wheel speed ratio";
-  parameter Modelica.Units.SI.Efficiency eta[size(uSpe, 1)](each max=1)
-    "Wheel motor efficiency at wheel speed ratios";
+  parameter Modelica.Units.SI.Efficiency eta[size(uSpe, 1)](each final max=1)
+    "Wheel motor efficiency at a given speed ratio";
   annotation (Documentation(info="<html>
 <p>
 This model describes wheel speed ratio <code>uSpe</code> versus
 the motor percent full-load efficiency (see 
 <a href=\"modelica://Buildings.Fluid.Movers.BaseClasses.Characteristics.motorEfficiencyCurve\">
 Buildings.Fluid.Movers.BaseClasses.Characteristics.motorEfficiencyCurve</a>).
-It is developed based on
+It is based on
 <a href=\"modelica://Buildings.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters_yMot\">
 Buildings.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters_yMot</a>.
 </p>
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Latent.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Latent.mo
index a6e6ce60ab7..2346b3f4514 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Latent.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Latent.mo
@@ -23,7 +23,7 @@ heat exchange effectiveness correction of an enthalpy wheel.
 </p>
 <p>
 The calculation of the power consumption and the sensible 
-heat exchange effectiveness correction can be referred to
+heat exchange effectiveness correction is elaborated in
 <a href=\"modelica://Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Sensible\"> 
 Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Sensible</a>.
 </p>

From 4da862d48010bfb60a10348a3a2e17e81e1d4c65 Mon Sep 17 00:00:00 2001
From: Huang <7q0@ornl.gov>
Date: Thu, 26 Sep 2024 16:07:26 -0400
Subject: [PATCH 26/27] change the performance dataset into parameters

---
 .../Validation/VariableSpeedThermalWheels.mo  | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/VariableSpeedThermalWheels.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/VariableSpeedThermalWheels.mo
index ace01b2a6b2..9037ddc003c 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/VariableSpeedThermalWheels.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Validation/VariableSpeedThermalWheels.mo
@@ -9,6 +9,17 @@ model VariableSpeedThermalWheels
     useDefaultMotorEfficiencyCurve=false)
     "Performance record for the sensible heat wheel"
     annotation (Placement(transformation(extent={{-80,74},{-60,94}})));
+  parameter Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.ASHRAE perLatWhe(
+    motorEfficiency(uSpe={0.1,0.6,0.8,1}, eta={0.3,0.8,0.85,1}),
+    haveLatentHeatExchange=true,
+    useDefaultMotorEfficiencyCurve=false)
+    "Performance record for the enthalpy wheel"
+    annotation (Placement(transformation(extent={{-40,74},{-20,94}})));
+  parameter Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.ASHRAE perLatWheDefMotCur(
+    haveLatentHeatExchange=true,
+    useDefaultMotorEfficiencyCurve=true)
+    "Performance record for the enthalpy wheel with default motor dataset"
+    annotation (Placement(transformation(extent={{0,74},{20,94}})));    
   Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.Sensible
     senWhe(per=perSenWhe)
     "Sensible heat wheel"
@@ -29,17 +40,7 @@ model VariableSpeedThermalWheels
     per=perLatWheDefMotCur)
     "Enthalpy wheel with default motor curve"
     annotation (Placement(transformation(extent={{-10,-60},{10,-40}})));
-  Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.ASHRAE perLatWhe(
-    motorEfficiency(uSpe={0.1,0.6,0.8,1}, eta={0.3,0.8,0.85,1}),
-    haveLatentHeatExchange=true,
-    useDefaultMotorEfficiencyCurve=false)
-    "Performance record for the enthalpy wheel"
-    annotation (Placement(transformation(extent={{-40,74},{-20,94}})));
-  Buildings.Fluid.HeatExchangers.BaseClasses.VariableSpeedThermalWheels.BaseClasses.Data.ASHRAE perLatWheDefMotCur(
-    haveLatentHeatExchange=true,
-    useDefaultMotorEfficiencyCurve=true)
-    "Performance record for the enthalpy wheel with default motor dataset"
-    annotation (Placement(transformation(extent={{0,74},{20,94}})));
+
 equation
   connect(uSpe.y, senWhe.uSpe)
     annotation (Line(points={{-39,0},{-28,0},{-28,50},

From 0b7f3346619e377e354b68fbf6cfefa4d42d9be5 Mon Sep 17 00:00:00 2001
From: SenHuang19 <jhy1987@gmail.com>
Date: Fri, 27 Sep 2024 10:34:32 -0400
Subject: [PATCH 27/27] minor doc format update

---
 .../BaseClasses/VariableSpeedThermalWheels/Sensible.mo        | 2 +-
 .../HeatExchangers/ThermalWheels/Latent/BypassDampers.mo      | 2 +-
 .../ThermalWheels/Sensible/BaseClasses/Effectiveness.mo       | 2 +-
 .../HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo    | 2 +-
 .../ThermalWheels/Sensible/Examples/SpaceCooling.mo           | 4 ++--
 Buildings/Fluid/HeatExchangers/ThermalWheels/package.mo       | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Sensible.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Sensible.mo
index 3057f9a9fb0..3e501350da1 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Sensible.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/VariableSpeedThermalWheels/Sensible.mo
@@ -38,7 +38,7 @@ initial equation
                   "Check if the motor efficiency curve is correct";
   end for;
   assert(abs(yeta[size(yeta,1)]-1) < 1E-4,
-          "In " + getInstanceName() + ": motor efficiency curve is wrong. 
+          "In " + getInstanceName() + ": the motor efficiency curve is wrong. 
           The motor percent full-load efficiency at the full seepd should be 1",
           level=AssertionLevel.error)
           "Check if the motor efficiency curve is consistent with the nominal condition";
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo
index 4482c7980d3..469d347237c 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Latent/BypassDampers.mo
@@ -7,7 +7,7 @@ model BypassDampers
     dpDamper_nominal(displayUnit="Pa") = 20
     "Nominal pressure drop of dampers"
     annotation (Dialog(group="Nominal condition"));
-   parameter Real P_nominal(final unit="W")
+  parameter Real P_nominal(final unit="W")
     "Power consumption at the design condition"
     annotation (Dialog(group="Nominal condition"));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput uBypDamPos(
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Effectiveness.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Effectiveness.mo
index eab917f931a..ec3a782c1d9 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Effectiveness.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BaseClasses/Effectiveness.mo
@@ -19,7 +19,7 @@ model Effectiveness
     annotation (Placement(transformation(extent={{-140,-60},{-100,-20}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TExh(
     final unit="K")
-    "Exhaust air temperature" 
+    "Exhaust air temperature"
     annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput mSup_flow(final unit="kg/s")
     "Supply air mass flow rate"
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo
index 5c408187442..b147bfd6ef4 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/BypassDampers.mo
@@ -61,7 +61,7 @@ protected
     final realFalse=0)
     "Electric power consumption for motor"
     annotation (Placement(transformation(extent={{-60,150},{-40,170}})));
-  Modelica.Blocks.Sources.Constant zero(final k=0) 
+  Modelica.Blocks.Sources.Constant zero(final k=0)
     "Zero signal"
     annotation (Placement(transformation(extent={{-160,-40},{-140,-20}})));
 equation
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo
index 2c6f5bf5d7a..a04d657b9f9 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/Sensible/Examples/SpaceCooling.mo
@@ -114,8 +114,8 @@ model SpaceCooling "Space cooling system"
     T=TWSup_nominal) "Source for water flow rate"
     annotation (Placement(transformation(extent={{-20,-110},{0,-90}})));
   Buildings.Fluid.Sources.Boundary_pT sinWat(
-    nPorts=1, 
-    redeclare package Medium =MediumW) 
+    nPorts=1,
+    redeclare package Medium = MediumW)
     "Sink for water circuit"
     annotation (Placement(transformation(extent={{-80,-76},{-60,-56}})));
   Buildings.BoundaryConditions.WeatherData.ReaderTMY3 weaDat(
diff --git a/Buildings/Fluid/HeatExchangers/ThermalWheels/package.mo b/Buildings/Fluid/HeatExchangers/ThermalWheels/package.mo
index 9d228dc16f7..d389098c35e 100644
--- a/Buildings/Fluid/HeatExchangers/ThermalWheels/package.mo
+++ b/Buildings/Fluid/HeatExchangers/ThermalWheels/package.mo
@@ -1,10 +1,10 @@
 within Buildings.Fluid.HeatExchangers;
-package ThermalWheels "Package with thermal wheels (both enthalpy and sensible heat recovery) models"
+package ThermalWheels "Package with thermal wheel (both enthalpy and sensible heat recovery) models"
   extends Modelica.Icons.Package;
 
 annotation (preferredView="info", Documentation(info="<html>
 <p>
-This package contains component models for thermal recovery wheels.
+This package contains component models for thermal wheels.
 </p>
 </html>"),
     Icon(graphics={