Skip to content

Commit af4c526

Browse files
authored
Merge pull request #1412 from kldjonge/AvoidWarnings
Fixes for #1402
2 parents c03a42d + 6ccbe0f commit af4c526

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

IDEAS/Airflow/Multizone/CrackOrOperableDoor.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ model CrackOrOperableDoor
151151
hOpe=hOpe,
152152
dpCloRat=dpCloRat,
153153
LClo=LClo,
154-
vZer=vZer*MFtrans*rho_default)
154+
vZer=MFtrans/(rho_default*doo.wOpe*doo.hOpe))
155155
if useDoor and interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts annotation (
156156
Placement(visible = true, transformation(origin={-2,0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
157157
IDEAS.Fluid.Sources.Boundary_pT bou(

IDEAS/Buildings/Components/InternalWall.mo

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ model InternalWall "interior opaque wall between two zones"
8181
"Discharge coefficient of cavity"
8282
annotation(Dialog(group="Cavity or open door",tab="Advanced"));
8383
final parameter Real hzone_b(fixed=false);
84-
final parameter Real hfloor_b(fixed=false);
84+
final parameter Real hAbs_floor_b(fixed=false);
8585

8686

8787
parameter Modelica.Units.SI.Length hRelSurfBot_b=if
@@ -146,16 +146,23 @@ protected
146146

147147
initial equation
148148
hzone_b = propsBus_b.hzone;
149-
hfloor_b = propsBus_b.hfloor;
149+
hAbs_floor_b = propsBus_b.hfloor;
150150
QTra_design=U_value*A*(TRefZon - TRef_b)
151151
"TRefZon is the reference temperature for heat loss calculations of the zone connected to propsbus_a,
152152
TRef_b is the reference temperature for heat loss calculations of the zone connected to propsBus_b";
153153

154+
if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None and hasCavity == true then
155+
assert(IDEAS.Utilities.Math.Functions.isAngle(incInt, IDEAS.Types.Tilt.Wall), "In " + getInstanceName() + ": Cavities without airflow are only supported for vertical walls, but inc=" + String(incInt) + ". The model is not accurate.", level = AssertionLevel.warning);
156+
end if;
157+
158+
if sim.interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None and IDEAS.Utilities.Math.Functions.isAngle(inc,0) then
159+
assert(hAbs_floor_a<hAbs_floor_b, getInstanceName()+ " is a ceiling, but the floor of the zone at probsbus_b (hfloor="+String(hAbs_floor_b) +") does not lie below the floor of zone at probsbus_a (hfloor="+String(hAbs_floor_a) +"), this should be fixed",level=AssertionLevel.error);
160+
elseif sim.interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None and IDEAS.Utilities.Math.Functions.isAngle(inc,Modelica.Constants.pi) then
161+
assert(hAbs_floor_a>hAbs_floor_b, getInstanceName()+ " is a floor, but the floor of the zone at probsbus_a (hfloor="+String(hAbs_floor_a) +") does not lie below the floor of zone at probsbus_b (hfloor="+String(hAbs_floor_b) +"), this should be fixed",level=AssertionLevel.error);
162+
end if;
163+
154164
equation
155165
connect(constOne.y, crackOrOperableDoor.y);
156-
//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);
157-
//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);
158-
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);
159166
connect(layMul.port_b, propsBus_b.surfRad) annotation(
160167
Line(points = {{-10, 0}, {-18, 0}, {-18, 20.1}, {-100.1, 20.1}}, color = {191, 0, 0}, smooth = Smooth.None));
161168
connect(propsBus_b.surfCon, intCon_b.port_b) annotation(

IDEAS/Buildings/Components/SlabOnGround.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ protected
105105
Placement(transformation(origin = {0, -4}, extent = {{-28, -76}, {-8, -56}})));
106106

107107
initial equation
108-
QTra_design=UEqui*A*(TRefZon - weaBus.TGroundDes);
108+
QTra_design=UEqui*A*(TRefZon - TdesGround.y);
109109
equation
110110
connect(TdesGround.u, weaBus.TGroundDes);
111111
connect(periodicFlow.port, layMul.port_b) annotation (Line(points={{-20,22},{

0 commit comments

Comments
 (0)