From 0e7afcf0e9fc3a96e3637455528ce135a4506ee4 Mon Sep 17 00:00:00 2001 From: David Blum Date: Mon, 8 Apr 2024 17:59:16 -0400 Subject: [PATCH] Issue3727 move dhc 2 (#3781) * Reformulated InductiveLoad to avoid infinite value For #3776 * Updated release notes * buildingspy move from Buildings.Experimental.DHC to Buildings.DHC * Remove Experimental from package.order * Renamed EnergyTransferStations to ETS * Adding schematics to AirToWater (#3782) * Renamed BoreField to Borefield for consistency * Replaced BoreFieldType with BorefieldType for consistency --------- Co-authored-by: Michael Wetter Co-authored-by: Remi Patureau <148592348+rpatureau@users.noreply.github.com> --- .travis.yml | 20 +- .../VAV/SetPoints/FreezeProtection.mo | 12 +- .../OutdoorAirFlow/ASHRAE62_1/AHU.mo | 12 +- .../SetPoints/OutdoorAirFlow/Title24/AHU.mo | 12 +- .../Steam/PartialSaturatedControlVolume.mo | 12 +- .../Steam/PartialTwoPortTwoMedium.mo | 2 +- .../DHC/BaseClasses/Steam/package.mo | 2 +- .../DHC/BaseClasses/Steam/package.order | 0 .../DHC/BaseClasses/package.mo | 8 +- .../DHC/BaseClasses/package.order | 0 .../ETS}/BaseClasses/CollectorDistributor.mo | 4 +- .../BaseClasses/Connection2PipeLossless.mo | 4 +- .../ETS}/BaseClasses/Junction.mo | 2 +- .../ETS}/BaseClasses/PartialDirect.mo | 6 +- .../ETS}/BaseClasses/PartialETS.mo | 70 +- .../ETS}/BaseClasses/PartialIndirect.mo | 6 +- .../ETS}/BaseClasses/Pump_m_flow.mo | 2 +- .../ETS}/BaseClasses/StratifiedTank.mo | 2 +- .../Validation/CollectorDistributor.mo | 14 +- .../ETS/BaseClasses}/Validation/package.mo | 6 +- .../ETS}/BaseClasses/Validation/package.order | 0 .../ETS}/BaseClasses/computeCoordinates.mo | 2 +- .../Loads => DHC/ETS}/BaseClasses/package.mo | 6 +- .../ETS}/BaseClasses/package.order | 0 .../PartialHeatPumpHeatExchanger.mo | 36 +- .../Combined/BaseClasses/PartialParallel.mo | 38 +- .../ETS}/Combined/BaseClasses/package.mo | 6 +- .../ETS}/Combined/BaseClasses/package.order | 0 .../ETS}/Combined/ChillerBorefield.mo | 36 +- .../BaseClasses/PartialSupervisory.mo | 2 +- .../Combined/Controls}/BaseClasses/package.mo | 6 +- .../Controls/BaseClasses/package.order | 0 .../ETS}/Combined/Controls/Borefield.mo | 6 +- .../ETS}/Combined/Controls/Chiller.mo | 2 +- .../ETS}/Combined/Controls/HeatExchanger.mo | 10 +- .../ETS}/Combined/Controls/PIDWithEnable.mo | 2 +- .../Controls/PredictLeavingTemperature.mo | 6 +- .../Combined/Controls/PrimaryVariableFlow.mo | 2 +- .../ETS}/Combined/Controls/Reset.mo | 2 +- .../ETS}/Combined/Controls/SideCold.mo | 6 +- .../ETS}/Combined/Controls/SideHot.mo | 10 +- .../ETS}/Combined/Controls/Supervisory.mo | 24 +- .../ETS}/Combined/Controls/SwitchBox.mo | 10 +- .../Combined/Controls/WatersideEconomizer.mo | 2 +- .../ETS}/Combined/Controls/package.mo | 2 +- .../ETS}/Combined/Controls/package.order | 0 .../Combined/Examples/ChillerBorefield.mo | 14 +- .../ETS}/Combined/Examples/ChillerOnly.mo | 20 +- .../ETS/Combined}/Examples/package.mo | 6 +- .../ETS}/Combined/Examples/package.order | 0 .../ETS}/Combined/HeatPumpHeatExchanger.mo | 14 +- .../Combined/HeatPumpHeatExchangerDHWTank.mo | 20 +- .../Subsystems/BaseClasses/PartialHeatPump.mo | 6 +- .../Subsystems/BaseClasses/package.mo | 6 +- .../Subsystems/BaseClasses/package.order | 0 .../ETS}/Combined/Subsystems/Borefield.mo | 16 +- .../ETS}/Combined/Subsystems/Chiller.mo | 16 +- .../ETS}/Combined/Subsystems/HeatExchanger.mo | 18 +- .../ETS}/Combined/Subsystems/HeatPump.mo | 8 +- .../Combined/Subsystems/HeatPumpDHWTank.mo | 18 +- .../ETS}/Combined/Subsystems/SwitchBox.mo | 16 +- .../Subsystems/Validation/Borefield.mo | 12 +- .../Combined/Subsystems/Validation/Chiller.mo | 10 +- .../Subsystems/Validation/HeatExchanger.mo | 16 +- .../Subsystems/Validation/HeatPump.mo | 10 +- .../Subsystems/Validation/HeatPumpDHWTank.mo | 14 +- .../Subsystems/Validation/SwitchBox.mo | 14 +- .../Validation/WatersideEconomizer.mo | 16 +- .../Subsystems}/Validation/package.mo | 6 +- .../Subsystems/Validation/package.order | 0 .../Subsystems/WatersideEconomizer.mo | 14 +- .../ETS}/Combined/Subsystems/package.mo | 2 +- .../ETS}/Combined/Subsystems/package.order | 0 .../BaseClasses/PartialChillerBorefield.mo | 8 +- .../Validation/BaseClasses/package.mo | 14 + .../Validation/BaseClasses/package.order | 0 .../Combined/Validation/ChillerBorefield.mo | 14 +- .../ETS}/Combined/Validation/ChillerOnly.mo | 14 +- .../ETS}/Combined/Validation/ChillerWSE.mo | 12 +- .../ETS/Combined}/Validation/package.mo | 6 +- .../ETS}/Combined/Validation/package.order | 0 .../ETS}/Combined/package.mo | 2 +- .../ETS}/Combined/package.order | 0 .../ETS}/Cooling/Direct.mo | 10 +- .../ETS}/Cooling/Examples/Direct.mo | 6 +- .../ETS}/Cooling/Examples/Indirect.mo | 6 +- .../ETS/Cooling}/Examples/package.mo | 6 +- .../ETS}/Cooling/Examples/package.order | 0 .../ETS}/Cooling/Indirect.mo | 10 +- .../ETS}/Cooling/package.mo | 2 +- .../ETS}/Cooling/package.order | 0 .../ETS}/Heating/Direct.mo | 8 +- .../ETS}/Heating/Examples/Direct.mo | 6 +- .../ETS}/Heating/Examples/Indirect.mo | 6 +- .../ETS/Heating}/Examples/package.mo | 6 +- .../ETS}/Heating/Examples/package.order | 0 .../ETS}/Heating/Indirect.mo | 8 +- .../ETS}/Heating/package.mo | 2 +- .../ETS}/Heating/package.order | 0 .../ETS}/Types.mo | 2 +- .../ETS}/package.mo | 6 +- .../ETS}/package.order | 0 .../Combined/BaseClasses/Borefield.mo} | 8 +- .../Combined/BaseClasses/DesignDataSeries.mo | 2 +- .../Combined/BaseClasses/PartialSeries.mo | 22 +- .../Examples/Combined/BaseClasses/Zurich.mo | 2 +- .../Examples/Combined}/BaseClasses/package.mo | 6 +- .../Combined/BaseClasses/package.order | 2 +- .../Examples/Combined/SeriesConstantFlow.mo | 14 +- .../Examples/Combined/SeriesVariableFlow.mo | 20 +- .../SeriesVariableFlowAgentControl.mo | 28 +- .../DHC/Examples/Combined/package.mo | 2 +- .../DHC/Examples/Combined/package.order | 0 .../Cooling/ElectricChillersDirectETS.mo | 32 +- .../DHC/Examples/Cooling/package.mo | 2 +- .../DHC/Examples/Cooling/package.order | 0 .../DHC/Examples/Steam/SingleBoiler.mo | 10 +- .../DHC/Examples/Steam/package.mo | 2 +- .../DHC/Examples/Steam/package.order | 0 .../DHC/Examples/package.mo | 2 +- .../DHC/Examples/package.order | 0 .../Loads}/BaseClasses/BuildingRCZ1Valve.mo | 20 +- .../Loads}/BaseClasses/BuildingRCZ6.mo | 28 +- .../Loads}/BaseClasses/BuildingSpawnZ1.mo | 16 +- .../Loads}/BaseClasses/BuildingSpawnZ6.mo | 16 +- .../Loads}/BaseClasses/BuildingTimeSeries.mo | 26 +- .../Loads/BaseClasses/ConstraintViolation.mo | 2 +- .../Controls/MixingValveControl.mo | 8 +- .../Controls/Validation/MixingValveControl.mo | 16 +- .../Controls}/Validation/package.mo | 6 +- .../Controls/Validation/package.order | 0 .../DHC/Loads/BaseClasses/Controls/package.mo | 2 +- .../Loads/BaseClasses/Controls/package.order | 0 .../GeojsonExportRC/OfficeBuilding/Floor.mo | 4 +- .../GeojsonExportRC/OfficeBuilding/ICT.mo | 4 +- .../GeojsonExportRC/OfficeBuilding/Meeting.mo | 4 +- .../GeojsonExportRC/OfficeBuilding/Office.mo | 4 +- .../OfficeBuilding/Restroom.mo | 4 +- .../GeojsonExportRC/OfficeBuilding/Storage.mo | 4 +- .../GeojsonExportRC/OfficeBuilding/package.mo | 2 +- .../OfficeBuilding/package.order | 0 .../BaseClasses/GeojsonExportRC/package.mo | 2 +- .../BaseClasses/GeojsonExportRC/package.order | 0 .../Examples/BaseClasses/package.mo | 6 +- .../Examples/BaseClasses/package.order | 1 + .../BaseClasses/Examples/CouplingRCZ1Valve.mo | 18 +- .../BaseClasses/Examples/CouplingRCZ6.mo | 18 +- .../BaseClasses/Examples/CouplingSpawnZ1.mo | 18 +- .../BaseClasses/Examples/CouplingSpawnZ6.mo | 18 +- .../Examples/CouplingTimeSeries.mo | 20 +- .../Examples/CouplingTimeSeriesSingleLoop.mo | 24 +- .../Loads/BaseClasses}/Examples/package.mo | 6 +- .../Loads/BaseClasses/Examples/package.order | 0 .../Loads}/BaseClasses/FanCoil4Pipe.mo | 6 +- .../BaseClasses/FanCoil4PipeHeatPorts.mo | 6 +- .../DHC/Loads/BaseClasses/FlowDistribution.mo | 32 +- .../DHC/Loads/BaseClasses/PartialBuilding.mo | 16 +- .../PartialBuildingWithPartialETS.mo | 98 +- .../Loads}/BaseClasses/PartialFanCoil4Pipe.mo | 8 +- .../Loads/BaseClasses/PartialTerminalUnit.mo | 38 +- .../DHC/Loads/BaseClasses/SimpleRoomODE.mo | 2 +- .../DHC/Loads/BaseClasses/Types.mo | 2 +- .../Validation/BaseClasses/Building.mo | 8 +- .../Validation/BaseClasses/BuildingWithETS.mo | 8 +- .../BaseClasses/Validation/BaseClasses/ETS.mo | 20 +- .../BaseClasses/FanCoil2PipeCooling.mo | 14 +- .../BaseClasses/FanCoil2PipeHeating.mo | 14 +- .../BaseClasses/FanCoil2PipeHeatingValve.mo | 10 +- .../Validation/BaseClasses/package.mo | 6 +- .../Validation/BaseClasses/package.order | 0 .../Validation/BenchmarkFlowDistribution1.mo | 24 +- .../Validation/BenchmarkFlowDistribution2.mo | 24 +- .../BaseClasses/Validation/BuildingWithETS.mo | 58 +- .../Validation/FlowDistributionPumpControl.mo | 28 +- .../BaseClasses/Validation/GetPeakLoad.mo | 16 +- .../BaseClasses/Validation/SimpleRoomODE.mo | 20 +- .../Validation/TerminalUnitScaling.mo | 14 +- .../Loads/BaseClasses/Validation/package.mo | 6 +- .../BaseClasses/Validation/package.order | 0 .../DHC/Loads/BaseClasses/getPeakLoad.mo | 6 +- .../Loads}/BaseClasses/package.mo | 6 +- .../DHC/Loads/BaseClasses/package.order | 8 + .../BaseClasses/PartialBuildingWithETS.mo | 10 +- .../Loads/Combined}/BaseClasses/package.mo | 6 +- .../Loads/Combined/BaseClasses/package.order | 0 .../Combined/BuildingTimeSeriesWithETS.mo | 14 +- .../BuildingTimeSeriesWithETSWithDHWTank.mo | 18 +- .../Examples/BuildingTimeSeriesWithETS.mo | 12 +- .../BuildingTimeSeriesWithETSDHWTank.mo | 14 +- .../Loads/Combined}/Examples/package.mo | 6 +- .../DHC/Loads/Combined/Examples/package.order | 0 .../DHC/Loads/Combined/package.mo | 2 +- .../DHC/Loads/Combined/package.order | 0 .../BaseClasses/PartialBuildingWithETS.mo | 10 +- .../Loads/Cooling}/BaseClasses/package.mo | 6 +- .../Loads/Cooling/BaseClasses/package.order | 0 .../Cooling/BuildingTimeSeriesWithETS.mo | 12 +- .../Examples/BuildingTimeSeriesWithETS.mo | 8 +- .../DHC/Loads/Cooling/Examples/package.mo | 6 +- .../DHC/Loads/Cooling/Examples/package.order | 0 .../DHC/Loads/Cooling/package.mo | 2 +- .../DHC/Loads/Cooling/package.order | 0 .../BaseClasses/PartialBuildingWithETS.mo | 10 +- .../Loads/Heating}/BaseClasses/package.mo | 6 +- .../Loads/Heating/BaseClasses/package.order | 0 .../Heating/BuildingTimeSeriesWithETS.mo | 12 +- .../Examples/BuildingTimeSeriesWithETS.mo | 6 +- .../DHC/Loads/Heating/Examples/package.mo | 6 +- .../DHC/Loads/Heating/Examples/package.order | 0 .../DHC/Loads/Heating/package.mo | 2 +- .../DHC/Loads/Heating/package.order | 0 .../HeatExchangerPumpController.mo | 2 +- .../BaseClasses/PartialFourPortDHW.mo | 2 +- .../BaseClasses/TankChargingController.mo | 2 +- .../BaseClasses/TankValveController.mo | 2 +- .../DHC/Loads/HotWater/BaseClasses/package.mo | 12 + .../Loads/HotWater/BaseClasses/package.order | 0 ...enericDomesticHotWaterWithHeatExchanger.mo | 2 +- .../DHC/Loads/HotWater/Data/package.mo | 2 +- .../DHC/Loads/HotWater/Data/package.order | 0 .../DirectHeatExchangerWithElectricHeat.mo | 6 +- ...tureDirectHeatExchangerWithElectricHeat.mo | 14 +- .../StorageTankWithExternalHeatExchanger.mo | 12 +- .../DHC/Loads/HotWater/Examples/package.mo | 2 +- .../DHC/Loads/HotWater/Examples/package.order | 0 .../StorageTankWithExternalHeatExchanger.mo | 22 +- .../Loads/HotWater/ThermostaticMixingValve.mo | 2 +- .../DHC/Loads/HotWater/package.mo | 2 +- .../DHC/Loads/HotWater/package.order | 0 .../BaseClasses/ControlVolumeCondensation.mo | 8 +- .../Examples/ControlVolumeCondensation.mo | 8 +- .../Steam/BaseClasses/Examples/SteamTrap.mo | 6 +- .../BaseClasses/Examples/ValveSelfActing.mo | 6 +- .../Steam/BaseClasses/Examples/package.mo | 6 +- .../Steam/BaseClasses/Examples/package.order | 0 .../DHC/Loads/Steam/BaseClasses/SteamTrap.mo | 2 +- .../Steam/BaseClasses/ValveSelfActing.mo | 2 +- .../DHC/Loads/Steam/BaseClasses/package.mo | 12 + .../DHC/Loads/Steam/BaseClasses/package.order | 0 .../Loads/Steam/BuildingTimeSeriesAtETS.mo | 12 +- .../Steam/Examples/BuildingTimeSeriesAtETS.mo | 6 +- .../DHC/Loads/Steam/Examples/package.mo | 6 +- .../DHC/Loads/Steam/Examples/package.order | 0 .../DHC/Loads/Steam/package.mo | 2 +- .../DHC/Loads/Steam/package.order | 0 .../{Experimental => }/DHC/Loads/package.mo | 2 +- .../DHC/Loads/package.order | 0 .../BaseClasses/DifferenceEnthalpyFlowRate.mo | 2 +- .../BaseClasses/PartialConnection1Pipe.mo | 2 +- .../BaseClasses/PartialConnection2Pipe.mo | 4 +- .../PartialConnection2Pipe2Medium.mo | 2 +- .../BaseClasses/PartialDistribution.mo | 4 +- .../BaseClasses/PartialDistribution1Pipe.mo | 2 +- .../BaseClasses/PartialDistribution2Medium.mo | 2 +- .../BaseClasses/PartialDistribution2Pipe.mo | 4 +- .../PartialDistribution2Pipe2Medium.mo | 8 +- .../DHC/Networks/BaseClasses/package.mo | 6 +- .../DHC/Networks/BaseClasses/package.order | 0 .../Connections/Connection1PipePlugFlow_v.mo | 4 +- .../Networks/Connections/Connection1Pipe_R.mo | 8 +- .../Connections/Connection2PipePlugFlow_v.mo | 4 +- .../Networks/Connections/Connection2Pipe_R.mo | 8 +- .../Examples/Connection1PipeExample.mo | 24 +- .../Examples/Connection2PipeExample.mo | 24 +- .../Networks/Connections}/Examples/package.mo | 6 +- .../Connections/Examples/package.order | 0 .../DHC/Networks/Connections/package.mo | 2 +- .../DHC/Networks/Connections/package.order | 0 .../DHC/Networks/Controls/AgentPump1Pipe.mo | 2 +- .../Examples/AgentPump1PipeExample.mo | 10 +- .../Controls/Examples/MainPump1PipeExample.mo | 8 +- .../DHC/Networks/Controls/Examples/package.mo | 2 +- .../Networks/Controls/Examples/package.order | 0 .../DHC/Networks/Controls/MainPump1Pipe.mo | 8 +- .../DHC/Networks/Controls/package.mo | 2 +- .../DHC/Networks/Controls/package.order | 0 .../Networks/Distribution1PipePlugFlow_v.mo | 10 +- .../DHC/Networks/Distribution1Pipe_R.mo | 16 +- .../Networks/Distribution2PipePlugFlow_v.mo | 8 +- .../DHC/Networks/Distribution2Pipe_R.mo | 16 +- .../Examples/Distribution1PipeExample.mo | 32 +- .../Examples/Distribution2PipeExample.mo | 28 +- .../Networks}/Examples/package.mo | 6 +- .../DHC/Networks/Examples/package.order | 0 .../DHC/Networks/Pipes/PipeAutosize.mo | 2 +- .../DHC/Networks/Pipes/PipeStandard.mo | 2 +- .../DHC/Networks/Pipes/Validation/Pipe.mo | 12 +- .../DHC/Networks/Pipes/Validation/package.mo | 6 +- .../Networks/Pipes/Validation/package.order | 0 .../DHC/Networks/Pipes/package.mo | 2 +- .../DHC/Networks/Pipes/package.order | 0 .../Steam/ConnectionCondensatePipe.mo | 4 +- .../Steam/DistributionCondensatePipe.mo | 4 +- .../Examples/ConnectionCondensatePipe.mo | 6 +- .../Examples/DistributionCondensatePipe.mo | 8 +- .../DHC/Networks/Steam/Examples/package.mo | 6 +- .../DHC/Networks/Steam/Examples/package.order | 0 .../DHC/Networks/Steam/package.mo | 2 +- .../DHC/Networks/Steam/package.order | 0 .../DHC/Networks/package.mo | 2 +- .../DHC/Networks/package.order | 0 .../DHC/Plants/BaseClasses/PartialPlant.mo | 22 +- Buildings/DHC/Plants/BaseClasses/package.mo | 15 + .../DHC/Plants/BaseClasses/package.order | 0 .../Plants/Combined/AllElectricCWStorage.mo | 16 +- .../Controls/BaseClasses/CoolingTowerLoop.mo | 14 +- .../BaseClasses/DirectHeatRecovery.mo | 4 +- .../Controls/BaseClasses/IntegerArrayHold.mo | 2 +- .../Controls/BaseClasses/ModeCondenserLoop.mo | 16 +- .../BaseClasses/ModeHeatRecoveryChiller.mo | 2 +- .../Controls/BaseClasses/PartialController.mo | 2 +- .../Controls/BaseClasses/StageIndex.mo | 2 +- .../Controls/BaseClasses/StagingPlant.mo | 16 +- .../Controls/BaseClasses/StagingPump.mo | 4 +- .../Controls/BaseClasses/TankCycle.mo | 4 +- .../BaseClasses/Validation/StageIndex.mo | 10 +- .../BaseClasses/Validation/StagingPlant.mo | 10 +- .../BaseClasses/Validation/StagingPump.mo | 10 +- .../BaseClasses/Validation/package.mo | 2 +- .../BaseClasses/Validation/package.order | 0 .../BaseClasses/ValveCondenserEvaporator.mo | 44 +- .../Combined/Controls/BaseClasses/package.mo | 2 +- .../Controls/BaseClasses/package.order | 0 .../Plants/Combined/Controls/Controller.mo | 44 +- .../Controls/ModeCondenserLoop/package.mo | 2 +- .../Controls/ModeCondenserLoop/package.order | 0 .../DHC/Plants/Combined/Controls/package.mo | 2 +- .../Plants/Combined/Controls/package.order | 0 .../Combined/Examples/AllElectricCWStorage.mo | 18 +- .../DHC/Plants/Combined/Examples/package.mo | 2 +- .../Plants/Combined/Examples/package.order | 0 .../Subsystems/BaseClasses/MultipleValves.mo | 2 +- .../BaseClasses/PartialMultiplePumps.mo | 8 +- .../BaseClasses/PassThroughFluid.mo | 2 +- .../Subsystems/BaseClasses/package.mo | 2 +- .../Subsystems/BaseClasses/package.order | 0 .../Combined/Subsystems/ChillerGroup.mo | 6 +- .../Subsystems/ChillerHeatRecoveryGroup.mo | 2 +- .../Combined/Subsystems/CoolingTowerGroup.mo | 2 +- .../Combined/Subsystems/HeatPumpGroup.mo | 2 +- .../Combined/Subsystems/MultiplePumpsDp.mo | 6 +- .../Combined/Subsystems/MultiplePumpsFlow.mo | 6 +- .../Combined/Subsystems/MultiplePumpsSpeed.mo | 8 +- .../BaseClasses/PartialMultiplePumps.mo | 12 +- .../Validation/BaseClasses/package.mo | 2 +- .../Validation/BaseClasses/package.order | 0 .../Subsystems/Validation/ChillerGroup.mo | 10 +- .../Validation/ChillerHeatRecoveryGroup.mo | 18 +- .../Validation/CoolingTowerGroup.mo | 14 +- .../Subsystems/Validation/HeatPumpGroup.mo | 10 +- .../Subsystems/Validation/MultiplePumpsDp.mo | 10 +- .../Validation/MultiplePumpsFlow.mo | 10 +- .../Validation/MultiplePumpsSpeed.mo | 10 +- .../Validation/ValveOpeningFlowBalancing.mo | 4 +- .../Combined/Subsystems/Validation/package.mo | 2 +- .../Subsystems/Validation/package.order | 0 .../DHC/Plants/Combined/Subsystems/package.mo | 2 +- .../Plants/Combined/Subsystems/package.order | 0 .../Validation/AllElectricCWStorage.mo | 10 +- .../DHC/Plants/Combined/Validation/package.mo | 2 +- .../Plants/Combined/Validation/package.order | 0 .../DHC/Plants/Combined/package.mo | 2 +- .../DHC/Plants/Combined/package.order | 0 .../Plants/Cooling/BaseClasses/IdealUser.mo | 6 +- .../Cooling/BaseClasses/ParallelJunctions.mo | 2 +- .../Cooling/BaseClasses/ParallelPipes.mo | 2 +- .../BaseClasses/ReversibleConnection.mo | 2 +- .../Plants/Cooling/BaseClasses/TankBranch.mo | 2 +- .../BaseClasses/Validation/IdealUser.mo | 6 +- .../Cooling/BaseClasses/Validation/package.mo | 2 +- .../BaseClasses/Validation/package.order | 0 .../DHC/Plants/Cooling/BaseClasses/package.mo | 2 +- .../Plants/Cooling/BaseClasses/package.order | 0 .../Cooling/Controls/ChilledWaterBypass.mo | 2 +- .../Cooling/Controls/ChilledWaterPumpSpeed.mo | 2 +- .../Plants/Cooling/Controls/ChillerStage.mo | 4 +- .../Plants/Cooling/Controls/FlowControl.mo | 2 +- .../DHC/Plants/Cooling/Controls/SelectMin.mo | 2 +- .../DHC/Plants/Cooling/Controls/TankStatus.mo | 2 +- .../Controls/Validation/ChilledWaterBypass.mo | 10 +- .../Validation/ChilledWaterPumpSpeed.mo | 10 +- .../Controls/Validation/ChillerStage.mo | 10 +- .../Cooling/Controls/Validation/TankStatus.mo | 10 +- .../Cooling/Controls/Validation/package.mo | 14 + .../Cooling/Controls/Validation/package.order | 0 .../DHC/Plants/Cooling/Controls/package.mo | 2 +- .../DHC/Plants/Cooling/Controls/package.order | 0 .../Plants/Cooling/ElectricChillerParallel.mo | 22 +- .../Examples/ElectricChillerParallel.mo | 10 +- .../Examples/StoragePlantDualSource.mo | 32 +- .../Plants/Cooling}/Examples/package.mo | 6 +- .../DHC/Plants/Cooling/Examples/package.order | 0 .../DHC/Plants/Cooling/StoragePlant.mo | 22 +- .../Subsystems/CoolingTowersParallel.mo | 2 +- .../Subsystems/CoolingTowersWithBypass.mo | 4 +- .../PartialCoolingTowersSubsystem.mo | 6 +- .../Examples/BaseClasses/package.mo | 4 +- .../Examples/BaseClasses/package.order | 0 .../Examples/CoolingTowersParallel.mo | 12 +- .../Examples/CoolingTowersWithBypass.mo | 12 +- .../Cooling/Subsystems/Examples/package.mo | 6 +- .../Cooling/Subsystems/Examples/package.order | 0 .../DHC/Plants/Cooling/Subsystems/package.mo | 2 +- .../Plants/Cooling/Subsystems/package.order | 0 .../DHC/Plants/Cooling/package.mo | 2 +- .../DHC/Plants/Cooling/package.order | 0 .../DHC/Plants/Heating/SewageHeatRecovery.mo | 12 +- .../DHC/Plants/Heating/package.mo | 2 +- .../DHC/Plants/Heating/package.order | 0 .../Steam/BaseClasses/BoilerPolynomial.mo | 16 +- .../BaseClasses/ControlVolumeEvaporation.mo | 8 +- .../BaseClasses/Examples/BoilerPolynomial.mo | 8 +- .../Examples/ControlVolumeEvaporation.mo | 8 +- .../Steam/BaseClasses/Examples/package.mo | 6 +- .../Steam/BaseClasses/Examples/package.order | 0 .../DHC/Plants/Steam/BaseClasses/package.mo | 12 + .../Plants/Steam/BaseClasses/package.order | 0 .../DHC/Plants/Steam/Examples/SingleBoiler.mo | 14 +- .../DHC/Plants/Steam/Examples/package.mo | 6 +- .../DHC/Plants/Steam/Examples/package.order | 0 .../DHC/Plants/Steam/SingleBoiler.mo | 10 +- .../DHC/Plants/Steam/package.mo | 2 +- .../DHC/Plants/Steam/package.order | 0 .../{Experimental => }/DHC/Plants/package.mo | 2 +- .../DHC/Plants/package.order | 0 Buildings/{Experimental => }/DHC/Types.mo | 2 +- .../{Experimental => }/DHC/UsersGuide.mo | 106 +- Buildings/{Experimental => }/DHC/package.mo | 2 +- .../{Experimental => }/DHC/package.order | 2 +- .../BaseClasses/Controls/SystemHysteresis.mo | 12 +- .../Combined/Controls/BaseClasses/package.mo | 15 - .../Combined/Subsystems/Validation/package.mo | 14 - .../Validation/BaseClasses/package.mo | 14 - .../Examples/Combined/BaseClasses/package.mo | 12 - .../Examples/BaseClasses/package.order | 9 - .../DHC/Loads/Steam/BaseClasses/package.mo | 12 - .../DHC/Plants/Steam/BaseClasses/package.mo | 12 - Buildings/Experimental/package.mo | 14 - Buildings/Experimental/package.order | 1 - .../Generic/BaseClasses/PerformanceCurve.mo | 2 +- .../Cooling/AirSource/Data/Generic/DXCoil.mo | 11 +- .../Generic/BaseClasses/PerformanceCurve.mo | 2 +- .../WaterSource/Data/Generic/DXCoil.mo | 14 +- .../Heating/AirSource/Data/Generic/DXCoil.mo | 31 +- .../BuriedPipes/PipeGroundCoupling.mo | 2 +- ...ew2004_7.1_5.0_3C_USA_CA_SAN_FRANCISCO.mos | 0 .../DHC/Loads/Examples/.gitignore | 0 .../OfficeBuilding/InternalGains_Floor.txt | 0 .../OfficeBuilding/InternalGains_ICT.txt | 0 .../OfficeBuilding/InternalGains_Meeting.txt | 0 .../OfficeBuilding/InternalGains_Office.txt | 0 .../OfficeBuilding/InternalGains_Restroom.txt | 0 .../OfficeBuilding/InternalGains_Storage.txt | 0 .../Examples/MediumOffice-90.1-2010-5A.mos | 0 .../Loads/Examples/SwissHospital_20190916.mos | 0 .../Loads/Examples/SwissOffice_20190916.mos | 0 .../Examples/SwissResidential_20190916.mos | 0 .../Loads/HotWater/DHW_ApartmentMidRise.mos | 0 .../DHC/UserGuide/DHC_Package_Concept.png | Bin .../DHC/UserGuide/DHC_Package_Concept.svg | 0 .../Combined/BaseClasses/PartialParallel.png | Bin .../Combined/BaseClasses/PartialParallel.svg | 0 .../ETS}/Combined/ChillerBorefield.png | Bin .../ETS}/Combined/ChillerBorefield.svg | 0 .../Combined/Subsystems/HeatPumpDHWTank.png | Bin .../Combined/Subsystems/HeatPumpDHWTank.svg | 0 .../ETS}/Cooling/Direct.png | Bin .../ETS}/Cooling/Direct.svg | 0 .../ETS}/Cooling/Indirect.png | Bin .../ETS}/Cooling/Indirect.svg | 0 .../Cooling/ElectricChillersDirectETS.png | Bin .../Cooling/ElectricChillersDirectETS.svg | 0 .../DirectHeatExchangerWithElectricHeat.png | Bin ...Example_DirectHeatExchangerWithAuxHeat.png | Bin .../HotWater/Example_HeatPumpWithTank.png | Bin .../StorageTankWithExternalHeatExchanger.png | Bin .../StorageTankWithExternalHeatExchanger.svg | 0 .../Loads}/Loads/FlowDistribution1.png | Bin .../Loads}/Loads/FlowDistribution1.svg | 0 .../Loads}/Loads/FlowDistribution2.png | Bin .../Loads}/Loads/FlowDistribution2.svg | 0 .../Loads}/Loads/PartialBuilding.png | Bin .../Loads}/Loads/PartialBuilding.svg | 0 .../Loads/PartialBuildingWithPartialETS.png | Bin .../Loads/PartialBuildingWithPartialETS.svg | 0 .../Loads/Steam/BuildingTimeSeriesAtETS.png | Bin .../Loads/Steam/BuildingTimeSeriesAtETS.svg | 0 .../DHC/Networks/Controls/MainPump.png | Bin .../DHC/Networks/Controls/MainPump.svg | 0 .../Plants/Combined/AllElectricCWStorage.png | Bin .../Plants/Combined/AllElectricCWStorage.svg | 0 .../Plants/Cooling/Controls/ChillerStage.png | Bin .../Plants/Cooling/Controls/ChillerStage.svg | 0 .../Cooling}/Cooling/ControlSignals.drawio | 0 .../Cooling}/Cooling/ControlSignals.png | Bin .../Cooling}/Cooling/ControlSignals.svg | 0 .../Cooling/ElectricChillerParallel.png | Bin .../Cooling/ElectricChillerParallel.svg | 0 .../Cooling}/Cooling/SystemConcept.drawio | 0 .../Plants/Cooling}/Cooling/SystemConcept.png | Bin .../Plants/Cooling}/Cooling/SystemConcept.svg | 0 .../Steam/BaseClasses/BoilerPolynomial.png | Bin .../Steam/BaseClasses/BoilerPolynomial.svg | 0 .../Templates/Plants/HeatPumps/AirToWater.png | Bin 0 -> 33087 bytes .../Templates/Plants/HeatPumps/AirToWater.svg | 916 ++++++++++++++++++ ...asses_Validation_CollectorDistributor.txt} | 0 ...TS_Combined_Examples_ChillerBorefield.txt} | 0 ...DHC_ETS_Combined_Examples_ChillerOnly.txt} | 0 ...bined_Subsystems_Validation_Borefield.txt} | 0 ...ombined_Subsystems_Validation_Chiller.txt} | 0 ...d_Subsystems_Validation_HeatExchanger.txt} | 0 ...mbined_Subsystems_Validation_HeatPump.txt} | 0 ...Subsystems_Validation_HeatPumpDHWTank.txt} | 0 ...bined_Subsystems_Validation_SwitchBox.txt} | 0 ...ystems_Validation_WatersideEconomizer.txt} | 0 ..._Combined_Validation_ChillerBorefield.txt} | 0 ...C_ETS_Combined_Validation_ChillerOnly.txt} | 0 ...HC_ETS_Combined_Validation_ChillerWSE.txt} | 0 ...dings_DHC_ETS_Cooling_Examples_Direct.txt} | 0 ...ngs_DHC_ETS_Cooling_Examples_Indirect.txt} | 0 ...dings_DHC_ETS_Heating_Examples_Direct.txt} | 0 ...ngs_DHC_ETS_Heating_Examples_Indirect.txt} | 0 ..._Examples_Combined_SeriesConstantFlow.txt} | 0 ..._Examples_Combined_SeriesVariableFlow.txt} | 0 ...mbined_SeriesVariableFlowAgentControl.txt} | 0 ...les_Cooling_ElectricChillersDirectETS.txt} | 0 ...dings_DHC_Examples_Steam_SingleBoiler.txt} | 0 ...ontrols_Validation_MixingValveControl.txt} | 0 ...aseClasses_Examples_CouplingRCZ1Valve.txt} | 0 ...ads_BaseClasses_Examples_CouplingRCZ6.txt} | 0 ..._BaseClasses_Examples_CouplingSpawnZ1.txt} | 0 ..._BaseClasses_Examples_CouplingSpawnZ6.txt} | 0 ...seClasses_Examples_CouplingTimeSeries.txt} | 0 ...Examples_CouplingTimeSeriesSingleLoop.txt} | 0 ...Validation_BenchmarkFlowDistribution1.txt} | 0 ...Validation_BenchmarkFlowDistribution2.txt} | 0 ...aseClasses_Validation_BuildingWithETS.txt} | 0 ...alidation_FlowDistributionPumpControl.txt} | 0 ...ds_BaseClasses_Validation_GetPeakLoad.txt} | 0 ..._BaseClasses_Validation_SimpleRoomODE.txt} | 0 ...lasses_Validation_TerminalUnitScaling.txt} | 0 ...ed_Examples_BuildingTimeSeriesWithETS.txt} | 0 ...ples_BuildingTimeSeriesWithETSDHWTank.txt} | 0 ...ng_Examples_BuildingTimeSeriesWithETS.txt} | 0 ...ng_Examples_BuildingTimeSeriesWithETS.txt} | 0 ...reDirectHeatExchangerWithElectricHeat.txt} | 0 ..._StorageTankWithExternalHeatExchanger.txt} | 0 ...es_Examples_ControlVolumeCondensation.txt} | 0 ..._Steam_BaseClasses_Examples_SteamTrap.txt} | 0 ..._BaseClasses_Examples_ValveSelfActing.txt} | 0 ...team_Examples_BuildingTimeSeriesAtETS.txt} | 0 ...tions_Examples_Connection1PipeExample.txt} | 0 ...tions_Examples_Connection2PipeExample.txt} | 0 ...ntrols_Examples_AgentPump1PipeExample.txt} | 0 ...ontrols_Examples_MainPump1PipeExample.txt} | 0 ...rks_Examples_Distribution1PipeExample.txt} | 0 ...rks_Examples_Distribution2PipeExample.txt} | 0 ...gs_DHC_Networks_Pipes_Validation_Pipe.txt} | 0 ...eam_Examples_ConnectionCondensatePipe.txt} | 0 ...m_Examples_DistributionCondensatePipe.txt} | 0 ...ols_BaseClasses_Validation_StageIndex.txt} | 0 ...s_BaseClasses_Validation_StagingPlant.txt} | 0 ...ls_BaseClasses_Validation_StagingPump.txt} | 0 ...ombined_Examples_AllElectricCWStorage.txt} | 0 ...ed_Subsystems_Validation_ChillerGroup.txt} | 0 ...s_Validation_ChillerHeatRecoveryGroup.txt} | 0 ...bsystems_Validation_CoolingTowerGroup.txt} | 0 ...d_Subsystems_Validation_HeatPumpGroup.txt} | 0 ...Subsystems_Validation_MultiplePumpsDp.txt} | 0 ...bsystems_Validation_MultiplePumpsFlow.txt} | 0 ...systems_Validation_MultiplePumpsSpeed.txt} | 0 ..._Validation_ValveOpeningFlowBalancing.txt} | 0 ...bined_Validation_AllElectricCWStorage.txt} | 0 ...ling_BaseClasses_Validation_IdealUser.txt} | 0 ...ontrols_Validation_ChilledWaterBypass.txt} | 0 ...rols_Validation_ChilledWaterPumpSpeed.txt} | 0 ...ling_Controls_Validation_ChillerStage.txt} | 0 ...ooling_Controls_Validation_TankStatus.txt} | 0 ...ling_Examples_ElectricChillerParallel.txt} | 0 ...oling_Examples_StoragePlantDualSource.txt} | 0 ...ystems_Examples_CoolingTowersParallel.txt} | 0 ...tems_Examples_CoolingTowersWithBypass.txt} | 0 ...BaseClasses_Examples_BoilerPolynomial.txt} | 0 ...ses_Examples_ControlVolumeEvaporation.txt} | 0 ...HC_Plants_Steam_Examples_SingleBoiler.txt} | 0 ...mples_HeaterAndFixtureHeatPumpWithTank.txt | 15 - ...s_Combined_BaseClasses_Validation_Pipe.txt | 21 - .../Resources/Scripts/BuildingsPy/conf.yml | 152 +-- .../ConvertBuildings_from_10_to_11.0.0.mos | 18 +- .../Validation/CollectorDistributor.mos | 2 +- .../Combined/Examples/ChillerBorefield.mos | 2 +- .../ETS}/Combined/Examples/ChillerOnly.mos | 2 +- .../Subsystems/Validation/Borefield.mos | 2 +- .../Subsystems/Validation/Chiller.mos | 2 +- .../Subsystems/Validation/HeatExchanger.mos | 2 +- .../Subsystems/Validation/HeatPump.mos | 2 +- .../Subsystems/Validation/HeatPumpDHWTank.mos | 2 +- .../Subsystems/Validation/SwitchBox.mos | 2 +- .../Validation/WatersideEconomizer.mos | 2 +- .../Combined/Validation/ChillerBorefield.mos | 2 +- .../ETS}/Combined/Validation/ChillerOnly.mos | 2 +- .../ETS}/Combined/Validation/ChillerWSE.mos | 2 +- .../ETS}/Cooling/Examples/Direct.mos | 2 +- .../ETS}/Cooling/Examples/Indirect.mos | 2 +- .../ETS}/Heating/Examples/Direct.mos | 2 +- .../ETS}/Heating/Examples/Indirect.mos | 2 +- .../Examples/Combined/SeriesConstantFlow.mos | 2 +- .../Examples/Combined/SeriesVariableFlow.mos | 2 +- .../SeriesVariableFlowAgentControl.mos | 2 +- .../Cooling/ElectricChillersDirectETS.mos | 2 +- .../DHC/Examples/Steam/SingleBoiler.mos | 2 +- .../Validation/MixingValveControl.mos | 2 +- .../Examples/CouplingRCZ1Valve.mos | 2 +- .../BaseClasses/Examples/CouplingRCZ6.mos | 2 +- .../BaseClasses/Examples/CouplingSpawnZ1.mos | 2 +- .../BaseClasses/Examples/CouplingSpawnZ6.mos | 2 +- .../Examples/CouplingTimeSeries.mos | 2 +- .../Examples/CouplingTimeSeriesSingleLoop.mos | 2 +- .../Validation/BenchmarkFlowDistribution1.mos | 2 +- .../Validation/BenchmarkFlowDistribution2.mos | 2 +- .../Validation/BuildingWithETS.mos | 2 +- .../FlowDistributionPumpControl.mos | 2 +- .../BaseClasses/Validation/GetPeakLoad.mos | 2 +- .../BaseClasses/Validation/SimpleRoomODE.mos | 2 +- .../Validation/TerminalUnitScaling.mos | 2 +- .../Examples/BuildingTimeSeriesWithETS.mos | 2 +- .../BuildingTimeSeriesWithETSDHWTank.mos | 2 +- .../Examples/BuildingTimeSeriesWithETS.mos | 2 +- .../Examples/BuildingTimeSeriesWithETS.mos | 2 +- ...ureDirectHeatExchangerWithElectricHeat.mos | 2 +- .../StorageTankWithExternalHeatExchanger.mos | 2 +- .../Examples/ControlVolumeCondensation.mos | 2 +- .../Steam/BaseClasses/Examples/SteamTrap.mos | 2 +- .../BaseClasses/Examples/ValveSelfActing.mos | 2 +- .../Examples/BuildingTimeSeriesAtETS.mos | 2 +- .../Examples/Connection1PipeExample.mos | 2 +- .../Examples/Connection2PipeExample.mos | 2 +- .../Examples/AgentPump1PipeExample.mos | 2 +- .../Examples/MainPump1PipeExample.mos | 2 +- .../Examples/Distribution1PipeExample.mos | 2 +- .../Examples/Distribution2PipeExample.mos | 2 +- .../DHC/Networks/Pipes/Validation/Pipe.mos | 2 +- .../Examples/ConnectionCondensatePipe.mos | 2 +- .../Examples/DistributionCondensatePipe.mos | 2 +- .../BaseClasses/Validation/StageIndex.mos | 2 +- .../BaseClasses/Validation/StagingPlant.mos | 2 +- .../BaseClasses/Validation/StagingPump.mos | 2 +- .../Examples/AllElectricCWStorage.mos | 2 +- .../Subsystems/Validation/ChillerGroup.mos | 2 +- .../Validation/ChillerHeatRecoveryGroup.mos | 2 +- .../Validation/CoolingTowerGroup.mos | 2 +- .../Subsystems/Validation/HeatPumpGroup.mos | 2 +- .../Subsystems/Validation/MultiplePumpsDp.mos | 2 +- .../Validation/MultiplePumpsFlow.mos | 2 +- .../Validation/MultiplePumpsSpeed.mos | 2 +- .../Validation/ValveOpeningFlowBalancing.mos | 2 +- .../Validation/AllElectricCWStorage.mos | 2 +- .../BaseClasses/Validation/IdealUser.mos | 2 +- .../Validation/ChilledWaterBypass.mos | 2 +- .../Validation/ChilledWaterPumpSpeed.mos | 2 +- .../Controls/Validation/ChillerStage.mos | 2 +- .../Controls/Validation/TankStatus.mos | 2 +- .../Examples/ElectricChillerParallel.mos | 2 +- .../Examples/StoragePlantDualSource.mos | 2 +- .../Examples/CoolingTowersParallel.mos | 2 +- .../Examples/CoolingTowersWithBypass.mos | 2 +- .../BaseClasses/Examples/BoilerPolynomial.mos | 2 +- .../Examples/ControlVolumeEvaporation.mos | 2 +- .../Plants/Steam/Examples/SingleBoiler.mos | 2 +- ...asses.Validation.CollectorDistributor.mos} | 0 ...TS.Combined.Examples.ChillerBorefield.mos} | 0 ...DHC.ETS.Combined.Examples.ChillerOnly.mos} | 0 ...bined.Subsystems.Validation.Borefield.mos} | 0 ...ombined.Subsystems.Validation.Chiller.mos} | 0 ...d.Subsystems.Validation.HeatExchanger.mos} | 0 ...mbined.Subsystems.Validation.HeatPump.mos} | 0 ...Subsystems.Validation.HeatPumpDHWTank.mos} | 0 ...bined.Subsystems.Validation.SwitchBox.mos} | 0 ...ystems.Validation.WatersideEconomizer.mos} | 0 ....Combined.Validation.ChillerBorefield.mos} | 0 ...C.ETS.Combined.Validation.ChillerOnly.mos} | 0 ...HC.ETS.Combined.Validation.ChillerWSE.mos} | 0 ...dings.DHC.ETS.Cooling.Examples.Direct.mos} | 0 ...ngs.DHC.ETS.Cooling.Examples.Indirect.mos} | 0 ...dings.DHC.ETS.Heating.Examples.Direct.mos} | 0 ...ngs.DHC.ETS.Heating.Examples.Indirect.mos} | 0 ....Examples.Combined.SeriesConstantFlow.mos} | 0 ....Examples.Combined.SeriesVariableFlow.mos} | 0 ...mbined.SeriesVariableFlowAgentControl.mos} | 0 ...les.Cooling.ElectricChillersDirectETS.mos} | 0 ...dings.DHC.Examples.Steam.SingleBoiler.mos} | 0 ...ontrols.Validation.MixingValveControl.mos} | 0 ...aseClasses.Examples.CouplingRCZ1Valve.mos} | 0 ...ads.BaseClasses.Examples.CouplingRCZ6.mos} | 0 ....BaseClasses.Examples.CouplingSpawnZ1.mos} | 0 ....BaseClasses.Examples.CouplingSpawnZ6.mos} | 0 ...seClasses.Examples.CouplingTimeSeries.mos} | 0 ...Examples.CouplingTimeSeriesSingleLoop.mos} | 0 ...Validation.BenchmarkFlowDistribution1.mos} | 0 ...Validation.BenchmarkFlowDistribution2.mos} | 0 ...aseClasses.Validation.BuildingWithETS.mos} | 0 ...alidation.FlowDistributionPumpControl.mos} | 0 ...ds.BaseClasses.Validation.GetPeakLoad.mos} | 0 ....BaseClasses.Validation.SimpleRoomODE.mos} | 0 ...lasses.Validation.TerminalUnitScaling.mos} | 0 ...ed.Examples.BuildingTimeSeriesWithETS.mos} | 0 ...ples.BuildingTimeSeriesWithETSDHWTank.mos} | 0 ...ng.Examples.BuildingTimeSeriesWithETS.mos} | 0 ...ng.Examples.BuildingTimeSeriesWithETS.mos} | 0 ...reDirectHeatExchangerWithElectricHeat.mos} | 0 ....StorageTankWithExternalHeatExchanger.mos} | 0 ...es.Examples.ControlVolumeCondensation.mos} | 0 ....Steam.BaseClasses.Examples.SteamTrap.mos} | 0 ....BaseClasses.Examples.ValveSelfActing.mos} | 0 ...team.Examples.BuildingTimeSeriesAtETS.mos} | 0 ...tions.Examples.Connection1PipeExample.mos} | 0 ...tions.Examples.Connection2PipeExample.mos} | 0 ...ntrols.Examples.AgentPump1PipeExample.mos} | 0 ...ontrols.Examples.MainPump1PipeExample.mos} | 0 ...rks.Examples.Distribution1PipeExample.mos} | 0 ...rks.Examples.Distribution2PipeExample.mos} | 0 ...gs.DHC.Networks.Pipes.Validation.Pipe.mos} | 0 ...eam.Examples.ConnectionCondensatePipe.mos} | 0 ...m.Examples.DistributionCondensatePipe.mos} | 0 ...ols.BaseClasses.Validation.StageIndex.mos} | 0 ...s.BaseClasses.Validation.StagingPlant.mos} | 0 ...ls.BaseClasses.Validation.StagingPump.mos} | 0 ...ombined.Examples.AllElectricCWStorage.mos} | 0 ...ed.Subsystems.Validation.ChillerGroup.mos} | 0 ...s.Validation.ChillerHeatRecoveryGroup.mos} | 0 ...bsystems.Validation.CoolingTowerGroup.mos} | 0 ...d.Subsystems.Validation.HeatPumpGroup.mos} | 0 ...Subsystems.Validation.MultiplePumpsDp.mos} | 0 ...bsystems.Validation.MultiplePumpsFlow.mos} | 0 ...systems.Validation.MultiplePumpsSpeed.mos} | 0 ....Validation.ValveOpeningFlowBalancing.mos} | 0 ...bined.Validation.AllElectricCWStorage.mos} | 0 ...ling.BaseClasses.Validation.IdealUser.mos} | 0 ...ontrols.Validation.ChilledWaterBypass.mos} | 0 ...rols.Validation.ChilledWaterPumpSpeed.mos} | 0 ...ling.Controls.Validation.ChillerStage.mos} | 0 ...ooling.Controls.Validation.TankStatus.mos} | 0 ...ling.Examples.ElectricChillerParallel.mos} | 0 ...oling.Examples.StoragePlantDualSource.mos} | 0 ...ystems.Examples.CoolingTowersParallel.mos} | 0 ...tems.Examples.CoolingTowersWithBypass.mos} | 0 ...BaseClasses.Examples.BoilerPolynomial.mos} | 0 ...ses.Examples.ControlVolumeEvaporation.mos} | 0 ...HC.Plants.Steam.Examples.SingleBoiler.mos} | 0 .../travis/templates/AirHandlersFans.checksum | 2 +- .../Scripts/travis/templates/checkandrun.sh | 2 +- .../Templates/Plants/HeatPumps/AirToWater.mo | 7 +- Buildings/package.mo | 480 ++++----- Buildings/package.order | 2 +- 754 files changed, 3111 insertions(+), 2181 deletions(-) rename Buildings/{Experimental => }/DHC/BaseClasses/Steam/PartialSaturatedControlVolume.mo (95%) rename Buildings/{Experimental => }/DHC/BaseClasses/Steam/PartialTwoPortTwoMedium.mo (99%) rename Buildings/{Experimental => }/DHC/BaseClasses/Steam/package.mo (91%) rename Buildings/{Experimental => }/DHC/BaseClasses/Steam/package.order (100%) rename Buildings/{Experimental => }/DHC/BaseClasses/package.mo (52%) rename Buildings/{Experimental => }/DHC/BaseClasses/package.order (100%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/BaseClasses/CollectorDistributor.mo (90%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/BaseClasses/Connection2PipeLossless.mo (82%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/BaseClasses/Junction.mo (89%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/BaseClasses/PartialDirect.mo (97%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/BaseClasses/PartialETS.mo (83%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/BaseClasses/PartialIndirect.mo (97%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/BaseClasses/Pump_m_flow.mo (94%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/BaseClasses/StratifiedTank.mo (99%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/BaseClasses/Validation/CollectorDistributor.mo (97%) rename Buildings/{Experimental/DHC/Plants/Cooling/Controls => DHC/ETS/BaseClasses}/Validation/package.mo (56%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/BaseClasses/Validation/package.order (100%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/BaseClasses/computeCoordinates.mo (93%) rename Buildings/{Experimental/DHC/Loads => DHC/ETS}/BaseClasses/package.mo (67%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/BaseClasses/package.order (100%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/BaseClasses/PartialHeatPumpHeatExchanger.mo (95%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/BaseClasses/PartialParallel.mo (89%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/BaseClasses/package.mo (54%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/BaseClasses/package.order (100%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/ChillerBorefield.mo (94%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Controls/BaseClasses/PartialSupervisory.mo (98%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS/Combined/Controls}/BaseClasses/package.mo (60%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Controls/BaseClasses/package.order (100%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Controls/Borefield.mo (97%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Controls/Chiller.mo (98%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Controls/HeatExchanger.mo (96%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Controls/PIDWithEnable.mo (98%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Controls/PredictLeavingTemperature.mo (87%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Controls/PrimaryVariableFlow.mo (97%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Controls/Reset.mo (97%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Controls/SideCold.mo (97%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Controls/SideHot.mo (96%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Controls/Supervisory.mo (86%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Controls/SwitchBox.mo (90%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Controls/WatersideEconomizer.mo (99%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Controls/package.mo (84%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Controls/package.order (100%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Examples/ChillerBorefield.mo (63%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Examples/ChillerOnly.mo (70%) rename Buildings/{Experimental/DHC/Loads/BaseClasses => DHC/ETS/Combined}/Examples/package.mo (67%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Examples/package.order (100%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/HeatPumpHeatExchanger.mo (95%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/HeatPumpHeatExchangerDHWTank.mo (94%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Subsystems/BaseClasses/PartialHeatPump.mo (98%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Subsystems/BaseClasses/package.mo (50%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Subsystems/BaseClasses/package.order (100%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Subsystems/Borefield.mo (94%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Subsystems/Chiller.mo (96%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Subsystems/HeatExchanger.mo (95%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Subsystems/HeatPump.mo (94%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Subsystems/HeatPumpDHWTank.mo (93%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Subsystems/SwitchBox.mo (93%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Subsystems/Validation/Borefield.mo (86%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Subsystems/Validation/Chiller.mo (91%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Subsystems/Validation/HeatExchanger.mo (93%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Subsystems/Validation/HeatPump.mo (91%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Subsystems/Validation/HeatPumpDHWTank.mo (89%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Subsystems/Validation/SwitchBox.mo (89%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Subsystems/Validation/WatersideEconomizer.mo (93%) rename Buildings/{Experimental/DHC/EnergyTransferStations/BaseClasses => DHC/ETS/Combined/Subsystems}/Validation/package.mo (52%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Subsystems/Validation/package.order (100%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Subsystems/WatersideEconomizer.mo (96%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Subsystems/package.mo (84%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Subsystems/package.order (100%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Validation/BaseClasses/PartialChillerBorefield.mo (98%) create mode 100644 Buildings/DHC/ETS/Combined/Validation/BaseClasses/package.mo rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Validation/BaseClasses/package.order (100%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Validation/ChillerBorefield.mo (62%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Validation/ChillerOnly.mo (67%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Validation/ChillerWSE.mo (73%) rename Buildings/{Experimental/DHC/Loads/BaseClasses/Controls => DHC/ETS/Combined}/Validation/package.mo (57%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Validation/package.order (100%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/package.mo (85%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/package.order (100%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Cooling/Direct.mo (93%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Cooling/Examples/Direct.mo (95%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Cooling/Examples/Indirect.mo (95%) rename Buildings/{Experimental/DHC/EnergyTransferStations/Heating => DHC/ETS/Cooling}/Examples/package.mo (53%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Cooling/Examples/package.order (100%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Cooling/Indirect.mo (94%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Cooling/package.mo (84%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Cooling/package.order (100%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Heating/Direct.mo (94%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Heating/Examples/Direct.mo (95%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Heating/Examples/Indirect.mo (95%) rename Buildings/{Experimental/DHC/EnergyTransferStations/Cooling => DHC/ETS/Heating}/Examples/package.mo (53%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Heating/Examples/package.order (100%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Heating/Indirect.mo (94%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Heating/package.mo (84%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Heating/package.order (100%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Types.mo (95%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/package.mo (65%) rename Buildings/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/package.order (100%) rename Buildings/{Experimental/DHC/Examples/Combined/BaseClasses/BoreField.mo => DHC/Examples/Combined/BaseClasses/Borefield.mo} (93%) rename Buildings/{Experimental => }/DHC/Examples/Combined/BaseClasses/DesignDataSeries.mo (96%) rename Buildings/{Experimental => }/DHC/Examples/Combined/BaseClasses/PartialSeries.mo (94%) rename Buildings/{Experimental => }/DHC/Examples/Combined/BaseClasses/Zurich.mo (71%) rename Buildings/{Experimental/DHC/Loads/Heating => DHC/Examples/Combined}/BaseClasses/package.mo (63%) rename Buildings/{Experimental => }/DHC/Examples/Combined/BaseClasses/package.order (79%) rename Buildings/{Experimental => }/DHC/Examples/Combined/SeriesConstantFlow.mo (88%) rename Buildings/{Experimental => }/DHC/Examples/Combined/SeriesVariableFlow.mo (87%) rename Buildings/{Experimental => }/DHC/Examples/Combined/SeriesVariableFlowAgentControl.mo (91%) rename Buildings/{Experimental => }/DHC/Examples/Combined/package.mo (87%) rename Buildings/{Experimental => }/DHC/Examples/Combined/package.order (100%) rename Buildings/{Experimental => }/DHC/Examples/Cooling/ElectricChillersDirectETS.mo (89%) rename Buildings/{Experimental => }/DHC/Examples/Cooling/package.mo (86%) rename Buildings/{Experimental => }/DHC/Examples/Cooling/package.order (100%) rename Buildings/{Experimental => }/DHC/Examples/Steam/SingleBoiler.mo (93%) rename Buildings/{Experimental => }/DHC/Examples/Steam/package.mo (85%) rename Buildings/{Experimental => }/DHC/Examples/Steam/package.order (100%) rename Buildings/{Experimental => }/DHC/Examples/package.mo (90%) rename Buildings/{Experimental => }/DHC/Examples/package.order (100%) rename Buildings/{Experimental/DHC/Loads/BaseClasses/Examples => DHC/Loads}/BaseClasses/BuildingRCZ1Valve.mo (95%) rename Buildings/{Experimental/DHC/Loads/BaseClasses/Examples => DHC/Loads}/BaseClasses/BuildingRCZ6.mo (88%) rename Buildings/{Experimental/DHC/Loads/BaseClasses/Examples => DHC/Loads}/BaseClasses/BuildingSpawnZ1.mo (92%) rename Buildings/{Experimental/DHC/Loads/BaseClasses/Examples => DHC/Loads}/BaseClasses/BuildingSpawnZ6.mo (95%) rename Buildings/{Experimental/DHC/Loads/BaseClasses/Examples => DHC/Loads}/BaseClasses/BuildingTimeSeries.mo (95%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/ConstraintViolation.mo (97%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Controls/MixingValveControl.mo (96%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Controls/Validation/MixingValveControl.mo (92%) rename Buildings/{Experimental/DHC/EnergyTransferStations/Combined => DHC/Loads/BaseClasses/Controls}/Validation/package.mo (55%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Controls/Validation/package.order (100%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Controls/package.mo (85%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Controls/package.order (100%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Floor.mo (97%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/ICT.mo (97%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Meeting.mo (97%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Office.mo (97%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Restroom.mo (97%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Storage.mo (97%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/package.mo (76%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/package.order (100%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/package.mo (79%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/package.order (100%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Examples/BaseClasses/package.mo (58%) create mode 100644 Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/package.order rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Examples/CouplingRCZ1Valve.mo (83%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Examples/CouplingRCZ6.mo (83%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ1.mo (83%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mo (82%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Examples/CouplingTimeSeries.mo (88%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Examples/CouplingTimeSeriesSingleLoop.mo (85%) rename Buildings/{Experimental/DHC/Plants/Cooling => DHC/Loads/BaseClasses}/Examples/package.mo (64%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Examples/package.order (100%) rename Buildings/{Experimental/DHC/Loads/BaseClasses/Examples => DHC/Loads}/BaseClasses/FanCoil4Pipe.mo (80%) rename Buildings/{Experimental/DHC/Loads/BaseClasses/Examples => DHC/Loads}/BaseClasses/FanCoil4PipeHeatPorts.mo (93%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/FlowDistribution.mo (96%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/PartialBuilding.mo (96%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/PartialBuildingWithPartialETS.mo (85%) rename Buildings/{Experimental/DHC/Loads/BaseClasses/Examples => DHC/Loads}/BaseClasses/PartialFanCoil4Pipe.mo (96%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/PartialTerminalUnit.mo (95%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/SimpleRoomODE.mo (99%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Types.mo (98%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Validation/BaseClasses/Building.mo (93%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Validation/BaseClasses/BuildingWithETS.mo (68%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Validation/BaseClasses/ETS.mo (84%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeCooling.mo (95%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeHeating.mo (95%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeHeatingValve.mo (96%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Validation/BaseClasses/package.mo (54%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Validation/BaseClasses/package.order (100%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution1.mo (85%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution2.mo (87%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Validation/BuildingWithETS.mo (89%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Validation/FlowDistributionPumpControl.mo (92%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Validation/GetPeakLoad.mo (67%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Validation/SimpleRoomODE.mo (90%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Validation/TerminalUnitScaling.mo (92%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Validation/package.mo (61%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/Validation/package.order (100%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/getPeakLoad.mo (95%) rename Buildings/{Experimental/DHC/Plants => DHC/Loads}/BaseClasses/package.mo (66%) rename Buildings/{Experimental => }/DHC/Loads/BaseClasses/package.order (54%) rename Buildings/{Experimental => }/DHC/Loads/Combined/BaseClasses/PartialBuildingWithETS.mo (93%) rename Buildings/{Experimental/DHC/Loads/Cooling => DHC/Loads/Combined}/BaseClasses/package.mo (63%) rename Buildings/{Experimental => }/DHC/Loads/Combined/BaseClasses/package.order (100%) rename Buildings/{Experimental => }/DHC/Loads/Combined/BuildingTimeSeriesWithETS.mo (91%) rename Buildings/{Experimental => }/DHC/Loads/Combined/BuildingTimeSeriesWithETSWithDHWTank.mo (88%) rename Buildings/{Experimental => }/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETS.mo (89%) rename Buildings/{Experimental => }/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mo (86%) rename Buildings/{Experimental/DHC/Networks => DHC/Loads/Combined}/Examples/package.mo (62%) rename Buildings/{Experimental => }/DHC/Loads/Combined/Examples/package.order (100%) rename Buildings/{Experimental => }/DHC/Loads/Combined/package.mo (86%) rename Buildings/{Experimental => }/DHC/Loads/Combined/package.order (100%) rename Buildings/{Experimental => }/DHC/Loads/Cooling/BaseClasses/PartialBuildingWithETS.mo (88%) rename Buildings/{Experimental/DHC/Loads/Combined => DHC/Loads/Cooling}/BaseClasses/package.mo (62%) rename Buildings/{Experimental => }/DHC/Loads/Cooling/BaseClasses/package.order (100%) rename Buildings/{Experimental => }/DHC/Loads/Cooling/BuildingTimeSeriesWithETS.mo (86%) rename Buildings/{Experimental => }/DHC/Loads/Cooling/Examples/BuildingTimeSeriesWithETS.mo (87%) rename Buildings/{Experimental => }/DHC/Loads/Cooling/Examples/package.mo (55%) rename Buildings/{Experimental => }/DHC/Loads/Cooling/Examples/package.order (100%) rename Buildings/{Experimental => }/DHC/Loads/Cooling/package.mo (89%) rename Buildings/{Experimental => }/DHC/Loads/Cooling/package.order (100%) rename Buildings/{Experimental => }/DHC/Loads/Heating/BaseClasses/PartialBuildingWithETS.mo (88%) rename Buildings/{Experimental/DHC/Loads/HotWater => DHC/Loads/Heating}/BaseClasses/package.mo (62%) rename Buildings/{Experimental => }/DHC/Loads/Heating/BaseClasses/package.order (100%) rename Buildings/{Experimental => }/DHC/Loads/Heating/BuildingTimeSeriesWithETS.mo (86%) rename Buildings/{Experimental => }/DHC/Loads/Heating/Examples/BuildingTimeSeriesWithETS.mo (87%) rename Buildings/{Experimental => }/DHC/Loads/Heating/Examples/package.mo (55%) rename Buildings/{Experimental => }/DHC/Loads/Heating/Examples/package.order (100%) rename Buildings/{Experimental => }/DHC/Loads/Heating/package.mo (88%) rename Buildings/{Experimental => }/DHC/Loads/Heating/package.order (100%) rename Buildings/{Experimental => }/DHC/Loads/HotWater/BaseClasses/HeatExchangerPumpController.mo (98%) rename Buildings/{Experimental => }/DHC/Loads/HotWater/BaseClasses/PartialFourPortDHW.mo (98%) rename Buildings/{Experimental => }/DHC/Loads/HotWater/BaseClasses/TankChargingController.mo (98%) rename Buildings/{Experimental => }/DHC/Loads/HotWater/BaseClasses/TankValveController.mo (97%) create mode 100644 Buildings/DHC/Loads/HotWater/BaseClasses/package.mo rename Buildings/{Experimental => }/DHC/Loads/HotWater/BaseClasses/package.order (100%) rename Buildings/{Experimental => }/DHC/Loads/HotWater/Data/GenericDomesticHotWaterWithHeatExchanger.mo (98%) rename Buildings/{Experimental => }/DHC/Loads/HotWater/Data/package.mo (83%) rename Buildings/{Experimental => }/DHC/Loads/HotWater/Data/package.order (100%) rename Buildings/{Experimental => }/DHC/Loads/HotWater/DirectHeatExchangerWithElectricHeat.mo (97%) rename Buildings/{Experimental => }/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mo (90%) rename Buildings/{Experimental => }/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mo (91%) rename Buildings/{Experimental => }/DHC/Loads/HotWater/Examples/package.mo (88%) rename Buildings/{Experimental => }/DHC/Loads/HotWater/Examples/package.order (100%) rename Buildings/{Experimental => }/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.mo (93%) rename Buildings/{Experimental => }/DHC/Loads/HotWater/ThermostaticMixingValve.mo (99%) rename Buildings/{Experimental => }/DHC/Loads/HotWater/package.mo (92%) rename Buildings/{Experimental => }/DHC/Loads/HotWater/package.order (100%) rename Buildings/{Experimental => }/DHC/Loads/Steam/BaseClasses/ControlVolumeCondensation.mo (86%) rename Buildings/{Experimental => }/DHC/Loads/Steam/BaseClasses/Examples/ControlVolumeCondensation.mo (92%) rename Buildings/{Experimental => }/DHC/Loads/Steam/BaseClasses/Examples/SteamTrap.mo (94%) rename Buildings/{Experimental => }/DHC/Loads/Steam/BaseClasses/Examples/ValveSelfActing.mo (94%) rename Buildings/{Experimental => }/DHC/Loads/Steam/BaseClasses/Examples/package.mo (60%) rename Buildings/{Experimental => }/DHC/Loads/Steam/BaseClasses/Examples/package.order (100%) rename Buildings/{Experimental => }/DHC/Loads/Steam/BaseClasses/SteamTrap.mo (98%) rename Buildings/{Experimental => }/DHC/Loads/Steam/BaseClasses/ValveSelfActing.mo (99%) create mode 100644 Buildings/DHC/Loads/Steam/BaseClasses/package.mo rename Buildings/{Experimental => }/DHC/Loads/Steam/BaseClasses/package.order (100%) rename Buildings/{Experimental => }/DHC/Loads/Steam/BuildingTimeSeriesAtETS.mo (97%) rename Buildings/{Experimental => }/DHC/Loads/Steam/Examples/BuildingTimeSeriesAtETS.mo (91%) rename Buildings/{Experimental => }/DHC/Loads/Steam/Examples/package.mo (63%) rename Buildings/{Experimental => }/DHC/Loads/Steam/Examples/package.order (100%) rename Buildings/{Experimental => }/DHC/Loads/Steam/package.mo (88%) rename Buildings/{Experimental => }/DHC/Loads/Steam/package.order (100%) rename Buildings/{Experimental => }/DHC/Loads/package.mo (90%) rename Buildings/{Experimental => }/DHC/Loads/package.order (100%) rename Buildings/{Experimental => }/DHC/Networks/BaseClasses/DifferenceEnthalpyFlowRate.mo (99%) rename Buildings/{Experimental => }/DHC/Networks/BaseClasses/PartialConnection1Pipe.mo (99%) rename Buildings/{Experimental => }/DHC/Networks/BaseClasses/PartialConnection2Pipe.mo (98%) rename Buildings/{Experimental => }/DHC/Networks/BaseClasses/PartialConnection2Pipe2Medium.mo (99%) rename Buildings/{Experimental => }/DHC/Networks/BaseClasses/PartialDistribution.mo (91%) rename Buildings/{Experimental => }/DHC/Networks/BaseClasses/PartialDistribution1Pipe.mo (99%) rename Buildings/{Experimental => }/DHC/Networks/BaseClasses/PartialDistribution2Medium.mo (98%) rename Buildings/{Experimental => }/DHC/Networks/BaseClasses/PartialDistribution2Pipe.mo (98%) rename Buildings/{Experimental => }/DHC/Networks/BaseClasses/PartialDistribution2Pipe2Medium.mo (95%) rename Buildings/{Experimental => }/DHC/Networks/BaseClasses/package.mo (68%) rename Buildings/{Experimental => }/DHC/Networks/BaseClasses/package.order (100%) rename Buildings/{Experimental => }/DHC/Networks/Connections/Connection1PipePlugFlow_v.mo (95%) rename Buildings/{Experimental => }/DHC/Networks/Connections/Connection1Pipe_R.mo (79%) rename Buildings/{Experimental => }/DHC/Networks/Connections/Connection2PipePlugFlow_v.mo (96%) rename Buildings/{Experimental => }/DHC/Networks/Connections/Connection2Pipe_R.mo (82%) rename Buildings/{Experimental => }/DHC/Networks/Connections/Examples/Connection1PipeExample.mo (83%) rename Buildings/{Experimental => }/DHC/Networks/Connections/Examples/Connection2PipeExample.mo (86%) rename Buildings/{Experimental/DHC/Loads/Combined => DHC/Networks/Connections}/Examples/package.mo (59%) rename Buildings/{Experimental => }/DHC/Networks/Connections/Examples/package.order (100%) rename Buildings/{Experimental => }/DHC/Networks/Connections/package.mo (89%) rename Buildings/{Experimental => }/DHC/Networks/Connections/package.order (100%) rename Buildings/{Experimental => }/DHC/Networks/Controls/AgentPump1Pipe.mo (99%) rename Buildings/{Experimental => }/DHC/Networks/Controls/Examples/AgentPump1PipeExample.mo (84%) rename Buildings/{Experimental => }/DHC/Networks/Controls/Examples/MainPump1PipeExample.mo (80%) rename Buildings/{Experimental => }/DHC/Networks/Controls/Examples/package.mo (67%) rename Buildings/{Experimental => }/DHC/Networks/Controls/Examples/package.order (100%) rename Buildings/{Experimental => }/DHC/Networks/Controls/MainPump1Pipe.mo (98%) rename Buildings/{Experimental => }/DHC/Networks/Controls/package.mo (96%) rename Buildings/{Experimental => }/DHC/Networks/Controls/package.order (100%) rename Buildings/{Experimental => }/DHC/Networks/Distribution1PipePlugFlow_v.mo (88%) rename Buildings/{Experimental => }/DHC/Networks/Distribution1Pipe_R.mo (80%) rename Buildings/{Experimental => }/DHC/Networks/Distribution2PipePlugFlow_v.mo (92%) rename Buildings/{Experimental => }/DHC/Networks/Distribution2Pipe_R.mo (81%) rename Buildings/{Experimental => }/DHC/Networks/Examples/Distribution1PipeExample.mo (88%) rename Buildings/{Experimental => }/DHC/Networks/Examples/Distribution2PipeExample.mo (88%) rename Buildings/{Experimental/DHC/Networks/Connections => DHC/Networks}/Examples/package.mo (59%) rename Buildings/{Experimental => }/DHC/Networks/Examples/package.order (100%) rename Buildings/{Experimental => }/DHC/Networks/Pipes/PipeAutosize.mo (98%) rename Buildings/{Experimental => }/DHC/Networks/Pipes/PipeStandard.mo (95%) rename Buildings/{Experimental => }/DHC/Networks/Pipes/Validation/Pipe.mo (91%) rename Buildings/{Experimental => }/DHC/Networks/Pipes/Validation/package.mo (61%) rename Buildings/{Experimental => }/DHC/Networks/Pipes/Validation/package.order (100%) rename Buildings/{Experimental => }/DHC/Networks/Pipes/package.mo (85%) rename Buildings/{Experimental => }/DHC/Networks/Pipes/package.order (100%) rename Buildings/{Experimental => }/DHC/Networks/Steam/ConnectionCondensatePipe.mo (96%) rename Buildings/{Experimental => }/DHC/Networks/Steam/DistributionCondensatePipe.mo (94%) rename Buildings/{Experimental => }/DHC/Networks/Steam/Examples/ConnectionCondensatePipe.mo (94%) rename Buildings/{Experimental => }/DHC/Networks/Steam/Examples/DistributionCondensatePipe.mo (92%) rename Buildings/{Experimental => }/DHC/Networks/Steam/Examples/package.mo (62%) rename Buildings/{Experimental => }/DHC/Networks/Steam/Examples/package.order (100%) rename Buildings/{Experimental => }/DHC/Networks/Steam/package.mo (85%) rename Buildings/{Experimental => }/DHC/Networks/Steam/package.order (100%) rename Buildings/{Experimental => }/DHC/Networks/package.mo (90%) rename Buildings/{Experimental => }/DHC/Networks/package.order (100%) rename Buildings/{Experimental => }/DHC/Plants/BaseClasses/PartialPlant.mo (90%) create mode 100644 Buildings/DHC/Plants/BaseClasses/package.mo rename Buildings/{Experimental => }/DHC/Plants/BaseClasses/package.order (100%) rename Buildings/{Experimental => }/DHC/Plants/Combined/AllElectricCWStorage.mo (99%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Controls/BaseClasses/CoolingTowerLoop.mo (98%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Controls/BaseClasses/DirectHeatRecovery.mo (99%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Controls/BaseClasses/IntegerArrayHold.mo (96%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Controls/BaseClasses/ModeCondenserLoop.mo (97%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Controls/BaseClasses/ModeHeatRecoveryChiller.mo (97%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Controls/BaseClasses/PartialController.mo (99%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Controls/BaseClasses/StageIndex.mo (99%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Controls/BaseClasses/StagingPlant.mo (97%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Controls/BaseClasses/StagingPump.mo (98%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Controls/BaseClasses/TankCycle.mo (98%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Controls/BaseClasses/Validation/StageIndex.mo (70%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPlant.mo (93%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPump.mo (82%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Controls/BaseClasses/Validation/package.mo (74%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Controls/BaseClasses/Validation/package.order (100%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Controls/BaseClasses/ValveCondenserEvaporator.mo (97%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Controls/BaseClasses/package.mo (86%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Controls/BaseClasses/package.order (100%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Controls/Controller.mo (93%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Controls/ModeCondenserLoop/package.mo (87%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Controls/ModeCondenserLoop/package.order (100%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Controls/package.mo (83%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Controls/package.order (100%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Examples/AllElectricCWStorage.mo (95%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Examples/package.mo (75%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Examples/package.order (100%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Subsystems/BaseClasses/MultipleValves.mo (99%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Subsystems/BaseClasses/PartialMultiplePumps.mo (97%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Subsystems/BaseClasses/PassThroughFluid.mo (91%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Subsystems/BaseClasses/package.mo (79%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Subsystems/BaseClasses/package.order (100%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Subsystems/ChillerGroup.mo (98%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Subsystems/ChillerHeatRecoveryGroup.mo (99%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Subsystems/CoolingTowerGroup.mo (99%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Subsystems/HeatPumpGroup.mo (99%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Subsystems/MultiplePumpsDp.mo (88%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Subsystems/MultiplePumpsFlow.mo (90%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Subsystems/MultiplePumpsSpeed.mo (84%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/PartialMultiplePumps.mo (94%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/package.mo (76%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/package.order (100%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Subsystems/Validation/ChillerGroup.mo (91%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Subsystems/Validation/ChillerHeatRecoveryGroup.mo (96%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Subsystems/Validation/CoolingTowerGroup.mo (89%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Subsystems/Validation/HeatPumpGroup.mo (91%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsDp.mo (82%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsFlow.mo (85%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mo (80%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Subsystems/Validation/ValveOpeningFlowBalancing.mo (94%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Subsystems/Validation/package.mo (77%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Subsystems/Validation/package.order (100%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Subsystems/package.mo (84%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Subsystems/package.order (100%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Validation/AllElectricCWStorage.mo (96%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Validation/package.mo (80%) rename Buildings/{Experimental => }/DHC/Plants/Combined/Validation/package.order (100%) rename Buildings/{Experimental => }/DHC/Plants/Combined/package.mo (87%) rename Buildings/{Experimental => }/DHC/Plants/Combined/package.order (100%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/BaseClasses/IdealUser.mo (96%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/BaseClasses/ParallelJunctions.mo (99%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/BaseClasses/ParallelPipes.mo (98%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/BaseClasses/ReversibleConnection.mo (99%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/BaseClasses/TankBranch.mo (99%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/BaseClasses/Validation/IdealUser.mo (93%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/BaseClasses/Validation/package.mo (78%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/BaseClasses/Validation/package.order (100%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/BaseClasses/package.mo (79%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/BaseClasses/package.order (100%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/Controls/ChilledWaterBypass.mo (98%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/Controls/ChilledWaterPumpSpeed.mo (99%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/Controls/ChillerStage.mo (98%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/Controls/FlowControl.mo (99%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/Controls/SelectMin.mo (97%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/Controls/TankStatus.mo (98%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/Controls/Validation/ChilledWaterBypass.mo (79%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/Controls/Validation/ChilledWaterPumpSpeed.mo (81%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/Controls/Validation/ChillerStage.mo (82%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/Controls/Validation/TankStatus.mo (80%) create mode 100644 Buildings/DHC/Plants/Cooling/Controls/Validation/package.mo rename Buildings/{Experimental => }/DHC/Plants/Cooling/Controls/Validation/package.order (100%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/Controls/package.mo (85%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/Controls/package.order (100%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/ElectricChillerParallel.mo (95%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/Examples/ElectricChillerParallel.mo (94%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/Examples/StoragePlantDualSource.mo (94%) rename Buildings/{Experimental/DHC/EnergyTransferStations/Combined => DHC/Plants/Cooling}/Examples/package.mo (58%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/Examples/package.order (100%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/StoragePlant.mo (94%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/Subsystems/CoolingTowersParallel.mo (99%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/Subsystems/CoolingTowersWithBypass.mo (99%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/PartialCoolingTowersSubsystem.mo (96%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/package.mo (58%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/package.order (100%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersParallel.mo (81%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersWithBypass.mo (74%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/Subsystems/Examples/package.mo (58%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/Subsystems/Examples/package.order (100%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/Subsystems/package.mo (86%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/Subsystems/package.order (100%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/package.mo (87%) rename Buildings/{Experimental => }/DHC/Plants/Cooling/package.order (100%) rename Buildings/{Experimental => }/DHC/Plants/Heating/SewageHeatRecovery.mo (93%) rename Buildings/{Experimental => }/DHC/Plants/Heating/package.mo (86%) rename Buildings/{Experimental => }/DHC/Plants/Heating/package.order (100%) rename Buildings/{Experimental => }/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.mo (94%) rename Buildings/{Experimental => }/DHC/Plants/Steam/BaseClasses/ControlVolumeEvaporation.mo (88%) rename Buildings/{Experimental => }/DHC/Plants/Steam/BaseClasses/Examples/BoilerPolynomial.mo (93%) rename Buildings/{Experimental => }/DHC/Plants/Steam/BaseClasses/Examples/ControlVolumeEvaporation.mo (92%) rename Buildings/{Experimental => }/DHC/Plants/Steam/BaseClasses/Examples/package.mo (60%) rename Buildings/{Experimental => }/DHC/Plants/Steam/BaseClasses/Examples/package.order (100%) create mode 100644 Buildings/DHC/Plants/Steam/BaseClasses/package.mo rename Buildings/{Experimental => }/DHC/Plants/Steam/BaseClasses/package.order (100%) rename Buildings/{Experimental => }/DHC/Plants/Steam/Examples/SingleBoiler.mo (91%) rename Buildings/{Experimental => }/DHC/Plants/Steam/Examples/package.mo (61%) rename Buildings/{Experimental => }/DHC/Plants/Steam/Examples/package.order (100%) rename Buildings/{Experimental => }/DHC/Plants/Steam/SingleBoiler.mo (97%) rename Buildings/{Experimental => }/DHC/Plants/Steam/package.mo (85%) rename Buildings/{Experimental => }/DHC/Plants/Steam/package.order (100%) rename Buildings/{Experimental => }/DHC/Plants/package.mo (88%) rename Buildings/{Experimental => }/DHC/Plants/package.order (100%) rename Buildings/{Experimental => }/DHC/Types.mo (98%) rename Buildings/{Experimental => }/DHC/UsersGuide.mo (68%) rename Buildings/{Experimental => }/DHC/package.mo (90%) rename Buildings/{Experimental => }/DHC/package.order (72%) delete mode 100644 Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/BaseClasses/package.mo delete mode 100644 Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/package.mo delete mode 100644 Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/BaseClasses/package.mo delete mode 100644 Buildings/Experimental/DHC/Examples/Combined/BaseClasses/package.mo delete mode 100644 Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/package.order delete mode 100644 Buildings/Experimental/DHC/Loads/Steam/BaseClasses/package.mo delete mode 100644 Buildings/Experimental/DHC/Plants/Steam/BaseClasses/package.mo delete mode 100644 Buildings/Experimental/package.mo delete mode 100644 Buildings/Experimental/package.order rename Buildings/Resources/Data/{Experimental => }/DHC/Loads/BaseClasses/Validation/RefBldgLargeOfficeNew2004_7.1_5.0_3C_USA_CA_SAN_FRANCISCO.mos (100%) rename Buildings/Resources/Data/{Experimental => }/DHC/Loads/Examples/.gitignore (100%) rename Buildings/Resources/Data/{Experimental => }/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Floor.txt (100%) rename Buildings/Resources/Data/{Experimental => }/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_ICT.txt (100%) rename Buildings/Resources/Data/{Experimental => }/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Meeting.txt (100%) rename Buildings/Resources/Data/{Experimental => }/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Office.txt (100%) rename Buildings/Resources/Data/{Experimental => }/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Restroom.txt (100%) rename Buildings/Resources/Data/{Experimental => }/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Storage.txt (100%) rename Buildings/Resources/Data/{Experimental => }/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos (100%) rename Buildings/Resources/Data/{Experimental => }/DHC/Loads/Examples/SwissHospital_20190916.mos (100%) rename Buildings/Resources/Data/{Experimental => }/DHC/Loads/Examples/SwissOffice_20190916.mos (100%) rename Buildings/Resources/Data/{Experimental => }/DHC/Loads/Examples/SwissResidential_20190916.mos (100%) rename Buildings/Resources/Data/{Experimental => }/DHC/Loads/HotWater/DHW_ApartmentMidRise.mos (100%) rename Buildings/Resources/Images/{Experimental => DHC}/DHC/UserGuide/DHC_Package_Concept.png (100%) rename Buildings/Resources/Images/{Experimental => DHC}/DHC/UserGuide/DHC_Package_Concept.svg (100%) rename Buildings/Resources/Images/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/BaseClasses/PartialParallel.png (100%) rename Buildings/Resources/Images/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/BaseClasses/PartialParallel.svg (100%) rename Buildings/Resources/Images/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/ChillerBorefield.png (100%) rename Buildings/Resources/Images/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/ChillerBorefield.svg (100%) rename Buildings/Resources/Images/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Subsystems/HeatPumpDHWTank.png (100%) rename Buildings/Resources/Images/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Subsystems/HeatPumpDHWTank.svg (100%) rename Buildings/Resources/Images/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Cooling/Direct.png (100%) rename Buildings/Resources/Images/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Cooling/Direct.svg (100%) rename Buildings/Resources/Images/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Cooling/Indirect.png (100%) rename Buildings/Resources/Images/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Cooling/Indirect.svg (100%) rename Buildings/Resources/Images/{Experimental => }/DHC/Examples/Cooling/ElectricChillersDirectETS.png (100%) rename Buildings/Resources/Images/{Experimental => }/DHC/Examples/Cooling/ElectricChillersDirectETS.svg (100%) rename Buildings/Resources/Images/{Experimental => }/DHC/Loads/HotWater/DirectHeatExchangerWithElectricHeat.png (100%) rename Buildings/Resources/Images/{Experimental => }/DHC/Loads/HotWater/Example_DirectHeatExchangerWithAuxHeat.png (100%) rename Buildings/Resources/Images/{Experimental => }/DHC/Loads/HotWater/Example_HeatPumpWithTank.png (100%) rename Buildings/Resources/Images/{Experimental => }/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.png (100%) rename Buildings/Resources/Images/{Experimental => }/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.svg (100%) rename Buildings/Resources/Images/{Experimental/DHC => DHC/Loads}/Loads/FlowDistribution1.png (100%) rename Buildings/Resources/Images/{Experimental/DHC => DHC/Loads}/Loads/FlowDistribution1.svg (100%) rename Buildings/Resources/Images/{Experimental/DHC => DHC/Loads}/Loads/FlowDistribution2.png (100%) rename Buildings/Resources/Images/{Experimental/DHC => DHC/Loads}/Loads/FlowDistribution2.svg (100%) rename Buildings/Resources/Images/{Experimental/DHC => DHC/Loads}/Loads/PartialBuilding.png (100%) rename Buildings/Resources/Images/{Experimental/DHC => DHC/Loads}/Loads/PartialBuilding.svg (100%) rename Buildings/Resources/Images/{Experimental/DHC => DHC/Loads}/Loads/PartialBuildingWithPartialETS.png (100%) rename Buildings/Resources/Images/{Experimental/DHC => DHC/Loads}/Loads/PartialBuildingWithPartialETS.svg (100%) rename Buildings/Resources/Images/{Experimental => }/DHC/Loads/Steam/BuildingTimeSeriesAtETS.png (100%) rename Buildings/Resources/Images/{Experimental => }/DHC/Loads/Steam/BuildingTimeSeriesAtETS.svg (100%) rename Buildings/Resources/Images/{Experimental => }/DHC/Networks/Controls/MainPump.png (100%) rename Buildings/Resources/Images/{Experimental => }/DHC/Networks/Controls/MainPump.svg (100%) rename Buildings/Resources/Images/{Experimental => }/DHC/Plants/Combined/AllElectricCWStorage.png (100%) rename Buildings/Resources/Images/{Experimental => }/DHC/Plants/Combined/AllElectricCWStorage.svg (100%) rename Buildings/Resources/Images/{Experimental => }/DHC/Plants/Cooling/Controls/ChillerStage.png (100%) rename Buildings/Resources/Images/{Experimental => }/DHC/Plants/Cooling/Controls/ChillerStage.svg (100%) rename Buildings/Resources/Images/{Experimental/DHC/Plants => DHC/Plants/Cooling}/Cooling/ControlSignals.drawio (100%) rename Buildings/Resources/Images/{Experimental/DHC/Plants => DHC/Plants/Cooling}/Cooling/ControlSignals.png (100%) rename Buildings/Resources/Images/{Experimental/DHC/Plants => DHC/Plants/Cooling}/Cooling/ControlSignals.svg (100%) rename Buildings/Resources/Images/{Experimental/DHC/Plants => DHC/Plants/Cooling}/Cooling/ElectricChillerParallel.png (100%) rename Buildings/Resources/Images/{Experimental/DHC/Plants => DHC/Plants/Cooling}/Cooling/ElectricChillerParallel.svg (100%) rename Buildings/Resources/Images/{Experimental/DHC/Plants => DHC/Plants/Cooling}/Cooling/SystemConcept.drawio (100%) rename Buildings/Resources/Images/{Experimental/DHC/Plants => DHC/Plants/Cooling}/Cooling/SystemConcept.png (100%) rename Buildings/Resources/Images/{Experimental/DHC/Plants => DHC/Plants/Cooling}/Cooling/SystemConcept.svg (100%) rename Buildings/Resources/Images/{Experimental => }/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.png (100%) rename Buildings/Resources/Images/{Experimental => }/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.svg (100%) create mode 100644 Buildings/Resources/Images/Templates/Plants/HeatPumps/AirToWater.png create mode 100644 Buildings/Resources/Images/Templates/Plants/HeatPumps/AirToWater.svg rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_EnergyTransferStations_BaseClasses_Validation_CollectorDistributor.txt => Buildings_DHC_ETS_BaseClasses_Validation_CollectorDistributor.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_EnergyTransferStations_Combined_Examples_ChillerBorefield.txt => Buildings_DHC_ETS_Combined_Examples_ChillerBorefield.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_EnergyTransferStations_Combined_Examples_ChillerOnly.txt => Buildings_DHC_ETS_Combined_Examples_ChillerOnly.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_Borefield.txt => Buildings_DHC_ETS_Combined_Subsystems_Validation_Borefield.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_Chiller.txt => Buildings_DHC_ETS_Combined_Subsystems_Validation_Chiller.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_HeatExchanger.txt => Buildings_DHC_ETS_Combined_Subsystems_Validation_HeatExchanger.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_HeatPump.txt => Buildings_DHC_ETS_Combined_Subsystems_Validation_HeatPump.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_HeatPumpDHWTank.txt => Buildings_DHC_ETS_Combined_Subsystems_Validation_HeatPumpDHWTank.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_SwitchBox.txt => Buildings_DHC_ETS_Combined_Subsystems_Validation_SwitchBox.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_WatersideEconomizer.txt => Buildings_DHC_ETS_Combined_Subsystems_Validation_WatersideEconomizer.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_EnergyTransferStations_Combined_Validation_ChillerBorefield.txt => Buildings_DHC_ETS_Combined_Validation_ChillerBorefield.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_EnergyTransferStations_Combined_Validation_ChillerOnly.txt => Buildings_DHC_ETS_Combined_Validation_ChillerOnly.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_EnergyTransferStations_Combined_Validation_ChillerWSE.txt => Buildings_DHC_ETS_Combined_Validation_ChillerWSE.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_EnergyTransferStations_Cooling_Examples_Direct.txt => Buildings_DHC_ETS_Cooling_Examples_Direct.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_EnergyTransferStations_Cooling_Examples_Indirect.txt => Buildings_DHC_ETS_Cooling_Examples_Indirect.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_EnergyTransferStations_Heating_Examples_Direct.txt => Buildings_DHC_ETS_Heating_Examples_Direct.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_EnergyTransferStations_Heating_Examples_Indirect.txt => Buildings_DHC_ETS_Heating_Examples_Indirect.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Examples_Combined_SeriesConstantFlow.txt => Buildings_DHC_Examples_Combined_SeriesConstantFlow.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Examples_Combined_SeriesVariableFlow.txt => Buildings_DHC_Examples_Combined_SeriesVariableFlow.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Examples_Combined_SeriesVariableFlowAgentControl.txt => Buildings_DHC_Examples_Combined_SeriesVariableFlowAgentControl.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Examples_Cooling_ElectricChillersDirectETS.txt => Buildings_DHC_Examples_Cooling_ElectricChillersDirectETS.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Examples_Steam_SingleBoiler.txt => Buildings_DHC_Examples_Steam_SingleBoiler.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Loads_BaseClasses_Controls_Validation_MixingValveControl.txt => Buildings_DHC_Loads_BaseClasses_Controls_Validation_MixingValveControl.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Loads_BaseClasses_Examples_CouplingRCZ1Valve.txt => Buildings_DHC_Loads_BaseClasses_Examples_CouplingRCZ1Valve.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Loads_BaseClasses_Examples_CouplingRCZ6.txt => Buildings_DHC_Loads_BaseClasses_Examples_CouplingRCZ6.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Loads_BaseClasses_Examples_CouplingSpawnZ1.txt => Buildings_DHC_Loads_BaseClasses_Examples_CouplingSpawnZ1.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Loads_BaseClasses_Examples_CouplingSpawnZ6.txt => Buildings_DHC_Loads_BaseClasses_Examples_CouplingSpawnZ6.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Loads_BaseClasses_Examples_CouplingTimeSeries.txt => Buildings_DHC_Loads_BaseClasses_Examples_CouplingTimeSeries.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Loads_BaseClasses_Examples_CouplingTimeSeriesSingleLoop.txt => Buildings_DHC_Loads_BaseClasses_Examples_CouplingTimeSeriesSingleLoop.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Loads_BaseClasses_Validation_BenchmarkFlowDistribution1.txt => Buildings_DHC_Loads_BaseClasses_Validation_BenchmarkFlowDistribution1.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Loads_BaseClasses_Validation_BenchmarkFlowDistribution2.txt => Buildings_DHC_Loads_BaseClasses_Validation_BenchmarkFlowDistribution2.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Loads_BaseClasses_Validation_BuildingWithETS.txt => Buildings_DHC_Loads_BaseClasses_Validation_BuildingWithETS.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Loads_BaseClasses_Validation_FlowDistributionPumpControl.txt => Buildings_DHC_Loads_BaseClasses_Validation_FlowDistributionPumpControl.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Loads_BaseClasses_Validation_GetPeakLoad.txt => Buildings_DHC_Loads_BaseClasses_Validation_GetPeakLoad.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Loads_BaseClasses_Validation_SimpleRoomODE.txt => Buildings_DHC_Loads_BaseClasses_Validation_SimpleRoomODE.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Loads_BaseClasses_Validation_TerminalUnitScaling.txt => Buildings_DHC_Loads_BaseClasses_Validation_TerminalUnitScaling.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Loads_Combined_Examples_BuildingTimeSeriesWithETS.txt => Buildings_DHC_Loads_Combined_Examples_BuildingTimeSeriesWithETS.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Loads_Combined_Examples_BuildingTimeSeriesWithETSDHWTank.txt => Buildings_DHC_Loads_Combined_Examples_BuildingTimeSeriesWithETSDHWTank.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Loads_Cooling_Examples_BuildingTimeSeriesWithETS.txt => Buildings_DHC_Loads_Cooling_Examples_BuildingTimeSeriesWithETS.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Loads_Heating_Examples_BuildingTimeSeriesWithETS.txt => Buildings_DHC_Loads_Heating_Examples_BuildingTimeSeriesWithETS.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Loads_HotWater_Examples_HeaterAndFixtureDirectHeatExchangerWithElectricHeat.txt => Buildings_DHC_Loads_HotWater_Examples_HeaterAndFixtureDirectHeatExchangerWithElectricHeat.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Loads_HotWater_Examples_StorageTankWithExternalHeatExchanger.txt => Buildings_DHC_Loads_HotWater_Examples_StorageTankWithExternalHeatExchanger.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Loads_Steam_BaseClasses_Examples_ControlVolumeCondensation.txt => Buildings_DHC_Loads_Steam_BaseClasses_Examples_ControlVolumeCondensation.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Loads_Steam_BaseClasses_Examples_SteamTrap.txt => Buildings_DHC_Loads_Steam_BaseClasses_Examples_SteamTrap.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Loads_Steam_BaseClasses_Examples_ValveSelfActing.txt => Buildings_DHC_Loads_Steam_BaseClasses_Examples_ValveSelfActing.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Loads_Steam_Examples_BuildingTimeSeriesAtETS.txt => Buildings_DHC_Loads_Steam_Examples_BuildingTimeSeriesAtETS.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Networks_Connections_Examples_Connection1PipeExample.txt => Buildings_DHC_Networks_Connections_Examples_Connection1PipeExample.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Networks_Connections_Examples_Connection2PipeExample.txt => Buildings_DHC_Networks_Connections_Examples_Connection2PipeExample.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Networks_Controls_Examples_AgentPump1PipeExample.txt => Buildings_DHC_Networks_Controls_Examples_AgentPump1PipeExample.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Networks_Controls_Examples_MainPump1PipeExample.txt => Buildings_DHC_Networks_Controls_Examples_MainPump1PipeExample.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Networks_Examples_Distribution1PipeExample.txt => Buildings_DHC_Networks_Examples_Distribution1PipeExample.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Networks_Examples_Distribution2PipeExample.txt => Buildings_DHC_Networks_Examples_Distribution2PipeExample.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Networks_Pipes_Validation_Pipe.txt => Buildings_DHC_Networks_Pipes_Validation_Pipe.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Networks_Steam_Examples_ConnectionCondensatePipe.txt => Buildings_DHC_Networks_Steam_Examples_ConnectionCondensatePipe.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Networks_Steam_Examples_DistributionCondensatePipe.txt => Buildings_DHC_Networks_Steam_Examples_DistributionCondensatePipe.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Plants_Combined_Controls_BaseClasses_Validation_StageIndex.txt => Buildings_DHC_Plants_Combined_Controls_BaseClasses_Validation_StageIndex.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Plants_Combined_Controls_BaseClasses_Validation_StagingPlant.txt => Buildings_DHC_Plants_Combined_Controls_BaseClasses_Validation_StagingPlant.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Plants_Combined_Controls_BaseClasses_Validation_StagingPump.txt => Buildings_DHC_Plants_Combined_Controls_BaseClasses_Validation_StagingPump.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Plants_Combined_Examples_AllElectricCWStorage.txt => Buildings_DHC_Plants_Combined_Examples_AllElectricCWStorage.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_ChillerGroup.txt => Buildings_DHC_Plants_Combined_Subsystems_Validation_ChillerGroup.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_ChillerHeatRecoveryGroup.txt => Buildings_DHC_Plants_Combined_Subsystems_Validation_ChillerHeatRecoveryGroup.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_CoolingTowerGroup.txt => Buildings_DHC_Plants_Combined_Subsystems_Validation_CoolingTowerGroup.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_HeatPumpGroup.txt => Buildings_DHC_Plants_Combined_Subsystems_Validation_HeatPumpGroup.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsDp.txt => Buildings_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsDp.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsFlow.txt => Buildings_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsFlow.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsSpeed.txt => Buildings_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsSpeed.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_ValveOpeningFlowBalancing.txt => Buildings_DHC_Plants_Combined_Subsystems_Validation_ValveOpeningFlowBalancing.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Plants_Combined_Validation_AllElectricCWStorage.txt => Buildings_DHC_Plants_Combined_Validation_AllElectricCWStorage.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Plants_Cooling_BaseClasses_Validation_IdealUser.txt => Buildings_DHC_Plants_Cooling_BaseClasses_Validation_IdealUser.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Plants_Cooling_Controls_Validation_ChilledWaterBypass.txt => Buildings_DHC_Plants_Cooling_Controls_Validation_ChilledWaterBypass.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Plants_Cooling_Controls_Validation_ChilledWaterPumpSpeed.txt => Buildings_DHC_Plants_Cooling_Controls_Validation_ChilledWaterPumpSpeed.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Plants_Cooling_Controls_Validation_ChillerStage.txt => Buildings_DHC_Plants_Cooling_Controls_Validation_ChillerStage.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Plants_Cooling_Controls_Validation_TankStatus.txt => Buildings_DHC_Plants_Cooling_Controls_Validation_TankStatus.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Plants_Cooling_Examples_ElectricChillerParallel.txt => Buildings_DHC_Plants_Cooling_Examples_ElectricChillerParallel.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Plants_Cooling_Examples_StoragePlantDualSource.txt => Buildings_DHC_Plants_Cooling_Examples_StoragePlantDualSource.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Plants_Cooling_Subsystems_Examples_CoolingTowersParallel.txt => Buildings_DHC_Plants_Cooling_Subsystems_Examples_CoolingTowersParallel.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Plants_Cooling_Subsystems_Examples_CoolingTowersWithBypass.txt => Buildings_DHC_Plants_Cooling_Subsystems_Examples_CoolingTowersWithBypass.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Plants_Steam_BaseClasses_Examples_BoilerPolynomial.txt => Buildings_DHC_Plants_Steam_BaseClasses_Examples_BoilerPolynomial.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Plants_Steam_BaseClasses_Examples_ControlVolumeEvaporation.txt => Buildings_DHC_Plants_Steam_BaseClasses_Examples_ControlVolumeEvaporation.txt} (100%) rename Buildings/Resources/ReferenceResults/Dymola/{Buildings_Experimental_DHC_Plants_Steam_Examples_SingleBoiler.txt => Buildings_DHC_Plants_Steam_Examples_SingleBoiler.txt} (100%) delete mode 100644 Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_HotWater_Examples_HeaterAndFixtureHeatPumpWithTank.txt delete mode 100644 Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Combined_BaseClasses_Validation_Pipe.txt rename Buildings/Resources/Scripts/Dymola/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/BaseClasses/Validation/CollectorDistributor.mos (91%) rename Buildings/Resources/Scripts/Dymola/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Examples/ChillerBorefield.mos (96%) rename Buildings/Resources/Scripts/Dymola/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Examples/ChillerOnly.mos (96%) rename Buildings/Resources/Scripts/Dymola/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Subsystems/Validation/Borefield.mos (82%) rename Buildings/Resources/Scripts/Dymola/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Subsystems/Validation/Chiller.mos (91%) rename Buildings/Resources/Scripts/Dymola/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Subsystems/Validation/HeatExchanger.mos (89%) rename Buildings/Resources/Scripts/Dymola/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Subsystems/Validation/HeatPump.mos (90%) rename Buildings/Resources/Scripts/Dymola/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Subsystems/Validation/HeatPumpDHWTank.mos (93%) rename Buildings/Resources/Scripts/Dymola/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Subsystems/Validation/SwitchBox.mos (83%) rename Buildings/Resources/Scripts/Dymola/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Subsystems/Validation/WatersideEconomizer.mos (88%) rename Buildings/Resources/Scripts/Dymola/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Validation/ChillerBorefield.mos (96%) rename Buildings/Resources/Scripts/Dymola/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Validation/ChillerOnly.mos (96%) rename Buildings/Resources/Scripts/Dymola/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Combined/Validation/ChillerWSE.mos (96%) rename Buildings/Resources/Scripts/Dymola/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Cooling/Examples/Direct.mos (86%) rename Buildings/Resources/Scripts/Dymola/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Cooling/Examples/Indirect.mos (94%) rename Buildings/Resources/Scripts/Dymola/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Heating/Examples/Direct.mos (86%) rename Buildings/Resources/Scripts/Dymola/{Experimental/DHC/EnergyTransferStations => DHC/ETS}/Heating/Examples/Indirect.mos (94%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Examples/Combined/SeriesConstantFlow.mos (98%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Examples/Combined/SeriesVariableFlow.mos (98%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Examples/Combined/SeriesVariableFlowAgentControl.mos (97%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Examples/Cooling/ElectricChillersDirectETS.mos (79%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Examples/Steam/SingleBoiler.mos (94%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Loads/BaseClasses/Controls/Validation/MixingValveControl.mos (91%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Loads/BaseClasses/Examples/CouplingRCZ1Valve.mos (94%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Loads/BaseClasses/Examples/CouplingRCZ6.mos (96%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ1.mos (95%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mos (96%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Loads/BaseClasses/Examples/CouplingTimeSeries.mos (95%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Loads/BaseClasses/Examples/CouplingTimeSeriesSingleLoop.mos (94%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution1.mos (85%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution2.mos (85%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Loads/BaseClasses/Validation/BuildingWithETS.mos (89%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Loads/BaseClasses/Validation/FlowDistributionPumpControl.mos (87%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Loads/BaseClasses/Validation/GetPeakLoad.mos (79%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Loads/BaseClasses/Validation/SimpleRoomODE.mos (86%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Loads/BaseClasses/Validation/TerminalUnitScaling.mos (88%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETS.mos (84%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mos (92%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Loads/Cooling/Examples/BuildingTimeSeriesWithETS.mos (79%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Loads/Heating/Examples/BuildingTimeSeriesWithETS.mos (77%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mos (75%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mos (85%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Loads/Steam/BaseClasses/Examples/ControlVolumeCondensation.mos (78%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Loads/Steam/BaseClasses/Examples/SteamTrap.mos (86%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Loads/Steam/BaseClasses/Examples/ValveSelfActing.mos (82%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Loads/Steam/Examples/BuildingTimeSeriesAtETS.mos (87%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Networks/Connections/Examples/Connection1PipeExample.mos (80%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Networks/Connections/Examples/Connection2PipeExample.mos (80%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Networks/Controls/Examples/AgentPump1PipeExample.mos (76%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Networks/Controls/Examples/MainPump1PipeExample.mos (81%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Networks/Examples/Distribution1PipeExample.mos (82%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Networks/Examples/Distribution2PipeExample.mos (82%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Networks/Pipes/Validation/Pipe.mos (93%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Networks/Steam/Examples/ConnectionCondensatePipe.mos (78%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Networks/Steam/Examples/DistributionCondensatePipe.mos (90%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Plants/Combined/Controls/BaseClasses/Validation/StageIndex.mos (81%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPlant.mos (92%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPump.mos (85%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Plants/Combined/Examples/AllElectricCWStorage.mos (94%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Plants/Combined/Subsystems/Validation/ChillerGroup.mos (90%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Plants/Combined/Subsystems/Validation/ChillerHeatRecoveryGroup.mos (95%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Plants/Combined/Subsystems/Validation/CoolingTowerGroup.mos (89%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Plants/Combined/Subsystems/Validation/HeatPumpGroup.mos (90%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsDp.mos (90%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsFlow.mos (90%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mos (90%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Plants/Combined/Subsystems/Validation/ValveOpeningFlowBalancing.mos (84%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Plants/Combined/Validation/AllElectricCWStorage.mos (98%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Plants/Cooling/BaseClasses/Validation/IdealUser.mos (85%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Plants/Cooling/Controls/Validation/ChilledWaterBypass.mos (89%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Plants/Cooling/Controls/Validation/ChilledWaterPumpSpeed.mos (88%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Plants/Cooling/Controls/Validation/ChillerStage.mos (88%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Plants/Cooling/Controls/Validation/TankStatus.mos (87%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Plants/Cooling/Examples/ElectricChillerParallel.mos (95%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Plants/Cooling/Examples/StoragePlantDualSource.mos (94%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersParallel.mos (89%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersWithBypass.mos (93%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Plants/Steam/BaseClasses/Examples/BoilerPolynomial.mos (78%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Plants/Steam/BaseClasses/Examples/ControlVolumeEvaporation.mos (78%) rename Buildings/Resources/Scripts/Dymola/{Experimental => }/DHC/Plants/Steam/Examples/SingleBoiler.mos (82%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Validation.CollectorDistributor.mos => Buildings.DHC.ETS.BaseClasses.Validation.CollectorDistributor.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.EnergyTransferStations.Combined.Examples.ChillerBorefield.mos => Buildings.DHC.ETS.Combined.Examples.ChillerBorefield.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.EnergyTransferStations.Combined.Examples.ChillerOnly.mos => Buildings.DHC.ETS.Combined.Examples.ChillerOnly.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.Borefield.mos => Buildings.DHC.ETS.Combined.Subsystems.Validation.Borefield.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.Chiller.mos => Buildings.DHC.ETS.Combined.Subsystems.Validation.Chiller.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.HeatExchanger.mos => Buildings.DHC.ETS.Combined.Subsystems.Validation.HeatExchanger.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.HeatPump.mos => Buildings.DHC.ETS.Combined.Subsystems.Validation.HeatPump.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.HeatPumpDHWTank.mos => Buildings.DHC.ETS.Combined.Subsystems.Validation.HeatPumpDHWTank.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.SwitchBox.mos => Buildings.DHC.ETS.Combined.Subsystems.Validation.SwitchBox.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.WatersideEconomizer.mos => Buildings.DHC.ETS.Combined.Subsystems.Validation.WatersideEconomizer.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.ChillerBorefield.mos => Buildings.DHC.ETS.Combined.Validation.ChillerBorefield.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.ChillerOnly.mos => Buildings.DHC.ETS.Combined.Validation.ChillerOnly.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.ChillerWSE.mos => Buildings.DHC.ETS.Combined.Validation.ChillerWSE.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Examples.Direct.mos => Buildings.DHC.ETS.Cooling.Examples.Direct.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Examples.Indirect.mos => Buildings.DHC.ETS.Cooling.Examples.Indirect.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.EnergyTransferStations.Heating.Examples.Direct.mos => Buildings.DHC.ETS.Heating.Examples.Direct.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.EnergyTransferStations.Heating.Examples.Indirect.mos => Buildings.DHC.ETS.Heating.Examples.Indirect.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Examples.Combined.SeriesConstantFlow.mos => Buildings.DHC.Examples.Combined.SeriesConstantFlow.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlow.mos => Buildings.DHC.Examples.Combined.SeriesVariableFlow.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlowAgentControl.mos => Buildings.DHC.Examples.Combined.SeriesVariableFlowAgentControl.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Examples.Cooling.ElectricChillersDirectETS.mos => Buildings.DHC.Examples.Cooling.ElectricChillersDirectETS.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Examples.Steam.SingleBoiler.mos => Buildings.DHC.Examples.Steam.SingleBoiler.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Loads.BaseClasses.Controls.Validation.MixingValveControl.mos => Buildings.DHC.Loads.BaseClasses.Controls.Validation.MixingValveControl.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingRCZ1Valve.mos => Buildings.DHC.Loads.BaseClasses.Examples.CouplingRCZ1Valve.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingRCZ6.mos => Buildings.DHC.Loads.BaseClasses.Examples.CouplingRCZ6.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingSpawnZ1.mos => Buildings.DHC.Loads.BaseClasses.Examples.CouplingSpawnZ1.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingSpawnZ6.mos => Buildings.DHC.Loads.BaseClasses.Examples.CouplingSpawnZ6.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingTimeSeries.mos => Buildings.DHC.Loads.BaseClasses.Examples.CouplingTimeSeries.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingTimeSeriesSingleLoop.mos => Buildings.DHC.Loads.BaseClasses.Examples.CouplingTimeSeriesSingleLoop.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1.mos => Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2.mos => Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BuildingWithETS.mos => Buildings.DHC.Loads.BaseClasses.Validation.BuildingWithETS.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Loads.BaseClasses.Validation.FlowDistributionPumpControl.mos => Buildings.DHC.Loads.BaseClasses.Validation.FlowDistributionPumpControl.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Loads.BaseClasses.Validation.GetPeakLoad.mos => Buildings.DHC.Loads.BaseClasses.Validation.GetPeakLoad.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Loads.BaseClasses.Validation.SimpleRoomODE.mos => Buildings.DHC.Loads.BaseClasses.Validation.SimpleRoomODE.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Loads.BaseClasses.Validation.TerminalUnitScaling.mos => Buildings.DHC.Loads.BaseClasses.Validation.TerminalUnitScaling.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETS.mos => Buildings.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETS.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETSDHWTank.mos => Buildings.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETSDHWTank.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Loads.Cooling.Examples.BuildingTimeSeriesWithETS.mos => Buildings.DHC.Loads.Cooling.Examples.BuildingTimeSeriesWithETS.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Loads.Heating.Examples.BuildingTimeSeriesWithETS.mos => Buildings.DHC.Loads.Heating.Examples.BuildingTimeSeriesWithETS.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Loads.HotWater.Examples.HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mos => Buildings.DHC.Loads.HotWater.Examples.HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Loads.HotWater.Examples.StorageTankWithExternalHeatExchanger.mos => Buildings.DHC.Loads.HotWater.Examples.StorageTankWithExternalHeatExchanger.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Loads.Steam.BaseClasses.Examples.ControlVolumeCondensation.mos => Buildings.DHC.Loads.Steam.BaseClasses.Examples.ControlVolumeCondensation.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Loads.Steam.BaseClasses.Examples.SteamTrap.mos => Buildings.DHC.Loads.Steam.BaseClasses.Examples.SteamTrap.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Loads.Steam.BaseClasses.Examples.ValveSelfActing.mos => Buildings.DHC.Loads.Steam.BaseClasses.Examples.ValveSelfActing.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Loads.Steam.Examples.BuildingTimeSeriesAtETS.mos => Buildings.DHC.Loads.Steam.Examples.BuildingTimeSeriesAtETS.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Networks.Connections.Examples.Connection1PipeExample.mos => Buildings.DHC.Networks.Connections.Examples.Connection1PipeExample.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Networks.Connections.Examples.Connection2PipeExample.mos => Buildings.DHC.Networks.Connections.Examples.Connection2PipeExample.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Networks.Controls.Examples.AgentPump1PipeExample.mos => Buildings.DHC.Networks.Controls.Examples.AgentPump1PipeExample.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Networks.Controls.Examples.MainPump1PipeExample.mos => Buildings.DHC.Networks.Controls.Examples.MainPump1PipeExample.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Networks.Examples.Distribution1PipeExample.mos => Buildings.DHC.Networks.Examples.Distribution1PipeExample.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Networks.Examples.Distribution2PipeExample.mos => Buildings.DHC.Networks.Examples.Distribution2PipeExample.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Networks.Pipes.Validation.Pipe.mos => Buildings.DHC.Networks.Pipes.Validation.Pipe.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Networks.Steam.Examples.ConnectionCondensatePipe.mos => Buildings.DHC.Networks.Steam.Examples.ConnectionCondensatePipe.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Networks.Steam.Examples.DistributionCondensatePipe.mos => Buildings.DHC.Networks.Steam.Examples.DistributionCondensatePipe.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.Validation.StageIndex.mos => Buildings.DHC.Plants.Combined.Controls.BaseClasses.Validation.StageIndex.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPlant.mos => Buildings.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPlant.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPump.mos => Buildings.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPump.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Plants.Combined.Examples.AllElectricCWStorage.mos => Buildings.DHC.Plants.Combined.Examples.AllElectricCWStorage.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.ChillerGroup.mos => Buildings.DHC.Plants.Combined.Subsystems.Validation.ChillerGroup.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.ChillerHeatRecoveryGroup.mos => Buildings.DHC.Plants.Combined.Subsystems.Validation.ChillerHeatRecoveryGroup.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.CoolingTowerGroup.mos => Buildings.DHC.Plants.Combined.Subsystems.Validation.CoolingTowerGroup.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.HeatPumpGroup.mos => Buildings.DHC.Plants.Combined.Subsystems.Validation.HeatPumpGroup.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsDp.mos => Buildings.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsDp.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsFlow.mos => Buildings.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsFlow.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsSpeed.mos => Buildings.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsSpeed.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.ValveOpeningFlowBalancing.mos => Buildings.DHC.Plants.Combined.Subsystems.Validation.ValveOpeningFlowBalancing.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Plants.Combined.Validation.AllElectricCWStorage.mos => Buildings.DHC.Plants.Combined.Validation.AllElectricCWStorage.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.Validation.IdealUser.mos => Buildings.DHC.Plants.Cooling.BaseClasses.Validation.IdealUser.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation.ChilledWaterBypass.mos => Buildings.DHC.Plants.Cooling.Controls.Validation.ChilledWaterBypass.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation.ChilledWaterPumpSpeed.mos => Buildings.DHC.Plants.Cooling.Controls.Validation.ChilledWaterPumpSpeed.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation.ChillerStage.mos => Buildings.DHC.Plants.Cooling.Controls.Validation.ChillerStage.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation.TankStatus.mos => Buildings.DHC.Plants.Cooling.Controls.Validation.TankStatus.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Plants.Cooling.Examples.ElectricChillerParallel.mos => Buildings.DHC.Plants.Cooling.Examples.ElectricChillerParallel.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Plants.Cooling.Examples.StoragePlantDualSource.mos => Buildings.DHC.Plants.Cooling.Examples.StoragePlantDualSource.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples.CoolingTowersParallel.mos => Buildings.DHC.Plants.Cooling.Subsystems.Examples.CoolingTowersParallel.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples.CoolingTowersWithBypass.mos => Buildings.DHC.Plants.Cooling.Subsystems.Examples.CoolingTowersWithBypass.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Plants.Steam.BaseClasses.Examples.BoilerPolynomial.mos => Buildings.DHC.Plants.Steam.BaseClasses.Examples.BoilerPolynomial.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Plants.Steam.BaseClasses.Examples.ControlVolumeEvaporation.mos => Buildings.DHC.Plants.Steam.BaseClasses.Examples.ControlVolumeEvaporation.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Experimental.DHC.Plants.Steam.Examples.SingleBoiler.mos => Buildings.DHC.Plants.Steam.Examples.SingleBoiler.mos} (100%) diff --git a/.travis.yml b/.travis.yml index 9f15deffc28..6e003ff35db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,15 +68,15 @@ env: - TEST_ARG="make test-dymola PACKAGE=\"Buildings.Applications\"" - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Applications\"" - TEST_ARG="make test-optimica PACKAGE=\"Buildings.Applications\"" - - TEST_ARG="make test-dymola PACKAGE=\"Buildings.Experimental.DHC.{EnergyTransferStations,Loads,Networks,Plants}\"" - - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Experimental.DHC.{EnergyTransferStations,Loads,Networks,Plants}\"" - - TEST_ARG="make test-optimica PACKAGE=\"Buildings.Experimental.DHC.{EnergyTransferStations,Loads,Networks,Plants}\"" - - TEST_ARG="make test-dymola PACKAGE=\"Buildings.Experimental.DHC.Examples.Combined\"" - - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Experimental.DHC.Examples.Combined\" SINGLEPROC=\"true\"" - - TEST_ARG="make test-optimica PACKAGE=\"Buildings.Experimental.DHC.Examples.Combined\"" - - TEST_ARG="make test-dymola PACKAGE=\"Buildings.Experimental.DHC.Examples.{Cooling,Steam}\"" - - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Experimental.DHC.Examples.{Cooling,Steam}\"" - - TEST_ARG="make test-optimica PACKAGE=\"Buildings.Experimental.DHC.Examples.{Cooling,Steam}\"" + - TEST_ARG="make test-dymola PACKAGE=\"Buildings.DHC.{ETS,Loads,Networks,Plants}\"" + - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.DHC.{ETS,Loads,Networks,Plants}\"" + - TEST_ARG="make test-optimica PACKAGE=\"Buildings.DHC.{ETS,Loads,Networks,Plants}\"" + - TEST_ARG="make test-dymola PACKAGE=\"Buildings.DHC.Examples.Combined\"" + - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.DHC.Examples.Combined\" SINGLEPROC=\"true\"" + - TEST_ARG="make test-optimica PACKAGE=\"Buildings.DHC.Examples.Combined\"" + - TEST_ARG="make test-dymola PACKAGE=\"Buildings.DHC.Examples.{Cooling,Steam}\"" + - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.DHC.Examples.{Cooling,Steam}\"" + - TEST_ARG="make test-optimica PACKAGE=\"Buildings.DHC.Examples.{Cooling,Steam}\"" - TEST_ARG="make test-dymola PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,CHPs,Delays}\"" - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,CHPs,Delays}\"" - TEST_ARG="make test-optimica PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,CHPs,Delays}\"" @@ -165,7 +165,7 @@ install: export ENERGYPLUS_23_1_0=${ENERGYPLUS_23_1_0}; pip3 install pandas==1.3.5; fi; - - if [[ "$TEST_ARG" == *EnergyPlus_9_6_0* ]] || [[ "$TEST_ARG" == *Buildings.Experimental.DHC.{EnergyTransferStations,Loads,Networks,Plants}* ]] || [[ "$TEST_ARG" == *spawn* ]]; then + - if [[ "$TEST_ARG" == *EnergyPlus_9_6_0* ]] || [[ "$TEST_ARG" == *Buildings.DHC.{ETS,Loads,Networks,Plants}* ]] || [[ "$TEST_ARG" == *spawn* ]]; then echo "Installing Spawn binaries"; Buildings/Resources/src/ThermalZones/install.py --binaries-for-os-only; fi; diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/FreezeProtection.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/FreezeProtection.mo index 98c08e48927..626b1578f61 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/FreezeProtection.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/FreezeProtection.mo @@ -1129,7 +1129,7 @@ annotation (defaultComponentName="mulAHUFrePro", Text( extent={{-96,120},{-20,102}}, textColor={0,0,127}, - visible=minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorSection.DedicatedDampersAirflow, + visible=minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.DedicatedDampersAirflow, textString="uMinOutDam"), Text( extent={{-98,78},{-46,62}}, @@ -1178,7 +1178,7 @@ annotation (defaultComponentName="mulAHUFrePro", Text( extent={{20,122},{98,104}}, textColor={0,0,127}, - visible=minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorSection.DedicatedDampersAirflow, + visible=minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.DedicatedDampersAirflow, textString="yMinOutDam"), Text( extent={{50,50},{96,34}}, @@ -1237,11 +1237,11 @@ annotation (defaultComponentName="mulAHUFrePro", extent={{-96,104},{-14,80}}, textColor={255,0,255}, textString="u1MinOutDamPos", - visible=minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorSection.DedicatedDampersPressure), + visible=minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.DedicatedDampersPressure), Text( extent={{16,102},{96,82}}, textColor={255,0,255}, - visible=minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorSection.DedicatedDampersPressure, + visible=minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.DedicatedDampersPressure, textString="y1MinOutDam"), Text( extent={{-96,-16},{-46,-40}}, @@ -1354,6 +1354,10 @@ shall be no software reset switch.) ", revisions="