Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates to project itz fixes v2 kdj after failed CI-test #1382

Merged
merged 6 commits into from
Oct 8, 2024
+10 −24
Merged

Updates to project itz fixes v2 kdj after failed CI-test #1382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0148f61
n50tests changed rho_default to 1.2041
kldjonge Oct 1, 2024
0f39646
Update CrackOrOperableDoor.mo
kldjonge Oct 1, 2024
d264910
unprotect dh in baseclasses and make final again in higher levels
kldjonge Oct 1, 2024
1ccddc5
Revert "unprotect dh in baseclasses and make final again in higher le…
kldjonge Oct 1, 2024
410cd0c
unprotect dh, move to advanced and hideresults
kldjonge Oct 1, 2024
570cbe5
Overridable dh in DoorDiscretized.mo
kldjonge Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions IDEAS/Airflow/Multizone/BaseClasses/DoorDiscretized.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ partial model DoorDiscretized
Modelica.Units.SI.Velocity vTop "Velocity at top of opening from A to B";
Modelica.Units.SI.Velocity vBot "Velocity at bottom of opening from A to B";

protected
parameter Modelica.Units.SI.Length dh=hOpe/nCom "Height of each compartment";

input Modelica.Units.SI.Length dh=hOpe/nCom "Height of each compartment";
protected
parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX(
T=Medium.T_default,
p=Medium.p_default,
Expand All @@ -28,11 +28,11 @@ protected
parameter Modelica.Units.SI.Density rho_default=Medium.density(sta_default)
"Density, used to compute fluid volume";

parameter Real hAg[nCom](each unit="m2/s2")=
input Real hAg[nCom](each unit="m2/s2")=
{Modelica.Constants.g_n*(hA - (i - 0.5)*dh) for i in 1:nCom}
"Product g*h_i for each compartment";

parameter Real hBg[nCom](each unit="m2/s2")=
input Real hBg[nCom](each unit="m2/s2")=
{Modelica.Constants.g_n*(hB - (i - 0.5)*dh) for i in 1:nCom}
"Product g*h_i for each compartment";
Modelica.Units.SI.AbsolutePressure pA[nCom](each nominal=101325)
Expand Down
3 changes: 2 additions & 1 deletion IDEAS/Airflow/Multizone/CrackOrOperableDoor.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ model CrackOrOperableDoor
hOpe=hOpe,
dpCloRat=dpCloRat,
LClo=LClo,
vZer=vZer*MFtrans*1.2) if useDoor and interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts annotation (
vZer=vZer*MFtrans*1.2041)
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,
Expand Down
10 changes: 1 addition & 9 deletions IDEAS/Buildings/Validation/Tests/n50Test.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,7 @@ model n50Test "n50 consistency check for OnePort"
inner BoundaryConditions.SimInfoManager sim(Va=0,interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.OnePort)
annotation (Placement(transformation(extent={{-100,80},{-80,100}})));

parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX(
T=Medium.T_default,
p=Medium.p_default,
X=Medium.X_default)
"State of the medium at the medium default properties";
parameter Modelica.Units.SI.Density rho_default=Medium.density(sta_default)
"Density at the medium default properties";

Real ach = -bou.ports[1].m_flow/rho_default/simpleZone.V*3600 "Effective air change rate";
Real ach = -bou.ports[1].m_flow/1.2041/simpleZone.V*3600 "Effective air change rate";

IDEAS.Buildings.Components.Examples.BaseClasses.SimpleZone simpleZone(
redeclare package Medium = Medium,
Expand Down
11 changes: 2 additions & 9 deletions IDEAS/Buildings/Validation/Tests/n50Test2.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,6 @@ model n50Test2 "n50 consistency check for interzonalAirFlowType=OnePort"
sim(Va=0, interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.OnePort),
window(A=2, nWin=2));

parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX(
T=Medium.T_default,
p=Medium.p_default,
X=Medium.X_default)
"State of the medium at the medium default properties";
parameter Modelica.Units.SI.Density rho_default=Medium.density(sta_default)
"Density at the medium default properties";
parameter Boolean disableAssert = false;


Expand All @@ -36,8 +29,8 @@ model n50Test2 "n50 consistency check for interzonalAirFlowType=OnePort"
IDEAS.BoundaryConditions.WeatherData.Bus weaDatBus1
"Weather data bus connectable to weaBus connector from Buildings Library"
annotation (Placement(transformation(extent={{0,80},{20,100}})));
Real ach = -bou.ports[1].m_flow/rho_default/zone.V*3600;
Real ach1 = -bou.ports[2].m_flow/rho_default/zone1.V*3600;
Real ach = -bou.ports[1].m_flow/1.2041/zone.V*3600;
Real ach1 = -bou.ports[2].m_flow/1.2041/zone1.V*3600;


equation
Expand Down
2 changes: 1 addition & 1 deletion IDEAS/Buildings/Validation/Tests/n50Test3.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ within IDEAS.Buildings.Validation.Tests;
model n50Test3
extends n50Test2(disableAssert=true,zone1(use_custom_n50=false), zone(use_custom_n50=false));

Real flowDelta = sum(bou.ports.m_flow) + rho_default*(zone1.V+zone.V)*sim.n50/3600;
Real flowDelta = sum(bou.ports.m_flow) + 1.2041*(zone1.V+zone.V)*sim.n50/3600;

equation
assert(abs(flowDelta)< 1e-6 or time<2, "Flow rate consistency check failed");
Expand Down
Loading