Mathadon · Mathadon · May 30, 2024 · May 31, 2024 · May 31, 2024 · May 31, 2024
diff --git a/IDEAS/BoundaryConditions/Interfaces/PartialSimInfoManager.mo b/IDEAS/BoundaryConditions/Interfaces/PartialSimInfoManager.mo
@@ -115,8 +115,6 @@ partial model PartialSimInfoManager
     annotation (Dialog(group="Wind"));
   parameter Real Cs_coeff = (A0*A0)*((1/Hwind)^(2*a)) "Multiplication factor for Habs"
     annotation(Dialog(group="Wind"));
-  parameter Modelica.Units.SI.Length Hpres=1 "Height above ground of meteorological ambient pressure measurement"
-    annotation(Dialog(group="Wind"));
   constant Modelica.Units.SI.Density rho_default = 1.2 "Default air density"
     annotation(Dialog(group="Wind"));
 

diff --git a/IDEAS/Buildings/Components/Interfaces/PartialSurface.mo b/IDEAS/Buildings/Components/Interfaces/PartialSurface.mo
@@ -53,12 +53,11 @@ partial model PartialSurface "Partial model for building envelope component"
   final parameter Real q50_internal(unit="m3/(h.m2)",fixed=false)
     "Surface air tightness";
 
-  final parameter Real hzone_a( fixed=false);//connected with propsbus in inital equation
-  final parameter Real hfloor_a( fixed=false);
-  parameter Real hVertical=if IDEAS.Utilities.Math.Functions.isAngle(inc,Modelica.Constants.pi) or IDEAS.Utilities.Math.Functions.isAngle(inc,0) then 0 else hzone_a "Vertical surface height, height of the surface projected to the vertical, 0 for floors and ceilings" annotation(Evaluate=true);
-  parameter Real hRef_a= if IDEAS.Utilities.Math.Functions.isAngle(inc,0) then hzone_a else 0  "Height above the zone floor at propsbus_a. Height where the surface starts. e.g. 0 for walls at floor level and floors.  "
-                                                                                                                                                                                   annotation(Evaluate=true);
-  final parameter Real Habs_surf=hfloor_a+hRef_a+(hVertical/2)  "Absolute height of the middle of the surface, can be used to check the heights after initialisation";
+  final parameter Modelica.Units.SI.Length hzone_a( fixed=false);//connected with propsbus in inital equation
+  final parameter Modelica.Units.SI.Length hAbs_floor_a( fixed=false);
+  parameter Modelica.Units.SI.Length hVertical=if IDEAS.Utilities.Math.Functions.isAngle(inc,IDEAS.Types.Tilt.Floor) or IDEAS.Utilities.Math.Functions.isAngle(inc,IDEAS.Types.Tilt.Ceiling) then 0 else hzone_a "Vertical surface height, height of the surface projected to the vertical, 0 for floors and ceilings" annotation(Evaluate=true);
+  parameter Modelica.Units.SI.Length hRelSurfBot_a= if IDEAS.Utilities.Math.Functions.isAngle(inc,IDEAS.Types.Tilt.Ceiling) then hzone_a else 0  "Height between the lowest point of the surface (bottom) and the floor level of the zone connected at propsBus_a"annotation(Evaluate=true);
+  final parameter Modelica.Units.SI.Length Habs_surf=hAbs_floor_a+hRelSurfBot_a+(hVertical/2)  "Absolute height of the middle of the surface, can be used to check the heights after initialisation";
 
   IDEAS.Buildings.Components.Interfaces.ZoneBus propsBus_a(
     redeclare final package Medium = Medium,
@@ -102,8 +101,10 @@ partial model PartialSurface "Partial model for building envelope component"
     A_q50 = A,
     q50=q50_internal,
     redeclare package Medium = Medium,
-    h_a2 = -0.5*hzone_a + 0.75*hVertical + hRef_a,
-    h_b1 = -0.5*hzone_a + 0.25*hVertical + hRef_a,
+    h_a1=0.25*hVertical,
+    h_b2=- 0.25*hVertical,
+    h_a2 = 0.75*hVertical + hRelSurfBot_a,
+    h_b1 = 0.25*hVertical + hRelSurfBot_a,
     interZonalAirFlowType = sim.interZonalAirFlowType) if add_door and sim.interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None annotation(
     Placement(visible = true, transformation(origin = {30, -52}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   Modelica.Blocks.Sources.RealExpression AExp(y = A) "Area expression" annotation(
@@ -192,7 +193,7 @@ end Q50_parameterToConnector;
 initial equation
   q50_internal=if use_custom_q50 then custom_q50 else q50_zone.q50_zone;
   hzone_a=propsBusInt.hzone;
-  hfloor_a=propsBusInt.hfloor;
+  hAbs_floor_a=propsBusInt.hfloor;
 equation
   connect(prescribedHeatFlowE.port, propsBusInt.E);
   connect(Qgai.y,prescribedHeatFlowQgai. Q_flow);

diff --git a/IDEAS/Buildings/Components/Interfaces/PartialZone.mo b/IDEAS/Buildings/Components/Interfaces/PartialZone.mo
@@ -259,7 +259,7 @@ model Setq50 "q50 computation for zones"
     "custom assigned v50 value, else zero";
 
   parameter Modelica.Units.SI.Length hZone "Zone height: distance between floor and ceiling";
-  parameter Modelica.Units.SI.Length hFloor = 0  "Absolute height of zone floor";
+  parameter Modelica.Units.SI.Length hFloor = 0  "Absolute height of zone floor. Relative to the height at which the atmospheric pressure is defined.";
 
   Modelica.Blocks.Interfaces.RealInput v50_surf[nSurf]
    annotation (Placement(transformation(extent={{-126,28},{-86,68}})));
@@ -703,4 +703,4 @@ Added view factor implementation.
 Partial model that defines the main variables and connectors of a zone model.
 </p>
 </html>"));
-end PartialZone;
+end PartialZone;
diff --git a/IDEAS/Buildings/Components/InternalWall.mo b/IDEAS/Buildings/Components/InternalWall.mo
@@ -126,8 +126,8 @@ initial equation
   hfloor_b = propsBus_b.hfloor;
 equation
   connect(constOne.y, crackOrOperableDoor.y);
-//assert(IDEAS.Utilities.Math.Functions.isAngle(inc,0) and hfloor_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 hfloor_a<hfloor_b, getInstanceName()+ "is a floor, 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,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_a<hfloor_b, getInstanceName()+ "is a floor, 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(hasCavity == false or IDEAS.Utilities.Math.Functions.isAngle(incInt, IDEAS.Types.Tilt.Wall), "In " + getInstanceName() + ": Cavities are only supported for vertical walls, but inc=" + String(incInt) + ". The model is not accurate.", level = AssertionLevel.warning);
   connect(layMul.port_b, propsBus_b.surfRad) annotation(
     Line(points = {{-10, 0}, {-18, 0}, {-18, 20.1}, {-100.1, 20.1}}, color = {191, 0, 0}, smooth = Smooth.None));

diff --git a/IDEAS/Buildings/Components/OuterWall.mo b/IDEAS/Buildings/Components/OuterWall.mo
@@ -4,10 +4,7 @@ model OuterWall "Opaque building envelope construction"
      setArea(A=A),
      final nWin=1,
      dT_nominal_a=-3,
-     QTra_design(fixed=false),
-    crackOrOperableDoor(
-      h_a1=(Habs - sim.Hpres) + 0.25*hVertical,
-      h_b2=(Habs - sim.Hpres) - 0.25*hVertical));
+     QTra_design(fixed=false));
 
   parameter Boolean linExtCon=sim.linExtCon
     "= true, if exterior convective heat transfer should be linearised (uses average wind speed)"
@@ -70,7 +67,7 @@ model OuterWall "Opaque building envelope construction"
   parameter Real Cs=sim.Cs
                        "Wind speed modifier"
     annotation (Dialog(enable=use_custom_Cs,tab="Airflow", group="Wind Pressure"));
-  final parameter Real Habs=hfloor_a + hRef_a + (hVertical/2)
+  final parameter Real Habs=hAbs_floor_a + hRelSurfBot_a + (hVertical/2)
     "Absolute height of the center of the surface for correcting the wind speed, used in TwoPort implementation"
     annotation (Dialog(tab="Airflow", group="Wind"));
 

diff --git a/IDEAS/Buildings/Components/Window.mo b/IDEAS/Buildings/Components/Window.mo
@@ -26,13 +26,11 @@ model Window "Multipane window"
       linIntCon=true,
       checkCoatings=glazing.checkLowPerformanceGlazing),
     setArea(A=A*nWin),
-    hRef_a=if IDEAS.Utilities.Math.Functions.isAngle(inc, 0) then hzone_a else (hzone_a - hVertical)/2,
-    hVertical=if IDEAS.Utilities.Math.Functions.isAngle(inc, Modelica.Constants.pi) or IDEAS.Utilities.Math.Functions.isAngle(inc, 0) then 0 else hWin,
+    hRelSurfBot_a=if IDEAS.Utilities.Math.Functions.isAngle(inc, IDEAS.Types.Tilt.Ceiling) then hzone_a else (hzone_a - hVertical)/2,
+    hVertical=if IDEAS.Utilities.Math.Functions.isAngle(inc, IDEAS.Types.Tilt.Floor) or IDEAS.Utilities.Math.Functions.isAngle(inc, IDEAS.Types.Tilt.Ceiling) then 0 else hWin,
     q50_zone(v50_surf=q50_internal*A),
     crackOrOperableDoor(
           openDoorOnePort=false,
-          h_a1=(Habs - sim.Hpres) + 0.25*hVertical,
-          h_b2=(Habs - sim.Hpres) - 0.25*hVertical,
           useDoor = use_operable_window));
   parameter Boolean linExtCon=sim.linExtCon
     "= true, if exterior convective heat transfer should be linearised (uses average wind speed)"
@@ -110,7 +108,7 @@ model Window "Multipane window"
         annotation (Dialog(enable=use_custom_Cs,tab="Airflow", group="Wind Pressure"));
 
   final parameter Real Habs(fixed=false)
-    "Absolute height of boundary for correcting the wind speed"
+    "Absolute height at the middle of the window"
     annotation (Dialog(tab="Airflow", group="Wind"));
   parameter Boolean use_operable_window = false
     "= true, to enable window control input"
@@ -147,7 +145,7 @@ model Window "Multipane window"
     m_flow_nominal=m_flow_nominal,
     use_y = use_trickle_vent_control)
     if use_trickle_vent and sim.interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None
-    "Trickle vent"
+"Trickle vent. Height assumed at the middle of the surface, i.e. at the reference pressure."
     annotation (Placement(visible = true, transformation(origin = {0, -158}, extent = {{20, 88}, {40, 68}}, rotation = 0)));
   replaceable
   IDEAS.Buildings.Components.BaseClasses.RadiativeHeatTransfer.SwWindowResponse
@@ -185,6 +183,8 @@ model Window "Multipane window"
   Modelica.Blocks.Sources.RealExpression y_window_trunc(y = max(0, min(1, y_window_internal)))
     "Truncated control signal" annotation (
     Placement(visible = true, transformation(origin = {-10, -90}, extent = {{-10, 10}, {10, -10}}, rotation = 90)));
+  Airflow.Multizone.ReversibleDensityColumn col_trickle(redeclare package Medium = Medium, h=hVertical/2) if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts "Column for port trickle vent" annotation(
+    Placement(transformation(origin = {112, -40}, extent = {{50, -10}, {70, 10}}, rotation = 180)));
 protected
   Modelica.Blocks.Interfaces.RealInput y_window_internal;
   final parameter Real U_value=glazing.U_value*(1-frac)+fraType.U_value*frac
@@ -242,7 +242,7 @@ protected
 
 initial equation
   QTra_design = (U_value*A + fraType.briTyp.G) *(273.15 + 21 - Tdes.y);
-  Habs =hfloor_a + hRef_a + (hVertical/2);
+  Habs =hAbs_floor_a + hRelSurfBot_a + (hVertical/2);
 
   assert(not use_trickle_vent or sim.interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None,
     "In " + getInstanceName() + ": Trickle vents can only be enabled when sim.interZonalAirFlowType is not None.");
@@ -315,8 +315,6 @@ equation
     Line(points = {{-10, 70}, {-10, 100}}, color = {191, 0, 0}));
   connect(heaCapGlaExt.port, layMul.port_b) annotation (
     Line(points = {{-10, -12}, {-10, 0}}, color = {191, 0, 0}));
-  connect(trickleVent.port_b, propsBusInt.port_1) annotation (
-    Line(points = {{40, -80}, {50, -80}, {50, 19.91}, {56.09, 19.91}}, color = {0, 127, 255}));
   connect(radSolData.Te, shaType.Te) annotation (
     Line(points={{-79.4,-64},{-68.5,-64},{-68.5,-29.9067}}, color = {0, 0, 127}));
   connect(shaType.port_frame, layFra.port_b) annotation (
@@ -348,6 +346,14 @@ equation
     Line(points={{-10,-79},{-10,-58}},      color = {0, 0, 127}));
  connect(y_window_trunc.y, crackOrOperableDoor.y) annotation (
     Line(points={{-10,-79},{-10,-68},{19,-68},{19,-52}},          color = {0, 0, 127}));
+ if sim.interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts then
+   connect(trickleVent.port_b, propsBusInt.port_1) annotation(
+    Line(points = {{40, -80}, {50, -80}, {50, 19.91}, {56.09, 19.91}}, color = {0, 127, 255}));
+ end if;
+ connect(trickleVent.port_b, col_trickle.port_a) annotation(
+    Line(points = {{40, -80}, {52, -80}, {52, -50}}, color = {0, 127, 255}));
+ connect(col_trickle.port_b, propsBusInt.port_1) annotation(
+    Line(points = {{52, -30}, {56, -30}, {56, 20}}, color = {0, 127, 255}));
   annotation (
     Icon(coordinateSystem(preserveAspectRatio=true, extent={{-60,-100},{60,100}}),
         graphics={Rectangle(fillColor = {255, 255, 255}, pattern = LinePattern.None,
@@ -553,4 +559,4 @@ Adjusted implementation for grouping of solar calculations.
 </li>
 </ul>
 </html>"));
-end Window;
+end Window;
diff --git a/IDEAS/Buildings/Examples/ZoneExample.mo b/IDEAS/Buildings/Examples/ZoneExample.mo
@@ -6,7 +6,7 @@ model ZoneExample
   parameter Modelica.Units.SI.Length l=4 "Room length";
   parameter Modelica.Units.SI.Length w=4 "Room width";
   parameter Modelica.Units.SI.Length h=2.7 "Room height";
-  inner BoundaryConditions.SimInfoManager sim(interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.OnePort)
+  inner BoundaryConditions.SimInfoManager sim(interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts)
                                               "Data reader"
     annotation (Placement(transformation(extent={{-96,76},{-76,96}})));
   IDEAS.Buildings.Components.Zone zone(
@@ -122,4 +122,4 @@ First implementation.
       StopTime=1000000,
       Tolerance=1e-06,
       __Dymola_Algorithm="Lsodar"));
-end ZoneExample;
+end ZoneExample;
diff --git a/IDEAS/Examples/PPD12/Structure.mo b/IDEAS/Examples/PPD12/Structure.mo
@@ -75,7 +75,7 @@ model Structure "Ppd 12 example model"
     annotation (Placement(transformation(extent={{70,68},{80,88}})));
   IDEAS.Buildings.Components.Window winBed3(
     hVertical=1.2*sin(winBed3.inc),
-    hRef_a=winBed3.hzone_a + 1,
+    hRelSurfMid_a=winBed3.hzone_a + 1,
     frac=0.1,
     azi=east,
     redeclare IDEAS.Examples.PPD12.Data.PvcInsulated fraType,
@@ -92,7 +92,7 @@ model Structure "Ppd 12 example model"
     A=wBedroom*lHalfBuilding*sqrt(2)/2,
     redeclare IDEAS.Examples.PPD12.Data.Roof constructionType,
     hVertical=lHalfBuilding*tan(Roof2.inc),
-    hRef_a=Roof2.hzone_a)
+    hRelSurfMid_a=Roof2.hzone_a)
     "Roof, east side"
     annotation (Placement(transformation(
         extent={{-5,-10},{5,10}},
@@ -359,7 +359,7 @@ model Structure "Ppd 12 example model"
     A=wBedroom*lHalfBuilding*sqrt(2),
     redeclare IDEAS.Examples.PPD12.Data.Roof constructionType,
     hVertical=lHalfBuilding*tan(Roof1.inc),
-    hRef_a=Roof1.hzone_a)
+    hRelSurfMid_a=Roof1.hzone_a)
     "Roof, west side"                     annotation (Placement(transformation(
         extent={{-5,-10},{5,10}},
         rotation=90,

diff --git a/IDEAS/Fluid/Sources/OutsideAir.mo b/IDEAS/Fluid/Sources/OutsideAir.mo
@@ -17,7 +17,10 @@ model OutsideAir
     annotation(Dialog(tab="Overwrite",group="Effect of surroundings on wind"));
   parameter Real a=sim.a "Velocity profile exponent. 0.28 for Suburban, 0.4 for Urban and 0.15 for Unshielded (Ashrae 1993) "
     annotation(Dialog(tab="Overwrite",group="Effect of surroundings on wind"));
-  constant Modelica.Units.SI.Density rho=sim.rho_default "Air density";
+  Modelica.Units.SI.Density rho = IDEAS.Utilities.Psychrometrics.Functions.density_pTX(
+        p=Medium.p_default,
+        T=T_in_internal,
+        X_w=X_wEnv);
 
   Modelica.Units.SI.Angle alpha "Wind incidence angle (0: normal to wall)";
   Real CpAct(final unit="1") = windPressureProfile(u=alpha, table=table[:, :]) "Actual wind pressure coefficient";
@@ -116,6 +119,8 @@ end windPressureProfile;
     "Angle of surface that is used to compute angle of attack of wind";
   Modelica.Blocks.Interfaces.RealInput vWin(final unit="m/s") = sim.Va   "Wind speed from weather bus";
   Modelica.Blocks.Interfaces.RealInput winDir( final unit="rad",displayUnit="deg") = sim.Vdir "Wind direction from weather bus";
+  Modelica.Blocks.Math.Add adder;
+ Modelica.Blocks.Sources.RealExpression dpStack(y=Habs*Modelica.Constants.g_n*rho);
 equation
 
   alpha = winDir-surOut;
@@ -127,7 +132,9 @@ equation
   connect(bus,sim.weaDatBus);
 
   connect(p_link.u, bus.pAtm);
-  connect(p_link.y,p_in_internal);
+  connect(p_link.y,adder.u1);
+  connect(adder.u2, dpStack.y);
+  connect(p_in_internal, adder.y);
 
   // must use sim.weaBus.Te for linearisation
   if (use_TDryBul_in) then
@@ -208,6 +215,10 @@ with exception of boundary pressure, do not have an effect.
 revisions="<html>
 <ul>
 <li>
+November 13, 2023 by Filip Jorissen:<br/>
+Computing stack height.
+</li>
+<li>
 July 21, 2022 by Filip Jorissen:<br/>
 Added optional dry bulb temperature input for #1270.
 </li>