From e72b02fb51423787daaf1cfa02ca3f5f85643ba1 Mon Sep 17 00:00:00 2001
From: jelgerjansen
Date: Mon, 16 Oct 2023 14:03:29 +0200
Subject: [PATCH 01/32] Change the unit of nominal mass flow rate to kg/s in
the documentation of SimpleHouse3.
---
IBPSA/Examples/Tutorial/SimpleHouse/SimpleHouse3.mo | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/IBPSA/Examples/Tutorial/SimpleHouse/SimpleHouse3.mo b/IBPSA/Examples/Tutorial/SimpleHouse/SimpleHouse3.mo
index 59325b856b..3bdd4ceec2 100644
--- a/IBPSA/Examples/Tutorial/SimpleHouse/SimpleHouse3.mo
+++ b/IBPSA/Examples/Tutorial/SimpleHouse/SimpleHouse3.mo
@@ -60,7 +60,7 @@ The MixingVolume
Medium
parameter contains information
the type of fluid and its properties that should be modelled by the MixingVolume
.
Set its value to MediumAir
, which is declared in the template,
by typing redeclare package Medium = MediumAir
.
-For the nominal mass flow rate you may assume a value of 1 kg/m3 for now.
+For the nominal mass flow rate you may assume a value of 1 kg/s for now.
You will have to change this value once you add a ventilation system to the model (see
IBPSA.Examples.Tutorial.SimpleHouse.SimpleHouse6).
From ed2ffe993b796b8a299ed8f864d3cda60412e9d5 Mon Sep 17 00:00:00 2001
From: Michael Wetter
Date: Wed, 8 May 2024 11:11:34 -0700
Subject: [PATCH 02/32] Removed connector to itself
---
IBPSA/ThermalZones/ISO13790/Zone5R1C/Zone.mo | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/IBPSA/ThermalZones/ISO13790/Zone5R1C/Zone.mo b/IBPSA/ThermalZones/ISO13790/Zone5R1C/Zone.mo
index e27b56c9a8..83b16732d0 100644
--- a/IBPSA/ThermalZones/ISO13790/Zone5R1C/Zone.mo
+++ b/IBPSA/ThermalZones/ISO13790/Zone5R1C/Zone.mo
@@ -183,8 +183,6 @@ equation
horizontalAlignment=TextAlignment.Right));
connect(heaPorSur, HThe.port_a)
annotation (Line(points={{40,0},{40,30}}, color={191,0,0}));
- connect(heaPorSur, heaPorSur)
- annotation (Line(points={{40,0},{40,0}}, color={191,0,0}));
connect(win.weaBus, weaBus) annotation (Line(
points={{-100,-50},{-112,-50},{-112,120},{120,120}},
color={255,204,51},
@@ -383,6 +381,10 @@ If a wall contains only opaque parts, the corresponding window area must be set
revisions="
-
+May 8, 2024, by Michael Wetter:
+Removed connection to itself.
+
+-
Mar 16, 2022, by Alessandro Maccarini:
First implementation.
From 6846c9bbfd80b6ce22c0ab185f463eac57da8b5a Mon Sep 17 00:00:00 2001
From: Michael Wetter
Date: Wed, 8 May 2024 11:11:55 -0700
Subject: [PATCH 03/32] Changed number representation to avoid a warning in OCT
---
.../ISO13790/Validation/BESTEST/Case900.mo | 13 +++++++++----
.../Validation/BESTEST/Data/Case600Results.mo | 18 ++++++++++++++----
2 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/IBPSA/ThermalZones/ISO13790/Validation/BESTEST/Case900.mo b/IBPSA/ThermalZones/ISO13790/Validation/BESTEST/Case900.mo
index 7e27de27a9..ffa18a27a2 100644
--- a/IBPSA/ThermalZones/ISO13790/Validation/BESTEST/Case900.mo
+++ b/IBPSA/ThermalZones/ISO13790/Validation/BESTEST/Case900.mo
@@ -4,10 +4,10 @@ model Case900
zon5R1C(hInt=2.74,
redeclare replaceable IBPSA.ThermalZones.ISO13790.Validation.BESTEST.Data.Case900Mass buiMas),
annComBESTEST(
- EHeaMax=7347600000,
- EHeaMin=4212000000,
- ECooMax=-11394000000,
- ECooMin=-7686000000,
+ EHeaMax= 7.3476E+09,
+ EHeaMin= 4.2120E+09,
+ ECooMax=-11.3940E+09,
+ ECooMin= -7.6860E+09,
PHeaMax=3797,
PHeaMin=2850,
PCooMax=-3871,
@@ -41,6 +41,11 @@ for heating and 27°C for cooling. The room has no shade and a window
", revisions="