From 0dc5daf9720144d150a6a12e253d6e487c108a64 Mon Sep 17 00:00:00 2001
From: kldjonge
Date: Tue, 5 Nov 2024 11:13:25 +0100
Subject: [PATCH 01/19] Asserts in internal wall
non-vertical openings in internal wall ARE supported now - delete this assert. And two suggestions of asserts to check connections of internal floors/ceilings. Need to check.
---
IDEAS/Buildings/Components/InternalWall.mo | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/IDEAS/Buildings/Components/InternalWall.mo b/IDEAS/Buildings/Components/InternalWall.mo
index 55b8456c6..ee67d2a79 100644
--- a/IDEAS/Buildings/Components/InternalWall.mo
+++ b/IDEAS/Buildings/Components/InternalWall.mo
@@ -147,10 +147,13 @@ initial equation
hfloor_b = propsBus_b.hfloor;
equation
connect(constOne.y, crackOrOperableDoor.y);
-//assert(IDEAS.Utilities.Math.Functions.isAngle(inc,0) and hAbs_floor_a>hfloor_b, getInstanceName()+ "is a ceiling, but the floor of the zone at probsbus_b lies above the floor of zone at probsbus_a, this is probably a mistake",level=AssertionLevel.warning);
-//assert(IDEAS.Utilities.Math.Functions.isAngle(inc,Modelica.Constants.pi) and hAbs_floor_ahfloor_b), getInstanceName()+ "is a ceiling, but the floor of the zone at probsbus_b lies above the floor of zone at probsbus_a, this is probably a mistake",level=AssertionLevel.warning);
+assert(not
+ (IDEAS.Utilities.Math.Functions.isAngle(inc,Modelica.Constants.pi) and hAbs_floor_a
Date: Wed, 6 Nov 2024 16:38:24 +0100
Subject: [PATCH 02/19] Revert "Asserts in internal wall"
This reverts commit 0dc5daf9720144d150a6a12e253d6e487c108a64.
---
IDEAS/Buildings/Components/InternalWall.mo | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/IDEAS/Buildings/Components/InternalWall.mo b/IDEAS/Buildings/Components/InternalWall.mo
index ee67d2a79..55b8456c6 100644
--- a/IDEAS/Buildings/Components/InternalWall.mo
+++ b/IDEAS/Buildings/Components/InternalWall.mo
@@ -147,13 +147,10 @@ initial equation
hfloor_b = propsBus_b.hfloor;
equation
connect(constOne.y, crackOrOperableDoor.y);
-
-assert(not
- (IDEAS.Utilities.Math.Functions.isAngle(inc,0) and hAbs_floor_a>hfloor_b), getInstanceName()+ "is a ceiling, but the floor of the zone at probsbus_b lies above the floor of zone at probsbus_a, this is probably a mistake",level=AssertionLevel.warning);
-assert(not
- (IDEAS.Utilities.Math.Functions.isAngle(inc,Modelica.Constants.pi) and hAbs_floor_ahfloor_b, getInstanceName()+ "is a ceiling, but the floor of the zone at probsbus_b lies above the floor of zone at probsbus_a, this is probably a mistake",level=AssertionLevel.warning);
+//assert(IDEAS.Utilities.Math.Functions.isAngle(inc,Modelica.Constants.pi) and hAbs_floor_a
Date: Mon, 9 Dec 2024 14:32:59 +0100
Subject: [PATCH 03/19] PPD12 package order update
---
IDEAS/Examples/PPD12/package.order | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/IDEAS/Examples/PPD12/package.order b/IDEAS/Examples/PPD12/package.order
index f9f05e0aa..5789add20 100644
--- a/IDEAS/Examples/PPD12/package.order
+++ b/IDEAS/Examples/PPD12/package.order
@@ -1,8 +1,8 @@
Heating
Structure
+StructureExt_2Port
+StructureExt_2Port_NoFlowTest
VentilationMPC
VentilationRBC
-StructureExt_2Port
Data
BaseClasses
-StructureExt_2Port_NoFlowTest
From 7c561baa8f774692e14ed947c7a0ceb5b0cb6930 Mon Sep 17 00:00:00 2001
From: kldjonge
Date: Mon, 9 Dec 2024 14:33:52 +0100
Subject: [PATCH 04/19] Delete obsolete whitespace
---
IDEAS/Buildings/Examples/ZoneWithSources.mo | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/IDEAS/Buildings/Examples/ZoneWithSources.mo b/IDEAS/Buildings/Examples/ZoneWithSources.mo
index 16067ac79..0f144cab3 100644
--- a/IDEAS/Buildings/Examples/ZoneWithSources.mo
+++ b/IDEAS/Buildings/Examples/ZoneWithSources.mo
@@ -2,9 +2,7 @@ within IDEAS.Buildings.Examples;
model ZoneWithSources "Zone with CO2 concentration model"
extends Modelica.Icons.Example;
replaceable package Medium = IDEAS.Media.Air(extraPropertiesNames={"test", "CO2"});
- inner BoundaryConditions.SimInfoManager sim
- "Simulation information manager for climate data"
- annotation (Placement(transformation(extent={{-100,80},{-80,100}})));
+ inner BoundaryConditions.SimInfoManager sim "Simulation information manager for climate data" annotation (Placement(transformation(extent={{-100,80},{-80,100}})));
IDEAS.Buildings.Components.Examples.BaseClasses.SimpleZone zone(
redeclare package Medium = Medium,
From bd8df1a441df1a41434e3435e378bbb2e1198ce8 Mon Sep 17 00:00:00 2001
From: kldjonge
Date: Mon, 9 Dec 2024 14:34:26 +0100
Subject: [PATCH 05/19] Delete obsolete whitespace
---
.../Data/WindPressureCoeff/Lowrise_Square_Exposed.mo | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/IDEAS/Buildings/Data/WindPressureCoeff/Lowrise_Square_Exposed.mo b/IDEAS/Buildings/Data/WindPressureCoeff/Lowrise_Square_Exposed.mo
index e038d0c07..ab87f7c71 100644
--- a/IDEAS/Buildings/Data/WindPressureCoeff/Lowrise_Square_Exposed.mo
+++ b/IDEAS/Buildings/Data/WindPressureCoeff/Lowrise_Square_Exposed.mo
@@ -11,7 +11,6 @@ record Lowrise_Square_Exposed
Cp_Floor=[0,0; 45,0; 90,0; 135,0; 180,0; 225,0; 270,0; 315,0; 360,0])
annotation (Documentation(info="
-
M. W. Liddament, A guide to energy efficient ventilation. Coventry: Annex V Air Infiltration and Ventilation Centre, 1996.
Table A2.1 Wind Pressure Coefficient Data
@@ -19,13 +18,9 @@ Low-rise buildings (up to 3 storeys)
Length to width ratio: 1:1
Shielding condition: Exposed
Wind speed reference level: Building height
-
-
"));
-
-
- annotation (Documentation(revisions="
+annotation (Documentation(revisions="
-
October 30, 2024, by Klaas De Jonge:
From b8522f42f539128361573000c8450138eebe757d Mon Sep 17 00:00:00 2001
From: kldjonge
Date: Mon, 9 Dec 2024 14:34:52 +0100
Subject: [PATCH 06/19] Documentation for s_co2
---
.../InternalGains/BaseClasses/PartialOccupancyGains.mo | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/IDEAS/Buildings/Components/InternalGains/BaseClasses/PartialOccupancyGains.mo b/IDEAS/Buildings/Components/InternalGains/BaseClasses/PartialOccupancyGains.mo
index d59cd34e8..50dcf4d5c 100644
--- a/IDEAS/Buildings/Components/InternalGains/BaseClasses/PartialOccupancyGains.mo
+++ b/IDEAS/Buildings/Components/InternalGains/BaseClasses/PartialOccupancyGains.mo
@@ -20,7 +20,8 @@ This is for #760.
final parameter Real s_co2[max(Medium.nC,1)] = {if Modelica.Utilities.Strings.isEqual(string1=if Medium.nC>0 then Medium.extraPropertiesNames[i] else "",
string2="CO2",
caseSensitive=false)
- then 1 else 0 for i in 1:max(Medium.nC,1)};
+ then 1 else 0 for i in 1:max(Medium.nC,1)}
+ "Array with 1 on the position where CO2 is situated in the Medium.extraPropertiesNames";
constant Modelica.Units.SI.SpecificEnthalpy lambdaWater=if (Medium.nX) > 1
then Medium.enthalpyOfCondensingGas(T=273.15 + 35) else 2566120
"Latent heat of evaporation of water at 35 degrees Celsius";
From deaf3c0f014ae5419d5f28568e6a095a67e8adaa Mon Sep 17 00:00:00 2001
From: kldjonge
Date: Mon, 9 Dec 2024 14:35:23 +0100
Subject: [PATCH 07/19] Fixed revision history
---
IDEAS/Buildings/Components/Interfaces/ZoneInterface.mo | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/IDEAS/Buildings/Components/Interfaces/ZoneInterface.mo b/IDEAS/Buildings/Components/Interfaces/ZoneInterface.mo
index 773c6b802..f9522af27 100644
--- a/IDEAS/Buildings/Components/Interfaces/ZoneInterface.mo
+++ b/IDEAS/Buildings/Components/Interfaces/ZoneInterface.mo
@@ -129,8 +129,8 @@ equation
connect(prescribedHeatFlowE.port, sim.E);
connect(Qgai.y,prescribedHeatFlowQgai. Q_flow);
connect(prescribedHeatFlowQgai.port, sim.Qgai);
-
connect(setVolume.volumePort, sim.volumePort);
+
annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,
-100},{100,100}})), Icon(coordinateSystem(
preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={
@@ -194,15 +194,14 @@ See #1253.
September 17, 2020, Filip Jorissen:
Modified default Medium.
See #1169.
-March 21, 2019 by Filip Jorissen:
-
March 17, 2020, Filip Jorissen:
Added support for vector fluidport.
See #1029.
-March 21, 2019 by Filip Jorissen:
-
+March 21, 2019 by Filip Jorissen:
Revised implementation of icon for
#996
and for #976.
From dd81b8b88da7fb3d9b0ae78aaa6bb3c3cac21068 Mon Sep 17 00:00:00 2001
From: kldjonge
Date: Mon, 9 Dec 2024 14:35:46 +0100
Subject: [PATCH 08/19] Delete obsolete whitespace
---
.../Components/Interfaces/ZoneBusVarMultiplicator.mo | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/IDEAS/Buildings/Components/Interfaces/ZoneBusVarMultiplicator.mo b/IDEAS/Buildings/Components/Interfaces/ZoneBusVarMultiplicator.mo
index 107f9f8e4..3dd33be9f 100644
--- a/IDEAS/Buildings/Components/Interfaces/ZoneBusVarMultiplicator.mo
+++ b/IDEAS/Buildings/Components/Interfaces/ZoneBusVarMultiplicator.mo
@@ -32,18 +32,15 @@ model ZoneBusVarMultiplicator "Component to scale all flows from the zone propsB
annotation (Placement(transformation(extent={{8,-324},{-12,-304}})));
protected
IDEAS.Fluid.BaseClasses.MassFlowRateMultiplier massFlowRateMultiplier2(
- redeclare package Medium = Medium, final k=k)
- if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts
+ redeclare package Medium = Medium,final k=k) if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts
"Mass flow rate multiplier for port 2"
annotation (Placement(transformation(extent={{-10,-200},{10,-180}})));
IDEAS.Fluid.BaseClasses.MassFlowRateMultiplier massFlowRateMultiplier1(
- redeclare package Medium = Medium, final k=k)
- if sim.interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None
+ redeclare package Medium = Medium,final k=k) if sim.interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None
"Mass flow rate multiplier for port 1"
annotation (Placement(transformation(extent={{-10,-170},{10,-150}})));
IDEAS.Fluid.BaseClasses.MassFlowRateMultiplier massFlowRateMultiplier3(
- redeclare package Medium = Medium, final k=k)
- if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts
+ redeclare package Medium = Medium,final k=k) if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts
"Mass flow rate multiplier for port 3"
annotation (Placement(transformation(origin = {0, -208}, extent = {{-10, -200}, {10, -180}})));
Modelica.Blocks.Math.Gain QTra_desgin(k=k) "Design heat flow rate"
From 434824107efe4f377b4b1765c05ca32563ee3105 Mon Sep 17 00:00:00 2001
From: kldjonge
Date: Mon, 9 Dec 2024 14:36:08 +0100
Subject: [PATCH 09/19] Obsolete line in revision history
---
.../Components/Interfaces/RectangularZoneTemplateInterface.mo | 1 -
1 file changed, 1 deletion(-)
diff --git a/IDEAS/Buildings/Components/Interfaces/RectangularZoneTemplateInterface.mo b/IDEAS/Buildings/Components/Interfaces/RectangularZoneTemplateInterface.mo
index 2a426a6a8..ef030fe99 100644
--- a/IDEAS/Buildings/Components/Interfaces/RectangularZoneTemplateInterface.mo
+++ b/IDEAS/Buildings/Components/Interfaces/RectangularZoneTemplateInterface.mo
@@ -1561,7 +1561,6 @@ See
October 18, 2023, by Filip Jorissen:
Added window height parameters.
-
-
August 2, 2022, by Filip Jorissen:
Added cavity support for horizontal internal walls (floor/ceiling)
From 08c1e55b70a18e6b2a08151807c7ae1acd60de67 Mon Sep 17 00:00:00 2001
From: kldjonge
Date: Mon, 9 Dec 2024 14:38:00 +0100
Subject: [PATCH 10/19] Aligned parameter with others
---
IDEAS/Buildings/Components/Interfaces/DummyConnection.mo | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/IDEAS/Buildings/Components/Interfaces/DummyConnection.mo b/IDEAS/Buildings/Components/Interfaces/DummyConnection.mo
index 96152061e..5730a22b5 100644
--- a/IDEAS/Buildings/Components/Interfaces/DummyConnection.mo
+++ b/IDEAS/Buildings/Components/Interfaces/DummyConnection.mo
@@ -17,9 +17,9 @@ model DummyConnection "Source generator/sink for propsbus"
outer IDEAS.BoundaryConditions.SimInfoManager sim annotation (Placement(transformation(extent={{-100,20},{-80,40}})));
IDEAS.Buildings.Components.Interfaces.ZoneBus zoneBus(
redeclare package Medium = Medium,
- numIncAndAziInBus=sim.numIncAndAziInBus,
- outputAngles=sim.outputAngles,
- use_port_1 = sim.interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None,
+ numIncAndAziInBus=sim.numIncAndAziInBus,
+ outputAngles=sim.outputAngles,
+ use_port_1 = sim.interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None,
use_port_2 = sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts)
annotation (Placement(transformation(extent={{80,-22},{120,18}})));
Modelica.Thermal.HeatTransfer.Sources.FixedHeatFlow prescribedHeatFlow[3](
From f49c1677c190c4dd3c887af3d69e63ddc3a9c111 Mon Sep 17 00:00:00 2001
From: kldjonge
Date: Mon, 9 Dec 2024 14:39:01 +0100
Subject: [PATCH 11/19] Deleted obsolete whitespace, change to documentation
---
IDEAS/Buildings/Components/Examples/TwoStoreyBoxes.mo | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/IDEAS/Buildings/Components/Examples/TwoStoreyBoxes.mo b/IDEAS/Buildings/Components/Examples/TwoStoreyBoxes.mo
index 56f225ba2..bc3d03a09 100644
--- a/IDEAS/Buildings/Components/Examples/TwoStoreyBoxes.mo
+++ b/IDEAS/Buildings/Components/Examples/TwoStoreyBoxes.mo
@@ -2,9 +2,7 @@ within IDEAS.Buildings.Components.Examples;
model TwoStoreyBoxes
extends Modelica.Icons.Example;
- inner BoundaryConditions.SimInfoManager sim(interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts,
- n50=1)
- annotation (Placement(transformation(extent={{-100,80},{-80,100}})));
+ inner BoundaryConditions.SimInfoManager sim(interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts,n50=1) annotation (Placement(transformation(extent={{-100,80},{-80,100}})));
IDEAS.Buildings.Components.RectangularZoneTemplate Level(
hFloor=5,
@@ -88,7 +86,7 @@ First implementation
", info="
-Model with two zones on different floors with a large opening between these zones and stack-effect airflow enabled.
+Model with two zones on different floors, one zone above the other, with a large opening between these zones and stack-effect airflow enabled.
"),
__Dymola_Commands(file=
"Resources/Scripts/Dymola/Buildings/Examples/TwoStoreyBoxes.mos"
From 436024539700fb8268cba0a144f53ee37e23f396 Mon Sep 17 00:00:00 2001
From: kldjonge
Date: Mon, 9 Dec 2024 14:39:42 +0100
Subject: [PATCH 12/19] Deleted obsolete whitespace
---
.../Buildings/Components/Examples/RectangularZoneTemplate.mo | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/IDEAS/Buildings/Components/Examples/RectangularZoneTemplate.mo b/IDEAS/Buildings/Components/Examples/RectangularZoneTemplate.mo
index 7481d132b..ec8751a91 100644
--- a/IDEAS/Buildings/Components/Examples/RectangularZoneTemplate.mo
+++ b/IDEAS/Buildings/Components/Examples/RectangularZoneTemplate.mo
@@ -2,9 +2,7 @@ within IDEAS.Buildings.Components.Examples;
model RectangularZoneTemplate
"This example illustrates the use of the RectangularZoneTemplate to model a room or building"
extends Modelica.Icons.Example;
- inner BoundaryConditions.SimInfoManager sim
- "Simulation information manager for climate data"
- annotation (Placement(transformation(extent={{-100,80},{-80,100}})));
+ inner BoundaryConditions.SimInfoManager sim "Simulation information manager for climate data" annotation (Placement(transformation(extent={{-100,80},{-80,100}})));
IDEAS.Buildings.Components.RectangularZoneTemplate Zone(
h=2.7,
@@ -16,7 +14,6 @@ model RectangularZoneTemplate
bouTypCei=IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall,
hasWinCei=false,
redeclare IDEAS.Buildings.Validation.Data.Constructions.LightRoof conTypCei,
-
bouTypFlo=IDEAS.Buildings.Components.Interfaces.BoundaryType.BoundaryWall,
redeclare IDEAS.Buildings.Validation.Data.Constructions.HeavyFloor
conTypFlo,
From 7208eea19784fd68d878dc7801e9896257bc7c0e Mon Sep 17 00:00:00 2001
From: kldjonge
Date: Mon, 9 Dec 2024 14:40:18 +0100
Subject: [PATCH 13/19] Deleted obsolete whitespace
---
IDEAS/Buildings/Components/Examples/BuildingShadeExample.mo | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/IDEAS/Buildings/Components/Examples/BuildingShadeExample.mo b/IDEAS/Buildings/Components/Examples/BuildingShadeExample.mo
index c196b4c2a..ae6c49ceb 100644
--- a/IDEAS/Buildings/Components/Examples/BuildingShadeExample.mo
+++ b/IDEAS/Buildings/Components/Examples/BuildingShadeExample.mo
@@ -98,10 +98,9 @@ model BuildingShadeExample
azi=azi.k,
t=0.02) "Horizontal fin model"
annotation (Placement(transformation(extent={{14,20},{24,40}})));
- Modelica.Blocks.Sources.Constant m_flow(k = 0) "Mass flow rate" annotation(
- Placement(visible = true, transformation(origin = {0, -60}, extent = {{-100, 20}, {-80, 40}}, rotation = 0)));
+ Modelica.Blocks.Sources.Constant m_flow(k=0) "Mass flow rate" annotation (Placement(visible = true, transformation(origin = {0, -60}, extent = {{-100, 20}, {-80, 40}}, rotation = 0)));
protected
- Interfaces.WeaBus weaBus(numSolBus=sim.numIncAndAziInBus)
+ Interfaces.WeaBus weaBus(numSolBus=sim.numIncAndAziInBus)
annotation (Placement(transformation(extent={{-64,24},{-44,44}})));
equation
connect(sim.weaBus, weaBus) annotation (Line(
From 38c081e7aca327ff164a394c6e319164522f2a7a Mon Sep 17 00:00:00 2001
From: kldjonge
Date: Mon, 9 Dec 2024 14:40:52 +0100
Subject: [PATCH 14/19] Change to revision note of DoorDiscretized
---
IDEAS/Airflow/Multizone/BaseClasses/DoorDiscretized.mo | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/IDEAS/Airflow/Multizone/BaseClasses/DoorDiscretized.mo b/IDEAS/Airflow/Multizone/BaseClasses/DoorDiscretized.mo
index b47848f84..d6a29efe7 100644
--- a/IDEAS/Airflow/Multizone/BaseClasses/DoorDiscretized.mo
+++ b/IDEAS/Airflow/Multizone/BaseClasses/DoorDiscretized.mo
@@ -119,7 +119,7 @@ revisions="
-
October 29, 2024, by Klaas De Jonge:
-Unprotected dh
and changed prefixes of dh
,hAg
and hBg
to input
.This is for #1935.
+Unprotected dh
and changed prefixes of dh
,hAg
and hBg
to input
. This is for #1935.
-
January 8, 2019, by Michael Wetter:
From 0a7b8a58b9e6e375ec21abc2118261e66e8b1c97 Mon Sep 17 00:00:00 2001
From: kldjonge
Date: Mon, 9 Dec 2024 14:42:23 +0100
Subject: [PATCH 15/19] Delete obsolete whitespace and use Modelica.Units in
CrackOrOperableDoor
---
IDEAS/Airflow/Multizone/CrackOrOperableDoor.mo | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/IDEAS/Airflow/Multizone/CrackOrOperableDoor.mo b/IDEAS/Airflow/Multizone/CrackOrOperableDoor.mo
index de5c583d8..61e6335fa 100644
--- a/IDEAS/Airflow/Multizone/CrackOrOperableDoor.mo
+++ b/IDEAS/Airflow/Multizone/CrackOrOperableDoor.mo
@@ -74,8 +74,8 @@ model CrackOrOperableDoor
if useDoor and interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts "Pressure difference where laminar and turbulent flow relation coincide for large cavities";
parameter Modelica.Units.SI.MassFlowRate MFtrans=(hOpe*wOpe)*VItrans*REtrans/DOpe if useDoor and interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts "Recommended massflowrate used for reguralisation";
parameter Modelica.Units.SI.Length DOpe=4*hOpe*wOpe/(2*hOpe+2*wOpe) if useDoor and interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts "Estimated hydraulic diameter of the opening - 4*A/Perimeter";
- constant Real REtrans=30 if useDoor and interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts "assumed reynoldsnumber at transition";
- constant Real VItrans(unit="kg/(m.s)")=0.0000181625 if useDoor and interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts "assumed viscosity of air at transition";
+ constant Modelica.Units.SI.ReynoldsNumber REtrans=30 if useDoor and interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts "Assumed Reynolds number at transition";
+ constant Modelica.Units.SI.DynamicViscosity VItrans(unit="kg/(m.s)")=0.0000181625 if useDoor and interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts "Assumed dynamic viscosity of air at transition";
final parameter Medium.ThermodynamicState state_default=Medium.setState_pTX(
T=Medium.T_default,
@@ -130,7 +130,7 @@ model CrackOrOperableDoor
IDEAS.Airflow.Multizone.Point_m_flow point_m_flow2(
redeclare package Medium = Medium,
dpMea_nominal = dpCloRat,
- forceErrorControlOnFlow=true,
+ forceErrorControlOnFlow=true,
m = mClo,
mMea_flow_nominal = (q50/3600*rho_default)*A_q50*0.5,
useDefaultProperties = false) if not useDoor and interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts "Pressure drop equation" annotation (
@@ -138,12 +138,12 @@ model CrackOrOperableDoor
IDEAS.Airflow.Multizone.DoorDiscretizedOperable doo(
final dh=doo.hOpe*sin(inc)/nCom,
redeclare package Medium = Medium,
- final hA=hA,
- final hB=hB,
- dp_turbulent=dp_turbulent_ope,
+ final hA=hA,
+ final hB=hB,
+ dp_turbulent=dp_turbulent_ope,
nCom=nCom,
CDOpe=CDOpe,
- CDClo=CDCloRat,
+ CDClo=CDCloRat,
mOpe=mOpe,
mClo=mClo,
CDCloRat=CDCloRat,
@@ -151,8 +151,8 @@ model CrackOrOperableDoor
hOpe=hOpe,
dpCloRat=dpCloRat,
LClo=LClo,
- vZer=vZer*MFtrans*rho_default)
- if useDoor and interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts annotation (
+ vZer=vZer*MFtrans*rho_default)
+ if useDoor and interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts annotation (
Placement(visible = true, transformation(origin={-2,0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
IDEAS.Fluid.Sources.Boundary_pT bou(
redeclare package Medium = Medium,
From 541aaa67601de08c46c6c7e7384f7432f8c825d2 Mon Sep 17 00:00:00 2001
From: kldjonge
Date: Mon, 9 Dec 2024 14:42:56 +0100
Subject: [PATCH 16/19] Delete obsolete whitespace
---
IDEAS/Airflow/Multizone/Examples/TrickleVentIDEAS.mo | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/IDEAS/Airflow/Multizone/Examples/TrickleVentIDEAS.mo b/IDEAS/Airflow/Multizone/Examples/TrickleVentIDEAS.mo
index c94135c19..8d9850e88 100644
--- a/IDEAS/Airflow/Multizone/Examples/TrickleVentIDEAS.mo
+++ b/IDEAS/Airflow/Multizone/Examples/TrickleVentIDEAS.mo
@@ -37,9 +37,7 @@ This model illustrates the use of the models
IDEAS.Airflow.Multizone.Table_V_flow,
which is an analytic alternative to the table implementation of
-IDEAS.Airflow.Multizone.Table_m_flow for
-
-modelling self regulating inlet vents.
+IDEAS.Airflow.Multizone.Table_m_flow for modelling self regulating inlet vents.
", revisions="
From a9944b56ac998725c1d1587b756ea0bd7e7afd83 Mon Sep 17 00:00:00 2001
From: kldjonge
Date: Mon, 9 Dec 2024 14:43:41 +0100
Subject: [PATCH 17/19] Use of Modelica.Units and change to Kelvin units in
LargeHorOpening
---
IDEAS/Airflow/Multizone/Validation/LargeHorizontalOpening.mo | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/IDEAS/Airflow/Multizone/Validation/LargeHorizontalOpening.mo b/IDEAS/Airflow/Multizone/Validation/LargeHorizontalOpening.mo
index 35f4c2d6a..db7446387 100644
--- a/IDEAS/Airflow/Multizone/Validation/LargeHorizontalOpening.mo
+++ b/IDEAS/Airflow/Multizone/Validation/LargeHorizontalOpening.mo
@@ -37,7 +37,7 @@ model LargeHorizontalOpening
annotation (Placement(transformation(extent={{4,14},{-16,34}})));
Modelica.Blocks.Math.Sum MF_Orifice(nin=1, k={3600})
annotation (Placement(transformation(extent={{-180,28},{-200,48}})));
- Real OpeningflowDiff(unit="kg/s")=abs(MF_Doormodel.y)-abs(MF_Orifice.y);
+ Modelica.Units.SI.MassFlowRate OpeningflowDiff(unit="kg/s")=abs(MF_Doormodel.y)-abs(MF_Orifice.y);
protected
Fluid.Sensors.MassFlowRate MFsensor_Orifice(
@@ -110,7 +110,7 @@ protected
extent={{-10,-10},{10,10}},
rotation=0,
origin={50,116})));
- Modelica.Thermal.HeatTransfer.Celsius.FixedTemperature fixedTemperature(T=20)
+ Modelica.Thermal.HeatTransfer.Sources.FixedTemperature fixedTemperature(T=293.15)
annotation (Placement(transformation(extent={{-172,58},{-152,78}})));
Fluid.Sensors.MassFlowRate Ori_Mixingvol_MF1(
redeclare package Medium = Medium) "Mass flow rate sensor" annotation (Placement(transformation(
From 4cbea235b04b9e32ef62ec6b6cbea093d6960dc4 Mon Sep 17 00:00:00 2001
From: kldjonge
Date: Mon, 9 Dec 2024 14:44:24 +0100
Subject: [PATCH 18/19] Description for box models and some cleaning up
---
.../Components/Examples/AirflowBoxModel.mo | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/IDEAS/Buildings/Components/Examples/AirflowBoxModel.mo b/IDEAS/Buildings/Components/Examples/AirflowBoxModel.mo
index 382d41100..9fb212a6c 100644
--- a/IDEAS/Buildings/Components/Examples/AirflowBoxModel.mo
+++ b/IDEAS/Buildings/Components/Examples/AirflowBoxModel.mo
@@ -2,11 +2,16 @@ within IDEAS.Buildings.Components.Examples;
model AirflowBoxModel
extends Modelica.Icons.Example;
- Box_Sim Energy_Only(sim(interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None)) annotation (Placement(transformation(rotation=0, extent={{-110,30},
+ Box_Sim Energy_Only(sim(interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None))
+ "Model not including a pressure network or n50 correction, the default IDEAS implementation."
+ annotation (Placement(transformation(rotation=0, extent={{-110,30},
{-50,90}})));
- Box_Sim Energy_n50Corr(sim(interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None, unify_n50=true)) annotation (Placement(transformation(rotation=0,
+ Box_Sim Energy_n50Corr(sim(interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None, unify_n50=true))
+ "Model not including a pressure network with n50 correction on building level."
+ annotation (Placement(transformation(rotation=0,
extent={{-30,30},{30,90}})));
Box_Sim IAQ_1port(sim(interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.OnePort))
+ "Model including a 1-port pressure network."
annotation (Placement(transformation(rotation=0, extent={{-110,-90},{-50,
-30}})));
Box_Sim IAQ_1port_trickle(sim(interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.OnePort),
@@ -14,21 +19,22 @@ model AirflowBoxModel
use_trickle_vent=true,
m_flow_nominal=0.0192656,
dp_nominal=2))
- "Extends the 1 port implementation with a tricklevent in the window"
+ "Model including a 1-port pressure network and a tricklevent in the window"
annotation (Placement(transformation(rotation=0, extent={{-30,-90},
{30,-30}})));
Box_Sim IAQ_2Port(
PerfectRad(G=10000000),
sim(interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts),
-
use_operable_window=true,
winD(
crackOrOperableDoor(nCom=2),
use_trickle_vent=false,
m_flow_nominal=0.0192656,
dp_nominal=2),
- winD_position(y=0)) annotation (Placement(transformation(rotation=0, extent
+ winD_position(y=0)) "Model including a 2-port pressure network."
+ annotation (Placement(transformation(rotation=0, extent
={{50,-90},{110,-30}})));
+
protected
model Box_Sim
inner BoundaryConditions.SimInfoManager sim(interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts,
From dcb03cd27ee21cae674fb888478b057b9d1eb491 Mon Sep 17 00:00:00 2001
From: kldjonge
Date: Mon, 9 Dec 2024 14:45:33 +0100
Subject: [PATCH 19/19] (Better) parameter descriptionsfor addmWat and addCFlow
---
IDEAS/Buildings/Components/Interfaces/PartialZone.mo | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/IDEAS/Buildings/Components/Interfaces/PartialZone.mo b/IDEAS/Buildings/Components/Interfaces/PartialZone.mo
index 7ff85582d..0fe3f4e1e 100644
--- a/IDEAS/Buildings/Components/Interfaces/PartialZone.mo
+++ b/IDEAS/Buildings/Components/Interfaces/PartialZone.mo
@@ -189,9 +189,9 @@ model PartialZone "Building zone model"
extent={{-10,10},{10,-10}},
rotation=270,
origin={-30,-10})));
- Modelica.Blocks.Math.Add addmWatFlow "Add mass flow rates" annotation(
+ Modelica.Blocks.Math.Add addmWatFlow "Add medium substance mass flow rates, typically moisture" annotation (
Placement(visible = true, transformation(origin = {-6, 40}, extent = {{4, -4}, {-4, 4}}, rotation = 0)));
- Modelica.Blocks.Math.Add addCFlow[max(Medium.nC,1)](k2 = intGaiOcc.s_co2) annotation(
+ Modelica.Blocks.Math.Add addCFlow[max(Medium.nC,1)](k2 = intGaiOcc.s_co2) "Add tracer mass flow rates" annotation (
Placement(visible = true, transformation(origin = {-6, 34}, extent = {{4, -4}, {-4, 4}}, rotation = 0)));
protected
parameter Real n50_int(unit="1/h",min=0.01,fixed= false)
@@ -578,12 +578,6 @@ Added conditional inputs for injecting water or CO2.
Added output phi for the relative humidity.
-
-January 8, 2024, by Jelger Jansen:
-Added min attribute to mSenFac
.
-See
-#1343
-
--
May 29, 2022, by Filip Jorissen:
Unprotected component for OM compatibility.
See