From 83605459f57faa11c60ebdf254efaba785f27f9a Mon Sep 17 00:00:00 2001 From: JayHuLBL Date: Thu, 13 May 2021 10:39:57 -0700 Subject: [PATCH] Merged master #2293 [ci skip] --- .travis.yml | 3 +- .../VAV/ChillerDXHeatingEconomizer.mo | 8 +- Buildings/Air/Systems/SingleZone/package.mo | 1 - Buildings/Air/Systems/package.mo | 1 - Buildings/Air/package.mo | 1 - .../BaseClasses/PowerLawResistance.mo | 4 +- .../Multizone/EffectiveAirLeakageArea.mo | 4 +- .../Multizone/Examples/CO2TransportStep.mo | 9 +- .../Examples/ChimneyShaftNoVolume.mo | 29 +- .../Examples/ChimneyShaftWithVolume.mo | 26 +- .../Airflow/Multizone/Examples/ClosedDoors.mo | 32 +- .../Multizone/Examples/NaturalVentilation.mo | 21 +- .../Examples/OneEffectiveAirLeakageArea.mo | 37 +- .../Airflow/Multizone/Examples/OneOpenDoor.mo | 28 +- .../Airflow/Multizone/Examples/OneRoom.mo | 21 +- .../Airflow/Multizone/Examples/Orifice.mo | 46 +- .../Multizone/Examples/ReverseBuoyancy.mo | 55 +- .../Examples/ReverseBuoyancy3Zones.mo | 38 +- .../Airflow/Multizone/Examples/ZonalFlow.mo | 5 + Buildings/Airflow/Multizone/Orifice.mo | 4 +- .../Multizone/Validation/DoorOpenClosed.mo | 7 +- .../Multizone/Validation/ThreeRoomsContam.mo | 3 +- .../ThreeRoomsContamDiscretizedDoor.mo | 15 +- .../FourPortResistanceChillerWSE.mo | 2 +- .../BaseClasses/PartialChillerWSE.mo | 61 +- .../PartialCoolingCoilHumidifyingHeating.mo | 9 +- .../BaseClasses/PartialHeatExchanger.mo | 15 +- .../BaseClasses/PartialIntegratedPrimary.mo | 54 +- .../BaseClasses/PartialPlantParallel.mo | 6 - .../BaseClasses/PartialPumpParallel.mo | 9 +- .../BaseClasses/ThreeWayValveParameters.mo | 11 + .../Equipment/IntegratedPrimaryLoadSide.mo | 34 +- .../Equipment/IntegratedPrimaryPlantSide.mo | 22 +- .../Equipment/IntegratedPrimarySecondary.mo | 96 +- .../ChillerCooled/Equipment/NonIntegrated.mo | 42 +- .../Equipment/WatersideEconomizer.mo | 13 +- .../Examples/DXCooledAirsideEconomizer.mo | 2 +- Buildings/Applications/DataCenters/Types.mo | 3 +- Buildings/BaseClasses/package.mo | 1 - .../BaseClasses/IncidenceAngle.mo | 2 +- .../BaseClasses/BrighteningCoefficient.mo | 2 +- .../BaseClasses/DiffusePerez.mo | 2 +- .../BaseClasses/DirectTiltedSurface.mo | 2 +- .../BaseClasses/RelativeAirMass.mo | 2 +- Buildings/BoundaryConditions/Types.mo | 13 +- .../Validation/BESTEST/WD100.mo | 193 ++ .../Validation/BESTEST/WD200.mo | 57 + .../Validation/BESTEST/WD300.mo | 57 + .../Validation/BESTEST/WD400.mo | 57 + .../Validation/BESTEST/WD500.mo | 57 + .../Validation/BESTEST/WD600.mo | 57 + .../Validation/BESTEST/package.mo | 14 + .../Validation/BESTEST/package.order | 6 + .../IsotropicAndPerezDiffuseRadiation.mo | 104 + .../Validation/UsersGuide.mo | 172 ++ .../BoundaryConditions/Validation/package.mo | 12 + .../Validation/package.order | 3 + Buildings/BoundaryConditions/package.order | 1 + .../BaseClasses/BaselinePrediction.mo | 4 +- .../DemandResponse/BaseClasses/package.mo | 1 - Buildings/Controls/DemandResponse/Client.mo | 8 +- .../Controls/Discrete/Examples/package.mo | 1 - Buildings/Controls/Discrete/package.mo | 1 - Buildings/Controls/Interfaces/package.mo | 1 - .../BaseClasses/Examples/SampleStart.mo | 4 +- .../Predictors/BaseClasses/package.mo | 1 - .../Controls/SetPoints/Examples/package.mo | 1 - .../Controls/SetPoints/OccupancySchedule.mo | 180 +- Buildings/Controls/SetPoints/package.mo | 1 - .../Controls/Sources/Examples/package.mo | 1 - Buildings/Controls/Sources/package.mo | 1 - Buildings/Controls/package.mo | 1 - .../Test4NodesFeeder/BalancedStepDown/DD.mo | 3 +- .../Test4NodesFeeder/BalancedStepDown/DY.mo | 11 +- .../Test4NodesFeeder/BalancedStepDown/YY.mo | 3 +- .../Test4NodesFeeder/BalancedStepUp/DD.mo | 3 +- .../Test4NodesFeeder/BalancedStepUp/YD.mo | 14 +- .../Test4NodesFeeder/BalancedStepUp/YY.mo | 3 +- .../Test4NodesFeeder/UnbalancedStepDown/DD.mo | 3 +- .../Test4NodesFeeder/UnbalancedStepUp/DD.mo | 3 +- .../Test4NodesFeeder/UnbalancedStepUp/YD.mo | 3 +- .../DC/Lines/Examples/DCLinesLinearized.mo | 2 +- Buildings/Electrical/PhaseSystems/OnePhase.mo | 4 +- .../Electrical/PhaseSystems/ThreePhase_dq.mo | 4 +- .../Electrical/PhaseSystems/ThreePhase_dq0.mo | 6 +- .../ChillerPlant/BaseClasses/DataCenter.mo | 8 +- .../Examples/DualFanDualDuct/ClosedLoop.mo | 87 +- .../DualFanDualDuct/Controls/FanVFD.mo | 100 - .../DualFanDualDuct/Controls/package.order | 1 - .../HydronicHeating/TwoRoomsWithStorage.mo | 9 +- .../BuildingVAV/BaseClasses/VAVBranch.mo | 14 +- .../BuildingVAV/Examples/OneFloor_OneZone.mo | 6 +- Buildings/Examples/Tutorial/CDL/System5.mo | 1 + .../Examples/Tutorial/SpaceCooling/System1.mo | 10 +- .../Examples/Tutorial/SpaceCooling/System2.mo | 27 +- .../Examples/Tutorial/SpaceCooling/System3.mo | 20 +- Buildings/Examples/VAVReheat/ASHRAE2006.mo | 230 +- .../Examples/VAVReheat/BaseClasses/Floor.mo | 23 +- .../VAVReheat/BaseClasses/FreezeStat.mo | 88 + .../VAVReheat/BaseClasses/MixingBox.mo | 388 ---- .../VAVReheat/BaseClasses/PartialFloor.mo | 10 +- .../VAVReheat/BaseClasses/PartialOpenLoop.mo | 578 ++--- .../VAVReheat/BaseClasses/VAVReheatBox.mo | 275 +++ .../VAVReheat/BaseClasses/package.order | 4 +- .../Examples/VAVReheat/Controls/Economizer.mo | 6 +- .../Controls/Examples/SupplyAirTemperature.mo | 3 +- .../Examples/VAVReheat/Controls/FanVFD.mo | 54 +- .../Controls/SupplyAirTemperature.mo | 17 +- Buildings/Examples/VAVReheat/Guideline36.mo | 364 +-- .../VAVReheat/Validation/BaseClasses/Floor.mo | 84 + .../Validation/BaseClasses/package.mo | 11 + .../Validation/BaseClasses/package.order | 1 + .../Validation/Guideline36SteadyState.mo | 12 +- .../VAVReheat/Validation/TraceSubstance.mo | 35 + .../VAVReheat/Validation/package.order | 2 + .../DHC/CentralPlants/BaseClasses/package.mo | 2 +- .../BaseClasses/Junction.mo | 7 +- .../BaseClasses/StratifiedTank.mo | 4 +- .../BaseClasses/Validation/package.mo | 4 +- .../BaseClasses/package.mo | 4 +- .../Generation5/BaseClasses/package.mo | 4 +- .../Combined/Generation5/ChillerBorefield.mo | 13 +- .../Controls/BaseClasses/package.mo | 4 +- .../Generation5/Controls/Borefield.mo | 3 +- .../Combined/Generation5/Controls/Chiller.mo | 6 +- .../Generation5/Controls/PIDWithEnable.mo | 8 +- .../Controls/PrimaryVariableFlow.mo | 77 + .../Combined/Generation5/Controls/SideCold.mo | 3 +- .../Generation5/Controls/Supervisory.mo | 10 +- .../Generation5/Controls/SwitchBox.mo | 86 + .../Combined/Generation5/Controls/package.mo | 4 +- .../Generation5/Controls/package.order | 2 + .../Combined/Generation5/Examples/package.mo | 4 +- .../Generation5/HeatPumpHeatExchanger.mo | 755 +++++++ .../Generation5/Subsystems/Chiller.mo | 3 +- .../Generation5/Subsystems/HeatPump.mo | 344 +++ .../Generation5/Subsystems/SwitchBox.mo | 161 ++ .../Subsystems/Validation/Borefield.mo | 3 +- .../Subsystems/Validation/Chiller.mo | 9 +- .../Subsystems/Validation/HeatExchanger.mo | 15 +- .../Subsystems/Validation/SwitchBox.mo | 119 + .../Subsystems/Validation/package.mo | 4 +- .../Subsystems/Validation/package.order | 1 + .../Generation5/Subsystems/package.mo | 4 +- .../Generation5/Subsystems/package.order | 2 + .../Generation5/Validation/package.mo | 4 +- .../Combined/Generation5/package.mo | 4 +- .../Combined/Generation5/package.order | 1 + .../Combined/package.mo | 4 +- .../DHC/EnergyTransferStations/Types.mo | 6 +- .../DHC/EnergyTransferStations/package.mo | 4 +- .../CentralPlants/SewageHeatRecovery.mo | 182 ++ .../Generation5/CentralPlants/package.mo | 11 + .../Generation5/CentralPlants/package.order | 1 + .../Generation5/Data/DesignDataParallel.mo | 52 + .../Generation5/Data/DesignDataSeries.mo | 41 + .../Combined/Generation5/Data/package.mo | 10 + .../Combined/Generation5/Data/package.order | 2 + .../Examples/BaseClasses/PartialParallel.mo | 287 +++ .../Examples/BaseClasses/PartialSeries.mo | 297 +++ .../Examples/BaseClasses/package.mo | 12 + .../Examples/BaseClasses/package.order | 2 + .../Examples/ParallelConstantFlow.mo | 71 + .../Examples/SeriesConstantFlow.mo | 88 + .../Examples/SeriesVariableFlow.mo | 105 + .../Combined/Generation5/Examples/package.mo | 13 + .../Generation5/Examples/package.order | 4 + .../BaseClasses/PartialBuildingWithETS.mo | 130 ++ .../Generation5/Loads/BaseClasses/package.mo | 12 + .../Loads/BaseClasses/package.order | 1 + .../Loads/BuildingTimeSeriesWithETS.mo | 126 ++ .../Combined/Generation5/Loads/package.mo | 11 + .../Combined/Generation5/Loads/package.order | 2 + .../BaseClasses/ConnectionParallelAutosize.mo | 39 + .../BaseClasses/ConnectionParallelStandard.mo | 40 + .../BaseClasses/ConnectionSeriesAutosize.mo | 36 + .../BaseClasses/ConnectionSeriesStandard.mo | 40 + .../Networks/BaseClasses/PipeAutosize.mo | 107 + .../Networks/BaseClasses/PipeStandard.mo | 33 + .../Networks/BaseClasses/package.mo | 12 + .../Networks/BaseClasses/package.order | 6 + .../Networks/UnidirectionalParallel.mo | 61 + .../Networks/UnidirectionalSeries.mo | 66 + .../Combined/Generation5/Networks/package.mo | 12 + .../Generation5/Networks/package.order | 3 + .../Generation5/ThermalStorages/BoreField.mo | 80 + .../Generation5/ThermalStorages/package.mo | 11 + .../Generation5/ThermalStorages/package.order | 1 + .../Examples/Combined/Generation5/package.mo | 14 + .../Combined/Generation5/package.order | 6 + .../DHC/Examples/Combined/package.mo | 14 + .../DHC/Examples/Combined/package.order | 1 + .../Experimental/DHC/Examples/package.mo | 14 + .../Experimental/DHC/Examples/package.order | 1 + .../Loads/BaseClasses/ConstraintViolation.mo | 75 + .../Loads/BaseClasses/PartialTerminalUnit.mo | 37 - .../Validation/BaseClasses/Building.mo | 4 +- .../Validation/BaseClasses/BuildingWithETS.mo | 4 +- .../BaseClasses/Validation/BaseClasses/ETS.mo | 15 +- .../Validation/BaseClasses/package.mo | 2 +- .../BaseClasses/Validation/BuildingWithETS.mo | 7 +- .../DHC/Loads/BaseClasses/getPeakLoad.mo | 4 +- .../DHC/Loads/BaseClasses/package.mo | 6 +- .../DHC/Loads/BaseClasses/package.order | 1 + .../Controls/Validation/MixingValveControl.mo | 18 +- .../DHC/Loads/Controls/Validation/package.mo | 4 +- .../DHC/Loads/Controls/package.mo | 4 +- .../Examples/BaseClasses/BuildingSpawnZ1.mo | 2 +- .../Examples/BaseClasses/BuildingSpawnZ6.mo | 2 +- .../GeojsonExportRC/OfficeBuilding/Floor.mo | 2 +- .../GeojsonExportRC/OfficeBuilding/ICT.mo | 2 +- .../GeojsonExportRC/OfficeBuilding/Meeting.mo | 2 +- .../GeojsonExportRC/OfficeBuilding/Office.mo | 2 +- .../OfficeBuilding/Restroom.mo | 2 +- .../GeojsonExportRC/OfficeBuilding/Storage.mo | 2 +- .../GeojsonExportRC/OfficeBuilding/package.mo | 4 +- .../BaseClasses/GeojsonExportRC/package.mo | 4 +- .../DHC/Loads/Examples/BaseClasses/package.mo | 6 +- .../DHC/Loads/Examples/package.mo | 4 +- .../Experimental/DHC/Loads/SimpleRoomODE.mo | 2 +- Buildings/Experimental/DHC/Loads/Types.mo | 24 +- .../Validation/BaseClasses/Connection2Pipe.mo | 2 +- .../BaseClasses/FanCoil2PipeCooling.mo | 2 +- .../BaseClasses/FanCoil2PipeHeating.mo | 2 +- .../Loads/Validation/BaseClasses/package.mo | 6 +- .../DHC/Loads/Validation/SimpleRoomODE.mo | 6 +- .../DHC/Loads/Validation/package.mo | 4 +- Buildings/Experimental/DHC/Loads/package.mo | 4 +- .../BaseClasses/PartialDistribution.mo | 22 +- .../BaseClasses/PartialDistribution1Pipe.mo | 4 +- .../DHC/Networks/BaseClasses/package.mo | 2 +- .../Experimental/DHC/Networks/Controls.mo | 292 +++ .../Experimental/DHC/Networks/package.mo | 4 +- .../Experimental/DHC/Networks/package.order | 1 + Buildings/Experimental/DHC/package.mo | 4 +- Buildings/Experimental/DHC/package.order | 1 + .../BaseClasses/PartialThreeWayValve.mo | 2 +- .../Actuators/Dampers/Examples/package.mo | 1 - .../Fluid/Actuators/Dampers/Exponential.mo | 11 +- .../Actuators/Motors/Examples/package.mo | 1 - Buildings/Fluid/Actuators/Motors/package.mo | 1 - .../Valves/Examples/ThreeWayValves.mo | 2 +- .../Actuators/Valves/Validation/package.mo | 1 + Buildings/Fluid/Actuators/Valves/package.mo | 1 - .../BasicFlowFunction_dp_DerivativeCheck.mo | 2 +- .../BasicFlowFunction_dp_DerivativeCheck2.mo | 2 +- ...asicFlowFunction_m_flow_DerivativeCheck.mo | 2 +- .../Fluid/BaseClasses/PartialResistance.mo | 2 +- Buildings/Fluid/BaseClasses/package.mo | 1 - Buildings/Fluid/Boilers/Examples/package.mo | 1 - Buildings/Fluid/Boilers/package.mo | 1 - .../BaseClasses/EnergyConversionNormal.mo | 11 +- .../Fluid/CHPs/ThermalElectricalFollowing.mo | 10 +- .../Fluid/Chillers/BaseClasses/Carnot.mo | 6 +- .../Chillers/BaseClasses/PartialElectric.mo | 20 +- .../Chillers/Data/ElectricReformulatedEIR.mo | 1929 ++++++++-------- Buildings/Fluid/Chillers/Data/package.mo | 1 - Buildings/Fluid/Chillers/ElectricEIR.mo | 6 +- Buildings/Fluid/Chillers/Examples/package.mo | 1 - Buildings/Fluid/Chillers/package.mo | 1 - Buildings/Fluid/Data/Fuels.mo | 23 +- Buildings/Fluid/Data/Pipes.mo | 114 +- Buildings/Fluid/Delays/Examples/package.mo | 1 - Buildings/Fluid/Delays/package.mo | 1 - .../Fluid/Examples/FlowSystem/Simplified1.mo | 2 +- .../BaseClasses/PlugFlowCore.mo | 2 +- .../BaseClasses/Validation/package.mo | 1 + .../FixedResistances/BaseClasses/package.mo | 1 - .../Fluid/FixedResistances/Examples/Pipe.mo | 4 +- Buildings/Fluid/FixedResistances/Junction.mo | 2 +- .../Fluid/FixedResistances/PlugFlowPipe.mo | 2 +- .../Data/BaseClasses/PipeDataULg.mo | 2 +- .../PlugFlowPipes/Data/PipeDataAIT151218.mo | 2 +- .../PlugFlowPipes/Data/PipeDataULg150801.mo | 2 +- .../PlugFlowPipes/Data/PipeDataULg151202.mo | 2 +- .../PlugFlowPipes/Data/PipeDataULg151204_1.mo | 2 +- .../PlugFlowPipes/Data/PipeDataULg151204_2.mo | 2 +- .../PlugFlowPipes/Data/PipeDataULg151204_4.mo | 2 +- .../PlugFlowPipes/Data/PipeDataULg160104_2.mo | 2 +- .../PlugFlowPipes/Data/PipeDataULg160118_1.mo | 2 +- .../Validation/PlugFlowPipes/Data/package.mo | 2 +- .../Validation/PlugFlowPipes/PlugFlowULg.mo | 2 +- .../finiteLineSource.mo | 2 +- .../Validation/Analytic_20Years.mo | 2 +- .../Validation/BaseClasses/package.mo | 1 - .../BaseClasses/PartialBorefield.mo | 9 +- .../Borefields/Examples/Borefields.mo | 11 +- .../Validation/BaseClasses/package.mo | 1 - .../ConstantHeatInjection_100Boreholes.mo | 7 +- .../Borefields/Validation/Sandbox.mo | 7 +- .../Fluid/Geothermal/Borefields/package.mo | 1 - .../BaseClasses/Examples/ExchangeValues.mo | 2 +- .../Fluid/Geothermal/Boreholes/package.mo | 1 - Buildings/Fluid/Geothermal/package.mo | 1 - .../ActiveBeams/BaseClasses/Convector.mo | 2 +- .../HeatExchangers/ActiveBeams/Cooling.mo | 12 +- .../BaseClasses/HexElementLatent.mo | 13 +- .../BaseClasses/PartialEffectivenessNTU.mo | 14 +- .../BaseClasses/PartialPipeManifold.mo | 2 +- .../BaseClasses/PartialPrescribedOutlet.mo | 11 +- .../BaseClasses/RayleighNumber.mo | 12 +- .../BaseClasses/WetCoilDryRegime.mo | 104 + .../BaseClasses/WetCoilDryWetRegime.mo | 422 ++++ .../BaseClasses/WetCoilUARated.mo | 194 ++ .../BaseClasses/WetCoilWetRegime.mo | 265 +++ .../BaseClasses/determineWaterIndex.mo | 49 + .../BaseClasses/ntu_epsilonZ.mo | 5 +- .../HeatExchangers/BaseClasses/package.order | 5 + .../Correlations/BaseClasses/package.mo | 1 - .../Correlations/Examples/package.mo | 1 - .../CoolingTowers/Correlations/package.mo | 1 - .../CoolingTowers/Examples/package.mo | 1 - .../HeatExchangers/CoolingTowers/package.mo | 1 - .../Data/Generic/BaseClasses/package.mo | 1 - .../DXCoils/AirCooled/Examples/MultiStage.mo | 2 +- .../Examples/PerformanceCurves/Curve_I.mo | 13 +- .../Examples/PerformanceCurves/Curve_II.mo | 13 +- .../Examples/PerformanceCurves/Curve_III.mo | 13 +- .../DXCoils/AirCooled/Examples/SingleSpeed.mo | 2 +- .../AirCooled/Examples/SpaceCooling.mo | 2 +- .../AirCooled/Examples/VariableSpeed.mo | 2 +- .../Validation/SingleSpeedEnergyPlus.mo | 2 +- .../Validation/SingleSpeedPLREnergyPlus.mo | 2 +- .../BaseClasses/CoolingCapacityAirCooled.mo | 2 +- .../BaseClasses/CoolingCapacityWaterCooled.mo | 2 +- .../DXCoils/BaseClasses/UACp.mo | 8 +- .../WaterCooled/Examples/MultiStage.mo | 2 +- .../WaterCooled/Examples/SingleSpeed.mo | 2 +- .../WaterCooled/Examples/VariableSpeed.mo | 2 +- .../Validation/VariableSpeedEnergyPlus.mo | 2 +- .../VariableSpeedEnergyPlusPartLoad.mo | 2 +- .../WetCoilEffectivenessNTUMassFlow.mo | 85 + .../HeatExchangers/Examples/package.order | 1 + .../Radiators/RadiatorEN442_2.mo | 2 +- .../Validation/WetCoilEffectivenessNTU.mo | 305 +++ .../WetCoilEffectivenessNTUHeating.mo | 296 +++ .../HeatExchangers/Validation/package.order | 2 + .../HeatExchangers/WetCoilCounterFlow.mo | 7 +- .../HeatExchangers/WetCoilEffectivenessNTU.mo | 631 ++++++ Buildings/Fluid/HeatExchangers/package.order | 1 + .../BaseClasses/PartialWaterToWater.mo | 2 +- .../Compressors/Validation/package.mo | 2 +- .../Fluid/HeatPumps/Compressors/package.mo | 2 +- .../Carrier_50PSW122_38kW_4_29COP_R410A.mo | 1 + .../Carrier_50PSW180_52kW_4_50COP_R410A.mo | 1 + .../Carrier_50PSW210_70kW_4_40COP_R410A.mo | 1 + .../Carrier_50PSW240_93kW_4_40COP_R410A.mo | 1 + .../Carrier_50PSW360_105kW_4_50COP_R410A.mo | 1 + .../Carrier_50PSW420_140kW_4_40COP_R410A.mo | 1 + ...ClimateMaster_TMW036_12kW_4_90COP_R410A.mo | 1 + ...ClimateMaster_TMW060_21kW_4_60COP_R410A.mo | 1 + ...ClimateMaster_TMW120_42kW_4_50COP_R410A.mo | 1 + ...ClimateMaster_TMW170_48kW_4_30COP_R410A.mo | 1 + ...ClimateMaster_TMW340_98kW_4_40COP_R410A.mo | 1 + .../Daikin_WRA036_13kW_4_50COP_R410A.mo | 1 + .../Daikin_WRA048_16kW_4_60COP_R410A.mo | 1 + .../Daikin_WRA060_19kW_4_50COP_R410A.mo | 1 + .../Daikin_WRA072_24kW_4_30COP_R410A.mo | 1 + .../Daikin_WRA120_37kW_4_40COP_R410A.mo | 1 + .../Daikin_WRA150_49kW_4_70COP_R410A.mo | 1 + .../Daikin_WRA180_63kW_4_50COP_R410A.mo | 1 + .../Daikin_WRA240_79kW_4_40COP_R410A.mo | 1 + .../Daikin_WRA300_93kW_4_60COP_R410A.mo | 1 + .../Daikin_WRA360_116kW_4_60COP_R410A.mo | 1 + .../Daikin_WRA420_137kW_4_50COP_R410A.mo | 1 + .../Trane_EXW060_21kW_4_30COP_R410A.mo | 1 + .../Trane_EXW120_40kW_3_90COP_R410A.mo | 1 + .../Trane_EXW240_76kW_4_10COP_R410A.mo | 1 + .../ScrollWaterToWater_OneRoomRadiator.mo | 10 +- Buildings/Fluid/HeatPumps/Examples/package.mo | 1 - Buildings/Fluid/HeatPumps/package.mo | 2 +- .../Validation/SprayAirWasher_X.mo | 10 +- .../Fluid/Interfaces/ConservationEquation.mo | 4 +- .../EightPortFlowResistanceParameters.mo | 2 + .../Interfaces/EightPortHeatMassExchanger.mo | 2 +- .../FourPortFlowResistanceParameters.mo | 2 + .../Interfaces/FourPortHeatMassExchanger.mo | 2 +- .../Interfaces/PartialEightPortInterface.mo | 10 +- .../Interfaces/PartialFourPortInterface.mo | 11 +- .../Interfaces/PartialTwoPortInterface.mo | 10 +- .../Interfaces/PartialTwoPortTransport.mo | 14 +- .../Fluid/Interfaces/PartialTwoPortVector.mo | 10 +- .../Fluid/Interfaces/PrescribedOutlet.mo | 9 +- .../StaticFourPortHeatMassExchanger.mo | 2 +- .../StaticTwoPortHeatMassExchanger.mo | 2 +- .../Interfaces/TwoPortHeatMassExchanger.mo | 2 +- .../MixingVolumeHeatMoisturePort.mo | 2 +- .../Validation/MixingVolumeHeatPortWater.mo | 3 +- .../MixingVolumes/MixingVolumeMoistAir.mo | 2 +- .../BaseClasses/MixingVolumeReverseFlow.mo | 15 +- .../Validation/CoupledVolumesAir.mo | 2 +- .../Validation/CoupledVolumesGlycol47.mo | 2 +- .../CoupledVolumesSpecializedAirPerfectGas.mo | 2 +- ...esSpecializedWaterConstantProperties_pT.mo | 2 +- ...ializedWaterTemperatureDependentDensity.mo | 2 +- .../Validation/CoupledVolumesWater.mo | 2 +- Buildings/Fluid/MixingVolumes/package.mo | 1 - .../BaseClasses/FlowMachineInterface.mo | 2 +- .../Movers/BaseClasses/PowerInterface.mo | 2 +- .../Sensors/Conversions/Examples/package.mo | 1 - .../Fluid/Sensors/Conversions/package.mo | 1 - Buildings/Fluid/Sensors/Examples/package.mo | 1 - Buildings/Fluid/Sensors/package.mo | 1 - .../Data/Concentrating/C_CogenraSunDeck.mo | 2 +- .../Data/Concentrating/C_VerificationModel.mo | 2 +- .../GlazedFlatPlate/FP_GuangdongFSPTY95.mo | 2 +- .../Data/GlazedFlatPlate/FP_SolahartKf.mo | 2 +- .../Data/GlazedFlatPlate/FP_ThermaLiteHS20.mo | 2 +- .../Data/Tubular/T_AMKCollectraAGOWR20.mo | 2 +- .../Data/Tubular/T_JiaxingDiyiC0130.mo | 2 +- .../Fluid/SolarCollectors/Examples/package.mo | 2 +- .../Sources/BaseClasses/PartialSource.mo | 18 +- .../Sources/BaseClasses/PartialSource_Xi_C.mo | 2 +- .../Validation/BaseClasses/BoundarySystem.mo | 2 +- .../BaseClasses/BoundarySystemWithX_in.mo | 2 +- .../BaseClasses/BoundarySystemWithXi_in.mo | 2 +- .../Sources/Validation/BaseClasses/package.mo | 1 - .../Fluid/Sources/Validation/Boundary.mo | 2 +- .../Sources/Validation/BoundaryWithX_in.mo | 2 +- .../Sources/Validation/BoundaryWithXi_in.mo | 2 +- .../BaseClasses/IndirectTankHeatExchanger.mo | 15 +- Buildings/Fluid/Storage/package.mo | 1 - .../Fluid/Utilities/BaseClasses/package.mo | 1 - Buildings/Fluid/Utilities/Examples/package.mo | 1 - Buildings/Fluid/Utilities/package.mo | 1 - .../Functions/HeatFlux/BaseClasses/package.mo | 2 +- .../Functions/HeatFlux/constantCoefficient.mo | 2 +- .../HeatTransfer/Data/BoreholeFillings.mo | 6 +- Buildings/HeatTransfer/Data/Gases.mo | 11 +- Buildings/HeatTransfer/Data/OpaqueSurfaces.mo | 13 +- Buildings/HeatTransfer/Data/Resistances.mo | 9 +- Buildings/HeatTransfer/Data/Shades.mo | 9 +- Buildings/HeatTransfer/Data/Soil.mo | 20 +- Buildings/HeatTransfer/Data/Solids.mo | 24 +- Buildings/HeatTransfer/Data/SolidsPCM.mo | 24 +- Buildings/HeatTransfer/Data/package.mo | 1 - Buildings/HeatTransfer/Windows/package.mo | 1 - .../Validation/PropyleneGlycolWater.mo | 4 +- Buildings/Media/Refrigerants/R410A/package.mo | 2 +- .../Controls/OBC/CDL/Continuous/package.mo | 1 - .../LakeWaterHeatExchanger_T_Heating.mo | 3 +- .../SubStations/Validation/package.mo | 2 +- .../SubStations/package.mo | 1 - .../DistrictHeatingCooling/package.mo | 2 +- .../VAVReheat/BaseClasses/VAVBranch.mo | 28 +- .../Examples/VAVReheat/BaseClasses/package.mo | 10 + .../VAVReheat/BaseClasses/package.order | 1 + .../VAVReheat/Validation/VAVBranch.mo | 79 + .../Examples/VAVReheat/Validation/package.mo | 10 + .../VAVReheat/Validation/package.order | 1 + .../Obsolete/Examples/VAVReheat/package.mo | 11 + .../Obsolete/Examples/VAVReheat/package.order | 2 + Buildings/Obsolete/Examples/package.mo | 11 + Buildings/Obsolete/Examples/package.order | 1 + Buildings/Obsolete/Fluid/package.mo | 2 + Buildings/Obsolete/Utilities/package.mo | 3 +- Buildings/Obsolete/package.order | 1 + .../BaseClasses/Validation/Logit2D.mo | 2 +- .../exponentialVariableGeneration.mo | 2 +- .../BaseClasses/weibullVariableGeneration.mo | 2 +- .../Blinds/Zhang2012BlindsSolarAltitude.mo | 2 +- .../Blinds/Zhang2012BlindsSolarIntensity.mo | 2 +- .../Office/Windows/Haldi2009WindowsTInTout.mo | 2 +- .../Herkel2008WindowsCompletelyOpen.mo | 2 +- .../Office/Windows/Herkel2008WindowsSmall.mo | 2 +- .../Windows/Herkel2008WindowsTiltedOpen.mo | 2 +- .../Office/Windows/Zhang2012WindowsAll.mo | 2 +- .../Office/Windows/Zhang2012WindowsEast.mo | 2 +- .../Office/Windows/Zhang2012WindowsNorth.mo | 2 +- .../Office/Windows/Zhang2012WindowsSouth.mo | 2 +- .../Office/Windows/Zhang2012WindowsWest.mo | 2 +- .../Detailed/BaseClasses/CFDFluidInterface.mo | 6 +- .../BaseClasses/ExteriorBoundaryConditions.mo | 3 +- .../Detailed/Constructions/Construction.mo | 3 +- .../Detailed/Examples/MixedAirFreeResponse.mo | 2 +- .../CellAndElectricalDividingWall.mo | 2 +- .../ClosetAndElectricalDividingWall.mo | 2 +- .../DividingWalls/TestBedDividingWall.mo | 2 +- .../DividingWalls/TestCellDividngWall.mo | 2 +- .../ExteriorConstructions/Construction1.mo | 2 +- .../Construction10and23.mo | 2 +- .../ExteriorConstructions/Construction3.mo | 2 +- .../Construction5and8.mo | 2 +- .../ExteriorDoorInsulated.mo | 2 +- .../ExteriorDoorUninsulated.mo | 2 +- .../PartitionConstructions/PartitionDoor.mo | 2 +- .../PartitionConstructions/PartitionWall.mo | 2 +- .../Roofs/ASHRAE_901_1975Roof.mo | 2 +- .../Roofs/ASHRAE_901_2010Roof.mo | 2 +- .../Roofs/CA_T24_2013Roof.mo | 2 +- .../Validation/BESTEST/Cases6xx/Case600.mo | 6 +- .../Validation/BESTEST/Cases6xx/Case600FF.mo | 41 +- .../Validation/BESTEST/Cases6xx/Case650FF.mo | 8 +- .../Validation/BESTEST/Cases6xx/package.mo | 1 - .../Validation/BESTEST/Cases9xx/Case900FF.mo | 7 +- .../Validation/BESTEST/Cases9xx/Case950FF.mo | 15 +- .../Validation/BESTEST/Cases9xx/package.mo | 1 - .../Detailed/Validation/BESTEST/UsersGuide.mo | 6 +- .../Validation/BaseClasses/package.mo | 1 - .../Validation/Initialization/package.mo | 1 - .../Validation/SingleZoneFloorWithHeating.mo | 69 +- Buildings/ThermalZones/EnergyPlus/Actuator.mo | 281 ++- .../BaseClasses/FMUInputVariableClass.mo | 117 - .../BaseClasses/FMUOutputVariableClass.mo | 110 - .../EnergyPlus/BaseClasses/FMUZoneClass.mo | 113 - .../BaseClasses/PartialEnergyPlusObject.mo | 14 +- .../BaseClasses/SpawnExternalObject.mo | 188 ++ .../Synchronize/ObjectSynchronizer.mo | 32 + .../Synchronize/SynchronizeBuilding.mo | 26 + .../Synchronize/SynchronizeConnector.mo | 28 + .../BaseClasses/Synchronize/package.mo | 23 + .../BaseClasses/Synchronize/package.order | 3 + ...MUZoneAdapter.mo => ThermalZoneAdapter.mo} | 156 +- .../Validation/FMUZoneAdapterZones1.mo | 11 +- .../Validation/FMUZoneAdapterZones2.mo | 14 +- .../Validation/FMUZoneAdapterZones3.mo | 20 +- .../BaseClasses/Validation/package.mo | 4 +- .../EnergyPlus/BaseClasses/exchange.mo | 43 + .../EnergyPlus/BaseClasses/getParameters.mo | 34 + .../EnergyPlus/BaseClasses/getUnitAsString.mo | 1 + .../EnergyPlus/BaseClasses/initialize.mo | 37 + .../BaseClasses/inputVariableExchange.mo | 41 - .../BaseClasses/inputVariableInitialize.mo | 31 - .../BaseClasses/outputVariableExchange.mo | 43 - .../BaseClasses/outputVariableInitialize.mo | 31 - .../EnergyPlus/BaseClasses/package.mo | 6 +- .../EnergyPlus/BaseClasses/package.order | 16 +- .../EnergyPlus/BaseClasses/zoneExchange.mo | 73 - .../EnergyPlus/BaseClasses/zoneInitialize.mo | 39 - Buildings/ThermalZones/EnergyPlus/Building.mo | 30 +- .../Examples/SingleFamilyHouse/AirHeating.mo | 230 ++ .../SingleFamilyHouse}/EquipmentSchedule.mo | 14 +- .../SingleFamilyHouse}/LightsControl.mo | 19 +- .../RadiantHeatingCooling.mo | 376 ++++ .../RadiantHeatingWithGroundHeatTransfer.mo | 239 ++ .../SingleFamilyHouse}/ShadeControl.mo | 148 +- .../SingleFamilyHouse/Unconditioned.mo} | 23 +- .../Examples/SingleFamilyHouse/package.mo | 15 + .../Examples/SingleFamilyHouse/package.order | 7 + .../Examples/SmallOffice/ASHRAE2006Spring.mo | 29 +- .../Examples/SmallOffice/ASHRAE2006Summer.mo | 29 +- .../Examples/SmallOffice/ASHRAE2006Winter.mo | 36 +- .../Examples/SmallOffice/BaseClasses/Floor.mo | 460 ++-- .../BaseClasses/IdealHeaterCooler.mo | 97 + .../SmallOffice/BaseClasses/package.mo | 4 +- .../SmallOffice/BaseClasses/package.order | 1 + .../Examples/SmallOffice/Guideline36Spring.mo | 26 +- .../Examples/SmallOffice/Guideline36Summer.mo | 29 +- .../Examples/SmallOffice/Guideline36Winter.mo | 38 +- .../SmallOffice/IdealHeatingCoolingSpring.mo | 33 + .../SmallOffice/IdealHeatingCoolingSummer.mo | 33 + .../SmallOffice/IdealHeatingCoolingWinter.mo | 107 + .../EnergyPlus/Examples/SmallOffice/NoHVAC.mo | 129 -- .../Examples/SmallOffice/Unconditioned.mo | 125 ++ .../Examples/SmallOffice/package.mo | 6 +- .../Examples/SmallOffice/package.order | 5 +- .../EnergyPlus/Examples/package.mo | 4 +- .../EnergyPlus/Examples/package.order | 1 + .../EnergyPlus/OpaqueConstruction.mo | 333 +++ .../ThermalZones/EnergyPlus/OutputVariable.mo | 1942 ++++++++++++++++- Buildings/ThermalZones/EnergyPlus/Schedule.mo | 82 +- .../ThermalZones/EnergyPlus/ThermalZone.mo | 131 +- .../EnergyPlus/Types/LogLevels.mo | 15 +- .../ThermalZones/EnergyPlus/Types/Units.mo | 45 +- .../ThermalZones/EnergyPlus/Types/package.mo | 4 +- .../ThermalZones/EnergyPlus/UsersGuide.mo | 1339 ++---------- .../Validation/Actuator/package.order | 2 - .../ThreeZonesTwoBuildings.mo | 3 +- .../TwoIdenticalOneZoneBuildings.mo | 2 +- .../Validation/MultipleBuildings/package.mo | 4 +- .../OneZoneOneOutputVariable.mo | 5 +- .../OneZoneOneOutputVariableSummer.mo | 6 +- .../OneZoneTwoDifferentOutputVariables.mo | 3 +- .../OneZoneTwoIdenticalOutputVariables.mo | 3 +- .../Validation/OutputVariable/package.mo | 4 +- .../EquipmentScheduleOutputVariable.mo | 6 +- .../EnergyPlus/Validation/Schedule/package.mo | 4 +- .../Validation/Schedule/package.order | 1 - .../Validation/ThermalZone/InternalGain.mo | 10 +- .../OneZoneCompareZoneTemperatureOutput.mo | 5 +- .../Validation/ThermalZone/OneZoneOneYear.mo | 38 + .../ThermalZone/OneZoneWithControl.mo | 128 -- .../ThermalZone/RefBldgSmallOffice.mo | 5 +- .../ThermalZone/TwoIdenticalZones.mo | 5 +- .../ZoneTemperatureInitialization.mo | 5 +- .../Validation/ThermalZone/package.mo | 4 +- .../Validation/ThermalZone/package.order | 3 +- .../OneZoneConstantFloorTemperature.mo | 45 + .../OneZoneControlledFloorTemperature.mo | 99 + .../{Actuator => ZoneSurface}/package.mo | 8 +- .../Validation/ZoneSurface/package.order | 2 + .../EnergyPlus/Validation/package.mo | 4 +- .../EnergyPlus/Validation/package.order | 2 +- .../ThermalZones/EnergyPlus/ZoneSurface.mo | 262 +++ Buildings/ThermalZones/EnergyPlus/package.mo | 6 +- .../ThermalZones/EnergyPlus/package.order | 2 + .../ReducedOrder/Examples/package.mo | 3 +- .../ReducedOrder/RC/OneElement.mo | 2 +- .../Validation/RoomWithLatentGain.mo | 2 +- .../Validation/RoomWithoutLatentGain.mo | 2 +- .../Validation/VDI6007/package.mo | 3 +- .../ReducedOrder/Validation/package.mo | 3 +- .../ThermalZones/ReducedOrder/package.mo | 3 +- .../IO/BCVTB/BaseClasses/FluidInterface.mo | 4 +- .../Examples/BaseClasses/ExportedModel.mo | 3 +- .../Examples/BaseClasses/OriginalModel.mo | 8 +- .../Examples/InverseXDerivativeCheck.mo | 4 +- .../RegNonZeroPowerDerivative_2_Check.mo | 6 +- Buildings/Utilities/Math/Functions/package.mo | 1 - Buildings/Utilities/Math/package.mo | 2 +- .../Plotters/Examples/BaseClasses/package.mo | 1 - .../Psychrometrics/Functions/X_pW.mo | 8 +- Buildings/Utilities/Psychrometrics/X_pTphi.mo | 2 +- .../Utilities/Psychrometrics/hSat_pTSat.mo | 62 + .../Utilities/Psychrometrics/package.order | 1 + 615 files changed, 16753 insertions(+), 5958 deletions(-) create mode 100644 Buildings/BoundaryConditions/Validation/BESTEST/WD100.mo create mode 100644 Buildings/BoundaryConditions/Validation/BESTEST/WD200.mo create mode 100644 Buildings/BoundaryConditions/Validation/BESTEST/WD300.mo create mode 100644 Buildings/BoundaryConditions/Validation/BESTEST/WD400.mo create mode 100644 Buildings/BoundaryConditions/Validation/BESTEST/WD500.mo create mode 100644 Buildings/BoundaryConditions/Validation/BESTEST/WD600.mo create mode 100644 Buildings/BoundaryConditions/Validation/BESTEST/package.mo create mode 100644 Buildings/BoundaryConditions/Validation/BESTEST/package.order create mode 100644 Buildings/BoundaryConditions/Validation/IsotropicAndPerezDiffuseRadiation.mo create mode 100644 Buildings/BoundaryConditions/Validation/UsersGuide.mo create mode 100644 Buildings/BoundaryConditions/Validation/package.mo create mode 100644 Buildings/BoundaryConditions/Validation/package.order delete mode 100644 Buildings/Examples/DualFanDualDuct/Controls/FanVFD.mo create mode 100644 Buildings/Examples/VAVReheat/BaseClasses/FreezeStat.mo delete mode 100644 Buildings/Examples/VAVReheat/BaseClasses/MixingBox.mo create mode 100644 Buildings/Examples/VAVReheat/BaseClasses/VAVReheatBox.mo create mode 100644 Buildings/Examples/VAVReheat/Validation/BaseClasses/Floor.mo create mode 100644 Buildings/Examples/VAVReheat/Validation/BaseClasses/package.mo create mode 100644 Buildings/Examples/VAVReheat/Validation/BaseClasses/package.order create mode 100644 Buildings/Examples/VAVReheat/Validation/TraceSubstance.mo create mode 100644 Buildings/Experimental/DHC/EnergyTransferStations/Combined/Generation5/Controls/PrimaryVariableFlow.mo create mode 100644 Buildings/Experimental/DHC/EnergyTransferStations/Combined/Generation5/Controls/SwitchBox.mo create mode 100644 Buildings/Experimental/DHC/EnergyTransferStations/Combined/Generation5/HeatPumpHeatExchanger.mo create mode 100644 Buildings/Experimental/DHC/EnergyTransferStations/Combined/Generation5/Subsystems/HeatPump.mo create mode 100644 Buildings/Experimental/DHC/EnergyTransferStations/Combined/Generation5/Subsystems/SwitchBox.mo create mode 100644 Buildings/Experimental/DHC/EnergyTransferStations/Combined/Generation5/Subsystems/Validation/SwitchBox.mo create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/CentralPlants/SewageHeatRecovery.mo create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/CentralPlants/package.mo create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/CentralPlants/package.order create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/Data/DesignDataParallel.mo create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/Data/DesignDataSeries.mo create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/Data/package.mo create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/Data/package.order create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/Examples/BaseClasses/PartialParallel.mo create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/Examples/BaseClasses/PartialSeries.mo create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/Examples/BaseClasses/package.mo create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/Examples/BaseClasses/package.order create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/Examples/ParallelConstantFlow.mo create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/Examples/SeriesConstantFlow.mo create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/Examples/SeriesVariableFlow.mo create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/Examples/package.mo create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/Examples/package.order create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/Loads/BaseClasses/PartialBuildingWithETS.mo create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/Loads/BaseClasses/package.mo create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/Loads/BaseClasses/package.order create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/Loads/BuildingTimeSeriesWithETS.mo create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/Loads/package.mo create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/Loads/package.order create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/Networks/BaseClasses/ConnectionParallelAutosize.mo create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/Networks/BaseClasses/ConnectionParallelStandard.mo create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/Networks/BaseClasses/ConnectionSeriesAutosize.mo create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/Networks/BaseClasses/ConnectionSeriesStandard.mo create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/Networks/BaseClasses/PipeAutosize.mo create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/Networks/BaseClasses/PipeStandard.mo create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/Networks/BaseClasses/package.mo create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/Networks/BaseClasses/package.order create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/Networks/UnidirectionalParallel.mo create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/Networks/UnidirectionalSeries.mo create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/Networks/package.mo create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/Networks/package.order create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/ThermalStorages/BoreField.mo create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/ThermalStorages/package.mo create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/ThermalStorages/package.order create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/package.mo create mode 100644 Buildings/Experimental/DHC/Examples/Combined/Generation5/package.order create mode 100644 Buildings/Experimental/DHC/Examples/Combined/package.mo create mode 100644 Buildings/Experimental/DHC/Examples/Combined/package.order create mode 100644 Buildings/Experimental/DHC/Examples/package.mo create mode 100644 Buildings/Experimental/DHC/Examples/package.order create mode 100644 Buildings/Experimental/DHC/Loads/BaseClasses/ConstraintViolation.mo create mode 100644 Buildings/Experimental/DHC/Networks/Controls.mo create mode 100644 Buildings/Fluid/HeatExchangers/BaseClasses/WetCoilDryRegime.mo create mode 100644 Buildings/Fluid/HeatExchangers/BaseClasses/WetCoilDryWetRegime.mo create mode 100644 Buildings/Fluid/HeatExchangers/BaseClasses/WetCoilUARated.mo create mode 100644 Buildings/Fluid/HeatExchangers/BaseClasses/WetCoilWetRegime.mo create mode 100644 Buildings/Fluid/HeatExchangers/BaseClasses/determineWaterIndex.mo create mode 100644 Buildings/Fluid/HeatExchangers/Examples/WetCoilEffectivenessNTUMassFlow.mo create mode 100644 Buildings/Fluid/HeatExchangers/Validation/WetCoilEffectivenessNTU.mo create mode 100644 Buildings/Fluid/HeatExchangers/Validation/WetCoilEffectivenessNTUHeating.mo create mode 100644 Buildings/Fluid/HeatExchangers/WetCoilEffectivenessNTU.mo rename Buildings/{ => Obsolete}/Examples/VAVReheat/BaseClasses/VAVBranch.mo (92%) create mode 100644 Buildings/Obsolete/Examples/VAVReheat/BaseClasses/package.mo create mode 100644 Buildings/Obsolete/Examples/VAVReheat/BaseClasses/package.order create mode 100644 Buildings/Obsolete/Examples/VAVReheat/Validation/VAVBranch.mo create mode 100644 Buildings/Obsolete/Examples/VAVReheat/Validation/package.mo create mode 100644 Buildings/Obsolete/Examples/VAVReheat/Validation/package.order create mode 100644 Buildings/Obsolete/Examples/VAVReheat/package.mo create mode 100644 Buildings/Obsolete/Examples/VAVReheat/package.order create mode 100644 Buildings/Obsolete/Examples/package.mo create mode 100644 Buildings/Obsolete/Examples/package.order delete mode 100644 Buildings/ThermalZones/EnergyPlus/BaseClasses/FMUInputVariableClass.mo delete mode 100644 Buildings/ThermalZones/EnergyPlus/BaseClasses/FMUOutputVariableClass.mo delete mode 100644 Buildings/ThermalZones/EnergyPlus/BaseClasses/FMUZoneClass.mo create mode 100644 Buildings/ThermalZones/EnergyPlus/BaseClasses/SpawnExternalObject.mo create mode 100644 Buildings/ThermalZones/EnergyPlus/BaseClasses/Synchronize/ObjectSynchronizer.mo create mode 100644 Buildings/ThermalZones/EnergyPlus/BaseClasses/Synchronize/SynchronizeBuilding.mo create mode 100644 Buildings/ThermalZones/EnergyPlus/BaseClasses/Synchronize/SynchronizeConnector.mo create mode 100644 Buildings/ThermalZones/EnergyPlus/BaseClasses/Synchronize/package.mo create mode 100644 Buildings/ThermalZones/EnergyPlus/BaseClasses/Synchronize/package.order rename Buildings/ThermalZones/EnergyPlus/BaseClasses/{FMUZoneAdapter.mo => ThermalZoneAdapter.mo} (68%) create mode 100644 Buildings/ThermalZones/EnergyPlus/BaseClasses/exchange.mo create mode 100644 Buildings/ThermalZones/EnergyPlus/BaseClasses/getParameters.mo create mode 100644 Buildings/ThermalZones/EnergyPlus/BaseClasses/initialize.mo delete mode 100644 Buildings/ThermalZones/EnergyPlus/BaseClasses/inputVariableExchange.mo delete mode 100644 Buildings/ThermalZones/EnergyPlus/BaseClasses/inputVariableInitialize.mo delete mode 100644 Buildings/ThermalZones/EnergyPlus/BaseClasses/outputVariableExchange.mo delete mode 100644 Buildings/ThermalZones/EnergyPlus/BaseClasses/outputVariableInitialize.mo delete mode 100644 Buildings/ThermalZones/EnergyPlus/BaseClasses/zoneExchange.mo delete mode 100644 Buildings/ThermalZones/EnergyPlus/BaseClasses/zoneInitialize.mo create mode 100644 Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/AirHeating.mo rename Buildings/ThermalZones/EnergyPlus/{Validation/Schedule => Examples/SingleFamilyHouse}/EquipmentSchedule.mo (65%) rename Buildings/ThermalZones/EnergyPlus/{Validation/Actuator => Examples/SingleFamilyHouse}/LightsControl.mo (88%) create mode 100644 Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/RadiantHeatingCooling.mo create mode 100644 Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/RadiantHeatingWithGroundHeatTransfer.mo rename Buildings/ThermalZones/EnergyPlus/{Validation/Actuator => Examples/SingleFamilyHouse}/ShadeControl.mo (58%) rename Buildings/ThermalZones/EnergyPlus/{Validation/ThermalZone/OneZone.mo => Examples/SingleFamilyHouse/Unconditioned.mo} (78%) create mode 100644 Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/package.mo create mode 100644 Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/package.order create mode 100644 Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/BaseClasses/IdealHeaterCooler.mo create mode 100644 Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/IdealHeatingCoolingSpring.mo create mode 100644 Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/IdealHeatingCoolingSummer.mo create mode 100644 Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/IdealHeatingCoolingWinter.mo delete mode 100644 Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/NoHVAC.mo create mode 100644 Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/Unconditioned.mo create mode 100644 Buildings/ThermalZones/EnergyPlus/OpaqueConstruction.mo delete mode 100644 Buildings/ThermalZones/EnergyPlus/Validation/Actuator/package.order create mode 100644 Buildings/ThermalZones/EnergyPlus/Validation/ThermalZone/OneZoneOneYear.mo delete mode 100644 Buildings/ThermalZones/EnergyPlus/Validation/ThermalZone/OneZoneWithControl.mo create mode 100644 Buildings/ThermalZones/EnergyPlus/Validation/ZoneSurface/OneZoneConstantFloorTemperature.mo create mode 100644 Buildings/ThermalZones/EnergyPlus/Validation/ZoneSurface/OneZoneControlledFloorTemperature.mo rename Buildings/ThermalZones/EnergyPlus/Validation/{Actuator => ZoneSurface}/package.mo (52%) create mode 100644 Buildings/ThermalZones/EnergyPlus/Validation/ZoneSurface/package.order create mode 100644 Buildings/ThermalZones/EnergyPlus/ZoneSurface.mo create mode 100644 Buildings/Utilities/Psychrometrics/hSat_pTSat.mo diff --git a/.travis.yml b/.travis.yml index 5dbd8fb5df5..858d84e9dc1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -156,4 +156,5 @@ after_failure: echo "*** Content of $ff" cat $ff echo "*** End of $ff" - done \ No newline at end of file + done + \ No newline at end of file diff --git a/Buildings/Air/Systems/SingleZone/VAV/ChillerDXHeatingEconomizer.mo b/Buildings/Air/Systems/SingleZone/VAV/ChillerDXHeatingEconomizer.mo index bc1ff5a2cf4..d325add66ae 100644 --- a/Buildings/Air/Systems/SingleZone/VAV/ChillerDXHeatingEconomizer.mo +++ b/Buildings/Air/Systems/SingleZone/VAV/ChillerDXHeatingEconomizer.mo @@ -1,6 +1,6 @@ within Buildings.Air.Systems.SingleZone.VAV; model ChillerDXHeatingEconomizer - "HVAC system model with a dry cooling coil, air-cooled chiller, electric heating coil, + "HVAC system model with a dry cooling coil, air-cooled chiller, electric heating coil, variable speed fan, and mixing box with economizer control." replaceable package MediumA = Buildings.Media.Air "Medium model for air" annotation (choicesAllMatching = true); @@ -162,7 +162,7 @@ model ChillerDXHeatingEconomizer final dp1_nominal=0, final dp2_nominal=0, final m2_flow_nominal=mAir_flow_nominal, - final Q_flow_nominal=-QCoo_flow_nominal, + final Q_flow_nominal=QCoo_flow_nominal, final configuration=Buildings.Fluid.Types.HeatExchangerConfiguration.CounterFlow, final allowFlowReversal1=false, final allowFlowReversal2=false, @@ -627,6 +627,10 @@ feedback control of damper positions. The cooling coil is a dry coil model. ", revisions="