From 2e64cc58825610228b219d74649664d4448a76ae Mon Sep 17 00:00:00 2001 From: TobiasSpratte Date: Tue, 19 Sep 2023 11:52:23 +0200 Subject: [PATCH 1/2] Removed the connector from model AixLib.ThermalZones.HighOrder.Rooms.BaseClasses.PartialRoomParams, because it should only contain parameters, and added the connector to AixLib.ThermalZones.HighOrder.Rooms.BaseClasses.PartialRoom --- .../HighOrder/Rooms/BaseClasses/PartialRoom.mo | 13 ++++++++----- .../Rooms/BaseClasses/PartialRoomParams.mo | 9 ++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/AixLib/ThermalZones/HighOrder/Rooms/BaseClasses/PartialRoom.mo b/AixLib/ThermalZones/HighOrder/Rooms/BaseClasses/PartialRoom.mo index c76010158a..4c82e956b6 100644 --- 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) @@ -158,13 +161,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 index e4c1467448..81aa87088f 100644 --- a/AixLib/ThermalZones/HighOrder/Rooms/BaseClasses/PartialRoomParams.mo +++ b/AixLib/ThermalZones/HighOrder/Rooms/BaseClasses/PartialRoomParams.mo @@ -70,12 +70,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 " @@ -151,9 +153,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="