diff --git a/IDEAS/.copiedFiles.txt b/IDEAS/.copiedFiles.txt index cb484fe36c..ddabde5521 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 @@ -2912,6 +2914,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 +3827,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 +4747,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="