From 9d0f28eaca23c0dd737f4037568e5b6fcfc29d6d Mon Sep 17 00:00:00 2001 From: Michael Wetter Date: Sun, 20 Oct 2024 13:17:59 -0700 Subject: [PATCH] Merges IBPSA, issues1935_unprotectdhDiscretizedDoor (#4021) * Merged IBPSA, issues1935_unprotectdhDiscretizedDoor This changes a protected parameter to an input, which is assinged by the extending class * Increased timeout. This is due to a recurring problem of this model on travis. The code change from this PR does not change the simulation statistics in OpenModelica --- .../Airflow/Multizone/BaseClasses/DoorDiscretized.mo | 8 ++++---- Buildings/Resources/Scripts/BuildingsPy/conf.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Buildings/Airflow/Multizone/BaseClasses/DoorDiscretized.mo b/Buildings/Airflow/Multizone/BaseClasses/DoorDiscretized.mo index b5326fd6d69..c05bfe92561 100644 --- a/Buildings/Airflow/Multizone/BaseClasses/DoorDiscretized.mo +++ b/Buildings/Airflow/Multizone/BaseClasses/DoorDiscretized.mo @@ -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, @@ -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) diff --git a/Buildings/Resources/Scripts/BuildingsPy/conf.yml b/Buildings/Resources/Scripts/BuildingsPy/conf.yml index 36cc92c0c16..4b5afef6961 100644 --- a/Buildings/Resources/Scripts/BuildingsPy/conf.yml +++ b/Buildings/Resources/Scripts/BuildingsPy/conf.yml @@ -526,7 +526,7 @@ - model_name: Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Guideline36Winter openmodelica: comment: Timeout on travis - time_out: 600 + time_out: 900 - model_name: Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.IdealHeatingCoolingSpring openmodelica: comment: returned non-zero exit status 255.