diff --git a/AixLib/Electrical/Machines/PVInverterRMS.mo b/AixLib/Electrical/Machines/PVInverterRMS.mo
index 43f4d4743a..960d1319e5 100644
--- a/AixLib/Electrical/Machines/PVInverterRMS.mo
+++ b/AixLib/Electrical/Machines/PVInverterRMS.mo
@@ -1,7 +1,7 @@
 within AixLib.Electrical.Machines;
 model PVInverterRMS "Inverter model including system management"
 
-  parameter Modelica.Units.SI.Power uMax2
+  parameter Modelica.Units.SI.Power uMax2=3800
     "Upper limits of input signals (MaxOutputPower)";
  Modelica.Blocks.Interfaces.RealOutput PVPowerRmsW(
   final quantity="Power",
@@ -66,9 +66,6 @@ equation
      Line(
       points={{-48,-34},{55,-34}},
       color={0,0,0})}),
-   experiment(
-    StopTime=1,
-    StartTime=0),
      Documentation(revisions="<html><ul>
   <li>
     <i>October 11, 2016</i> by Tobias Blacha:<br/>
diff --git a/AixLib/Fluid/BaseClasses/PartialReversibleVapourCompressionMachine.mo b/AixLib/Fluid/BaseClasses/PartialReversibleVapourCompressionMachine.mo
index 4cf93d15c0..4da9d823ff 100644
--- a/AixLib/Fluid/BaseClasses/PartialReversibleVapourCompressionMachine.mo
+++ b/AixLib/Fluid/BaseClasses/PartialReversibleVapourCompressionMachine.mo
@@ -30,7 +30,7 @@ partial model PartialReversibleVapourCompressionMachine
   parameter Boolean use_autoCalc=false
     "Enable automatic estimation of volumes and mass flows?"
     annotation(choices(checkBox=true), Dialog(descriptionLabel=true));
-  parameter Modelica.Units.SI.Power Q_useNominal(start=0)
+  parameter Modelica.Units.SI.Power Q_useNominal=0
     "Nominal usable heat flow of the vapour compression machine (HP: Heating; Chiller: Cooling)"
     annotation (Dialog(enable=use_autoCalc));
   parameter Real scalingFactor=1 "Scaling-factor of vapour compression machine";
@@ -76,13 +76,13 @@ partial model PartialReversibleVapourCompressionMachine
       group="Heat Losses",
       tab="Condenser",
       enable=use_conCap));
-  parameter Modelica.Units.SI.ThermalConductance GConOut
+  parameter Modelica.Units.SI.ThermalConductance GConOut=0
     "Constant parameter for heat transfer to the ambient. Represents a sum of thermal resistances such as conductance, insulation and natural convection. If you want to simulate a condenser with additional dry mass but without external heat losses, set the value to zero"
     annotation (Evaluate=true, Dialog(
       group="Heat Losses",
       tab="Condenser",
       enable=use_conCap));
-  parameter Modelica.Units.SI.ThermalConductance GConIns
+  parameter Modelica.Units.SI.ThermalConductance GConIns=0
     "Constant parameter for heat transfer to heat exchangers capacity. Represents a sum of thermal resistances such as forced convection and conduction inside of the capacity"
     annotation (Evaluate=true, Dialog(
       group="Heat Losses",
@@ -117,13 +117,13 @@ partial model PartialReversibleVapourCompressionMachine
       group="Heat Losses",
       tab="Evaporator",
       enable=use_evaCap));
-  parameter Modelica.Units.SI.ThermalConductance GEvaOut
+  parameter Modelica.Units.SI.ThermalConductance GEvaOut=0
     "Constant parameter for heat transfer to the ambient. Represents a sum of thermal resistances such as conductance, insulation and natural convection. If you want to simulate a evaporator with additional dry mass but without external heat losses, set the value to zero"
     annotation (Evaluate=true, Dialog(
       group="Heat Losses",
       tab="Evaporator",
       enable=use_evaCap));
-  parameter Modelica.Units.SI.ThermalConductance GEvaIns
+  parameter Modelica.Units.SI.ThermalConductance GEvaIns=0
     "Constant parameter for heat transfer to heat exchangers capacity. Represents a sum of thermal resistances such as forced convection and conduction inside of the capacity"
     annotation (Evaluate=true, Dialog(
       group="Heat Losses",
@@ -788,7 +788,7 @@ equation
 <ol>
   <li>
     <a href=
-    \"AixLib.Fluid.HeatPumps.BaseClasses.InnerCycle\">InnerCycle</a>
+    \"AixLib.Fluid.HeatPumps.BaseClasses.InnerCycle_HeatPump\">InnerCycle</a>
     (Black Box): Here, the user can use between several input models or
     just easily create his own, modular black box model. Please look at
     the model description for more info.
diff --git a/AixLib/Obsolete/Year2021/Electrical/PVSystem.mo b/AixLib/Obsolete/Year2021/Electrical/PVSystem.mo
index ed2dd7ecfd..7a3d0d05d6 100644
--- a/AixLib/Obsolete/Year2021/Electrical/PVSystem.mo
+++ b/AixLib/Obsolete/Year2021/Electrical/PVSystem.mo
@@ -428,7 +428,7 @@ package PVSystem
     model PVInverterRMS "Inverter model including system management"
       extends AixLib.Obsolete.BaseClasses.ObsoleteModel;
 
-      parameter Modelica.Units.SI.Power uMax2
+      parameter Modelica.Units.SI.Power uMax2=3800
         "Upper limits of input signals (MaxOutputPower)";
      Modelica.Blocks.Interfaces.RealOutput PVPowerRmsW(
       final quantity="Power",
diff --git a/AixLib/Obsolete/YearIndependent/FastHVAC/Components/Chiller/Chiller.mo b/AixLib/Obsolete/YearIndependent/FastHVAC/Components/Chiller/Chiller.mo
index 39b236e878..3c3289041b 100644
--- a/AixLib/Obsolete/YearIndependent/FastHVAC/Components/Chiller/Chiller.mo
+++ b/AixLib/Obsolete/YearIndependent/FastHVAC/Components/Chiller/Chiller.mo
@@ -68,7 +68,7 @@ model Chiller "Base model of FastHVAC Chiller"
       group="Heat Losses",
       tab="Condenser",
       enable=use_ConCap));
-  parameter Modelica.Units.SI.ThermalConductance GConIns
+  parameter Modelica.Units.SI.ThermalConductance GConIns=0
     "Constant thermal conductance of condenser material" annotation (Evaluate=
         true, Dialog(
       group="Heat Losses",
@@ -101,7 +101,7 @@ model Chiller "Base model of FastHVAC Chiller"
       group="Heat Losses",
       tab="Evaporator",
       enable=use_EvaCap));
-  parameter Modelica.Units.SI.ThermalConductance GEvaIns
+  parameter Modelica.Units.SI.ThermalConductance GEvaIns=0
     "Constant thermal conductance of Evaporator material" annotation (Evaluate=
         true, Dialog(
       group="Heat Losses",
@@ -381,12 +381,6 @@ equation
           -16,-86},{-30,-86},{-30,-86.1},{-43.2,-86.1}}, color={176,0,0}));
   connect(senT_b2.enthalpyPort_b, enthalpyPort_b1) annotation (Line(points={{-61,
           -86.1},{-82,-86.1},{-82,-60},{-100,-60}}, color={176,0,0}));
-  connect(iceFac_in, sigBus.iceFacMeas) annotation (Line(points={{-76,-136},{-76,-43},
-          {-105,-43}},         color={0,0,127}), Text(
-      string="%second",
-      index=1,
-      extent={{-3,6},{-3,6}},
-      horizontalAlignment=TextAlignment.Right));
   connect(innerCycle.QEva, realPassThroughnSetEva.u) annotation (Line(points={{0,
           -30.7},{0,-40},{16,-40},{16,-44.8}}, color={0,0,127}));
   connect(innerCycle.QEva, heatFlowIneEva.u) annotation (Line(points={{0,-30.7},
diff --git a/AixLib/Obsolete/YearIndependent/FastHVAC/Components/HeatGenerators/HeatPump/HeatPump.mo b/AixLib/Obsolete/YearIndependent/FastHVAC/Components/HeatGenerators/HeatPump/HeatPump.mo
index 25ceeb0a0c..aa9dbb4fe4 100644
--- a/AixLib/Obsolete/YearIndependent/FastHVAC/Components/HeatGenerators/HeatPump/HeatPump.mo
+++ b/AixLib/Obsolete/YearIndependent/FastHVAC/Components/HeatGenerators/HeatPump/HeatPump.mo
@@ -70,7 +70,7 @@ model HeatPump "Base model of FastHVAC Heat Pump"
       group="Heat Losses",
       tab="Condenser",
       enable=use_ConCap));
-  parameter Modelica.Units.SI.ThermalConductance GConIns
+  parameter Modelica.Units.SI.ThermalConductance GConIns=0
     "Constant thermal conductance of condenser material" annotation (Evaluate=
         true, Dialog(
       group="Heat Losses",
@@ -103,7 +103,7 @@ model HeatPump "Base model of FastHVAC Heat Pump"
       group="Heat Losses",
       tab="Evaporator",
       enable=use_EvaCap));
-  parameter Modelica.Units.SI.ThermalConductance GEvaIns
+  parameter Modelica.Units.SI.ThermalConductance GEvaIns=0
     "Constant thermal conductance of Evaporator material" annotation (Evaluate=
         true, Dialog(
       group="Heat Losses",
diff --git a/AixLib/Obsolete/YearIndependent/FastHVAC/Components/Pipes/BaseClasses/PipeBase.mo b/AixLib/Obsolete/YearIndependent/FastHVAC/Components/Pipes/BaseClasses/PipeBase.mo
index 226d4a097f..12a678ab07 100644
--- a/AixLib/Obsolete/YearIndependent/FastHVAC/Components/Pipes/BaseClasses/PipeBase.mo
+++ b/AixLib/Obsolete/YearIndependent/FastHVAC/Components/Pipes/BaseClasses/PipeBase.mo
@@ -24,7 +24,7 @@ model PipeBase
 
     parameter Integer nParallel(min=1)=1 "Number of identical parallel pipes"
     annotation(Dialog(group="Geometry"));
-  parameter Modelica.Units.SI.Length length "Length of pipe"
+  parameter Modelica.Units.SI.Length length=0 "Length of pipe"
     annotation (Dialog(group="Geometry"));
 
     parameter AixLib.DataBase.Pipes.PipeBaseDataDefinition parameterPipe=
diff --git a/AixLib/Obsolete/YearIndependent/FastHVAC/Examples/Chiller/Chiller.mo b/AixLib/Obsolete/YearIndependent/FastHVAC/Examples/Chiller/Chiller.mo
index e758410d0a..9d82bcb625 100644
--- a/AixLib/Obsolete/YearIndependent/FastHVAC/Examples/Chiller/Chiller.mo
+++ b/AixLib/Obsolete/YearIndependent/FastHVAC/Examples/Chiller/Chiller.mo
@@ -123,6 +123,9 @@ model Chiller
     annotation (Placement(transformation(extent={{46,-82},{34,-70}})));
   Modelica.Blocks.Logical.LogicalSwitch logicalSwitch
     annotation (Placement(transformation(extent={{10,-78},{0,-88}})));
+  Controls.Interfaces.VapourCompressionMachineControlBus sigBus1
+    annotation (Placement(transformation(extent={{18,-28},{30,-16}}),
+        iconTransformation(extent={{18,-28},{30,-16}})));
 equation
   connect(dotm_sink.y, fluidSource.dotm) annotation (Line(points={{-77,-72},{-64,
           -72},{-64,-36.6},{-48,-36.6}}, color={0,0,127}));
@@ -146,9 +149,6 @@ equation
     annotation (Line(points={{-30,-33},{-5,-33},{-5,-15}}, color={176,0,0}));
   connect(vessel_ev.enthalpyPort_a, chiller.enthalpyPort_b) annotation (Line(
         points={{-27.3,57},{-20,57},{-20,18},{-5,18},{-5,11}}, color={176,0,0}));
-  connect(iceFac.y, chiller.iceFac_in) annotation (Line(points={{29.4,-12},{
-          26.75,-12},{26.75,-11.88},{21.1333,-11.88}},
-                                                 color={0,0,127}));
   connect(hysHeating.y,not2. u)
     annotation (Line(points={{33.4,-76},{28.8,-76}}, color={255,0,255}));
   connect(logicalSwitch.y,booleanToReal. u) annotation (Line(points={{-0.5,-83},
@@ -170,6 +170,19 @@ equation
           -54},{12,-36},{5.4,-36},{5.4,-17.08}}, color={255,0,255}));
   connect(chiller.nSet, booleanToReal.y) annotation (Line(points={{0.333333,-17.08},
           {0.333333,-38},{-3,-38},{-3,-45.3}}, color={0,0,127}));
+  connect(chiller.sigBus, sigBus1) annotation (Line(
+      points={{8.2,-14.87},{8.2,-22},{24,-22}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(iceFac.y, sigBus1.iceFacMea) annotation (Line(points={{29.6,-14},{
+          24.03,-14},{24.03,-21.97}},
+                          color={0,0,127}), Text(
+      string="%second",
+      index=1,
+      extent={{6,3},{6,3}},
+      horizontalAlignment=TextAlignment.Left));
+  connect(iceFac.y, chiller.iceFac_in) annotation (Line(points={{29.4,-12},{
+          25.2667,-12},{25.2667,-11.88},{21.1333,-11.88}}, color={0,0,127}));
   annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,
             -100},{100,100}}),      graphics={
         Rectangle(
diff --git a/AixLib/ThermalZones/HighOrder/Components/Walls/Wall.mo b/AixLib/ThermalZones/HighOrder/Components/Walls/Wall.mo
index 009aba5309..53337ba4bb 100644
--- a/AixLib/ThermalZones/HighOrder/Components/Walls/Wall.mo
+++ b/AixLib/ThermalZones/HighOrder/Components/Walls/Wall.mo
@@ -96,11 +96,10 @@ parameter DataBase.Surfaces.RoughnessForHT.PolynomialCoefficients_ASHRAEHandbook
 
   parameter Boolean withSunblind = false "enable support of sunblinding?" annotation(Dialog(tab = "Window", group="Sunblind", enable = outside and withWindow));
   parameter Real Blinding = 0 "blinding factor: 0 means total blocking of solar irradiation" annotation(Dialog(tab = "Window", group="Sunblind", enable = withWindow and outside and withSunblind));
-  parameter Real LimitSolIrr if withWindow and outside and withSunblind
+  parameter Real LimitSolIrr=0
     "Minimum specific total solar radiation in W/m2 for blinding becoming active (see also TOutAirLimit)"
     annotation(Dialog(tab="Window", group="Sunblind", enable=withWindow and outside and withSunblind));
-  parameter Modelica.Units.SI.Temperature TOutAirLimit
-    if withWindow and outside and withSunblind
+  parameter Modelica.Units.SI.Temperature TOutAirLimit=288.15
     "Temperature at which sunblind closes (see also LimitSolIrr)" annotation (
       Dialog(tab="Window", group="Sunblind", enable=withWindow and outside and withSunblind));
   //Parameter and module fow shadow model
diff --git a/AixLib/ThermalZones/HighOrder/Validation/ASHRAE140/BaseClasses/PartialCase.mo b/AixLib/ThermalZones/HighOrder/Validation/ASHRAE140/BaseClasses/PartialCase.mo
index bdb6d79b1a..25be1158d5 100644
--- a/AixLib/ThermalZones/HighOrder/Validation/ASHRAE140/BaseClasses/PartialCase.mo
+++ b/AixLib/ThermalZones/HighOrder/Validation/ASHRAE140/BaseClasses/PartialCase.mo
@@ -76,9 +76,11 @@ partial model PartialCase "This is the base class from which the base cases will
     final use_dynamicShortWaveRadMethod=false)
                   annotation(Placement(transformation(extent={{-27,8},{29,62}})));
 
-  Modelica.Blocks.Interfaces.RealOutput AnnualHeatingLoad "in kWh"
+  Modelica.Blocks.Interfaces.RealOutput AnnualHeatingLoad
+ if activeHeatingOutput                                   "in kWh"
     annotation (Placement(transformation(extent={{130,58},{150,78}})));
-  Modelica.Blocks.Interfaces.RealOutput AnnualCoolingLoad "in kWh"
+  Modelica.Blocks.Interfaces.RealOutput AnnualCoolingLoad
+ if activeCoolingOutput                                   "in kWh"
     annotation (Placement(transformation(extent={{130,42},{150,62}})));
   Modelica.Blocks.Interfaces.RealOutput TransmittedSolarRadiation_room
     "in kWh/m2"
@@ -94,10 +96,14 @@ partial model PartialCase "This is the base class from which the base cases will
   Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow
     InternalGains_radiative
     annotation (Placement(transformation(extent={{-97,-97},{-77,-77}})));
-  Modelica.Blocks.Continuous.Integrator integratorHeat annotation (Placement(transformation(extent={{72,62.5},{83,73.5}})));
-  Modelica.Blocks.Continuous.Integrator integratorCool annotation (Placement(transformation(extent={{72,46.5},{83,57.5}})));
-  Modelica.Blocks.Math.UnitConversions.To_kWh to_kWhHeat annotation (Placement(transformation(extent={{92,63},{102,73}})));
-  Modelica.Blocks.Math.UnitConversions.To_kWh to_kWhCool annotation (Placement(transformation(extent={{92,47},{102,57}})));
+  Modelica.Blocks.Continuous.Integrator integratorHeat if activeHeatingOutput
+                                                       annotation (Placement(transformation(extent={{72,62.5},{83,73.5}})));
+  Modelica.Blocks.Continuous.Integrator integratorCool if activeCoolingOutput
+                                                       annotation (Placement(transformation(extent={{72,46.5},{83,57.5}})));
+  Modelica.Blocks.Math.UnitConversions.To_kWh to_kWhHeat if activeHeatingOutput
+                                                         annotation (Placement(transformation(extent={{92,63},{102,73}})));
+  Modelica.Blocks.Math.UnitConversions.To_kWh to_kWhCool if activeCoolingOutput
+                                                         annotation (Placement(transformation(extent={{92,47},{102,57}})));
   Modelica.Blocks.Math.Gain convectiveInternalGains(k=0.4) "Convective part"
     annotation (Placement(transformation(extent={{-120,-72},{-110,-62}})));
   Modelica.Blocks.Math.Gain radiativeInternalGains(k=0.6) "Radiative part"
@@ -132,7 +138,8 @@ partial model PartialCase "This is the base class from which the base cases will
     annotation (choicesAllMatching=true);
   replaceable model CorrSolarGainWin =
       Components.WindowsDoors.BaseClasses.CorrectionSolarGain.CorG_ASHRAE140
-    constrainedby Components.WindowsDoors.BaseClasses.CorrectionSolarGain.PartialCorG
+    constrainedby
+    Components.WindowsDoors.BaseClasses.CorrectionSolarGain.PartialCorG
     "Correction model for solar irradiance as transmitted radiation" annotation (choicesAllMatching=true);
 
   parameter Modelica.Units.SI.Area Win_Area=12 "Window area ";
@@ -159,7 +166,10 @@ partial model PartialCase "This is the base class from which the base cases will
     "Simulation time when block should check if model results lies in limit range"
     annotation (Dialog(tab="Results check", group=
           "Cooling load or min. temperature"));
-
+  parameter Boolean activeHeatingOutput=true
+  "Activates blocks connected with HeaterCoolerPI.heatingPower";
+  parameter Boolean activeCoolingOutput=true
+  "Activates blocks connected with HeaterCoolerPI.coolingPower";
   Modelica.Blocks.Math.UnitConversions.To_degC to_degCRoomConvTemp annotation (Placement(transformation(extent={{92,31},{102,41}})));
   Modelica.Blocks.Interfaces.RealOutput FreeFloatRoomTemperature annotation (Placement(transformation(extent={{130,26},{150,46}})));
   Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor temperatureSensor annotation (Placement(transformation(extent={{72,30},{84,42}})));
diff --git a/AixLib/ThermalZones/HighOrder/Validation/ASHRAE140/Case600.mo b/AixLib/ThermalZones/HighOrder/Validation/ASHRAE140/Case600.mo
index ef7cfc124c..8d7e5a4333 100644
--- a/AixLib/ThermalZones/HighOrder/Validation/ASHRAE140/Case600.mo
+++ b/AixLib/ThermalZones/HighOrder/Validation/ASHRAE140/Case600.mo
@@ -23,10 +23,6 @@ model Case600
     annotation (Placement(transformation(extent={{-38,-82},{-27,-71}})));
   Modelica.Blocks.Sources.Constant TSet_Heater(final k=TsetHeater)
     annotation (Placement(transformation(extent={{30,-81},{19,-70}})));
-  Modelica.Blocks.Sources.RealExpression HeatingPower(y=idealHeaterCooler.heatingPower)
-    annotation (Placement(transformation(extent={{43,58},{63,78}})));
-  Modelica.Blocks.Sources.RealExpression CoolingPower(y=idealHeaterCooler.coolingPower)
-    annotation (Placement(transformation(extent={{43,42},{63,62}})));
   Modelica.Blocks.Math.UnitConversions.From_degC from_degC
     annotation (Placement(transformation(extent={{-20,-82},{-9,-71}})));
   Modelica.Blocks.Math.UnitConversions.From_degC from_degC1 annotation (
@@ -47,10 +43,6 @@ equation
     annotation (Line(points={{18.45,-75.5},{13.1,-75.5}}, color={0,0,127}));
   connect(from_degC1.y, idealHeaterCooler.setPointHeat) annotation (Line(points={{0.45,
           -75.5},{-2.8,-75.5},{-2.8,-62.2}},        color={0,0,127}));
-  connect(HeatingPower.y, integratorHeat.u)
-    annotation (Line(points={{64,68},{70.9,68}}, color={0,0,127}));
-  connect(CoolingPower.y, integratorCool.u) annotation (Line(points={{64,52},{
-          68,52},{68,52},{70.9,52}}, color={0,0,127}));
   connect(Room.AirExchangePort, AirExchangeRate.y) annotation (Line(points={{
           -29.8,53.765},{-47,53.765},{-47,-33},{-20,-33},{-20,-49.5},{-24.35,
           -49.5}}, color={0,0,127}));
@@ -60,6 +52,12 @@ equation
   connect(to_kWhHeat.y, checkResultsAccordingToASHRAEHeatingOrTempMax.modelResults) annotation (Line(points={{102.5,68},{112,68},{112,-39},{94,-39},{94,-52.15},{97.95,-52.15}}, color={0,0,127}));
   connect(to_kWhCool.y, checkResultsAccordingToASHRAECoolingOrTempMin.modelResults) annotation (Line(points={{102.5,52},{111,52},{111,-37},{93,-37},{93,-73.15},{97.95,-73.15}}, color={0,0,127}));
   connect(Room.transShoWaveRadWin, integrator2.u) annotation (Line(points={{17.8,5.3},{17.8,-0.75},{74,-0.75}}, color={0,0,127}));
+  connect(idealHeaterCooler.heatingPower, integratorHeat.u) annotation (Line(
+        points={{5,-51},{31.05,-51},{31.05,-10.5},{55.05,-10.5},{55.05,68},{
+          70.9,68}}, color={0,0,127}));
+  connect(idealHeaterCooler.coolingPower, integratorCool.u) annotation (Line(
+        points={{5,-55.6},{36.05,-55.6},{36.05,-14.2},{60.05,-14.2},{60.05,52},
+          {70.9,52}}, color={0,0,127}));
   annotation (
     experiment(StopTime=31539600, Tolerance=1e-06),
     __Dymola_Commands(file=
diff --git a/AixLib/ThermalZones/HighOrder/Validation/ASHRAE140/Case600FF.mo b/AixLib/ThermalZones/HighOrder/Validation/ASHRAE140/Case600FF.mo
index 90a0470401..1d9b9c3c2e 100644
--- a/AixLib/ThermalZones/HighOrder/Validation/ASHRAE140/Case600FF.mo
+++ b/AixLib/ThermalZones/HighOrder/Validation/ASHRAE140/Case600FF.mo
@@ -7,12 +7,10 @@ model Case600FF
     dispTypeHeatOrTempMax="T Max",
     tableCoolOrTempMin=[600,-18.8,-15.6],
     tableHeatOrTempMax=[600,64.9,69.5],
+    activeCoolingOutput=false,
+    activeHeatingOutput=false,
     Room(redeclare Components.Types.CoeffTableSouthWindow coeffTableSolDistrFractions));
 
-  Modelica.Blocks.Sources.RealExpression HeatingPower(y=0)
-    annotation (Placement(transformation(extent={{43,58},{63,78}})));
-  Modelica.Blocks.Sources.RealExpression CoolingPower(y=0)
-    annotation (Placement(transformation(extent={{43,42},{63,62}})));
   Modelica.Blocks.Sources.Constant AirExchangeRate(final k=airExchange)
     annotation (Placement(transformation(extent={{-38,-56},{-25,-43}})));
 
@@ -21,10 +19,6 @@ equation
   connect(Room.AirExchangePort, AirExchangeRate.y) annotation (Line(points={{
           -29.8,53.765},{-47,53.765},{-47,-37},{-17,-37},{-17,-49.5},{-24.35,
           -49.5}}, color={0,0,127}));
-  connect(HeatingPower.y, integratorHeat.u)
-    annotation (Line(points={{64,68},{70.9,68}}, color={0,0,127}));
-  connect(CoolingPower.y, integratorCool.u) annotation (Line(points={{64,52},{
-          68,52},{68,52},{70.9,52}}, color={0,0,127}));
   connect(to_degCRoomConvTemp.y, checkResultsAccordingToASHRAEHeatingOrTempMax.modelResults) annotation (Line(points={{102.5,36},{112,36},{112,-39},{92,-39},{92,-52.15},{97.95,-52.15}}, color={0,0,127}));
   connect(to_degCRoomConvTemp.y, checkResultsAccordingToASHRAECoolingOrTempMin.modelResults) annotation (Line(points={{102.5,36},{111,36},{111,-38},{91,-38},{91,-73.15},{97.95,-73.15}}, color={0,0,127}));
   connect(Room.transShoWaveRadWin, integrator2.u) annotation (Line(points={{17.8,5.3},{17.8,-0.75},{74,-0.75}}, color={0,0,127}));
diff --git a/AixLib/ThermalZones/HighOrder/Validation/ASHRAE140/Case620.mo b/AixLib/ThermalZones/HighOrder/Validation/ASHRAE140/Case620.mo
index 70c1f984cc..90e235e5d3 100644
--- a/AixLib/ThermalZones/HighOrder/Validation/ASHRAE140/Case620.mo
+++ b/AixLib/ThermalZones/HighOrder/Validation/ASHRAE140/Case620.mo
@@ -31,10 +31,6 @@ model Case620
     annotation (Placement(transformation(extent={{-38,-82},{-27,-71}})));
   Modelica.Blocks.Sources.Constant TSet_Heater(final k=TsetHeater)
     annotation (Placement(transformation(extent={{30,-81},{19,-70}})));
-  Modelica.Blocks.Sources.RealExpression HeatingPower(y=idealHeaterCooler.heatingPower)
-    annotation (Placement(transformation(extent={{43,58},{63,78}})));
-  Modelica.Blocks.Sources.RealExpression CoolingPower(y=idealHeaterCooler.coolingPower)
-    annotation (Placement(transformation(extent={{43,42},{63,62}})));
   Modelica.Blocks.Math.UnitConversions.From_degC from_degC
     annotation (Placement(transformation(extent={{-20,-82},{-9,-71}})));
   Modelica.Blocks.Math.UnitConversions.From_degC from_degC1 annotation (
@@ -61,13 +57,15 @@ equation
   connect(idealHeaterCooler.heatCoolRoom, Room.thermRoom) annotation (Line(
         points={{4,-59},{22,-59},{22,-19},{-2,-19},{-2,35},{-2.92,35}}, color={191,
           0,0}));
-  connect(HeatingPower.y, integratorHeat.u)
-    annotation (Line(points={{64,68},{70.9,68}}, color={0,0,127}));
-  connect(CoolingPower.y, integratorCool.u)
-    annotation (Line(points={{64,52},{70.9,52}}, color={0,0,127}));
   connect(to_kWhHeat.y, checkResultsAccordingToASHRAEHeatingOrTempMax.modelResults) annotation (Line(points={{102.5,68},{112,68},{112,-39},{94,-39},{94,-52.15},{97.95,-52.15}}, color={0,0,127}));
   connect(to_kWhCool.y, checkResultsAccordingToASHRAECoolingOrTempMin.modelResults) annotation (Line(points={{102.5,52},{111,52},{111,-37},{93,-37},{93,-73.15},{97.95,-73.15}}, color={0,0,127}));
   connect(Room.transShoWaveRadWin, integrator2.u) annotation (Line(points={{17.8,5.3},{17.8,-0.75},{74,-0.75}}, color={0,0,127}));
+  connect(idealHeaterCooler.heatingPower, integratorHeat.u) annotation (Line(
+        points={{5,-51},{32.3,-51},{32.3,-5},{52.3,-5},{52.3,68},{70.9,68}},
+        color={0,0,127}));
+  connect(idealHeaterCooler.coolingPower, integratorCool.u) annotation (Line(
+        points={{5,-55.6},{39.1,-55.6},{39.1,-9.4},{57.1,-9.4},{57.1,52},{70.9,
+          52}}, color={0,0,127}));
   annotation (
     experiment(StopTime=31539600, Tolerance=1e-06),
     __Dymola_Commands(file=
diff --git a/AixLib/ThermalZones/HighOrder/Validation/ASHRAE140/Case640.mo b/AixLib/ThermalZones/HighOrder/Validation/ASHRAE140/Case640.mo
index d403cc47c5..66f7cc49a3 100644
--- a/AixLib/ThermalZones/HighOrder/Validation/ASHRAE140/Case640.mo
+++ b/AixLib/ThermalZones/HighOrder/Validation/ASHRAE140/Case640.mo
@@ -23,10 +23,6 @@ model Case640
     annotation (Placement(transformation(extent={{-38,-56},{-25,-43}})));
   Modelica.Blocks.Sources.Constant Tset_Cooler(final k=TsetCooler)
     annotation (Placement(transformation(extent={{-38,-82},{-27,-71}})));
-  Modelica.Blocks.Sources.RealExpression HeatingPower(y=idealHeaterCooler.heatingPower)
-    annotation (Placement(transformation(extent={{43,58},{63,78}})));
-  Modelica.Blocks.Sources.RealExpression CoolingPower(y=idealHeaterCooler.coolingPower)
-    annotation (Placement(transformation(extent={{43,42},{63,62}})));
   Modelica.Blocks.Math.UnitConversions.From_degC from_degC
     annotation (Placement(transformation(extent={{-20,-82},{-9,-71}})));
 
@@ -48,10 +44,6 @@ equation
           -76.5},{-7.4,-76.5},{-7.4,-62.2}},      color={0,0,127}));
   connect(Source_TsetHeat.y[1], idealHeaterCooler.setPointHeat) annotation (
       Line(points={{9.35,-75.5},{-2.8,-75.5},{-2.8,-62.2}}, color={0,0,127}));
-  connect(HeatingPower.y, integratorHeat.u) annotation (Line(points={{64,68},{70.9,68}},
-                                     color={0,0,127}));
-  connect(CoolingPower.y, integratorCool.u)
-    annotation (Line(points={{64,52},{70.9,52}}, color={0,0,127}));
   connect(Room.AirExchangePort, AirExchangeRate.y) annotation (Line(points={{
           -29.8,53.765},{-47,53.765},{-47,-34},{-20,-34},{-20,-49.5},{-24.35,
           -49.5}}, color={0,0,127}));
@@ -61,6 +53,12 @@ equation
   connect(to_kWhHeat.y, checkResultsAccordingToASHRAEHeatingOrTempMax.modelResults) annotation (Line(points={{102.5,68},{112,68},{112,-39},{94,-39},{94,-52.15},{97.95,-52.15}}, color={0,0,127}));
   connect(to_kWhCool.y, checkResultsAccordingToASHRAECoolingOrTempMin.modelResults) annotation (Line(points={{102.5,52},{111,52},{111,-37},{93,-37},{93,-73.15},{97.95,-73.15}}, color={0,0,127}));
   connect(Room.transShoWaveRadWin, integrator2.u) annotation (Line(points={{17.8,5.3},{17.8,-0.75},{74,-0.75}}, color={0,0,127}));
+  connect(idealHeaterCooler.heatingPower, integratorHeat.u) annotation (Line(
+        points={{5,-51},{35.1,-51},{35.1,-7},{49.1,-7},{49.1,68},{70.9,68}},
+        color={0,0,127}));
+  connect(idealHeaterCooler.coolingPower, integratorCool.u) annotation (Line(
+        points={{5,-55.6},{40.1,-55.6},{40.1,-10.4},{54.1,-10.4},{54.1,52},{
+          70.9,52}}, color={0,0,127}));
   annotation (
     experiment(StopTime=31539600, Tolerance=1e-06),
     __Dymola_Commands(file=
diff --git a/AixLib/ThermalZones/HighOrder/Validation/ASHRAE140/Case650.mo b/AixLib/ThermalZones/HighOrder/Validation/ASHRAE140/Case650.mo
index 47e69574f0..8746ee80fb 100644
--- a/AixLib/ThermalZones/HighOrder/Validation/ASHRAE140/Case650.mo
+++ b/AixLib/ThermalZones/HighOrder/Validation/ASHRAE140/Case650.mo
@@ -24,8 +24,6 @@ model Case650
 
   Modelica.Blocks.Sources.RealExpression HeatingPower(y=0)
     annotation (Placement(transformation(extent={{43,58},{63,78}})));
-  Modelica.Blocks.Sources.RealExpression CoolingPower(y=idealHeaterCooler.coolingPower)
-    annotation (Placement(transformation(extent={{43,42},{63,62}})));
   Modelica.Blocks.Sources.CombiTimeTable AirExchangeRate(
     columns={2},
     tableOnFile=false,
@@ -50,14 +48,14 @@ equation
           -47.5}}, color={0,0,127}));
   connect(HeatingPower.y, integratorHeat.u)
     annotation (Line(points={{64,68},{70.9,68}}, color={0,0,127}));
-  connect(CoolingPower.y, integratorCool.u)
-    annotation (Line(points={{64,52},{70.9,52}}, color={0,0,127}));
   connect(idealHeaterCooler.heatCoolRoom, Room.thermRoom) annotation (Line(
         points={{3,-59},{21,-59},{21,-19},{-2,-19},{-2,35},{-2.92,35}}, color={
           191,0,0}));
   connect(to_kWhHeat.y, checkResultsAccordingToASHRAEHeatingOrTempMax.modelResults) annotation (Line(points={{102.5,68},{112,68},{112,-39},{94,-39},{94,-52.15},{97.95,-52.15}}, color={0,0,127}));
   connect(to_kWhCool.y, checkResultsAccordingToASHRAECoolingOrTempMin.modelResults) annotation (Line(points={{102.5,52},{111,52},{111,-37},{93,-37},{93,-73.15},{97.95,-73.15}}, color={0,0,127}));
   connect(Room.transShoWaveRadWin, integrator2.u) annotation (Line(points={{17.8,5.3},{17.8,-0.75},{74,-0.75}}, color={0,0,127}));
+  connect(idealHeaterCooler.coolingPower, integratorCool.u) annotation (Line(
+        points={{4,-55.6},{48,-55.6},{48,52},{70.9,52}}, color={0,0,127}));
   annotation (
     experiment(StopTime=31539600, Tolerance=1e-06),
     __Dymola_Commands(file=
diff --git a/AixLib/ThermalZones/HighOrder/Validation/ASHRAE140/Case650FF.mo b/AixLib/ThermalZones/HighOrder/Validation/ASHRAE140/Case650FF.mo
index 12d83b1725..d88f488572 100644
--- a/AixLib/ThermalZones/HighOrder/Validation/ASHRAE140/Case650FF.mo
+++ b/AixLib/ThermalZones/HighOrder/Validation/ASHRAE140/Case650FF.mo
@@ -7,15 +7,13 @@ model Case650FF
     dispTypeHeatOrTempMax="T Max",
     tableCoolOrTempMin=[650,-23,-21.6],
     tableHeatOrTempMax=[650,63.2,68.2],
+    activeHeatingOutput=false,
+    activeCoolingOutput=false,
     Room(redeclare Components.Types.CoeffTableSouthWindow coeffTableSolDistrFractions));
 
   parameter AixLib.DataBase.Profiles.ProfileBaseDataDefinition SetTempProfile = AixLib.DataBase.Profiles.ASHRAE140.SetTemp_caseX50();
   parameter AixLib.DataBase.Profiles.ProfileBaseDataDefinition AERProfile = AixLib.DataBase.Profiles.ASHRAE140.Ventilation_caseX50();
 
-  Modelica.Blocks.Sources.RealExpression HeatingPower(y=0)
-    annotation (Placement(transformation(extent={{43,58},{63,78}})));
-  Modelica.Blocks.Sources.RealExpression CoolingPower(y=0)
-    annotation (Placement(transformation(extent={{43,42},{63,62}})));
   Modelica.Blocks.Sources.CombiTimeTable AirExchangeRate(
     columns={2},
     tableOnFile=false,
@@ -28,10 +26,6 @@ equation
   connect(Room.AirExchangePort, AirExchangeRate.y[1]) annotation (Line(points={
           {-29.8,53.765},{-47,53.765},{-47,-36},{-18,-36},{-18,-47.5},{-25.35,
           -47.5}}, color={0,0,127}));
-  connect(HeatingPower.y, integratorHeat.u)
-    annotation (Line(points={{64,68},{70.9,68}}, color={0,0,127}));
-  connect(CoolingPower.y, integratorCool.u)
-    annotation (Line(points={{64,52},{70.9,52}}, color={0,0,127}));
   connect(to_degCRoomConvTemp.y, checkResultsAccordingToASHRAEHeatingOrTempMax.modelResults) annotation (Line(points={{102.5,36},{112,36},{112,-39},{92,-39},{92,-52.15},{97.95,-52.15}}, color={0,0,127}));
   connect(to_degCRoomConvTemp.y, checkResultsAccordingToASHRAECoolingOrTempMin.modelResults) annotation (Line(points={{102.5,36},{111,36},{111,-38},{91,-38},{91,-73.15},{97.95,-73.15}}, color={0,0,127}));
   connect(Room.transShoWaveRadWin, integrator2.u) annotation (Line(points={{17.8,5.3},{17.8,-0.75},{74,-0.75}}, color={0,0,127}));
diff --git a/AixLib/Utilities/HeatTransfer/HeatConvInside.mo b/AixLib/Utilities/HeatTransfer/HeatConvInside.mo
index 1ef4cfc6d3..5790713e57 100644
--- a/AixLib/Utilities/HeatTransfer/HeatConvInside.mo
+++ b/AixLib/Utilities/HeatTransfer/HeatConvInside.mo
@@ -19,7 +19,7 @@ model HeatConvInside
           calcMethod == AixLib.ThermalZones.HighOrder.Components.Types.CalcMethodConvectiveHeatTransferInsideSurface.ASHRAE140_2017 then true else false));
 
   // which orientation of surface?
-  parameter AixLib.ThermalZones.HighOrder.Components.Types.InsideSurfaceOrientation surfaceOrientation "Surface orientation" annotation (
+  parameter AixLib.ThermalZones.HighOrder.Components.Types.InsideSurfaceOrientation surfaceOrientation=AixLib.ThermalZones.HighOrder.Components.Types.InsideSurfaceOrientation.vertical_wall "Surface orientation" annotation (
       Dialog(descriptionLabel=true, enable=if calcMethod == AixLib.ThermalZones.HighOrder.Components.Types.CalcMethodConvectiveHeatTransferInsideSurface.Custom_hCon then false else true),
       Evaluate=true);
   parameter Modelica.Units.SI.Area A(min=Modelica.Constants.eps)
