From 21fc58796ea0bdb9cbeac658eb8dd0a3440bf36d Mon Sep 17 00:00:00 2001 From: jelgerjansen Date: Thu, 25 Sep 2025 12:46:30 +0200 Subject: [PATCH 1/6] IBPSA merge 881b10178f8696c95dbe4851e99c4863c03b3be0 --- IDEAS/.copiedFiles.txt | 45 + IDEAS/Airflow/Multizone/BaseClasses/Door.mo | 10 + .../Multizone/BaseClasses/DoorDiscretized.mo | 10 + .../BaseClasses/Examples/PowerLaw05.mo | 73 + .../BaseClasses/Examples/package.order | 1 + .../BaseClasses/PartialOneWayFlowElement.mo | 25 +- .../BaseClasses/TwoWayFlowElement.mo | 36 +- .../Multizone/BaseClasses/package.order | 1 + .../Airflow/Multizone/BaseClasses/powerLaw.mo | 43 +- .../Multizone/BaseClasses/powerLaw05.mo | 88 + .../Multizone/BaseClasses/powerLawFixedM.mo | 35 +- IDEAS/Airflow/Multizone/Coefficient_V_flow.mo | 35 +- IDEAS/Airflow/Multizone/Coefficient_m_flow.mo | 36 +- .../Airflow/Multizone/DoorDiscretizedOpen.mo | 12 +- .../Multizone/DoorDiscretizedOperable.mo | 13 +- IDEAS/Airflow/Multizone/DoorOpen.mo | 35 +- IDEAS/Airflow/Multizone/DoorOperable.mo | 44 +- IDEAS/Controls/OBC/CDL/Reals/Ramp.mo | 15 +- IDEAS/Fluid/Actuators/package.mo | 21 +- IDEAS/Fluid/CHPs/package.mo | 25 +- IDEAS/Fluid/Chillers/package.mo | 31 +- IDEAS/Fluid/Delays/package.mo | 20 +- .../Examples/ResistanceVolumeFlowReversal.mo | 26 +- IDEAS/Fluid/FixedResistances/package.mo | 33 +- .../FiniteLineSource_Integrand_Length.mo | 18 +- .../Borefields/Data/Filling/Template.mo | 11 +- IDEAS/Fluid/Geothermal/Borefields/package.mo | 27 +- IDEAS/Fluid/Geothermal/package.mo | 27 +- IDEAS/Fluid/HeatExchangers/package.mo | 25 +- .../PartialReversibleRefrigerantMachine.mo | 2 +- .../Controls/Safety/Examples/Safety.mo | 8 +- IDEAS/Fluid/HeatPumps/package.mo | 29 +- IDEAS/Fluid/MassExchangers/package.mo | 46 +- IDEAS/Fluid/MixingVolumes/package.mo | 23 +- IDEAS/Fluid/Storage/package.mo | 38 +- ...tizone_BaseClasses_Examples_PowerLaw05.txt | 4 + ..._Multizone_Examples_NaturalVentilation.txt | 8 +- ...ne_Examples_OneEffectiveAirLeakageArea.txt | 6 +- ...Airflow_Multizone_Examples_OneOpenDoor.txt | 18 +- ..._Multizone_Examples_PressurizationData.txt | 10 +- ...ltizone_Examples_ReverseBuoyancy3Zones.txt | 30 +- ..._Examples_ResistanceVolumeFlowReversal.txt | 10 +- ...rsible_Controls_Safety_Examples_Safety.txt | 8 +- .../BaseClasses/Examples/PowerLaw05.mos | 14 + .../Examples/ResistanceVolumeFlowReversal.mos | 2 +- .../bootstrap-3.4.1/css/bootstrap-theme.css | 587 + .../css/bootstrap-theme.css.map | 1 + .../css/bootstrap-theme.min.css | 6 + .../css/bootstrap-theme.min.css.map | 1 + .../_static/bootstrap-3.4.1/css/bootstrap.css | 6834 ++++++++++ .../bootstrap-3.4.1/css/bootstrap.css.map | 1 + .../bootstrap-3.4.1/css/bootstrap.min.css | 6 + .../bootstrap-3.4.1/css/bootstrap.min.css.map | 1 + .../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 20127 bytes .../fonts/glyphicons-halflings-regular.svg | 288 + .../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 45404 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 23424 bytes .../fonts/glyphicons-halflings-regular.woff2 | Bin 0 -> 18028 bytes .../_static/bootstrap-3.4.1/js/bootstrap.js | 2580 ++++ .../bootstrap-3.4.1/js/bootstrap.min.js | 6 + .../html/_static/bootstrap-3.4.1/js/npm.js | 13 + .../cerulean/bootstrap.min.css | 11 + .../bootswatch-3.4.1/cosmo/bootstrap.min.css | 11 + .../bootswatch-3.4.1/cyborg/bootstrap.min.css | 11 + .../bootswatch-3.4.1/darkly/bootstrap.min.css | 11 + .../bootswatch-3.4.1/flatly/bootstrap.min.css | 11 + .../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 20127 bytes .../fonts/glyphicons-halflings-regular.svg | 288 + .../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 45404 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 23424 bytes .../fonts/glyphicons-halflings-regular.woff2 | Bin 0 -> 18028 bytes .../journal/bootstrap.min.css | 11 + .../bootswatch-3.4.1/lumen/bootstrap.min.css | 11 + .../bootswatch-3.4.1/paper/bootstrap.min.css | 11 + .../readable/bootstrap.min.css | 11 + .../sandstone/bootstrap.min.css | 11 + .../simplex/bootstrap.min.css | 11 + .../bootswatch-3.4.1/slate/bootstrap.min.css | 11 + .../spacelab/bootstrap.min.css | 11 + .../superhero/bootstrap.min.css | 11 + .../bootswatch-3.4.1/united/bootstrap.min.css | 11 + .../bootswatch-3.4.1/yeti/bootstrap.min.css | 11 + .../doc/build/html/_static/jquery-3.5.1.js | 10872 ++++++++++++++++ .../html/_static/js/jquery-1.12.4.min.js | 5 + .../build/html/_static/underscore-1.13.1.js | 2042 +++ .../SimpleRoomFourElementsTraceSubstance.mo | 8 +- IDEAS/Utilities/Math/Functions/bicubic.mo | 14 +- .../Math/Functions/quadraticLinear.mo | 13 +- .../Math/Functions/quinticHermite.mo | 8 +- .../Math/Functions/smoothHeaviside.mo | 8 +- IDEAS/Utilities/Math/Functions/smoothLimit.mo | 17 +- .../Psychrometrics/Functions/density_pTX.mo | 14 +- 92 files changed, 24680 insertions(+), 186 deletions(-) create mode 100644 IDEAS/Airflow/Multizone/BaseClasses/Examples/PowerLaw05.mo create mode 100644 IDEAS/Airflow/Multizone/BaseClasses/powerLaw05.mo create mode 100644 IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Airflow_Multizone_BaseClasses_Examples_PowerLaw05.txt create mode 100644 IDEAS/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/PowerLaw05.mos create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootstrap-3.4.1/css/bootstrap-theme.css create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootstrap-3.4.1/css/bootstrap-theme.css.map create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootstrap-3.4.1/css/bootstrap-theme.min.css create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootstrap-3.4.1/css/bootstrap-theme.min.css.map create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootstrap-3.4.1/css/bootstrap.css create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootstrap-3.4.1/css/bootstrap.css.map create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootstrap-3.4.1/css/bootstrap.min.css create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootstrap-3.4.1/css/bootstrap.min.css.map create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootstrap-3.4.1/fonts/glyphicons-halflings-regular.eot create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootstrap-3.4.1/fonts/glyphicons-halflings-regular.svg create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootstrap-3.4.1/fonts/glyphicons-halflings-regular.ttf create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootstrap-3.4.1/fonts/glyphicons-halflings-regular.woff create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootstrap-3.4.1/fonts/glyphicons-halflings-regular.woff2 create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootstrap-3.4.1/js/bootstrap.js create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootstrap-3.4.1/js/bootstrap.min.js create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootstrap-3.4.1/js/npm.js create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/cerulean/bootstrap.min.css create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/cosmo/bootstrap.min.css create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/cyborg/bootstrap.min.css create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/darkly/bootstrap.min.css create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/flatly/bootstrap.min.css create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/fonts/glyphicons-halflings-regular.eot create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/fonts/glyphicons-halflings-regular.svg create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/fonts/glyphicons-halflings-regular.ttf create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/fonts/glyphicons-halflings-regular.woff create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/fonts/glyphicons-halflings-regular.woff2 create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/journal/bootstrap.min.css create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/lumen/bootstrap.min.css create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/paper/bootstrap.min.css create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/readable/bootstrap.min.css create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/sandstone/bootstrap.min.css create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/simplex/bootstrap.min.css create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/slate/bootstrap.min.css create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/spacelab/bootstrap.min.css create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/superhero/bootstrap.min.css create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/united/bootstrap.min.css create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/yeti/bootstrap.min.css create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/jquery-3.5.1.js create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/js/jquery-1.12.4.min.js create mode 100644 IDEAS/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/underscore-1.13.1.js diff --git a/IDEAS/.copiedFiles.txt b/IDEAS/.copiedFiles.txt index cb484fe36c..00db2017b9 100644 --- a/IDEAS/.copiedFiles.txt +++ b/IDEAS/.copiedFiles.txt @@ -4,6 +4,7 @@ IDEAS\Airflow\Multizone\BaseClasses\Door.mo IDEAS\Airflow\Multizone\BaseClasses\DoorDiscretized.mo IDEAS\Airflow\Multizone\BaseClasses\ErrorControl.mo IDEAS\Airflow\Multizone\BaseClasses\Examples\PowerLaw.mo +IDEAS\Airflow\Multizone\BaseClasses\Examples\PowerLaw05.mo IDEAS\Airflow\Multizone\BaseClasses\Examples\PowerLawFixedM.mo IDEAS\Airflow\Multizone\BaseClasses\Examples\WindPressureLowRise.mo IDEAS\Airflow\Multizone\BaseClasses\Examples\WindPressureProfile.mo @@ -17,6 +18,7 @@ IDEAS\Airflow\Multizone\BaseClasses\ZonalFlow.mo IDEAS\Airflow\Multizone\BaseClasses\package.mo IDEAS\Airflow\Multizone\BaseClasses\package.order IDEAS\Airflow\Multizone\BaseClasses\powerLaw.mo +IDEAS\Airflow\Multizone\BaseClasses\powerLaw05.mo IDEAS\Airflow\Multizone\BaseClasses\powerLawFixedM.mo IDEAS\Airflow\Multizone\BaseClasses\windPressureLowRise.mo IDEAS\Airflow\Multizone\BaseClasses\windPressureProfile.mo @@ -1364,6 +1366,7 @@ IDEAS\Fluid\Examples\Performance\PressureDrop\package.order IDEAS\Fluid\Examples\Performance\package.mo IDEAS\Fluid\Examples\Performance\package.order IDEAS\Fluid\Examples\ResistanceVolumeFlowReversal.mo +IDEAS\Fluid\Examples\SimpleHouse.bak-mo IDEAS\Fluid\Examples\package.mo IDEAS\Fluid\Examples\package.order IDEAS\Fluid\FMI\Adaptors\Examples\ThermalZoneHVACNoExhaust.mo @@ -2912,6 +2915,7 @@ IDEAS\Resources\Images\Utilities\Math\int.pdf IDEAS\Resources\Images\Utilities\Math\int.png IDEAS\Resources\Python-Sources\MakeORCFluidRecord.py IDEAS\Resources\ReferenceResults\Dymola\IDEAS_Airflow_Multizone_BaseClasses_Examples_PowerLaw.txt +IDEAS\Resources\ReferenceResults\Dymola\IDEAS_Airflow_Multizone_BaseClasses_Examples_PowerLaw05.txt IDEAS\Resources\ReferenceResults\Dymola\IDEAS_Airflow_Multizone_BaseClasses_Examples_PowerLawFixedM.txt IDEAS\Resources\ReferenceResults\Dymola\IDEAS_Airflow_Multizone_BaseClasses_Examples_WindPressureLowRise.txt IDEAS\Resources\ReferenceResults\Dymola\IDEAS_Airflow_Multizone_BaseClasses_Examples_WindPressureProfile.txt @@ -3824,6 +3828,7 @@ IDEAS\Resources\ReferenceResults\Dymola\IDEAS_Utilities_Time_Validation_Calendar IDEAS\Resources\ReferenceResults\Dymola\IDEAS_Utilities_Time_Validation_CalendarTimeMonthsMinus.txt IDEAS\Resources\ReferenceResults\Dymola\IDEAS_Utilities_Time_Validation_CalendarTimeMonthsPlus.txt IDEAS\Resources\Scripts\Dymola\Airflow\Multizone\BaseClasses\Examples\PowerLaw.mos +IDEAS\Resources\Scripts\Dymola\Airflow\Multizone\BaseClasses\Examples\PowerLaw05.mos IDEAS\Resources\Scripts\Dymola\Airflow\Multizone\BaseClasses\Examples\PowerLawFixedM.mos IDEAS\Resources\Scripts\Dymola\Airflow\Multizone\BaseClasses\Examples\WindPressureLowRise.mos IDEAS\Resources\Scripts\Dymola\Airflow\Multizone\BaseClasses\Examples\WindPressureProfile.mos @@ -4743,6 +4748,46 @@ IDEAS\Resources\src\convertEPW\src\ConvertWeatherData.java IDEAS\Resources\src\convertEPW\src\Makefile IDEAS\Resources\src\convertEPW\src\Manifest.txt IDEAS\Resources\src\fluid\heatpumps\calibration\Examples\SomeManufacturer_ABC060_70kW_4_0COP_R410A.mo +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootstrap-3.4.1\css\bootstrap-theme.css +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootstrap-3.4.1\css\bootstrap-theme.css.map +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootstrap-3.4.1\css\bootstrap-theme.min.css +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootstrap-3.4.1\css\bootstrap-theme.min.css.map +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootstrap-3.4.1\css\bootstrap.css +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootstrap-3.4.1\css\bootstrap.css.map +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootstrap-3.4.1\css\bootstrap.min.css +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootstrap-3.4.1\css\bootstrap.min.css.map +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootstrap-3.4.1\fonts\glyphicons-halflings-regular.eot +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootstrap-3.4.1\fonts\glyphicons-halflings-regular.svg +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootstrap-3.4.1\fonts\glyphicons-halflings-regular.ttf +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootstrap-3.4.1\fonts\glyphicons-halflings-regular.woff +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootstrap-3.4.1\fonts\glyphicons-halflings-regular.woff2 +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootstrap-3.4.1\js\bootstrap.js +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootstrap-3.4.1\js\bootstrap.min.js +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootstrap-3.4.1\js\npm.js +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootswatch-3.4.1\cerulean\bootstrap.min.css +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootswatch-3.4.1\cosmo\bootstrap.min.css +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootswatch-3.4.1\cyborg\bootstrap.min.css +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootswatch-3.4.1\darkly\bootstrap.min.css +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootswatch-3.4.1\flatly\bootstrap.min.css +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootswatch-3.4.1\fonts\glyphicons-halflings-regular.eot +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootswatch-3.4.1\fonts\glyphicons-halflings-regular.svg +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootswatch-3.4.1\fonts\glyphicons-halflings-regular.ttf +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootswatch-3.4.1\fonts\glyphicons-halflings-regular.woff +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootswatch-3.4.1\fonts\glyphicons-halflings-regular.woff2 +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootswatch-3.4.1\journal\bootstrap.min.css +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootswatch-3.4.1\lumen\bootstrap.min.css +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootswatch-3.4.1\paper\bootstrap.min.css +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootswatch-3.4.1\readable\bootstrap.min.css +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootswatch-3.4.1\sandstone\bootstrap.min.css +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootswatch-3.4.1\simplex\bootstrap.min.css +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootswatch-3.4.1\slate\bootstrap.min.css +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootswatch-3.4.1\spacelab\bootstrap.min.css +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootswatch-3.4.1\superhero\bootstrap.min.css +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootswatch-3.4.1\united\bootstrap.min.css +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\bootswatch-3.4.1\yeti\bootstrap.min.css +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\jquery-3.5.1.js +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\js\jquery-1.12.4.min.js +IDEAS\Resources\src\fluid\heatpumps\calibration\doc\build\html\_static\underscore-1.13.1.js IDEAS\Resources\weatherdata\DRYCOLD.TMY IDEAS\Resources\weatherdata\DRYCOLD.mos IDEAS\Resources\weatherdata\USA_CA_San.Francisco.Intl.AP.724940_TMY3.epw diff --git a/IDEAS/Airflow/Multizone/BaseClasses/Door.mo b/IDEAS/Airflow/Multizone/BaseClasses/Door.mo index 8a11a6470a..c1a700d631 100644 --- a/IDEAS/Airflow/Multizone/BaseClasses/Door.mo +++ b/IDEAS/Airflow/Multizone/BaseClasses/Door.mo @@ -43,6 +43,9 @@ protected constant Real conTP = IDEAS.Media.Air.dStp*Modelica.Media.IdealGases.Common.SingleGasesData.Air.R_s "Conversion factor for converting temperature difference to pressure difference"; + final parameter Real sqrt_dp_turbulent(min=0) = sqrt(dp_turbulent) + "Square root of pressure difference where laminar and turbulent flow relation coincide"; + parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX( T=Medium.T_default, p=Medium.p_default, @@ -118,6 +121,13 @@ This is a partial model for the bi-directional air flow through a door. revisions="