RWTH-EBC · FWuellhorst · Sep 23, 2024 · Aug 13, 2024 · Aug 13, 2024 · Aug 13, 2024
diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_BAUSimStudy_Case1Standard.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_BAUSimStudy_Case1Standard.txt
@@ -9,7 +9,7 @@ statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0",
   "nonlinear": "1, 1, 6, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1",
-  "number of continuous time states": "104",
+  "number of continuous time states": "105",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]

diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_DesignOptimization_BES.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_DesignOptimization_BES.txt
@@ -9,7 +9,7 @@ statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0",
   "nonlinear": "2, 6, 1, 0, 1, 0, 1, 0, 1, 1, 1",
-  "number of continuous time states": "71",
+  "number of continuous time states": "72",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]

diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_DesignOptimization_BESNoDHW.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_DesignOptimization_BESNoDHW.txt
@@ -9,7 +9,7 @@ statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0",
   "nonlinear": "6, 1, 0, 1, 0, 1, 0, 1, 1, 1",
-  "number of continuous time states": "52",
+  "number of continuous time states": "53",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]

diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_GasBoilerBuildingOnly.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_GasBoilerBuildingOnly.txt
@@ -8,7 +8,7 @@ statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0",
   "nonlinear": "1, 6, 1, 0, 1, 0, 1, 0, 1, 1",
-  "number of continuous time states": "41",
+  "number of continuous time states": "42",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]

diff --git a/...esources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_AfterBufferWithDHW.txt b/...esources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_AfterBufferWithDHW.txt
@@ -9,7 +9,7 @@ statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0",
   "nonlinear": "1, 6, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1",
-  "number of continuous time states": "144",
+  "number of continuous time states": "145",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]

diff --git a/...urces/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_AfterBufferWithoutDHW.txt b/...urces/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_AfterBufferWithoutDHW.txt
@@ -9,7 +9,7 @@ statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0",
   "nonlinear": "1, 6, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1",
-  "number of continuous time states": "110",
+  "number of continuous time states": "111",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]

diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_Parallel.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_Parallel.txt
diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_Serial.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_Serial.txt
@@ -9,7 +9,7 @@ statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0",
   "nonlinear": "2, 6, 1, 0, 1, 0, 1, 0, 1, 1, 1",
-  "number of continuous time states": "77",
+  "number of continuous time states": "78",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]

diff --git a/...ources/ReferenceResults/Dymola/BESMod_Examples_ModelicaConferencePaper_TEASERBuilding.txt b/...ources/ReferenceResults/Dymola/BESMod_Examples_ModelicaConferencePaper_TEASERBuilding.txt
@@ -9,7 +9,7 @@ statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0",
   "nonlinear": "2, 1, 1, 6, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1",
-  "number of continuous time states": "84",
+  "number of continuous time states": "85",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 8.64e+05]

diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1NoRetrofit.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1NoRetrofit.txt
@@ -9,7 +9,7 @@ statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0",
   "nonlinear": "1, 1, 6, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1",
-  "number of continuous time states": "104",
+  "number of continuous time states": "105",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 8.64e+04]

diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1PartialRetrofit.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1PartialRetrofit.txt
@@ -9,7 +9,7 @@ statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0",
   "nonlinear": "1, 1, 6, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1",
-  "number of continuous time states": "104",
+  "number of continuous time states": "105",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 8.64e+04]

diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1TotalRetrofit.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1TotalRetrofit.txt
@@ -9,7 +9,7 @@ statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0",
   "nonlinear": "1, 1, 6, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1",
-  "number of continuous time states": "104",
+  "number of continuous time states": "105",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 8.64e+04]

diff --git a/...sources/ReferenceResults/Dymola/BESMod_Examples_SolarThermalSystem_SolarThermalAixLib.txt b/...sources/ReferenceResults/Dymola/BESMod_Examples_SolarThermalSystem_SolarThermalAixLib.txt
@@ -9,7 +9,7 @@ statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0",
   "nonlinear": "1, 1, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1",
-  "number of continuous time states": "237",
+  "number of continuous time states": "238",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]

diff --git a/...rces/ReferenceResults/Dymola/BESMod_Examples_SolarThermalSystem_SolarThermalBuildings.txt b/...rces/ReferenceResults/Dymola/BESMod_Examples_SolarThermalSystem_SolarThermalBuildings.txt
@@ -9,7 +9,7 @@ statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0",
   "nonlinear": "1, 1, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1",
-  "number of continuous time states": "239",
+  "number of continuous time states": "240",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]

diff --git a/...d/Resources/ReferenceResults/Dymola/BESMod_Examples_TEASERHeatLoadCalculation_Example.txt b/...d/Resources/ReferenceResults/Dymola/BESMod_Examples_TEASERHeatLoadCalculation_Example.txt
@@ -7,7 +7,7 @@ statistics-simulation=
 {
   "linear": "10, 0, 0",
   "nonlinear": "1, 0, 1, 0, 1, 0, 1",
-  "number of continuous time states": "20",
+  "number of continuous time states": "21",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]

diff --git a/BESMod/Systems/BaseClasses/PartialBuildingEnergySystem.mo b/BESMod/Systems/BaseClasses/PartialBuildingEnergySystem.mo
@@ -349,6 +349,15 @@ equation
           -41.0824,118.857}},
       color={0,0,0},
       thickness=1));
+  connect(control.useProBus, userProfiles.useProBus) annotation (Line(
+      points={{16.82,198.37},{16.82,206},{-214,206},{-214,150.775},{-225.167,
+          150.775}},
+      color={0,127,0},
+      thickness=0.5));
+  connect(control.buiMeaBus, building.buiMeaBus) annotation (Line(
+      points={{62.04,198.37},{62.04,206},{-16,206},{-16,88},{39,88},{39,77.62}},
+      color={255,128,0},
+      thickness=0.5));
   annotation (Icon(graphics,
                    coordinateSystem(preserveAspectRatio=false, extent={{-280,
             -140},{280,200}})),

diff --git a/BESMod/Systems/Control/BaseClasses/PartialControl.mo b/BESMod/Systems/Control/BaseClasses/PartialControl.mo
@@ -4,19 +4,25 @@ partial model PartialControl "Model for a partial HEMS control"
   parameter Boolean use_openModelica=false
     "=true to disable features which 
     are not available in open modelica" annotation(Dialog(tab="Advanced"));
-  Hydraulical.Interfaces.SystemControlBus sigBusHyd annotation (Placement(
+  BESMod.Systems.Hydraulical.Interfaces.SystemControlBus sigBusHyd annotation (Placement(
         transformation(extent={{-94,-114},{-64,-88}}), iconTransformation(
           extent={{-94,-114},{-64,-88}})));
-  Ventilation.Interfaces.SystemControlBus sigBusVen annotation (Placement(
+  BESMod.Systems.Ventilation.Interfaces.SystemControlBus sigBusVen annotation (Placement(
         transformation(extent={{64,-114},{96,-86}}), iconTransformation(extent=
             {{64,-114},{96,-86}})));
-  Interfaces.ControlOutputs outBusCtrl if not use_openModelica
+  BESMod.Systems.Interfaces.ControlOutputs outBusCtrl if not use_openModelica
                                        annotation (Placement(transformation(
           extent={{84,-16},{118,16}}), iconTransformation(extent={{84,-16},{118,
             16}})));
-  Electrical.Interfaces.SystemControlBus sigBusEle annotation (Placement(
+  BESMod.Systems.Electrical.Interfaces.SystemControlBus sigBusEle annotation (Placement(
         transformation(extent={{-116,-14},{-84,14}}), iconTransformation(extent=
            {{-116,-14},{-84,14}})));
+  BESMod.Systems.Interfaces.UseProBus useProBus annotation (
+      Placement(transformation(extent={{-80,78},{-38,124}}),
+        iconTransformation(extent={{-74,88},{-48,114}})));
+  BESMod.Systems.Interfaces.BuiMeaBus buiMeaBus annotation (
+      Placement(transformation(extent={{36,82},{82,120}}), iconTransformation(
+          extent={{44,88},{72,114}})));
   annotation (Icon(graphics,
                    coordinateSystem(preserveAspectRatio=false)), Diagram(graphics,
         coordinateSystem(preserveAspectRatio=false)));

diff --git a/BESMod/Systems/Demand/Building/TEASERThermalZone.mo b/BESMod/Systems/Demand/Building/TEASERThermalZone.mo
@@ -17,7 +17,8 @@ model TEASERThermalZone
   parameter Boolean use_verboseEnergyBalance=true   "=false to disable the integration of the verbose energy balance";
   parameter Modelica.Units.SI.TemperatureDifference dTComfort=2
     "Temperature difference to room set temperature at which the comfort is still acceptable. In DIN EN 15251, all temperatures below 22 °C - 2 K count as discomfort. Hence the default value. If your room set temperature is lower, consider using smaller values.";
-
+  parameter Boolean incElePro = false
+    "=false to not include electrical energy consumption in the electrical connectors";
   parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial
     "Type of energy balance: dynamic (3 initialization options) or steady state"
     annotation (Dialog(tab="Dynamics"));
@@ -76,7 +77,7 @@ model TEASERThermalZone
         transformation(
         extent={{-10,-10},{10,10}},
         rotation=180,
-        origin={30,-110})));
+        origin={30,-150})));
   BESMod.Utilities.KPIs.EnergyKPICalculator intKPICalVentGain[nZones](each final
             use_inpCon=true) if use_ventilation and use_verboseEnergyBalance
     annotation (Placement(transformation(
@@ -154,13 +155,8 @@ model TEASERThermalZone
   Modelica.Blocks.Math.MultiSum multiSum[nZones](each final nu=3) if use_verboseEnergyBalance annotation (Placement(transformation(extent={{-9,-9},
             {9,9}},
         rotation=180,
-        origin={69,-129})));
+        origin={69,-149})));
 
-  BESMod.Utilities.Electrical.ZeroLoad zeroLoad annotation (Placement(
-        transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=180,
-        origin={94,-96})));
   Modelica.Blocks.Routing.RealPassThrough realPassThroughIntGains[nZones,3]
     annotation (Placement(transformation(extent={{-100,0},{-80,20}})));
   Modelica.Blocks.Routing.RealPassThrough realPassThroughTDry[nZones]
@@ -185,6 +181,27 @@ model TEASERThermalZone
         TSetZone_nominal .+ dTComfort, each for_heating=true)
     "Comfort calculator operative room temperature for cooling"
     annotation (Placement(transformation(extent={{20,-70},{40,-50}})));
+  BESMod.Utilities.Electrical.RealToElecCon realToElecCon(use_souGen=false)
+                                                annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={98,-120})));
+  Modelica.Blocks.Math.Gain gain(final k=if incElePro then 1 else 0)
+                                                               annotation (
+      Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={62,-120})));
+  Modelica.Blocks.Math.MultiSum multiSumEle(final k=fill(1, multiSumEle.nu),
+      final nu=2*nZones)  annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={30,-120})));
+  BESMod.Utilities.KPIs.RoomControlCalculator roomControlCalculator[nZones](each
+      final for_heating=true, each final dTComBou=0)
+    annotation (Placement(transformation(extent={{50,-40},{70,-20}})));
 equation
 
   for i in 1:nZones loop
@@ -204,6 +221,13 @@ equation
         index=-1,
         extent={{-3,-6},{-3,-6}},
         horizontalAlignment=TextAlignment.Right));
+    connect(thermalZone[i].QIntGains_flow[2], multiSumEle.u[2*i-1]) annotation (Line(
+          points={{-42.7,33.6},{-42.7,0},{-28,0},{-28,-68},{-6,-68},{-6,-134},{12,
+            -134},{12,-120},{20,-120}}, color={0,0,127}));
+  connect(thermalZone[i].QIntGains_flow[3], multiSumEle.u[2*i]) annotation (Line(
+        points={{-42.7,34.8},{-42.7,0},{-28,0},{-28,-68},{-6,-68},{-6,-134},{12,
+            -134},{12,-120},{20,-120}},
+                                      color={0,0,127}));
     if use_ventilation then
       connect(portVent_in[i], thermalZone[i].ports[1]) annotation (Line(points={{100,38},
               {82,38},{82,10},{-2,10},{-2,22.08}},                 color={0,127,
@@ -256,7 +280,7 @@ equation
             {-41.8,-130}},                     color={0,0,127}));
   end if;
   connect(intKPICal.KPI, outBusDem.QIntGain) annotation (Line(
-      points={{17.8,-110},{8,-110},{8,-2},{98,-2}},
+      points={{17.8,-150},{8,-150},{8,-2},{98,-2}},
       color={135,135,135},
       thickness=0.5), Text(
       string="%second",
@@ -372,17 +396,12 @@ equation
       extent={{-6,3},{-6,3}},
       horizontalAlignment=TextAlignment.Right));
   connect(multiSum.y, intKPICal.u)
-    annotation (Line(points={{58.47,-129},{54,-129},{54,-110},{41.8,-110}},
+    annotation (Line(points={{58.47,-149},{58.47,-150},{41.8,-150}},
                                                        color={0,0,127}));
-  connect(multiSum.u, thermalZone.QIntGains_flow) annotation (Line(points={{78,-129},
-          {86,-129},{86,-110},{56,-110},{56,4},{-28,4},{-28,10},{-32,10},{-32,8},
-          {-42.7,8},{-42.7,33.6}},
+  connect(multiSum.u, thermalZone.QIntGains_flow) annotation (Line(points={{78,-149},
+          {78,-152},{86,-152},{86,-134},{-6,-134},{-6,-68},{-28,-68},{-28,0},{-42.7,
+          0},{-42.7,33.6}},
         color={0,0,127}));
-  connect(zeroLoad.internalElectricalPin, internalElectricalPin) annotation (
-      Line(
-      points={{84,-96},{70,-96}},
-      color={0,0,0},
-      thickness=1));
   connect(realPassThroughIntGains.y, thermalZone.intGains) annotation (Line(
         points={{-79,10},{-50,10},{-50,4},{-31.6,4},{-31.6,17.76}}, color={0,0,
           127}));
@@ -400,7 +419,8 @@ equation
       extent={{6,3},{6,3}},
       horizontalAlignment=TextAlignment.Left));
   connect(comCalHeaOpe.TZone, calTOpe.y) annotation (Line(points={{18,-20},{-32,
-          -20},{-32,-16},{-81,-16},{-81,30}}, color={0,0,127}));
+          -20},{-32,-10},{-86,-10},{-86,30},{-81,30}},
+                                              color={0,0,127}));
   connect(comCalCooOpe.TZone, calTOpe.y) annotation (Line(points={{18,-60},{10,
           -60},{10,0},{2,0},{2,2},{0,2},{0,6},{-46,6},{-46,28},{-52,28},{-52,44},
           {-88,44},{-88,30},{-81,30}}, color={0,0,127}));
@@ -424,6 +444,33 @@ equation
       index=1,
       extent={{6,3},{6,3}},
       horizontalAlignment=TextAlignment.Left));
+  connect(gain.y,realToElecCon. PEleLoa) annotation (Line(points={{73,-120},{73,
+          -116},{86,-116}},             color={0,0,127}));
+  connect(multiSumEle.y, gain.u)
+    annotation (Line(points={{41.7,-120},{50,-120}}, color={0,0,127}));
+  connect(realToElecCon.internalElectricalPin, internalElectricalPin)
+    annotation (Line(
+      points={{108.2,-119.8},{114,-119.8},{114,-96},{70,-96}},
+      color={0,0,0},
+      thickness=1));
+
+  connect(roomControlCalculator.dTComSec, outBusDem.dTControlHea) annotation (
+      Line(points={{71,-30},{86,-30},{86,-16},{98,-16},{98,-2}}, color={0,0,127}),
+      Text(
+      string="%second",
+      index=1,
+      extent={{6,3},{6,3}},
+      horizontalAlignment=TextAlignment.Left));
+  connect(roomControlCalculator.TZone, thermalZone.TAir) annotation (Line(
+        points={{48,-30},{2,-30},{2,-20},{-32,-20},{-32,-10},{-54,-10},{-54,
+          76.8},{-42.7,76.8}}, color={0,0,127}));
+  connect(roomControlCalculator.TZoneSet, useProBus.TZoneSet) annotation (Line(
+        points={{48,-36},{42,-36},{42,102},{52,102},{52,101},{51,101}}, color={
+          0,0,127}), Text(
+      string="%second",
+      index=1,
+      extent={{-6,3},{-6,3}},
+      horizontalAlignment=TextAlignment.Right));
     annotation (Diagram(coordinateSystem(extent={{-100,-220},{100,100}})),
       Documentation(info="<html>
 <p>This model uses the reduced-order approach with the common TEASER output to model the building envelope. Relevant KPIs are calculated.</p>

diff --git a/BESMod/Systems/Hydraulical/Components/UFH/PanelHeating.mo b/BESMod/Systems/Hydraulical/Components/UFH/PanelHeating.mo
@@ -28,18 +28,14 @@ model PanelHeating
   parameter Modelica.Units.SI.Temperature T0=
       Modelica.Units.Conversions.from_degC(20)
     "Initial temperature, in degrees Celsius";
-  parameter Integer calcMethod=2 "Calculation method for convective heat transfer coefficient at surface" annotation (Dialog(group="Heat convection",
-        descriptionLabel=true), choices(
-      choice=1 "EN ISO 6946 Appendix A >>Flat Surfaces<<",
-      choice=2 "By Bernd Glueck",
-      choice=3 "Custom hCon (constant)",
-      radioButtons=true));
-
+  parameter AixLib.ThermalZones.HighOrder.Components.Types.CalcMethodConvectiveHeatTransferInsideSurface calcMethod=AixLib.ThermalZones.HighOrder.Components.Types.CalcMethodConvectiveHeatTransferInsideSurface.Bernd_Glueck "Calculation method for convective heat transfer coefficient" annotation (
+    Dialog(descriptionLabel=true),
+    Evaluate=true);
   parameter Modelica.Units.SI.CoefficientOfHeatTransfer hCon_const=2.5
     "Custom convective heat transfer coefficient" annotation (Dialog(
       group="Heat convection",
       descriptionLabel=true,
-      enable=if calcMethod == 3 then true else false));
+      enable=if calcMethod == AixLib.ThermalZones.HighOrder.Components.Types.CalcMethodConvectiveHeatTransferInsideSurface.Custom_hCon then true else false));
 
   final parameter Modelica.Units.SI.Emissivity eps=floorHeatingType.eps
     "Emissivity";

diff --git a/BESMod/Systems/Hydraulical/Components/UFH/PanelHeatingSegment.mo b/BESMod/Systems/Hydraulical/Components/UFH/PanelHeatingSegment.mo
@@ -23,19 +23,15 @@ parameter
 parameter
     AixLib.Fluid.HeatExchangers.ActiveWalls.BaseClasses.HeatCapacityPerArea cDown;
 
-  parameter Integer calcMethod=2 "Calculation method for convective heat transfer coefficient at surface"
-    annotation (Dialog(group="Heat convection",
-        descriptionLabel=true), choices(
-        choice=1 "EN ISO 6946 Appendix A >>Flat Surfaces<<",
-        choice=2 "By Bernd Glueck",
-        choice=3 "Custom hCon (constant)",
-        radioButtons=true));
+  parameter AixLib.ThermalZones.HighOrder.Components.Types.CalcMethodConvectiveHeatTransferInsideSurface calcMethod=AixLib.ThermalZones.HighOrder.Components.Types.CalcMethodConvectiveHeatTransferInsideSurface.Bernd_Glueck "Calculation method for convective heat transfer coefficient" annotation (
+    Dialog(descriptionLabel=true),
+    Evaluate=true);
 
   parameter Modelica.Units.SI.CoefficientOfHeatTransfer hCon_const=2.5
     "Constant heat transfer coefficient" annotation (Dialog(
       group="Heat convection",
       descriptionLabel=true,
-      enable=if calcMethod == 3 then true else false));
+      enable=if calcMethod == AixLib.ThermalZones.HighOrder.Components.Types.CalcMethodConvectiveHeatTransferInsideSurface.Custom_hCon then true else false));
 
   Modelica.Fluid.Vessels.ClosedVolume vol(
     redeclare package Medium = Medium,
@@ -65,7 +61,7 @@ parameter
     final A=A_floor,
     final calcMethod=calcMethod,
     final hCon_const=hCon_const,
-    surfaceOrientation=if isFloor then 2 else 1) annotation (Placement(
+    surfaceOrientation=if isFloor then AixLib.ThermalZones.HighOrder.Components.Types.InsideSurfaceOrientation.floor else AixLib.ThermalZones.HighOrder.Components.Types.InsideSurfaceOrientation.vertical_wall) annotation (Placement(
         transformation(
         extent={{-10,-10},{10,10}},
         rotation=270,