diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 0000000000..6012034185 --- /dev/null +++ b/.gitconfig @@ -0,0 +1 @@ +anw = !git diff -U0 -w --no-color -- \"$@\" | git apply --cached --ignore-whitespace --unidiff-zero "#" \ No newline at end of file diff --git a/.github/issue-branch.yml b/.github/issue-branch.yml new file mode 100644 index 0000000000..1cf390fedb --- /dev/null +++ b/.github/issue-branch.yml @@ -0,0 +1,10 @@ +# configuration file for automatic issue branch creation +branchName: 'Issue${issue.number}_${issue.title}' +silent: false +autoCloseIssue: true +gitSafeReplacementChar: '_' +defaultBranch: 'development' + +branches: + - label: question + skip: true \ No newline at end of file diff --git a/.github/workflows/github-action-slack.yml b/.github/workflows/github-action-slack.yml new file mode 100644 index 0000000000..ad4c3e5d90 --- /dev/null +++ b/.github/workflows/github-action-slack.yml @@ -0,0 +1,21 @@ +name: github-action-slack +on: + schedule: + # * is a special character in YAML so you have to quote this string + - cron: '0 18 1 * *' + + +jobs: + slack_message_job: + runs-on: ubuntu-latest + strategy: + matrix: + # in this example, there is a newer version already installed, 3.7.7, so the older version will be downloaded + python-version: ['3.10'] + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: '3.11.0-alpha.1' + - run: pip install requests datetime argparse slack_sdk + - run: python bin/CITests/04_api_script/api_slack.py --github-token ${{ secrets.GIT_TOKEN }} --slack-token ${{ secrets.SLACK_BOT_TOKEN }} --github-repo "RWTH-EBC/AixLib" --base-branch "development" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8d14cf31aa..8a05e5e1ce 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,58 +1,39 @@ -#!/bin/bash -image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:miniconda-latest - -stages: - - deleteBranch - - IBPSA_Merge - - Update_WhiteList - - Release - - SetSettings - - CheckSettings - - Ref_Check - - Ref_Update - - Dif_Ref - - build - - HTMLCheck - - deploy - - openMR - - post - - ChangedModels - - StyleCheck - - Check - - Simulate - - RegressionTest - - -variables: - Praefix_Branch: "Correct_HTML_" - TARGET_BRANCH: $CI_COMMIT_REF_NAME - Newbranch: ${Praefix_Branch}${CI_COMMIT_REF_NAME} - Github_Repository : RWTH-EBC/AixLib - -include: - - project: 'EBC/EBC_all/gitlab_ci/templates' - file: 'modelica-ci-tests/CheckConfiguration/check_settings.gitlab-ci.yml' - - project: 'EBC/EBC_all/gitlab_ci/templates' - file: 'modelica-ci-tests/deploy/deploy_ref.gitlab-ci.yml' - - project: 'EBC/EBC_all/gitlab_ci/templates' - file: 'modelica-ci-tests/UnitTests/development_check.gitlab-ci.yml' - - project: 'EBC/EBC_all/gitlab_ci/templates' - file: 'modelica-ci-tests/deploy/IBPSA_Merge.gitlab-ci.yml' - - project: 'EBC/EBC_all/gitlab_ci/templates' - file: 'modelica-ci-tests/UnitTests/regression_ref_check.gitlab-ci.yml' - - project: 'EBC/EBC_all/gitlab_ci/templates' - file: 'modelica-ci-tests/SyntaxTests/html_check.gitlab-ci.yml' - - project: 'EBC/EBC_all/gitlab_ci/templates' - file: 'modelica-ci-tests/SyntaxTests/style_check.gitlab-ci.yml' - - project: 'EBC/EBC_all/gitlab_ci/templates' - file: 'modelica-ci-tests/UnitTests/check_model.gitlab-ci.yml' - - project: 'EBC/EBC_all/gitlab_ci/templates' - file: 'modelica-ci-tests/UnitTests/regression_test.gitlab-ci.yml' - - project: 'EBC/EBC_all/gitlab_ci/templates' - file: 'modelica-ci-tests/UnitTests/simulate_model.gitlab-ci.yml' - - project: 'EBC/EBC_all/gitlab_ci/templates' - file: 'modelica-ci-tests/UnitTests/changed_simulate_model.gitlab-ci.yml' - - project: 'EBC/EBC_all/gitlab_ci/templates' - file: 'modelica-ci-tests/UnitTests/changed_check_model.gitlab-ci.yml' - - project: 'EBC/EBC_all/gitlab_ci/templates' - file: 'modelica-ci-tests/UnitTests/changed_regression_test.gitlab-ci.yml' \ No newline at end of file + +image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:Dymola_2022-miniconda + +stages: + - check_setting + - build_templates + - Ref_Check + - build + - HTML_Check + - IBPSA_Merge + - create_html_whitelist + - Update_WhiteList + - Release + - StyleCheck + - check + - openMR + - post + - create_whitelist + - simulate + - RegressionTest + - Update_Ref + - plot_ref + - prepare + - deploy + +variables: + Github_Repository: RWTH-EBC/AixLib + GITLAB_Page: https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib + +include: + - 'bin/templates/03_ci_templates/01_deploy/gitlab_pages.gitlab-ci.yml' + - 'bin/templates/03_ci_templates/01_deploy/IBPSA_Merge.gitlab-ci.yml' + - 'bin/templates/03_ci_templates/02_UnitTests/check_model.gitlab-ci.yml' + - 'bin/templates/03_ci_templates/02_UnitTests/regression_test.gitlab-ci.yml' + - 'bin/templates/03_ci_templates/02_UnitTests/simulate_model.gitlab-ci.yml' + - 'bin/templates/03_ci_templates/03_SyntaxTest/html_check.gitlab-ci.yml' + - 'bin/templates/03_ci_templates/03_SyntaxTest/style_check.gitlab-ci.yml' + - 'bin/templates/03_ci_templates/04_CleanUpScript/ci_setting.gitlab-ci.yml' + \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index fd170093ae..e69de29bb2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +0,0 @@ -[submodule "netCDF-DataReader"] - path = netCDF-DataReader - url = https://github.com/modelica-3rdparty/netCDF-DataReader - branch = master diff --git a/AixLib/.copiedFiles.txt b/AixLib/.copiedFiles.txt index fda6dcf0b6..8f67174064 100644 --- a/AixLib/.copiedFiles.txt +++ b/AixLib/.copiedFiles.txt @@ -3,20 +3,27 @@ AixLib/Airflow/Multizone/BaseClasses/Door.mo AixLib/Airflow/Multizone/BaseClasses/DoorDiscretized.mo AixLib/Airflow/Multizone/BaseClasses/ErrorControl.mo +AixLib/Airflow/Multizone/BaseClasses/Examples/Interpolate.mo AixLib/Airflow/Multizone/BaseClasses/Examples/PowerLaw.mo AixLib/Airflow/Multizone/BaseClasses/Examples/PowerLawFixedM.mo AixLib/Airflow/Multizone/BaseClasses/Examples/WindPressureLowRise.mo +AixLib/Airflow/Multizone/BaseClasses/Examples/WindPressureProfile.mo AixLib/Airflow/Multizone/BaseClasses/Examples/package.mo AixLib/Airflow/Multizone/BaseClasses/Examples/package.order -AixLib/Airflow/Multizone/BaseClasses/PowerLawResistance.mo +AixLib/Airflow/Multizone/BaseClasses/PartialOneWayFlowElement.mo +AixLib/Airflow/Multizone/BaseClasses/PowerLawResistanceParameters.mo AixLib/Airflow/Multizone/BaseClasses/TwoWayFlowElement.mo AixLib/Airflow/Multizone/BaseClasses/TwoWayFlowElementBuoyancy.mo AixLib/Airflow/Multizone/BaseClasses/ZonalFlow.mo +AixLib/Airflow/Multizone/BaseClasses/interpolate.mo AixLib/Airflow/Multizone/BaseClasses/package.mo AixLib/Airflow/Multizone/BaseClasses/package.order AixLib/Airflow/Multizone/BaseClasses/powerLaw.mo AixLib/Airflow/Multizone/BaseClasses/powerLawFixedM.mo AixLib/Airflow/Multizone/BaseClasses/windPressureLowRise.mo +AixLib/Airflow/Multizone/BaseClasses/windPressureProfile.mo +AixLib/Airflow/Multizone/Coefficient_V_flow.mo +AixLib/Airflow/Multizone/Coefficient_m_flow.mo AixLib/Airflow/Multizone/DoorDiscretizedOpen.mo AixLib/Airflow/Multizone/DoorDiscretizedOperable.mo AixLib/Airflow/Multizone/DoorOpen.mo @@ -31,19 +38,27 @@ AixLib/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo AixLib/Airflow/Multizone/Examples/OneOpenDoor.mo AixLib/Airflow/Multizone/Examples/OneRoom.mo AixLib/Airflow/Multizone/Examples/Orifice.mo +AixLib/Airflow/Multizone/Examples/PowerLaw.mo +AixLib/Airflow/Multizone/Examples/PressurizationData.mo AixLib/Airflow/Multizone/Examples/ReverseBuoyancy.mo AixLib/Airflow/Multizone/Examples/ReverseBuoyancy3Zones.mo +AixLib/Airflow/Multizone/Examples/TrickleVent.mo AixLib/Airflow/Multizone/Examples/ZonalFlow.mo AixLib/Airflow/Multizone/Examples/package.mo AixLib/Airflow/Multizone/Examples/package.order AixLib/Airflow/Multizone/MediumColumn.mo AixLib/Airflow/Multizone/MediumColumnDynamic.mo AixLib/Airflow/Multizone/Orifice.mo +AixLib/Airflow/Multizone/Point_m_flow.mo +AixLib/Airflow/Multizone/Points_m_flow.mo +AixLib/Airflow/Multizone/Table_V_flow.mo +AixLib/Airflow/Multizone/Table_m_flow.mo AixLib/Airflow/Multizone/Types/densitySelection.mo AixLib/Airflow/Multizone/Types/package.mo AixLib/Airflow/Multizone/Types/package.order AixLib/Airflow/Multizone/UsersGuide.mo AixLib/Airflow/Multizone/Validation/DoorOpenClosed.mo +AixLib/Airflow/Multizone/Validation/OneWayFlow.mo AixLib/Airflow/Multizone/Validation/OpenDoorBuoyancyDynamic.mo AixLib/Airflow/Multizone/Validation/OpenDoorBuoyancyPressureDynamic.mo AixLib/Airflow/Multizone/Validation/OpenDoorPressure.mo @@ -147,6 +162,7 @@ AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/ConvertTimeNegativeSt AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/ConvertTimePositiveStart.mo AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/EquationOfTime.mo AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/GetAbsolutePath.mo +AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/GetAltitudeTMY3.mo AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3.mo AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3LongHeader.mo @@ -170,7 +186,9 @@ AixLib/BoundaryConditions/WeatherData/BaseClasses/SolarTime.mo AixLib/BoundaryConditions/WeatherData/BaseClasses/SourceSelector.mo AixLib/BoundaryConditions/WeatherData/BaseClasses/SourceSelectorRadiation.mo AixLib/BoundaryConditions/WeatherData/BaseClasses/getAbsolutePath.mo +AixLib/BoundaryConditions/WeatherData/BaseClasses/getAltitudeLocationTMY3.mo AixLib/BoundaryConditions/WeatherData/BaseClasses/getHeaderElementTMY3.mo +AixLib/BoundaryConditions/WeatherData/BaseClasses/getLastHeaderElementTMY3.mo AixLib/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo AixLib/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo AixLib/BoundaryConditions/WeatherData/BaseClasses/getTimeSpanTMY3.mo @@ -198,16 +216,12 @@ AixLib/Controls/Continuous/Examples/LimPID.mo AixLib/Controls/Continuous/Examples/LimPIDWithReset.mo AixLib/Controls/Continuous/Examples/NumberOfRequests.mo AixLib/Controls/Continuous/Examples/OffTimer.mo -AixLib/Controls/Continuous/Examples/PIDHysteresis.mo -AixLib/Controls/Continuous/Examples/PIDHysteresisTimer.mo AixLib/Controls/Continuous/Examples/SignalRanker.mo AixLib/Controls/Continuous/Examples/package.mo AixLib/Controls/Continuous/Examples/package.order AixLib/Controls/Continuous/LimPID.mo AixLib/Controls/Continuous/NumberOfRequests.mo AixLib/Controls/Continuous/OffTimer.mo -AixLib/Controls/Continuous/PIDHysteresis.mo -AixLib/Controls/Continuous/PIDHysteresisTimer.mo AixLib/Controls/Continuous/SignalRanker.mo AixLib/Controls/Continuous/Validation/LimPIDReset.mo AixLib/Controls/Continuous/Validation/OffTimerNonZeroStart.mo @@ -300,6 +314,7 @@ AixLib/Fluid/Actuators/Valves/package.mo AixLib/Fluid/Actuators/Valves/package.order AixLib/Fluid/Actuators/package.mo AixLib/Fluid/Actuators/package.order +AixLib/Fluid/BaseClasses/ActuatorFilter.mo AixLib/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mo AixLib/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mo AixLib/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mo @@ -321,6 +336,7 @@ AixLib/Fluid/BaseClasses/IndexMassFraction.mo AixLib/Fluid/BaseClasses/MassFlowRateMultiplier.mo AixLib/Fluid/BaseClasses/PartialResistance.mo AixLib/Fluid/BaseClasses/PartialThreeWayResistance.mo +AixLib/Fluid/BaseClasses/Validation/ActuatorFilter.mo AixLib/Fluid/BaseClasses/Validation/MassFlowRateMultiplier.mo AixLib/Fluid/BaseClasses/Validation/package.mo AixLib/Fluid/BaseClasses/Validation/package.order @@ -485,12 +501,9 @@ AixLib/Fluid/FMI/Validation/package.order AixLib/Fluid/FMI/package.mo AixLib/Fluid/FMI/package.order AixLib/Fluid/FixedResistances/BaseClasses/PlugFlow.mo -AixLib/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo AixLib/Fluid/FixedResistances/BaseClasses/PlugFlowHeatLoss.mo +AixLib/Fluid/FixedResistances/BaseClasses/PlugFlowPipe.mo AixLib/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo -AixLib/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mo -AixLib/Fluid/FixedResistances/BaseClasses/Validation/package.mo -AixLib/Fluid/FixedResistances/BaseClasses/Validation/package.order AixLib/Fluid/FixedResistances/BaseClasses/package.mo AixLib/Fluid/FixedResistances/BaseClasses/package.order AixLib/Fluid/FixedResistances/CheckValve.mo @@ -498,6 +511,7 @@ AixLib/Fluid/FixedResistances/Examples/CheckValve.mo AixLib/Fluid/FixedResistances/Examples/FlowJunction.mo AixLib/Fluid/FixedResistances/Examples/HydraulicDiameter.mo AixLib/Fluid/FixedResistances/Examples/PlugFlowPipe.mo +AixLib/Fluid/FixedResistances/Examples/PlugFlowPipeDiscretized.mo AixLib/Fluid/FixedResistances/Examples/PressureDrop.mo AixLib/Fluid/FixedResistances/Examples/package.mo AixLib/Fluid/FixedResistances/Examples/package.order @@ -505,6 +519,7 @@ AixLib/Fluid/FixedResistances/HydraulicDiameter.mo AixLib/Fluid/FixedResistances/Junction.mo AixLib/Fluid/FixedResistances/LosslessPipe.mo AixLib/Fluid/FixedResistances/PlugFlowPipe.mo +AixLib/Fluid/FixedResistances/PlugFlowPipeDiscretized.mo AixLib/Fluid/FixedResistances/PressureDrop.mo AixLib/Fluid/FixedResistances/Validation/FlowJunctionSteadyState.mo AixLib/Fluid/FixedResistances/Validation/FlowJunctionSteadyStateNoPressureDrop.mo @@ -733,10 +748,16 @@ AixLib/Fluid/HeatExchangers/BaseClasses/HANaturalCylinder.mo AixLib/Fluid/HeatExchangers/BaseClasses/PartialEffectiveness.mo AixLib/Fluid/HeatExchangers/BaseClasses/PartialEffectivenessNTU.mo AixLib/Fluid/HeatExchangers/BaseClasses/PartialPrescribedOutlet.mo +AixLib/Fluid/HeatExchangers/BaseClasses/WetCoilDryRegime.mo +AixLib/Fluid/HeatExchangers/BaseClasses/WetCoilDryWetRegime.mo +AixLib/Fluid/HeatExchangers/BaseClasses/WetCoilUARated.mo +AixLib/Fluid/HeatExchangers/BaseClasses/WetCoilWetRegime.mo +AixLib/Fluid/HeatExchangers/BaseClasses/determineWaterIndex.mo AixLib/Fluid/HeatExchangers/BaseClasses/dynamicViscosityWater.mo AixLib/Fluid/HeatExchangers/BaseClasses/epsilon_C.mo AixLib/Fluid/HeatExchangers/BaseClasses/epsilon_ntuZ.mo AixLib/Fluid/HeatExchangers/BaseClasses/isobaricExpansionCoefficientWater.mo +AixLib/Fluid/HeatExchangers/BaseClasses/lmtd.mo AixLib/Fluid/HeatExchangers/BaseClasses/ntu_epsilonZ.mo AixLib/Fluid/HeatExchangers/BaseClasses/package.mo AixLib/Fluid/HeatExchangers/BaseClasses/package.order @@ -755,6 +776,7 @@ AixLib/Fluid/HeatExchangers/Examples/DryCoilEffectivenessNTUPControl.mo AixLib/Fluid/HeatExchangers/Examples/WaterCooler_T.mo AixLib/Fluid/HeatExchangers/Examples/WaterHeater_T.mo AixLib/Fluid/HeatExchangers/Examples/WaterHeater_u.mo +AixLib/Fluid/HeatExchangers/Examples/WetCoilEffectivenessNTUMassFlow.mo AixLib/Fluid/HeatExchangers/Examples/package.mo AixLib/Fluid/HeatExchangers/Examples/package.order AixLib/Fluid/HeatExchangers/HeaterCooler_u.mo @@ -773,8 +795,10 @@ AixLib/Fluid/HeatExchangers/Validation/EvaporatorCondenser.mo AixLib/Fluid/HeatExchangers/Validation/HeaterCooler_u.mo AixLib/Fluid/HeatExchangers/Validation/PrescribedOutlet.mo AixLib/Fluid/HeatExchangers/Validation/PrescribedOutlet_dynamic.mo +AixLib/Fluid/HeatExchangers/Validation/WetCoilEffectivenessNTU.mo AixLib/Fluid/HeatExchangers/Validation/package.mo AixLib/Fluid/HeatExchangers/Validation/package.order +AixLib/Fluid/HeatExchangers/WetCoilEffectivenessNTU.mo AixLib/Fluid/HeatExchangers/package.mo AixLib/Fluid/HeatExchangers/package.order AixLib/Fluid/HeatPumps/BaseClasses/PartialWaterToWater.mo @@ -1135,6 +1159,9 @@ AixLib/Fluid/Sources/Boundary_pT.mo AixLib/Fluid/Sources/Boundary_ph.mo AixLib/Fluid/Sources/Examples/MassFlowSource_WeatherData.mo AixLib/Fluid/Sources/Examples/Outside.mo +AixLib/Fluid/Sources/Examples/Outside_CpData.mo +AixLib/Fluid/Sources/Examples/Outside_CpData_Angles.mo +AixLib/Fluid/Sources/Examples/Outside_CpData_Specification.mo AixLib/Fluid/Sources/Examples/Outside_CpLowRise.mo AixLib/Fluid/Sources/Examples/PropertySource_T.mo AixLib/Fluid/Sources/Examples/PropertySource_h.mo @@ -1145,6 +1172,7 @@ AixLib/Fluid/Sources/MassFlowSource_T.mo AixLib/Fluid/Sources/MassFlowSource_WeatherData.mo AixLib/Fluid/Sources/MassFlowSource_h.mo AixLib/Fluid/Sources/Outside.mo +AixLib/Fluid/Sources/Outside_CpData.mo AixLib/Fluid/Sources/Outside_CpLowRise.mo AixLib/Fluid/Sources/PropertySource_T.mo AixLib/Fluid/Sources/PropertySource_h.mo @@ -1157,6 +1185,7 @@ AixLib/Fluid/Sources/Validation/BaseClasses/package.order AixLib/Fluid/Sources/Validation/Boundary.mo AixLib/Fluid/Sources/Validation/BoundaryWithX_in.mo AixLib/Fluid/Sources/Validation/BoundaryWithXi_in.mo +AixLib/Fluid/Sources/Validation/Outside_CpData_Directions.mo AixLib/Fluid/Sources/Validation/package.mo AixLib/Fluid/Sources/Validation/package.order AixLib/Fluid/Sources/package.mo @@ -1219,6 +1248,10 @@ AixLib/Media/Examples/BaseClasses/package.order AixLib/Media/Examples/PropyleneGlycolWaterDerivativeCheck.mo AixLib/Media/Examples/PropyleneGlycolWaterProperties.mo AixLib/Media/Examples/PropyleneGlycolWaterTemperatureEnthalpyInversion.mo +AixLib/Media/Examples/SteamDerivativeCheck.mo +AixLib/Media/Examples/SteamProperties.mo +AixLib/Media/Examples/SteamSaturationConsistencyCheck.mo +AixLib/Media/Examples/SteamTemperatureEnthalpyInversion.mo AixLib/Media/Examples/WaterDerivativeCheck.mo AixLib/Media/Examples/WaterProperties.mo AixLib/Media/Examples/WaterTemperatureEnthalpyInversion.mo @@ -1262,6 +1295,7 @@ AixLib/Media/Specialized/Water/package.mo AixLib/Media/Specialized/Water/package.order AixLib/Media/Specialized/package.mo AixLib/Media/Specialized/package.order +AixLib/Media/Steam.mo AixLib/Media/Water.mo AixLib/Media/package.mo AixLib/Media/package.order @@ -1283,11 +1317,19 @@ AixLib/Resources/Data/BoundaryConditions/Validation/BESTEST/700260.epw AixLib/Resources/Data/BoundaryConditions/Validation/BESTEST/700260.mos AixLib/Resources/Data/BoundaryConditions/Validation/BESTEST/722190.epw AixLib/Resources/Data/BoundaryConditions/Validation/BESTEST/722190.mos -AixLib/Resources/Data/BoundaryConditions/Validation/BESTEST/725650.epw -AixLib/Resources/Data/BoundaryConditions/Validation/BESTEST/725650.mos AixLib/Resources/Data/BoundaryConditions/Validation/BESTEST/855740.epw AixLib/Resources/Data/BoundaryConditions/Validation/BESTEST/855740.mos AixLib/Resources/Data/BoundaryConditions/Validation/BESTEST/README.md +AixLib/Resources/Data/BoundaryConditions/Validation/BESTEST/WD100.epw +AixLib/Resources/Data/BoundaryConditions/Validation/BESTEST/WD100.mos +AixLib/Resources/Data/BoundaryConditions/Validation/BESTEST/WD200.epw +AixLib/Resources/Data/BoundaryConditions/Validation/BESTEST/WD200.mos +AixLib/Resources/Data/BoundaryConditions/Validation/BESTEST/WD300.epw +AixLib/Resources/Data/BoundaryConditions/Validation/BESTEST/WD300.mos +AixLib/Resources/Data/BoundaryConditions/Validation/BESTEST/WD400.epw +AixLib/Resources/Data/BoundaryConditions/Validation/BESTEST/WD400.mos +AixLib/Resources/Data/BoundaryConditions/Validation/BESTEST/WD500.epw +AixLib/Resources/Data/BoundaryConditions/Validation/BESTEST/WD500.mos AixLib/Resources/Data/BoundaryConditions/Validation/BESTEST/WD600.epw AixLib/Resources/Data/BoundaryConditions/Validation/BESTEST/WD600.mos AixLib/Resources/Data/BoundaryConditions/Validation/BESTEST/WeatherDriversResultsSubmittal1.json @@ -1309,7 +1351,7 @@ AixLib/Resources/Data/Fluid/FixedResistances/Validation/PlugFlowPipes/PipeDataUL AixLib/Resources/Data/Fluid/Geothermal/Borefields/HeatTransfer/Validation/Analytic_20Years.txt AixLib/Resources/Data/Fluid/Geothermal/Borefields/HeatTransfer/Validation/Beier_Smith_Spitler_2011_SandBox.txt AixLib/Resources/Data/Fluid/Geothermal/Borefields/HeatTransfer/Validation/Cimmino_Bernier_2015_SmallScale.txt -AixLib/Resources/Data/Utilities/IO/Files/Examples/CSVReader/Data.csv +AixLib/Resources/Data/Utilities/IO/Files/Examples/CSVReader/Data.txt AixLib/Resources/Documentation/userGuide/source/_static/lbl-logo.png AixLib/Resources/Images/Airflow/Multizone/BaseClasses/windPressureLowRise.odp AixLib/Resources/Images/Airflow/Multizone/BaseClasses/windPressureLowRise.png @@ -1336,9 +1378,6 @@ AixLib/Resources/Images/BoundaryConditions/zen_sun.png AixLib/Resources/Images/Controls/Continuous/Examples/NumberOfRequests.png AixLib/Resources/Images/Controls/Continuous/Examples/OffTimer1.png AixLib/Resources/Images/Controls/Continuous/Examples/OffTimer2.png -AixLib/Resources/Images/Controls/Continuous/Examples/PIDHysteresis.png -AixLib/Resources/Images/Controls/Continuous/Examples/PIDHysteresisTimerError.png -AixLib/Resources/Images/Controls/Continuous/Examples/PIDHysteresisTimerOutput.png AixLib/Resources/Images/Controls/Continuous/Examples/SignalRankerU.png AixLib/Resources/Images/Controls/Continuous/Examples/SignalRankerY.png AixLib/Resources/Images/Controls/SetPoints/Examples/OccupancySchedule.png @@ -1405,6 +1444,8 @@ AixLib/Resources/Images/Fluid/Sensors/twoPortHex.png AixLib/Resources/Images/Fluid/Sensors/twoPortHex.tiff AixLib/Resources/Images/Fluid/Sensors/warningIcon.png AixLib/Resources/Images/Fluid/Sensors/warningIcon.svg +AixLib/Resources/Images/Fluid/Sources/Outside_CpData.png +AixLib/Resources/Images/Fluid/Sources/Outside_CpData.svg AixLib/Resources/Images/Fluid/Storage/Stratified.pdf AixLib/Resources/Images/Fluid/Storage/Stratified.png AixLib/Resources/Images/Fluid/Storage/Stratified.svg @@ -1454,31 +1495,32 @@ AixLib/Resources/Images/Utilities/Math/Functions/Examples/cubicHermite.png AixLib/Resources/Images/Utilities/Math/Functions/SmoothExponentialXPower.png AixLib/Resources/Images/Utilities/Math/int.pdf AixLib/Resources/Images/Utilities/Math/int.png -AixLib/Resources/ReferenceResults/Dymola/AixLib_Airflow_Multizone_Validation_DoorOpenClosed.txt -AixLib/Resources/ReferenceResults/Dymola/AixLib_Airflow_Multizone_Validation_OpenDoorBuoyancyDynamic.txt -AixLib/Resources/ReferenceResults/Dymola/AixLib_Airflow_Multizone_Validation_OpenDoorBuoyancyPressureDynamic.txt -AixLib/Resources/ReferenceResults/Dymola/AixLib_Airflow_Multizone_Validation_OpenDoorPressure.txt -AixLib/Resources/ReferenceResults/Dymola/AixLib_Airflow_Multizone_Validation_OpenDoorTemperature.txt -AixLib/Resources/ReferenceResults/Dymola/AixLib_Airflow_Multizone_Validation_ThreeRoomsContamDiscretizedDoor.txt -AixLib/Resources/ReferenceResults/Dymola/AixLib_BoundaryConditions_Validation_BESTEST_WD100.txt -AixLib/Resources/ReferenceResults/Dymola/AixLib_BoundaryConditions_Validation_BESTEST_WD200.txt -AixLib/Resources/ReferenceResults/Dymola/AixLib_BoundaryConditions_Validation_BESTEST_WD300.txt -AixLib/Resources/ReferenceResults/Dymola/AixLib_BoundaryConditions_Validation_BESTEST_WD400.txt -AixLib/Resources/ReferenceResults/Dymola/AixLib_BoundaryConditions_Validation_BESTEST_WD500.txt -AixLib/Resources/ReferenceResults/Dymola/AixLib_BoundaryConditions_Validation_BESTEST_WD600.txt -AixLib/Resources/ReferenceResults/Dymola/AixLib_BoundaryConditions_WeatherData_BaseClasses_Examples_GetTimeSpanTMY3LongHeader.txt -AixLib/Resources/ReferenceResults/Dymola/AixLib_BoundaryConditions_WeatherData_BaseClasses_Examples_LimitMin.txt -AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_Actuators_Dampers_Validation_PressureIndependent.txt -AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_HeatExchangers_Validation_DryCoilEffectivenessNTU.txt -AixLib/Resources/ReferenceResults/Dymola/AixLib_Media_Antifreeze_Validation_EthyleneGlycolWater.txt -AixLib/Resources/ReferenceResults/Dymola/AixLib_ThermalZones_ReducedOrder_Examples_SimpleRoomFourElementsTraceSubstance.txt -AixLib/Resources/ReferenceResults/Dymola/AixLib_ThermalZones_ReducedOrder_Validation_RoomSteadyState.txt -AixLib/Resources/ReferenceResults/Dymola/AixLib_Utilities_IO_SignalExchange_Examples_WeatherStation.txt -AixLib/Resources/ReferenceResults/Dymola/AixLib_Utilities_Math_Functions_Examples_SmoothHeavisideDerivatives.txt -AixLib/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_Examples_DryCoilEffectivenessNTUPControl.txt +AixLib/Resources/ReferenceResults/Dymola/AixLib_Airflow_Multizone_BaseClasses_Examples_Interpolate.txt +AixLib/Resources/ReferenceResults/Dymola/AixLib_Airflow_Multizone_BaseClasses_Examples_WindPressureProfile.txt +AixLib/Resources/ReferenceResults/Dymola/AixLib_Airflow_Multizone_Examples_PowerLaw.txt +AixLib/Resources/ReferenceResults/Dymola/AixLib_Airflow_Multizone_Examples_PressurizationData.txt +AixLib/Resources/ReferenceResults/Dymola/AixLib_Airflow_Multizone_Examples_TrickleVent.txt +AixLib/Resources/ReferenceResults/Dymola/AixLib_Airflow_Multizone_Validation_OneWayFlow.txt +AixLib/Resources/ReferenceResults/Dymola/AixLib_BoundaryConditions_WeatherData_BaseClasses_Examples_GetAltitudeTMY3.txt +AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_BaseClasses_Validation_ActuatorFilter.txt +AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_FixedResistances_Examples_PlugFlowPipeDiscretized.txt +AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_HeatExchangers_Examples_WetCoilEffectivenessNTUMassFlow.txt +AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_HeatExchangers_Validation_WetCoilEffectivenessNTU.txt +AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_Sources_Examples_Outside_CpData.txt +AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_Sources_Examples_Outside_CpData_Angles.txt +AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_Sources_Examples_Outside_CpData_Specification.txt +AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_Sources_Validation_Outside_CpData_Directions.txt +AixLib/Resources/ReferenceResults/Dymola/AixLib_Media_Examples_SteamDerivativeCheck.txt +AixLib/Resources/ReferenceResults/Dymola/AixLib_Media_Examples_SteamProperties.txt +AixLib/Resources/ReferenceResults/Dymola/AixLib_Media_Examples_SteamSaturationConsistencyCheck.txt +AixLib/Resources/ReferenceResults/Dymola/AixLib_Media_Examples_SteamTemperatureEnthalpyInversion.txt +AixLib/Resources/ReferenceResults/Dymola/AixLib_Utilities_Math_Examples_Polynomial.txt +AixLib/Resources/Scripts/Conversion/ConvertIBPSA_from_3.0_to_4.0.mos +AixLib/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/Interpolate.mos AixLib/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/PowerLaw.mos AixLib/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/PowerLawFixedM.mos AixLib/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/WindPressureLowRise.mos +AixLib/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/WindPressureProfile.mos AixLib/Resources/Scripts/Dymola/Airflow/Multizone/Examples/CO2TransportStep.mos AixLib/Resources/Scripts/Dymola/Airflow/Multizone/Examples/ChimneyShaftNoVolume.mos AixLib/Resources/Scripts/Dymola/Airflow/Multizone/Examples/ChimneyShaftWithVolume.mos @@ -1488,10 +1530,14 @@ AixLib/Resources/Scripts/Dymola/Airflow/Multizone/Examples/OneEffectiveAirLeakag AixLib/Resources/Scripts/Dymola/Airflow/Multizone/Examples/OneOpenDoor.mos AixLib/Resources/Scripts/Dymola/Airflow/Multizone/Examples/OneRoom.mos AixLib/Resources/Scripts/Dymola/Airflow/Multizone/Examples/Orifice.mos +AixLib/Resources/Scripts/Dymola/Airflow/Multizone/Examples/PowerLaw.mos +AixLib/Resources/Scripts/Dymola/Airflow/Multizone/Examples/PressurizationData.mos AixLib/Resources/Scripts/Dymola/Airflow/Multizone/Examples/ReverseBuoyancy.mos AixLib/Resources/Scripts/Dymola/Airflow/Multizone/Examples/ReverseBuoyancy3Zones.mos +AixLib/Resources/Scripts/Dymola/Airflow/Multizone/Examples/TrickleVent.mos AixLib/Resources/Scripts/Dymola/Airflow/Multizone/Examples/ZonalFlow.mos AixLib/Resources/Scripts/Dymola/Airflow/Multizone/Validation/DoorOpenClosed.mos +AixLib/Resources/Scripts/Dymola/Airflow/Multizone/Validation/OneWayFlow.mos AixLib/Resources/Scripts/Dymola/Airflow/Multizone/Validation/OpenDoorBuoyancyDynamic.mos AixLib/Resources/Scripts/Dymola/Airflow/Multizone/Validation/OpenDoorBuoyancyPressureDynamic.mos AixLib/Resources/Scripts/Dymola/Airflow/Multizone/Validation/OpenDoorPressure.mos @@ -1530,6 +1576,7 @@ AixLib/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examp AixLib/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/ConvertTimePositiveStart.mos AixLib/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/EquationOfTime.mos AixLib/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/GetAbsolutePath.mos +AixLib/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/GetAltitudeTMY3.mos AixLib/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mos AixLib/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3.mos AixLib/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3LongHeader.mos @@ -1548,8 +1595,6 @@ AixLib/Resources/Scripts/Dymola/Controls/Continuous/Examples/LimPID.mos AixLib/Resources/Scripts/Dymola/Controls/Continuous/Examples/LimPIDWithReset.mos AixLib/Resources/Scripts/Dymola/Controls/Continuous/Examples/NumberOfRequests.mos AixLib/Resources/Scripts/Dymola/Controls/Continuous/Examples/OffTimer.mos -AixLib/Resources/Scripts/Dymola/Controls/Continuous/Examples/PIDHysteresis.mos -AixLib/Resources/Scripts/Dymola/Controls/Continuous/Examples/PIDHysteresisTimer.mos AixLib/Resources/Scripts/Dymola/Controls/Continuous/Examples/SignalRanker.mos AixLib/Resources/Scripts/Dymola/Controls/Continuous/Validation/LimPIDReset.mos AixLib/Resources/Scripts/Dymola/Controls/Continuous/Validation/OffTimerNonZeroStart.mos @@ -1580,6 +1625,7 @@ AixLib/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/BasicFlo AixLib/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/InverseFlowFunctions.mos AixLib/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_dp.mos AixLib/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_m_flow.mos +AixLib/Resources/Scripts/Dymola/Fluid/BaseClasses/Validation/ActuatorFilter.mos AixLib/Resources/Scripts/Dymola/Fluid/BaseClasses/Validation/MassFlowRateMultiplier.mos AixLib/Resources/Scripts/Dymola/Fluid/Chillers/Examples/Carnot_TEva.mos AixLib/Resources/Scripts/Dymola/Fluid/Chillers/Examples/Carnot_y.mos @@ -1660,11 +1706,11 @@ AixLib/Resources/Scripts/Dymola/Fluid/FMI/Validation/FlowSplitter_u.mos AixLib/Resources/Scripts/Dymola/Fluid/FMI/Validation/HeaterFan.mos AixLib/Resources/Scripts/Dymola/Fluid/FMI/Validation/HeaterFanPressureDriven.mos AixLib/Resources/Scripts/Dymola/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mos -AixLib/Resources/Scripts/Dymola/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mos AixLib/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/CheckValve.mos AixLib/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/FlowJunction.mos AixLib/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/HydraulicDiameter.mos AixLib/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/PlugFlowPipe.mos +AixLib/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/PlugFlowPipeDiscretized.mos AixLib/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/PressureDrop.mos AixLib/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/FlowJunctionSteadyState.mos AixLib/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/FlowJunctionSteadyStateNoPressureDrop.mos @@ -1738,6 +1784,7 @@ AixLib/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/DryCoilEffectivene AixLib/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/WaterCooler_T.mos AixLib/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/WaterHeater_T.mos AixLib/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/WaterHeater_u.mos +AixLib/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/WetCoilEffectivenessNTUMassFlow.mos AixLib/Resources/Scripts/Dymola/Fluid/HeatExchangers/Radiators/Examples/RadiatorEN442_2.mos AixLib/Resources/Scripts/Dymola/Fluid/HeatExchangers/Validation/ConstantEffectiveness.mos AixLib/Resources/Scripts/Dymola/Fluid/HeatExchangers/Validation/DryCoilEffectivenessNTU.mos @@ -1745,6 +1792,7 @@ AixLib/Resources/Scripts/Dymola/Fluid/HeatExchangers/Validation/EvaporatorConden AixLib/Resources/Scripts/Dymola/Fluid/HeatExchangers/Validation/HeaterCooler_u.mos AixLib/Resources/Scripts/Dymola/Fluid/HeatExchangers/Validation/PrescribedOutlet.mos AixLib/Resources/Scripts/Dymola/Fluid/HeatExchangers/Validation/PrescribedOutlet_dynamic.mos +AixLib/Resources/Scripts/Dymola/Fluid/HeatExchangers/Validation/WetCoilEffectivenessNTU.mos AixLib/Resources/Scripts/Dymola/Fluid/HeatPumps/Calibration/ScrollWaterToWater.mos AixLib/Resources/Scripts/Dymola/Fluid/HeatPumps/Compressors/BaseClasses/Validation/TemperatureProtection.mos AixLib/Resources/Scripts/Dymola/Fluid/HeatPumps/Compressors/Validation/ReciprocatingCompressor.mos @@ -1860,6 +1908,9 @@ AixLib/Resources/Scripts/Dymola/Fluid/Sensors/Examples/Velocity.mos AixLib/Resources/Scripts/Dymola/Fluid/Sensors/Examples/VolumeFlowRate.mos AixLib/Resources/Scripts/Dymola/Fluid/Sources/Examples/MassFlowSource_WeatherData.mos AixLib/Resources/Scripts/Dymola/Fluid/Sources/Examples/Outside.mos +AixLib/Resources/Scripts/Dymola/Fluid/Sources/Examples/Outside_CpData.mos +AixLib/Resources/Scripts/Dymola/Fluid/Sources/Examples/Outside_CpData_Angles.mos +AixLib/Resources/Scripts/Dymola/Fluid/Sources/Examples/Outside_CpData_Specification.mos AixLib/Resources/Scripts/Dymola/Fluid/Sources/Examples/Outside_CpLowRise.mos AixLib/Resources/Scripts/Dymola/Fluid/Sources/Examples/PropertySource_T.mos AixLib/Resources/Scripts/Dymola/Fluid/Sources/Examples/PropertySource_h.mos @@ -1867,6 +1918,7 @@ AixLib/Resources/Scripts/Dymola/Fluid/Sources/Examples/TraceSubstancesFlowSource AixLib/Resources/Scripts/Dymola/Fluid/Sources/Validation/Boundary.mos AixLib/Resources/Scripts/Dymola/Fluid/Sources/Validation/BoundaryWithX_in.mos AixLib/Resources/Scripts/Dymola/Fluid/Sources/Validation/BoundaryWithXi_in.mos +AixLib/Resources/Scripts/Dymola/Fluid/Sources/Validation/Outside_CpData_Directions.mos AixLib/Resources/Scripts/Dymola/Fluid/Storage/BaseClasses/Examples/IndirectTankHeatExchanger.mos AixLib/Resources/Scripts/Dymola/Fluid/Storage/Examples/ExpansionVessel.mos AixLib/Resources/Scripts/Dymola/Fluid/Storage/Examples/Stratified.mos @@ -1884,6 +1936,10 @@ AixLib/Resources/Scripts/Dymola/Media/Examples/AirTemperatureEnthalpyInversion.m AixLib/Resources/Scripts/Dymola/Media/Examples/PropyleneGlycolWaterDerivativeCheck.mos AixLib/Resources/Scripts/Dymola/Media/Examples/PropyleneGlycolWaterProperties.mos AixLib/Resources/Scripts/Dymola/Media/Examples/PropyleneGlycolWaterTemperatureEnthalpyInversion.mos +AixLib/Resources/Scripts/Dymola/Media/Examples/SteamDerivativeCheck.mos +AixLib/Resources/Scripts/Dymola/Media/Examples/SteamProperties.mos +AixLib/Resources/Scripts/Dymola/Media/Examples/SteamSaturationConsistencyCheck.mos +AixLib/Resources/Scripts/Dymola/Media/Examples/SteamTemperatureEnthalpyInversion.mos AixLib/Resources/Scripts/Dymola/Media/Examples/WaterDerivativeCheck.mos AixLib/Resources/Scripts/Dymola/Media/Examples/WaterProperties.mos AixLib/Resources/Scripts/Dymola/Media/Examples/WaterTemperatureEnthalpyInversion.mos @@ -1936,7 +1992,7 @@ AixLib/Resources/Scripts/Dymola/Utilities/Math/Examples/FallingFactorial.mos AixLib/Resources/Scripts/Dymola/Utilities/Math/Examples/IntegerReplicator.mos AixLib/Resources/Scripts/Dymola/Utilities/Math/Examples/IntegratorWithReset.mos AixLib/Resources/Scripts/Dymola/Utilities/Math/Examples/InverseXRegularized.mos -AixLib/Resources/Scripts/Dymola/Utilities/Math/Examples/Polynominal.mos +AixLib/Resources/Scripts/Dymola/Utilities/Math/Examples/Polynomial.mos AixLib/Resources/Scripts/Dymola/Utilities/Math/Examples/PowerLinearized.mos AixLib/Resources/Scripts/Dymola/Utilities/Math/Examples/QuadraticLinear.mos AixLib/Resources/Scripts/Dymola/Utilities/Math/Examples/RegNonZeroPower.mos @@ -2001,8 +2057,8 @@ AixLib/Resources/Scripts/Dymola/Utilities/Time/Validation/CalendarTimeMonths.mos AixLib/Resources/Scripts/Dymola/Utilities/Time/Validation/CalendarTimeMonthsMinus.mos AixLib/Resources/Scripts/Dymola/Utilities/Time/Validation/CalendarTimeMonthsPlus.mos AixLib/Resources/Scripts/JModelica/buildingspy_to_csv.py -AixLib/Resources/Scripts/github-actions/jmodelica/jm_ipython.sh AixLib/Resources/Scripts/travis/dymola/dymola +AixLib/Resources/Scripts/travis/omc/omc AixLib/Resources/bin/ConvertWeatherData.jar AixLib/Resources/src/convertEPW/Makefile AixLib/Resources/src/convertEPW/doc/ConvertWeatherData.html @@ -2061,7 +2117,47 @@ AixLib/Resources/src/convertEPW/src/ConvertWeatherData.java AixLib/Resources/src/convertEPW/src/Makefile AixLib/Resources/src/convertEPW/src/Manifest.txt AixLib/Resources/src/fluid/heatpumps/calibration/Examples/SomeManufacturer_ABC060_70kW_4_0COP_R410A.mo -AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/language_data.js +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootstrap-3.4.1/css/bootstrap-theme.css +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootstrap-3.4.1/css/bootstrap-theme.css.map +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootstrap-3.4.1/css/bootstrap-theme.min.css +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootstrap-3.4.1/css/bootstrap-theme.min.css.map +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootstrap-3.4.1/css/bootstrap.css +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootstrap-3.4.1/css/bootstrap.css.map +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootstrap-3.4.1/css/bootstrap.min.css +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootstrap-3.4.1/css/bootstrap.min.css.map +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootstrap-3.4.1/fonts/glyphicons-halflings-regular.eot +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootstrap-3.4.1/fonts/glyphicons-halflings-regular.svg +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootstrap-3.4.1/fonts/glyphicons-halflings-regular.ttf +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootstrap-3.4.1/fonts/glyphicons-halflings-regular.woff +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootstrap-3.4.1/fonts/glyphicons-halflings-regular.woff2 +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootstrap-3.4.1/js/bootstrap.js +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootstrap-3.4.1/js/bootstrap.min.js +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootstrap-3.4.1/js/npm.js +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/cerulean/bootstrap.min.css +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/cosmo/bootstrap.min.css +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/cyborg/bootstrap.min.css +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/darkly/bootstrap.min.css +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/flatly/bootstrap.min.css +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/fonts/glyphicons-halflings-regular.eot +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/fonts/glyphicons-halflings-regular.svg +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/fonts/glyphicons-halflings-regular.ttf +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/fonts/glyphicons-halflings-regular.woff +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/fonts/glyphicons-halflings-regular.woff2 +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/journal/bootstrap.min.css +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/lumen/bootstrap.min.css +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/paper/bootstrap.min.css +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/readable/bootstrap.min.css +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/sandstone/bootstrap.min.css +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/simplex/bootstrap.min.css +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/slate/bootstrap.min.css +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/spacelab/bootstrap.min.css +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/superhero/bootstrap.min.css +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/united/bootstrap.min.css +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/bootswatch-3.4.1/yeti/bootstrap.min.css +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/jquery-3.5.1.js +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/js/jquery-1.12.4.min.js +AixLib/Resources/src/fluid/heatpumps/calibration/doc/build/html/_static/underscore-1.13.1.js +AixLib/Resources/src/fluid/heatpumps/calibration/doc/requirements.txt AixLib/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.epw AixLib/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos AixLib/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw @@ -2211,7 +2307,7 @@ AixLib/Utilities/Math/Examples/FallingFactorial.mo AixLib/Utilities/Math/Examples/IntegerReplicator.mo AixLib/Utilities/Math/Examples/IntegratorWithReset.mo AixLib/Utilities/Math/Examples/InverseXRegularized.mo -AixLib/Utilities/Math/Examples/Polynominal.mo +AixLib/Utilities/Math/Examples/Polynomial.mo AixLib/Utilities/Math/Examples/PowerLinearized.mo AixLib/Utilities/Math/Examples/QuadraticLinear.mo AixLib/Utilities/Math/Examples/RegNonZeroPower.mo @@ -2300,7 +2396,7 @@ AixLib/Utilities/Math/IntegratorWithReset.mo AixLib/Utilities/Math/InverseXRegularized.mo AixLib/Utilities/Math/Max.mo AixLib/Utilities/Math/Min.mo -AixLib/Utilities/Math/Polynominal.mo +AixLib/Utilities/Math/Polynomial.mo AixLib/Utilities/Math/PowerLinearized.mo AixLib/Utilities/Math/QuadraticLinear.mo AixLib/Utilities/Math/RegNonZeroPower.mo @@ -2381,6 +2477,7 @@ AixLib/Utilities/Psychrometrics/ToDryAir.mo AixLib/Utilities/Psychrometrics/ToTotalAir.mo AixLib/Utilities/Psychrometrics/X_pTphi.mo AixLib/Utilities/Psychrometrics/X_pW.mo +AixLib/Utilities/Psychrometrics/hSat_pTSat.mo AixLib/Utilities/Psychrometrics/pW_TDewPoi.mo AixLib/Utilities/Psychrometrics/pW_X.mo AixLib/Utilities/Psychrometrics/package.mo diff --git a/AixLib/Airflow/AirCurtain/AirCurtainSimplified.mo b/AixLib/Airflow/AirCurtain/AirCurtainSimplified.mo index 9baefc1052..9dcc9a967c 100644 --- a/AixLib/Airflow/AirCurtain/AirCurtainSimplified.mo +++ b/AixLib/Airflow/AirCurtain/AirCurtainSimplified.mo @@ -1,19 +1,18 @@ within AixLib.Airflow.AirCurtain; model AirCurtainSimplified "Ideal model for the usage of an air curtain in the context of low order retail zones" - parameter Modelica.SIunits.VolumeFlowRate V_flowAirCur = 5 + parameter Modelica.Units.SI.VolumeFlowRate V_flowAirCur=5 "Design volume flow rate of the air curtain"; - parameter Modelica.SIunits.TemperatureDifference TAddAirCur = 5 + parameter Modelica.Units.SI.TemperatureDifference TAddAirCur=5 "Temperature increase over the air curtain"; parameter Real etaAirCur = 0.73 "Efficiency of the air curtain"; - parameter Modelica.SIunits.Density rho = 1.25 - "Air density"; - parameter Modelica.SIunits.SpecificHeatCapacity c = 1000 + parameter Modelica.Units.SI.Density rho=1.25 "Air density"; + parameter Modelica.Units.SI.SpecificHeatCapacity c=1000 "Specific heat capacity of air"; - parameter Modelica.SIunits.Temperature TBou = 287.15 + parameter Modelica.Units.SI.Temperature TBou=287.15 "Threshold of the ambient temperature when aircurtain becomes active"; - parameter Modelica.SIunits.Power PAirCur = 27500 + parameter Modelica.Units.SI.Power PAirCur=27500 "The thermal Power of the air curtain, simplified use"; Utilities.Psychrometrics.MixedTemperature mixedTemperature annotation (Placement(transformation(extent={{-6,-10},{14,10}}))); diff --git a/AixLib/Airflow/AirHandlingUnit/AHU.mo b/AixLib/Airflow/AirHandlingUnit/AHU.mo index cc946d63bb..d496fd4c40 100644 --- a/AixLib/Airflow/AirHandlingUnit/AHU.mo +++ b/AixLib/Airflow/AirHandlingUnit/AHU.mo @@ -1,4 +1,4 @@ -within AixLib.Airflow.AirHandlingUnit; +within AixLib.Airflow.AirHandlingUnit; model AHU "Air Handling Unit with Heat Recovery System, Cooling, Heating, Humidification (adiabatic), Dehumidification" extends AixLib.Airflow.AirHandlingUnit.BaseClasses.PartialAHU; @@ -43,57 +43,60 @@ model AHU "efficiency of HRS in the AHU modes when HRS is disabled"; inner Real phi_t(start=0.5); - inner Modelica.SIunits.Temp_K T_oda;//(start=288.15); - inner Modelica.SIunits.Temp_K T_1(start=290.15); - inner Modelica.SIunits.Temp_K T_5(start=293.15); - inner Modelica.SIunits.Temp_K T_sup(start=295.15); - inner Modelica.SIunits.Temp_K T_eta(start=296.15); - inner Modelica.SIunits.Temp_K T_6;//(start=296.15); - - inner Modelica.SIunits.MassFraction X_oda(start=0.007); - Modelica.SIunits.MassFraction X_odaSat(start=0.007); - Modelica.SIunits.MassFraction X_odaRaw(start=0.007); - inner Modelica.SIunits.MassFraction X_sup(start=0.008); - Modelica.SIunits.MassFraction X_supplyMin(start=0.006); - Modelica.SIunits.MassFraction X_supplyMax(start=0.010); - inner Modelica.SIunits.MassFraction X_supMin(start=0.006); - inner Modelica.SIunits.MassFraction X_supMax(start=0.010); - Modelica.SIunits.MassFraction X_extractAir(start=0.008); - Modelica.SIunits.MassFraction X_eta(start=0.008); + inner Modelica.Units.SI.Temperature T_oda; + //(start=288.15); + inner Modelica.Units.SI.Temperature T_1(start=290.15); + inner Modelica.Units.SI.Temperature T_5(start=293.15); + inner Modelica.Units.SI.Temperature T_sup(start=295.15); + inner Modelica.Units.SI.Temperature T_eta(start=296.15); + inner Modelica.Units.SI.Temperature T_6; + //(start=296.15); + + inner Modelica.Units.SI.MassFraction X_oda(start=0.007); + Modelica.Units.SI.MassFraction X_odaSat(start=0.007); + Modelica.Units.SI.MassFraction X_odaRaw(start=0.007); + inner Modelica.Units.SI.MassFraction X_sup(start=0.008); + Modelica.Units.SI.MassFraction X_supplyMin(start=0.006); + Modelica.Units.SI.MassFraction X_supplyMax(start=0.010); + inner Modelica.Units.SI.MassFraction X_supMin(start=0.006); + inner Modelica.Units.SI.MassFraction X_supMax(start=0.010); + Modelica.Units.SI.MassFraction X_extractAir(start=0.008); + Modelica.Units.SI.MassFraction X_eta(start=0.008); Real phi_sup(start=0.5); - inner Modelica.SIunits.HeatFlowRate Q_dot_C(start=1e-3); - inner Modelica.SIunits.HeatFlowRate Q_dot_H(start=1e-3); - Modelica.SIunits.Power P_el_sup(start=1e-3); - Modelica.SIunits.Power P_el_eta(start=1e-3); - inner Modelica.SIunits.VolumeFlowRate V_dot_sup(start=1e-3); - inner Modelica.SIunits.VolumeFlowRate V_dot_eta(start=1e-3); + inner Modelica.Units.SI.HeatFlowRate Q_dot_C(start=1e-3); + inner Modelica.Units.SI.HeatFlowRate Q_dot_H(start=1e-3); + Modelica.Units.SI.Power P_el_sup(start=1e-3); + Modelica.Units.SI.Power P_el_eta(start=1e-3); + inner Modelica.Units.SI.VolumeFlowRate V_dot_sup(start=1e-3); + inner Modelica.Units.SI.VolumeFlowRate V_dot_eta(start=1e-3); // Constants from formulas collection of Thermodynamik (institute: LTT) - constant Modelica.SIunits.SpecificHeatCapacityAtConstantPressure c_pL_iG=1E3; - constant Modelica.SIunits.SpecificHeatCapacityAtConstantPressure c_pW_iG=1.86E3; - constant Modelica.SIunits.SpecificEnthalpy r_0=2465E3 + constant Modelica.Units.SI.SpecificHeatCapacityAtConstantPressure c_pL_iG=1E3; + constant Modelica.Units.SI.SpecificHeatCapacityAtConstantPressure c_pW_iG= + 1.86E3; + constant Modelica.Units.SI.SpecificEnthalpy r_0=2465E3 "enthalpy of vaporization at temperature between T_dew(X_sup=0.008)=11 degC and T_sup = 22 degC"; - constant Modelica.SIunits.Density rho=1.2; - constant Modelica.SIunits.Pressure p_0=101325; - constant Modelica.SIunits.SpecificEnthalpy dhV=2501.3E3; - constant Modelica.SIunits.Temp_K T_0=273.15; + constant Modelica.Units.SI.Density rho=1.2; + constant Modelica.Units.SI.Pressure p_0=101325; + constant Modelica.Units.SI.SpecificEnthalpy dhV=2501.3E3; + constant Modelica.Units.SI.Temperature T_0=273.15; constant Real molarMassRatio=Modelica.Media.IdealGases.Common.SingleGasesData.H2O.MM /Modelica.Media.Air.SimpleAir.MM_const; // auxiliary variable - Modelica.SIunits.TemperatureDifference dTFan; - Modelica.SIunits.Temp_K TsupplyAirOut(start=295.15); + Modelica.Units.SI.TemperatureDifference dTFan; + Modelica.Units.SI.Temperature TsupplyAirOut(start=295.15); // Sampler (time-continous to time-discrete variables) - Modelica_Synchronous.RealSignals.Sampler.SampleVectorizedAndClocked sample(n=9) + Modelica.Clocked.RealSignals.Sampler.SampleVectorizedAndClocked sample(n=9) annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=-90, origin={-66,14}))); - Modelica_Synchronous.ClockSignals.Clocks.PeriodicRealClock periodicClock( + Modelica.Clocked.ClockSignals.Clocks.PeriodicRealClock periodicClock( solverMethod="ExplicitRungeKutta4", useSolver=true, period=clockPeriodGeneric) @@ -107,8 +110,8 @@ model AHU //Start State block StartState - outer output Modelica.SIunits.HeatFlowRate Q_dot_C; - outer output Modelica.SIunits.HeatFlowRate Q_dot_H; + outer output Modelica.Units.SI.HeatFlowRate Q_dot_C; + outer output Modelica.Units.SI.HeatFlowRate Q_dot_H; equation Q_dot_C = previous(Q_dot_C); @@ -138,30 +141,30 @@ model AHU // Dehumidification block DeHuHRS_true - outer output Modelica.SIunits.HeatFlowRate Q_dot_C; - outer output Modelica.SIunits.HeatFlowRate Q_dot_H; - outer input Modelica.SIunits.Temp_K T_oda; - outer input Modelica.SIunits.Temp_K T_1; - Modelica.SIunits.Temp_K T_2(start=290); - Modelica.SIunits.Temp_K T_3(start=282); - Modelica.SIunits.Temp_K T_4(start=282); - outer input Modelica.SIunits.Temp_K T_5; - outer input Modelica.SIunits.Temp_K T_6; - outer input Modelica.SIunits.MassFraction X_oda; - outer input Modelica.SIunits.MassFraction X_supMax; - outer output Modelica.SIunits.MassFraction X_sup; - outer input Modelica.SIunits.VolumeFlowRate V_dot_sup; + outer output Modelica.Units.SI.HeatFlowRate Q_dot_C; + outer output Modelica.Units.SI.HeatFlowRate Q_dot_H; + outer input Modelica.Units.SI.Temperature T_oda; + outer input Modelica.Units.SI.Temperature T_1; + Modelica.Units.SI.Temperature T_2(start=290); + Modelica.Units.SI.Temperature T_3(start=282); + Modelica.Units.SI.Temperature T_4(start=282); + outer input Modelica.Units.SI.Temperature T_5; + outer input Modelica.Units.SI.Temperature T_6; + outer input Modelica.Units.SI.MassFraction X_oda; + outer input Modelica.Units.SI.MassFraction X_supMax; + outer output Modelica.Units.SI.MassFraction X_sup; + outer input Modelica.Units.SI.VolumeFlowRate V_dot_sup; outer output Real phi_t; outer input Real phi_t_withHRS; outer parameter Real BPF_DeHu; - Modelica.SIunits.SpecificEnthalpy h_2(start=0.003) "h_in of cooler"; - Modelica.SIunits.SpecificEnthalpy h_surface(start=0.002) + Modelica.Units.SI.SpecificEnthalpy h_2(start=0.003) "h_in of cooler"; + Modelica.Units.SI.SpecificEnthalpy h_surface(start=0.002) "h_surface of cooler"; - Modelica.SIunits.SpecificEnthalpy h_CoilOut(start=0.001) "h_out of cooler"; - Modelica.SIunits.Pressure p_sat_surface(start=2300); - Modelica.SIunits.MassFraction X_surface(start=0.005); - Modelica.SIunits.Temp_K T_surface(start=280); - Modelica.SIunits.Temp_K T_CoilOut(start=278); + Modelica.Units.SI.SpecificEnthalpy h_CoilOut(start=0.001) "h_out of cooler"; + Modelica.Units.SI.Pressure p_sat_surface(start=2300); + Modelica.Units.SI.MassFraction X_surface(start=0.005); + Modelica.Units.SI.Temperature T_surface(start=280); + Modelica.Units.SI.Temperature T_CoilOut(start=278); equation phi_t = phi_t_withHRS "heat recovery system is enabled"; @@ -223,30 +226,30 @@ model AHU // block DeHuHRS_false - outer output Modelica.SIunits.HeatFlowRate Q_dot_C; - outer output Modelica.SIunits.HeatFlowRate Q_dot_H; - outer input Modelica.SIunits.Temp_K T_oda; - outer input Modelica.SIunits.Temp_K T_1; - Modelica.SIunits.Temp_K T_2(start=290); - Modelica.SIunits.Temp_K T_3(start=282); - Modelica.SIunits.Temp_K T_4(start=282); - outer input Modelica.SIunits.Temp_K T_5; - outer input Modelica.SIunits.Temp_K T_6; - outer input Modelica.SIunits.MassFraction X_oda; - outer input Modelica.SIunits.MassFraction X_supMax; - outer output Modelica.SIunits.MassFraction X_sup; - outer input Modelica.SIunits.VolumeFlowRate V_dot_sup; + outer output Modelica.Units.SI.HeatFlowRate Q_dot_C; + outer output Modelica.Units.SI.HeatFlowRate Q_dot_H; + outer input Modelica.Units.SI.Temperature T_oda; + outer input Modelica.Units.SI.Temperature T_1; + Modelica.Units.SI.Temperature T_2(start=290); + Modelica.Units.SI.Temperature T_3(start=282); + Modelica.Units.SI.Temperature T_4(start=282); + outer input Modelica.Units.SI.Temperature T_5; + outer input Modelica.Units.SI.Temperature T_6; + outer input Modelica.Units.SI.MassFraction X_oda; + outer input Modelica.Units.SI.MassFraction X_supMax; + outer output Modelica.Units.SI.MassFraction X_sup; + outer input Modelica.Units.SI.VolumeFlowRate V_dot_sup; outer output Real phi_t; outer input Real phi_t_withoutHRS; outer parameter Real BPF_DeHu; - Modelica.SIunits.SpecificEnthalpy h_2(start=0.003) "h_in of cooler"; - Modelica.SIunits.SpecificEnthalpy h_surface(start=0.002) + Modelica.Units.SI.SpecificEnthalpy h_2(start=0.003) "h_in of cooler"; + Modelica.Units.SI.SpecificEnthalpy h_surface(start=0.002) "h_surface of cooler"; - Modelica.SIunits.SpecificEnthalpy h_CoilOut(start=0.001) "h_out of cooler"; - Modelica.SIunits.Pressure p_sat_surface(start=2300); - Modelica.SIunits.MassFraction X_surface(start=0.005); - Modelica.SIunits.Temp_K T_surface(start=280); - Modelica.SIunits.Temp_K T_CoilOut(start=278); + Modelica.Units.SI.SpecificEnthalpy h_CoilOut(start=0.001) "h_out of cooler"; + Modelica.Units.SI.Pressure p_sat_surface(start=2300); + Modelica.Units.SI.MassFraction X_surface(start=0.005); + Modelica.Units.SI.Temperature T_surface(start=280); + Modelica.Units.SI.Temperature T_CoilOut(start=278); equation phi_t = phi_t_withoutHRS "heat recovery system is disabled"; @@ -309,16 +312,16 @@ model AHU // Humidification block HuPreHHRS_true - outer output Modelica.SIunits.HeatFlowRate Q_dot_C; - outer output Modelica.SIunits.HeatFlowRate Q_dot_H; - outer input Modelica.SIunits.Temp_K T_oda; - outer input Modelica.SIunits.Temp_K T_1; - outer input Modelica.SIunits.Temp_K T_5; - outer input Modelica.SIunits.Temp_K T_6; - outer input Modelica.SIunits.MassFraction X_oda; - outer input Modelica.SIunits.MassFraction X_supMin; - outer output Modelica.SIunits.MassFraction X_sup; - outer input Modelica.SIunits.VolumeFlowRate V_dot_sup; + outer output Modelica.Units.SI.HeatFlowRate Q_dot_C; + outer output Modelica.Units.SI.HeatFlowRate Q_dot_H; + outer input Modelica.Units.SI.Temperature T_oda; + outer input Modelica.Units.SI.Temperature T_1; + outer input Modelica.Units.SI.Temperature T_5; + outer input Modelica.Units.SI.Temperature T_6; + outer input Modelica.Units.SI.MassFraction X_oda; + outer input Modelica.Units.SI.MassFraction X_supMin; + outer output Modelica.Units.SI.MassFraction X_sup; + outer input Modelica.Units.SI.VolumeFlowRate V_dot_sup; outer output Real phi_t; outer input Real phi_t_withHRS; @@ -356,16 +359,16 @@ model AHU // block HuPreHHRS_false - outer output Modelica.SIunits.HeatFlowRate Q_dot_C; - outer output Modelica.SIunits.HeatFlowRate Q_dot_H; - outer input Modelica.SIunits.Temp_K T_oda; - outer input Modelica.SIunits.Temp_K T_1; - outer input Modelica.SIunits.Temp_K T_5; - outer input Modelica.SIunits.Temp_K T_6; - outer input Modelica.SIunits.MassFraction X_oda; - outer input Modelica.SIunits.MassFraction X_supMin; - outer output Modelica.SIunits.MassFraction X_sup; - outer input Modelica.SIunits.VolumeFlowRate V_dot_sup; + outer output Modelica.Units.SI.HeatFlowRate Q_dot_C; + outer output Modelica.Units.SI.HeatFlowRate Q_dot_H; + outer input Modelica.Units.SI.Temperature T_oda; + outer input Modelica.Units.SI.Temperature T_1; + outer input Modelica.Units.SI.Temperature T_5; + outer input Modelica.Units.SI.Temperature T_6; + outer input Modelica.Units.SI.MassFraction X_oda; + outer input Modelica.Units.SI.MassFraction X_supMin; + outer output Modelica.Units.SI.MassFraction X_sup; + outer input Modelica.Units.SI.VolumeFlowRate V_dot_sup; outer output Real phi_t; outer input Real phi_t_withoutHRS; @@ -403,19 +406,19 @@ model AHU // block HuCHRS_true - outer output Modelica.SIunits.HeatFlowRate Q_dot_C; - outer output Modelica.SIunits.HeatFlowRate Q_dot_H; - outer input Modelica.SIunits.Temp_K T_oda; - outer input Modelica.SIunits.Temp_K T_1; - Modelica.SIunits.Temp_K T_2; - Modelica.SIunits.Temp_K T_3; - Modelica.SIunits.Temp_K T_4; - outer input Modelica.SIunits.Temp_K T_5; - outer input Modelica.SIunits.Temp_K T_6; - outer input Modelica.SIunits.MassFraction X_oda; - outer input Modelica.SIunits.MassFraction X_supMin; - outer output Modelica.SIunits.MassFraction X_sup; - outer input Modelica.SIunits.VolumeFlowRate V_dot_sup; + outer output Modelica.Units.SI.HeatFlowRate Q_dot_C; + outer output Modelica.Units.SI.HeatFlowRate Q_dot_H; + outer input Modelica.Units.SI.Temperature T_oda; + outer input Modelica.Units.SI.Temperature T_1; + Modelica.Units.SI.Temperature T_2; + Modelica.Units.SI.Temperature T_3; + Modelica.Units.SI.Temperature T_4; + outer input Modelica.Units.SI.Temperature T_5; + outer input Modelica.Units.SI.Temperature T_6; + outer input Modelica.Units.SI.MassFraction X_oda; + outer input Modelica.Units.SI.MassFraction X_supMin; + outer output Modelica.Units.SI.MassFraction X_sup; + outer input Modelica.Units.SI.VolumeFlowRate V_dot_sup; outer output Real phi_t; outer input Real phi_t_withHRS; @@ -456,19 +459,19 @@ model AHU // block HuCHRS_false - outer output Modelica.SIunits.HeatFlowRate Q_dot_C; - outer output Modelica.SIunits.HeatFlowRate Q_dot_H; - outer input Modelica.SIunits.Temp_K T_oda; - outer input Modelica.SIunits.Temp_K T_1; - Modelica.SIunits.Temp_K T_2; - Modelica.SIunits.Temp_K T_3; - Modelica.SIunits.Temp_K T_4; - outer input Modelica.SIunits.Temp_K T_5; - outer input Modelica.SIunits.Temp_K T_6; - outer input Modelica.SIunits.MassFraction X_oda; - outer input Modelica.SIunits.MassFraction X_supMin; - outer output Modelica.SIunits.MassFraction X_sup; - outer input Modelica.SIunits.VolumeFlowRate V_dot_sup; + outer output Modelica.Units.SI.HeatFlowRate Q_dot_C; + outer output Modelica.Units.SI.HeatFlowRate Q_dot_H; + outer input Modelica.Units.SI.Temperature T_oda; + outer input Modelica.Units.SI.Temperature T_1; + Modelica.Units.SI.Temperature T_2; + Modelica.Units.SI.Temperature T_3; + Modelica.Units.SI.Temperature T_4; + outer input Modelica.Units.SI.Temperature T_5; + outer input Modelica.Units.SI.Temperature T_6; + outer input Modelica.Units.SI.MassFraction X_oda; + outer input Modelica.Units.SI.MassFraction X_supMin; + outer output Modelica.Units.SI.MassFraction X_sup; + outer input Modelica.Units.SI.VolumeFlowRate V_dot_sup; outer output Real phi_t; outer input Real phi_t_withoutHRS; @@ -509,18 +512,18 @@ model AHU // Only Heating block OnlyHeatingHRS_true - outer output Modelica.SIunits.HeatFlowRate Q_dot_C; - outer output Modelica.SIunits.HeatFlowRate Q_dot_H; - outer input Modelica.SIunits.Temp_K T_oda; - outer input Modelica.SIunits.Temp_K T_1; - Modelica.SIunits.Temp_K T_2; - Modelica.SIunits.Temp_K T_3; - Modelica.SIunits.Temp_K T_4; - outer input Modelica.SIunits.Temp_K T_5; - outer input Modelica.SIunits.Temp_K T_6; - outer input Modelica.SIunits.MassFraction X_oda; - outer output Modelica.SIunits.MassFraction X_sup; - outer input Modelica.SIunits.VolumeFlowRate V_dot_sup; + outer output Modelica.Units.SI.HeatFlowRate Q_dot_C; + outer output Modelica.Units.SI.HeatFlowRate Q_dot_H; + outer input Modelica.Units.SI.Temperature T_oda; + outer input Modelica.Units.SI.Temperature T_1; + Modelica.Units.SI.Temperature T_2; + Modelica.Units.SI.Temperature T_3; + Modelica.Units.SI.Temperature T_4; + outer input Modelica.Units.SI.Temperature T_5; + outer input Modelica.Units.SI.Temperature T_6; + outer input Modelica.Units.SI.MassFraction X_oda; + outer output Modelica.Units.SI.MassFraction X_sup; + outer input Modelica.Units.SI.VolumeFlowRate V_dot_sup; outer output Real phi_t; outer input Real phi_t_withHRS; @@ -559,18 +562,18 @@ model AHU // block OnlyHeatingHRS_false - outer output Modelica.SIunits.HeatFlowRate Q_dot_C; - outer output Modelica.SIunits.HeatFlowRate Q_dot_H; - outer input Modelica.SIunits.Temp_K T_oda; - outer input Modelica.SIunits.Temp_K T_1; - Modelica.SIunits.Temp_K T_2; - Modelica.SIunits.Temp_K T_3; - Modelica.SIunits.Temp_K T_4; - outer input Modelica.SIunits.Temp_K T_5; - outer input Modelica.SIunits.Temp_K T_6; - outer input Modelica.SIunits.MassFraction X_oda; - outer output Modelica.SIunits.MassFraction X_sup; - outer input Modelica.SIunits.VolumeFlowRate V_dot_sup; + outer output Modelica.Units.SI.HeatFlowRate Q_dot_C; + outer output Modelica.Units.SI.HeatFlowRate Q_dot_H; + outer input Modelica.Units.SI.Temperature T_oda; + outer input Modelica.Units.SI.Temperature T_1; + Modelica.Units.SI.Temperature T_2; + Modelica.Units.SI.Temperature T_3; + Modelica.Units.SI.Temperature T_4; + outer input Modelica.Units.SI.Temperature T_5; + outer input Modelica.Units.SI.Temperature T_6; + outer input Modelica.Units.SI.MassFraction X_oda; + outer output Modelica.Units.SI.MassFraction X_sup; + outer input Modelica.Units.SI.VolumeFlowRate V_dot_sup; outer output Real phi_t; outer input Real phi_t_withoutHRS; @@ -609,18 +612,18 @@ model AHU // Only Cooling block OnlyCoolingHRS_true - outer output Modelica.SIunits.HeatFlowRate Q_dot_C; - outer output Modelica.SIunits.HeatFlowRate Q_dot_H; - outer input Modelica.SIunits.Temp_K T_oda; - outer input Modelica.SIunits.Temp_K T_1; - Modelica.SIunits.Temp_K T_2; - Modelica.SIunits.Temp_K T_3; - Modelica.SIunits.Temp_K T_4; - outer input Modelica.SIunits.Temp_K T_5; - outer input Modelica.SIunits.Temp_K T_6; - outer input Modelica.SIunits.MassFraction X_oda; - outer output Modelica.SIunits.MassFraction X_sup; - outer input Modelica.SIunits.VolumeFlowRate V_dot_sup; + outer output Modelica.Units.SI.HeatFlowRate Q_dot_C; + outer output Modelica.Units.SI.HeatFlowRate Q_dot_H; + outer input Modelica.Units.SI.Temperature T_oda; + outer input Modelica.Units.SI.Temperature T_1; + Modelica.Units.SI.Temperature T_2; + Modelica.Units.SI.Temperature T_3; + Modelica.Units.SI.Temperature T_4; + outer input Modelica.Units.SI.Temperature T_5; + outer input Modelica.Units.SI.Temperature T_6; + outer input Modelica.Units.SI.MassFraction X_oda; + outer output Modelica.Units.SI.MassFraction X_sup; + outer input Modelica.Units.SI.VolumeFlowRate V_dot_sup; outer output Real phi_t; outer input Real phi_t_withHRS; @@ -659,18 +662,18 @@ model AHU // block OnlyCoolingHRS_false - outer output Modelica.SIunits.HeatFlowRate Q_dot_C; - outer output Modelica.SIunits.HeatFlowRate Q_dot_H; - outer input Modelica.SIunits.Temp_K T_oda; - outer input Modelica.SIunits.Temp_K T_1; - Modelica.SIunits.Temp_K T_2; - Modelica.SIunits.Temp_K T_3; - Modelica.SIunits.Temp_K T_4; - outer input Modelica.SIunits.Temp_K T_5; - outer input Modelica.SIunits.Temp_K T_6; - outer input Modelica.SIunits.MassFraction X_oda; - outer output Modelica.SIunits.MassFraction X_sup; - outer input Modelica.SIunits.VolumeFlowRate V_dot_sup; + outer output Modelica.Units.SI.HeatFlowRate Q_dot_C; + outer output Modelica.Units.SI.HeatFlowRate Q_dot_H; + outer input Modelica.Units.SI.Temperature T_oda; + outer input Modelica.Units.SI.Temperature T_1; + Modelica.Units.SI.Temperature T_2; + Modelica.Units.SI.Temperature T_3; + Modelica.Units.SI.Temperature T_4; + outer input Modelica.Units.SI.Temperature T_5; + outer input Modelica.Units.SI.Temperature T_6; + outer input Modelica.Units.SI.MassFraction X_oda; + outer output Modelica.Units.SI.MassFraction X_sup; + outer input Modelica.Units.SI.VolumeFlowRate V_dot_sup; outer output Real phi_t; outer input Real phi_t_withoutHRS; diff --git a/AixLib/Airflow/AirHandlingUnit/BaseClasses/PartialAHU.mo b/AixLib/Airflow/AirHandlingUnit/BaseClasses/PartialAHU.mo index c600f99342..6f1825a81f 100644 --- a/AixLib/Airflow/AirHandlingUnit/BaseClasses/PartialAHU.mo +++ b/AixLib/Airflow/AirHandlingUnit/BaseClasses/PartialAHU.mo @@ -47,16 +47,17 @@ partial model PartialAHU "Defines necessary parameters and connectors" (in case that a HRS is physically installed in the AHU)" annotation (Dialog(group="Settings AHU Value", enable=HRS)); // assumed increase in ventilator pressure - parameter Modelica.SIunits.Pressure dp_sup=800 + parameter Modelica.Units.SI.Pressure dp_sup=800 "pressure difference over supply fan" annotation (Dialog(tab="Fans", group="Constant Assumptions")); - parameter Modelica.SIunits.Pressure dp_eta=800 + parameter Modelica.Units.SI.Pressure dp_eta=800 "pressure difference over extract fan" annotation (Dialog(tab="Fans", group="Constant Assumptions")); // assumed efficiencies of the ventilators - parameter Modelica.SIunits.Efficiency eta_sup=0.7 "efficiency of supply fan" + parameter Modelica.Units.SI.Efficiency eta_sup=0.7 "efficiency of supply fan" annotation (Dialog(tab="Fans", group="Constant Assumptions")); - parameter Modelica.SIunits.Efficiency eta_eta=0.7 "efficiency of extract fan" + parameter Modelica.Units.SI.Efficiency eta_eta=0.7 + "efficiency of extract fan" annotation (Dialog(tab="Fans", group="Constant Assumptions")); Modelica.Blocks.Interfaces.RealInput Vflow_in(unit="m3/s") "m3/s" @@ -147,15 +148,15 @@ partial model PartialAHU "Defines necessary parameters and connectors" extent={{4,-4},{-4,4}}, rotation=180, origin={84,-4}))); - Modelica.Blocks.Interfaces.RealInput Vflow_in_extractAir(unit="m3/s") if - use_Vflow_in_extractAir "Volume flow of extract air" + Modelica.Blocks.Interfaces.RealInput Vflow_in_extractAir(unit="m3/s") +if use_Vflow_in_extractAir "Volume flow of extract air" annotation (Placement(transformation(extent={{114,80},{86,108}}), iconTransformation(extent={{88,32},{80,40}}))); protected Modelica.Blocks.Interfaces.RealInput Vflow_in_extractAir_internal(unit="m3/s") "Needed to connect to conditional connector"; equation dehumidification = if dehumidificationSet and heating and cooling then dehumidificationSet else false; - humidification = if dehumidificationSet and heating and cooling then humidificationSet else false; + humidification = if humidificationSet and heating and cooling then humidificationSet else false; connect(Vflow_in_extractAir, Vflow_in_extractAir_internal); diff --git a/AixLib/Airflow/AirHandlingUnit/Examples/AHU.mo b/AixLib/Airflow/AirHandlingUnit/Examples/AHU.mo index 7c121b53e0..2a6104d78b 100644 --- a/AixLib/Airflow/AirHandlingUnit/Examples/AHU.mo +++ b/AixLib/Airflow/AirHandlingUnit/Examples/AHU.mo @@ -3,9 +3,9 @@ model AHU "Example to test all states of the AHU model - Play with the possible modes (boolean parameters for: heating, cooling, de-/humidification" extends Modelica.Icons.Example; - Modelica.Blocks.Sources.Sine tempOutside( + Modelica.Blocks.Sources.Sine tempOutside( amplitude=10, - freqHz=1/86400, + f=1/86400, phase=-3.1415/2, offset=292) annotation (Placement(transformation(extent={{-100,-16},{-80,4}}))); @@ -24,7 +24,7 @@ model AHU annotation (Placement(transformation(extent={{98,-56},{78,-36}}))); Modelica.Blocks.Sources.Sine waterLoadOutside( - freqHz=1/86400, + f=1/86400, offset=0.008, amplitude=0.002, phase=-0.054829518451402) @@ -32,11 +32,10 @@ model AHU Modelica.Blocks.Sources.Constant phi_RoomExtractAir(k=0.6) annotation (Placement(transformation(extent={{98,-24},{78,-4}}))); Modelica.Blocks.Sources.Sine tempAddInRoom( - freqHz=1/86400, + f=1/86400, amplitude=2, phase=-3.1415/4, - offset=1.7) - annotation (Placement(transformation(extent={{98,20},{78,40}}))); + offset=1.7) annotation (Placement(transformation(extent={{98,20},{78,40}}))); Modelica.Blocks.Math.Add addToExtractTemp annotation (Placement(transformation(extent={{46,12},{34,24}}))); Modelica.Blocks.Interfaces.RealOutput QFlowCool( diff --git a/AixLib/Airflow/FacadeVentilationUnit/BaseClasses/SetPower.mo b/AixLib/Airflow/FacadeVentilationUnit/BaseClasses/SetPower.mo index 9a8fdf162f..cbe7d24553 100644 --- a/AixLib/Airflow/FacadeVentilationUnit/BaseClasses/SetPower.mo +++ b/AixLib/Airflow/FacadeVentilationUnit/BaseClasses/SetPower.mo @@ -5,20 +5,20 @@ model SetPower extends Modelica.Fluid.Interfaces.PartialTwoPort; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.05 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.05 "Nominal mass flow rate of fan"; parameter Medium.AbsolutePressure p_start=Medium.p_default "Start value of pressure"; parameter Integer noUnits=1 "Number of identical FVU units"; - parameter Modelica.SIunits.PressureDifference dp_nominal=500 + parameter Modelica.Units.SI.PressureDifference dp_nominal=500 "Initial pressure difference"; parameter Medium.Temperature T_start=Medium.T_default "Start value of temperature"; - Modelica.Blocks.Tables.CombiTable1D volumeFlow(table=[0,1; 0.1,25; 0.2,40; + Modelica.Blocks.Tables.CombiTable1Dv volumeFlow(table=[0,1; 0.1,25; 0.2,40; 0.3,60; 0.4,90; 0.5,100; 0.6,140; 0.7,175; 0.8,200; 0.9,225; 1,260]) - "Correlates the relative input signal and a volume flow rate" - annotation (Placement(transformation( + "Correlates the relative input signal and a volume flow rate" annotation ( + Placement(transformation( extent={{-10,-10},{10,10}}, rotation=90, origin={0,-56}))); diff --git a/AixLib/Airflow/FacadeVentilationUnit/DataBase/FVUBaseRecord.mo b/AixLib/Airflow/FacadeVentilationUnit/DataBase/FVUBaseRecord.mo index a83768b530..7bab9b917b 100644 --- a/AixLib/Airflow/FacadeVentilationUnit/DataBase/FVUBaseRecord.mo +++ b/AixLib/Airflow/FacadeVentilationUnit/DataBase/FVUBaseRecord.mo @@ -4,37 +4,35 @@ record FVUBaseRecord extends Modelica.Icons.Record; parameter Integer noUnits=1 "Number of identical FVUs"; - parameter Modelica.SIunits.ThermalConductance UA_heater=120 - "Thermal conductance of heater at nominal flow, used to compute heat + parameter Modelica.Units.SI.ThermalConductance UA_heater=120 "Thermal conductance of heater at nominal flow, used to compute heat capacity"; - parameter Modelica.SIunits.ThermalConductance UA_cooler=65 - "Thermal conductance of cooler at nominal flow, used to compute heat + parameter Modelica.Units.SI.ThermalConductance UA_cooler=65 "Thermal conductance of cooler at nominal flow, used to compute heat capacity"; - parameter Modelica.SIunits.MassFlowRate m1_flow_nominal_heater=0.1 + parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal_heater=0.1 "Nominal mass flow rate on water side of heater"; - parameter Modelica.SIunits.MassFlowRate m2_flow_nominal_heater=0.1 + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal_heater=0.1 "Nominal mass flow rate on air side of heater"; - parameter Modelica.SIunits.MassFlowRate m1_flow_nominal_cooler=0.1 + parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal_cooler=0.1 "Nominal mass flow rate on water side of cooler"; - parameter Modelica.SIunits.MassFlowRate m2_flow_nominal_cooler=0.05 + parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal_cooler=0.05 "Nominal mass flow rate on air side of cooler"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal_damper=0.1 + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal_damper=0.1 "Nominal mass flow rate of damper"; - parameter Modelica.SIunits.Pressure dp1_nominal_heater=1000 + parameter Modelica.Units.SI.Pressure dp1_nominal_heater=1000 "Nominal pressure loss on water side of heater"; - parameter Modelica.SIunits.Pressure dp2_nominal_heater=100 + parameter Modelica.Units.SI.Pressure dp2_nominal_heater=100 "Nominal pressure loss on air side of heater"; - parameter Modelica.SIunits.Pressure dp1_nominal_cooler=1000 + parameter Modelica.Units.SI.Pressure dp1_nominal_cooler=1000 "Nominal pressure loss on water side of cooler"; - parameter Modelica.SIunits.Pressure dp2_nominal_cooler=100 + parameter Modelica.Units.SI.Pressure dp2_nominal_cooler=100 "Nominal pressure loss on air side of cooler"; - parameter Modelica.SIunits.Pressure p_default=101300 + parameter Modelica.Units.SI.Pressure p_default=101300 "Default static pressure at outlet"; - parameter Modelica.SIunits.Pressure dp_nominal_damper=500 + parameter Modelica.Units.SI.Pressure dp_nominal_damper=500 "Nominal pressure loss in dampers"; - parameter Modelica.SIunits.Time damperRiseTimeLong = 90 "Rising time of the + parameter Modelica.Units.SI.Time damperRiseTimeLong=90 "Rising time of the slowly moving dampers"; - parameter Modelica.SIunits.Time damperRiseTimeShort = 20 "Rising time of the + parameter Modelica.Units.SI.Time damperRiseTimeShort=20 "Rising time of the slowly moving dampers"; annotation (Documentation(info="
diff --git a/AixLib/Airflow/FacadeVentilationUnit/Examples/FacadeVentilationUnit.mo b/AixLib/Airflow/FacadeVentilationUnit/Examples/FacadeVentilationUnit.mo index 50a1964d4d..0196528939 100644 --- a/AixLib/Airflow/FacadeVentilationUnit/Examples/FacadeVentilationUnit.mo +++ b/AixLib/Airflow/FacadeVentilationUnit/Examples/FacadeVentilationUnit.mo @@ -11,7 +11,8 @@ model FacadeVentilationUnit maxExFanPower=0.6) "Comprehensive rule-based controller for the facade ventilation unit" annotation (Placement(transformation(extent={{-46,-30},{-6,10}}))); - AixLib.Airflow.FacadeVentilationUnit.FacadeVentilationUnit FVU(redeclare package Air = + AixLib.Airflow.FacadeVentilationUnit.FacadeVentilationUnit FVU(redeclare + package Air = Medium1, redeclare package Water = Medium2) "The facade ventilation unit to be tested in this example" annotation (Placement(transformation(extent={{70,-56},{106,-36}}))); @@ -82,30 +83,29 @@ model FacadeVentilationUnit Modelica.Blocks.Sources.Constant coolingWaterTemperature(k=273.15 + 17) "Provides a test value of the cooling water temperatiure" annotation (Placement(transformation(extent={{84,74},{104,94}}))); - AixLib.Fluid.Sensors.TemperatureTwoPort supplyAirTemperature(redeclare package Medium = + AixLib.Fluid.Sensors.TemperatureTwoPort supplyAirTemperature(redeclare + package Medium = Medium1, m_flow_nominal=0.1) "Measures the supply air temperature" annotation (Placement(transformation(extent={{120,-54},{140,-34}}))); Modelica.Blocks.Sources.Sine roomTemperature( amplitude=5, - freqHz=1/86400, + f=1/86400, phase=3.1415926535898, - offset=273.15 + 20) - "Provides a test value of the room temperature" + offset=273.15 + 20) "Provides a test value of the room temperature" annotation (Placement(transformation(extent={{-100,40},{-80,60}}))); Modelica.Blocks.Sources.Sine roomSetTemperature( amplitude=5, - freqHz=1/86400, + f=1/86400, phase=1.5707963267949, - offset=273.15 + 20) - "Provides a test value of the room set temperature" + offset=273.15 + 20) "Provides a test value of the room set temperature" annotation (Placement(transformation(extent={{-100,-36},{-80,-16}}))); Modelica.Blocks.Sources.Constant co2Concentration(k=1000) "Provides a test value of the CO2 concnetration" annotation (Placement(transformation(extent={{-100,-80},{-80,-60}}))); Modelica.Blocks.Sources.Sine outdoorTemperature( amplitude=5, - freqHz=1/86400, + f=1/86400, offset=273.15 + 10) "Provides a test value of the outdoor temperature" annotation (Placement(transformation(extent={{-100,6},{-80,26}}))); AixLib.Controls.Interfaces.FVUControlBus fVUControlBus diff --git a/AixLib/Airflow/FacadeVentilationUnit/FacadeVentilationUnit.mo b/AixLib/Airflow/FacadeVentilationUnit/FacadeVentilationUnit.mo index ccb76a7114..9c17fbce7a 100644 --- a/AixLib/Airflow/FacadeVentilationUnit/FacadeVentilationUnit.mo +++ b/AixLib/Airflow/FacadeVentilationUnit/FacadeVentilationUnit.mo @@ -1,7 +1,6 @@ -within AixLib.Airflow.FacadeVentilationUnit; +within AixLib.Airflow.FacadeVentilationUnit; model FacadeVentilationUnit "Facade Ventilation Unit (FVU) equipped with a recuperator" - replaceable package Water = AixLib.Media.Water "Water Model in the system"; replaceable package Air = AixLib.Media.Air @@ -11,7 +10,7 @@ model FacadeVentilationUnit fVUParam=AixLib.Airflow.FacadeVentilationUnit.DataBase.FVUBaseRecord() "Record containing the characteristic parameters of the unit"; - parameter Modelica.SIunits.ThermodynamicTemperature T_start=273.15 + 20 + parameter Modelica.Units.SI.ThermodynamicTemperature T_start=273.15 + 20 "Initial temperature in unit"; AixLib.Airflow.FacadeVentilationUnit.BaseClasses.SetPower fanExhaustAir( @@ -68,13 +67,15 @@ model FacadeVentilationUnit m2_flow_nominal=fVUParam.m2_flow_nominal_cooler) "The heat exchanger used for cooling" annotation (Placement(transformation(extent={{182,22},{162,42}}))); - Modelica.Fluid.Interfaces.FluidPort_b heaterReturnConnector(redeclare package Medium = + Modelica.Fluid.Interfaces.FluidPort_b heaterReturnConnector(redeclare package + Medium = Water) "Connector to the heating water sink" annotation (Placement(transformation(extent={{82,90},{102,110}}))); Modelica.Fluid.Interfaces.FluidPort_a heaterFlowConnector(redeclare package Medium = Water) "Connector to the heating water source" annotation (Placement(transformation(extent={{112,90},{132,110}}))); - Modelica.Fluid.Interfaces.FluidPort_b coolerReturnConnector(redeclare package Medium = + Modelica.Fluid.Interfaces.FluidPort_b coolerReturnConnector(redeclare package + Medium = Water) "Connector to the cooling water source" annotation (Placement(transformation(extent={{152,90},{172,110}}))); Modelica.Fluid.Interfaces.FluidPort_a coolerFlowConnector(redeclare package Medium = diff --git a/AixLib/Airflow/Multizone/BaseClasses/Door.mo b/AixLib/Airflow/Multizone/BaseClasses/Door.mo index 0088e53a16..c8fa35d402 100644 --- a/AixLib/Airflow/Multizone/BaseClasses/Door.mo +++ b/AixLib/Airflow/Multizone/BaseClasses/Door.mo @@ -16,29 +16,31 @@ partial model Door annotation (choices( choice(redeclare package Medium = AixLib.Media.Air "Moist air"))); - parameter Modelica.SIunits.Length wOpe=0.9 "Width of opening" + parameter Modelica.Units.SI.Length wOpe=0.9 "Width of opening" annotation (Dialog(group="Geometry")); - parameter Modelica.SIunits.Length hOpe=2.1 "Height of opening" + parameter Modelica.Units.SI.Length hOpe=2.1 "Height of opening" annotation (Dialog(group="Geometry")); - parameter Modelica.SIunits.PressureDifference dp_turbulent( + parameter Modelica.Units.SI.PressureDifference dp_turbulent( min=0, displayUnit="Pa") = 0.01 "Pressure difference where laminar and turbulent flow relation coincide" - annotation(Dialog(tab="Advanced")); + annotation (Dialog(tab="Advanced")); - Modelica.SIunits.VolumeFlowRate VAB_flow(nominal=0.001) + Modelica.Units.SI.VolumeFlowRate VAB_flow(nominal=0.001) "Volume flow rate from A to B if positive"; - Modelica.SIunits.VolumeFlowRate VBA_flow(nominal=0.001) + Modelica.Units.SI.VolumeFlowRate VBA_flow(nominal=0.001) "Volume flow rate from B to A if positive"; - input Modelica.SIunits.Velocity vAB(nominal=0.01) "Average velocity from A to B"; - input Modelica.SIunits.Velocity vBA(nominal=0.01) "Average velocity from B to A"; + input Modelica.Units.SI.Velocity vAB(nominal=0.01) + "Average velocity from A to B"; + input Modelica.Units.SI.Velocity vBA(nominal=0.01) + "Average velocity from B to A"; protected - final parameter Modelica.SIunits.Area AOpe = wOpe*hOpe "Open aperture area"; + final parameter Modelica.Units.SI.Area AOpe=wOpe*hOpe "Open aperture area"; - constant Real conTP = AixLib.Media.Air.dStp*Modelica.Media.IdealGases.Common.SingleGasesData.Air.R + constant Real conTP = AixLib.Media.Air.dStp*Modelica.Media.IdealGases.Common.SingleGasesData.Air.R_s "Conversion factor for converting temperature difference to pressure difference"; parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX( @@ -46,12 +48,12 @@ protected p=Medium.p_default, X=Medium.X_default); - parameter Modelica.SIunits.Density rho_default=Medium.density(sta_default) + parameter Modelica.Units.SI.Density rho_default=Medium.density(sta_default) "Density"; - Modelica.SIunits.VolumeFlowRate VABp_flow(nominal=0.001) + Modelica.Units.SI.VolumeFlowRate VABp_flow(nominal=0.001) "Volume flow rate from A to B if positive due to static pressure difference"; - Modelica.SIunits.MassFlowRate mABt_flow(nominal=0.001) + Modelica.Units.SI.MassFlowRate mABt_flow(nominal=0.001) "Mass flow rate from A to B if positive due to buoyancy"; equation @@ -109,17 +111,18 @@ equation fillColor={0,0,0}, fillPattern=FillPattern.Solid)}), Documentation(info=" -
-This is a partial model for the bi-directional air flow through a door. -
-", ++ This is a partial model for the bi-directional air flow through a door. +
+ ", revisions=" -