diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..7bf9194d31 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,32 @@ +language: python +python: + - "2.7" + +cache: pip + +notifications: + email: false + +git: + depth: 10 + +services: + - docker + +env: + - TEST_ARG="make test-documentation" + + +# Install dependencies +# For sphinx, we need to install specific package versions, otherwise +# the html output may have small formatting differences which causes +# the test to fail +install: + - export PYTHONIOENCODING=UTF8 # just in case + - pip install --upgrade pip setuptools wheel + - pip install --only-binary=numpy,scipy,matplotlib numpy scipy matplotlib + - pip install git+https://github.com/lbl-srg/BuildingsPy@master + +# Execute tests +script: + - (cd AixLib/Resources/Scripts/travis && travis_wait 70 $TEST_ARG) diff --git a/AixLib/.copiedFiles.txt b/AixLib/.copiedFiles.txt index 160a1e7104..9db1d605d0 100644 --- a/AixLib/.copiedFiles.txt +++ b/AixLib/.copiedFiles.txt @@ -1,5 +1,5 @@ # Do not edit this file unless you know what you are doing. -# This file is used by the Annex60 merge script and generated by BuildingsPy. +# This file is used by the IBPSA merge script and generated by BuildingsPy. AixLib\Airflow\Multizone\BaseClasses\DoorDiscretized.mo AixLib\Airflow\Multizone\BaseClasses\ErrorControl.mo AixLib\Airflow\Multizone\BaseClasses\Examples\PowerLaw.mo @@ -180,6 +180,7 @@ 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 AixLib\Controls\Continuous\Validation\package.mo AixLib\Controls\Continuous\Validation\package.order AixLib\Controls\Continuous\package.mo @@ -223,6 +224,7 @@ AixLib\Fluid\Actuators\Dampers\Examples\package.mo AixLib\Fluid\Actuators\Dampers\Examples\package.order AixLib\Fluid\Actuators\Dampers\Exponential.mo AixLib\Fluid\Actuators\Dampers\MixingBox.mo +AixLib\Fluid\Actuators\Dampers\PressureIndependent.mo AixLib\Fluid\Actuators\Dampers\VAVBoxExponential.mo AixLib\Fluid\Actuators\Dampers\package.mo AixLib\Fluid\Actuators\Dampers\package.order @@ -242,7 +244,6 @@ AixLib\Fluid\Actuators\Valves\Examples\TwoWayValveTable.mo AixLib\Fluid\Actuators\Valves\Examples\TwoWayValves.mo AixLib\Fluid\Actuators\Valves\Examples\TwoWayValvesMotor.mo AixLib\Fluid\Actuators\Valves\Examples\TwoWayValvesTable.mo -AixLib\Fluid\Actuators\Valves\Examples\ValveParameterization.mo AixLib\Fluid\Actuators\Valves\Examples\package.mo AixLib\Fluid\Actuators\Valves\Examples\package.order AixLib\Fluid\Actuators\Valves\ThreeWayEqualPercentageLinear.mo @@ -252,6 +253,10 @@ AixLib\Fluid\Actuators\Valves\TwoWayLinear.mo AixLib\Fluid\Actuators\Valves\TwoWayPressureIndependent.mo AixLib\Fluid\Actuators\Valves\TwoWayQuickOpening.mo AixLib\Fluid\Actuators\Valves\TwoWayTable.mo +AixLib\Fluid\Actuators\Valves\Validation\ThreeWayValveParameterization.mo +AixLib\Fluid\Actuators\Valves\Validation\TwoWayValveParameterization.mo +AixLib\Fluid\Actuators\Valves\Validation\package.mo +AixLib\Fluid\Actuators\Valves\Validation\package.order AixLib\Fluid\Actuators\Valves\package.mo AixLib\Fluid\Actuators\Valves\package.order AixLib\Fluid\Actuators\package.mo @@ -289,6 +294,9 @@ AixLib\Fluid\Chillers\Examples\Carnot_TEva.mo AixLib\Fluid\Chillers\Examples\Carnot_y.mo AixLib\Fluid\Chillers\Examples\package.mo AixLib\Fluid\Chillers\Examples\package.order +AixLib\Fluid\Chillers\Validation\CarnotVerifyCOP.mo +AixLib\Fluid\Chillers\Validation\CarnotVerifyEtaCarnot.mo +AixLib\Fluid\Chillers\Validation\Carnot_TEva_2ndLaw.mo AixLib\Fluid\Chillers\Validation\Carnot_TEva_HighTemperature.mo AixLib\Fluid\Chillers\Validation\Carnot_TEva_LimitedCapacity.mo AixLib\Fluid\Chillers\Validation\Carnot_TEva_etaPL.mo @@ -304,6 +312,15 @@ AixLib\Fluid\Delays\Examples\package.mo AixLib\Fluid\Delays\Examples\package.order AixLib\Fluid\Delays\package.mo AixLib\Fluid\Delays\package.order +AixLib\Fluid\Examples\FlowSystem\Basic.mo +AixLib\Fluid\Examples\FlowSystem\Simplified1.mo +AixLib\Fluid\Examples\FlowSystem\Simplified2.mo +AixLib\Fluid\Examples\FlowSystem\Simplified3.mo +AixLib\Fluid\Examples\FlowSystem\Simplified4.mo +AixLib\Fluid\Examples\FlowSystem\Simplified5.mo +AixLib\Fluid\Examples\FlowSystem\Simplified6.mo +AixLib\Fluid\Examples\FlowSystem\package.mo +AixLib\Fluid\Examples\FlowSystem\package.order AixLib\Fluid\Examples\Performance\BaseClasses\Example1.mo AixLib\Fluid\Examples\Performance\BaseClasses\package.mo AixLib\Fluid\Examples\Performance\BaseClasses\package.order @@ -316,6 +333,20 @@ AixLib\Fluid\Examples\Performance\Example5.mo AixLib\Fluid\Examples\Performance\Example6.mo AixLib\Fluid\Examples\Performance\Example7.mo AixLib\Fluid\Examples\Performance\Example8.mo +AixLib\Fluid\Examples\Performance\PressureDrop\ParallelDp.mo +AixLib\Fluid\Examples\Performance\PressureDrop\ParallelDpOptimised.mo +AixLib\Fluid\Examples\Performance\PressureDrop\ParallelFlow.mo +AixLib\Fluid\Examples\Performance\PressureDrop\ParallelFlowOptimised.mo +AixLib\Fluid\Examples\Performance\PressureDrop\SeriesDp.mo +AixLib\Fluid\Examples\Performance\PressureDrop\SeriesDpOptimised.mo +AixLib\Fluid\Examples\Performance\PressureDrop\SeriesFlow.mo +AixLib\Fluid\Examples\Performance\PressureDrop\SeriesFlowOptimised.mo +AixLib\Fluid\Examples\Performance\PressureDrop\SeriesParallelDp.mo +AixLib\Fluid\Examples\Performance\PressureDrop\SeriesParallelDpOptimised.mo +AixLib\Fluid\Examples\Performance\PressureDrop\SeriesParallelFlow.mo +AixLib\Fluid\Examples\Performance\PressureDrop\SeriesParallelFlowOptimised.mo +AixLib\Fluid\Examples\Performance\PressureDrop\package.mo +AixLib\Fluid\Examples\Performance\PressureDrop\package.order AixLib\Fluid\Examples\Performance\package.mo AixLib\Fluid\Examples\Performance\package.order AixLib\Fluid\Examples\ResistanceVolumeFlowReversal.mo @@ -352,8 +383,8 @@ AixLib\Fluid\FMI\ExportContainers\Examples\FMUs\Fan.mo AixLib\Fluid\FMI\ExportContainers\Examples\FMUs\FlowSplitter_u.mo AixLib\Fluid\FMI\ExportContainers\Examples\FMUs\HVACZone.mo AixLib\Fluid\FMI\ExportContainers\Examples\FMUs\HVACZones.mo -AixLib\Fluid\FMI\ExportContainers\Examples\FMUs\HeaterCooler_T.mo AixLib\Fluid\FMI\ExportContainers\Examples\FMUs\HeaterCooler_u.mo +AixLib\Fluid\FMI\ExportContainers\Examples\FMUs\Heater_T.mo AixLib\Fluid\FMI\ExportContainers\Examples\FMUs\Humidifier_u.mo AixLib\Fluid\FMI\ExportContainers\Examples\FMUs\IdealSource_m_flow.mo AixLib\Fluid\FMI\ExportContainers\Examples\FMUs\MixingVolume.mo @@ -464,6 +495,7 @@ AixLib\Fluid\HeatExchangers\ActiveBeams\Validation\package.order AixLib\Fluid\HeatExchangers\ActiveBeams\package.mo AixLib\Fluid\HeatExchangers\ActiveBeams\package.order AixLib\Fluid\HeatExchangers\BaseClasses\PartialEffectiveness.mo +AixLib\Fluid\HeatExchangers\BaseClasses\PartialPrescribedOutlet.mo AixLib\Fluid\HeatExchangers\BaseClasses\package.mo AixLib\Fluid\HeatExchangers\BaseClasses\package.order AixLib\Fluid\HeatExchangers\ConstantEffectiveness.mo @@ -472,22 +504,25 @@ AixLib\Fluid\HeatExchangers\Examples\AirHeater_u.mo AixLib\Fluid\HeatExchangers\Examples\BaseClasses\Heater.mo AixLib\Fluid\HeatExchangers\Examples\BaseClasses\package.mo AixLib\Fluid\HeatExchangers\Examples\BaseClasses\package.order +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\package.mo AixLib\Fluid\HeatExchangers\Examples\package.order -AixLib\Fluid\HeatExchangers\HeaterCooler_T.mo AixLib\Fluid\HeatExchangers\HeaterCooler_u.mo +AixLib\Fluid\HeatExchangers\Heater_T.mo +AixLib\Fluid\HeatExchangers\PrescribedOutlet.mo AixLib\Fluid\HeatExchangers\Radiators\Examples\RadiatorEN442_2.mo AixLib\Fluid\HeatExchangers\Radiators\Examples\package.mo AixLib\Fluid\HeatExchangers\Radiators\Examples\package.order AixLib\Fluid\HeatExchangers\Radiators\RadiatorEN442_2.mo AixLib\Fluid\HeatExchangers\Radiators\package.mo AixLib\Fluid\HeatExchangers\Radiators\package.order +AixLib\Fluid\HeatExchangers\SensibleCooler_T.mo AixLib\Fluid\HeatExchangers\Validation\ConstantEffectiveness.mo -AixLib\Fluid\HeatExchangers\Validation\HeaterCooler_T.mo -AixLib\Fluid\HeatExchangers\Validation\HeaterCooler_T_dynamic.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\package.mo AixLib\Fluid\HeatExchangers\Validation\package.order AixLib\Fluid\HeatExchangers\package.mo @@ -508,11 +543,32 @@ AixLib\Fluid\HeatPumps\Validation\package.mo AixLib\Fluid\HeatPumps\Validation\package.order AixLib\Fluid\HeatPumps\package.mo AixLib\Fluid\HeatPumps\package.order +AixLib\Fluid\Humidifiers\Examples\Humidifier_u.mo +AixLib\Fluid\Humidifiers\Examples\package.mo +AixLib\Fluid\Humidifiers\Examples\package.order +AixLib\Fluid\Humidifiers\Humidifier_u.mo +AixLib\Fluid\Humidifiers\SprayAirWasher_X.mo +AixLib\Fluid\Humidifiers\SteamHumidifier_X.mo +AixLib\Fluid\Humidifiers\Validation\SprayAirWasher_X.mo +AixLib\Fluid\Humidifiers\Validation\SprayAirWasher_X_dynamic.mo +AixLib\Fluid\Humidifiers\Validation\SteamHumidifier_X.mo +AixLib\Fluid\Humidifiers\Validation\SteamHumidifier_X_dynamic.mo +AixLib\Fluid\Humidifiers\Validation\package.mo +AixLib\Fluid\Humidifiers\Validation\package.order +AixLib\Fluid\Humidifiers\package.mo +AixLib\Fluid\Humidifiers\package.order AixLib\Fluid\Interfaces\ConservationEquation.mo +AixLib\Fluid\Interfaces\Examples\BaseClasses\PrescribedOutletState.mo +AixLib\Fluid\Interfaces\Examples\BaseClasses\package.mo +AixLib\Fluid\Interfaces\Examples\BaseClasses\package.order AixLib\Fluid\Interfaces\Examples\ConservationEquation.mo +AixLib\Fluid\Interfaces\Examples\FourPortHeatMassExchanger.mo AixLib\Fluid\Interfaces\Examples\HeaterCooler_u.mo AixLib\Fluid\Interfaces\Examples\Humidifier_u.mo -AixLib\Fluid\Interfaces\Examples\PrescribedOutletState.mo +AixLib\Fluid\Interfaces\Examples\PrescribedOutlet.mo +AixLib\Fluid\Interfaces\Examples\PrescribedOutlet_TSetOnly.mo +AixLib\Fluid\Interfaces\Examples\PrescribedOutlet_Water.mo +AixLib\Fluid\Interfaces\Examples\PrescribedOutlet_X_wSetOnly.mo AixLib\Fluid\Interfaces\Examples\ReverseFlowHumidifier.mo AixLib\Fluid\Interfaces\Examples\ReverseFlowMassExchanger.mo AixLib\Fluid\Interfaces\Examples\StaticTwoPortConservationEquation.mo @@ -526,8 +582,7 @@ AixLib\Fluid\Interfaces\PartialFourPortInterface.mo AixLib\Fluid\Interfaces\PartialTwoPort.mo AixLib\Fluid\Interfaces\PartialTwoPortInterface.mo AixLib\Fluid\Interfaces\PartialTwoPortTransport.mo -AixLib\Fluid\Interfaces\PrescribedOutletState.mo -AixLib\Fluid\Interfaces\PrescribedOutletStateParameters.mo +AixLib\Fluid\Interfaces\PrescribedOutlet.mo AixLib\Fluid\Interfaces\StaticFourPortHeatMassExchanger.mo AixLib\Fluid\Interfaces\StaticTwoPortConservationEquation.mo AixLib\Fluid\Interfaces\StaticTwoPortHeatMassExchanger.mo @@ -537,10 +592,8 @@ AixLib\Fluid\Interfaces\package.mo AixLib\Fluid\Interfaces\package.order AixLib\Fluid\MassExchangers\ConstantEffectiveness.mo AixLib\Fluid\MassExchangers\Examples\ConstantEffectiveness.mo -AixLib\Fluid\MassExchangers\Examples\Humidifier_u.mo AixLib\Fluid\MassExchangers\Examples\package.mo AixLib\Fluid\MassExchangers\Examples\package.order -AixLib\Fluid\MassExchangers\Humidifier_u.mo AixLib\Fluid\MassExchangers\package.mo AixLib\Fluid\MassExchangers\package.order AixLib\Fluid\MixingVolumes\BaseClasses\PartialMixingVolume.mo @@ -645,6 +698,7 @@ AixLib\Fluid\Movers\Validation\BaseClasses\package.order AixLib\Fluid\Movers\Validation\ControlledFlowMachine.mo AixLib\Fluid\Movers\Validation\ControlledFlowMachineDynamic.mo AixLib\Fluid\Movers\Validation\FlowControlled_dp.mo +AixLib\Fluid\Movers\Validation\FlowControlled_dpSystem.mo AixLib\Fluid\Movers\Validation\FlowControlled_m_flow.mo AixLib\Fluid\Movers\Validation\PowerExact.mo AixLib\Fluid\Movers\Validation\PowerSimplified.mo @@ -673,8 +727,10 @@ AixLib\Fluid\Sensors\Conversions\package.order AixLib\Fluid\Sensors\Density.mo AixLib\Fluid\Sensors\DensityTwoPort.mo AixLib\Fluid\Sensors\EnthalpyFlowRate.mo +AixLib\Fluid\Sensors\EntropyFlowRate.mo AixLib\Fluid\Sensors\Examples\Density.mo AixLib\Fluid\Sensors\Examples\EnthalpyFlowRate.mo +AixLib\Fluid\Sensors\Examples\EntropyFlowRate.mo AixLib\Fluid\Sensors\Examples\MassFraction.mo AixLib\Fluid\Sensors\Examples\MoistAirEnthalpyFlowRate.mo AixLib\Fluid\Sensors\Examples\PPM.mo @@ -720,6 +776,7 @@ AixLib\Fluid\Sources\BaseClasses\package.mo AixLib\Fluid\Sources\BaseClasses\package.order 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_CpLowRise.mo AixLib\Fluid\Sources\Examples\TraceSubstancesFlowSource.mo @@ -727,6 +784,7 @@ AixLib\Fluid\Sources\Examples\package.mo AixLib\Fluid\Sources\Examples\package.order AixLib\Fluid\Sources\FixedBoundary.mo 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_CpLowRise.mo @@ -811,7 +869,6 @@ 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\Discrete\Examples\BooleanDelay.png AixLib\Resources\Images\Controls\SetPoints\Examples\HotWaterTemperatureReset.png AixLib\Resources\Images\Controls\SetPoints\Examples\OccupancySchedule.png AixLib\Resources\Images\Controls\SetPoints\Table.png @@ -845,6 +902,8 @@ AixLib\Resources\Images\Fluid\Sensors\onePortHex.png AixLib\Resources\Images\Fluid\Sensors\onePortHex.tiff AixLib\Resources\Images\Fluid\Sensors\twoPortHex.png AixLib\Resources\Images\Fluid\Sensors\twoPortHex.tiff +AixLib\Resources\Images\IBPSA-logo-text.png +AixLib\Resources\Images\IBPSA-logo.png AixLib\Resources\Images\Media\Water\plotCp.pdf AixLib\Resources\Images\Media\Water\plotCp.png AixLib\Resources\Images\Media\Water\plotCp.py @@ -875,20 +934,34 @@ 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\Images\iea-ebc-logo-text.png -AixLib\Resources\Images\iea-ebc-logo.pdf -AixLib\Resources\Images\iea-ebc-logo.png AixLib\Resources\ReferenceResults\Dymola\AixLib_BoundaryConditions_WeatherData_BaseClasses_Examples_CheckBlackBodySkyTemperature.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_BoundaryConditions_WeatherData_Validation_ReaderTMY3HDirNor.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Controls_Continuous_Examples_LimPIDWithReset.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Controls_Continuous_Validation_LimPIDReset.txt +AixLib\Resources\ReferenceResults\Dymola\AixLib_Controls_Continuous_Validation_OffTimerNonZeroStart.txt +AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Actuators_Valves_Validation_ThreeWayValveParameterization.txt +AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Actuators_Valves_Validation_TwoWayValveParameterization.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Chillers_Examples_Carnot_TEva.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Chillers_Examples_Carnot_y.txt +AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Chillers_Validation_CarnotVerifyCOP.txt +AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Chillers_Validation_CarnotVerifyEtaCarnot.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Chillers_Validation_Carnot_TEva_HighTemperature.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Chillers_Validation_Carnot_TEva_LimitedCapacity.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Chillers_Validation_Carnot_TEva_etaPL.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Chillers_Validation_Carnot_TEva_reverseFlow.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Chillers_Validation_Carnot_y_etaPL.txt +AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Examples_Performance_PressureDrop_ParallelDp.txt +AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Examples_Performance_PressureDrop_ParallelDpOptimised.txt +AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Examples_Performance_PressureDrop_ParallelFlow.txt +AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Examples_Performance_PressureDrop_ParallelFlowOptimised.txt +AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Examples_Performance_PressureDrop_SeriesDp.txt +AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Examples_Performance_PressureDrop_SeriesDpOptimised.txt +AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Examples_Performance_PressureDrop_SeriesFlow.txt +AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Examples_Performance_PressureDrop_SeriesFlowOptimised.txt +AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Examples_Performance_PressureDrop_SeriesParallelDp.txt +AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Examples_Performance_PressureDrop_SeriesParallelDpOptimised.txt +AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Examples_Performance_PressureDrop_SeriesParallelFlow.txt +AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Examples_Performance_PressureDrop_SeriesParallelFlowOptimised.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_FMI_Adaptors_Examples_ThermalZoneHVACNoExhaust.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_FMI_Adaptors_Examples_ThermalZoneHVACWithExhaust.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_FMI_Conversion_Validation_AirToOutlet.txt @@ -901,8 +974,8 @@ AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_FMI_ExportContainers_Examp AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_FMI_ExportContainers_Examples_FMUs_FlowSplitter_u.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_FMI_ExportContainers_Examples_FMUs_HVACZone.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_FMI_ExportContainers_Examples_FMUs_HVACZones.txt -AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_FMI_ExportContainers_Examples_FMUs_HeaterCooler_T.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_FMI_ExportContainers_Examples_FMUs_HeaterCooler_u.txt +AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_FMI_ExportContainers_Examples_FMUs_Heater_T.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_FMI_ExportContainers_Examples_FMUs_Humidifier_u.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_FMI_ExportContainers_Examples_FMUs_IdealSource_m_flow.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_FMI_ExportContainers_Examples_FMUs_MixingVolume.txt @@ -947,8 +1020,11 @@ AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_HeatExchangers_ActiveBeams AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_HeatExchangers_ActiveBeams_Validation_NumberOfBeamsDynamics.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_HeatExchangers_Examples_AirHeater_T.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_HeatExchangers_Examples_AirHeater_u.txt +AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_HeatExchangers_Examples_WaterCooler_T.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_HeatExchangers_Examples_WaterHeater_T.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_HeatExchangers_Examples_WaterHeater_u.txt +AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_HeatExchangers_Validation_PrescribedOutlet.txt +AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_HeatExchangers_Validation_PrescribedOutlet_dynamic.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_HeatPumps_Examples_Carnot_TCon.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_HeatPumps_Examples_Carnot_y.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_HeatPumps_Validation_Carnot_TCon_LimitedCapacity.txt @@ -957,6 +1033,15 @@ AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_HeatPumps_Validation_Carno AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_HeatPumps_Validation_Carnot_TCon_reverseFlow.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_HeatPumps_Validation_Carnot_y_etaCar.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_HeatPumps_Validation_Carnot_y_etaPL.txt +AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Humidifiers_Examples_Humidifier_u.txt +AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Humidifiers_Validation_SprayAirWasher_X.txt +AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Humidifiers_Validation_SprayAirWasher_X_dynamic.txt +AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Humidifiers_Validation_SteamHumidifier_X.txt +AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Humidifiers_Validation_SteamHumidifier_X_dynamic.txt +AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Interfaces_Examples_PrescribedOutlet.txt +AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Interfaces_Examples_PrescribedOutlet_TSetOnly.txt +AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Interfaces_Examples_PrescribedOutlet_Water.txt +AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Interfaces_Examples_PrescribedOutlet_X_wSetOnly.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_MixingVolumes_Validation_MixingVolume.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_MixingVolumes_Validation_MixingVolumeHeatReverseFlow.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_MixingVolumes_Validation_MixingVolumeHeatReverseFlowPrescribedHeatFlowRate.txt @@ -979,10 +1064,12 @@ AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Movers_BaseClasses_Validat AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Movers_Examples_MoverContinuous.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Movers_Examples_MoverParameter.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Movers_Examples_MoverStages.txt +AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Movers_Validation_FlowControlled_dpSystem.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Movers_Validation_PowerExact.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Movers_Validation_PowerSimplified.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Movers_Validation_PumpCurveDerivatives.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Sensors_Examples_PPM.txt +AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Sources_Examples_MassFlowSource_WeatherData.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Sources_Examples_Outside.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Fluid_Sources_Examples_Outside_CpLowRise.txt AixLib\Resources\ReferenceResults\Dymola\AixLib_Media_Specialized_Water_Examples_WaterProperties_pT.txt @@ -1054,6 +1141,7 @@ 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 AixLib\Resources\Scripts\Dymola\Controls\Discrete\Examples\BooleanDelay.mos AixLib\Resources\Scripts\Dymola\Controls\SetPoints\Examples\HotWaterTemperatureReset.mos AixLib\Resources\Scripts\Dymola\Controls\SetPoints\Examples\OccupancySchedule.mos @@ -1069,7 +1157,8 @@ AixLib\Resources\Scripts\Dymola\Fluid\Actuators\Valves\Examples\TwoWayValveTable AixLib\Resources\Scripts\Dymola\Fluid\Actuators\Valves\Examples\TwoWayValves.mos AixLib\Resources\Scripts\Dymola\Fluid\Actuators\Valves\Examples\TwoWayValvesMotor.mos AixLib\Resources\Scripts\Dymola\Fluid\Actuators\Valves\Examples\TwoWayValvesTable.mos -AixLib\Resources\Scripts\Dymola\Fluid\Actuators\Valves\Examples\ValveParameterization.mos +AixLib\Resources\Scripts\Dymola\Fluid\Actuators\Valves\Validation\ThreeWayValveParameterization.mos +AixLib\Resources\Scripts\Dymola\Fluid\Actuators\Valves\Validation\TwoWayValveParameterization.mos AixLib\Resources\Scripts\Dymola\Fluid\BaseClasses\FlowModels\Validation\BasicFlowFunction_dp_DerivativeCheck.mos AixLib\Resources\Scripts\Dymola\Fluid\BaseClasses\FlowModels\Validation\BasicFlowFunction_dp_DerivativeCheck2.mos AixLib\Resources\Scripts\Dymola\Fluid\BaseClasses\FlowModels\Validation\BasicFlowFunction_m_flow_DerivativeCheck.mos @@ -1079,12 +1168,22 @@ AixLib\Resources\Scripts\Dymola\Fluid\BaseClasses\FlowModels\Validation\Invertin AixLib\Resources\Scripts\Dymola\Fluid\BaseClasses\FlowModels\Validation\InvertingBasicFlowFunction_m_flow.mos AixLib\Resources\Scripts\Dymola\Fluid\Chillers\Examples\Carnot_TEva.mos AixLib\Resources\Scripts\Dymola\Fluid\Chillers\Examples\Carnot_y.mos +AixLib\Resources\Scripts\Dymola\Fluid\Chillers\Validation\CarnotVerifyCOP.mos +AixLib\Resources\Scripts\Dymola\Fluid\Chillers\Validation\CarnotVerifyEtaCarnot.mos +AixLib\Resources\Scripts\Dymola\Fluid\Chillers\Validation\Carnot_TEva_2ndLaw.mos AixLib\Resources\Scripts\Dymola\Fluid\Chillers\Validation\Carnot_TEva_HighTemperature.mos AixLib\Resources\Scripts\Dymola\Fluid\Chillers\Validation\Carnot_TEva_LimitedCapacity.mos AixLib\Resources\Scripts\Dymola\Fluid\Chillers\Validation\Carnot_TEva_etaPL.mos AixLib\Resources\Scripts\Dymola\Fluid\Chillers\Validation\Carnot_TEva_reverseFlow.mos AixLib\Resources\Scripts\Dymola\Fluid\Chillers\Validation\Carnot_y_etaPL.mos AixLib\Resources\Scripts\Dymola\Fluid\Delays\Examples\Delay.mos +AixLib\Resources\Scripts\Dymola\Fluid\Examples\FlowSystem\Basic.mos +AixLib\Resources\Scripts\Dymola\Fluid\Examples\FlowSystem\Simplified1.mos +AixLib\Resources\Scripts\Dymola\Fluid\Examples\FlowSystem\Simplified2.mos +AixLib\Resources\Scripts\Dymola\Fluid\Examples\FlowSystem\Simplified3.mos +AixLib\Resources\Scripts\Dymola\Fluid\Examples\FlowSystem\Simplified4.mos +AixLib\Resources\Scripts\Dymola\Fluid\Examples\FlowSystem\Simplified5.mos +AixLib\Resources\Scripts\Dymola\Fluid\Examples\FlowSystem\Simplified6.mos AixLib\Resources\Scripts\Dymola\Fluid\Examples\Performance\Example1v1.mos AixLib\Resources\Scripts\Dymola\Fluid\Examples\Performance\Example1v2.mos AixLib\Resources\Scripts\Dymola\Fluid\Examples\Performance\Example2.mos @@ -1094,6 +1193,18 @@ AixLib\Resources\Scripts\Dymola\Fluid\Examples\Performance\Example5.mos AixLib\Resources\Scripts\Dymola\Fluid\Examples\Performance\Example6.mos AixLib\Resources\Scripts\Dymola\Fluid\Examples\Performance\Example7.mos AixLib\Resources\Scripts\Dymola\Fluid\Examples\Performance\Example8.mos +AixLib\Resources\Scripts\Dymola\Fluid\Examples\Performance\PressureDrop\ParallelDp.mos +AixLib\Resources\Scripts\Dymola\Fluid\Examples\Performance\PressureDrop\ParallelDpOptimised.mos +AixLib\Resources\Scripts\Dymola\Fluid\Examples\Performance\PressureDrop\ParallelFlow.mos +AixLib\Resources\Scripts\Dymola\Fluid\Examples\Performance\PressureDrop\ParallelFlowOptimised.mos +AixLib\Resources\Scripts\Dymola\Fluid\Examples\Performance\PressureDrop\SeriesDp.mos +AixLib\Resources\Scripts\Dymola\Fluid\Examples\Performance\PressureDrop\SeriesDpOptimised.mos +AixLib\Resources\Scripts\Dymola\Fluid\Examples\Performance\PressureDrop\SeriesFlow.mos +AixLib\Resources\Scripts\Dymola\Fluid\Examples\Performance\PressureDrop\SeriesFlowOptimised.mos +AixLib\Resources\Scripts\Dymola\Fluid\Examples\Performance\PressureDrop\SeriesParallelDp.mos +AixLib\Resources\Scripts\Dymola\Fluid\Examples\Performance\PressureDrop\SeriesParallelDpOptimised.mos +AixLib\Resources\Scripts\Dymola\Fluid\Examples\Performance\PressureDrop\SeriesParallelFlow.mos +AixLib\Resources\Scripts\Dymola\Fluid\Examples\Performance\PressureDrop\SeriesParallelFlowOptimised.mos AixLib\Resources\Scripts\Dymola\Fluid\Examples\ResistanceVolumeFlowReversal.mos AixLib\Resources\Scripts\Dymola\Fluid\Examples\SimpleHouse.mos AixLib\Resources\Scripts\Dymola\Fluid\FMI\Adaptors\Examples\ThermalZoneHVACNoExhaust.mos @@ -1108,8 +1219,8 @@ AixLib\Resources\Scripts\Dymola\Fluid\FMI\ExportContainers\Examples\FMUs\Fan.mos AixLib\Resources\Scripts\Dymola\Fluid\FMI\ExportContainers\Examples\FMUs\FlowSplitter_u.mos AixLib\Resources\Scripts\Dymola\Fluid\FMI\ExportContainers\Examples\FMUs\HVACZone.mos AixLib\Resources\Scripts\Dymola\Fluid\FMI\ExportContainers\Examples\FMUs\HVACZones.mos -AixLib\Resources\Scripts\Dymola\Fluid\FMI\ExportContainers\Examples\FMUs\HeaterCooler_T.mos AixLib\Resources\Scripts\Dymola\Fluid\FMI\ExportContainers\Examples\FMUs\HeaterCooler_u.mos +AixLib\Resources\Scripts\Dymola\Fluid\FMI\ExportContainers\Examples\FMUs\Heater_T.mos AixLib\Resources\Scripts\Dymola\Fluid\FMI\ExportContainers\Examples\FMUs\Humidifier_u.mos AixLib\Resources\Scripts\Dymola\Fluid\FMI\ExportContainers\Examples\FMUs\IdealSource_m_flow.mos AixLib\Resources\Scripts\Dymola\Fluid\FMI\ExportContainers\Examples\FMUs\MixingVolume.mos @@ -1154,13 +1265,14 @@ AixLib\Resources\Scripts\Dymola\Fluid\HeatExchangers\ActiveBeams\Validation\Numb AixLib\Resources\Scripts\Dymola\Fluid\HeatExchangers\ActiveBeams\Validation\NumberOfBeamsDynamics.mos AixLib\Resources\Scripts\Dymola\Fluid\HeatExchangers\Examples\AirHeater_T.mos AixLib\Resources\Scripts\Dymola\Fluid\HeatExchangers\Examples\AirHeater_u.mos +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\Radiators\Examples\RadiatorEN442_2.mos AixLib\Resources\Scripts\Dymola\Fluid\HeatExchangers\Validation\ConstantEffectiveness.mos -AixLib\Resources\Scripts\Dymola\Fluid\HeatExchangers\Validation\HeaterCooler_T.mos -AixLib\Resources\Scripts\Dymola\Fluid\HeatExchangers\Validation\HeaterCooler_T_dynamic.mos 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\HeatPumps\Examples\Carnot_TCon.mos AixLib\Resources\Scripts\Dymola\Fluid\HeatPumps\Examples\Carnot_y.mos AixLib\Resources\Scripts\Dymola\Fluid\HeatPumps\Validation\Carnot_TCon_LimitedCapacity.mos @@ -1169,15 +1281,23 @@ AixLib\Resources\Scripts\Dymola\Fluid\HeatPumps\Validation\Carnot_TCon_etaPL.mos AixLib\Resources\Scripts\Dymola\Fluid\HeatPumps\Validation\Carnot_TCon_reverseFlow.mos AixLib\Resources\Scripts\Dymola\Fluid\HeatPumps\Validation\Carnot_y_etaCar.mos AixLib\Resources\Scripts\Dymola\Fluid\HeatPumps\Validation\Carnot_y_etaPL.mos +AixLib\Resources\Scripts\Dymola\Fluid\Humidifiers\Examples\Humidifier_u.mos +AixLib\Resources\Scripts\Dymola\Fluid\Humidifiers\Validation\SprayAirWasher_X.mos +AixLib\Resources\Scripts\Dymola\Fluid\Humidifiers\Validation\SprayAirWasher_X_dynamic.mos +AixLib\Resources\Scripts\Dymola\Fluid\Humidifiers\Validation\SteamHumidifier_X.mos +AixLib\Resources\Scripts\Dymola\Fluid\Humidifiers\Validation\SteamHumidifier_X_dynamic.mos AixLib\Resources\Scripts\Dymola\Fluid\Interfaces\Examples\ConservationEquation.mos +AixLib\Resources\Scripts\Dymola\Fluid\Interfaces\Examples\FourPortHeatMassExchanger.mos AixLib\Resources\Scripts\Dymola\Fluid\Interfaces\Examples\HeaterCooler_u.mos AixLib\Resources\Scripts\Dymola\Fluid\Interfaces\Examples\Humidifier_u.mos -AixLib\Resources\Scripts\Dymola\Fluid\Interfaces\Examples\PrescribedOutletState.mos +AixLib\Resources\Scripts\Dymola\Fluid\Interfaces\Examples\PrescribedOutlet.mos +AixLib\Resources\Scripts\Dymola\Fluid\Interfaces\Examples\PrescribedOutlet_TSetOnly.mos +AixLib\Resources\Scripts\Dymola\Fluid\Interfaces\Examples\PrescribedOutlet_Water.mos +AixLib\Resources\Scripts\Dymola\Fluid\Interfaces\Examples\PrescribedOutlet_X_wSetOnly.mos AixLib\Resources\Scripts\Dymola\Fluid\Interfaces\Examples\ReverseFlowHumidifier.mos AixLib\Resources\Scripts\Dymola\Fluid\Interfaces\Examples\ReverseFlowMassExchanger.mos AixLib\Resources\Scripts\Dymola\Fluid\Interfaces\Examples\StaticTwoPortConservationEquation.mos AixLib\Resources\Scripts\Dymola\Fluid\MassExchangers\Examples\ConstantEffectiveness.mos -AixLib\Resources\Scripts\Dymola\Fluid\MassExchangers\Examples\Humidifier_u.mos AixLib\Resources\Scripts\Dymola\Fluid\MixingVolumes\Examples\MixingVolumeHeatConduction.mos AixLib\Resources\Scripts\Dymola\Fluid\MixingVolumes\Examples\MixingVolumeMoistAir.mos AixLib\Resources\Scripts\Dymola\Fluid\MixingVolumes\Examples\MixingVolumePrescribedHeatFlowRate.mos @@ -1211,6 +1331,7 @@ AixLib\Resources\Scripts\Dymola\Fluid\Movers\Examples\SpeedControlled_y_pumpCurv AixLib\Resources\Scripts\Dymola\Fluid\Movers\Validation\ControlledFlowMachine.mos AixLib\Resources\Scripts\Dymola\Fluid\Movers\Validation\ControlledFlowMachineDynamic.mos AixLib\Resources\Scripts\Dymola\Fluid\Movers\Validation\FlowControlled_dp.mos +AixLib\Resources\Scripts\Dymola\Fluid\Movers\Validation\FlowControlled_dpSystem.mos AixLib\Resources\Scripts\Dymola\Fluid\Movers\Validation\FlowControlled_m_flow.mos AixLib\Resources\Scripts\Dymola\Fluid\Movers\Validation\PowerExact.mos AixLib\Resources\Scripts\Dymola\Fluid\Movers\Validation\PowerSimplified.mos @@ -1224,6 +1345,7 @@ AixLib\Resources\Scripts\Dymola\Fluid\Movers\Validation\SpeedControlled_y_linear AixLib\Resources\Scripts\Dymola\Fluid\Sensors\Conversions\Examples\To_VolumeFraction.mos AixLib\Resources\Scripts\Dymola\Fluid\Sensors\Examples\Density.mos AixLib\Resources\Scripts\Dymola\Fluid\Sensors\Examples\EnthalpyFlowRate.mos +AixLib\Resources\Scripts\Dymola\Fluid\Sensors\Examples\EntropyFlowRate.mos AixLib\Resources\Scripts\Dymola\Fluid\Sensors\Examples\MassFraction.mos AixLib\Resources\Scripts\Dymola\Fluid\Sensors\Examples\MoistAirEnthalpyFlowRate.mos AixLib\Resources\Scripts\Dymola\Fluid\Sensors\Examples\PPM.mos @@ -1236,6 +1358,7 @@ AixLib\Resources\Scripts\Dymola\Fluid\Sensors\Examples\TemperatureWetBulb.mos AixLib\Resources\Scripts\Dymola\Fluid\Sensors\Examples\TraceSubstances.mos 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_CpLowRise.mos AixLib\Resources\Scripts\Dymola\Fluid\Sources\Examples\TraceSubstancesFlowSource.mos @@ -1272,6 +1395,7 @@ AixLib\Resources\Scripts\Dymola\ThermalZones\ReducedOrder\Validation\VDI6007\Tes AixLib\Resources\Scripts\Dymola\ThermalZones\ReducedOrder\Validation\VDI6007\TestCase7.mos AixLib\Resources\Scripts\Dymola\ThermalZones\ReducedOrder\Validation\VDI6007\TestCase8.mos AixLib\Resources\Scripts\Dymola\ThermalZones\ReducedOrder\Validation\VDI6007\TestCase9.mos +AixLib\Resources\Scripts\Dymola\Utilities\Diagnostics\Validation\CheckEquality.mos AixLib\Resources\Scripts\Dymola\Utilities\Math\Examples\Average.mos AixLib\Resources\Scripts\Dymola\Utilities\Math\Examples\Bicubic.mos AixLib\Resources\Scripts\Dymola\Utilities\Math\Examples\Biquadratic.mos @@ -1297,6 +1421,7 @@ AixLib\Resources\Scripts\Dymola\Utilities\Math\Functions\Examples\InverseXRegula AixLib\Resources\Scripts\Dymola\Utilities\Math\Functions\Examples\IsMonotonic.mos AixLib\Resources\Scripts\Dymola\Utilities\Math\Functions\Examples\Polynomial.mos AixLib\Resources\Scripts\Dymola\Utilities\Math\Functions\Examples\PowerLinearized.mos +AixLib\Resources\Scripts\Dymola\Utilities\Math\Functions\Examples\QuinticHermite.mos AixLib\Resources\Scripts\Dymola\Utilities\Math\Functions\Examples\RegNonZeroPower.mos AixLib\Resources\Scripts\Dymola\Utilities\Math\Functions\Examples\RegNonZeroPowerDerivativeCheck.mos AixLib\Resources\Scripts\Dymola\Utilities\Math\Functions\Examples\RegNonZeroPowerDerivative_2_Check.mos @@ -1333,6 +1458,8 @@ AixLib\Resources\Scripts\Dymola\Utilities\Time\Examples\ModelTime.mos 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\travis\usr\local\bin\dymola AixLib\Resources\bin\ConvertWeatherData.jar AixLib\Resources\src\convertEPW\Makefile AixLib\Resources\src\convertEPW\doc\ConvertWeatherData.html @@ -1357,6 +1484,7 @@ 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 AixLib\Resources\weatherdata\USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos +AixLib\Resources\www\navigation.png AixLib\ThermalZones\ReducedOrder\EquivalentAirTemperature\BaseClasses\PartialVDI6007.mo AixLib\ThermalZones\ReducedOrder\EquivalentAirTemperature\BaseClasses\package.mo AixLib\ThermalZones\ReducedOrder\EquivalentAirTemperature\BaseClasses\package.order @@ -1388,7 +1516,7 @@ AixLib\ThermalZones\ReducedOrder\SolarGain\BaseClasses\package.order AixLib\ThermalZones\ReducedOrder\SolarGain\CorrectionGDoublePane.mo AixLib\ThermalZones\ReducedOrder\SolarGain\package.mo AixLib\ThermalZones\ReducedOrder\SolarGain\package.order -AixLib\ThermalZones\ReducedOrder\Validation\VDI6007\BaseClasses\AssertEqualityThreePeriods.mo +AixLib\ThermalZones\ReducedOrder\Validation\VDI6007\BaseClasses\VerifyDifferenceThreePeriods.mo AixLib\ThermalZones\ReducedOrder\Validation\VDI6007\BaseClasses\package.mo AixLib\ThermalZones\ReducedOrder\Validation\VDI6007\BaseClasses\package.order AixLib\ThermalZones\ReducedOrder\Validation\VDI6007\TestCase1.mo @@ -1422,6 +1550,10 @@ AixLib\Utilities\Diagnostics\AssertInequality.mo AixLib\Utilities\Diagnostics\BaseClasses\PartialInputCheck.mo AixLib\Utilities\Diagnostics\BaseClasses\package.mo AixLib\Utilities\Diagnostics\BaseClasses\package.order +AixLib\Utilities\Diagnostics\CheckEquality.mo +AixLib\Utilities\Diagnostics\Validation\CheckEquality.mo +AixLib\Utilities\Diagnostics\Validation\package.mo +AixLib\Utilities\Diagnostics\Validation\package.order AixLib\Utilities\Diagnostics\package.mo AixLib\Utilities\Diagnostics\package.order AixLib\Utilities\Math\Average.mo @@ -1464,6 +1596,7 @@ AixLib\Utilities\Math\Functions\Examples\InverseXRegularized.mo AixLib\Utilities\Math\Functions\Examples\IsMonotonic.mo AixLib\Utilities\Math\Functions\Examples\Polynomial.mo AixLib\Utilities\Math\Functions\Examples\PowerLinearized.mo +AixLib\Utilities\Math\Functions\Examples\QuinticHermite.mo AixLib\Utilities\Math\Functions\Examples\RegNonZeroPower.mo AixLib\Utilities\Math\Functions\Examples\RegNonZeroPowerDerivativeCheck.mo AixLib\Utilities\Math\Functions\Examples\RegNonZeroPowerDerivative_2_Check.mo @@ -1487,6 +1620,7 @@ AixLib\Utilities\Math\Functions\package.order AixLib\Utilities\Math\Functions\polynomial.mo AixLib\Utilities\Math\Functions\powerLinearized.mo AixLib\Utilities\Math\Functions\quadraticLinear.mo +AixLib\Utilities\Math\Functions\quinticHermite.mo AixLib\Utilities\Math\Functions\regNonZeroPower.mo AixLib\Utilities\Math\Functions\regStep.mo AixLib\Utilities\Math\Functions\smoothExponential.mo diff --git a/AixLib/Airflow/AirHandlingUnit/AHU.mo b/AixLib/Airflow/AirHandlingUnit/AHU.mo index 51641685a5..9014949a45 100644 --- a/AixLib/Airflow/AirHandlingUnit/AHU.mo +++ b/AixLib/Airflow/AirHandlingUnit/AHU.mo @@ -87,7 +87,7 @@ model AHU // Sampler (time-continous to time-discrete variables) - Modelica_Synchronous.RealSignals.Sampler.SampleVectorizedAndClocked sample(n=8) + Modelica_Synchronous.RealSignals.Sampler.SampleVectorizedAndClocked sample(n=9) annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=-90, @@ -747,6 +747,7 @@ equation X_supMax = sample.y[6]; X_eta = sample.y[7]; V_dot_sup = sample.y[8]; + V_dot_eta = sample.y[9]; // absolute humidity for state of saturated outdoor air X_odaSat = molarMassRatio*(611.2*exp(17.62*(T_oda - T_0)/(243.12 + T_oda - @@ -847,9 +848,6 @@ equation Modelica.Media.Air.MoistAir.saturationPressure(T_extractAir))/(p_0 - phi_extractAir*Modelica.Media.Air.MoistAir.saturationPressure(T_extractAir)); - // equation for outgoing volume flow - V_dot_sup = V_dot_eta "no leckage between supply and extract air"; - // calculation of T_5 and T_6 regarding the electrical power consumption P_el_sup = V_dot_sup*dp_sup/eta_sup "Calculation of electrical power consumption"; @@ -872,8 +870,17 @@ equation stateToOnlyHeatingHRS_false or stateToOnlyCoolingHRS_true or stateToOnlyCoolingHRS_false then true else false; - Vflow_out = hold(V_dot_eta); - Pel = if Vflow_out > 0 then hold(P_el_eta) + hold(P_el_sup) else 0; + Vflow_out = hold(V_dot_sup); + if Vflow_out > 0 and hold(V_dot_eta) <= 0 then + Pel = hold(P_el_sup); + elseif Vflow_out <= 0 and hold(V_dot_eta) > 0 then + Pel = hold(P_el_eta); + elseif Vflow_out > 0 and hold(V_dot_eta) > 0 then + Pel = hold(P_el_eta) + hold(P_el_sup); + else + Pel = 0; + end if; + QflowH = if hold(Q_dot_H) > 0 then hold(Q_dot_H) else 0; QflowC = if hold(Q_dot_C) > 0 then hold(Q_dot_C) else 0; @@ -1270,23 +1277,25 @@ equation //stateToHuCHRS_false==false, connect(T_outdoorAir, sample.u[1]) annotation (Line(points={{-100,56},{-100, - 56},{-67.75,56},{-67.75,26}}, + 56},{-67.7778,56},{-67.7778,26}}, color={0,0,127})); connect(X_outdoorAir, sample.u[2]) annotation (Line(points={{-100,36},{-100, - 36},{-67.25,36},{-67.25,26}}, + 36},{-67.3333,36},{-67.3333,26}}, color={0,0,127})); - connect(T_supplyAir, sample.u[3]) annotation (Line(points={{100,42},{100,42}, - {-66.75,42},{-66.75,26}}, + connect(T_supplyAir, sample.u[3]) annotation (Line(points={{100,36},{100,42}, + {-66.8889,42},{-66.8889,26}}, color={0,0,127})); - connect(T_extractAir, sample.u[4]) annotation (Line(points={{100,90},{-60,90}, - {-60,60},{-66.25,60},{-66.25,26}}, + connect(T_extractAir, sample.u[4]) annotation (Line(points={{100,78},{-60,78}, + {-60,60},{-66.4444,60},{-66.4444,26}}, color={0,0,127})); - connect(Vflow_in, sample.u[8]) annotation (Line(points={{-100,82},{-64.25,82}, - {-64.25,26}},color={0,0,127})); - connect(hold_phi_sup.y, phi_supply) annotation (Line(points={{79,9},{99,9},{ - 99,9}}, color={0,0,127})); + connect(Vflow_in, sample.u[8]) annotation (Line(points={{-100,82},{-64.6667, + 82},{-64.6667,26}}, + color={0,0,127})); + connect(Vflow_in_extractAir_internal, sample.u[9]); + connect(hold_phi_sup.y, phi_supply) annotation (Line(points={{79,9},{99,9},{99, + 5}}, color={0,0,127})); connect(TsupAirOut.y, T_supplyAirOut) annotation (Line(points={{79,57},{99,57}, - {99,57}}, color={0,0,127})); + {99,49}}, color={0,0,127})); public block StateExtra @@ -1344,24 +1353,24 @@ equation graphics={ Bitmap( extent={{36,-42},{100,4}}, fileName= - "modelica://AixLib/Images/AHU/HumidifierCooling.jpg"), + "modelica://AixLib/Resources/Images/Airflow/AirHandlingUnit/HumidifierCooling.jpg"), Bitmap( extent={{-100,-90},{-36,-44}}, fileName= - "modelica://AixLib/Images/AHU/Dehumidifier.jpg"), + "modelica://AixLib/Resources/Images/Airflow/AirHandlingUnit/Dehumidifier.jpg"), Bitmap( extent={{-32,-42},{32,4}}, fileName= - "modelica://AixLib/Images/AHU/HumidifierHeating.jpg"), + "modelica://AixLib/Resources/Images/Airflow/AirHandlingUnit/HumidifierHeating.jpg"), Bitmap( extent={{-32,-90},{32,-44}}, fileName= - "modelica://AixLib/Images/AHU/Heating.jpg"), + "modelica://AixLib/Resources/Images/Airflow/AirHandlingUnit/Heating.jpg"), Bitmap( extent={{36,-90},{100,-44}}, fileName= - "modelica://AixLib/Images/AHU/Cooling.jpg")}), + "modelica://AixLib/Resources/Images/Airflow/AirHandlingUnit/Cooling.jpg")}), experiment(StopTime=13398, Interval=5), Icon(coordinateSystem(extent={{-100,-40},{100,40}}, preserveAspectRatio=false), graphics={Bitmap( extent={{-100,-28},{100,28}}, fileName= - "modelica://AixLib/Resources/Images/AHU/AHUaccToDINV18599-3.jpg"), + "modelica://AixLib/Resources/Images/Airflow/AirHandlingUnit/AHUaccToDINV18599-3.jpg"), Rectangle( extent={{68,24},{98,-18}}, fillColor={255,255,255}, @@ -1374,9 +1383,6 @@ equation

It is based on incoming and outgoing enthalpy flows of moist air (thermodynamic principle).

The model aims to need little computational effort. Therefore state machines represent the basis of the model and no Modelica Fluid is used.

If simulation runs instable, reduce clockPeriodGeneric and/or use one of the alternative equations for the calculation of p_sat_surface in both dehumidification state machines (see source code of these state machines).

-

Level of Development

-

\"stars:

-

4 stars because the model was validated with an AHU test bench at E.ON ERC EBC, RWTH Aachen University. Additionally, simulations of a city district were made and compared to measurement data. Examples and descriptions are recorded in [1].

Assumptions

For further explanation for each parameter see noted sources and [1]! Please note that the assumptions are made regarding AHUs which are implemented in laboratories.


Figure 1 [5, appendix D]

-

\"schema


References

"), - experiment(StopTime=86400), + experiment(Tolerance=1e-6, StopTime=86400), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/BaseClasses/Examples/IncidenceAngle.mos" "Simulate and plot")); end IncidenceAngle; diff --git a/AixLib/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo b/AixLib/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo index a880b1246d..6470394846 100644 --- a/AixLib/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo +++ b/AixLib/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo @@ -77,7 +77,7 @@ First implementation. "), -experiment(StopTime=864000), +experiment(Tolerance=1e-6, StopTime=864000), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mos" "Simulate and plot")); end SolarAzimuth; diff --git a/AixLib/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarHourAngle.mo b/AixLib/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarHourAngle.mo index 556000b749..41e4de3718 100644 --- a/AixLib/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarHourAngle.mo +++ b/AixLib/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarHourAngle.mo @@ -27,7 +27,7 @@ equation string="%first", index=-1, extent={{-6,3},{-6,3}})); - annotation (experiment(StopTime=86400), + annotation (experiment(Tolerance=1e-6, StopTime=86400), Documentation(info="

This example computes the solar hour angle, diff --git a/AixLib/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo b/AixLib/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo index 14e4f0761c..721d8cc6df 100644 --- a/AixLib/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo +++ b/AixLib/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo @@ -44,7 +44,7 @@ equation string="%first", index=-1, extent={{-6,3},{-6,3}})); - annotation (experiment(StopTime=86400), + annotation (experiment(Tolerance=1e-6, StopTime=86400), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mos" "Simulate and plot"), Documentation(info=" diff --git a/AixLib/BoundaryConditions/SolarGeometry/BaseClasses/Examples/ZenithAngle.mo b/AixLib/BoundaryConditions/SolarGeometry/BaseClasses/Examples/ZenithAngle.mo index b769ab76fa..b2b9f31209 100644 --- a/AixLib/BoundaryConditions/SolarGeometry/BaseClasses/Examples/ZenithAngle.mo +++ b/AixLib/BoundaryConditions/SolarGeometry/BaseClasses/Examples/ZenithAngle.mo @@ -59,7 +59,7 @@ First implementation. "), -experiment(StartTime=100000, StopTime=300000), +experiment(StartTime=100000, Tolerance=1e-6, StopTime=300000), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/BaseClasses/Examples/ZenithAngle.mos" "Simulate and plot")); end ZenithAngle; diff --git a/AixLib/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo b/AixLib/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo index b2f4d474f3..36bb022345 100644 --- a/AixLib/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo +++ b/AixLib/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo @@ -31,7 +31,7 @@ Input are the solar hour angle and the declination angle. January 5, 2015, by Michael Wetter:
Updated comment of the input connector as this is used in the weather bus connector. This is for -issue 376. +issue 376.

  • Dec 7, 2010, by Michael Wetter:
    diff --git a/AixLib/BoundaryConditions/SolarGeometry/Examples/IncidenceAngle.mo b/AixLib/BoundaryConditions/SolarGeometry/Examples/IncidenceAngle.mo index c18367aa62..50f00ec9f9 100644 --- a/AixLib/BoundaryConditions/SolarGeometry/Examples/IncidenceAngle.mo +++ b/AixLib/BoundaryConditions/SolarGeometry/Examples/IncidenceAngle.mo @@ -76,7 +76,7 @@ First implementation.
    • "), -experiment(StopTime=86400), +experiment(Tolerance=1e-6, StopTime=86400), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/Examples/IncidenceAngle.mos" "Simulate and plot")); end IncidenceAngle; diff --git a/AixLib/BoundaryConditions/SolarGeometry/Examples/ZenithAngle.mo b/AixLib/BoundaryConditions/SolarGeometry/Examples/ZenithAngle.mo index 35ccd70abb..17baead2db 100644 --- a/AixLib/BoundaryConditions/SolarGeometry/Examples/ZenithAngle.mo +++ b/AixLib/BoundaryConditions/SolarGeometry/Examples/ZenithAngle.mo @@ -31,7 +31,7 @@ First implementation. "), - experiment(StartTime=100000, StopTime=300000), + experiment(StartTime=100000, Tolerance=1e-6, StopTime=300000), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/Examples/ZenithAngle.mos" "Simulate and plot")); end ZenithAngle; diff --git a/AixLib/BoundaryConditions/SolarIrradiation/BaseClasses/BrighteningCoefficient.mo b/AixLib/BoundaryConditions/SolarIrradiation/BaseClasses/BrighteningCoefficient.mo index c91252e58f..b2d4d4ff8b 100644 --- a/AixLib/BoundaryConditions/SolarIrradiation/BaseClasses/BrighteningCoefficient.mo +++ b/AixLib/BoundaryConditions/SolarIrradiation/BaseClasses/BrighteningCoefficient.mo @@ -122,7 +122,7 @@ This component computes the circumsolar and horizon brightening coefficients. March 15, 2016, by Michael Wetter:
    Replaced spliceFunction with regStep. This is for -issue 300. +issue 300.
  • May 25, 2010, by Wangda Zuo:
    diff --git a/AixLib/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/BrighteningCoefficient.mo b/AixLib/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/BrighteningCoefficient.mo index 978e37360a..39e078794e 100644 --- a/AixLib/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/BrighteningCoefficient.mo +++ b/AixLib/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/BrighteningCoefficient.mo @@ -86,6 +86,6 @@ First implementation.
    • "), -experiment(StopTime=8640000), +experiment(Tolerance=1e-6, StopTime=8640000), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/BrighteningCoefficient.mos" "run")); end BrighteningCoefficient; diff --git a/AixLib/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/DiffuseIsotropic.mo b/AixLib/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/DiffuseIsotropic.mo index e05f884028..4d97669a36 100644 --- a/AixLib/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/DiffuseIsotropic.mo +++ b/AixLib/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/DiffuseIsotropic.mo @@ -45,7 +45,7 @@ First implementation. "), - experiment(StopTime=8640000), + experiment(Tolerance=1e-6, StartTime=0, StopTime=8640000), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/DiffuseIsotropic.mos" "Simulate and plot")); end DiffuseIsotropic; diff --git a/AixLib/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/RelativeAirMass.mo b/AixLib/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/RelativeAirMass.mo index 0bddb1cb1a..30aa8f9067 100644 --- a/AixLib/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/RelativeAirMass.mo +++ b/AixLib/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/RelativeAirMass.mo @@ -30,7 +30,7 @@ First implementation. "), - experiment(StopTime=864000), + experiment(Tolerance=1e-6, StopTime=864000), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/RelativeAirMass.mos" "Simulate and plot")); end RelativeAirMass; diff --git a/AixLib/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/SkyBrightness.mo b/AixLib/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/SkyBrightness.mo index 8fa6bda7aa..27cd6dea64 100644 --- a/AixLib/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/SkyBrightness.mo +++ b/AixLib/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/SkyBrightness.mo @@ -59,7 +59,7 @@ First implementation. "), -experiment(StopTime=8640000), +experiment(Tolerance=1e-6, StopTime=8640000), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/SkyBrightness.mos" "Simulate and plot")); end SkyBrightness; diff --git a/AixLib/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/SkyClearness.mo b/AixLib/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/SkyClearness.mo index 85b23c5e8c..9ff6a50eb3 100644 --- a/AixLib/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/SkyClearness.mo +++ b/AixLib/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/SkyClearness.mo @@ -61,7 +61,7 @@ First implementation. "), -experiment(StartTime=100000, StopTime=3000000), +experiment(StartTime=100000, Tolerance=1e-6, StopTime=3000000), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/SkyClearness.mos" "Simulate and plot")); end SkyClearness; diff --git a/AixLib/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo b/AixLib/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo index 373121605a..a213a0a081 100644 --- a/AixLib/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo +++ b/AixLib/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo @@ -70,7 +70,7 @@ September 23, 2016, by Michael Wetter:
    Changed deltaX from 0.1 to 0.01, and also optimized the code.
    This is for -issue 521. +issue 521.
  • May 5, 2015, by Michael Wetter:
    diff --git a/AixLib/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo b/AixLib/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo index 1eef332578..52ec0810a5 100644 --- a/AixLib/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo +++ b/AixLib/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo @@ -63,8 +63,8 @@ For a definition of the parameters, see the April 21, 2016, by Michael Wetter:
    Removed duplicate instance weaBus. This is for - -https://github.com/iea-annex60/modelica-annex60/issues/461. + +https://github.com/ibpsa/modelica-ibpsa/issues/461.
  • December 12, 2010, by Michael Wetter:
    diff --git a/AixLib/BoundaryConditions/SolarIrradiation/Examples/DiffuseIsotropic.mo b/AixLib/BoundaryConditions/SolarIrradiation/Examples/DiffuseIsotropic.mo index a4d1b114eb..21571a5398 100644 --- a/AixLib/BoundaryConditions/SolarIrradiation/Examples/DiffuseIsotropic.mo +++ b/AixLib/BoundaryConditions/SolarIrradiation/Examples/DiffuseIsotropic.mo @@ -71,7 +71,7 @@ First implementation.
    • "), -experiment(StartTime=1.82304e+07, StopTime=1.83168e+07), +experiment(StartTime=1.82304e+07, Tolerance=1e-6, StopTime=1.83168e+07), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/Examples/DiffuseIsotropic.mos" "Simulate and plot")); end DiffuseIsotropic; diff --git a/AixLib/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo b/AixLib/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo index ec198320cc..eff9ccbe52 100644 --- a/AixLib/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo +++ b/AixLib/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo @@ -57,7 +57,7 @@ equation index=-1, extent={{-6,3},{-6,3}})); annotation ( -experiment(StartTime=1.82304e+07, StopTime=1.83168e+07), +experiment(StartTime=1.82304e+07, Tolerance=1e-6, StopTime=1.83168e+07), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mos" "Simulate and plot"), Documentation(info=" diff --git a/AixLib/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo b/AixLib/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo index ddb16cb413..ce0d076ed7 100644 --- a/AixLib/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo +++ b/AixLib/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo @@ -46,7 +46,7 @@ equation color={255,204,51}, thickness=0.5)); annotation ( -experiment(StartTime=1.82304e+07, StopTime=1.83168e+07), +experiment(StartTime=1.82304e+07, Tolerance=1e-6, StopTime=1.83168e+07), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mos" "Simulate and plot"), Documentation(info=" diff --git a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckBlackBodySkyTemperature.mo b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckBlackBodySkyTemperature.mo index 9f5616eea8..ebf7c9f577 100644 --- a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckBlackBodySkyTemperature.mo +++ b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckBlackBodySkyTemperature.mo @@ -27,7 +27,7 @@ First implementation. "), - experiment(StopTime=1), + experiment(Tolerance=1e-6, StopTime=1.0), __Dymola_Commands(file= "modelica://AixLib/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckBlackBodySkyTemperature.mos" "Simulate and plot"), diff --git a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckCeilingHeight.mo b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckCeilingHeight.mo index 245a7b3e05..e7638ca75e 100644 --- a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckCeilingHeight.mo +++ b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckCeilingHeight.mo @@ -48,7 +48,7 @@ First implementation. "), - experiment(StopTime=8640000), + experiment(Tolerance=1e-6, StartTime=0, StopTime=8640000), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckCeilingHeight.mos" "Simulate and plot")); end CheckCeilingHeight; diff --git a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckPressure.mo b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckPressure.mo index ceaaf36e42..dbc149e979 100644 --- a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckPressure.mo +++ b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckPressure.mo @@ -50,7 +50,7 @@ First implementation. "), - experiment(StopTime=8640000), + experiment(Tolerance=1e-6, StartTime=0, StopTime=8640000), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckPressure.mos" "Simulate and plot")); end CheckPressure; diff --git a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckRadiation.mo b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckRadiation.mo index 364131ce4f..17bc4e4993 100644 --- a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckRadiation.mo +++ b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckRadiation.mo @@ -30,7 +30,7 @@ First implementation. "), -experiment(StopTime=8640000), +experiment(Tolerance=1e-6, StartTime=0, StopTime=8640000), __Dymola_Commands(file= "modelica://AixLib/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckRadiation.mos" "Simulate and plot")); diff --git a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckRelativeHumidity.mo b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckRelativeHumidity.mo index 94fd9e34bd..63e81dd771 100644 --- a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckRelativeHumidity.mo +++ b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckRelativeHumidity.mo @@ -24,7 +24,7 @@ First implementation. "), - experiment(StopTime=8640000), + experiment(Tolerance=1e-6, StartTime=0, StopTime=8640000), __Dymola_Commands(file= "modelica://AixLib/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckRelativeHumidity.mos" "Simulate and plot")); diff --git a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckSkyCover.mo b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckSkyCover.mo index ab0f0f8259..f9a70f0a95 100644 --- a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckSkyCover.mo +++ b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckSkyCover.mo @@ -68,7 +68,7 @@ First implementation. "), - experiment(StopTime=8640000), + experiment(Tolerance=1e-6, StartTime=0, StopTime=8640000), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckSkyCover.mos" "Simulate and plot")); end CheckSkyCover; diff --git a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckTemperature.mo b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckTemperature.mo index d7e41b64e1..a5e3f89e2a 100644 --- a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckTemperature.mo +++ b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckTemperature.mo @@ -67,7 +67,7 @@ First implementation. "), - experiment(StopTime=8640000), + experiment(Tolerance=1e-6, StartTime=0, StopTime=8640000), __Dymola_Commands(file= "modelica://AixLib/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckTemperature.mos" "Simulate and plot")); diff --git a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckWindDirection.mo b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckWindDirection.mo index 08b8dda330..d347aa55b9 100644 --- a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckWindDirection.mo +++ b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckWindDirection.mo @@ -54,7 +54,7 @@ First implementation. "), - experiment(StopTime=8640000), + experiment(Tolerance=1e-6, StartTime=0, StopTime=8640000), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckWindDirection.mos" "Simulate and plot")); end CheckWindDirection; diff --git a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckWindSpeed.mo b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckWindSpeed.mo index 814b31e770..f55fdd01b5 100644 --- a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckWindSpeed.mo +++ b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckWindSpeed.mo @@ -49,7 +49,7 @@ First implementation. "), - experiment(StopTime=8640000), + experiment(Tolerance=1e-6, StartTime=0, StopTime=8640000), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckWindSpeed.mos" "Simulate and plot")); end CheckWindSpeed; diff --git a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/ConvertRadiation.mo b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/ConvertRadiation.mo index e3676951a5..9dcfbe9499 100644 --- a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/ConvertRadiation.mo +++ b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/ConvertRadiation.mo @@ -56,7 +56,7 @@ First implementation. "), - experiment(StopTime=8640000), + experiment(Tolerance=1e-6, StartTime=0, StopTime=8640000), __Dymola_Commands(file= "modelica://AixLib/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/ConvertRadiation.mos" "Simulate and plot")); diff --git a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/ConvertRelativeHumidity.mo b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/ConvertRelativeHumidity.mo index 0f90391bb3..0ce83d8ca0 100644 --- a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/ConvertRelativeHumidity.mo +++ b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/ConvertRelativeHumidity.mo @@ -50,7 +50,7 @@ July 14, 2010, by Wangda Zuo:
    First implementation. -"),experiment(StopTime=8640000), +"),experiment(Tolerance=1e-6, StartTime=0, StopTime=8640000), __Dymola_Commands(file= "modelica://AixLib/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/ConvertRelativeHumidity.mos" "Simulate and plot")); diff --git a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/ConvertTime.mo b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/ConvertTime.mo index 43b86bbbe7..f0255371eb 100644 --- a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/ConvertTime.mo +++ b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/ConvertTime.mo @@ -25,7 +25,7 @@ First implementation. "), - experiment(StopTime=77760000), + experiment(Tolerance=1e-6, StopTime=77760000), __Dymola_Commands(file= "modelica://AixLib/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/ConvertTime.mos" "Simulate and plot")); diff --git a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/EquationOfTime.mo b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/EquationOfTime.mo index e0a34c4292..066b1defe1 100644 --- a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/EquationOfTime.mo +++ b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/EquationOfTime.mo @@ -24,7 +24,7 @@ First implementation. "), - experiment(StopTime=86400), + experiment(Tolerance=1e-6, StopTime=86400), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/EquationOfTime.mos" "Simulate and plot")); end EquationOfTime; diff --git a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/GetAbsolutePath.mo b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/GetAbsolutePath.mo index 50deb3a3d2..65d47c5ec2 100644 --- a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/GetAbsolutePath.mo +++ b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/GetAbsolutePath.mo @@ -12,7 +12,7 @@ initial algorithm Modelica.Utilities.Streams.print("Absolute path = " + fAbs); annotation ( -experiment(StopTime=1.0), +experiment(Tolerance=1e-6, StopTime=1.0), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/GetAbsolutePath.mos" "Simulate and plot"), Documentation(info=" @@ -26,7 +26,7 @@ November 18, 2016, by Michael Wetter:
    Removed tests that assumed that the regression test is run from the library root directory.
    This is for -#596. +#596.
  • October 9, 2013, by Michael Wetter:
    diff --git a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo index 635a064087..07f9b0f65e 100644 --- a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo +++ b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo @@ -52,7 +52,7 @@ First implementation.
    • "), -experiment(StopTime=1.0), +experiment(Tolerance=1e-6, StopTime=1.0), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mos" "Simulate and plot")); end GetHeaderElement; diff --git a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/LocalCivilTime.mo b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/LocalCivilTime.mo index beba49730d..c315453d43 100644 --- a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/LocalCivilTime.mo +++ b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/LocalCivilTime.mo @@ -25,7 +25,7 @@ First implementation. "), - experiment(StopTime=172800), + experiment(Tolerance=1e-6, StartTime=0, StopTime=172800), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/LocalCivilTime.mos" "Simulate and plot")); end LocalCivilTime; diff --git a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/SolarTime.mo b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/SolarTime.mo index 8d91395ed3..587379aac0 100644 --- a/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/SolarTime.mo +++ b/AixLib/BoundaryConditions/WeatherData/BaseClasses/Examples/SolarTime.mo @@ -39,7 +39,7 @@ July 14, 2010, by Wangda Zuo:
    First implementation. -"), experiment(StopTime=864000), +"), experiment(Tolerance=1e-6, StopTime=864000), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/SolarTime.mos" "Simulate and plot")); end SolarTime; diff --git a/AixLib/BoundaryConditions/WeatherData/BaseClasses/getAbsolutePath.mo b/AixLib/BoundaryConditions/WeatherData/BaseClasses/getAbsolutePath.mo index 021087763a..33f0550d6d 100644 --- a/AixLib/BoundaryConditions/WeatherData/BaseClasses/getAbsolutePath.mo +++ b/AixLib/BoundaryConditions/WeatherData/BaseClasses/getAbsolutePath.mo @@ -1,5 +1,6 @@ within AixLib.BoundaryConditions.WeatherData.BaseClasses; function getAbsolutePath "Gets the absolute path of a URI" + extends Modelica.Icons.Function; input String uri "A URI"; output String path "The absolute path of the file pointed to by the URI"; algorithm @@ -9,7 +10,7 @@ algorithm

    The function returns the absolute path of a uniform resource identifier (URI) or local file name. -If the file is not found, then this function +If the file is not found, then this function terminates with an assert.

    diff --git a/AixLib/BoundaryConditions/WeatherData/BaseClasses/getHeaderElementTMY3.mo b/AixLib/BoundaryConditions/WeatherData/BaseClasses/getHeaderElementTMY3.mo index ddb127d7b8..a7817639fc 100644 --- a/AixLib/BoundaryConditions/WeatherData/BaseClasses/getHeaderElementTMY3.mo +++ b/AixLib/BoundaryConditions/WeatherData/BaseClasses/getHeaderElementTMY3.mo @@ -1,6 +1,7 @@ within AixLib.BoundaryConditions.WeatherData.BaseClasses; function getHeaderElementTMY3 "Gets an element from the header of a TMY3 weather data file" + extends Modelica.Icons.Function; input String filNam "Name of weather data file" annotation (Dialog( loadSelector(filter="Weather files (*.mos)", caption= diff --git a/AixLib/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo b/AixLib/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo index f8ec96a9bb..53a1b06982 100644 --- a/AixLib/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo +++ b/AixLib/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo @@ -1,5 +1,6 @@ within AixLib.BoundaryConditions.WeatherData.BaseClasses; function getLatitudeTMY3 "Gets the latitude from a TMY3 weather data file" + extends Modelica.Icons.Function; input String filNam "Name of weather data file" annotation (Dialog( loadSelector(filter="Weather files (*.mos)", caption= diff --git a/AixLib/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo b/AixLib/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo index df9a435879..54fdbf9f92 100644 --- a/AixLib/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo +++ b/AixLib/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo @@ -1,5 +1,6 @@ within AixLib.BoundaryConditions.WeatherData.BaseClasses; function getLongitudeTMY3 "Gets the longitude from a TMY3 weather data file" + extends Modelica.Icons.Function; input String filNam "Name of weather data file" annotation (Dialog( loadSelector(filter="Weather files (*.mos)", caption= diff --git a/AixLib/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo b/AixLib/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo index 418d265d18..d776c06920 100644 --- a/AixLib/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo +++ b/AixLib/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo @@ -1,5 +1,6 @@ within AixLib.BoundaryConditions.WeatherData.BaseClasses; function getTimeZoneTMY3 "Gets the time zone from a TMY3 weather data file" + extends Modelica.Icons.Function; input String filNam "Name of weather data file" annotation (Dialog( loadSelector(filter="Weather files (*.mos)", caption= diff --git a/AixLib/BoundaryConditions/WeatherData/Examples/ReaderTMY3.mo b/AixLib/BoundaryConditions/WeatherData/Examples/ReaderTMY3.mo index eb193ace0c..ceeeabc735 100644 --- a/AixLib/BoundaryConditions/WeatherData/Examples/ReaderTMY3.mo +++ b/AixLib/BoundaryConditions/WeatherData/Examples/ReaderTMY3.mo @@ -23,7 +23,7 @@ equation annotation (Line( points={{-59,-50},{-40,-50},{-40,-57.6},{-21,-57.6}}, color={0,0,127})); - annotation (experiment(StopTime=8640000), + annotation (experiment(Tolerance=1e-6, StartTime=0, StopTime=8640000), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/Examples/ReaderTMY3.mos" "Simulate and plot"), Documentation(info=" diff --git a/AixLib/BoundaryConditions/WeatherData/ReaderTMY3.mo b/AixLib/BoundaryConditions/WeatherData/ReaderTMY3.mo index 87ae1669f6..fb24ef7484 100644 --- a/AixLib/BoundaryConditions/WeatherData/ReaderTMY3.mo +++ b/AixLib/BoundaryConditions/WeatherData/ReaderTMY3.mo @@ -235,7 +235,8 @@ protected final fileName=absFilNam, final smoothness=Modelica.Blocks.Types.Smoothness.ContinuousDerivative, final columns={2,3,4,5,6,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27, - 28,29,30}) "Data reader" + 28,29,30,8}) + "Data reader" annotation (Placement(transformation(extent={{-80,-40},{-60,-20}}))); AixLib.BoundaryConditions.WeatherData.BaseClasses.CheckTemperature cheTemDryBul "Check dry bulb temperature " @@ -254,12 +255,12 @@ protected annotation (Placement(transformation(extent={{160,-160},{180,-140}}))); BaseClasses.CheckRadiation cheGloHorRad "Check the global horizontal radiation" - annotation (Placement(transformation(extent={{160,160},{180,180}}))); + annotation (Placement(transformation(extent={{160,180},{180,200}}))); BaseClasses.CheckRadiation cheDifHorRad "Check the diffuse horizontal radiation" - annotation (Placement(transformation(extent={{160,120},{180,140}}))); + annotation (Placement(transformation(extent={{160,140},{180,160}}))); BaseClasses.CheckRadiation cheDirNorRad "Check the direct normal radiation" - annotation (Placement(transformation(extent={{160,200},{180,220}}))); + annotation (Placement(transformation(extent={{160,220},{180,240}}))); BaseClasses.CheckCeilingHeight cheCeiHei "Check the ceiling height" annotation (Placement(transformation(extent={{160,-120},{180,-100}}))); BaseClasses.CheckWindSpeed cheWinSpe "Check the wind speed" @@ -267,7 +268,7 @@ protected BaseClasses.CheckIRRadiation cheHorRad "Check the horizontal infrared irradiation" - annotation (Placement(transformation(extent={{160,240},{180,260}}))); + annotation (Placement(transformation(extent={{160,100},{180,120}}))); BaseClasses.CheckWindDirection cheWinDir "Check the wind direction" annotation (Placement(transformation(extent={{160,-280},{180,-260}}))); SkyTemperature.BlackBody TBlaSkyCom(final calTSky=calTSky) if @@ -279,10 +280,10 @@ protected annotation (Placement(transformation(extent={{-180,-10},{-160,10}}))); Modelica.Blocks.Math.Add add "Add 30 minutes to time to shift weather data reader" - annotation (Placement(transformation(extent={{-140,160},{-120,180}}))); + annotation (Placement(transformation(extent={{-140,180},{-120,200}}))); Modelica.Blocks.Sources.Constant con30mins(final k=1800) "Constant used to shift weather data reader" - annotation (Placement(transformation(extent={{-180,192},{-160,212}}))); + annotation (Placement(transformation(extent={{-180,212},{-160,232}}))); AixLib.BoundaryConditions.WeatherData.BaseClasses.LocalCivilTime locTim( final lon=lon, final timZon=timZon) "Local civil time" annotation (Placement(transformation(extent={{-120,-160},{-100,-140}}))); @@ -291,11 +292,11 @@ protected final tableName="tab1", final fileName=absFilNam, final smoothness=Modelica.Blocks.Types.Smoothness.ContinuousDerivative, - final columns=8:11) "Data reader" - annotation (Placement(transformation(extent={{-80,160},{-60,180}}))); + final columns=9:11) "Data reader" + annotation (Placement(transformation(extent={{-80,180},{-60,200}}))); AixLib.BoundaryConditions.WeatherData.BaseClasses.ConvertTime conTim1 "Convert simulation time to calendar time" - annotation (Placement(transformation(extent={{-110,160},{-90,180}}))); + annotation (Placement(transformation(extent={{-110,180},{-90,200}}))); BaseClasses.ConvertTime conTim "Convert simulation time to calendar time" annotation (Placement(transformation(extent={{-120,-40},{-100,-20}}))); BaseClasses.EquationOfTime eqnTim "Equation of time" @@ -361,16 +362,16 @@ protected Modelica.Blocks.Math.UnitConversions.From_degC conTDryBul annotation (Placement(transformation(extent={{120,-200},{140,-180}}))); BaseClasses.ConvertRadiation conHorRad - annotation (Placement(transformation(extent={{120,240},{140,260}}))); + annotation (Placement(transformation(extent={{120,100},{140,120}}))); Modelica.Blocks.Math.UnitConversions.From_degC conTDewPoi "Convert the dew point temperature form [degC] to [K]" annotation (Placement(transformation(extent={{120,-240},{140,-220}}))); BaseClasses.ConvertRadiation conDirNorRad - annotation (Placement(transformation(extent={{120,200},{140,220}}))); + annotation (Placement(transformation(extent={{120,220},{140,240}}))); BaseClasses.ConvertRadiation conGloHorRad - annotation (Placement(transformation(extent={{120,160},{140,180}}))); + annotation (Placement(transformation(extent={{120,180},{140,200}}))); BaseClasses.ConvertRadiation conDifHorRad - annotation (Placement(transformation(extent={{120,120},{140,140}}))); + annotation (Placement(transformation(extent={{120,140},{140,160}}))); BaseClasses.CheckRelativeHumidity cheRelHum annotation (Placement(transformation(extent={{160,20},{180,40}}))); SolarGeometry.BaseClasses.AltitudeAngle altAng "Solar altitude angle" @@ -696,19 +697,19 @@ equation index=1, extent={{6,3},{6,3}})); connect(cheGloHorRad.HOut, weaBus.HGloHor) annotation (Line( - points={{181,170},{220,170},{220,0},{300,0}}, + points={{181,190},{220,190},{220,0},{300,0}}, color={0,0,127}), Text( string="%second", index=1, extent={{6,3},{6,3}})); connect(cheDifHorRad.HOut, weaBus.HDifHor) annotation (Line( - points={{181,130},{220,130},{220,0},{300,0}}, + points={{181,150},{220,150},{220,0},{300,0}}, color={0,0,127}), Text( string="%second", index=1, extent={{6,3},{6,3}})); connect(cheDirNorRad.HOut, weaBus.HDirNor) annotation (Line( - points={{181,210},{220,210},{220,0},{300,0}}, + points={{181,230},{220,230},{220,0},{300,0}}, color={0,0,127}), Text( string="%second", index=1, @@ -726,7 +727,7 @@ equation index=1, extent={{6,3},{6,3}})); connect(cheHorRad.HOut, weaBus.HHorIR) annotation (Line( - points={{181,250},{220,250},{220,0},{300,0}}, + points={{181,110},{220,110},{220,0},{300,0}}, color={0,0,127}), Text( string="%second", index=1, @@ -741,7 +742,7 @@ equation points={{181,-150},{220,-150},{220,-213},{238,-213}}, color={0,0,127})); connect(cheHorRad.HOut, TBlaSkyCom.HHorIR) annotation (Line( - points={{181,250},{220,250},{220,-218},{238,-218}}, + points={{181,110},{220,110},{220,-218},{238,-218}}, color={0,0,127})); connect(modTim.y, weaBus.cloTim) annotation (Line( points={{-159,6.10623e-16},{34.75,6.10623e-16},{34.75,0},{124.5,0},{300,0}}, @@ -750,16 +751,16 @@ equation index=1, extent={{6,3},{6,3}})); connect(modTim.y, add.u2) annotation (Line( - points={{-159,6.10623e-16},{-150,6.10623e-16},{-150,164},{-142,164}}, + points={{-159,0},{-150,0},{-150,184},{-142,184}}, color={0,0,127})); connect(con30mins.y, add.u1) annotation (Line( - points={{-159,202},{-150,202},{-150,176},{-142,176}}, + points={{-159,222},{-150,222},{-150,196},{-142,196}}, color={0,0,127})); connect(add.y, conTim1.modTim) annotation (Line( - points={{-119,170},{-112,170}}, + points={{-119,190},{-112,190}}, color={0,0,127})); connect(conTim1.calTim, datRea1.u) annotation (Line( - points={{-89,170},{-82,170}}, + points={{-89,190},{-82,190}}, color={0,0,127})); connect(modTim.y, locTim.cloTim) annotation (Line( points={{-159,6.10623e-16},{-150,6.10623e-16},{-150,-150},{-122,-150}}, @@ -789,9 +790,6 @@ equation connect(datRea.y[11], conWinDir.u) annotation (Line( points={{-59,-30},{20,-30},{20,-270},{118,-270}}, color={0,0,127})); - connect(datRea1.y[1], conHorRad.HIn) annotation (Line( - points={{-59,170},{20,170},{20,250},{118,250}}, - color={0,0,127})); connect(cheTemDryBul.TOut, TBlaSkyCom.TDryBul) annotation (Line( points={{181,-190},{220,-190},{220,-202},{238,-202}}, color={0,0,127})); @@ -810,14 +808,14 @@ equation connect(TBlaSkyCom.TDewPoi, cheTemDewPoi.TOut) annotation (Line( points={{238,-207},{220,-207},{220,-230},{181,-230}}, color={0,0,127})); - connect(datRea1.y[3], conDirNorRad.HIn) annotation (Line( - points={{-59,170},{20,170},{20,210},{118,210}}, + connect(datRea1.y[2], conDirNorRad.HIn) annotation (Line( + points={{-59,190},{20,190},{20,230},{118,230}}, color={0,0,127})); - connect(datRea1.y[2], conGloHorRad.HIn) annotation (Line( - points={{-59,170},{30,170},{30,170},{118,170}}, + connect(datRea1.y[1], conGloHorRad.HIn) annotation (Line( + points={{-59,190},{-40,190},{20,190},{118,190}}, color={0,0,127})); - connect(datRea1.y[4], conDifHorRad.HIn) annotation (Line( - points={{-59,170},{20,170},{20,130},{118,130}}, + connect(datRea1.y[3], conDifHorRad.HIn) annotation (Line( + points={{-59,190},{20,190},{20,150},{118,150}}, color={0,0,127})); connect(conRelHum.relHumIn, datRea.y[3]) annotation (Line( points={{118,30},{20,30},{20,-30},{-59,-30}}, @@ -892,6 +890,8 @@ equation color={0,0,127})); connect(cheTemBlaSky.TOut, weaBus.TBlaSky) annotation (Line(points={{261,-250}, {261,-250},{280,-250},{280,0},{300,0}}, color={0,0,127})); + connect(datRea.y[26], conHorRad.HIn) annotation (Line(points={{-59,-30},{20, + -30},{20,110},{118,110}}, color={0,0,127})); annotation ( defaultComponentName="weaDat", Icon(coordinateSystem( @@ -1564,11 +1564,20 @@ Technical Report, NREL/TP-581-43156, revised May 2008. ", revisions="

    ", revisions=" -

    + ")); end CHP_Cleanergy_C9G; diff --git a/AixLib/DataBase/CHP/CHP_FMB_1500_GSMK.mo b/AixLib/DataBase/CHP/CHP_FMB_1500_GSMK.mo index f047e2049f..6f39a2739d 100644 --- a/AixLib/DataBase/CHP/CHP_FMB_1500_GSMK.mo +++ b/AixLib/DataBase/CHP/CHP_FMB_1500_GSMK.mo @@ -9,12 +9,12 @@ record CHP_FMB_1500_GSMK "FMB-1500-GSMK : Guascor" DPipe=0.2); annotation (Documentation(info=" -

    Overview

    +

    Overview

    Natural Gas CHP: Schmitt Enertec GmbH FMB-1500-GSMK

    ", revisions=" -

    ")); end CHP_FMB_1500_GSMK; diff --git a/AixLib/DataBase/CHP/CHP_FMB_155_GSK.mo b/AixLib/DataBase/CHP/CHP_FMB_155_GSK.mo index f4303d31ea..d84ed21d6f 100644 --- a/AixLib/DataBase/CHP/CHP_FMB_155_GSK.mo +++ b/AixLib/DataBase/CHP/CHP_FMB_155_GSK.mo @@ -9,12 +9,12 @@ record CHP_FMB_155_GSK "FMB-155-GSK : Schmitt Enertec" DPipe=0.13); annotation (Documentation(info=" -

    Overview

    +

    Overview

    Natural Gas CHP: Schmitt Enertec GmbH FMB-155-GSK

    ", revisions=" -

    ")); end CHP_FMB_155_GSK; diff --git a/AixLib/DataBase/CHP/CHP_FMB_2500_GSMK.mo b/AixLib/DataBase/CHP/CHP_FMB_2500_GSMK.mo index 43ce097005..f7a24b2a1c 100644 --- a/AixLib/DataBase/CHP/CHP_FMB_2500_GSMK.mo +++ b/AixLib/DataBase/CHP/CHP_FMB_2500_GSMK.mo @@ -9,12 +9,12 @@ record CHP_FMB_2500_GSMK "FMB-2500-GSMK : Cummins" DPipe=0.3); annotation (Documentation(info=" -

    Overview

    +

    Overview

    Natural Gas CHP: Schmitt Enertec GmbH FMB-2500-GSMK

    ", revisions=" -

    ")); end CHP_FMB_2500_GSMK; diff --git a/AixLib/DataBase/CHP/CHP_FMB_270_GSMK.mo b/AixLib/DataBase/CHP/CHP_FMB_270_GSMK.mo index e3b9a1092f..7a3b8f4868 100644 --- a/AixLib/DataBase/CHP/CHP_FMB_270_GSMK.mo +++ b/AixLib/DataBase/CHP/CHP_FMB_270_GSMK.mo @@ -9,12 +9,12 @@ record CHP_FMB_270_GSMK "FMB-270-GSMK : Schmitt Enertec" DPipe=0.13); annotation (Documentation(info=" -

    Overview

    +

    Overview

    Natural Gas CHP: Schmitt Enertec GmbH FMB-270-GSMK

    ", revisions=" -

    ")); end CHP_FMB_270_GSMK; diff --git a/AixLib/DataBase/CHP/CHP_FMB_31_GSK.mo b/AixLib/DataBase/CHP/CHP_FMB_31_GSK.mo index 43061249c1..9055a5fca8 100644 --- a/AixLib/DataBase/CHP/CHP_FMB_31_GSK.mo +++ b/AixLib/DataBase/CHP/CHP_FMB_31_GSK.mo @@ -8,12 +8,12 @@ record CHP_FMB_31_GSK "FMB-31-GSK : Schmitt Enertec" DPipe=0.08); annotation (Documentation(info=" -

    Overview

    +

    Overview

    Natural Gas CHP: Schmitt Enertec GmbH FMB-31-GSK

    ", revisions=" -

    ")); end CHP_FMB_31_GSK; diff --git a/AixLib/DataBase/CHP/CHP_FMB_410_GSMK.mo b/AixLib/DataBase/CHP/CHP_FMB_410_GSMK.mo index 6d786300bb..74d77f66e9 100644 --- a/AixLib/DataBase/CHP/CHP_FMB_410_GSMK.mo +++ b/AixLib/DataBase/CHP/CHP_FMB_410_GSMK.mo @@ -9,12 +9,12 @@ record CHP_FMB_410_GSMK "FMB-410-GSMK : Schmitt Enertec" DPipe=0.13); annotation (Documentation(info=" -

    Overview

    +

    Overview

    Natural Gas CHP: Schmitt Enertec GmbH FMB-410-GSMK

    ", revisions=" -

    ")); end CHP_FMB_410_GSMK; diff --git a/AixLib/DataBase/CHP/CHP_FMB_65_GSK.mo b/AixLib/DataBase/CHP/CHP_FMB_65_GSK.mo index beb6d940bf..138eea7697 100644 --- a/AixLib/DataBase/CHP/CHP_FMB_65_GSK.mo +++ b/AixLib/DataBase/CHP/CHP_FMB_65_GSK.mo @@ -8,12 +8,12 @@ record CHP_FMB_65_GSK "FMB-65-GSK : Schmitt Enertec" DPipe=0.08); annotation (Documentation(info=" -

    Overview

    +

    Overview

    Natural Gas CHP: Schmitt Enertec GmbH FMB-65-GSK

    ", revisions=" -

    ")); end CHP_FMB_65_GSK; diff --git a/AixLib/DataBase/CHP/CHP_FMB_750_GSMK.mo b/AixLib/DataBase/CHP/CHP_FMB_750_GSMK.mo index 5d22991a48..a0420bb8c8 100644 --- a/AixLib/DataBase/CHP/CHP_FMB_750_GSMK.mo +++ b/AixLib/DataBase/CHP/CHP_FMB_750_GSMK.mo @@ -9,12 +9,12 @@ record CHP_FMB_750_GSMK "FMB-750-GSMK : Guascor" DPipe=0.16); annotation (Documentation(info=" -

    Overview

    +

    Overview

    Natural Gas CHP: Schmitt Enertec GmbH FMB-750-GSMK

    ", revisions=" -

    ")); end CHP_FMB_750_GSMK; diff --git a/AixLib/DataBase/CHP/CHP_GG_113.mo b/AixLib/DataBase/CHP/CHP_GG_113.mo index 0758eb0227..c1524eac69 100644 --- a/AixLib/DataBase/CHP/CHP_GG_113.mo +++ b/AixLib/DataBase/CHP/CHP_GG_113.mo @@ -9,12 +9,12 @@ record CHP_GG_113 "GG 113 : Sokratherm" DPipe=0.1); annotation (Documentation(info=" -

    Overview

    +

    Overview

    Sokratherm BHKW GG 113

    ", revisions=" -

    ")); end CHP_GG_113; diff --git a/AixLib/DataBase/CHP/CHP_GG_50.mo b/AixLib/DataBase/CHP/CHP_GG_50.mo index 304653799d..8b6902a377 100644 --- a/AixLib/DataBase/CHP/CHP_GG_50.mo +++ b/AixLib/DataBase/CHP/CHP_GG_50.mo @@ -8,12 +8,12 @@ record CHP_GG_50 "GG 50 : Sokratherm" DPipe=0.08); annotation (Documentation(info=" -

    Overview

    +

    Overview

    Sokratherm BHKW GG 50

    ", revisions=" -

    ")); end CHP_GG_50; diff --git a/AixLib/DataBase/CHP/CHP_GG_70.mo b/AixLib/DataBase/CHP/CHP_GG_70.mo index d496a289da..61dbb3f001 100644 --- a/AixLib/DataBase/CHP/CHP_GG_70.mo +++ b/AixLib/DataBase/CHP/CHP_GG_70.mo @@ -9,12 +9,12 @@ record CHP_GG_70 "GG 70 : Sokratherm" DPipe=0.1); annotation (Documentation(info=" -

    Overview

    +

    Overview

    Sokratherm BHKW GG 70

    ", revisions=" -

    ")); end CHP_GG_70; diff --git a/AixLib/DataBase/CHP/CHP_XRGI_9kWel.mo b/AixLib/DataBase/CHP/CHP_XRGI_9kWel.mo index d72504d8d5..c4fbcccc52 100644 --- a/AixLib/DataBase/CHP/CHP_XRGI_9kWel.mo +++ b/AixLib/DataBase/CHP/CHP_XRGI_9kWel.mo @@ -26,12 +26,12 @@ record CHP_XRGI_9kWel "Eco Power: mini BHKW XRGI 9 (12-20 kW thermal)"

    Overview

    EC Power mini-BHKW XRGI 9 (Natural Gas)

    Concept

    -

    The electrical and thermal powers are in kW. The "fuel input" is in +

    The electrical and thermal powers are in kW. The fuel input is in kW. The fuel consumption is in m³/h.

    The calorific value of natural gas is assumed to be 11.5 kWh/m³ (10 - 12 kWh/m³).

    Data Sheet (English, German)

    - +
    @@ -44,7 +44,8 @@ kW. The fuel consumption is in m³/h.

    - + @@ -69,15 +70,15 @@ kW. The fuel consumption is in m³/h.

    - + - + - + @@ -93,22 +94,22 @@ kW. The fuel consumption is in m³/h.

    - + - +

    Max. noise level dB(A)

    49

    0.59

    Weight kg

    Weight kg

    440

    Electrical efficiency

    29.5 %

    29.5 %

    Thermal efficiency excluding optional condenser

    63.5 %

    63.5 %

    Total efficiency excluding optional condenser

    93 %

    93 %

    Flow temperature (constant) °C

    Emissions mg/Nm3

    CO: < 50

    NOX: < 100

    CO: < 50

    NOX: < 100

    Primary energy saving PES (EU Directive, verification in accordance with DIN 4709)

    22.4 %

    22.4 %
    - +
    - + - + @@ -121,9 +122,8 @@ Prüfung nach DIN 4709)

    ", revisions=" -

    ")); end CHP_XRGI_9kWel; diff --git a/AixLib/DataBase/CHP/CHP_mikro_ECO_POWER_1.mo b/AixLib/DataBase/CHP/CHP_mikro_ECO_POWER_1.mo index 5391a0c96f..f766ad7343 100644 --- a/AixLib/DataBase/CHP/CHP_mikro_ECO_POWER_1.mo +++ b/AixLib/DataBase/CHP/CHP_mikro_ECO_POWER_1.mo @@ -9,21 +9,21 @@ record CHP_mikro_ECO_POWER_1 "Vaillant mikro CHP ecoPOWER 1.0" //Matrix contains : [Capacity, Electrical Power, Total Heat Recovery,Fuel Input, Fuel Consumption] annotation (Documentation(info=" -

    Overview

    +

    Overview

    Vaillant mikro-BHKW ecoPOWER 1.0 (Natural Gas)

    -

    Known Limitations

    +

    Known Limitations

    Electrical output is taken from the manufacturer's website. The values for heat output, fuel input and fuel consumption are calculated with the provided efficiency. They are not given by the manufacturer.

    Source:

    -

    ", revisions=" -

    ")); end CHP_mikro_ECO_POWER_1; diff --git a/AixLib/DataBase/CHP/CHP_mini_ECO_POWER_3.mo b/AixLib/DataBase/CHP/CHP_mini_ECO_POWER_3.mo index 038fc13716..29865c7c7e 100644 --- a/AixLib/DataBase/CHP/CHP_mini_ECO_POWER_3.mo +++ b/AixLib/DataBase/CHP/CHP_mini_ECO_POWER_3.mo @@ -14,23 +14,22 @@ consumption is in l/kWh. and the calorific value of natural gas is assumed 12 kWh/m^3. */ annotation (Documentation(info=" -

    Overview

    +

    Overview

    Vaillant mini-BHKW ecoPOWER 3.0 (Natural Gas)

    -

    Concept

    +

    Concept

    The electrical and thermal powers are in kW. The fuel mass flow is in l/s. The fuel consumption is in l/kWh.

    The calorific value of liquid gas is assumed to be 28 kWh/m³ and the calorific value of natural gas is assumed to be 12 kWh/m³.

    Source:

    -

    ", revisions=" -

    ")); end CHP_mini_ECO_POWER_3; diff --git a/AixLib/DataBase/CHP/CHP_mini_ECO_POWER_3_LiquidGas.mo b/AixLib/DataBase/CHP/CHP_mini_ECO_POWER_3_LiquidGas.mo index 879ff8759f..1ee7fd211c 100644 --- a/AixLib/DataBase/CHP/CHP_mini_ECO_POWER_3_LiquidGas.mo +++ b/AixLib/DataBase/CHP/CHP_mini_ECO_POWER_3_LiquidGas.mo @@ -15,23 +15,22 @@ consumption is in l/kWh. and the calorific value of natural gas is assumed 12 kWh/m^3. */ annotation (Documentation(info=" -

    Overview

    +

    Overview

    Vaillant mini-BHKW ecoPOWER 3.0 (Liquid Gas)

    -

    Concept

    +

    Concept

    The electrical and thermal powers are in kW. The fuel mass flow is in l/s. The fuel consumption is in l/kWh.

    The calorific value of liquid gas is assumed to be 28 kWh/m³ and the calorific value of natural gas is assumed to be 12 kWh/m³.

    Source:

    -

    ", revisions=" -

    ")); end CHP_mini_ECO_POWER_3_LiquidGas; diff --git a/AixLib/DataBase/CHP/CHP_mini_ECO_POWER_5.mo b/AixLib/DataBase/CHP/CHP_mini_ECO_POWER_5.mo index 2e9e965e7f..7d562f10c4 100644 --- a/AixLib/DataBase/CHP/CHP_mini_ECO_POWER_5.mo +++ b/AixLib/DataBase/CHP/CHP_mini_ECO_POWER_5.mo @@ -14,23 +14,22 @@ consumption is in l/kWh. and the calorific value of natural gas is assumed 12 kWh/m^3. */ annotation (Documentation(info=" -

    Overview

    +

    Overview

    Vaillant mini-BHKW ecoPOWER 4.7 (Natural Gas)

    -

    Concept

    +

    Concept

    The electrical and thermal powers are in kW. The fuel mass flow is in l/s. The fuel consumption is in l/kWh.

    The calorific value of liquid gas is assumed to be 28 kWh/m³ and the calorific value of natural gas is assumed to be 12 kWh/m³.

    Source:

    -

    ", revisions=" -

    ")); end CHP_mini_ECO_POWER_5; diff --git a/AixLib/DataBase/CHP/CHP_mini_ECO_POWER_5_LiquidGas.mo b/AixLib/DataBase/CHP/CHP_mini_ECO_POWER_5_LiquidGas.mo index fa1b617203..2e2f3c48a9 100644 --- a/AixLib/DataBase/CHP/CHP_mini_ECO_POWER_5_LiquidGas.mo +++ b/AixLib/DataBase/CHP/CHP_mini_ECO_POWER_5_LiquidGas.mo @@ -15,23 +15,22 @@ consumption is in l/kWh. and the calorific value of natural gas is assumed 12 kWh/m^3. */ annotation (Documentation(info=" -

    Overview

    +

    Overview

    Vaillant mini-BHKW ecoPOWER 4.7 (Liquid Gas)

    -

    Concept

    +

    Concept

    The electrical and thermal powers are in kW. The fuel mass flow is in l/s. The fuel consumption is in l/kWh.

    The calorific value of liquid gas is assumed to be 28 kWh/m³ and the calorific value of natural gas is assumed to be 12 kWh/m³.

    Source:

    -

    ", revisions=" -

    ")); end CHP_mini_ECO_POWER_5_LiquidGas; diff --git a/AixLib/DataBase/Fans/Fan1.mo b/AixLib/DataBase/Fans/Fan1.mo deleted file mode 100644 index 29587d3440..0000000000 --- a/AixLib/DataBase/Fans/Fan1.mo +++ /dev/null @@ -1,15 +0,0 @@ -within AixLib.DataBase.Fans; - - -record Fan1 "Fan with Diameter of 250mm" - extends FanCharacteristicsBaseDataDefinition(dp = [0, 1100, 0.3; 900, 1050, 0.4; 1500, 1000, 0.6; 2000, 800, 0.7; 2500, 500, 0.5; 2600, 400, 0.4; 2700, 0, 0.3]); - annotation(Documentation(info = " -

    Level of Development

    -

    \"stars:

    -

    Example for a small fan with a diameter of 250mm. Maximum volume flow of 2700 m^3/h and maximum pressure increase of 1100 Pa.

    -

    References

    -

    Record is used in model AixLib.HVAC.Fan.FanSimple

    - ", revisions = " -

    30.12.2013, by Mark Wesseling: implemented

    - ")); -end Fan1; diff --git a/AixLib/DataBase/Fans/FanCharacteristicsBaseDataDefinition.mo b/AixLib/DataBase/Fans/FanCharacteristicsBaseDataDefinition.mo deleted file mode 100644 index 363eabfa4a..0000000000 --- a/AixLib/DataBase/Fans/FanCharacteristicsBaseDataDefinition.mo +++ /dev/null @@ -1,16 +0,0 @@ -within AixLib.DataBase.Fans; -record FanCharacteristicsBaseDataDefinition - "Characteristics for simple fan model" - extends Modelica.Icons.Record; - parameter Real[:, :] dp "V_flow | dp | eta "; - annotation(Documentation(info = " -

    Overview

    -


    1. Column: Volume Flow in m^3 / h

    -

    2. Column: Pressure Increase in Pa

    -

    3. Column: efficiency of Fan

    -

    References

    -

    Base data definition for record to be used in model AixLib.HVAC.Fan.FanSimple

    - ", revisions = " -

    30.12.2013, by Mark Wesseling: implemented

    - ")); -end FanCharacteristicsBaseDataDefinition; diff --git a/AixLib/DataBase/Fans/package.mo b/AixLib/DataBase/Fans/package.mo deleted file mode 100644 index 4235adba5d..0000000000 --- a/AixLib/DataBase/Fans/package.mo +++ /dev/null @@ -1,4 +0,0 @@ -within AixLib.DataBase; -package Fans "Base definition and specific parameter definitions of fans" - extends Modelica.Icons.Package; -end Fans; diff --git a/AixLib/DataBase/Fans/package.order b/AixLib/DataBase/Fans/package.order deleted file mode 100644 index b34032654e..0000000000 --- a/AixLib/DataBase/Fans/package.order +++ /dev/null @@ -1,2 +0,0 @@ -Fan1 -FanCharacteristicsBaseDataDefinition diff --git a/AixLib/DataBase/Pipes/Copper.mo b/AixLib/DataBase/Pipes/Copper.mo deleted file mode 100644 index 0ebe3fcc71..0000000000 --- a/AixLib/DataBase/Pipes/Copper.mo +++ /dev/null @@ -1,1757 +0,0 @@ -within AixLib.DataBase.Pipes; -package Copper - extends Modelica.Icons.Package; - - record Copper_6x0_6 "Copper 6x0.6" - extends PipeBaseDataDefinition( - d_i=0.0048, - d_o=0.006, - d=8900, - lambda=393, - c=390); - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_6x0_6; - - record Copper_6x0_8 "Copper 6x0.8" - - extends PipeBaseDataDefinition( - d_i=0.0044, - d_o=0.006, - d=8900, - lambda=393, - c=390); - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_6x0_8; - - record Copper_6x1 "Copper 6x1" - - extends PipeBaseDataDefinition( - d_i=0.004, - d_o=0.006, - d=8900, - lambda=393, - c=390); - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_6x1; - - record Copper_8x0_6 "Copper 8x0.6" - - extends PipeBaseDataDefinition( - d_i=0.0068, - d_o=0.008, - d=8900, - lambda=393, - c=390); - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_8x0_6; - - record Copper_8x0_8 "Copper 8x0.8" - - extends PipeBaseDataDefinition( - d_i=0.0064, - d_o=0.008, - d=8900, - lambda=393, - c=390); - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_8x0_8; - - record Copper_8x1 "Copper 8x1" - - extends PipeBaseDataDefinition( - d_i=0.006, - d_o=0.008, - d=8900, - lambda=393, - c=390); - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_8x1; - - record Copper_10x0_6 "Copper 10x0.6" - - extends PipeBaseDataDefinition( - d_i=0.0088, - d_o=0.01, - d=8900, - lambda=393, - c=390); - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_10x0_6; - - record Copper_10x0_7 "Copper 10x0.7" - - extends PipeBaseDataDefinition( - d_i=0.0086, - d_o=0.01, - d=8900, - lambda=393, - c=390); - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_10x0_7; - - record Copper_10x0_8 "Copper 10x0.8" - - extends PipeBaseDataDefinition( - d_i=0.0084, - d_o=0.01, - d=8900, - lambda=393, - c=390); - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_10x0_8; - - record Copper_10x1 "Copper 10x1" - - extends PipeBaseDataDefinition( - d_i=0.008, - d_o=0.01, - d=8900, - lambda=393, - c=390); - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_10x1; - - record Copper_12x0_6 "Copper 12x0.6" - - extends PipeBaseDataDefinition( - d_i=0.0108, - d_o=0.012, - d=8900, - lambda=393, - c=390); - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_12x0_6; - - record Copper_12x0_7 "Copper 12x0.7" - - extends PipeBaseDataDefinition( - d_i=0.0106, - d_o=0.012, - d=8900, - lambda=393, - c=390); - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_12x0_7; - - record Copper_12x0_8 "Copper 12x0.8" - - extends PipeBaseDataDefinition( - d_i=0.0104, - d_o=0.012, - d=8900, - lambda=393, - c=390); - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_12x0_8; - - record Copper_12x1 "Copper 12x1" - - extends PipeBaseDataDefinition( - d_i=0.01, - d_o=0.012, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_12x1; - - record Copper_14x0_8 "Copper 14x0.8" - - extends PipeBaseDataDefinition( - d_i=0.0124, - d_o=0.014, - d=8900, - lambda=393, - c=390); - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_14x0_8; - - record Copper_14x1 "Copper 14x1" - - extends PipeBaseDataDefinition( - d_i=0.012, - d_o=0.014, - d=8900, - lambda=393, - c=390); - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_14x1; - - record Copper_15x0_7 "Copper 15x0.7" - - extends PipeBaseDataDefinition( - d_i=0.0136, - d_o=0.015, - d=8900, - lambda=393, - c=390); - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_15x0_7; - - record Copper_15x0_8 "Copper 15x0.8" - - extends PipeBaseDataDefinition( - d_i=0.0134, - d_o=0.015, - d=8900, - lambda=393, - c=390); - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_15x0_8; - - record Copper_15x1 "Copper 15x1" - - extends PipeBaseDataDefinition( - d_i=0.013, - d_o=0.015, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_15x1; - - record Copper_16x1 "Copper 16x1" - - extends PipeBaseDataDefinition( - d_i=0.014, - d_o=0.016, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_16x1; - - record Copper_18x0_8 "Copper 18x0.8" - - extends PipeBaseDataDefinition( - d_i=0.0164, - d_o=0.018, - d=8900, - lambda=393, - c=390); - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_18x0_8; - - record Copper_18x1 "Copper 18x1" - - extends PipeBaseDataDefinition( - d_i=0.016, - d_o=0.018, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_18x1; - - record Copper_22x0_9 "Copper 22x0.9" - - extends PipeBaseDataDefinition( - d_i=0.0202, - d_o=0.022, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_22x0_9; - - record Copper_22x1 "Copper 22x1" - - extends PipeBaseDataDefinition( - d_i=0.02, - d_o=0.022, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_22x1; - - record Copper_22x1_1 "Copper 22x1.1" - - extends PipeBaseDataDefinition( - d_i=0.0198, - d_o=0.022, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_22x1_1; - - record Copper_22x1_2 "Copper 22x1.2" - - extends PipeBaseDataDefinition( - d_i=0.0196, - d_o=0.022, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_22x1_2; - - record Copper_22x1_5 "Copper 22x1.5" - extends PipeBaseDataDefinition( - d_i=0.019, - d_o=0.022, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_22x1_5; - - record Copper_28x0_9 "Copper 28x0.9" - - extends PipeBaseDataDefinition( - d_i=0.0262, - d_o=0.028, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_28x0_9; - - record Copper_28x1 "Copper 28x1" - extends PipeBaseDataDefinition( - d_i=0.026, - d_o=0.028, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_28x1; - - record Copper_28x1_2 "Copper 28x1.2" - - extends PipeBaseDataDefinition( - d_i=0.0256, - d_o=0.028, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_28x1_2; - - record Copper_28x1_5 "Copper 28x1.5" - - extends PipeBaseDataDefinition( - d_i=0.025, - d_o=0.028, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_28x1_5; - - record Copper_35x1 "Copper 35x1" - - extends PipeBaseDataDefinition( - d_i=0.033, - d_o=0.035, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_35x1; - - record Copper_35x1_2 "Copper 35x1.2" - - extends PipeBaseDataDefinition( - d_i=0.0326, - d_o=0.035, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_35x1_2; - - record Copper_35x1_5 "Copper 35x1.5" - - extends PipeBaseDataDefinition( - d_i=0.032, - d_o=0.035, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_35x1_5; - - record Copper_40x1 "Copper 40x1" - - extends PipeBaseDataDefinition( - d_i=0.038, - d_o=0.04, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_40x1; - - record Copper_42x1 "Copper 42x1" - - extends PipeBaseDataDefinition( - d_i=0.04, - d_o=0.042, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_42x1; - - record Copper_42x1_2 "Copper 42x1.2" - - extends PipeBaseDataDefinition( - d_i=0.0396, - d_o=0.042, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_42x1_2; - - record Copper_42x1_5 "Copper 42x1.5" - - extends PipeBaseDataDefinition( - d_i=0.039, - d_o=0.042, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_42x1_5; - - record Copper_54x1 "Copper 54x1" - - extends PipeBaseDataDefinition( - d_i=0.052, - d_o=0.054, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_54x1; - - record Copper_54x1_2 "Copper 54x1.2" - - extends PipeBaseDataDefinition( - d_i=0.0516, - d_o=0.054, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_54x1_2; - - record Copper_54x1_5 "Copper 54x1.5" - - extends PipeBaseDataDefinition( - d_i=0.051, - d_o=0.054, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_54x1_5; - - record Copper_54x2 "Copper 54x2" - - extends PipeBaseDataDefinition( - d_i=0.050, - d_o=0.054, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_54x2; - - record Copper_64x2 "Copper 64x2" - - extends PipeBaseDataDefinition( - d_i=0.060, - d_o=0.064, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_64x2; - - record Copper_66_7x1_2 "Copper 66.7x1.2" - - extends PipeBaseDataDefinition( - d_i=0.0643, - d_o=0.0667, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_66_7x1_2; - - record Copper_66_7x2 "Copper 66.7x2" - - extends PipeBaseDataDefinition( - d_i=0.0627, - d_o=0.0667, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_66_7x2; - - record Copper_76_1x1_5 "Copper 76.1x1.5" - - extends PipeBaseDataDefinition( - d_i=0.0731, - d_o=0.0761, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_76_1x1_5; - - record Copper_76_1x2 "Copper 76.1x2" - - extends PipeBaseDataDefinition( - d_i=0.0721, - d_o=0.0761, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_76_1x2; - - record Copper_88_9x2 "Copper 88_9x2" - - extends PipeBaseDataDefinition( - d_i=0.0849, - d_o=0.0889, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_88_9x2; - - record Copper_108x1_5 "Copper 108x1_5" - - extends PipeBaseDataDefinition( - d_i=0.105, - d_o=0.108, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_108x1_5; - - record Copper_108x2_5 "Copper 108x2_5" - - extends PipeBaseDataDefinition( - d_i=0.103, - d_o=0.108, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_108x2_5; - - record Copper_133x1_5 "Copper 133x1_5" - - extends PipeBaseDataDefinition( - d_i=0.130, - d_o=0.133, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_133x1_5; - - record Copper_133x3 "Copper 133x3" - - extends PipeBaseDataDefinition( - d_i=0.127, - d_o=0.133, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_133x3; - - record Copper_159x2 "Copper 159x2" - - extends PipeBaseDataDefinition( - d_i=0.155, - d_o=0.159, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_159x2; - - record Copper_159x3 "Copper 159x3" - - extends PipeBaseDataDefinition( - d_i=0.153, - d_o=0.159, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_159x3; - - record Copper_219x3 "Copper 219x3" - - extends PipeBaseDataDefinition( - d_i=0.213, - d_o=0.219, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_219x3; - - record Copper_267x3 "Copper 267x3" - - extends PipeBaseDataDefinition( - d_i=0.261, - d_o=0.267, - d=8900, - lambda=393, - c=390); - // Constant chemical Values assumed - - annotation (Documentation(revisions=" - -", - info=" -

    Overview

    -

    -Record for copper pipe -

    - -

    References

    -

    Record is used with HVAC.Components.Pipes.DynamicPipeEBC1

    -

    Source:

    - -")); - end Copper_267x3; -end Copper; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_108x1_5.mo b/AixLib/DataBase/Pipes/Copper/Copper_108x1_5.mo new file mode 100644 index 0000000000..465160190d --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_108x1_5.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_108x1_5 "Copper 108x1_5" + + extends PipeBaseDataDefinition( + d_i=0.105, + d_o=0.108, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_108x1_5; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_108x2_5.mo b/AixLib/DataBase/Pipes/Copper/Copper_108x2_5.mo new file mode 100644 index 0000000000..feee1c23bf --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_108x2_5.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_108x2_5 "Copper 108x2_5" + + extends PipeBaseDataDefinition( + d_i=0.103, + d_o=0.108, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_108x2_5; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_10x0_6.mo b/AixLib/DataBase/Pipes/Copper/Copper_10x0_6.mo new file mode 100644 index 0000000000..c1772c5a9e --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_10x0_6.mo @@ -0,0 +1,30 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_10x0_6 "Copper 10x0.6" + + extends PipeBaseDataDefinition( + d_i=0.0088, + d_o=0.01, + d=8900, + lambda=393, + c=390); + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_10x0_6; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_10x0_7.mo b/AixLib/DataBase/Pipes/Copper/Copper_10x0_7.mo new file mode 100644 index 0000000000..9123a483b6 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_10x0_7.mo @@ -0,0 +1,30 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_10x0_7 "Copper 10x0.7" + + extends PipeBaseDataDefinition( + d_i=0.0086, + d_o=0.01, + d=8900, + lambda=393, + c=390); + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_10x0_7; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_10x0_8.mo b/AixLib/DataBase/Pipes/Copper/Copper_10x0_8.mo new file mode 100644 index 0000000000..71d193addf --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_10x0_8.mo @@ -0,0 +1,30 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_10x0_8 "Copper 10x0.8" + + extends PipeBaseDataDefinition( + d_i=0.0084, + d_o=0.01, + d=8900, + lambda=393, + c=390); + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_10x0_8; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_10x1.mo b/AixLib/DataBase/Pipes/Copper/Copper_10x1.mo new file mode 100644 index 0000000000..7f66b16a42 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_10x1.mo @@ -0,0 +1,30 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_10x1 "Copper 10x1" + + extends PipeBaseDataDefinition( + d_i=0.008, + d_o=0.01, + d=8900, + lambda=393, + c=390); + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_10x1; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_12x0_6.mo b/AixLib/DataBase/Pipes/Copper/Copper_12x0_6.mo new file mode 100644 index 0000000000..20283e7e14 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_12x0_6.mo @@ -0,0 +1,30 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_12x0_6 "Copper 12x0.6" + + extends PipeBaseDataDefinition( + d_i=0.0108, + d_o=0.012, + d=8900, + lambda=393, + c=390); + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_12x0_6; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_12x0_7.mo b/AixLib/DataBase/Pipes/Copper/Copper_12x0_7.mo new file mode 100644 index 0000000000..54a04767b3 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_12x0_7.mo @@ -0,0 +1,30 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_12x0_7 "Copper 12x0.7" + + extends PipeBaseDataDefinition( + d_i=0.0106, + d_o=0.012, + d=8900, + lambda=393, + c=390); + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_12x0_7; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_12x0_8.mo b/AixLib/DataBase/Pipes/Copper/Copper_12x0_8.mo new file mode 100644 index 0000000000..80a5c05e8d --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_12x0_8.mo @@ -0,0 +1,30 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_12x0_8 "Copper 12x0.8" + + extends PipeBaseDataDefinition( + d_i=0.0104, + d_o=0.012, + d=8900, + lambda=393, + c=390); + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_12x0_8; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_12x1.mo b/AixLib/DataBase/Pipes/Copper/Copper_12x1.mo new file mode 100644 index 0000000000..e3dd5dc8b8 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_12x1.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_12x1 "Copper 12x1" + + extends PipeBaseDataDefinition( + d_i=0.01, + d_o=0.012, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_12x1; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_133x1_5.mo b/AixLib/DataBase/Pipes/Copper/Copper_133x1_5.mo new file mode 100644 index 0000000000..8045ae4a01 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_133x1_5.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_133x1_5 "Copper 133x1_5" + + extends PipeBaseDataDefinition( + d_i=0.130, + d_o=0.133, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_133x1_5; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_133x3.mo b/AixLib/DataBase/Pipes/Copper/Copper_133x3.mo new file mode 100644 index 0000000000..4672784b23 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_133x3.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_133x3 "Copper 133x3" + + extends PipeBaseDataDefinition( + d_i=0.127, + d_o=0.133, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_133x3; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_14x0_8.mo b/AixLib/DataBase/Pipes/Copper/Copper_14x0_8.mo new file mode 100644 index 0000000000..6666162ae0 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_14x0_8.mo @@ -0,0 +1,30 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_14x0_8 "Copper 14x0.8" + + extends PipeBaseDataDefinition( + d_i=0.0124, + d_o=0.014, + d=8900, + lambda=393, + c=390); + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_14x0_8; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_14x1.mo b/AixLib/DataBase/Pipes/Copper/Copper_14x1.mo new file mode 100644 index 0000000000..237362ee67 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_14x1.mo @@ -0,0 +1,30 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_14x1 "Copper 14x1" + + extends PipeBaseDataDefinition( + d_i=0.012, + d_o=0.014, + d=8900, + lambda=393, + c=390); + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_14x1; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_159x2.mo b/AixLib/DataBase/Pipes/Copper/Copper_159x2.mo new file mode 100644 index 0000000000..7bb1497825 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_159x2.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_159x2 "Copper 159x2" + + extends PipeBaseDataDefinition( + d_i=0.155, + d_o=0.159, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_159x2; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_159x3.mo b/AixLib/DataBase/Pipes/Copper/Copper_159x3.mo new file mode 100644 index 0000000000..6e8d4fd22a --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_159x3.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_159x3 "Copper 159x3" + + extends PipeBaseDataDefinition( + d_i=0.153, + d_o=0.159, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_159x3; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_15x0_7.mo b/AixLib/DataBase/Pipes/Copper/Copper_15x0_7.mo new file mode 100644 index 0000000000..7a50cc20b0 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_15x0_7.mo @@ -0,0 +1,30 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_15x0_7 "Copper 15x0.7" + + extends PipeBaseDataDefinition( + d_i=0.0136, + d_o=0.015, + d=8900, + lambda=393, + c=390); + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_15x0_7; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_15x0_8.mo b/AixLib/DataBase/Pipes/Copper/Copper_15x0_8.mo new file mode 100644 index 0000000000..6179cd4e52 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_15x0_8.mo @@ -0,0 +1,30 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_15x0_8 "Copper 15x0.8" + + extends PipeBaseDataDefinition( + d_i=0.0134, + d_o=0.015, + d=8900, + lambda=393, + c=390); + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_15x0_8; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_15x1.mo b/AixLib/DataBase/Pipes/Copper/Copper_15x1.mo new file mode 100644 index 0000000000..17a5e8008c --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_15x1.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_15x1 "Copper 15x1" + + extends PipeBaseDataDefinition( + d_i=0.013, + d_o=0.015, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_15x1; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_16x1.mo b/AixLib/DataBase/Pipes/Copper/Copper_16x1.mo new file mode 100644 index 0000000000..d2738d1d0e --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_16x1.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_16x1 "Copper 16x1" + + extends PipeBaseDataDefinition( + d_i=0.014, + d_o=0.016, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_16x1; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_18x0_8.mo b/AixLib/DataBase/Pipes/Copper/Copper_18x0_8.mo new file mode 100644 index 0000000000..c9e774cc5d --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_18x0_8.mo @@ -0,0 +1,30 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_18x0_8 "Copper 18x0.8" + + extends PipeBaseDataDefinition( + d_i=0.0164, + d_o=0.018, + d=8900, + lambda=393, + c=390); + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_18x0_8; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_18x1.mo b/AixLib/DataBase/Pipes/Copper/Copper_18x1.mo new file mode 100644 index 0000000000..f68bec53e5 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_18x1.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_18x1 "Copper 18x1" + + extends PipeBaseDataDefinition( + d_i=0.016, + d_o=0.018, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_18x1; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_219x3.mo b/AixLib/DataBase/Pipes/Copper/Copper_219x3.mo new file mode 100644 index 0000000000..2dc566dd39 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_219x3.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_219x3 "Copper 219x3" + + extends PipeBaseDataDefinition( + d_i=0.213, + d_o=0.219, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_219x3; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_22x0_9.mo b/AixLib/DataBase/Pipes/Copper/Copper_22x0_9.mo new file mode 100644 index 0000000000..c48b22582d --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_22x0_9.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_22x0_9 "Copper 22x0.9" + + extends PipeBaseDataDefinition( + d_i=0.0202, + d_o=0.022, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_22x0_9; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_22x1.mo b/AixLib/DataBase/Pipes/Copper/Copper_22x1.mo new file mode 100644 index 0000000000..6f8cabcbdc --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_22x1.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_22x1 "Copper 22x1" + + extends PipeBaseDataDefinition( + d_i=0.02, + d_o=0.022, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_22x1; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_22x1_1.mo b/AixLib/DataBase/Pipes/Copper/Copper_22x1_1.mo new file mode 100644 index 0000000000..d4ba711784 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_22x1_1.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_22x1_1 "Copper 22x1.1" + + extends PipeBaseDataDefinition( + d_i=0.0198, + d_o=0.022, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_22x1_1; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_22x1_2.mo b/AixLib/DataBase/Pipes/Copper/Copper_22x1_2.mo new file mode 100644 index 0000000000..e837ae00ef --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_22x1_2.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_22x1_2 "Copper 22x1.2" + + extends PipeBaseDataDefinition( + d_i=0.0196, + d_o=0.022, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_22x1_2; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_22x1_5.mo b/AixLib/DataBase/Pipes/Copper/Copper_22x1_5.mo new file mode 100644 index 0000000000..dee4cecc67 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_22x1_5.mo @@ -0,0 +1,31 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_22x1_5 "Copper 22x1.5" + extends PipeBaseDataDefinition( + d_i=0.019, + d_o=0.022, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_22x1_5; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_267x3.mo b/AixLib/DataBase/Pipes/Copper/Copper_267x3.mo new file mode 100644 index 0000000000..31ad084c6a --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_267x3.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_267x3 "Copper 267x3" + + extends PipeBaseDataDefinition( + d_i=0.261, + d_o=0.267, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_267x3; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_28x0_9.mo b/AixLib/DataBase/Pipes/Copper/Copper_28x0_9.mo new file mode 100644 index 0000000000..159621aa46 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_28x0_9.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_28x0_9 "Copper 28x0.9" + + extends PipeBaseDataDefinition( + d_i=0.0262, + d_o=0.028, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_28x0_9; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_28x1.mo b/AixLib/DataBase/Pipes/Copper/Copper_28x1.mo new file mode 100644 index 0000000000..a51c100ca6 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_28x1.mo @@ -0,0 +1,31 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_28x1 "Copper 28x1" + extends PipeBaseDataDefinition( + d_i=0.026, + d_o=0.028, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_28x1; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_28x1_2.mo b/AixLib/DataBase/Pipes/Copper/Copper_28x1_2.mo new file mode 100644 index 0000000000..ada98f9a12 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_28x1_2.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_28x1_2 "Copper 28x1.2" + + extends PipeBaseDataDefinition( + d_i=0.0256, + d_o=0.028, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_28x1_2; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_28x1_5.mo b/AixLib/DataBase/Pipes/Copper/Copper_28x1_5.mo new file mode 100644 index 0000000000..2ccf00f8a2 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_28x1_5.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_28x1_5 "Copper 28x1.5" + + extends PipeBaseDataDefinition( + d_i=0.025, + d_o=0.028, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_28x1_5; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_35x1.mo b/AixLib/DataBase/Pipes/Copper/Copper_35x1.mo new file mode 100644 index 0000000000..1669fef67c --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_35x1.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_35x1 "Copper 35x1" + + extends PipeBaseDataDefinition( + d_i=0.033, + d_o=0.035, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_35x1; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_35x1_2.mo b/AixLib/DataBase/Pipes/Copper/Copper_35x1_2.mo new file mode 100644 index 0000000000..809146e0e3 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_35x1_2.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_35x1_2 "Copper 35x1.2" + + extends PipeBaseDataDefinition( + d_i=0.0326, + d_o=0.035, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_35x1_2; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_35x1_5.mo b/AixLib/DataBase/Pipes/Copper/Copper_35x1_5.mo new file mode 100644 index 0000000000..71a87db2e4 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_35x1_5.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_35x1_5 "Copper 35x1.5" + + extends PipeBaseDataDefinition( + d_i=0.032, + d_o=0.035, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_35x1_5; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_40x1.mo b/AixLib/DataBase/Pipes/Copper/Copper_40x1.mo new file mode 100644 index 0000000000..dd9e01af70 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_40x1.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_40x1 "Copper 40x1" + + extends PipeBaseDataDefinition( + d_i=0.038, + d_o=0.04, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_40x1; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_42x1.mo b/AixLib/DataBase/Pipes/Copper/Copper_42x1.mo new file mode 100644 index 0000000000..9dd80adc86 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_42x1.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_42x1 "Copper 42x1" + + extends PipeBaseDataDefinition( + d_i=0.04, + d_o=0.042, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_42x1; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_42x1_2.mo b/AixLib/DataBase/Pipes/Copper/Copper_42x1_2.mo new file mode 100644 index 0000000000..ab74ac1588 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_42x1_2.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_42x1_2 "Copper 42x1.2" + + extends PipeBaseDataDefinition( + d_i=0.0396, + d_o=0.042, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_42x1_2; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_42x1_5.mo b/AixLib/DataBase/Pipes/Copper/Copper_42x1_5.mo new file mode 100644 index 0000000000..03ae1f63f8 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_42x1_5.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_42x1_5 "Copper 42x1.5" + + extends PipeBaseDataDefinition( + d_i=0.039, + d_o=0.042, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_42x1_5; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_54x1.mo b/AixLib/DataBase/Pipes/Copper/Copper_54x1.mo new file mode 100644 index 0000000000..f6d04aa404 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_54x1.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_54x1 "Copper 54x1" + + extends PipeBaseDataDefinition( + d_i=0.052, + d_o=0.054, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_54x1; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_54x1_2.mo b/AixLib/DataBase/Pipes/Copper/Copper_54x1_2.mo new file mode 100644 index 0000000000..1317f74db7 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_54x1_2.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_54x1_2 "Copper 54x1.2" + + extends PipeBaseDataDefinition( + d_i=0.0516, + d_o=0.054, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_54x1_2; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_54x1_5.mo b/AixLib/DataBase/Pipes/Copper/Copper_54x1_5.mo new file mode 100644 index 0000000000..46a06f1ce9 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_54x1_5.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_54x1_5 "Copper 54x1.5" + + extends PipeBaseDataDefinition( + d_i=0.051, + d_o=0.054, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_54x1_5; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_54x2.mo b/AixLib/DataBase/Pipes/Copper/Copper_54x2.mo new file mode 100644 index 0000000000..8173a9c3ee --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_54x2.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_54x2 "Copper 54x2" + + extends PipeBaseDataDefinition( + d_i=0.050, + d_o=0.054, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_54x2; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_64x2.mo b/AixLib/DataBase/Pipes/Copper/Copper_64x2.mo new file mode 100644 index 0000000000..14e0f40200 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_64x2.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_64x2 "Copper 64x2" + + extends PipeBaseDataDefinition( + d_i=0.060, + d_o=0.064, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_64x2; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_66_7x1_2.mo b/AixLib/DataBase/Pipes/Copper/Copper_66_7x1_2.mo new file mode 100644 index 0000000000..544d2c686f --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_66_7x1_2.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_66_7x1_2 "Copper 66.7x1.2" + + extends PipeBaseDataDefinition( + d_i=0.0643, + d_o=0.0667, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_66_7x1_2; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_66_7x2.mo b/AixLib/DataBase/Pipes/Copper/Copper_66_7x2.mo new file mode 100644 index 0000000000..a1c5c897cd --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_66_7x2.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_66_7x2 "Copper 66.7x2" + + extends PipeBaseDataDefinition( + d_i=0.0627, + d_o=0.0667, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_66_7x2; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_6x0_6.mo b/AixLib/DataBase/Pipes/Copper/Copper_6x0_6.mo new file mode 100644 index 0000000000..05430a5c9b --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_6x0_6.mo @@ -0,0 +1,29 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_6x0_6 "Copper 6x0.6" + extends PipeBaseDataDefinition( + d_i=0.0048, + d_o=0.006, + d=8900, + lambda=393, + c=390); + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_6x0_6; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_6x0_8.mo b/AixLib/DataBase/Pipes/Copper/Copper_6x0_8.mo new file mode 100644 index 0000000000..c84ae72c15 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_6x0_8.mo @@ -0,0 +1,30 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_6x0_8 "Copper 6x0.8" + + extends PipeBaseDataDefinition( + d_i=0.0044, + d_o=0.006, + d=8900, + lambda=393, + c=390); + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_6x0_8; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_6x1.mo b/AixLib/DataBase/Pipes/Copper/Copper_6x1.mo new file mode 100644 index 0000000000..d6947a9458 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_6x1.mo @@ -0,0 +1,30 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_6x1 "Copper 6x1" + + extends PipeBaseDataDefinition( + d_i=0.004, + d_o=0.006, + d=8900, + lambda=393, + c=390); + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_6x1; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_76_1x1_5.mo b/AixLib/DataBase/Pipes/Copper/Copper_76_1x1_5.mo new file mode 100644 index 0000000000..2fa474bdf0 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_76_1x1_5.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_76_1x1_5 "Copper 76.1x1.5" + + extends PipeBaseDataDefinition( + d_i=0.0731, + d_o=0.0761, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_76_1x1_5; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_76_1x2.mo b/AixLib/DataBase/Pipes/Copper/Copper_76_1x2.mo new file mode 100644 index 0000000000..9a6f750a31 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_76_1x2.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_76_1x2 "Copper 76.1x2" + + extends PipeBaseDataDefinition( + d_i=0.0721, + d_o=0.0761, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_76_1x2; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_88_9x2.mo b/AixLib/DataBase/Pipes/Copper/Copper_88_9x2.mo new file mode 100644 index 0000000000..d9f232a880 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_88_9x2.mo @@ -0,0 +1,32 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_88_9x2 "Copper 88_9x2" + + extends PipeBaseDataDefinition( + d_i=0.0849, + d_o=0.0889, + d=8900, + lambda=393, + c=390); + // Constant chemical values assumed + + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_88_9x2; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_8x0_6.mo b/AixLib/DataBase/Pipes/Copper/Copper_8x0_6.mo new file mode 100644 index 0000000000..c1deaaf337 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_8x0_6.mo @@ -0,0 +1,30 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_8x0_6 "Copper 8x0.6" + + extends PipeBaseDataDefinition( + d_i=0.0068, + d_o=0.008, + d=8900, + lambda=393, + c=390); + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_8x0_6; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_8x0_8.mo b/AixLib/DataBase/Pipes/Copper/Copper_8x0_8.mo new file mode 100644 index 0000000000..28b42ee4f8 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_8x0_8.mo @@ -0,0 +1,30 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_8x0_8 "Copper 8x0.8" + + extends PipeBaseDataDefinition( + d_i=0.0064, + d_o=0.008, + d=8900, + lambda=393, + c=390); + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_8x0_8; diff --git a/AixLib/DataBase/Pipes/Copper/Copper_8x1.mo b/AixLib/DataBase/Pipes/Copper/Copper_8x1.mo new file mode 100644 index 0000000000..37ea27b6d6 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/Copper_8x1.mo @@ -0,0 +1,30 @@ +within AixLib.DataBase.Pipes.Copper; +record Copper_8x1 "Copper 8x1" + + extends PipeBaseDataDefinition( + d_i=0.006, + d_o=0.008, + d=8900, + lambda=393, + c=390); + annotation (Documentation(revisions=" + +", +info=" +

    Overview

    +

    +Record for copper pipe +

    + + + +

    Source:

    + +")); +end Copper_8x1; diff --git a/AixLib/DataBase/Pipes/Copper/package.mo b/AixLib/DataBase/Pipes/Copper/package.mo new file mode 100644 index 0000000000..0106db2c2c --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/package.mo @@ -0,0 +1,60 @@ +within AixLib.DataBase.Pipes; +package Copper + extends Modelica.Icons.Package; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +end Copper; diff --git a/AixLib/DataBase/Pipes/Copper/package.order b/AixLib/DataBase/Pipes/Copper/package.order new file mode 100644 index 0000000000..20bc5c7e90 --- /dev/null +++ b/AixLib/DataBase/Pipes/Copper/package.order @@ -0,0 +1,56 @@ +Copper_108x1_5 +Copper_108x2_5 +Copper_10x0_6 +Copper_10x0_7 +Copper_10x0_8 +Copper_10x1 +Copper_12x0_6 +Copper_12x0_7 +Copper_12x0_8 +Copper_12x1 +Copper_133x1_5 +Copper_133x3 +Copper_14x0_8 +Copper_14x1 +Copper_159x2 +Copper_159x3 +Copper_15x0_7 +Copper_15x0_8 +Copper_15x1 +Copper_16x1 +Copper_18x0_8 +Copper_18x1 +Copper_219x3 +Copper_22x0_9 +Copper_22x1 +Copper_22x1_1 +Copper_22x1_2 +Copper_22x1_5 +Copper_267x3 +Copper_28x0_9 +Copper_28x1 +Copper_28x1_2 +Copper_28x1_5 +Copper_35x1 +Copper_35x1_2 +Copper_35x1_5 +Copper_40x1 +Copper_42x1 +Copper_42x1_2 +Copper_42x1_5 +Copper_54x1 +Copper_54x1_2 +Copper_54x1_5 +Copper_54x2 +Copper_64x2 +Copper_66_7x1_2 +Copper_66_7x2 +Copper_6x0_6 +Copper_6x0_8 +Copper_6x1 +Copper_76_1x1_5 +Copper_76_1x2 +Copper_88_9x2 +Copper_8x0_6 +Copper_8x0_8 +Copper_8x1 diff --git a/AixLib/DataBase/Pipes/PipeBaseDataDefinition.mo b/AixLib/DataBase/Pipes/PipeBaseDataDefinition.mo index c26e2314c1..dde364b277 100644 --- a/AixLib/DataBase/Pipes/PipeBaseDataDefinition.mo +++ b/AixLib/DataBase/Pipes/PipeBaseDataDefinition.mo @@ -1,23 +1,20 @@ within AixLib.DataBase.Pipes; record PipeBaseDataDefinition "Base data definition of parameter values for pipes" - extends Modelica.Icons.Record; + extends Modelica.Icons.Record; import SI = Modelica.SIunits; - // Constant chemical Values assumed + // Constant chemical values assumed parameter SI.Diameter d_i "Inner pipe diameter"; parameter SI.Diameter d_o "Outer pipe diameter"; parameter SI.Density d "Density of pipe material"; parameter SI.ThermalConductivity lambda - "Thermal Conductivity of pipe material"; + "Thermal conductivity of pipe material"; parameter SI.SpecificHeatCapacity c "Heat capacity of pipe material"; annotation (Documentation(info="

    Overview

    Base data definition for pipes

    -

    References

    -

    Base data definition for record used with HVAC.Components.Pipes.DynamicPipeEBC1

    ", revisions="

    Emission

    < ½ TA Luft

    < ½ TA Luft

    Primärenergieeinsparung PEE (EU-Richtlinie, Prüfung nach DIN 4709)

    22,4 %

    22,4 %

    Primärenergiefaktor fp (EnEV 2009, EN15326)
    diff --git a/AixLib/DataBase/Weather/SurfaceOrientation/SurfaceOrientationData_N_E_S_W_Hor.mo b/AixLib/DataBase/Weather/SurfaceOrientation/SurfaceOrientationData_N_E_S_W_Hor.mo index 047f0e08a4..85b33ee472 100644 --- a/AixLib/DataBase/Weather/SurfaceOrientation/SurfaceOrientationData_N_E_S_W_Hor.mo +++ b/AixLib/DataBase/Weather/SurfaceOrientation/SurfaceOrientationData_N_E_S_W_Hor.mo @@ -7,8 +7,6 @@ record SurfaceOrientationData_N_E_S_W_Hor annotation(Documentation(info = "

    Overview

    Surface Orientation Data for N,E,S and W

    -

    Level of Development

    -

    \"stars:

    Concept

    Data in this set:

    diff --git a/AixLib/DataBase/Weather/SurfaceOrientation/SurfaceOrientationData_N_E_S_W_RoofN_Roof_S.mo b/AixLib/DataBase/Weather/SurfaceOrientation/SurfaceOrientationData_N_E_S_W_RoofN_Roof_S.mo index 24476ada60..cca25a9510 100644 --- a/AixLib/DataBase/Weather/SurfaceOrientation/SurfaceOrientationData_N_E_S_W_RoofN_Roof_S.mo +++ b/AixLib/DataBase/Weather/SurfaceOrientation/SurfaceOrientationData_N_E_S_W_RoofN_Roof_S.mo @@ -7,8 +7,6 @@ record SurfaceOrientationData_N_E_S_W_RoofN_Roof_S annotation(Documentation(info = "

    Overview

    Surface Orientation Data for N,E,S,W,Roof_N and Roof_S suitable to standard OFD.

    -

    Level of Development

    -

    \"stars:

    Concept

    Data in this set:

    diff --git a/AixLib/DataBase/Weather/WinterDay.mo b/AixLib/DataBase/Weather/WinterDay.mo index cca395563a..e07cdc6004 100644 --- a/AixLib/DataBase/Weather/WinterDay.mo +++ b/AixLib/DataBase/Weather/WinterDay.mo @@ -5,8 +5,6 @@ record WinterDay annotation(Documentation(info = "

    Overview

    Very simple source to output weather conditions in the form of outdoor air temperature and solar irraditation. This record includes outdoor conditions for a cold winter day, taken from German Test Reference Year region 1 (TRY 2010_01_Wint.dat) for January 8 2010.

    -

    Level of Development

    -

    \"stars:

    Assumptions

    Values at a certain timestamp represent the average temperature for the time between this timestamp and the timestampt before. E.g. a value with timestamp 3600 expresses the average value for t = [0; 3600]

    Known Limitations

    diff --git a/AixLib/DataBase/WindowsDoors/Simple/OWBaseDataDefinition_Simple.mo b/AixLib/DataBase/WindowsDoors/Simple/OWBaseDataDefinition_Simple.mo index ab82f90db8..8ddfe389d2 100644 --- a/AixLib/DataBase/WindowsDoors/Simple/OWBaseDataDefinition_Simple.mo +++ b/AixLib/DataBase/WindowsDoors/Simple/OWBaseDataDefinition_Simple.mo @@ -11,8 +11,6 @@ record OWBaseDataDefinition_Simple annotation(Documentation(info = "

    Overview

    Base data definition for simple windows.

    -

    Level of Development

    -

    \"stars:

    References

    Base data definition for record to be used in model Building.Components.WindowsDoors.WindowSimple

    ", revisions = " diff --git a/AixLib/DataBase/WindowsDoors/Simple/WindowSimple_ASHRAE140.mo b/AixLib/DataBase/WindowsDoors/Simple/WindowSimple_ASHRAE140.mo index 8ec0732be5..6470710f84 100644 --- a/AixLib/DataBase/WindowsDoors/Simple/WindowSimple_ASHRAE140.mo +++ b/AixLib/DataBase/WindowsDoors/Simple/WindowSimple_ASHRAE140.mo @@ -15,9 +15,6 @@ extends AixLib.DataBase.WindowsDoors.Simple.OWBaseDataDefinition_Simple( info="

    Overview

    Window definition according to standard ASHARE 140 for a simple window.

    -

    Level of Development

    -

    \"stars:

    References

    Record is used in model Building.Components.WindowsDoors.WindowSimple

    Source:

    diff --git a/AixLib/DataBase/WindowsDoors/Simple/WindowSimple_EnEV2002.mo b/AixLib/DataBase/WindowsDoors/Simple/WindowSimple_EnEV2002.mo index 8419709d66..1590ed53e5 100644 --- a/AixLib/DataBase/WindowsDoors/Simple/WindowSimple_EnEV2002.mo +++ b/AixLib/DataBase/WindowsDoors/Simple/WindowSimple_EnEV2002.mo @@ -9,8 +9,6 @@ record WindowSimple_EnEV2002 "Window according to EnEv 2002" ", info = "

    Overview

    Window definition according to EnEV 2002 for a simple window.

    -

    Level of Development

    -

    \"stars:

    References

    Record is used in model Building.Components.WindowsDoors.WindowSimple

    Source:

    diff --git a/AixLib/DataBase/WindowsDoors/Simple/WindowSimple_EnEV2009.mo b/AixLib/DataBase/WindowsDoors/Simple/WindowSimple_EnEV2009.mo index a8f0e76d2a..6f9c09a5f5 100644 --- a/AixLib/DataBase/WindowsDoors/Simple/WindowSimple_EnEV2009.mo +++ b/AixLib/DataBase/WindowsDoors/Simple/WindowSimple_EnEV2009.mo @@ -9,8 +9,6 @@ record WindowSimple_EnEV2009 "Window according to EnEV 2009" ", info="

    Overview

    Window definition according to EnEV 2009 for a simple window.

    -

    Level of Development

    -

    \"stars:

    References

    References

    Record is used in model Building.Components.WindowsDoors.WindowSimple

    diff --git a/AixLib/DataBase/WindowsDoors/Simple/WindowSimple_WSchV1984.mo b/AixLib/DataBase/WindowsDoors/Simple/WindowSimple_WSchV1984.mo index 7c9648d3fc..ea970000ea 100644 --- a/AixLib/DataBase/WindowsDoors/Simple/WindowSimple_WSchV1984.mo +++ b/AixLib/DataBase/WindowsDoors/Simple/WindowSimple_WSchV1984.mo @@ -9,8 +9,6 @@ record WindowSimple_WSchV1984 "Window according to WSchV1984" ", info="

    Overview

    Window definition according to WSchV 1984 for a simple window.

    -

    Level of Development

    -

    \"stars:

    References

    Record is used in model Building.Components.WindowsDoors.WindowSimple

    Source:

    diff --git a/AixLib/DataBase/WindowsDoors/Simple/WindowSimple_WSchV1995.mo b/AixLib/DataBase/WindowsDoors/Simple/WindowSimple_WSchV1995.mo index bf8e6cba5c..8bef9206fd 100644 --- a/AixLib/DataBase/WindowsDoors/Simple/WindowSimple_WSchV1995.mo +++ b/AixLib/DataBase/WindowsDoors/Simple/WindowSimple_WSchV1995.mo @@ -9,8 +9,6 @@ record WindowSimple_WSchV1995 "Window according to WSchV1995" ", info="

    Overview

    Window definition according to WSchV 1995 for a simple window.

    -

    Level of Development

    -

    \"stars:

    References

    Record is used in model Building.Components.WindowsDoors.WindowSimple

    Source:

    diff --git a/AixLib/DataBase/package.order b/AixLib/DataBase/package.order index d861b2ed53..adb80eb671 100644 --- a/AixLib/DataBase/package.order +++ b/AixLib/DataBase/package.order @@ -1,6 +1,5 @@ Boiler CHP -Fans HeatPump Pipes Profiles diff --git a/AixLib/Fluid/Actuators/BaseClasses/ActuatorSignal.mo b/AixLib/Fluid/Actuators/BaseClasses/ActuatorSignal.mo index c85dff708c..a14eb11c2f 100644 --- a/AixLib/Fluid/Actuators/BaseClasses/ActuatorSignal.mo +++ b/AixLib/Fluid/Actuators/BaseClasses/ActuatorSignal.mo @@ -2,17 +2,17 @@ within AixLib.Fluid.Actuators.BaseClasses; model ActuatorSignal "Partial model that implements the filtered opening for valves and dampers" - parameter Boolean filteredOpening=true + parameter Boolean use_inputFilter=true "= true, if opening is filtered with a 2nd order CriticalDamping filter" annotation(Dialog(tab="Dynamics", group="Filtered opening")); parameter Modelica.SIunits.Time riseTime=120 "Rise time of the filter (time to reach 99.6 % of an opening step)" - annotation(Dialog(tab="Dynamics", group="Filtered opening",enable=filteredOpening)); + annotation(Dialog(tab="Dynamics", group="Filtered opening",enable=use_inputFilter)); parameter Modelica.Blocks.Types.Init init=Modelica.Blocks.Types.Init.InitialOutput "Type of initialization (no init/steady state/initial state/initial output)" - annotation(Dialog(tab="Dynamics", group="Filtered opening",enable=filteredOpening)); + annotation(Dialog(tab="Dynamics", group="Filtered opening",enable=use_inputFilter)); parameter Real y_start=1 "Initial value of output" - annotation(Dialog(tab="Dynamics", group="Filtered opening",enable=filteredOpening)); + annotation(Dialog(tab="Dynamics", group="Filtered opening",enable=use_inputFilter)); Modelica.Blocks.Interfaces.RealInput y(min=0, max=1) "Actuator position (0: closed, 1: open)" @@ -28,7 +28,7 @@ model ActuatorSignal // Classes used to implement the filtered opening protected - Modelica.Blocks.Interfaces.RealOutput y_filtered if filteredOpening + Modelica.Blocks.Interfaces.RealOutput y_filtered if use_inputFilter "Filtered valve position in the range 0..1" annotation (Placement(transformation(extent={{40,78},{60,98}}), iconTransformation(extent={{60,50},{80,70}}))); @@ -41,7 +41,7 @@ protected final analogFilter=Modelica.Blocks.Types.AnalogFilter.CriticalDamping, final filterType=Modelica.Blocks.Types.FilterType.LowPass, x(each stateSelect=StateSelect.always)) if - filteredOpening + use_inputFilter "Second order filter to approximate valve opening time, and to improve numerics" annotation (Placement(transformation(extent={{6,81},{20,95}}))); @@ -49,7 +49,7 @@ equation connect(filter.y, y_filtered) annotation (Line( points={{20.7,88},{50,88}}, color={0,0,127})); - if filteredOpening then + if use_inputFilter then connect(y, filter.u) annotation (Line( points={{1.11022e-15,120},{1.11022e-15,88},{4.6,88}}, color={0,0,127})); @@ -69,19 +69,19 @@ equation Line( points={{0,70},{40,70}}), Rectangle( - visible=filteredOpening, + visible=use_inputFilter, extent={{-32,40},{32,100}}, lineColor={0,0,0}, fillColor={135,135,135}, fillPattern=FillPattern.Solid), Ellipse( - visible=filteredOpening, + visible=use_inputFilter, extent={{-32,100},{32,40}}, lineColor={0,0,0}, fillColor={135,135,135}, fillPattern=FillPattern.Solid), Text( - visible=filteredOpening, + visible=use_inputFilter, extent={{-20,92},{20,48}}, lineColor={0,0,0}, fillColor={135,135,135}, @@ -105,6 +105,12 @@ for a description of the filter. ", revisions="

    The package diff --git a/AixLib/Fluid/FMI/Validation/FlowSplitter_u.mo b/AixLib/Fluid/FMI/Validation/FlowSplitter_u.mo index 327503d262..babfce0c67 100644 --- a/AixLib/Fluid/FMI/Validation/FlowSplitter_u.mo +++ b/AixLib/Fluid/FMI/Validation/FlowSplitter_u.mo @@ -95,5 +95,5 @@ First implementation. "), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/FMI/Validation/FlowSplitter_u.mos" "Simulate and plot"), - experiment(StopTime=1)); + experiment(Tolerance=1e-6, StopTime=1.0)); end FlowSplitter_u; diff --git a/AixLib/Fluid/FMI/Validation/HeaterFan.mo b/AixLib/Fluid/FMI/Validation/HeaterFan.mo index c2dffe0a2d..4f1cc5eb3b 100644 --- a/AixLib/Fluid/FMI/Validation/HeaterFan.mo +++ b/AixLib/Fluid/FMI/Validation/HeaterFan.mo @@ -150,7 +150,7 @@ thermofluid flow models are wrapped using input/output blocks. January 22, 2016, by Michael Wetter:
    Corrected type declaration of pressure difference. This is -for #404. +for #404.

  • November 8, 2014, by Michael Wetter:
    @@ -160,5 +160,5 @@ First implementation. "), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/FMI/Validation/HeaterFan.mos" "Simulate and plot"), - experiment(StopTime=1)); + experiment(Tolerance=1e-6, StopTime=1.0)); end HeaterFan; diff --git a/AixLib/Fluid/FMI/Validation/HeaterFanPressureDriven.mo b/AixLib/Fluid/FMI/Validation/HeaterFanPressureDriven.mo index 62f1c096f9..5dea1e68b3 100644 --- a/AixLib/Fluid/FMI/Validation/HeaterFanPressureDriven.mo +++ b/AixLib/Fluid/FMI/Validation/HeaterFanPressureDriven.mo @@ -161,7 +161,7 @@ thermofluid flow models are wrapped using input/output blocks. January 22, 2016, by Michael Wetter:
    Corrected type declaration of pressure difference. This is -for #404. +for #404.
  • November 8, 2014, by Michael Wetter:
    @@ -171,5 +171,5 @@ First implementation. "), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/FMI/Validation/HeaterFanPressureDriven.mos" "Simulate and plot"), - experiment(StopTime=1)); + experiment(Tolerance=1e-6, StopTime=1.0)); end HeaterFanPressureDriven; diff --git a/AixLib/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mo b/AixLib/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mo index 8f1f1548a3..beb8da6f01 100644 --- a/AixLib/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mo +++ b/AixLib/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mo @@ -120,7 +120,7 @@ have been deleted. January 22, 2016, by Michael Wetter:
    Corrected type declaration of pressure difference. This is -for #404. +for #404.
  • November 8, 2014, by Michael Wetter:
    @@ -130,5 +130,5 @@ First implementation. "), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mos" "Simulate and plot"), - experiment(StopTime=1)); + experiment(Tolerance=1e-6, StopTime=1.0)); end HeaterFan_noReverseFlow; diff --git a/AixLib/Fluid/FixedResistances/Examples/CompareFixedResistances.mo b/AixLib/Fluid/FixedResistances/Examples/CompareFixedResistances.mo index d3208a5038..f6fad98521 100644 --- a/AixLib/Fluid/FixedResistances/Examples/CompareFixedResistances.mo +++ b/AixLib/Fluid/FixedResistances/Examples/CompareFixedResistances.mo @@ -3,17 +3,17 @@ model CompareFixedResistances "Compare models FixedResistancesDpM and HydraulicResistance" extends Modelica.Icons.Example; - package Medium = AixLib.Media.Water; - Modelica.Blocks.Sources.Constant PAtm(k=101325) - annotation (Placement(transformation(extent={{66,76},{86,96}}))); - Modelica.Blocks.Sources.Trapezoid - P( - offset=101325, - amplitude=12000, + package Medium = AixLib.Media.Water; + Modelica.Blocks.Sources.Constant PAtm(k=101325) + annotation (Placement(transformation(extent={{66,76},{86,96}}))); + Modelica.Blocks.Sources.Trapezoid P( rising=1, width=0.5, falling=1, - period=3) annotation (Placement(transformation(extent={{-100,70},{-80,90}}))); + period=3, + amplitude=-12000, + offset=101325 + 6000) + annotation (Placement(transformation(extent={{-100,70},{-80,90}}))); AixLib.Fluid.FixedResistances.PressureDrop FRdp( redeclare package Medium = Medium, deltaM=0.3, @@ -23,84 +23,95 @@ model CompareFixedResistances from_dp=true, dp_nominal=10000) annotation (Placement(transformation(extent={{-28,30},{-8,50}}))); - AixLib.Fluid.Sources.Boundary_pT sou1( redeclare package Medium = - Medium, + AixLib.Fluid.Sources.Boundary_pT sou1( + redeclare package Medium = Medium, T=293.15, nPorts=2, - use_p_in=true) annotation (Placement(transformation(extent={{-70,28}, - {-50,48}}))); - AixLib.Fluid.Sources.Boundary_pT sin1( redeclare package Medium = - Medium, + use_p_in=true) + annotation (Placement(transformation(extent={{-70,28},{-50,48}}))); + AixLib.Fluid.Sources.Boundary_pT sin1( + redeclare package Medium = Medium, T=283.15, nPorts=2, - use_p_in=true) annotation (Placement(transformation(extent={{80,28}, - {60,48}}))); - HydraulicResistance HR( + use_p_in=true) + annotation (Placement(transformation(extent={{80,28},{60,48}}))); + HydraulicResistance HR( redeclare package Medium = Medium, - zeta=10000/8, - m_flow_small=0.001, dp_start=P.offset - PAtm.k, m_flow_start=0, - D=sqrt(1/(sqrt(995.586)*Modelica.Constants.pi))) + diameter=sqrt(1/(sqrt(995.586)*Modelica.Constants.pi)), + m_flow_nominal=1, + from_dp=true, + zeta=10000/8) annotation (Placement(transformation(extent={{-28,-10},{-8,10}}))); AixLib.Fluid.Sensors.MassFlowRate masFlo2(redeclare package Medium = Medium) - "Mass flow rate sensor" annotation (Placement(transformation(extent={{0,-10}, - {20,10}}))); - AixLib.Utilities.Diagnostics.AssertEquality assEqu( message= + "Mass flow rate sensor" + annotation (Placement(transformation(extent={{0,-10},{20,10}}))); + AixLib.Utilities.Diagnostics.AssertEquality assEqu(message= "Inputs differ, check that lossless pipe is correctly implemented.", threShold=0.1) "Assert equality of the two mass flow rates" annotation (Placement(transformation(extent={{40,60},{60,80}}))); AixLib.Fluid.Sensors.MassFlowRate masFlo1(redeclare package Medium = Medium) - "Mass flow rate sensor" annotation (Placement(transformation(extent={{20,30}, - {40,50}}))); + "Mass flow rate sensor" + annotation (Placement(transformation(extent={{20,30},{40,50}}))); equation - connect(PAtm.y, sin1.p_in) - annotation (Line(points={{87,86},{94,86},{94,46},{ + connect(PAtm.y, sin1.p_in) annotation (Line(points={{87,86},{94,86},{94,46},{ 82,46}}, color={0,0,127})); connect(P.y, sou1.p_in) annotation (Line(points={{-79,80},{-74,80},{-74,46},{ -72,46}}, color={0,0,127})); - connect(HR.port_b, masFlo2.port_a) annotation (Line(points={{-8,6.10623e-16},{ - -4,-3.36456e-22},{-4,6.10623e-16},{-5.55112e-16,6.10623e-16}}, color={ - 0,127,255})); + connect(HR.port_b, masFlo2.port_a) annotation (Line(points={{-8,6.10623e-16}, + {-4,-3.36456e-22},{-4,6.10623e-16},{-5.55112e-16,6.10623e-16}}, color= + {0,127,255})); connect(FRdp.port_b, masFlo1.port_a) - annotation (Line(points={{-8,40},{20,40}},color={0,127,255})); - connect(sou1.ports[1],FRdp. port_a) annotation (Line( - points={{-50,40},{-28,40}}, - color={0,127,255})); - connect(sou1.ports[2], HR.port_a) annotation (Line(points={{-50,36},{-38,36},{ - -38,6.10623e-16},{-28,6.10623e-16}}, color={0,127,255})); - connect(sin1.ports[1], masFlo1.port_b) annotation (Line( - points={{60,40},{40,40}}, - color={0,127,255})); - connect(sin1.ports[2], masFlo2.port_b) annotation (Line( - points={{60,36},{52,36},{52,6.10623e-16},{20,6.10623e-16}}, - color={0,127,255})); - connect(masFlo2.m_flow, assEqu.u1) annotation (Line( - points={{10,11},{10,76},{38,76}}, - color={0,0,127})); - connect(masFlo1.m_flow, assEqu.u2) annotation (Line( - points={{30,51},{30,64},{38,64}}, - color={0,0,127})); - annotation (experiment(StopTime=3), -__Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/FixedResistancesParallel.mos" + annotation (Line(points={{-8,40},{20,40}}, color={0,127,255})); + connect(sou1.ports[1], FRdp.port_a) + annotation (Line(points={{-50,40},{-28,40}}, color={0,127,255})); + connect(sou1.ports[2], HR.port_a) annotation (Line(points={{-50,36},{-38,36}, + {-38,6.10623e-16},{-28,6.10623e-16}}, color={0,127,255})); + connect(sin1.ports[1], masFlo1.port_b) + annotation (Line(points={{60,40},{40,40}}, color={0,127,255})); + connect(sin1.ports[2], masFlo2.port_b) annotation (Line(points={{60,36},{52, + 36},{52,6.10623e-16},{20,6.10623e-16}}, color={0,127,255})); + connect(masFlo2.m_flow, assEqu.u1) + annotation (Line(points={{10,11},{10,76},{38,76}}, color={0,0,127})); + connect(masFlo1.m_flow, assEqu.u2) + annotation (Line(points={{30,51},{30,64},{38,64}}, color={0,0,127})); + annotation ( + experiment(StopTime=3), + __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/CompareFixedResistances.mos" "Simulate and plot"), __Dymola_experimentSetupOutput, Documentation(info=" -

    Compares the mass flow rate of the two pressure loss models HydraulicResistance -and FixedResistanceDpM. -For small pressure differences (up to 800 Pa) the flow rate of -HydraulicResistance will be larger than the flow rate of FixedResistanceDpM. The -difference is lower than 0.1 kg/s.

    -

    There was a problem with the formulation of the pressure loss calculation (see -issue issue 232). -The following graph shows that the flow direction could have been calculated the -wrong (red line):

    -

    -

    The correct results are shown in the positive curves (thick lines).

    -")); +

    Compares the mass flow rate of the two pressure loss models + HydraulicResistance + and FixedResistanceDpM. + For small pressure differences (up to 800 Pa) the flow rate of + HydraulicResistance will be larger than the flow rate of FixedResistanceDpM. + The difference is lower than 0.1 kg/s.

    +

    The parameters of the two models are chosen in a way to achieve the same pressure drop. + Results visualize the equation handling near zero. + Furthermore, the parameter HR.zeta includes the denominator 8 due to the + calculation of final + dp_nominal=8*zeta*... + in the model + HydraulicResistance.

    +


    + Change parameter HR.from_dp to false and the + simulation time will increase by about 25 %.

    +

    Choosing this parameter depending whether you are using a mass flow source + or a pressure source might improve the stability of the simulation.

    +

    Using a mass flow source and HR.from_dp = false shows similiar + simulation speed as with HR.from_dp = true.

    +", revisions=" + + ")); end CompareFixedResistances; diff --git a/AixLib/Fluid/FixedResistances/Examples/FlowJunction.mo b/AixLib/Fluid/FixedResistances/Examples/FlowJunction.mo index f2b0089bc9..de9eb0dfc5 100644 --- a/AixLib/Fluid/FixedResistances/Examples/FlowJunction.mo +++ b/AixLib/Fluid/FixedResistances/Examples/FlowJunction.mo @@ -91,7 +91,7 @@ equation annotation (Line(points={{30,0},{35,0},{40,0}}, color={0,127,255})); connect(senTem2.port_b, bou2.ports[1]) annotation (Line(points={{60,0},{70,0}}, color={0,127,255})); - annotation (experiment(StopTime=100.0), + annotation (experiment(Tolerance=1e-6, StopTime=100), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/FlowJunction.mos" "Simulate and plot"), Documentation(info=" @@ -111,7 +111,7 @@ Removed import statement. October 14, 2017 by Michael Wetter:
    Updated documentation and added to Annex 60 library.
    This is for -issue 451. +issue 451.
  • July 20, 2007 by Michael Wetter:
    diff --git a/AixLib/Fluid/FixedResistances/Examples/HydraulicDiameter.mo b/AixLib/Fluid/FixedResistances/Examples/HydraulicDiameter.mo index 4cfc7aa588..3d225369fe 100644 --- a/AixLib/Fluid/FixedResistances/Examples/HydraulicDiameter.mo +++ b/AixLib/Fluid/FixedResistances/Examples/HydraulicDiameter.mo @@ -45,7 +45,7 @@ equation annotation (Line(points={{-30,0},{-10,0}}, color={0,127,255})); connect(res.port_b, sin.ports[1]) annotation (Line(points={{10,0},{10,0},{30,0}}, color={0,127,255})); - annotation (experiment(StopTime=1.0), + annotation (experiment(Tolerance=1e-6, StopTime=1.0), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/HydraulicDiameter.mos" "Simulate and plot"), Documentation(info=" @@ -57,7 +57,7 @@ Example model for a fixed resistance that takes as a parameter the hydraulic dia
  • December 1, 2016, by Michael Wetter:
    First implementation for -#480. +#480.
    • ")); diff --git a/AixLib/Fluid/FixedResistances/Examples/PerformanceHydraulicResistance1.mo b/AixLib/Fluid/FixedResistances/Examples/PerformanceHydraulicResistance1.mo deleted file mode 100644 index f347145ed1..0000000000 --- a/AixLib/Fluid/FixedResistances/Examples/PerformanceHydraulicResistance1.mo +++ /dev/null @@ -1,88 +0,0 @@ -within AixLib.Fluid.FixedResistances.Examples; -model PerformanceHydraulicResistance1 - "Assess simulation speed of FixedResistancesDpM" - extends Modelica.Icons.Example; - - package Medium = AixLib.Media.Water; - Modelica.Blocks.Sources.Constant PAtm(k=101325) - annotation (Placement(transformation(extent={{66,76},{86,96}}))); - Modelica.Blocks.Sources.Trapezoid - P( - offset=101325, - amplitude=12000, - rising=1, - width=0.5, - falling=1, - period=3) annotation (Placement(transformation(extent={{-100,70},{-80,90}}))); - AixLib.Fluid.FixedResistances.PressureDrop FRdp( - redeclare package Medium = Medium, - deltaM=0.3, - linearized=false, - m_flow_nominal=1, - dp(start=P.offset - PAtm.k), - dp_nominal=10000, - from_dp=false) - annotation (Placement(transformation(extent={{-28,28},{-8,48}}))); - AixLib.Fluid.Sources.Boundary_pT sou1( redeclare package Medium = - Medium, - T=293.15, - nPorts=1, - use_p_in=true) annotation (Placement(transformation(extent={{-70,28}, - {-50,48}}))); - AixLib.Fluid.Sources.Boundary_pT sin1( redeclare package Medium = - Medium, - T=283.15, - nPorts=1, - use_p_in=true) annotation (Placement(transformation(extent={{80,28}, - {60,48}}))); - AixLib.Fluid.Sensors.MassFlowRate masFlo1(redeclare package Medium = Medium) - "Mass flow rate sensor" annotation (Placement(transformation(extent={{20,28}, - {40,48}}))); - -equation - connect(PAtm.y, sin1.p_in) - annotation (Line(points={{87,86},{94,86},{94,46},{ - 82,46}}, color={0,0,127})); - connect(P.y, sou1.p_in) annotation (Line(points={{-79,80},{-74,80},{-74,46},{ - -72,46}}, color={0,0,127})); - connect(FRdp.port_b, masFlo1.port_a) - annotation (Line(points={{-8,38},{-2,38},{6,38},{20,38}}, - color={0,127,255})); - connect(sou1.ports[1],FRdp. port_a) annotation (Line( - points={{-50,38},{-40,38},{-28,38}}, - color={0,127,255})); - connect(sin1.ports[1], masFlo1.port_b) annotation (Line( - points={{60,38},{50,38},{40,38}}, - color={0,127,255})); - annotation (experiment(StopTime=100000), -__Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/FixedResistancesParallel.mos" - "Simulate and plot"), - __Dymola_experimentSetupOutput, - Diagram(graphics={Text( - extent={{-76,-60},{76,-74}}, - lineColor={28,108,200}, - textString="activate time measurement! - -OutputCPUtime:=true;")}), - __Dymola_experimentFlags( - Advanced(GenerateVariableDependencies=false, OutputModelicaCode=false), - Evaluate=false, - OutputCPUtime=true, - OutputFlatModelica=false), - Documentation(info=" -

    Test the simulation time of the resistance model FixedResistanceDpM. -Use the second test PerformanceHydraulicResistance2 -to test the speed of HydraulicResistance. -

    -

    During the test the pressure difference will go up and down to test all flow -regimes. Especially low pressure differences and mass flow rates will be hard -for the solver. A simulation time of 10000 s was chosen to have a sufficiently -long time for measurment but avoiding extreme simulation times. On an Intel Xeon -E5-2667 @ 2.90 GHz the total simulation time will be around 0.72 s.

    -

    The FixedResistanceDpM model (0.72 s) needs only around 60 % of the -simulation time of the HydraulicResistance model (1.21 s).

    -")); -end PerformanceHydraulicResistance1; diff --git a/AixLib/Fluid/FixedResistances/Examples/PerformanceHydraulicResistance2.mo b/AixLib/Fluid/FixedResistances/Examples/PerformanceHydraulicResistance2.mo deleted file mode 100644 index c27dcc1993..0000000000 --- a/AixLib/Fluid/FixedResistances/Examples/PerformanceHydraulicResistance2.mo +++ /dev/null @@ -1,102 +0,0 @@ -within AixLib.Fluid.FixedResistances.Examples; -model PerformanceHydraulicResistance2 - "Assess simulation speed of HydraulicResistance" - extends Modelica.Icons.Example; - - package Medium = AixLib.Media.Water; - Modelica.Blocks.Sources.Constant PAtm(k=101325) - annotation (Placement(transformation(extent={{66,76},{86,96}}))); - Modelica.Blocks.Sources.Trapezoid - P( - offset=101325, - amplitude=12000, - rising=1, - width=0.5, - falling=1, - period=3) annotation (Placement(transformation(extent={{-100,70},{-80,90}}))); - AixLib.Fluid.Sources.Boundary_pT sou1( redeclare package Medium = - Medium, - T=293.15, - nPorts=1, - use_p_in=true) annotation (Placement(transformation(extent={{-70,28}, - {-50,48}}))); - AixLib.Fluid.Sources.Boundary_pT sin1( redeclare package Medium = - Medium, - T=283.15, - nPorts=1, - use_p_in=true) annotation (Placement(transformation(extent={{80,28}, - {60,48}}))); - HydraulicResistance HR( - redeclare package Medium = Medium, - zeta=10000/8, - m_flow_small=0.001, - dp_start=P.offset - PAtm.k, - m_flow_start=0, - D=sqrt(1/(sqrt(995.586)*Modelica.Constants.pi))) - annotation (Placement(transformation(extent={{-28,-10},{-8,10}}))); - AixLib.Fluid.Sensors.MassFlowRate masFlo2(redeclare package Medium = Medium) - "Mass flow rate sensor" annotation (Placement(transformation(extent={{0,-10}, - {20,10}}))); - -equation - connect(PAtm.y, sin1.p_in) - annotation (Line(points={{87,86},{94,86},{94,46},{ - 82,46}}, color={0,0,127})); - connect(P.y, sou1.p_in) annotation (Line(points={{-79,80},{-74,80},{-74,46},{ - -72,46}}, color={0,0,127})); - connect(HR.port_b, masFlo2.port_a) annotation (Line(points={{-8,6.10623e-16}, - {-4,-3.36456e-22},{-4,6.10623e-16},{-5.55112e-16,6.10623e-16}}, color= - {0,127,255})); - connect(sou1.ports[1], HR.port_a) annotation (Line(points={{-50,38},{-38,38}, - {-38,6.10623e-016},{-28,6.10623e-016}}, color={0,127,255})); - connect(sin1.ports[1], masFlo2.port_b) annotation (Line( - points={{60,38},{52,38},{52,6.10623e-016},{20,6.10623e-016}}, - color={0,127,255})); - annotation (experiment(StopTime=10000), -__Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/FixedResistancesParallel.mos" - "Simulate and plot"), - __Dymola_experimentSetupOutput, - Diagram(graphics={Text( - extent={{-72,-60},{80,-74}}, - lineColor={28,108,200}, - textString="activate time measurement! - -OutputCPUtime:=true;")}), - __Dymola_experimentFlags( - Advanced(GenerateVariableDependencies=false, OutputModelicaCode=false), - Evaluate=false, - OutputCPUtime=true, - OutputFlatModelica=false), - Documentation(info=" -

    Test the simulation time of the resistance model HydraulicResistance. -Use the second test PerformanceHydraulicResistance1 -to test the speed of FixedResistanceDpM. -

    -

    Speed Comparison

    -

    During the test the pressure difference will go up and down to test all flow -regimes. Especially low pressure differences and mass flow rates will be hard -for the solver. A simulation time of 10000 s was chosen to have a sufficiently -long time for measurment but avoiding extreme simulation times. On an Intel Xeon -E5-2667 @ 2.90 GHz the total simulation time will be around 1.21 s.

    The -FixedResistanceDpM model (0.72 s) needs only around 60 % of the simulation -time of the HydraulicResistance model (1.21 s). The following graph showes the -time comparion for a longer simulation time:

    -

    Running both models in parallel (Examples.CompareFixedResistances) -will not add equally to the total simulation time as can be seen in the dotted -green line.

    -

    Reformulation of Pressure Loss Equation

    -

    The equation for the pressure loss has been changed from

    -

    \"dp

    -

    to

    -

    \"dp

    -

    to avoid exponential terms for Pi, D and m_flow as that showed speed improvements and more stable simulation in a weather model some years ago. However, this did not result in speedups for this model and Dymola 2017 as shown in the following graph:

    -

    -")); -end PerformanceHydraulicResistance2; diff --git a/AixLib/Fluid/FixedResistances/Examples/PressureDrop.mo b/AixLib/Fluid/FixedResistances/Examples/PressureDrop.mo index 49537a4f92..90001809a4 100644 --- a/AixLib/Fluid/FixedResistances/Examples/PressureDrop.mo +++ b/AixLib/Fluid/FixedResistances/Examples/PressureDrop.mo @@ -44,7 +44,7 @@ equation annotation (Line(points={{-30,0},{-10,0}}, color={0,127,255})); connect(res.port_b, sin.ports[1]) annotation (Line(points={{10,0},{10,0},{30,0}}, color={0,127,255})); - annotation (experiment(StopTime=1.0), + annotation (experiment(Tolerance=1e-6, StopTime=1.0), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/PressureDrop.mos" "Simulate and plot"), Documentation(info=" @@ -57,7 +57,7 @@ pressure drop at nominal condition.
  • December 1, 2016, by Michael Wetter:
    First implementation for -#480. +#480.
    • ")); diff --git a/AixLib/Fluid/FixedResistances/Examples/package.order b/AixLib/Fluid/FixedResistances/Examples/package.order index 53c9d39b50..85b1f8ff7d 100644 --- a/AixLib/Fluid/FixedResistances/Examples/package.order +++ b/AixLib/Fluid/FixedResistances/Examples/package.order @@ -1,6 +1,4 @@ CompareFixedResistances FlowJunction HydraulicDiameter -PerformanceHydraulicResistance1 -PerformanceHydraulicResistance2 PressureDrop diff --git a/AixLib/Fluid/FixedResistances/HydraulicDiameter.mo b/AixLib/Fluid/FixedResistances/HydraulicDiameter.mo index 21eedaa4fa..1d2760f22b 100644 --- a/AixLib/Fluid/FixedResistances/HydraulicDiameter.mo +++ b/AixLib/Fluid/FixedResistances/HydraulicDiameter.mo @@ -176,7 +176,7 @@ This leads to simpler equations.
  • December 1, 2016, by Michael Wetter:
    First implementation for -#480. +#480.
    • "), diff --git a/AixLib/Fluid/FixedResistances/HydraulicResistance.mo b/AixLib/Fluid/FixedResistances/HydraulicResistance.mo index b8eaf2a677..919fa87222 100644 --- a/AixLib/Fluid/FixedResistances/HydraulicResistance.mo +++ b/AixLib/Fluid/FixedResistances/HydraulicResistance.mo @@ -1,33 +1,108 @@ within AixLib.Fluid.FixedResistances; model HydraulicResistance "Simple model for a hydraulic resistance using a pressure loss factor" - extends AixLib.Fluid.Interfaces.PartialTwoPortTransport; - parameter Real zeta=1.0 "Pressure loss factor for flow of port_a -> port_b"; - parameter Modelica.SIunits.Length D=0.05 "Diameter of component"; + extends AixLib.Fluid.BaseClasses.PartialResistance( + final m_flow(start=m_flow_start), + final dp(start=dp_start), + final dp_nominal=8*zeta*m_flow_nominal*m_flow_nominal/ + (rho_default*Modelica.Constants.pi*Modelica.Constants.pi* + diameter*diameter*diameter*diameter), + final m_flow_turbulent=100*m_flow_nominal); + /* No usage of m_flow_turbulent since zeta approach does not distinguish + between laminar and turbulent flow. */ + + parameter Real zeta(min=0, unit="") + "Pressure loss factor for flow of port_a -> port_b"; + parameter Modelica.SIunits.Diameter diameter "Diameter of component"; + parameter Modelica.SIunits.PressureDifference dp_start(displayUnit="Pa") = 0 + "Guess value of dp = port_a.p - port_b.p" + annotation (Dialog(tab="Advanced")); + parameter Medium.MassFlowRate m_flow_start=0 + "Guess value of m_flow = port_a.m_flow" + annotation (Dialog(tab="Advanced")); + protected - Modelica.SIunits.Density rho "Density of the fluid"; + final parameter Real k(min=0, unit="")= + Modelica.Fluid.Fittings.BaseClasses.lossConstant_D_zeta( + D=diameter, + zeta=zeta) + "Calculate loss coefficient based on diameter and zeta"; + parameter Modelica.SIunits.PressureDifference dp_small=1E-4*abs(dp_nominal) + "Small pressure difference for regularization of zero pressure difference"; + parameter Modelica.SIunits.Density rho_default=Medium.density_pTX( + p=Medium.p_default, + T=Medium.T_default, + X=Medium.X_default[1:Medium.nXi]) "Density at nominal condition"; + + Modelica.SIunits.Density rho_a "Density of the fluid at port_a"; + Modelica.SIunits.Density rho_b "Density of the fluid at port_b"; + +initial equation + assert(m_flow_nominal_pos > 0, + "m_flow_nominal_pos must be non-zero. Check parameters."); + equation - rho = Medium.density(Medium.setState_phX( - port_a.p, - inStream(port_a.h_outflow), - inStream(port_a.Xi_outflow))); - port_a.h_outflow = inStream(port_b.h_outflow); - port_b.h_outflow = inStream(port_a.h_outflow); - dp = sign(m_flow)*8*zeta/(Modelica.Constants.pi*Modelica.Constants.pi*D*D*D*D - *rho)*m_flow*m_flow - "multiplication instead of exponent term for speed improvement"; + + rho_a = Medium.density(Medium.setState_phX( + p=port_a.p, + h=inStream(port_a.h_outflow), + X=inStream(port_a.Xi_outflow))); + + rho_b = Medium.density(Medium.setState_phX( + p=port_b.p, + h=inStream(port_b.h_outflow), + X=inStream(port_b.Xi_outflow))); + + // Pressure drop calculation + if linearized then + m_flow*m_flow_nominal_pos = k*k*dp; + else + if homotopyInitialization then + if from_dp then + m_flow = homotopy(actual=Modelica.Fluid.Utilities.regRoot2( + dp, + dp_small, + rho_a/k, + rho_b/k), simplified=m_flow_nominal_pos*dp/dp_nominal_pos); + else + dp = homotopy(actual=Modelica.Fluid.Utilities.regSquare2( + m_flow, + m_flow_small, + k/rho_a, + k/rho_b), simplified=dp_nominal_pos*m_flow/m_flow_nominal_pos); + end if; // from_dp + else // do not use homotopy + if from_dp then + m_flow = Modelica.Fluid.Utilities.regRoot2( + dp, + dp_small, + rho_a/k, + rho_b/k); + else + dp = Modelica.Fluid.Utilities.regSquare2( + m_flow, + m_flow_small, + k/rho_a, + k/rho_b); + end if; // from_dp + end if; // homotopyInitialization + end if; // linearized + annotation (Icon(graphics={Rectangle( - extent={{-80,46},{80,-34}}, + extent={{-80,40},{80,-40}}, lineColor={0,0,255}, fillColor={255,255,0}, fillPattern=FillPattern.Solid, radius=45), Text( - extent={{32,26},{-30,-10}}, + extent={{74,40},{-74,-42}}, lineColor={0,0,255}, fillColor={255,255,0}, fillPattern=FillPattern.Solid, - textString="Zeta")}), Documentation(revisions=" + textString="Zeta=%zeta")}), Documentation(revisions=" ", info=" -

    Overview

    -

    Very simple model for a hydraulic resistance with the pressureloss modelled with a pressure loss factor, zeta.

    -

    Level of Development

    -

    \"stars:

    -

    Concept

    -

    Values for pressure loss factor zeta can be easily found in tables.

    -

    Example Results

    -

    - AixLib.HVAC.Pumps.Examples.PumpHydraulicResistance_closedLoop

    - ")); +

    Overview

    +

    Simple model for a hydraulic resistance with the pressureloss modelled with the pressure loss factor zeta (ζ).

    +

    Concept

    +

    Values for pressure loss factor zeta can be easily found in tables.

    +

    The following equation represents the dependencies of m_flow(_nominal), dp(_nominal), zeta and the diameter (D).

    +

    Δp = 0.5*ζ*ρ*v*|v|

    +

    = 8*ζ/(π^2*D^4*ρ) * m_flow*|m_flow|

    +


    +Since this a simplified approach to calculate/generate a pressure drop, there exist no distinction between laminar and turbulent flow regarding ζ-values.

    +

    The non-existance of a turbulent flow, the equation handling near zero as well as the different approach of being able to use tabled zeta values, +mainly distinguish this model from +AixLib.Fluid.FixedResistances.PressureDrop.

    +

    Example Results

    +

    AixLib.Fluid.FixedResistances.Examples.CompareFixedResistances

    +")); end HydraulicResistance; diff --git a/AixLib/Fluid/FixedResistances/Junction.mo b/AixLib/Fluid/FixedResistances/Junction.mo index 65d3a28068..cab30a361d 100644 --- a/AixLib/Fluid/FixedResistances/Junction.mo +++ b/AixLib/Fluid/FixedResistances/Junction.mo @@ -125,20 +125,20 @@ Renamed model from SplitterFixedResistanceDpM to FlowJunction and removed the parameters use_dh, dh and ReC.
    This is for -issue 451. +issue 451.
  • October 14, 2016 by Michael Wetter:
    Added to Annex 60 library.
    Updated comment for parameter use_dh.
    This is for -issue 451. +issue 451.
  • Removed parameter dynamicBalance that overwrote the setting of energyDynamics and massDynamics. This is for - + Annex 60, issue 411.
  • diff --git a/AixLib/Fluid/FixedResistances/LosslessPipe.mo b/AixLib/Fluid/FixedResistances/LosslessPipe.mo index 5c146d71e1..2f63b866fa 100644 --- a/AixLib/Fluid/FixedResistances/LosslessPipe.mo +++ b/AixLib/Fluid/FixedResistances/LosslessPipe.mo @@ -28,7 +28,7 @@ equation extent={{-100,50},{100,-48}}, lineColor={0,0,0}, fillPattern=FillPattern.HorizontalCylinder, - fillColor={217,236,256})}), + fillColor={217,236,255})}), defaultComponentName="pip", Documentation(info="

    diff --git a/AixLib/Fluid/FixedResistances/Validation/FlowJunctionSteadyState.mo b/AixLib/Fluid/FixedResistances/Validation/FlowJunctionSteadyState.mo index 70a507994c..39d85dc57b 100644 --- a/AixLib/Fluid/FixedResistances/Validation/FlowJunctionSteadyState.mo +++ b/AixLib/Fluid/FixedResistances/Validation/FlowJunctionSteadyState.mo @@ -7,7 +7,7 @@ model FlowJunctionSteadyState AixLib.Fluid.FixedResistances.Junction spl( redeclare package Medium = Medium, - m_flow_nominal={1,2,3}, + m_flow_nominal={2,2,2}, dp_nominal={5,10,15}, energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState) "Splitter" annotation (Placement(transformation(extent={{10,-10},{30,10}}))); @@ -54,22 +54,19 @@ model FlowJunctionSteadyState AixLib.Fluid.Sensors.TemperatureTwoPort senTem1( redeclare package Medium = Medium, - m_flow_nominal=1, - tau=0) + m_flow_nominal=1) "Temperature sensor" annotation (Placement(transformation(extent={{-20,-10},{0,10}}))); AixLib.Fluid.Sensors.TemperatureTwoPort senTem2( redeclare package Medium = Medium, - m_flow_nominal=2, - tau=0) + m_flow_nominal=2) "Temperature sensor" annotation (Placement(transformation(extent={{40,-10},{60,10}}))); AixLib.Fluid.Sensors.TemperatureTwoPort senTem3( redeclare package Medium = Medium, - m_flow_nominal=3, - tau=0) + m_flow_nominal=3) "Temperature sensor" annotation (Placement(transformation(extent={{-20,-70},{0,-50}}))); equation @@ -91,7 +88,7 @@ equation annotation (Line(points={{30,0},{35,0},{40,0}}, color={0,127,255})); connect(senTem2.port_b, bou2.ports[1]) annotation (Line(points={{60,0},{70,0}}, color={0,127,255})); - annotation (experiment(StopTime=100.0), + annotation (experiment(Tolerance=1e-6, StopTime=100), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/FlowJunctionSteadyState.mos" "Simulate and plot"), Documentation(info=" @@ -105,10 +102,16 @@ The splitter model has been configured as a steady-state model. ", revisions="

    ")); diff --git a/AixLib/Fluid/FixedResistances/Validation/FlowJunctionSteadyStateNoPressureDrop.mo b/AixLib/Fluid/FixedResistances/Validation/FlowJunctionSteadyStateNoPressureDrop.mo index a0a432e520..d95cc7ab85 100644 --- a/AixLib/Fluid/FixedResistances/Validation/FlowJunctionSteadyStateNoPressureDrop.mo +++ b/AixLib/Fluid/FixedResistances/Validation/FlowJunctionSteadyStateNoPressureDrop.mo @@ -7,7 +7,7 @@ model FlowJunctionSteadyStateNoPressureDrop AixLib.Fluid.FixedResistances.Junction spl( redeclare package Medium = Medium, - m_flow_nominal={1,2,3}, + m_flow_nominal={2,2,2}, energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState, dp_nominal={0,0,0}) "Splitter" annotation (Placement(transformation(extent={{10,-10},{30,10}}))); @@ -45,29 +45,26 @@ model FlowJunctionSteadyStateNoPressureDrop Modelica.Blocks.Sources.Ramp m3_flow( height=1, - offset=-1, duration=20, - startTime=70) "Ramp mass flow signal" + startTime=70, + offset=1) "Ramp mass flow signal" annotation (Placement(transformation(extent={{-92,-62},{-72,-42}}))); AixLib.Fluid.Sensors.TemperatureTwoPort senTem1( redeclare package Medium = Medium, - m_flow_nominal=1, - tau=0) + m_flow_nominal=1) "Temperature sensor" annotation (Placement(transformation(extent={{-20,-10},{0,10}}))); AixLib.Fluid.Sensors.TemperatureTwoPort senTem2( redeclare package Medium = Medium, - m_flow_nominal=2, - tau=0) + m_flow_nominal=2) "Temperature sensor" annotation (Placement(transformation(extent={{40,-10},{60,10}}))); AixLib.Fluid.Sensors.TemperatureTwoPort senTem3( redeclare package Medium = Medium, - m_flow_nominal=3, - tau=0) + m_flow_nominal=3) "Temperature sensor" annotation (Placement(transformation(extent={{-20,-70},{0,-50}}))); equation @@ -87,7 +84,7 @@ equation annotation (Line(points={{-69,8},{-60,8}}, color={0,0,127})); connect(m3_flow.y, bou3.m_flow_in) annotation (Line(points={{-71,-52},{-60,-52}}, color={0,0,127})); - annotation (experiment(StopTime=100.0), + annotation (experiment(Tolerance=1e-6, StopTime=100), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/FlowJunctionSteadyStateNoPressureDrop.mos" "Simulate and plot"), Documentation(info=" @@ -102,10 +99,16 @@ with no flow resistance. ", revisions=" ")); diff --git a/AixLib/Fluid/FixedResistances/Validation/LosslessPipe.mo b/AixLib/Fluid/FixedResistances/Validation/LosslessPipe.mo index 75e2a89529..f2ae28a344 100644 --- a/AixLib/Fluid/FixedResistances/Validation/LosslessPipe.mo +++ b/AixLib/Fluid/FixedResistances/Validation/LosslessPipe.mo @@ -42,7 +42,7 @@ equation annotation (Line(points={{10,0},{10,0},{30,0}}, color={0,127,255})); connect(m_flow.y, sou.m_flow_in) annotation (Line(points={{-71,8},{-60.5,8},{-50,8}}, color={0,0,127})); - annotation (experiment(StopTime=1.0), + annotation (experiment(Tolerance=1e-6, StopTime=1.0), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/LosslessPipe.mos" "Simulate and plot"), Documentation(info=" @@ -54,7 +54,7 @@ Validation model for a the pipe model with no friction and no heat loss.
  • December 1, 2016, by Michael Wetter:
    First implementation for -#480. +#480.
    • ")); diff --git a/AixLib/Fluid/FixedResistances/Validation/PressureDropsExplicit.mo b/AixLib/Fluid/FixedResistances/Validation/PressureDropsExplicit.mo index 0986c69dc6..d11d075773 100644 --- a/AixLib/Fluid/FixedResistances/Validation/PressureDropsExplicit.mo +++ b/AixLib/Fluid/FixedResistances/Validation/PressureDropsExplicit.mo @@ -226,7 +226,7 @@ equation color={0,0,127})); annotation (Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100, -100},{160,160}})), -experiment(StartTime=-1, StopTime=1.0), +experiment(StartTime=-1, Tolerance=1e-6, StopTime=1.0), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PressureDropsExplicit.mos" "Simulate and plot"), Documentation(info=" diff --git a/AixLib/Fluid/FixedResistances/Validation/PressureDropsExplicitLinearized.mo b/AixLib/Fluid/FixedResistances/Validation/PressureDropsExplicitLinearized.mo index 797fe62a4f..a60580f65c 100644 --- a/AixLib/Fluid/FixedResistances/Validation/PressureDropsExplicitLinearized.mo +++ b/AixLib/Fluid/FixedResistances/Validation/PressureDropsExplicitLinearized.mo @@ -11,7 +11,7 @@ model PressureDropsExplicitLinearized res41(linearized=true), res42(linearized=true)); annotation ( -experiment(StartTime=-1, StopTime=1.0), +experiment(StartTime=-1, Tolerance=1e-6, StopTime=1.0), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PressureDropsExplicitLinearized.mos" "Simulate and plot"), Documentation(info=" diff --git a/AixLib/Fluid/FixedResistances/Validation/PressureDropsParallel.mo b/AixLib/Fluid/FixedResistances/Validation/PressureDropsParallel.mo index b19566d5cf..3295875ca0 100644 --- a/AixLib/Fluid/FixedResistances/Validation/PressureDropsParallel.mo +++ b/AixLib/Fluid/FixedResistances/Validation/PressureDropsParallel.mo @@ -85,7 +85,7 @@ equation points={{30,51},{30,64},{38,64}}, color={0,0,127})); -annotation (experiment(StopTime=1.0), +annotation (experiment(Tolerance=1e-6, StopTime=1.0), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PressureDropsParallel.mos" "Simulate and plot"), Documentation(info="

    diff --git a/AixLib/Fluid/FixedResistances/Validation/PressureDropsSeries.mo b/AixLib/Fluid/FixedResistances/Validation/PressureDropsSeries.mo index f4874c4555..46bf721754 100644 --- a/AixLib/Fluid/FixedResistances/Validation/PressureDropsSeries.mo +++ b/AixLib/Fluid/FixedResistances/Validation/PressureDropsSeries.mo @@ -50,7 +50,7 @@ equation connect(sou.ports[1], res[1].port_a) annotation (Line( points={{-20,30},{-5.55112e-16,30}}, color={0,127,255})); - annotation (experiment(StopTime=1.0), + annotation (experiment(Tolerance=1e-6, StopTime=1.0), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PressureDropsSeries.mos" "Simulate and plot"), Documentation(info=" diff --git a/AixLib/Fluid/FixedResistances/package.mo b/AixLib/Fluid/FixedResistances/package.mo index 2609980467..894f1c9827 100644 --- a/AixLib/Fluid/FixedResistances/package.mo +++ b/AixLib/Fluid/FixedResistances/package.mo @@ -4,7 +4,7 @@ package FixedResistances "Package with models for fixed flow resistances" annotation (preferredView="info", Documentation(info="

    -This package contains components models for fixed flow resistances. +This package contains component models for fixed flow resistances. By fixed flow resistance, we mean resistances that do not change the flow coefficient

    diff --git a/AixLib/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Convector.mo b/AixLib/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Convector.mo index 483135a4eb..38961be1ac 100644 --- a/AixLib/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Convector.mo +++ b/AixLib/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Convector.mo @@ -139,6 +139,7 @@ equation Documentation(info="

    In cooling mode, this model adds heat to the water stream. The heat added is equal to: +

    QBeam = Qrated fΔT fSA fW

    diff --git a/AixLib/Fluid/HeatExchangers/ActiveBeams/BaseClasses/DerivativesCubicSpline.mo b/AixLib/Fluid/HeatExchangers/ActiveBeams/BaseClasses/DerivativesCubicSpline.mo index 7c58801d5f..89f413b48a 100644 --- a/AixLib/Fluid/HeatExchangers/ActiveBeams/BaseClasses/DerivativesCubicSpline.mo +++ b/AixLib/Fluid/HeatExchangers/ActiveBeams/BaseClasses/DerivativesCubicSpline.mo @@ -51,7 +51,7 @@ and linear extrapolation of predefined values. The predefined values must create December 15, 2016, by Michael Wetter:
    Removed wrong annotations.
    This is for -#629. +#629.
  • June 13, 2016, by Michael Wetter:
    diff --git a/AixLib/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/Convector.mo b/AixLib/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/Convector.mo index 481a72160e..dc27e5c174 100644 --- a/AixLib/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/Convector.mo +++ b/AixLib/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/Convector.mo @@ -46,7 +46,7 @@ equation annotation (Line(points={{50,0},{60,0}}, color={0,127,255})); connect(wat.ports[1], con.port_a) annotation (Line(points={{-60,0},{-30,0},{0,0}}, color={0,127,255})); - annotation (experiment(StopTime=10),__Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/Convector.mos" + annotation (experiment(Tolerance=1e-6, StopTime=10),__Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/Convector.mos" "Simulate and plot"), Documentation(info="

    diff --git a/AixLib/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/DerivateCubicSpline.mo b/AixLib/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/DerivateCubicSpline.mo index c105692815..2f5451a854 100644 --- a/AixLib/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/DerivateCubicSpline.mo +++ b/AixLib/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/DerivateCubicSpline.mo @@ -10,7 +10,7 @@ model DerivateCubicSpline equation connect(clock.y, cubSpl.u) annotation (Line(points={{-39,0},{-12,0}}, color={0,0,127})); - annotation (experiment(StopTime=1),__Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/DerivateCubicSpline.mos" + annotation (experiment(Tolerance=1e-6, StopTime=1.0),__Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/DerivateCubicSpline.mos" "Simulate and plot"), Documentation(info="

    diff --git a/AixLib/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/ModificationFactor.mo b/AixLib/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/ModificationFactor.mo index 92afa2be59..335b18c3a6 100644 --- a/AixLib/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/ModificationFactor.mo +++ b/AixLib/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/ModificationFactor.mo @@ -34,7 +34,7 @@ equation {-12,-3}}, color={0,0,127})); connect(const1.y, mod.TRoo) annotation (Line(points={{-59,-70},{-20,-70},{-20, -8.8},{-12,-8.8}}, color={0,0,127})); - annotation ( experiment(StopTime=1), + annotation ( experiment(Tolerance=1e-6, StopTime=1.0), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/ModificationFactor.mos" "Simulate and plot"), Documentation(info=" diff --git a/AixLib/Fluid/HeatExchangers/ActiveBeams/Data/Trox.mo b/AixLib/Fluid/HeatExchangers/ActiveBeams/Data/Trox.mo index 05028697d1..97d8136ebf 100644 --- a/AixLib/Fluid/HeatExchangers/ActiveBeams/Data/Trox.mo +++ b/AixLib/Fluid/HeatExchangers/ActiveBeams/Data/Trox.mo @@ -1,6 +1,6 @@ within AixLib.Fluid.HeatExchangers.ActiveBeams.Data; package Trox "Performance data for Trox" - record DID632A_nozzleH_lenght6ft_cooling = + record DID632A_nozzleH_length6ft_cooling = AixLib.Fluid.HeatExchangers.ActiveBeams.Data.Generic ( primaryAir( r_V = {0,0.714286, 1,1.2857}, @@ -38,7 +38,7 @@ Performance data for Trox active beam for cooling mode. ")); - record DID632A_nozzleH_lenght6ft_heating = + record DID632A_nozzleH_length6ft_heating = AixLib.Fluid.HeatExchangers.ActiveBeams.Data.Generic ( dT( f = {0,0.5,1}, diff --git a/AixLib/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingAndHeating.mo b/AixLib/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingAndHeating.mo index 5b649750c2..de4536ed38 100644 --- a/AixLib/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingAndHeating.mo +++ b/AixLib/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingAndHeating.mo @@ -92,9 +92,9 @@ model CoolingAndHeating redeclare package MediumWat = MediumW, redeclare package MediumAir = MediumA, redeclare - AixLib.Fluid.HeatExchangers.ActiveBeams.Data.Trox.DID632A_nozzleH_lenght6ft_cooling perCoo, + AixLib.Fluid.HeatExchangers.ActiveBeams.Data.Trox.DID632A_nozzleH_length6ft_cooling perCoo, redeclare - AixLib.Fluid.HeatExchangers.ActiveBeams.Data.Trox.DID632A_nozzleH_lenght6ft_heating perHea, + AixLib.Fluid.HeatExchangers.ActiveBeams.Data.Trox.DID632A_nozzleH_length6ft_heating perHea, energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyStateInitial) "Active Beam" annotation (Placement(transformation(extent={{26,48},{54,72}}))); @@ -140,7 +140,7 @@ equation connect(pumHea.ports[1], beaCooHea.watHea_a) annotation (Line(points={{0,60},{13,60},{26,60}}, color={0,127,255})); annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-120, - -120},{120,120}})),experiment(StopTime=172800),__Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingAndHeating.mos" + -120},{120,120}})),experiment(Tolerance=1e-6, StopTime=172800),__Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingAndHeating.mos" "Simulate and plot"), Icon(coordinateSystem(extent={{-120,-120},{120,120}})), Documentation(info=" @@ -158,7 +158,7 @@ June 25, 2016, by Michael Wetter:
    Changed medium start temperature to avoid conflicting start values of the same precedence in Dymola 2016. See - + issue 485.

  • diff --git a/AixLib/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingOnly.mo b/AixLib/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingOnly.mo index 683abe82c3..23e973ee35 100644 --- a/AixLib/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingOnly.mo +++ b/AixLib/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingOnly.mo @@ -69,7 +69,7 @@ model CoolingOnly redeclare package MediumWat = MediumW, redeclare package MediumAir = MediumA, redeclare - AixLib.Fluid.HeatExchangers.ActiveBeams.Data.Trox.DID632A_nozzleH_lenght6ft_cooling perCoo, + AixLib.Fluid.HeatExchangers.ActiveBeams.Data.Trox.DID632A_nozzleH_length6ft_cooling perCoo, energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial) "Active beam" annotation (Placement(transformation(extent={{26,48},{54,72}}))); equation @@ -104,7 +104,7 @@ equation connect(pum.m_flow_in, conPID.y) annotation (Line(points={{-22,74},{-40,74},{ -40,-10},{-49,-10}}, color={0,0,127})); annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-120, - -120},{120,120}})),experiment(StopTime=172800), + -120},{120,120}})),experiment(Tolerance=1e-6, StopTime=172800), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingOnly.mos" "Simulate and plot"), Icon(coordinateSystem(extent={{-120,-120},{120,120}})), diff --git a/AixLib/Fluid/HeatExchangers/ActiveBeams/Examples/HeatingOnly.mo b/AixLib/Fluid/HeatExchangers/ActiveBeams/Examples/HeatingOnly.mo index 7d7b5b630a..3398edbf88 100644 --- a/AixLib/Fluid/HeatExchangers/ActiveBeams/Examples/HeatingOnly.mo +++ b/AixLib/Fluid/HeatExchangers/ActiveBeams/Examples/HeatingOnly.mo @@ -78,9 +78,9 @@ model HeatingOnly redeclare package MediumWat = MediumW, redeclare package MediumAir = MediumA, redeclare - AixLib.Fluid.HeatExchangers.ActiveBeams.Data.Trox.DID632A_nozzleH_lenght6ft_cooling perCoo, + AixLib.Fluid.HeatExchangers.ActiveBeams.Data.Trox.DID632A_nozzleH_length6ft_cooling perCoo, redeclare - AixLib.Fluid.HeatExchangers.ActiveBeams.Data.Trox.DID632A_nozzleH_lenght6ft_heating perHea, + AixLib.Fluid.HeatExchangers.ActiveBeams.Data.Trox.DID632A_nozzleH_length6ft_heating perHea, energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial) "Active beam" annotation (Placement(transformation(extent={{26,48},{54,72}}))); equation @@ -119,7 +119,7 @@ equation connect(pumHea.m_flow_in, conPID.y) annotation (Line(points={{-20,68},{-40,68}, {-40,-10},{-49,-10}}, color={0,0,127})); annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-120, - -120},{120,120}})),experiment(StopTime=172800),__Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/Examples/HeatingOnly.mos" + -120},{120,120}})),experiment(Tolerance=1e-6, StopTime=172800),__Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/Examples/HeatingOnly.mos" "Simulate and plot"), Icon(coordinateSystem(extent={{-120,-120},{120,120}})), Documentation(info=" diff --git a/AixLib/Fluid/HeatExchangers/ActiveBeams/UsersGuide.mo b/AixLib/Fluid/HeatExchangers/ActiveBeams/UsersGuide.mo index 1222e40988..a579ee2f9d 100644 --- a/AixLib/Fluid/HeatExchangers/ActiveBeams/UsersGuide.mo +++ b/AixLib/Fluid/HeatExchangers/ActiveBeams/UsersGuide.mo @@ -130,7 +130,7 @@ The model can be configured to be steady-state or dynamic. If configured as dynamic, then a dynamic conservation equation is applied to the water streams for heating and for cooling. However, because the capacity of the beam depends on its inlet temperature, and is independent of the -outlet temperature, the heat transfered +outlet temperature, the heat transferred to the room at the port heaPor.Q_flow, as well as the heat added to or removed from the water streams, will instantaneously change. The only dynamic responses are the water outlet temperatures, which change with a first diff --git a/AixLib/Fluid/HeatExchangers/ActiveBeams/Validation/NumberOfBeams.mo b/AixLib/Fluid/HeatExchangers/ActiveBeams/Validation/NumberOfBeams.mo index 8ad6679d8e..457faa5c7e 100644 --- a/AixLib/Fluid/HeatExchangers/ActiveBeams/Validation/NumberOfBeams.mo +++ b/AixLib/Fluid/HeatExchangers/ActiveBeams/Validation/NumberOfBeams.mo @@ -33,9 +33,8 @@ model NumberOfBeams m_flow_nominal=0.094, addPowerToMedium=false, energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState, - filteredSpeed=false, - nominalValuesDefineDefaultPressureCurve=true) - "Pump for hot water" + use_inputFilter=false, + nominalValuesDefineDefaultPressureCurve=true) "Pump for hot water" annotation (Placement(transformation(extent={{-60,30},{-40,50}}))); AixLib.Fluid.Sources.FixedBoundary sou_2( redeclare package Medium = MediumW, @@ -50,17 +49,16 @@ model NumberOfBeams m_flow_nominal=0.094, addPowerToMedium=false, energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState, - filteredSpeed=false, - nominalValuesDefineDefaultPressureCurve=true) - "Pump for chilled water" + use_inputFilter=false, + nominalValuesDefineDefaultPressureCurve=true) "Pump for chilled water" annotation (Placement(transformation(extent={{-60,70},{-40,90}}))); AixLib.Fluid.HeatExchangers.ActiveBeams.CoolingAndHeating beaCooHea( redeclare package MediumWat = MediumW, redeclare package MediumAir = MediumA, redeclare - AixLib.Fluid.HeatExchangers.ActiveBeams.Data.Trox.DID632A_nozzleH_lenght6ft_cooling perCoo, + AixLib.Fluid.HeatExchangers.ActiveBeams.Data.Trox.DID632A_nozzleH_length6ft_cooling perCoo, redeclare - AixLib.Fluid.HeatExchangers.ActiveBeams.Data.Trox.DID632A_nozzleH_lenght6ft_heating perHea, + AixLib.Fluid.HeatExchangers.ActiveBeams.Data.Trox.DID632A_nozzleH_length6ft_heating perHea, nBeams=1, energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState) "Active beam" @@ -83,9 +81,8 @@ model NumberOfBeams addPowerToMedium=false, m_flow_nominal=0.094*nBeams, energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState, - filteredSpeed=false, - nominalValuesDefineDefaultPressureCurve=true) - "Pump for hot water" + use_inputFilter=false, + nominalValuesDefineDefaultPressureCurve=true) "Pump for hot water" annotation (Placement(transformation(extent={{-60,-90},{-40,-70}}))); AixLib.Fluid.Movers.FlowControlled_m_flow pumChiWat10( @@ -93,19 +90,18 @@ model NumberOfBeams addPowerToMedium=false, m_flow_nominal=0.094*nBeams, energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState, - filteredSpeed=false, - nominalValuesDefineDefaultPressureCurve=true) - "Pump for chilled water" + use_inputFilter=false, + nominalValuesDefineDefaultPressureCurve=true) "Pump for chilled water" annotation (Placement(transformation(extent={{-60,-50},{-40,-30}}))); AixLib.Fluid.HeatExchangers.ActiveBeams.CoolingAndHeating beaCooHea10( redeclare package MediumWat = MediumW, redeclare package MediumAir = MediumA, redeclare - AixLib.Fluid.HeatExchangers.ActiveBeams.Data.Trox.DID632A_nozzleH_lenght6ft_cooling + AixLib.Fluid.HeatExchangers.ActiveBeams.Data.Trox.DID632A_nozzleH_length6ft_cooling perCoo, redeclare - AixLib.Fluid.HeatExchangers.ActiveBeams.Data.Trox.DID632A_nozzleH_lenght6ft_heating + AixLib.Fluid.HeatExchangers.ActiveBeams.Data.Trox.DID632A_nozzleH_length6ft_heating perHea, nBeams=nBeams, energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState) @@ -184,7 +180,7 @@ equation {{0,28},{0,28},{0,-10},{0,-40},{50,-40},{50,-150},{-40,-150}}, color={191, 0,0})); annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-200, - -180},{120,120}})),experiment(StopTime=5000), + -180},{120,120}})),experiment(Tolerance=1e-6, StopTime=5000), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/Validation/NumberOfBeams.mos" "Simulate and plot"), Documentation(info=" diff --git a/AixLib/Fluid/HeatExchangers/ActiveBeams/Validation/NumberOfBeamsDynamics.mo b/AixLib/Fluid/HeatExchangers/ActiveBeams/Validation/NumberOfBeamsDynamics.mo index 5ed6ea8140..3ae0e7b26e 100644 --- a/AixLib/Fluid/HeatExchangers/ActiveBeams/Validation/NumberOfBeamsDynamics.mo +++ b/AixLib/Fluid/HeatExchangers/ActiveBeams/Validation/NumberOfBeamsDynamics.mo @@ -20,7 +20,7 @@ model NumberOfBeamsDynamics step3(startTime=200), step2(startTime=300)); annotation ( -experiment(StopTime=500), +experiment(Tolerance=1e-6, StopTime=500), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/Validation/NumberOfBeamsDynamics.mos" "Simulate and plot"), Documentation(info=" diff --git a/AixLib/Fluid/HeatExchangers/BaseClasses/PartialEffectiveness.mo b/AixLib/Fluid/HeatExchangers/BaseClasses/PartialEffectiveness.mo index bcbaeef8ba..85c3c191bf 100644 --- a/AixLib/Fluid/HeatExchangers/BaseClasses/PartialEffectiveness.mo +++ b/AixLib/Fluid/HeatExchangers/BaseClasses/PartialEffectiveness.mo @@ -91,7 +91,7 @@ equation annotation ( Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100, 100}}), graphics={Rectangle( - extent={{-70,78},{70,-82}}, + extent={{-70,78},{70,-80}}, lineColor={0,0,255}, pattern=LinePattern.None, fillColor={95,95,95}, diff --git a/AixLib/Fluid/HeatExchangers/BaseClasses/PartialPrescribedOutlet.mo b/AixLib/Fluid/HeatExchangers/BaseClasses/PartialPrescribedOutlet.mo new file mode 100644 index 0000000000..a298bbe840 --- /dev/null +++ b/AixLib/Fluid/HeatExchangers/BaseClasses/PartialPrescribedOutlet.mo @@ -0,0 +1,99 @@ +within AixLib.Fluid.HeatExchangers.BaseClasses; +partial model PartialPrescribedOutlet + "Ideal heater, cooler, humidifier or dehumidifier with prescribed outlet conditions" + extends AixLib.Fluid.Interfaces.PartialTwoPortInterface; + extends AixLib.Fluid.Interfaces.TwoPortFlowResistanceParameters( + final computeFlowResistance=(abs(dp_nominal) > Modelica.Constants.eps)); + + + parameter Modelica.SIunits.MassFlowRate m_flow_nominal + "Nominal mass flow rate, used for regularization near zero flow" + annotation(Dialog(group = "Nominal condition")); + + parameter Modelica.SIunits.Time tau(min=0) = 10 + "Time constant at nominal flow rate (used if energyDynamics or massDynamics not equal Modelica.Fluid.Types.Dynamics.SteadyState)" + annotation(Dialog(tab = "Dynamics")); + + parameter Boolean homotopyInitialization = true "= true, use homotopy method" + annotation(Evaluate=true, Dialog(tab="Advanced")); + +protected + AixLib.Fluid.FixedResistances.PressureDrop preDro( + redeclare final package Medium = Medium, + final m_flow_nominal=m_flow_nominal, + final deltaM=deltaM, + final allowFlowReversal=allowFlowReversal, + final show_T=false, + final from_dp=from_dp, + final linearized=linearizeFlowResistance, + final homotopyInitialization=homotopyInitialization, + final dp_nominal=dp_nominal) "Flow resistance" + annotation (Placement(transformation(extent={{-50,-10},{-30,10}}))); + + AixLib.Fluid.Interfaces.PrescribedOutlet outCon( + redeclare final package Medium = Medium, + final allowFlowReversal=allowFlowReversal, + final m_flow_small=m_flow_small, + final show_T=false, + final m_flow_nominal=m_flow_nominal, + final tau=tau) "Model to set outlet conditions" + annotation (Placement(transformation(extent={{20,-10},{40,10}}))); +equation + connect(port_a, preDro.port_a) annotation (Line( + points={{-100,0},{-50,0}}, + color={0,127,255})); + connect(preDro.port_b,outCon. port_a) annotation (Line( + points={{-30,0},{20,0}}, + color={0,127,255})); + connect(outCon.port_b, port_b) annotation (Line( + points={{40,0},{100,0}}, + color={0,127,255})); + annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100, + -100},{100,100}}), graphics={ + Rectangle( + extent={{-102,5},{99,-5}}, + lineColor={0,0,255}, + pattern=LinePattern.None, + fillColor={0,0,0}, + fillPattern=FillPattern.Solid), + Rectangle( + extent={{-70,60},{70,-60}}, + lineColor={0,0,255}, + pattern=LinePattern.None, + fillColor={95,95,95}, + fillPattern=FillPattern.Solid)}), +defaultComponentName="hea", +Documentation(info=" +

    +Base class for model for an ideal heater, cooler, humidifier or dehumidifier +with a prescribed outlet conditions. +

    +

    +Models that extend this model need to configure the instance outCon +and connect its input signals, in they are enabled. +

    +", +revisions=" + +")); +end PartialPrescribedOutlet; diff --git a/AixLib/Fluid/HeatExchangers/BaseClasses/package.mo b/AixLib/Fluid/HeatExchangers/BaseClasses/package.mo index 7b8f8c9960..4a4017ef89 100644 --- a/AixLib/Fluid/HeatExchangers/BaseClasses/package.mo +++ b/AixLib/Fluid/HeatExchangers/BaseClasses/package.mo @@ -1,6 +1,7 @@ within AixLib.Fluid.HeatExchangers; package BaseClasses "Package with base classes for AixLib.Fluid.HeatExchangers" extends Modelica.Icons.BasesPackage; + annotation (preferredView="info", Documentation(info="

    This package contains base classes that are used to construct the models in diff --git a/AixLib/Fluid/HeatExchangers/BaseClasses/package.order b/AixLib/Fluid/HeatExchangers/BaseClasses/package.order index 98736afb81..ea8c096468 100644 --- a/AixLib/Fluid/HeatExchangers/BaseClasses/package.order +++ b/AixLib/Fluid/HeatExchangers/BaseClasses/package.order @@ -1,2 +1,3 @@ PartialEffectiveness PartialHeatGen +PartialPrescribedOutlet diff --git a/AixLib/Fluid/HeatExchangers/Examples/AirHeater_T.mo b/AixLib/Fluid/HeatExchangers/Examples/AirHeater_T.mo index ce5db78e32..f7c0286fe6 100644 --- a/AixLib/Fluid/HeatExchangers/Examples/AirHeater_T.mo +++ b/AixLib/Fluid/HeatExchangers/Examples/AirHeater_T.mo @@ -8,15 +8,16 @@ model AirHeater_T Q_flow_nominal=30*6*6, mov(dp_nominal=1200, nominalValuesDefineDefaultPressureCurve=true)); - AixLib.Fluid.HeatExchangers.HeaterCooler_T hea( + Heater_T hea( redeclare package Medium = Medium, m_flow_nominal=m_flow_nominal, dp_nominal=1000, - Q_flow_maxCool=0, energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, - Q_flow_maxHeat=Q_flow_nominal) "Heater" + QMax_flow=Q_flow_nominal) "Heater" annotation (Placement(transformation(extent={{-20,-50},{0,-30}}))); + Controls.SetPoints.Table tab(table=[0,273.15 + 15; 1,273.15 + 30]) + "Temperature set point" annotation (Placement(transformation(extent={{-30,20},{-10,40}}))); equation connect(hea.port_b, THeaOut.port_a) annotation (Line( @@ -26,7 +27,7 @@ equation points={{-39,30},{-32,30}}, color={0,0,127})); connect(tab.y, hea.TSet) annotation (Line( - points={{-9,30},{-6,30},{-6,-20},{-32,-20},{-32,-34},{-22,-34}}, + points={{-9,30},{-6,30},{-6,-20},{-32,-20},{-32,-32},{-22,-32}}, color={0,0,127})); connect(mov.port_b, hea.port_a) annotation (Line(points={{-50,-40},{-35,-40}, {-20,-40}}, color={0,127,255})); @@ -50,6 +51,13 @@ for a model that takes the heating power as an input. ", revisions="

    -"), - Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{ - 100,100}}))); +")); end Carnot_TCon_reverseFlow; diff --git a/AixLib/Fluid/HeatPumps/Validation/Carnot_y_etaCar.mo b/AixLib/Fluid/HeatPumps/Validation/Carnot_y_etaCar.mo index efd8e854f1..58dddc30ce 100644 --- a/AixLib/Fluid/HeatPumps/Validation/Carnot_y_etaCar.mo +++ b/AixLib/Fluid/HeatPumps/Validation/Carnot_y_etaCar.mo @@ -5,7 +5,7 @@ model Carnot_y_etaCar heaPum(use_eta_Carnot_nominal=true, etaCarnot_nominal=0.494805)); - annotation (experiment(StopTime=3600), + annotation (experiment(Tolerance=1e-6, StopTime=3600), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/Carnot_y_etaCar.mos" "Simulate and plot"), Documentation(info=" diff --git a/AixLib/Fluid/HeatPumps/Validation/Carnot_y_etaPL.mo b/AixLib/Fluid/HeatPumps/Validation/Carnot_y_etaPL.mo index 6d094105c0..0e8f680038 100644 --- a/AixLib/Fluid/HeatPumps/Validation/Carnot_y_etaPL.mo +++ b/AixLib/Fluid/HeatPumps/Validation/Carnot_y_etaPL.mo @@ -5,7 +5,7 @@ model Carnot_y_etaPL T1_start=303.15, T2_start=278.15)); - annotation (experiment(StopTime=3600), + annotation (experiment(Tolerance=1e-6, StopTime=3600), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/Carnot_y_etaPL.mos" "Simulate and plot"), Documentation(info=" diff --git a/AixLib/Fluid/HeatPumps/Validation/package.mo b/AixLib/Fluid/HeatPumps/Validation/package.mo index f43bfa7b17..4d301813a4 100644 --- a/AixLib/Fluid/HeatPumps/Validation/package.mo +++ b/AixLib/Fluid/HeatPumps/Validation/package.mo @@ -2,7 +2,6 @@ within AixLib.Fluid.HeatPumps; package Validation "Collection of models that validate the heat pump models" extends Modelica.Icons.ExamplesPackage; - annotation (preferredView="info", Documentation(info="

    This package contains models that validate the heat pump models. diff --git a/AixLib/Fluid/HeatPumps/package.mo b/AixLib/Fluid/HeatPumps/package.mo index 34b2ecd766..e14b977690 100644 --- a/AixLib/Fluid/HeatPumps/package.mo +++ b/AixLib/Fluid/HeatPumps/package.mo @@ -1,9 +1,9 @@ within AixLib.Fluid; -package HeatPumps +package HeatPumps "Package with models for heat pumps" extends Modelica.Icons.VariantsPackage; annotation (preferredView="info", Documentation(info="

    -This package contains components models for heat pumps. +This package contains component models for heat pumps.

    ")); diff --git a/AixLib/Fluid/MassExchangers/Examples/Humidifier_u.mo b/AixLib/Fluid/Humidifiers/Examples/Humidifier_u.mo similarity index 92% rename from AixLib/Fluid/MassExchangers/Examples/Humidifier_u.mo rename to AixLib/Fluid/Humidifiers/Examples/Humidifier_u.mo index e28307f823..21ee83d927 100644 --- a/AixLib/Fluid/MassExchangers/Examples/Humidifier_u.mo +++ b/AixLib/Fluid/Humidifiers/Examples/Humidifier_u.mo @@ -1,4 +1,4 @@ -within AixLib.Fluid.MassExchangers.Examples; +within AixLib.Fluid.Humidifiers.Examples; model Humidifier_u "Model that demonstrates the ideal humidifier model" extends Modelica.Icons.Example; @@ -15,7 +15,7 @@ model Humidifier_u "Model that demonstrates the ideal humidifier model" m_flow=2*m_flow_nominal, T=303.15) "Source" annotation (Placement(transformation(extent={{-82,40},{-62,60}}))); - AixLib.Fluid.MassExchangers.Humidifier_u humSte( + AixLib.Fluid.Humidifiers.Humidifier_u humSte( redeclare package Medium = Medium, m_flow_nominal=m_flow_nominal, dp_nominal=6000, @@ -24,8 +24,8 @@ model Humidifier_u "Model that demonstrates the ideal humidifier model" energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState) "Steady-state model of the humidifier" annotation (Placement(transformation(extent={{0,90},{20,110}}))); - AixLib.Fluid.Sensors.TemperatureTwoPort senTem1(redeclare package Medium - = Medium, m_flow_nominal=m_flow_nominal) "Temperature sensor" + AixLib.Fluid.Sensors.TemperatureTwoPort senTem1(redeclare package Medium = + Medium, m_flow_nominal=m_flow_nominal) "Temperature sensor" annotation (Placement(transformation(extent={{40,90},{60,110}}))); Modelica.Blocks.Sources.TimeTable TSet(table=[0, 273.15 + 30; 120, 273.15 + 30; 120, 273.15 + 25; 1200, 273.15 + 25]) "Setpoint" @@ -37,7 +37,7 @@ model Humidifier_u "Model that demonstrates the ideal humidifier model" controllerType=Modelica.Blocks.Types.SimpleController.PI, reverseAction=true) "Controller" annotation (Placement(transformation(extent={{40,140},{60,160}}))); - AixLib.Fluid.MassExchangers.Humidifier_u humDyn( + AixLib.Fluid.Humidifiers.Humidifier_u humDyn( redeclare package Medium = Medium, m_flow_nominal=m_flow_nominal, dp_nominal=6000, @@ -46,8 +46,8 @@ model Humidifier_u "Model that demonstrates the ideal humidifier model" massDynamics=Modelica.Fluid.Types.Dynamics.SteadyState, T_start=303.15) "Dynamic model of the humidifier" annotation (Placement(transformation(extent={{0,-20},{20,0}}))); - AixLib.Fluid.Sensors.TemperatureTwoPort senTem2(redeclare package Medium - = Medium, m_flow_nominal=m_flow_nominal) "Temperature sensor" + AixLib.Fluid.Sensors.TemperatureTwoPort senTem2(redeclare package Medium = + Medium, m_flow_nominal=m_flow_nominal) "Temperature sensor" annotation (Placement(transformation(extent={{40,-20},{60,0}}))); AixLib.Controls.Continuous.LimPID con2( Td=1, @@ -105,7 +105,7 @@ equation Diagram(coordinateSystem(preserveAspectRatio=false,extent={{-100,-100},{200, 200}}), graphics), __Dymola_Commands(file= - "modelica://AixLib/Resources/Scripts/Dymola/Fluid/MassExchangers/Examples/Humidifier_u.mos" + "modelica://AixLib/Resources/Scripts/Dymola/Fluid/Humidifiers/Examples/Humidifier_u.mos" "Simulate and plot"), Documentation(info="

    @@ -132,5 +132,5 @@ First implementation. "), experiment( StopTime=1200, - Tolerance=1e-05)); + Tolerance=1e-06)); end Humidifier_u; diff --git a/AixLib/Fluid/Humidifiers/Examples/package.mo b/AixLib/Fluid/Humidifiers/Examples/package.mo new file mode 100644 index 0000000000..e6e12f3083 --- /dev/null +++ b/AixLib/Fluid/Humidifiers/Examples/package.mo @@ -0,0 +1,12 @@ +within AixLib.Fluid.Humidifiers; +package Examples "Collection of models that illustrate model use and test models" + extends Modelica.Icons.ExamplesPackage; + +annotation (preferredView="info", Documentation(info=" +

    +This package contains examples for the use of models that can be found in + +AixLib.Fluid.Humidifiers. +

    +")); +end Examples; diff --git a/AixLib/Fluid/Humidifiers/Examples/package.order b/AixLib/Fluid/Humidifiers/Examples/package.order new file mode 100644 index 0000000000..4b07492b8c --- /dev/null +++ b/AixLib/Fluid/Humidifiers/Examples/package.order @@ -0,0 +1 @@ +Humidifier_u diff --git a/AixLib/Fluid/MassExchangers/Humidifier_u.mo b/AixLib/Fluid/Humidifiers/Humidifier_u.mo similarity index 53% rename from AixLib/Fluid/MassExchangers/Humidifier_u.mo rename to AixLib/Fluid/Humidifiers/Humidifier_u.mo index a41ff04899..ffc67fec1a 100644 --- a/AixLib/Fluid/MassExchangers/Humidifier_u.mo +++ b/AixLib/Fluid/Humidifiers/Humidifier_u.mo @@ -1,4 +1,4 @@ -within AixLib.Fluid.MassExchangers; +within AixLib.Fluid.Humidifiers; model Humidifier_u "Ideal humidifier or dehumidifier with prescribed water mass flow rate addition or subtraction" extends AixLib.Fluid.Interfaces.TwoPortHeatMassExchanger( @@ -7,86 +7,106 @@ model Humidifier_u redeclare final AixLib.Fluid.MixingVolumes.MixingVolumeMoistAir vol( final prescribedHeatFlowRate=true)); - parameter Boolean use_T_in= false - "Get the temperature from the input connector" - annotation(Evaluate=true, HideResult=true); - - parameter Modelica.SIunits.Temperature T = 293.15 - "Temperature of water that is added to the fluid stream (used if use_T_in=false)" - annotation (Dialog(enable = not use_T_in)); - parameter Modelica.SIunits.MassFlowRate mWat_flow_nominal "Water mass flow rate at u=1, positive for humidification"; - Modelica.Blocks.Interfaces.RealInput T_in if use_T_in - "Temperature of water added to the fluid stream" - annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}))); - Modelica.Blocks.Interfaces.RealInput u "Control input" + Modelica.Blocks.Interfaces.RealInput u(unit="1") "Control input" annotation (Placement(transformation( - extent={{-140,40},{-100,80}}))); + extent={{-140,40},{-100,80}}), iconTransformation(extent={{-120,50},{ + -100,70}}))); + + Modelica.Blocks.Interfaces.RealOutput mWat_flow(unit="kg/s") + "Water added to the fluid" + annotation (Placement(transformation(extent={{100,50},{120,70}}))); + + Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a heatPort + "Heat port for total heat exchange with the control volume" + annotation (Placement(transformation(extent={{-110,-70},{-90,-50}}))); + protected - Modelica.Blocks.Interfaces.RealInput T_in_internal - "Needed to connect to conditional connector"; - Modelica.Blocks.Math.Gain gai(k=mWat_flow_nominal) "Gain" + Modelica.Blocks.Math.Gain gai(final k=mWat_flow_nominal) "Gain" annotation (Placement(transformation(extent={{-80,50},{-60,70}}))); - Modelica.Blocks.Sources.RealExpression TWat(y=T_in_internal) - "Temperature of the water" - annotation (Placement(transformation(extent={{-80,72},{-52,96}}))); -equation - // Conditional connect statement - connect(T_in, T_in_internal); - if not use_T_in then - T_in_internal = T; - end if; +equation connect(u, gai.u) annotation (Line( points={{-120,60},{-82,60}}, color={0,0,127})); connect(gai.y, vol.mWat_flow) annotation (Line( points={{-59,60},{-30,60},{-30,-18},{-11,-18}}, color={0,0,127})); - connect(vol.TWat, TWat.y) annotation (Line( - points={{-11,-14.8},{-20,-14.8},{-20,84},{-50.6,84}}, - color={0,0,127})); + connect(vol.heatPort, heatPort) annotation (Line(points={{-9,-10},{-20,-10},{-20, + -60},{-100,-60}}, color={191,0,0})); + + connect(gai.y, mWat_flow) + annotation (Line(points={{-59,60},{110,60},{110,60}}, color={0,0,127})); annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100, -100},{100,100}}), graphics={ + Text( + extent={{-52,-60},{58,-120}}, + textString="m=%m_flow_nominal", + pattern=LinePattern.None, + lineColor={0,0,127}), Rectangle( - extent={{-70,80},{70,-80}}, + extent={{-100,61},{-70,58}}, lineColor={0,0,255}, pattern=LinePattern.None, - fillColor={85,170,255}, + fillColor={0,0,127}, fillPattern=FillPattern.Solid), + Text( + extent={{-114,104},{-70,76}}, + lineColor={0,0,127}, + textString="u"), Rectangle( - extent={{-102,5},{99,-5}}, + visible=use_T_in, + extent={{-100,-59},{-70,-62}}, + lineColor={0,0,0}, + pattern=LinePattern.None, + fillColor={191,0,0}, + fillPattern=FillPattern.Solid), + Rectangle( + extent={{-100,5},{101,-5}}, lineColor={0,0,255}, pattern=LinePattern.None, fillColor={0,0,0}, fillPattern=FillPattern.Solid), - Text( - extent={{-56,-12},{54,-72}}, - lineColor={0,0,255}, - textString="m=%m_flow_nominal"), Rectangle( - extent={{-100,61},{-70,58}}, + extent={{-70,60},{70,-60}}, lineColor={0,0,255}, pattern=LinePattern.None, - fillColor={0,0,127}, + fillColor={0,62,0}, + fillPattern=FillPattern.Solid), + Polygon( + points={{42,42},{54,34},{54,34},{42,28},{42,30},{50,34},{50,34},{42, + 40},{42,42}}, + lineColor={255,255,255}, + fillColor={255,255,255}, fillPattern=FillPattern.Solid), - Text( - extent={{-144,114},{-100,86}}, - lineColor={0,0,255}, - textString="u"), - Text( - visible=use_T_in, - extent={{-140,-20},{-96,-48}}, - lineColor={0,0,255}, - textString="T"), Rectangle( - visible=use_T_in, - extent={{-100,-59},{-70,-62}}, + extent={{58,-54},{54,52}}, + lineColor={255,255,255}, + fillColor={255,255,255}, + fillPattern=FillPattern.Solid), + Rectangle( + extent={{70,61},{100,58}}, lineColor={0,0,255}, pattern=LinePattern.None, - fillColor={255,0,0}, + fillColor={0,0,127}, + fillPattern=FillPattern.Solid), + Text( + extent={{30,112},{96,58}}, + lineColor={0,0,127}, + textString="mWat_flow"), + Polygon( + points={{42,10},{54,2},{54,2},{42,-4},{42,-2},{50,2},{50,2},{42,8},{ + 42,10}}, + lineColor={255,255,255}, + fillColor={255,255,255}, + fillPattern=FillPattern.Solid), + Polygon( + points={{42,-26},{54,-34},{54,-34},{42,-40},{42,-38},{50,-34},{50,-34}, + {42,-28},{42,-26}}, + lineColor={255,255,255}, + fillColor={255,255,255}, fillPattern=FillPattern.Solid)}), defaultComponentName="hum", Documentation(info=" @@ -107,19 +127,26 @@ The parameter mWat_flow_nominal can be positive or negative. If ṁwat is positive, then moisture is added to the air stream, otherwise it is removed.

    -

    If the connector T_in is left unconnected, the value -set by the parameter T is used for the temperature of the water that is -added to the air stream. -

    -This model can only be used with medium models that define the integer constant -Water which needs to be equal to the index of the water mass fraction -in the species vector. +If the heat port heatPort is unconnected, then the enthalpy of the +air that flows through the device remains unchanged, e.g., the humidification +is adiabatic. To change the enthalpy of the air, add heat flow to the connector +heatPort.

    ", revisions=" ")); end Humidifier_u; - diff --git a/AixLib/Fluid/Humidifiers/SprayAirWasher_X.mo b/AixLib/Fluid/Humidifiers/SprayAirWasher_X.mo new file mode 100644 index 0000000000..6c36d7f9f2 --- /dev/null +++ b/AixLib/Fluid/Humidifiers/SprayAirWasher_X.mo @@ -0,0 +1,199 @@ +within AixLib.Fluid.Humidifiers; +model SprayAirWasher_X + "Spray air washer with leaving water mass fraction as input" + extends AixLib.Fluid.HeatExchangers.BaseClasses.PartialPrescribedOutlet( + outCon( + final T_start=293.15, + final X_start=X_start, + final use_TSet = true, + final use_X_wSet = true, + final QMax_flow = Modelica.Constants.inf, + final QMin_flow = -Modelica.Constants.inf, + final mWatMax_flow = mWatMax_flow, + final mWatMin_flow = 0, + final energyDynamics = Modelica.Fluid.Types.Dynamics.SteadyState, + final massDynamics = massDynamics)); + + parameter Modelica.SIunits.MassFlowRate mWatMax_flow(min=0) = Modelica.Constants.inf + "Maximum water mass flow rate addition (positive)" + annotation (Evaluate=true); + + parameter Modelica.SIunits.MassFraction X_start[Medium.nX] = Medium.X_default + "Start value of mass fractions m_i/m" + annotation (Dialog(tab="Initialization")); + + // Dynamics + parameter Modelica.Fluid.Types.Dynamics massDynamics = Modelica.Fluid.Types.Dynamics.SteadyState + "Type of mass balance: dynamic (3 initialization options) or steady state" + annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations")); + + // Set maximum to a high value to avoid users mistakenly entering relative humidity. + Modelica.Blocks.Interfaces.RealInput X_w( + unit="1", + min=0, + max=0.03) + "Set point for water vapor mass fraction in kg/kg total air of the fluid that leaves port_b" + annotation (Placement(transformation(extent={{-140,40},{-100,80}}))); + + Modelica.Blocks.Interfaces.RealOutput mWat_flow(unit="kg/s") + "Water added to the fluid (if flow is from port_a to port_b)" + annotation (Placement(transformation(extent={{100,50},{120,70}}))); + +protected + constant Modelica.SIunits.SpecificEnthalpy hSte = Medium.enthalpyOfLiquid(T=283.15) + "Enthalpy of water at 10 degree Celsius"; + + Modelica.SIunits.SpecificEnthalpy hLea= + inStream(port_a.h_outflow) + + {hSte} * (port_b.Xi_outflow - inStream(port_a.Xi_outflow)) + "Approximation of leaving enthalpy, based on dh/dx=h_fg"; + + Modelica.Blocks.Sources.RealExpression TLea(y= + Medium.temperature_phX(p = port_b.p, + h = hLea, + X = port_b.Xi_outflow)) "Leaving air temperature" + annotation (Placement(transformation(extent={{-10,10},{10,30}}))); +equation + connect(X_w, outCon.X_wSet) + annotation (Line(points={{-120,60},{-20,60},{-20,4},{19,4}}, + color={0,0,127})); + connect(outCon.mWat_flow, mWat_flow) annotation (Line(points={{41,4},{80,4},{80, + 60},{110,60}}, color={0,0,127})); + + connect(TLea.y, outCon.TSet) + annotation (Line(points={{11,20},{14,20},{14,8},{19,8}}, color={0,0,127})); + + annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100, + -100},{100,100}}), graphics={ + Rectangle( + extent={{-70,60},{70,-60}}, + lineColor={0,0,255}, + pattern=LinePattern.None, + fillColor={0,62,0}, + fillPattern=FillPattern.Solid), + Text( + extent={{-100,98},{-64,80}}, + lineColor={0,0,127}, + textString="X_w"), + Text( + extent={{32,116},{98,62}}, + lineColor={0,0,127}, + textString="mWat_flow"), + Rectangle( + extent={{-100,62},{-70,58}}, + lineColor={0,0,255}, + pattern=LinePattern.None, + fillColor={0,0,127}, + fillPattern=FillPattern.Solid), + Rectangle( + extent={{70,62},{100,58}}, + lineColor={0,0,255}, + pattern=LinePattern.None, + fillColor={0,0,127}, + fillPattern=FillPattern.Solid), + Rectangle( + extent={{-64,34},{-34,54}}, + lineColor={0,0,0}, + fillColor={255,255,255}, + fillPattern=FillPattern.Solid), + Line(points={{-64,34},{-52,44},{-64,54}}, color={0,0,0}), + Rectangle( + extent={{58,-54},{54,52}}, + lineColor={255,255,255}, + fillColor={255,255,255}, + fillPattern=FillPattern.Solid), + Polygon( + points={{42,-26},{54,-34},{54,-34},{42,-40},{42,-38},{50,-34},{50,-34}, + {42,-28},{42,-26}}, + lineColor={255,255,255}, + fillColor={255,255,255}, + fillPattern=FillPattern.Solid), + Polygon( + points={{42,10},{54,2},{54,2},{42,-4},{42,-2},{50,2},{50,2},{42,8},{ + 42,10}}, + lineColor={255,255,255}, + fillColor={255,255,255}, + fillPattern=FillPattern.Solid), + Polygon( + points={{42,42},{54,34},{54,34},{42,28},{42,30},{50,34},{50,34},{42, + 40},{42,42}}, + lineColor={255,255,255}, + fillColor={255,255,255}, + fillPattern=FillPattern.Solid)}), +defaultComponentName="hum", +Documentation(info=" +

    +Model for a spray air washer with a prescribed outlet water vapor mass fraction +in kg/kg total air. +

    +

    +This model forces the outlet water mass fraction at port_b to be +no lower than the +input signal X_wSet, subject to optional limits on the +maximum water vapor mass flow rate that is added, as +described by the parameter mWatMax_flow. +By default, the model has unlimited capacity. +

    +

    +The output signal mWat_flow ≥ 0 is the moisture added +to the medium if the flow rate is from port_a to port_b. +If the flow is reversed, then mWat_flow = 0. +The outlet specific enthalpy at port_b is increased by +the enthalpy of liquid water at 10°C times the mass of water that was added. +Therefore, the temperature of the leaving fluid is below the inlet temperature. +

    +

    +The outlet conditions at port_a are not affected by this model, +other than for a possible pressure difference due to flow friction. +

    +

    +If the parameter energyDynamics is different from +Modelica.Fluid.Types.Dynamics.SteadyState, +the component models the dynamic response using a first order differential equation. +The time constant of the component is equal to the parameter tau. +This time constant is adjusted based on the mass flow rate using +

    +

    +τeff = τ |ṁ| ⁄ ṁnom +

    +

    +where +τeff is the effective time constant for the given mass flow rate +ṁ and +τ is the time constant at the nominal mass flow rate +ṁnom. +This type of dynamics is equal to the dynamics that a completely mixed +control volume would have. +

    +

    +Optionally, this model can have a flow resistance. +Set dp_nominal = 0 to disable the flow friction calculation. +

    +

    +For a model that uses a control signal u ∈ [0, 1] and multiplies +this with the nominal water mass flow rate, use + +AixLib.Fluid.Humidifiers.Humidifier_u + +

    +

    Limitations

    +

    +This model only adds water vapor for the flow from +port_a to port_b. +The water vapor of the reverse flow is not affected by this model. +

    +

    +This model does not affect the enthalpy of the air. Therefore, +if water is added, the temperature will decrease, e.g., the humidification +is adiabatic. +

    +", +revisions=" + +")); +end SprayAirWasher_X; diff --git a/AixLib/Fluid/Humidifiers/SteamHumidifier_X.mo b/AixLib/Fluid/Humidifiers/SteamHumidifier_X.mo new file mode 100644 index 0000000000..29b62441a5 --- /dev/null +++ b/AixLib/Fluid/Humidifiers/SteamHumidifier_X.mo @@ -0,0 +1,271 @@ +within AixLib.Fluid.Humidifiers; +model SteamHumidifier_X + "Steam humidifier with leaving water mass fraction as input" + extends AixLib.Fluid.HeatExchangers.BaseClasses.PartialPrescribedOutlet( + outCon( + final T_start=293.15, + final X_start=X_start, + final use_TSet = true, + final use_X_wSet = true, + final QMax_flow = Modelica.Constants.inf, + final QMin_flow = -Modelica.Constants.inf, + final mWatMax_flow = mWatMax_flow, + final mWatMin_flow = 0, + final energyDynamics = Modelica.Fluid.Types.Dynamics.SteadyState, + final massDynamics = massDynamics)); + + parameter Modelica.SIunits.MassFlowRate mWatMax_flow(min=0) = Modelica.Constants.inf + "Maximum water mass flow rate addition (positive)" + annotation (Evaluate=true); + + parameter Modelica.SIunits.MassFraction X_start[Medium.nX] = Medium.X_default + "Start value of mass fractions m_i/m" + annotation (Dialog(tab="Initialization")); + + // Dynamics + parameter Modelica.Fluid.Types.Dynamics massDynamics = Modelica.Fluid.Types.Dynamics.SteadyState + "Type of mass balance: dynamic (3 initialization options) or steady state" + annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations")); + + // Set maximum to a high value to avoid users mistakenly entering relative humidity. + Modelica.Blocks.Interfaces.RealInput X_w( + unit="1", + min=0, + max=0.03) + "Set point for water vapor mass fraction in kg/kg total air of the fluid that leaves port_b" + annotation (Placement(transformation(extent={{-140,40},{-100,80}}))); + + Modelica.Blocks.Interfaces.RealOutput mWat_flow(unit="kg/s") + "Water added to the fluid (if flow is from port_a to port_b)" + annotation (Placement(transformation(extent={{100,50},{120,70}}))); + + Modelica.Blocks.Interfaces.RealOutput Q_flow(unit="W") + "Heat flow rate added to the fluid (if flow is from port_a to port_b)" + annotation (Placement(transformation(extent={{100,70},{120,90}}))); +protected + constant Modelica.SIunits.SpecificEnthalpy hSte = Medium.enthalpyOfCondensingGas(T=373.15) + "Enthalpy of steam at 100 degree Celsius"; + + Modelica.SIunits.SpecificEnthalpy hLea= + inStream(port_a.h_outflow) + + {hSte} * (port_b.Xi_outflow - inStream(port_a.Xi_outflow)) + "Approximation of leaving enthalpy, based on dh/dx=h_fg"; + + Modelica.Blocks.Sources.RealExpression TLea(y= + Medium.temperature_phX(p = port_b.p, + h = hLea, + X = port_b.Xi_outflow)) "Leaving air temperature" + annotation (Placement(transformation(extent={{-10,10},{10,30}}))); +equation + connect(X_w, outCon.X_wSet) + annotation (Line(points={{-120,60},{-20,60},{-20,4},{19,4}}, + color={0,0,127})); + connect(outCon.mWat_flow, mWat_flow) annotation (Line(points={{41,4},{80,4},{80, + 60},{110,60}}, color={0,0,127})); + + connect(Q_flow, outCon.Q_flow) annotation (Line(points={{110,80},{90,80},{60,80}, + {60,8},{41,8}}, color={0,0,127})); + connect(TLea.y, outCon.TSet) + annotation (Line(points={{11,20},{14,20},{14,8},{19,8}}, color={0,0,127})); + annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100, + -100},{100,100}}), graphics={ + Rectangle( + extent={{-70,60},{70,-60}}, + lineColor={0,0,255}, + pattern=LinePattern.None, + fillColor={0,62,0}, + fillPattern=FillPattern.Solid), + Text( + extent={{-100,98},{-64,80}}, + lineColor={0,0,127}, + textString="X_w"), + Text( + extent={{72,68},{138,14}}, + lineColor={0,0,127}, + textString="mWat_flow"), + Rectangle( + extent={{-100,62},{-70,58}}, + lineColor={0,0,255}, + pattern=LinePattern.None, + fillColor={0,0,127}, + fillPattern=FillPattern.Solid), + Rectangle( + extent={{70,62},{100,58}}, + lineColor={0,0,255}, + pattern=LinePattern.None, + fillColor={0,0,127}, + fillPattern=FillPattern.Solid), + Rectangle( + extent={{-64,34},{-34,54}}, + lineColor={0,0,0}, + fillColor={255,255,255}, + fillPattern=FillPattern.Solid), + Line(points={{-64,34},{-52,44},{-64,54}}, color={0,0,0}), + Rectangle( + extent={{44,-54},{40,52}}, + fillColor={255,101,101}, + fillPattern=FillPattern.Solid, + pattern=LinePattern.None), + Polygon( + points={{28,-26},{40,-34},{40,-34},{28,-40},{28,-38},{36,-34},{36,-34}, + {28,-28},{28,-26}}, + fillColor={255,101,101}, + fillPattern=FillPattern.Solid, + pattern=LinePattern.None), + Polygon( + points={{28,10},{40,2},{40,2},{28,-4},{28,-2},{36,2},{36,2},{28,8},{28, + 10}}, + fillColor={255,101,101}, + fillPattern=FillPattern.Solid, + pattern=LinePattern.None), + Polygon( + points={{28,42},{40,34},{40,34},{28,28},{28,30},{36,34},{36,34},{28,40}, + {28,42}}, + fillColor={255,101,101}, + fillPattern=FillPattern.Solid, + pattern=LinePattern.None), + Rectangle( + extent={{70,82},{100,78}}, + lineColor={0,0,255}, + pattern=LinePattern.None, + fillColor={0,0,127}, + fillPattern=FillPattern.Solid), + Rectangle( + extent={{66,60},{70,82}}, + lineColor={0,0,255}, + pattern=LinePattern.None, + fillColor={0,0,127}, + fillPattern=FillPattern.Solid), + Text( + extent={{72,108},{120,92}}, + lineColor={0,0,127}, + textString="Q_flow"), + Polygon( + points={{56,-26},{44,-34},{44,-34},{56,-40},{56,-38},{48,-34},{48,-34}, + {56,-28},{56,-26}}, + fillColor={255,101,101}, + fillPattern=FillPattern.Solid, + pattern=LinePattern.None), + Polygon( + points={{56,10},{44,2},{44,2},{56,-4},{56,-2},{48,2},{48,2},{56,8},{56, + 10}}, + fillColor={255,101,101}, + fillPattern=FillPattern.Solid, + pattern=LinePattern.None), + Polygon( + points={{56,42},{44,34},{44,34},{56,28},{56,30},{48,34},{48,34},{56,40}, + {56,42}}, + fillColor={255,101,101}, + fillPattern=FillPattern.Solid, + pattern=LinePattern.None), + Rectangle( + extent={{-4,-54},{-8,52}}, + fillColor={255,101,101}, + fillPattern=FillPattern.Solid, + pattern=LinePattern.None), + Polygon( + points={{8,-26},{-4,-34},{-4,-34},{8,-40},{8,-38},{0,-34},{0,-34},{8,-28}, + {8,-26}}, + fillColor={255,101,101}, + fillPattern=FillPattern.Solid, + pattern=LinePattern.None), + Polygon( + points={{-20,-26},{-8,-34},{-8,-34},{-20,-40},{-20,-38},{-12,-34},{-12, + -34},{-20,-28},{-20,-26}}, + fillColor={255,101,101}, + fillPattern=FillPattern.Solid, + pattern=LinePattern.None), + Polygon( + points={{-20,10},{-8,2},{-8,2},{-20,-4},{-20,-2},{-12,2},{-12,2},{-20, + 8},{-20,10}}, + fillColor={255,101,101}, + fillPattern=FillPattern.Solid, + pattern=LinePattern.None), + Polygon( + points={{8,10},{-4,2},{-4,2},{8,-4},{8,-2},{0,2},{0,2},{8,8},{8,10}}, + fillColor={255,101,101}, + fillPattern=FillPattern.Solid, + pattern=LinePattern.None), + Polygon( + points={{8,42},{-4,34},{-4,34},{8,28},{8,30},{0,34},{0,34},{8,40},{8,42}}, + fillColor={255,101,101}, + fillPattern=FillPattern.Solid, + pattern=LinePattern.None), + Polygon( + points={{-20,42},{-8,34},{-8,34},{-20,28},{-20,30},{-12,34},{-12,34},{ + -20,40},{-20,42}}, + fillColor={255,101,101}, + fillPattern=FillPattern.Solid, + pattern=LinePattern.None)}), +defaultComponentName="hum", +Documentation(info=" +

    +Model for a steam humidifier with a prescribed outlet water vapor mass fraction +in kg/kg total air. +

    +

    +This model forces the outlet water mass fraction at port_b to be +no lower than the +input signal X_wSet, subject to optional limits on the +maximum water vapor mass flow rate that is added, as +described by the parameter mWatMax_flow. +By default, the model has unlimited capacity. +

    +

    +The output signal mWat_flow ≥ 0 is the moisture added +to the medium if the flow rate is from port_a to port_b. +If the flow is reversed, then mWat_flow = 0. +The outlet specific enthalpy at port_b is increased by +the enthalpy of steam at 100°C times the mass of steam that was added. +Therefore, the temperature of the leaving fluid is slightly above the inlet temperature. +

    +

    +The outlet conditions at port_a are not affected by this model, +other than for a possible pressure difference due to flow friction. +

    +

    +If the parameter energyDynamics is different from +Modelica.Fluid.Types.Dynamics.SteadyState, +the component models the dynamic response using a first order differential equation. +The time constant of the component is equal to the parameter tau. +This time constant is adjusted based on the mass flow rate using +

    +

    +τeff = τ |ṁ| ⁄ ṁnom +

    +

    +where +τeff is the effective time constant for the given mass flow rate +ṁ and +τ is the time constant at the nominal mass flow rate +ṁnom. +This type of dynamics is equal to the dynamics that a completely mixed +control volume would have. +

    +

    +Optionally, this model can have a flow resistance. +Set dp_nominal = 0 to disable the flow friction calculation. +

    +

    +For a model that uses a control signal u ∈ [0, 1] and multiplies +this with the nominal water mass flow rate, use + +AixLib.Fluid.Humidifiers.Humidifier_u + +

    +

    Limitations

    +

    +This model only adds water vapor for the flow from +port_a to port_b. +The water vapor of the reverse flow is not affected by this model. +

    +", +revisions=" + +")); +end SteamHumidifier_X; diff --git a/AixLib/Fluid/Humidifiers/Validation/SprayAirWasher_X.mo b/AixLib/Fluid/Humidifiers/Validation/SprayAirWasher_X.mo new file mode 100644 index 0000000000..11671d1931 --- /dev/null +++ b/AixLib/Fluid/Humidifiers/Validation/SprayAirWasher_X.mo @@ -0,0 +1,91 @@ +within AixLib.Fluid.Humidifiers.Validation; +model SprayAirWasher_X + "Model that demonstrates the spray air washer model, configured as steady-state" + extends Modelica.Icons.Example; + + package Medium = AixLib.Media.Air; + + parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.1 + "Nominal mass flow rate"; + + parameter Modelica.SIunits.MassFlowRate mWat_flow_nominal = m_flow_nominal * 0.004 + "Maximum humidification water mass flow rate"; + + AixLib.Fluid.Sources.Boundary_pT sin( + redeclare package Medium = Medium, + use_T_in=false, + p(displayUnit="Pa"), + T=293.15, + nPorts=1) "Sink" + annotation (Placement(transformation(extent={{-10,10},{10,-10}},rotation=180,origin={110,0}))); + + replaceable AixLib.Fluid.Humidifiers.SprayAirWasher_X hum( + mWatMax_flow=mWat_flow_nominal, + massDynamics=Modelica.Fluid.Types.Dynamics.SteadyState) + constrainedby + AixLib.Fluid.HeatExchangers.BaseClasses.PartialPrescribedOutlet( + redeclare package Medium = Medium, + m_flow_nominal=m_flow_nominal, + dp_nominal=6000, + show_T=true) "Humidifier with capacity limitation" + annotation (Placement(transformation(extent={{20,-10},{40,10}}))); + + Sources.MassFlowSource_T sou1( + redeclare package Medium = Medium, + nPorts=1, + m_flow=m_flow_nominal, + T=293.15) "Flow source" + annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); + + Modelica.Blocks.Sources.CombiTimeTable XSet( + tableOnFile=false, + table=[ + 0.0, 0.01; + 1*180, 0.012; + 2*180, 0.015; + 3*180, 0.01; + 4*180, 0.008; + 5*180, 0.004; + 6*180, 0.01], + smoothness=Modelica.Blocks.Types.Smoothness.ConstantSegments, + extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic) + "Set point for humidity" + annotation (Placement(transformation(extent={{-40,40},{-20,60}}))); + + AixLib.Fluid.Sensors.MassFractionTwoPort senHum( + redeclare package Medium = Medium, + m_flow_nominal=m_flow_nominal, + tau=0) "Mass fraction sensor" + annotation (Placement(transformation(extent={{60,-10},{80,10}}))); + +equation + connect(sou1.ports[1], hum.port_a) + annotation (Line(points={{-40,0},{-10,0},{20,0}}, color={0,127,255})); + connect(XSet.y[1], hum.X_w) annotation (Line(points={{-19,50},{0,50},{0,6},{18, + 6}}, color={0,0,127})); + connect(hum.port_b, senHum.port_a) + annotation (Line(points={{40,0},{60,0}}, color={0,127,255})); + connect(senHum.port_b, sin.ports[1]) annotation (Line(points={{80,0},{92,0},{ + 100,0},{100,1.11022e-15}}, color={0,127,255})); + annotation (Diagram(coordinateSystem(preserveAspectRatio=false,extent={{-100, + -100},{200,200}})), + __Dymola_Commands(file= "modelica://AixLib/Resources/Scripts/Dymola/Fluid/Humidifiers/Validation/SprayAirWasher_X.mos" + "Simulate and plot"), + Documentation(info=" +

    +Model that validates the use of a spray air washer +configured as a steady-state model with limits on the maximum water mass flow rate +that is added to the air stream. +

    +", revisions=" + +"), + experiment( + StopTime=1080, + Tolerance=1e-6)); +end SprayAirWasher_X; diff --git a/AixLib/Fluid/Humidifiers/Validation/SprayAirWasher_X_dynamic.mo b/AixLib/Fluid/Humidifiers/Validation/SprayAirWasher_X_dynamic.mo new file mode 100644 index 0000000000..2c2f310dbe --- /dev/null +++ b/AixLib/Fluid/Humidifiers/Validation/SprayAirWasher_X_dynamic.mo @@ -0,0 +1,29 @@ +within AixLib.Fluid.Humidifiers.Validation; +model SprayAirWasher_X_dynamic + "Model that demonstrates the spray air washer model, configured as dynamic model" + extends AixLib.Fluid.Humidifiers.Validation.SprayAirWasher_X( + hum( + mWatMax_flow=mWat_flow_nominal, + massDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)); + +annotation ( + __Dymola_Commands(file= "modelica://AixLib/Resources/Scripts/Dymola/Fluid/Humidifiers/Validation/SprayAirWasher_X_dynamic.mos" + "Simulate and plot"), + Documentation(info=" +

    +Model that validates the use of a spray air washer +configured as a dynamic model with limits on the maximum water mass flow rate +that is added to the air stream. +

    +", revisions=" + +"), + experiment( + StopTime=1080, + Tolerance=1e-6)); +end SprayAirWasher_X_dynamic; diff --git a/AixLib/Fluid/Humidifiers/Validation/SteamHumidifier_X.mo b/AixLib/Fluid/Humidifiers/Validation/SteamHumidifier_X.mo new file mode 100644 index 0000000000..b56ca52e2d --- /dev/null +++ b/AixLib/Fluid/Humidifiers/Validation/SteamHumidifier_X.mo @@ -0,0 +1,30 @@ +within AixLib.Fluid.Humidifiers.Validation; +model SteamHumidifier_X + "Model that demonstrates the steam humidifier model, configured as steady-state model" + import AixLib; + extends AixLib.Fluid.Humidifiers.Validation.SprayAirWasher_X( + redeclare AixLib.Fluid.Humidifiers.SteamHumidifier_X hum( + mWatMax_flow=mWat_flow_nominal, + massDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)); + +annotation ( + __Dymola_Commands(file= "modelica://AixLib/Resources/Scripts/Dymola/Fluid/Humidifiers/Validation/SteamHumidifier_X.mos" + "Simulate and plot"), + Documentation(info=" +

    +Model that validates the use of a spray air washer +configured as a steady-state model with limits on the maximum water mass flow rate +that is added to the air stream. +

    +", revisions=" + +"), + experiment( + StopTime=1080, + Tolerance=1e-6)); +end SteamHumidifier_X; diff --git a/AixLib/Fluid/Humidifiers/Validation/SteamHumidifier_X_dynamic.mo b/AixLib/Fluid/Humidifiers/Validation/SteamHumidifier_X_dynamic.mo new file mode 100644 index 0000000000..fe68aa0eae --- /dev/null +++ b/AixLib/Fluid/Humidifiers/Validation/SteamHumidifier_X_dynamic.mo @@ -0,0 +1,29 @@ +within AixLib.Fluid.Humidifiers.Validation; +model SteamHumidifier_X_dynamic + "Model that demonstrates the steam humidifier model, configured as dynamic model" + extends AixLib.Fluid.Humidifiers.Validation.SprayAirWasher_X( + redeclare AixLib.Fluid.Humidifiers.SteamHumidifier_X hum( + mWatMax_flow=mWat_flow_nominal, + massDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)); + +annotation ( + __Dymola_Commands(file= "modelica://AixLib/Resources/Scripts/Dymola/Fluid/Humidifiers/Validation/SteamHumidifier_X_dynamic.mos" + "Simulate and plot"), + Documentation(info=" +

    +Model that validates the use of a spray air washer +configured as a dynamic model with limits on the maximum water mass flow rate +that is added to the air stream. +

    +", revisions=" + +"), + experiment( + StopTime=1080, + Tolerance=1e-6)); +end SteamHumidifier_X_dynamic; diff --git a/AixLib/Fluid/Humidifiers/Validation/package.mo b/AixLib/Fluid/Humidifiers/Validation/package.mo new file mode 100644 index 0000000000..9ccd9770b6 --- /dev/null +++ b/AixLib/Fluid/Humidifiers/Validation/package.mo @@ -0,0 +1,20 @@ +within AixLib.Fluid.Humidifiers; +package Validation "Collection of validation models" + extends Modelica.Icons.ExamplesPackage; + +annotation (preferredView="info", Documentation(info=" +

    +This package contains validation models for the classes in + +AixLib.Fluid.Humidifiers. +

    +

    +Note that most validation models contain simple input data +which may not be realistic, but for which the correct +output can be obtained through an analytic solution. +The examples plot various outputs, which have been verified against these +solutions. These model outputs are stored as reference data and +used for continuous validation whenever models in the library change. +

    +")); +end Validation; diff --git a/AixLib/Fluid/Humidifiers/Validation/package.order b/AixLib/Fluid/Humidifiers/Validation/package.order new file mode 100644 index 0000000000..22d34d7487 --- /dev/null +++ b/AixLib/Fluid/Humidifiers/Validation/package.order @@ -0,0 +1,4 @@ +SprayAirWasher_X +SprayAirWasher_X_dynamic +SteamHumidifier_X +SteamHumidifier_X_dynamic diff --git a/AixLib/Fluid/Humidifiers/package.mo b/AixLib/Fluid/Humidifiers/package.mo new file mode 100644 index 0000000000..daa35b8b5e --- /dev/null +++ b/AixLib/Fluid/Humidifiers/package.mo @@ -0,0 +1,34 @@ +within AixLib.Fluid; +package Humidifiers "fixme: add brief description" + extends Modelica.Icons.Package; + +annotation (preferredView="info", Documentation(info=" +

    +Package with humidifiers. +

    +"), + Icon(graphics={ + Rectangle( + extent={{-72,70},{70,-72}}, + lineColor={0,0,255}, + pattern=LinePattern.None, + fillColor={0,0,0}, + fillPattern=FillPattern.Solid), + Rectangle( + extent={{46,-52},{34,54}}, + lineColor={255,255,255}, + fillColor={255,255,255}, + fillPattern=FillPattern.Solid), + Polygon( + points={{8,48},{34,32},{34,32},{8,18},{8,24},{24,32},{24,32},{8,42},{ + 8,48}}, + lineColor={255,255,255}, + fillColor={255,255,255}, + fillPattern=FillPattern.Solid), + Polygon( + points={{8,0},{34,-16},{34,-16},{8,-30},{8,-24},{24,-16},{24,-16},{8, + -6},{8,0}}, + lineColor={255,255,255}, + fillColor={255,255,255}, + fillPattern=FillPattern.Solid)})); +end Humidifiers; diff --git a/AixLib/Fluid/Humidifiers/package.order b/AixLib/Fluid/Humidifiers/package.order new file mode 100644 index 0000000000..7edcb74fa7 --- /dev/null +++ b/AixLib/Fluid/Humidifiers/package.order @@ -0,0 +1,5 @@ +Humidifier_u +SprayAirWasher_X +SteamHumidifier_X +Examples +Validation diff --git a/AixLib/Fluid/Interfaces/ConservationEquation.mo b/AixLib/Fluid/Interfaces/ConservationEquation.mo index afb7c3ec06..f6ec483e63 100644 --- a/AixLib/Fluid/Interfaces/ConservationEquation.mo +++ b/AixLib/Fluid/Interfaces/ConservationEquation.mo @@ -92,8 +92,14 @@ model ConservationEquation "Lumped volume with mass and energy balance" T=T_start, p=p_start, X=X_start[1:Medium.nXi])) + - (T_start - Medium.reference_T)*CSen) "Internal energy of fluid"; - Modelica.SIunits.Mass m "Mass of fluid"; + (T_start - Medium.reference_T)*CSen, + nominal = 1E5) "Internal energy of fluid"; + + Modelica.SIunits.Mass m( + stateSelect=if massDynamics == Modelica.Fluid.Types.Dynamics.SteadyState + then StateSelect.default else StateSelect.prefer) + "Mass of fluid"; + Modelica.SIunits.Mass[Medium.nXi] mXi "Masses of independent components in the fluid"; Modelica.SIunits.Mass[Medium.nC] mC "Masses of trace substances in the fluid"; @@ -230,9 +236,9 @@ equation // If moisture is neglected in mass balance, assume for computation // of the mass of air that the air is at Medium.X_default. m = fluidVolume*Medium.density(Medium.setState_phX( - p= medium.p, - h= hOut, - X= Medium.X_default)); + p = medium.p, + h = hOut, + X = Medium.X_default)); else // Use actual density m = fluidVolume*medium.d; @@ -253,7 +259,7 @@ equation for i in 1:nPorts loop //The semiLinear function should be used for the equations below //for allowing min/max simplifications. - //See https://github.com/iea-annex60/modelica-annex60/issues/216 for a discussion and motivation + //See https://github.com/ibpsa/modelica-ibpsa/issues/216 for a discussion and motivation ports_H_flow[i] = semiLinear(ports[i].m_flow, inStream(ports[i].h_outflow), ports[i].h_outflow) "Enthalpy flow"; for j in 1:Medium.nXi loop @@ -411,10 +417,21 @@ AixLib.Fluid.MixingVolumes.MixingVolume. ", revisions=" diff --git a/AixLib/Fluid/Interfaces/Examples/BaseClasses/PrescribedOutletState.mo b/AixLib/Fluid/Interfaces/Examples/BaseClasses/PrescribedOutletState.mo new file mode 100644 index 0000000000..d0cdee91f8 --- /dev/null +++ b/AixLib/Fluid/Interfaces/Examples/BaseClasses/PrescribedOutletState.mo @@ -0,0 +1,184 @@ +within AixLib.Fluid.Interfaces.Examples.BaseClasses; +partial model PrescribedOutletState "Test model for prescribed outlet state" + + replaceable package Medium = AixLib.Media.Air + constrainedby Modelica.Media.Interfaces.PartialMedium "Medium model"; + + parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.1 + "Nominal mass flow rate"; + + AixLib.Fluid.Sources.Boundary_pT sin( + redeclare package Medium = Medium, + use_T_in=false, + p(displayUnit="Pa"), + T=293.15, + nPorts=4) "Sink" + annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=180,origin={100,0}))); + AixLib.Fluid.Interfaces.PrescribedOutlet heaHigPow( + redeclare package Medium = Medium, + QMax_flow=1.0e10, + mWatMax_flow = 0.001, + m_flow_small=1E-4*abs(m_flow_nominal), + show_T=true, + m_flow_nominal=m_flow_nominal, + energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial) + "Steady-state model of the heater with high capacity" + annotation (Placement(transformation(extent={{-10,76},{10,96}}))); + Modelica.Blocks.Sources.CombiTimeTable setHeaHigPow(table=[ + 0, 20.0, 0.012; + 120, 20.0, 0.012; + 500, 60.0, 0.020; + 800, 10.0, 0.005; + 1200, 30.0, 0.015], + offset={273.15,0}, + smoothness = Modelica.Blocks.Types.Smoothness.ConstantSegments) + "Setpoint heating and humidification" + annotation (Placement(transformation(extent={{-60,110},{-40,130}}))); + AixLib.Fluid.Interfaces.PrescribedOutlet cooLimPow( + redeclare package Medium = Medium, + QMin_flow=-1000, + mWatMin_flow = -0.001, + m_flow_small=1E-4*abs(m_flow_nominal), + show_T=true, + m_flow_nominal=m_flow_nominal, + energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial) + "Steady-state model of the cooler with limited capacity" + annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); + Modelica.Blocks.Sources.CombiTimeTable setCooLimPow(table=[ + 0, 20.0, 0.008; + 120, 20.0, 0.008; + 500, 15.0, 0.004; + 800, 60.0, 0.015; + 1200, 10.0, 0.002], + offset={273.15,0}, + smoothness = Modelica.Blocks.Types.Smoothness.ConstantSegments) + "Setpoint cooling and dehumidification" + annotation (Placement(transformation(extent={{-60,30},{-40,50}}))); + AixLib.Fluid.Interfaces.PrescribedOutlet heaCooUnl( + redeclare package Medium = Medium, + m_flow_small=1E-4*abs(m_flow_nominal), + show_T=true, + m_flow_nominal=m_flow_nominal, + energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial) + "Steady-state model of the heater or cooler with unlimited capacity" + annotation (Placement(transformation(extent={{-10,-70},{10,-50}}))); + AixLib.Fluid.Interfaces.PrescribedOutlet steSta( + redeclare package Medium = Medium, + m_flow_small=1E-4*abs(m_flow_nominal), + show_T=true, + m_flow_nominal=m_flow_nominal, + energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState) + "Steady-state model of the heater or cooler with unlimited capacity" + annotation (Placement(transformation(extent={{-10,-100},{10,-80}}))); + Modelica.Blocks.Sources.CombiTimeTable setHeaCooUnl(table=[ + 0, 20.0, 0.012; + 120, 20.0, 0.012; + 500, 15.0, 0.008; + 800, 10.0, 0.005; + 1200, 30.0, 0.015], + offset={273.15,0}, + smoothness = Modelica.Blocks.Types.Smoothness.ConstantSegments) + "Setpoint cooling, heating, dehumidification and humidification" + annotation (Placement(transformation(extent={{-60,-40},{-40,-20}}))); + Modelica.Blocks.Sources.Ramp m_flow( + height=-2*m_flow_nominal, + duration=100, + offset=m_flow_nominal, + startTime=1000) "Mass flow rate" + annotation (Placement(transformation(extent={{-130,-2},{-110,18}}))); + AixLib.Fluid.Sources.MassFlowSource_T sou1( + redeclare package Medium = Medium, + use_m_flow_in=true, + T=293.15, + nPorts=1) "Flow source" + annotation (Placement(transformation(extent={{-90,76},{-70,96}}))); + AixLib.Fluid.Sources.MassFlowSource_T sou2( + redeclare package Medium = Medium, + use_m_flow_in=true, + T=293.15, + nPorts=1) "Flow source" + annotation (Placement(transformation(extent={{-90,-10},{-70,10}}))); + AixLib.Fluid.Sources.MassFlowSource_T sou3( + redeclare package Medium = Medium, + use_m_flow_in=true, + T=293.15, + nPorts=1) "Flow source" + annotation (Placement(transformation(extent={{-90,-70},{-70,-50}}))); + AixLib.Fluid.Sources.MassFlowSource_T sou4( + redeclare package Medium = Medium, + use_m_flow_in=true, + T=293.15, + nPorts=1) "Flow source" + annotation (Placement(transformation(extent={{-90,-100},{-70,-80}}))); +equation + + connect(m_flow.y, sou1.m_flow_in) annotation (Line( + points={{-109,8},{-100,8},{-100,94},{-90,94}}, + color={0,0,127})); + connect(m_flow.y, sou2.m_flow_in) annotation (Line( + points={{-109,8},{-90,8}}, + color={0,0,127})); + connect(m_flow.y, sou3.m_flow_in) annotation (Line( + points={{-109,8},{-100,8},{-100,-52},{-90,-52}}, + color={0,0,127})); + connect(sou1.ports[1], heaHigPow.port_a) annotation (Line( + points={{-70,86},{-10,86}}, + color={0,127,255})); + connect(sou2.ports[1], cooLimPow.port_a) annotation (Line( + points={{-70,0},{-10,0}}, + color={0,127,255})); + connect(sou3.ports[1], heaCooUnl.port_a) annotation (Line( + points={{-70,-60},{-56,-60},{-40,-60},{-10,-60}}, + color={0,127,255})); + connect(heaCooUnl.port_b, sin.ports[1]) annotation (Line( + points={{10,-60},{50,-60},{50,-3},{90,-3}}, + color={0,127,255})); + connect(cooLimPow.port_b, sin.ports[2]) annotation (Line( + points={{10,0},{52,0},{52,-1},{90,-1}}, + color={0,127,255})); + connect(heaHigPow.port_b, sin.ports[3]) annotation (Line( + points={{10,86},{50,86},{50,1},{90,1}}, + color={0,127,255})); + connect(m_flow.y, sou4.m_flow_in) annotation (Line(points={{-109,8},{-100,8},{ + -100,-82},{-90,-82}}, color={0,0,127})); + connect(sou4.ports[1], steSta.port_a) annotation (Line(points={{-70,-90},{-40, + -90},{-10,-90}}, color={0,127,255})); + connect(steSta.port_b, sin.ports[4]) annotation (Line(points={{10,-90},{54,-90}, + {54,3},{90,3}}, color={0,127,255})); + annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-140, + -120},{120,160}})), + Documentation(info=" +

    +Model that is used as the base class for models that +demonstrates the use of an ideal heater and an ideal cooler, +or an ideal humidifier and dehumidifier. +

    +

    +The model on the top has almost unlimited positive capacity (Q_flow_nominal = 1.0e10 Watts), +and hence its outlet temperature always reaches the set points. +

    +

    +The model in the middle has a limited negative capacitiy (Q_flow_nominal = 1000 Watts), and hence +its outlet state reaches only a limited value corresponding to its +maximum negative capacity. +

    +

    +The model at the bottom has unlimited capacity. +

    +

    +At t=1000 second, the flow reverses its direction. +

    +

    +Each flow leg has the same mass flow rate. There are three mass flow sources +as using one source only would yield a nonlinear system of equations that +needs to be solved to determine the mass flow rate distribution. +

    +", revisions=" + +")); +end PrescribedOutletState; diff --git a/AixLib/Fluid/Interfaces/Examples/BaseClasses/package.mo b/AixLib/Fluid/Interfaces/Examples/BaseClasses/package.mo new file mode 100644 index 0000000000..8b1240ff76 --- /dev/null +++ b/AixLib/Fluid/Interfaces/Examples/BaseClasses/package.mo @@ -0,0 +1,12 @@ +within AixLib.Fluid.Interfaces.Examples; +package BaseClasses "Package with base classes for AixLib.Fluid.Interfaces.Examples" + extends Modelica.Icons.BasesPackage; + +annotation (preferredView="info", Documentation(info=" +

    +This package contains base classes that are used to construct the models in + +AixLib.Fluid.Interfaces.Examples. +

    +")); +end BaseClasses; diff --git a/AixLib/Fluid/Interfaces/Examples/BaseClasses/package.order b/AixLib/Fluid/Interfaces/Examples/BaseClasses/package.order new file mode 100644 index 0000000000..eadb09db16 --- /dev/null +++ b/AixLib/Fluid/Interfaces/Examples/BaseClasses/package.order @@ -0,0 +1 @@ +PrescribedOutletState diff --git a/AixLib/Fluid/Interfaces/Examples/ConservationEquation.mo b/AixLib/Fluid/Interfaces/Examples/ConservationEquation.mo index b6460129da..1d55f92911 100644 --- a/AixLib/Fluid/Interfaces/Examples/ConservationEquation.mo +++ b/AixLib/Fluid/Interfaces/Examples/ConservationEquation.mo @@ -86,7 +86,7 @@ equation points={{2,30},{0,30},{0,0},{20,0}}, color={0,127,255})); annotation ( - experiment(StopTime=3600), + experiment(Tolerance=1e-6, StopTime=3600), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/ConservationEquation.mos" "Simulate and plot"), Documentation(info=" diff --git a/AixLib/Fluid/Interfaces/Examples/FourPortHeatMassExchanger.mo b/AixLib/Fluid/Interfaces/Examples/FourPortHeatMassExchanger.mo new file mode 100644 index 0000000000..f4c8a958f6 --- /dev/null +++ b/AixLib/Fluid/Interfaces/Examples/FourPortHeatMassExchanger.mo @@ -0,0 +1,80 @@ +within AixLib.Fluid.Interfaces.Examples; +model FourPortHeatMassExchanger + "FourPortHeatMassExchanger example model" + extends Modelica.Icons.Example; + package Medium = AixLib.Media.Water; + parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1 + "Nominal mass flow rate"; + + AixLib.Fluid.Interfaces.FourPortHeatMassExchanger fouPor( + redeclare package Medium1 = Medium, + redeclare package Medium2 = Medium, + m1_flow_nominal=m_flow_nominal, + m2_flow_nominal=m_flow_nominal, + dp1_nominal=0, + dp2_nominal=0, + tau1=1, + tau2=1, + energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial) + "Four port heat mass exchanger" + annotation (Placement(transformation(extent={{-10,0},{10,20}}))); + + + Sources.Boundary_pT sin(nPorts=2, redeclare package Medium = Medium) + "Mass flow sink" + annotation (Placement(transformation(extent={{-60,-40},{-40,-20}}))); + Sources.MassFlowSource_T sou1( + nPorts=1, + redeclare package Medium = Medium, + use_m_flow_in=true, + use_T_in=true) "Mass flow source" + annotation (Placement(transformation(extent={{-60,0},{-40,20}}))); + Sources.MassFlowSource_T sou2( + nPorts=1, + redeclare package Medium = Medium, + m_flow=1, + T=283.15) "Mass flow source" + annotation (Placement(transformation(extent={{60,0},{40,20}}))); + Modelica.Blocks.Sources.Ramp ram_T( + height=10, + offset=273.15, + duration=5) "Temperature ramp" + annotation (Placement(transformation(extent={{-90,-10},{-70,10}}))); + Modelica.Blocks.Sources.Ramp ram_m_flow( + height=-2, + offset=1, + duration=5) "Mass flow rate ramp" + annotation (Placement(transformation(extent={{-90,30},{-70,50}}))); +equation + connect(sin.ports[1], fouPor.port_b2) annotation (Line(points={{-40,-28},{-20, + -28},{-20,4},{-10,4}}, color={0,127,255})); + connect(fouPor.port_b1, sin.ports[2]) annotation (Line(points={{10,16},{24,16}, + {24,-32},{-40,-32}}, color={0,127,255})); + connect(sou1.ports[1], fouPor.port_a1) annotation (Line(points={{-40,10},{-20, + 10},{-20,16},{-10,16}}, color={0,127,255})); + connect(sou2.ports[1], fouPor.port_a2) annotation (Line(points={{40,10},{20, + 10},{20,4},{10,4}}, color={0,127,255})); + connect(ram_m_flow.y, sou1.m_flow_in) annotation (Line(points={{-69,40},{-66, + 40},{-66,18},{-60,18}}, color={0,0,127})); + connect(ram_T.y, sou1.T_in) annotation (Line(points={{-69,0},{-66,0},{-66,14}, + {-62,14}}, color={0,0,127})); + annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( + coordinateSystem(preserveAspectRatio=false)), + Documentation(info=" +

    +This example model demonstrates the used of the +FourPortHeatMassExchanger model. +

    +", revisions=" + +"), +experiment(Tolerance=1e-6, StopTime=5), +__Dymola_Commands(file= + "Resources/Scripts/Dymola/Fluid/Interfaces/Examples/FourPortHeatMassExchanger.mos" + "Simulate and plot")); +end FourPortHeatMassExchanger; diff --git a/AixLib/Fluid/Interfaces/Examples/HeaterCooler_u.mo b/AixLib/Fluid/Interfaces/Examples/HeaterCooler_u.mo index 704ea184d2..5259c252ae 100644 --- a/AixLib/Fluid/Interfaces/Examples/HeaterCooler_u.mo +++ b/AixLib/Fluid/Interfaces/Examples/HeaterCooler_u.mo @@ -488,7 +488,7 @@ equation extent={{-188,-20},{-38,-84}}, lineColor={0,0,255}, textString="Same system as above, but with flow reversed")}), -experiment(StopTime=3600), +experiment(Tolerance=1e-6, StopTime=3600), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/HeaterCooler_u.mos" "Simulate and plot"), Documentation(info=" @@ -510,7 +510,7 @@ November 2, 2016, by Michael Wetter:
    Changed assertions to blocks that compute the difference, and added the difference to the regression results.
    This is for -issue 564. +issue 564.
  • May 30, 2014, by Michael Wetter:
    diff --git a/AixLib/Fluid/Interfaces/Examples/Humidifier_u.mo b/AixLib/Fluid/Interfaces/Examples/Humidifier_u.mo index 1b23afde41..887653a175 100644 --- a/AixLib/Fluid/Interfaces/Examples/Humidifier_u.mo +++ b/AixLib/Fluid/Interfaces/Examples/Humidifier_u.mo @@ -321,7 +321,7 @@ model Humidifier_u protected model Humidifier "Model for humidifier that adds a variable for the thermodynamic states at its ports" - extends AixLib.Fluid.MassExchangers.Humidifier_u; + extends AixLib.Fluid.Humidifiers.Humidifier_u; Medium.ThermodynamicState staA= Medium.setState_phX(port_a.p, actualStream(port_a.h_outflow), @@ -546,7 +546,7 @@ equation extent={{-198,-4},{-6,-38}}, lineColor={0,0,255}, textString="Same models as above, but flow is reversed")}), -experiment(StopTime=3600), +experiment(Tolerance=1e-6, StopTime=3600), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/Humidifier_u.mos" "Simulate and plot"), Documentation(info=" @@ -567,7 +567,7 @@ November 2, 2016, by Michael Wetter:
    Changed assertions to blocks that compute the difference, and added the difference to the regression results.
    This is for -issue 564. +issue 564.
  • May 30, 2014, by Michael Wetter:
    diff --git a/AixLib/Fluid/Interfaces/Examples/PrescribedOutlet.mo b/AixLib/Fluid/Interfaces/Examples/PrescribedOutlet.mo new file mode 100644 index 0000000000..a23ece62c5 --- /dev/null +++ b/AixLib/Fluid/Interfaces/Examples/PrescribedOutlet.mo @@ -0,0 +1,49 @@ +within AixLib.Fluid.Interfaces.Examples; +model PrescribedOutlet "Test model for prescribed outlet state" + extends Modelica.Icons.Example; + extends AixLib.Fluid.Interfaces.Examples.BaseClasses.PrescribedOutletState; + +equation + connect(setHeaHigPow.y[1], heaHigPow.TSet) annotation (Line(points={{-39,120}, + {-20,120},{-20,94},{-12,94}}, color={0,0,127})); + connect(setHeaHigPow.y[2], heaHigPow.X_wSet) annotation (Line(points={{-39,120}, + {-20,120},{-20,90},{-12,90}}, color={0,0,127})); + connect(setCooLimPow.y[1], cooLimPow.TSet) annotation (Line(points={{-39,40}, + {-26,40},{-26,8},{-12,8}}, color={0,0,127})); + connect(setCooLimPow.y[2], cooLimPow.X_wSet) annotation (Line(points={{-39,40}, + {-26,40},{-26,4},{-12,4}}, color={0,0,127})); + connect(setHeaCooUnl.y[1], heaCooUnl.TSet) annotation (Line(points={{-39,-30}, + {-26,-30},{-26,-52},{-12,-52}}, color={0,0,127})); + connect(setHeaCooUnl.y[2], heaCooUnl.X_wSet) annotation (Line(points={{-39,-30}, + {-26,-30},{-26,-56},{-12,-56}}, color={0,0,127})); + connect(setHeaCooUnl.y[1], steSta.TSet) annotation (Line(points={{-39,-30},{ + -26,-30},{-26,-82},{-12,-82}}, color={0,0,127})); + connect(setHeaCooUnl.y[2], steSta.X_wSet) annotation (Line(points={{-39,-30},{ + -26,-30},{-26,-86},{-12,-86}}, color={0,0,127})); + annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-140, + -120},{120,160}})), + experiment(Tolerance=1e-6, StopTime=1200), +__Dymola_Commands(file= "modelica://AixLib/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/PrescribedOutlet.mos" + "Simulate and plot"), + Documentation(info=" +

    +Model that demonstrates + +AixLib.Fluid.Interfaces.PrescribedOutlet +with mass fraction setpoint. +

    +", revisions=" + +")); +end PrescribedOutlet; diff --git a/AixLib/Fluid/Interfaces/Examples/PrescribedOutletState.mo b/AixLib/Fluid/Interfaces/Examples/PrescribedOutletState.mo deleted file mode 100644 index 2f847c4401..0000000000 --- a/AixLib/Fluid/Interfaces/Examples/PrescribedOutletState.mo +++ /dev/null @@ -1,155 +0,0 @@ -within AixLib.Fluid.Interfaces.Examples; -model PrescribedOutletState "Test model for prescribed outlet state" - extends Modelica.Icons.Example; - - package Medium = AixLib.Media.Water; - - parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.1 - "Nominal mass flow rate"; - - AixLib.Fluid.Sources.Boundary_pT sin( - redeclare package Medium = Medium, - use_T_in=false, - p(displayUnit="Pa"), - T=293.15, - nPorts=3) "Sink" - annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=180,origin={100,0}))); - AixLib.Fluid.Interfaces.PrescribedOutletState heaHigPow( - redeclare package Medium = Medium, - Q_flow_maxHeat=1.0e10, - m_flow_small=1E-4*abs(m_flow_nominal), - show_T=true, - m_flow_nominal=m_flow_nominal) - "Steady-state model of the heater with high capacity" - annotation (Placement(transformation(extent={{-10,76},{10,96}}))); - Modelica.Blocks.Sources.TimeTable TSetHeat(table=[0,273.15 + 20.0; 120,273.15 - + 20.0; 120,273.15 + 60.0; 500,273.15 + 60.0; 500,273.15 + 30.0; 1200,273.15 + 30.0]) - "Setpoint heating" - annotation (Placement(transformation(extent={{-60,126},{-40,146}}))); - AixLib.Fluid.Interfaces.PrescribedOutletState cooLimPow( - redeclare package Medium = Medium, - Q_flow_maxCool=-1000, - m_flow_small=1E-4*abs(m_flow_nominal), - show_T=true, - m_flow_nominal=m_flow_nominal) - "Steady-state model of the cooler with limited capacity" - annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); - Modelica.Blocks.Sources.TimeTable TSetCool(table=[0,273.15 + 20.0; 120,273.15 - + 20.0; 120,273.15 + 15.0; 500,273.15 + 15.0; 500,273.15 + 10.0; 1200,273.15 + 10.0]) - "Setpoint cooling" - annotation (Placement(transformation(extent={{-58,36},{-38,56}}))); - AixLib.Fluid.Interfaces.PrescribedOutletState heaCooUnl( - redeclare package Medium = Medium, - m_flow_small=1E-4*abs(m_flow_nominal), - show_T=true, - m_flow_nominal=m_flow_nominal) - "Steady-state model of the heater or cooler with unlimited capacity" - annotation (Placement(transformation(extent={{-10,-94},{10,-74}}))); - Modelica.Blocks.Sources.TimeTable TSetCoolHeat(table=[0,273.15 + 20.0; 120,273.15 - + 20.0; 120,273.15 + 15.0; 500,273.15 + 15.0; 500,273.15 + 30.0; 1200,273.15 - + 30.0]) "Setpoint cooling" - annotation (Placement(transformation(extent={{-58,-54},{-38,-34}}))); - Modelica.Blocks.Sources.Ramp m_flow( - height=-2*m_flow_nominal, - duration=100, - offset=m_flow_nominal, - startTime=1000) "Mass flow rate" - annotation (Placement(transformation(extent={{-130,-2},{-110,18}}))); - AixLib.Fluid.Sources.MassFlowSource_T sou1( - redeclare package Medium = Medium, - use_m_flow_in=true, - T=293.15, - nPorts=1) "Flow source" - annotation (Placement(transformation(extent={{-90,76},{-70,96}}))); - AixLib.Fluid.Sources.MassFlowSource_T sou2( - redeclare package Medium = Medium, - use_m_flow_in=true, - T=293.15, - nPorts=1) "Flow source" - annotation (Placement(transformation(extent={{-90,-10},{-70,10}}))); - AixLib.Fluid.Sources.MassFlowSource_T sou3( - redeclare package Medium = Medium, - use_m_flow_in=true, - T=293.15, - nPorts=1) "Flow source" - annotation (Placement(transformation(extent={{-90,-94},{-70,-74}}))); -equation - - connect(TSetHeat.y,heaHigPow. TSet) annotation (Line( - points={{-39,136},{-30,136},{-30,94},{-12,94}}, - color={0,0,127})); - connect(TSetCool.y,cooLimPow. TSet) annotation (Line( - points={{-37,46},{-22,46},{-22,8},{-12,8}}, - color={0,0,127})); - connect(TSetCoolHeat.y,heaCooUnl. TSet) annotation (Line( - points={{-37,-44},{-24,-44},{-24,-76},{-12,-76}}, - color={0,0,127})); - connect(m_flow.y, sou1.m_flow_in) annotation (Line( - points={{-109,8},{-100,8},{-100,94},{-90,94}}, - color={0,0,127})); - connect(m_flow.y, sou2.m_flow_in) annotation (Line( - points={{-109,8},{-90,8}}, - color={0,0,127})); - connect(m_flow.y, sou3.m_flow_in) annotation (Line( - points={{-109,8},{-100,8},{-100,-76},{-90,-76}}, - color={0,0,127})); - connect(sou1.ports[1], heaHigPow.port_a) annotation (Line( - points={{-70,86},{-10,86}}, - color={0,127,255})); - connect(sou2.ports[1], cooLimPow.port_a) annotation (Line( - points={{-70,0},{-10,0}}, - color={0,127,255})); - connect(sou3.ports[1], heaCooUnl.port_a) annotation (Line( - points={{-70,-84},{-10,-84}}, - color={0,127,255})); - connect(heaCooUnl.port_b, sin.ports[1]) annotation (Line( - points={{10,-84},{50,-84},{50,-2.66667},{90,-2.66667}}, - color={0,127,255})); - connect(cooLimPow.port_b, sin.ports[2]) annotation (Line( - points={{10,0},{52,0},{52,1.33227e-15},{90,1.33227e-15}}, - color={0,127,255})); - connect(heaHigPow.port_b, sin.ports[3]) annotation (Line( - points={{10,86},{50,86},{50,2.66667},{90,2.66667}}, - color={0,127,255})); - annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-140, - -120},{120,160}})), - experiment(StopTime=1200), -__Dymola_Commands(file= "modelica://AixLib/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/PrescribedOutletState.mos" - "Simulate and plot"), - Documentation(info=" -

    -Model that demonstrates the use of an ideal heater and an ideal cooler. -

    -

    -The heater model has an almost unlimited positive capacity (Q_flow_nominal = 1.0e10 Watts), -and hence its outlet temperature always reaches the set point temperatures. -

    -

    -The cooler model has a limited negative capacitiy (Q_flow_nominal = 1000 Watts), and hence -its outlet temperature reaches only a limited value corresponding to its -maximum negative capacity. -

    -

    -There is also a heater and cooler with unlimited capacity. -

    -

    -At t=1000 second, the flow reverses its direction. -

    -

    -Each flow leg has the same mass flow rate. There are three mass flow sources -as using one source only would yield a nonlinear system of equations that -needs to be solved to determine the mass flow rate distribution. -

    -

    -The heater and cooler models have the parameter show_T set to true -to allow inspecting the temperatures at their ports. -

    -", revisions=" - -")); -end PrescribedOutletState; diff --git a/AixLib/Fluid/Interfaces/Examples/PrescribedOutlet_TSetOnly.mo b/AixLib/Fluid/Interfaces/Examples/PrescribedOutlet_TSetOnly.mo new file mode 100644 index 0000000000..bdd508e2ae --- /dev/null +++ b/AixLib/Fluid/Interfaces/Examples/PrescribedOutlet_TSetOnly.mo @@ -0,0 +1,47 @@ +within AixLib.Fluid.Interfaces.Examples; +model PrescribedOutlet_TSetOnly "Test model for prescribed outlet state" + extends Modelica.Icons.Example; + extends AixLib.Fluid.Interfaces.Examples.BaseClasses.PrescribedOutletState( + steSta(use_X_wSet=false), + heaHigPow(use_X_wSet=false), + cooLimPow(use_X_wSet=false), + heaCooUnl(use_X_wSet=false)); + +equation + connect(setHeaHigPow.y[1], heaHigPow.TSet) annotation (Line(points={{-39,120}, + {-20,120},{-20,94},{-12,94}}, color={0,0,127})); + connect(setCooLimPow.y[1], cooLimPow.TSet) annotation (Line(points={{-39,40},{ + -26,40},{-26,8},{-12,8}}, color={0,0,127})); + connect(setHeaCooUnl.y[1], heaCooUnl.TSet) annotation (Line(points={{-39,-30}, + {-26,-30},{-26,-52},{-12,-52}}, color={0,0,127})); + connect(setHeaCooUnl.y[1], steSta.TSet) annotation (Line(points={{-39,-30},{-26, + -30},{-26,-82},{-12,-82}}, color={0,0,127})); + + + annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-140, + -120},{120,160}})), + experiment(Tolerance=1e-6, StopTime=1200), +__Dymola_Commands(file= "modelica://AixLib/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/PrescribedOutlet_TSetOnly.mos" + "Simulate and plot"), + Documentation(info=" +

    +Model that demonstrates + +AixLib.Fluid.Interfaces.PrescribedOutlet +with temperature setpoint. +

    +", revisions=" + +")); +end PrescribedOutlet_TSetOnly; diff --git a/AixLib/Fluid/Interfaces/Examples/PrescribedOutlet_Water.mo b/AixLib/Fluid/Interfaces/Examples/PrescribedOutlet_Water.mo new file mode 100644 index 0000000000..e25e4ea9d1 --- /dev/null +++ b/AixLib/Fluid/Interfaces/Examples/PrescribedOutlet_Water.mo @@ -0,0 +1,49 @@ +within AixLib.Fluid.Interfaces.Examples; +model PrescribedOutlet_Water + "Test model for prescribed outlet state" + extends Modelica.Icons.Example; + extends AixLib.Fluid.Interfaces.Examples.BaseClasses.PrescribedOutletState( + redeclare package Medium = AixLib.Media.Water, + steSta(use_X_wSet=false), + heaHigPow(use_X_wSet=false), + cooLimPow(use_X_wSet=false), + heaCooUnl(use_X_wSet=false)); + +equation + connect(setHeaHigPow.y[1], heaHigPow.TSet) annotation (Line(points={{-39,120}, + {-20,120},{-20,94},{-11,94}}, color={0,0,127})); + connect(setCooLimPow.y[1], cooLimPow.TSet) annotation (Line(points={{-39,40},{ + -26,40},{-26,8},{-11,8}}, color={0,0,127})); + connect(setHeaCooUnl.y[1], heaCooUnl.TSet) annotation (Line(points={{-39,-30}, + {-26,-30},{-26,-52},{-11,-52}}, color={0,0,127})); + connect(setHeaCooUnl.y[1], steSta.TSet) annotation (Line(points={{-39,-30},{-26, + -30},{-26,-82},{-11,-82}}, color={0,0,127})); + + + annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-140, + -120},{120,160}})), + experiment(Tolerance=1e-6, StopTime=1200), +__Dymola_Commands(file= "modelica://AixLib/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/PrescribedOutlet_Water.mos" + "Simulate and plot"), + Documentation(info=" +

    +Model that demonstrates + +AixLib.Fluid.Interfaces.PrescribedOutlet +with temperature setpoint and water as the medium. +

    +", revisions=" + +")); +end PrescribedOutlet_Water; diff --git a/AixLib/Fluid/Interfaces/Examples/PrescribedOutlet_X_wSetOnly.mo b/AixLib/Fluid/Interfaces/Examples/PrescribedOutlet_X_wSetOnly.mo new file mode 100644 index 0000000000..c66bbf7aa9 --- /dev/null +++ b/AixLib/Fluid/Interfaces/Examples/PrescribedOutlet_X_wSetOnly.mo @@ -0,0 +1,49 @@ +within AixLib.Fluid.Interfaces.Examples; +model PrescribedOutlet_X_wSetOnly + "Test model for prescribed outlet state" + extends Modelica.Icons.Example; + extends AixLib.Fluid.Interfaces.Examples.BaseClasses.PrescribedOutletState( + heaHigPow(use_TSet=false), + cooLimPow(use_TSet=false), + heaCooUnl(use_TSet=false), + steSta(use_TSet=false)); + +equation + connect(setHeaHigPow.y[2], heaHigPow.X_wSet) annotation (Line(points={{-39,120}, + {-20,120},{-20,90},{-12,90}}, color={0,0,127})); + connect(setCooLimPow.y[2], cooLimPow.X_wSet) annotation (Line(points={{-39,40}, + {-26,40},{-26,4},{-12,4}}, color={0,0,127})); + connect(setHeaCooUnl.y[2], heaCooUnl.X_wSet) annotation (Line(points={{-39,-30}, + {-26,-30},{-26,-56},{-12,-56}}, color={0,0,127})); + connect(setHeaCooUnl.y[2], steSta.X_wSet) annotation (Line(points={{-39,-30},{-26, + -30},{-26,-86},{-12,-86}}, color={0,0,127})); + + + + annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-140, + -120},{120,160}})), + experiment(Tolerance=1e-6, StopTime=1200), +__Dymola_Commands(file= "modelica://AixLib/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/PrescribedOutlet_X_wSetOnly.mos" + "Simulate and plot"), + Documentation(info=" +

    +Model that demonstrates + +AixLib.Fluid.Interfaces.PrescribedOutlet +with mass fraction setpoint. +

    +", revisions=" + +")); +end PrescribedOutlet_X_wSetOnly; diff --git a/AixLib/Fluid/Interfaces/Examples/ReverseFlowHumidifier.mo b/AixLib/Fluid/Interfaces/Examples/ReverseFlowHumidifier.mo index 31e17aafc1..d4b5be5815 100644 --- a/AixLib/Fluid/Interfaces/Examples/ReverseFlowHumidifier.mo +++ b/AixLib/Fluid/Interfaces/Examples/ReverseFlowHumidifier.mo @@ -12,23 +12,23 @@ package Medium = AixLib.Media.Air; Modelica.Blocks.Math.Add cheMas(k2=-1) "Check whether the outputs of the forward flow and reverse flow model are identical" annotation (Placement(transformation(extent={{80,-60},{100,-40}}))); - AixLib.Fluid.MassExchangers.Humidifier_u humBac( + AixLib.Fluid.Humidifiers.Humidifier_u humBac( redeclare package Medium = Medium, dp_nominal=0, m_flow(start=1), m_flow_nominal=1, mWat_flow_nominal=0.1, - energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, - T=283.15) "Humidifier with backward flow" + energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial) + "Humidifier with backward flow" annotation (Placement(transformation(extent={{-32,-16},{-52,4}}))); - AixLib.Fluid.MassExchangers.Humidifier_u humFor( + AixLib.Fluid.Humidifiers.Humidifier_u humFor( redeclare package Medium = Medium, dp_nominal=0, m_flow(start=1), m_flow_nominal=1, mWat_flow_nominal=0.1, - energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, - T=283.15) "Humidifier with forward flow" + energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial) + "Humidifier with forward flow" annotation (Placement(transformation(extent={{-50,20},{-30,40}}))); Modelica.Blocks.Sources.Constant u2(k=0.01) "Control input" annotation (Placement(transformation(extent={{-92,54},{-80,66}}))); @@ -158,7 +158,7 @@ equation points={{-80,-6},{-52,-6}}, color={0,127,255})); annotation ( -experiment(StopTime=1), +experiment(Tolerance=1e-6, StopTime=1), __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/ReverseFlowHumidifier.mos" "Simulate and plot"), Documentation(info=" @@ -167,11 +167,17 @@ identical for forward flow and reverse flow. ", revisions="