Merge pull request #1522 from RWTH-EBC/1401-improve-parameterization-…

…in-highorder-model Moved the connector from AixLib.ThermalZones.HighOrder.Rooms.BaseClasses.PartialRoomParams to .PartialRoom
RWTH-EBC · Jul 26, 2024 · abff927 · abff927
2 parents 9eca742 + 02e4ee4
commit abff927
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/...s/HighOrder/House/OFD_MiddleInnerLoadWall/BuildingEnvelope/GroundFloorBuildingEnvelope.mo b/...s/HighOrder/House/OFD_MiddleInnerLoadWall/BuildingEnvelope/GroundFloorBuildingEnvelope.mo
@@ -392,6 +392,8 @@ model GroundFloorBuildingEnvelope
       Medium = Medium) "Outlet of Ventilation" annotation (Placement(
         transformation(extent={{94,-94},{114,-74}}), iconTransformation(extent={
             {94,-94},{108,-80}})));
+  Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a thermOutside
+    annotation (Placement(transformation(extent={{-114,90},{-94,110}})));
 equation
   connect(Livingroom.SolarRadiationPort_OW2, West) annotation (Line(points={{-50.89,
           75.68},{-50.89,82},{-12,82},{-12,78},{42,78},{42,84},{84,84},{84,86},{

diff --git a/...es/HighOrder/House/OFD_MiddleInnerLoadWall/BuildingEnvelope/UpperFloorBuildingEnvelope.mo b/...es/HighOrder/House/OFD_MiddleInnerLoadWall/BuildingEnvelope/UpperFloorBuildingEnvelope.mo
@@ -408,6 +408,8 @@ model UpperFloorBuildingEnvelope
       Medium = Medium) "Outlet of Ventilation" annotation (Placement(
         transformation(extent={{94,-94},{114,-74}}), iconTransformation(extent={
             {94,-94},{108,-80}})));
+  Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a thermOutside
+    annotation (Placement(transformation(extent={{-114,90},{-94,110}})));
 equation
   connect(Bedroom.SolarRadiationPort_OW2, West) annotation (Line(points={{-53.1,
           78.32},{-52,78.32},{-52,84},{-40,84},{-40,82},{-12,82},{-12,80},{54,80},

diff --git a/...es/HighOrder/House/OFD_MiddleInnerLoadWall/BuildingEnvelope/WholeHouseBuildingEnvelope.mo b/...es/HighOrder/House/OFD_MiddleInnerLoadWall/BuildingEnvelope/WholeHouseBuildingEnvelope.mo
@@ -281,6 +281,8 @@ model WholeHouseBuildingEnvelope
                                "Outlet of Ventilation" annotation (Placement(
         transformation(extent={{90,-98},{110,-78}}), iconTransformation(extent={
             {96,-92},{110,-78}})));
+  Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a thermOutside
+    annotation (Placement(transformation(extent={{-112,90},{-92,110}})));
 equation
   connect(upperFloor_Building.thermOutside, thermOutside) annotation (Line(
         points={{-26,33.54},{-74,33.54},{-74,100},{-100,100}}, color={191,0,0}));

diff --git a/AixLib/ThermalZones/HighOrder/Rooms/BaseClasses/PartialRoom.mo b/AixLib/ThermalZones/HighOrder/Rooms/BaseClasses/PartialRoom.mo
@@ -6,7 +6,8 @@ partial model PartialRoom "Partial model with base component that are necessary
       final T_start=T0_air);
 
   // Medium in the room
-  replaceable package MediumAir = AixLib.Media.Air constrainedby Modelica.Media.Interfaces.PartialMedium "Medium in the component"
+  replaceable package MediumAir = AixLib.Media.Air constrainedby
+    Modelica.Media.Interfaces.PartialMedium                                                              "Medium in the component"
       annotation (choices(
         choice(redeclare package MediumR = AixLib.Media.Air "Moist air"),
         choice(redeclare package MediumR = AixLib.Media.Air (extraPropertiesNames={"CO2"}, C_nominal = {6.12E-4}) "Moist air with tracer gas (404 ppm CO2)")));
@@ -105,6 +106,8 @@ partial model PartialRoom "Partial model with base component that are necessary
     "Latent heat gains for the room"
     annotation (Placement(transformation(extent={{-124,-68},{-100,-44}}),
         iconTransformation(extent={{-120,-80},{-100,-60}})));
+  Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a thermOutside
+    annotation (Placement(transformation(extent={{-110,90},{-90,110}})));
 protected
   constant Modelica.Units.SI.SpecificEnergy h_fg=
       AixLib.Media.Air.enthalpyOfCondensingGas(273.15 + 37)
@@ -164,13 +167,13 @@ equation
       points={{12,22},{12,4},{-3.875,4}},
       color={95,95,95},
       pattern=LinePattern.Solid));
-  connect(infiltrationRate.port_a,thermOutside)  annotation (Line(
+  connect(infiltrationRate.port_a, thermOutside) annotation (Line(
       points={{-30,-4},{-66,-4},{-66,100},{-100,100}},
       color={191,0,0},
       pattern=LinePattern.Dash));
-  connect(NaturalVentilation.port_a,thermOutside)  annotation (Line(points={{-34,-18},
-          {-68,-18},{-68,100},{-100,100}},   color={191,0,0}));
-  connect(dynamicVentilation.port_outside,thermOutside)  annotation (Line(
+  connect(NaturalVentilation.port_a, thermOutside) annotation (Line(points={{
+          -34,-18},{-68,-18},{-68,100},{-100,100}}, color={191,0,0}));
+  connect(dynamicVentilation.port_outside, thermOutside) annotation (Line(
       points={{-30,-32},{-72,-32},{-72,100},{-100,100}},
       color={191,0,0},
       pattern=LinePattern.Dash));

diff --git a/AixLib/ThermalZones/HighOrder/Rooms/BaseClasses/PartialRoomParams.mo b/AixLib/ThermalZones/HighOrder/Rooms/BaseClasses/PartialRoomParams.mo
@@ -59,12 +59,14 @@ partial model PartialRoomParams "Partial model with base parameters that are nec
   replaceable model WindowModel =
       AixLib.ThermalZones.HighOrder.Components.WindowsDoors.BaseClasses.PartialWindow
     constrainedby
-    AixLib.ThermalZones.HighOrder.Components.WindowsDoors.BaseClasses.PartialWindow               annotation (Dialog(tab="Outer walls", group="Windows"), choicesAllMatching = true);
+    AixLib.ThermalZones.HighOrder.Components.WindowsDoors.BaseClasses.PartialWindow
+                                                                                                  annotation (Dialog(tab="Outer walls", group="Windows"), choicesAllMatching = true);
   replaceable parameter DataBase.WindowsDoors.Simple.OWBaseDataDefinition_Simple Type_Win "Window parametrization" annotation (Dialog(tab="Outer walls", group="Windows"), choicesAllMatching = true);
   replaceable model CorrSolarGainWin =
       AixLib.ThermalZones.HighOrder.Components.WindowsDoors.BaseClasses.CorrectionSolarGain.PartialCorG
     constrainedby
-    AixLib.ThermalZones.HighOrder.Components.WindowsDoors.BaseClasses.CorrectionSolarGain.PartialCorG               "Correction model for solar irradiance as transmitted radiation" annotation (choicesAllMatching=true, Dialog(tab="Outer walls", group="Windows", enable = withWindow and outside));
+    AixLib.ThermalZones.HighOrder.Components.WindowsDoors.BaseClasses.CorrectionSolarGain.PartialCorG
+                                                                                                                    "Correction model for solar irradiance as transmitted radiation" annotation (choicesAllMatching=true, Dialog(tab="Outer walls", group="Windows", enable = withWindow and outside));
 
   // Solar absorptance
   parameter Real solar_absorptance_OW(min=0, max=1)=0.6 "Solar absoptance outer walls "
@@ -136,9 +138,6 @@ partial model PartialRoomParams "Partial model with base parameters that are nec
       descriptionLabel=true,
       enable=if withDynamicVentilation then true else false));
 
-  Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a thermOutside
-    annotation (Placement(transformation(extent={{-110,90},{-90,110}}), iconTransformation(extent={{-110,88},{-90,108}})));
-
     annotation (Dialog(tab="Infiltration acc. to EN 12831 (building airtightness"),
               Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(coordinateSystem(preserveAspectRatio=false)),
     Documentation(revisions="<html><ul>