From 7df3ecf1e85f43e8bc3f0aa8370b0366f022d5a1 Mon Sep 17 00:00:00 2001 From: jayhulbl Date: Wed, 21 Jul 2021 16:08:54 -0700 Subject: [PATCH] solved conflicts [ci skip] --- .gitignore | 1 + .travis.yml | 64 +- Buildings/.copiedFiles.txt | 45 +- .../ControllerChillerDXHeatingEconomizer.mo | 338 +- .../VAV/BaseClasses/ControllerEconomizer.mo | 197 +- .../VAV/BaseClasses/ControllerHeatingFan.mo | 104 +- .../Validation/ControllerEconomizer.mo | 25 +- .../Validation/ControllerHeatingFan.mo | 19 +- .../VAV/ChillerDXHeatingEconomizer.mo | 574 +- .../VAV/Examples/BaseClasses/InternalLoads.mo | 25 - .../Examples/BaseClasses/PartialOpenLoop.mo | 75 +- .../VAV/Examples/BaseClasses/Room.mo | 136 +- .../VAV/Examples/BaseClasses/package.order | 1 - .../Examples/ChillerDXHeatingEconomizer.mo | 75 +- .../SingleZone/VAV/Examples/Guideline36.mo | 160 +- .../BaseClasses/PowerLawResistance.mo | 9 +- .../BaseClasses/TwoWayFlowElement.mo | 11 +- .../Multizone/BaseClasses/ZonalFlow.mo | 21 +- .../Controls/CoolingTowerSpeed.mo | 6 +- .../Controls/Validation/CoolingTowerSpeed.mo | 24 - .../BaseClasses/PartialChillerWSE.mo | 4 +- .../BaseClasses/PartialControllerInterface.mo | 2 +- .../Equipment/HeatExchanger_TSet.mo | 2 +- ...oolingCoilHumidifyingHeating_ClosedLoop.mo | 3 +- .../Equipment/WatersideEconomizer.mo | 2 +- .../Examples/BaseClasses/PartialDataCenter.mo | 24 +- .../DXCooled/Controls/AirsideEconomizer.mo | 2 +- .../DXCooled/Controls/Compressor.mo | 4 +- .../Examples/DXCooledAirsideEconomizer.mo | 3 +- .../SolarGeometry/BaseClasses/SolarAzimuth.mo | 30 +- .../SolarGeometry/BaseClasses/package.order | 2 + .../BaseClasses/solarAzimuthNoEvent.mo | 32 + .../BaseClasses/solarAzimuthWithEvent.mo | 31 + .../WeatherData/BaseClasses/ConvertTime.mo | 4 +- .../BaseClasses/Examples/LimitMin.mo | 2 +- .../BaseClasses/LimiterCeilingHeight.mo | 7 +- .../LimiterHorizontalInfraredIrradiation.mo | 7 +- .../BaseClasses/LimiterWindSpeed.mo | 7 +- .../WeatherData/ReaderTMY3.mo | 10 + .../Controls/Continuous/Examples/LimPID.mo | 2 +- .../Continuous/Examples/LimPIDWithReset.mo | 1 - .../Continuous/Examples/PIDHysteresis.mo | 1 - .../Continuous/Examples/PIDHysteresisTimer.mo | 1 - Buildings/Controls/Continuous/LimPID.mo | 108 +- .../Controls/Continuous/PIDHysteresis.mo | 19 +- .../Controls/Continuous/PIDHysteresisTimer.mo | 14 +- .../G36_PR1/AHUs/MultiZone/VAV/Controller.mo | 24 +- .../MultiZone/VAV/Economizers/Controller.mo | 29 +- .../VAV/Economizers/Subsequences/Limits.mo | 24 +- .../Economizers/Subsequences/Modulation.mo | 13 - .../Validation/Enable_FreProSta.mo | 6 +- .../Validation/Enable_TOut_hOut.mo | 8 - .../Validation/Modulation_TSup.mo | 26 +- .../Validation/Controller_Disable.mo | 2 +- .../Validation/Controller_Mod_DamLim.mo | 2 +- .../MultiZone/VAV/SetPoints/ExhaustDamper.mo | 28 +- .../VAV/SetPoints/ReturnFanDirectPressure.mo | 32 +- .../AHUs/MultiZone/VAV/SetPoints/SupplyFan.mo | 42 +- .../MultiZone/VAV/SetPoints/SupplySignals.mo | 7 +- .../VAV/SetPoints/SupplyTemperature.mo | 12 +- .../G36_PR1/AHUs/SingleZone/VAV/Controller.mo | 643 +- .../AHUs/SingleZone/VAV/CoolingCoil.mo | 17 +- .../VAV/Economizers/Subsequences/Enable.mo | 8 +- .../VAV/Economizers/Subsequences/Limits.mo | 6 +- .../Economizers/Subsequences/Modulation.mo | 13 +- .../Validation/Enable_FreProSta_ZonSta.mo | 2 +- .../Validation/Enable_TOut_hOut.mo | 12 - .../Validation/Controller_Disable.mo | 4 +- .../Validation/Controller_Mod_DamLim.mo | 2 +- .../VAV/SetPoints/ModeAndSetPoints.mo | 452 + .../VAV/SetPoints/OutsideAirFlow.mo | 8 +- .../SetPoints/Validation/ModeAndSetPoints.mo | 225 + .../VAV/SetPoints/Validation/package.order | 1 + .../SingleZone/VAV/SetPoints/package.order | 1 + .../SingleZone/VAV/Validation/Controller.mo | 382 +- .../SingleZone/VAV/Validation/ZoneState.mo | 35 +- .../Generic/FreezeProtectionMixedAir.mo | 2 +- .../G36_PR1/Generic/SetPoints/GroupStatus.mo | 664 + .../Generic/SetPoints/OperationMode.mo | 965 +- .../Generic/SetPoints/TrimAndRespond.mo | 23 +- .../SetPoints/Validation/OperationMode.mo | 337 +- .../SetPoints/Validation/ZoneStatus.mo | 132 +- .../SetPoints/Validation/package.order | 1 + .../G36_PR1/Generic/SetPoints/ZoneStatus.mo | 646 +- .../G36_PR1/Generic/SetPoints/package.order | 1 + .../Validation/FreezeProtectionMixedAir.mo | 1 + .../G36_PR1/TerminalUnits/Controller.mo | 176 +- .../G36_PR1/TerminalUnits/ModeAndSetPoints.mo | 473 - .../TerminalUnits/Reheat/DamperValves.mo | 92 +- .../Reheat/SetPoints/ActiveAirFlow.mo | 7 +- .../SetPoints/Validation/ActiveAirFlow.mo | 4 - .../TerminalUnits/Reheat/SystemRequests.mo | 78 +- .../Reheat/Validation/SystemRequests.mo | 29 +- .../SetPoints/Validation/ZoneTemperatures.mo | 169 +- .../SetPoints/ZoneTemperatures.mo | 173 +- .../TerminalUnits/Validation/Controller.mo | 92 +- .../Validation/ModeAndSetPoints.mo | 158 - .../TerminalUnits/Validation/package.order | 1 - .../G36_PR1/TerminalUnits/package.order | 1 - .../Controls/OBC/ASHRAE/G36_PR1/package.mo | 4 +- Buildings/Controls/OBC/CDL/Constants.mo | 5 - .../Controls/OBC/CDL/Continuous/Greater.mo | 40 +- .../OBC/CDL/Continuous/GreaterThreshold.mo | 51 +- .../OBC/CDL/Continuous/IntegratorWithReset.mo | 105 +- Buildings/Controls/OBC/CDL/Continuous/Less.mo | 40 +- .../OBC/CDL/Continuous/LessThreshold.mo | 51 +- .../Controls/OBC/CDL/Continuous/MatrixMax.mo | 5 - .../Controls/OBC/CDL/Continuous/MatrixMin.mo | 5 - .../Controls/OBC/CDL/Continuous/MultiMax.mo | 6 - .../Controls/OBC/CDL/Continuous/MultiMin.mo | 5 - .../OBC/CDL/Continuous/SlewRateLimiter.mo | 14 - .../OBC/CDL/Continuous/Sources/Pulse.mo | 54 +- .../OBC/CDL/Continuous/Sources/TimeTable.mo | 29 +- .../OBC/CDL/Continuous/Validation/Greater.mo | 35 +- .../Continuous/Validation/GreaterThreshold.mo | 27 +- .../Validation/IntegratorWithReset.mo | 60 - .../OBC/CDL/Continuous/Validation/Less.mo | 34 +- .../Continuous/Validation/LessThreshold.mo | 27 +- ...mPIDInitialState.mo => PIDInitialState.mo} | 46 +- .../{LimPIDWithReset.mo => PIDWithReset.mo} | 136 +- .../CDL/Continuous/Validation/package.order | 18 +- .../Controls/OBC/CDL/Continuous/package.order | 11 +- .../OBC/CDL/Conversions/BooleanToInteger.mo | 26 +- .../OBC/CDL/Conversions/BooleanToReal.mo | 23 - .../Discrete/Examples/TriggeredMovingMean.mo | 9 - .../OBC/CDL/Discrete/FirstOrderHold.mo | 23 - .../Controls/OBC/CDL/Discrete/Sampler.mo | 7 - .../OBC/CDL/Discrete/TriggeredMovingMean.mo | 15 +- .../Controls/OBC/CDL/Discrete/UnitDelay.mo | 23 - .../OBC/CDL/Discrete/ZeroOrderHold.mo | 7 - .../OBC/CDL/Integers/GreaterEqualThreshold.mo | 25 +- .../OBC/CDL/Integers/GreaterThreshold.mo | 26 +- .../OBC/CDL/Integers/LessEqualThreshold.mo | 26 +- .../OBC/CDL/Integers/LessThreshold.mo | 16 +- .../Integers/Sources/Validation/package.order | 3 + .../OBC/CDL/Integers/Sources/package.order | 2 + .../OBC/CDL/Integers/Validation/Change.mo | 30 +- .../Validation/GreaterEqualThreshold.mo | 4 - .../Integers/Validation/GreaterThreshold.mo | 4 - .../Integers/Validation/LessEqualThreshold.mo | 4 - .../CDL/Integers/Validation/LessThreshold.mo | 4 - .../Controls/OBC/CDL/Logical/FallingEdge.mo | 4 - .../Controls/OBC/CDL/Logical/IntegerSwitch.mo | 13 +- Buildings/Controls/OBC/CDL/Logical/Latch.mo | 27 +- .../Controls/OBC/CDL/Logical/LogicalSwitch.mo | 13 +- .../Controls/OBC/CDL/Logical/Sources/Pulse.mo | 44 +- .../OBC/CDL/Logical/Sources/SampleTrigger.mo | 22 +- .../CDL/Logical/Sources/Validation/Pulse.mo | 32 +- .../Logical/Sources/Validation/package.order | 5 +- .../OBC/CDL/Logical/Sources/package.order | 1 + Buildings/Controls/OBC/CDL/Logical/Switch.mo | 15 +- Buildings/Controls/OBC/CDL/Logical/Timer.mo | 109 +- Buildings/Controls/OBC/CDL/Logical/Toggle.mo | 27 +- .../OBC/CDL/Logical/TriggeredTrapezoid.mo | 85 - .../OBC/CDL/Logical/Validation/And.mo | 12 - .../OBC/CDL/Logical/Validation/And3.mo | 14 - .../OBC/CDL/Logical/Validation/FallingEdge.mo | 12 +- .../OBC/CDL/Logical/Validation/Latch.mo | 149 +- .../CDL/Logical/Validation/LogicalSwitch.mo | 10 +- .../OBC/CDL/Logical/Validation/MultiAnd.mo | 20 +- .../OBC/CDL/Logical/Validation/Nand.mo | 8 +- .../OBC/CDL/Logical/Validation/Nor.mo | 8 +- .../OBC/CDL/Logical/Validation/Not.mo | 6 +- .../Controls/OBC/CDL/Logical/Validation/Or.mo | 8 +- .../OBC/CDL/Logical/Validation/Or3.mo | 10 +- .../OBC/CDL/Logical/Validation/Switch.mo | 10 +- .../OBC/CDL/Logical/Validation/Timer.mo | 78 +- .../OBC/CDL/Logical/Validation/Toggle.mo | 150 +- .../CDL/Logical/Validation/TrueFalseHold.mo | 60 - .../Logical/Validation/TrueHoldWithReset.mo | 33 - .../OBC/CDL/Logical/Validation/Xor.mo | 8 +- .../OBC/CDL/Logical/Validation/package.order | 3 + .../Controls/OBC/CDL/Logical/ZeroCrossing.mo | 11 - .../Controls/OBC/CDL/Logical/package.order | 1 + ...i_TDryBulPhi.mo => DewPoint_TDryBulPhi.mo} | 51 +- .../Psychrometrics/Validation/package.order | 6 +- .../OBC/CDL/Psychrometrics/package.order | 6 +- Buildings/Controls/OBC/CDL/Types/Reset.mo | 35 - .../Controls/OBC/CDL/Types/package.order | 1 - .../Controls/OBC/CDL/Utilities/SunRiseSet.mo | 7 - .../Validation/SunRiseSetNegativeStartTime.mo | 11 - .../Validation/SunRiseSetPositiveStartTime.mo | 11 - .../OBC/OutdoorLights/DaylightControlled.mo | 8 - Buildings/Controls/OBC/Shade/Shade_H.mo | 9 - Buildings/Controls/OBC/Shade/Shade_T.mo | 9 - .../BaseClasses/OptimalStartCalculation.mo | 175 +- .../Controls/OBC/Utilities/OptimalStart.mo | 86 +- .../SupplyReturnTemperatureReset.mo | 5 - .../OptimalStartCoolingNegativeStartTime.mo | 8 +- .../OptimalStartCoolingPositiveStartTime.mo | 8 +- .../Validation/OptimalStartHeating.mo | 9 +- .../Validation/OptimalStartHeatingCooling.mo | 21 +- .../OptimalStartNoHeatingNoCooling.mo | 41 +- .../Functions/Validation/SelectCable_low.mo | 38 + .../Functions/Validation/SelectCable_med.mo | 38 + .../Functions/Validation/package.mo | 18 + .../Functions/Validation/package.order | 2 + .../Transmission/Functions/package.order | 1 + .../Examples/ChillerSetPointControl.mo | 3 +- ...imAndRespondContinuousTimeApproximation.mo | 3 +- .../Examples/DualFanDualDuct/ClosedLoop.mo | 15 - .../Controls/Examples/package.mo | 0 .../DualFanDualDuct/Controls/FanVFD.mo | 101 - .../Controls/MixedAirTemperatureSetpoint.mo | 0 .../DualFanDualDuct/Controls/PreHeatCoil.mo | 1 - .../DualFanDualDuct/Controls/RoomMixingBox.mo | 35 +- .../DualFanDualDuct/Controls/package.mo | 0 Buildings/Examples/DualFanDualDuct/package.mo | 0 .../HydronicHeating/TwoRoomsWithStorage.mo | 4 +- Buildings/Examples/HydronicHeating/package.mo | 0 .../BuildingVAV/BaseClasses/VAVBranch.mo | 41 +- .../BuildingVAV/Examples/OneFloor_OneZone.mo | 32 - Buildings/Examples/Tutorial/Boiler/System3.mo | 2 +- Buildings/Examples/Tutorial/Boiler/System5.mo | 31 +- Buildings/Examples/Tutorial/Boiler/System6.mo | 15 +- Buildings/Examples/Tutorial/Boiler/System7.mo | 36 +- .../Tutorial/CDL/Controls/BoilerReturn.mo | 7 +- .../Tutorial/CDL/Controls/RadiatorSupply.mo | 2 +- Buildings/Examples/Tutorial/CDL/System3.mo | 4 +- Buildings/Examples/Tutorial/CDL/System6.mo | 4 +- .../Examples/Tutorial/SpaceCooling/System3.mo | 4 +- .../VAVCO2/BaseClasses/DamperControl.mo | 2 +- .../Examples/VAVCO2/BaseClasses/Occupancy.mo | 0 .../Examples/VAVCO2/BaseClasses/RoomVAV.mo | 3 +- Buildings/Examples/VAVReheat/ASHRAE2006.mo | 193 - .../VAVReheat/BaseClasses/PartialOpenLoop.mo | 55 +- .../Examples/VAVReheat/Controls/ControlBus.mo | 0 .../Controls/DuctStaticPressureSetpoint.mo | 7 +- .../Examples/VAVReheat/Controls/Economizer.mo | 168 - .../Controls/EconomizerTemperatureControl.mo | 136 - .../VAVReheat/Controls/Examples/RoomVAV.mo | 52 + .../VAVReheat/Controls/Examples/package.mo | 0 .../VAVReheat/Controls/Examples/package.order | 3 - .../Examples/VAVReheat/Controls/FanVFD.mo | 12 +- .../VAVReheat/Controls/OperationModes.mo | 0 .../VAVReheat/Controls/PreCoolingStarter.mo | 0 .../Examples/VAVReheat/Controls/RoomVAV.mo | 335 +- .../Examples/VAVReheat/Controls/State.mo | 0 .../Examples/VAVReheat/Controls/package.mo | 0 Buildings/Examples/VAVReheat/Guideline36.mo | 288 +- .../VAVReheat/ThermalZones/package.mo | 4 - Buildings/Examples/VAVReheat/package.mo | 0 Buildings/Experimental/package.mo | 6 +- .../Actuators/BaseClasses/ActuatorSignal.mo | 23 +- .../BaseClasses/Examples/package.order | 0 .../BaseClasses/PartialDamperExponential.mo | 4 +- .../BaseClasses/exponentialDamper.mo | 2 +- .../Fluid/Actuators/BaseClasses/package.order | 0 .../Actuators/Dampers/Examples/package.order | 0 .../Actuators/Dampers/PressureIndependent.mo | 167 +- .../Dampers/Validation/PressureIndependent.mo | 174 + .../Actuators/Dampers/Validation/package.mo | 18 + .../Dampers/Validation/package.order | 1 + .../Fluid/Actuators/Dampers/package.order | 1 + .../Actuators/Motors/Examples/package.order | 0 .../Fluid/Actuators/Motors/package.order | 0 .../Actuators/Valves/Examples/package.order | 0 .../Actuators/Valves/TwoWayEqualPercentage.mo | 10 +- .../Fluid/Actuators/Valves/TwoWayLinear.mo | 10 +- .../Actuators/Valves/TwoWayPolynomial.mo | 10 +- .../Valves/TwoWayPressureIndependent.mo | 10 +- .../Actuators/Valves/TwoWayQuickOpening.mo | 10 +- .../Fluid/Actuators/Valves/TwoWayTable.mo | 10 +- .../Fluid/Actuators/Valves/package.order | 0 Buildings/Fluid/Actuators/package.order | 0 .../BaseClasses/FlowModels/package.order | 0 .../Examples/BoilerPolynomialClosedLoop.mo | 1 - .../Fluid/CHPs/BaseClasses/AssertFuelFlow.mo | 88 + .../Fluid/CHPs/BaseClasses/AssertPower.mo | 126 + .../Fluid/CHPs/BaseClasses/AssertWaterFlow.mo | 89 + .../BaseClasses/AssertWaterTemperature.mo | 83 + .../Fluid/CHPs/BaseClasses/Controller.mo | 430 + .../Fluid/CHPs/BaseClasses/EfficiencyCurve.mo | 109 + .../CHPs/BaseClasses/EnergyConversion.mo | 220 + .../BaseClasses/EnergyConversionWarmUp.mo | 243 + .../CHPs/BaseClasses/EngineTemperature.mo | 116 + .../Fluid/CHPs/BaseClasses/FilterPower.mo | 124 + .../CHPs/BaseClasses/Functions/package.mo | 14 + .../CHPs/BaseClasses/Functions/package.order | 1 + .../Functions/polynomialtrivariate.mo | 73 + .../BaseClasses/Interfaces/ModeTypeInput.mo | 42 + .../BaseClasses/Interfaces/ModeTypeOutput.mo | 41 + .../CHPs/BaseClasses/Interfaces/package.mo | 11 + .../CHPs/BaseClasses/Interfaces/package.order | 2 + .../CHPs/BaseClasses/PowerConsumption.mo | 80 + .../Fluid/CHPs/BaseClasses/Types/Mode.mo | 43 + .../Fluid/CHPs/BaseClasses/Types/package.mo | 11 + .../CHPs/BaseClasses/Types/package.order | 1 + .../BaseClasses/Validation/AssertFuelFlow.mo | 42 + .../BaseClasses/Validation/AssertPower.mo | 45 + .../BaseClasses/Validation/AssertWaterFlow.mo | 46 + .../Validation/AssertWaterTemperature.mo | 42 + .../CHPs/BaseClasses/Validation/Controller.mo | 63 + .../CHPs/BaseClasses/Validation/CoolDown.mo | 122 + .../Validation/EnergyConversion.mo | 116 + .../Validation/EnergyConversionNormal.mo | 58 + .../Validation/EnergyConversionWarmUp.mo | 67 + .../Validation/EngineTemperature.mo | 75 + .../BaseClasses/Validation/FilterPower.mo | 52 + .../Validation/PowerConsumption.mo | 71 + .../CHPs/BaseClasses/Validation/StandBy.mo | 108 + .../Validation/WarmUpTemperature.mo | 127 + .../BaseClasses/Validation/WarmUpTimeDelay.mo | 107 + .../Validation/WaterFlowControl.mo | 92 + .../CHPs/BaseClasses/Validation/package.mo | 12 + .../CHPs/BaseClasses/Validation/package.order | 16 + .../Fluid/CHPs/BaseClasses/WarmUpLeaving.mo | 126 + .../CHPs/BaseClasses/WaterFlowControl.mo | 93 + Buildings/Fluid/CHPs/BaseClasses/package.mo | 11 + .../Fluid/CHPs/BaseClasses/package.order | 18 + Buildings/Fluid/CHPs/Data/Generic.mo | 104 + Buildings/Fluid/CHPs/Data/Senertech5_5kW.mo | 45 + Buildings/Fluid/CHPs/Data/ValidationData1.mo | 63 + Buildings/Fluid/CHPs/Data/ValidationData2.mo | 60 + Buildings/Fluid/CHPs/Data/ValidationData3.mo | 54 + Buildings/Fluid/CHPs/Data/package.mo | 22 + Buildings/Fluid/CHPs/Data/package.order | 5 + .../CHPs/Validation/ElectricalFollowing.mo | 232 + .../Fluid/CHPs/Validation/ThermalFollowing.mo | 279 + Buildings/Fluid/CHPs/Validation/package.mo | 12 + Buildings/Fluid/CHPs/Validation/package.order | 2 + Buildings/Fluid/CHPs/package.mo | 10 + Buildings/Fluid/CHPs/package.order | 4 + .../Fluid/Chillers/Examples/package.order | 0 .../AbsorptionIndirectSteam_EnergyPlus.mo | 40 +- Buildings/Fluid/Chillers/package.order | 0 Buildings/Fluid/Delays/Examples/package.order | 0 Buildings/Fluid/Delays/package.order | 0 Buildings/Fluid/Examples/SimpleHouse.mo | 3 +- .../Examples/ThermalZoneHVACNoExhaust.mo | 1 - .../BaseClasses/PartialBorefield.mo | 14 +- .../ActiveBeams/Examples/CoolingAndHeating.mo | 11 +- .../ActiveBeams/Examples/CoolingOnly.mo | 5 +- .../ActiveBeams/Examples/HeatingOnly.mo | 6 +- .../BaseClasses/HexElementLatent.mo | 4 +- .../BaseClasses/PartialEffectiveness.mo | 4 +- .../CoolingTowers/Examples/Merkel.mo | 15 +- .../CoolingTowers/Examples/YorkCalc.mo | 10 +- .../Validation/MerkelEnergyPlus.mo | 11 +- .../AirCooled/Examples/SpaceCooling.mo | 2 +- .../DXCoils/BaseClasses/DryWetSelector.mo | 8 +- .../DXCoils/BaseClasses/Evaporation.mo | 13 +- .../DXCoils/BaseClasses/Functions/package.mo | 0 .../DXCoils/BaseClasses/WetCoil.mo | 1 + .../Examples/BaseClasses/Heater.mo | 3 +- .../Examples/DryCoilCounterFlowPControl.mo | 3 +- .../DryCoilEffectivenessNTUPControl.mo | 1 - ...teHeatExchangerEffectivenessNTUPControl.mo | 1 - .../Examples/WetCoilCounterFlowPControl.mo | 3 +- .../Examples/WetCoilDiscretizedPControl.mo | 2 +- .../HeatExchangers/Examples/package.order | 0 .../Functions/AverageResistance.mo | 18 +- .../Radiators/Examples/package.order | 0 .../HeatExchangers/Radiators/package.order | 0 .../Validation/HeaterCooler_u.mo | 2 - .../HeatExchangers/Validation/package.order | 0 .../HeatExchangers/WetCoilCounterFlow.mo | 8 - Buildings/Fluid/HeatExchangers/package.order | 0 .../Fluid/HeatPumps/EquationFitReversible.mo | 6 +- .../Examples/EquationFitReversible.mo | 11 +- ...EquationFitReversible_CoolingClosedLoop.mo | 56 +- .../EquationFitReversible_EnergyPlus.mo | 27 +- .../Humidifiers/Examples/Humidifier_u.mo | 6 +- .../Examples/ReverseFlowHumidifier.mo | 23 +- .../Examples/ReverseFlowMassExchanger.mo | 41 +- Buildings/Fluid/Interfaces/PartialFourPort.mo | 27 +- .../StaticTwoPortConservationEquation.mo | 13 +- .../BaseClasses/PartialMixingVolume.mo | 12 +- .../Examples/MixingVolumeMoistAir.mo | 2 - .../Fluid/Movers/BaseClasses/package.order | 0 .../Fluid/Movers/Examples/ClosedLoop_y.mo | 1 - Buildings/Fluid/Movers/package.order | 0 .../BaseClasses/PartialAbsoluteSensor.mo | 23 +- .../Conversions/Examples/To_VolumeFraction.mo | 5 +- Buildings/Fluid/Sensors/Density.mo | 12 +- Buildings/Fluid/Sensors/Examples/Density.mo | 3 +- .../Fluid/Sensors/Examples/MassFraction.mo | 3 +- Buildings/Fluid/Sensors/Examples/PPM.mo | 9 +- .../Sensors/Examples/RelativeHumidity.mo | 2 +- .../Sensors/Examples/SpecificEnthalpy.mo | 3 +- .../Fluid/Sensors/Examples/SpecificEntropy.mo | 3 +- .../Fluid/Sensors/Examples/TraceSubstances.mo | 7 +- Buildings/Fluid/Sensors/MassFraction.mo | 12 +- Buildings/Fluid/Sensors/PPM.mo | 12 +- Buildings/Fluid/Sensors/Pressure.mo | 3 +- Buildings/Fluid/Sensors/RelativeHumidity.mo | 12 +- Buildings/Fluid/Sensors/SpecificEnthalpy.mo | 12 +- Buildings/Fluid/Sensors/SpecificEntropy.mo | 12 +- Buildings/Fluid/Sensors/Temperature.mo | 20 +- Buildings/Fluid/Sensors/TraceSubstances.mo | 12 +- Buildings/Fluid/Sensors/UsersGuide.mo | 64 +- .../BaseClasses/PartialSolarCollector.mo | 6 +- .../Fluid/Storage/BaseClasses/package.order | 0 .../Fluid/Storage/Examples/package.order | 0 Buildings/Fluid/Storage/package.order | 0 Buildings/Fluid/package.order | 1 + .../BaseClasses/Examples/package.mo | 0 Buildings/HeatTransfer/Convection/Exterior.mo | 26 +- .../Convection/Validation/ZeroWindSpeed.mo | 25 + .../Convection/Validation/package.mo | 20 + .../Convection/Validation/package.order | 1 + .../HeatTransfer/Convection/package.order | 1 + Buildings/HeatTransfer/Examples/package.mo | 0 .../HeatTransfer/Sources/FixedHeatFlow.mo | 1 + .../HeatTransfer/Sources/FixedTemperature.mo | 1 + .../Sources/PrescribedHeatFlow.mo | 1 + .../Sources/PrescribedTemperature.mo | 1 + Buildings/HeatTransfer/package.mo | 0 Buildings/Media/Air.mo | 85 +- .../Media/Examples/SteamDerivativeCheck.mo | 15 - Buildings/Media/Examples/SteamProperties.mo | 17 - .../Examples/SteamSaturatedProperties.mo | 88 - .../SteamTemperatureEnthalpyInversion.mo | 8 - Buildings/Media/Examples/package.order | 4 - Buildings/Media/Steam.mo | 619 - Buildings/Media/Water.mo | 60 +- Buildings/Media/package.order | 0 .../Controls/OBC/CDL/Continuous/ChangeSign.mo | 8 +- .../Controls/OBC/CDL/Continuous/Derivative.mo | 16 +- .../OBC/CDL/Continuous/GreaterEqual.mo | 14 +- .../CDL/Continuous/GreaterEqualThreshold.mo | 14 +- .../OBC/CDL/Continuous/HysteresisWithHold.mo | 18 +- .../Controls/OBC/CDL/Continuous/LessEqual.mo | 14 +- .../OBC/CDL/Continuous/LessEqualThreshold.mo | 14 +- .../Controls/OBC/CDL/Continuous/LimPID.mo | 226 +- .../OBC/CDL/Continuous/NumberOfRequests.mo | 37 +- .../CDL/Continuous/Validation/ChangeSign.mo | 10 +- .../CDL/Continuous/Validation/Derivative.mo | 12 +- .../CDL/Continuous/Validation/GreaterEqual.mo | 15 +- .../Validation/GreaterEqualThreshold.mo | 13 +- .../Validation/HysteresisWithHold.mo | 18 +- .../CDL/Continuous/Validation/LessEqual.mo | 15 +- .../Validation/LessEqualThreshold.mo | 16 +- .../OBC/CDL/Continuous/Validation/LimPID.mo | 36 +- .../LimPIDInitialDerivativeOutput.mo | 20 +- .../Validation/LimPIDInitialState.mo | 78 + .../Continuous/Validation/LimPIDWithReset.mo | 163 + .../Continuous/Validation/NumberOfRequests.mo | 22 +- .../OBC/CDL/Continuous/Validation/package.mo | 20 + .../CDL/Continuous/Validation/package.order | 12 + .../Controls/OBC/CDL/Continuous/package.mo | 13 + .../Controls/OBC/CDL/Continuous/package.order | 10 + .../Controls/OBC/CDL/Logical/Timer.mo | 154 + .../OBC/CDL/Logical/Validation/package.mo | 34 + .../OBC/CDL/Logical/Validation/package.order | 1 + .../Controls/OBC/CDL/Logical/package.mo | 33 + .../Controls/OBC/CDL/Logical/package.order | 2 + .../CDL/Psychrometrics/TDewPoi_TDryBulPhi.mo | 133 + .../CDL/Psychrometrics/TWetBul_TDryBulPhi.mo | 22 +- .../Validation/TDewPoi_TDryBulPhi.mo | 53 +- .../Validation/TWetBul_TDryBulPhi.mo | 38 +- .../Psychrometrics/Validation/h_TDryBulPhi.mo | 16 +- .../CDL/Psychrometrics/Validation/package.mo | 20 + .../Psychrometrics/Validation/package.order | 3 + .../OBC/CDL/Psychrometrics/h_TDryBulPhi.mo | 30 +- .../OBC/CDL/Psychrometrics/package.mo | 10 + .../OBC/CDL/Psychrometrics/package.order | 4 + Buildings/Obsolete/Controls/OBC/CDL/Types.mo | 70 + .../Obsolete/Controls/OBC/CDL/package.order | 4 + .../VAVReheat/BaseClasses/VAVBranch.mo | 22 +- Buildings/Obsolete/package.order | 3 - .../{python27Wrapper.c => pythonWrapper.c} | 0 .../IndirectAbsorptionChiller.idf | 2705 ---- .../IndirectAbsorptionChiller/modelica.csv | 2884 ---- .../IndirectAbsorptionChiller/run.sh | 5 - .../CoolingTower_VariableSpeed_Merkel.idf | 4 - .../energyplus_to_modelica.py | 36 - .../Validation/MerkelEnergyPlus/modelica.csv | 2883 ---- .../Validation/MerkelEnergyPlus/run.sh | 5 - .../GSHPSimple-GLHE-ReverseHeatPump.idf | 2217 --- .../energyplus_to_modelica_data.py | 36 - .../modelica.csv | 2883 ---- .../Documentation/userGuide/Makefile | 7 +- .../userGuide/build/html/.buildinfo | 2 +- .../userGuide/build/html/_images/Merkel.png | Bin 352598 -> 0 bytes .../userGuide/build/html/_images/Merkel.svg | 2146 +++ .../_images/MixingVolumeInitialization.png | Bin 14945 -> 0 bytes .../_images/MixingVolumeInitialization.svg | 1181 ++ .../build/html/_images/fanStepSchematics.png | Bin 5509 -> 0 bytes .../build/html/_images/fanStepSchematics.svg | 1063 ++ .../build/html/_images/flowCircuit.svg | 1501 ++ .../html/_images/flowCircuitNoExpansion.png | Bin 20933 -> 0 bytes .../html/_images/flowCircuitWithBoundary.png | Bin 24697 -> 0 bytes .../html/_images/flowCircuitWithBoundary.svg | 1851 +++ .../flowCircuitWithExpansionVessel.png | Bin 20311 -> 0 bytes .../html/_images/fluidJunctionMixing.png | Bin 5045 -> 0 bytes .../html/_images/fluidJunctionMixing.svg | 2044 +++ .../_images/fluidJunctionMixingSplitter.png | Bin 52480 -> 0 bytes .../_images/fluidJunctionMixingSplitter.svg | 8204 +++++++++++ .../html/_images/resistanceValveSeries.png | Bin 9148 -> 0 bytes .../html/_images/resistanceValveSeries.svg | 2016 +++ .../build/html/_images/resistancesSeries.png | Bin 7274 -> 0 bytes .../build/html/_images/resistancesSeries.svg | 1822 +++ .../build/html/_images/valveNoResistance.png | Bin 8456 -> 0 bytes .../build/html/_images/valveNoResistance.svg | 1531 +++ .../build/html/_sources/bestPractice.rst.txt | 489 +- .../build/html/_sources/development.rst.txt | 502 +- .../html/_sources/gettingStarted.rst.txt | 50 +- .../build/html/_sources/index.rst.txt | 2 +- .../build/html/_sources/legal.rst.txt | 2 +- .../build/html/_sources/workArounds.rst.txt | 162 - .../userGuide/build/html/acknowledgments.html | 29 +- .../userGuide/build/html/bestPractice.html | 465 +- .../userGuide/build/html/development.html | 511 +- .../userGuide/build/html/disclaimer.html | 29 +- .../userGuide/build/html/genindex.html | 29 +- .../userGuide/build/html/gettingStarted.html | 68 +- .../userGuide/build/html/glossary.html | 31 +- .../userGuide/build/html/help.html | 29 +- .../userGuide/build/html/index.html | 80 +- .../userGuide/build/html/legal.html | 31 +- .../userGuide/build/html/objects.inv | Bin 1077 -> 1335 bytes .../build/html/prePostProcessing.html | 33 +- .../userGuide/build/html/search.html | 29 +- .../userGuide/build/html/searchindex.js | 6 +- .../userGuide/build/html/workArounds.html | 331 - .../userGuide/source/_static/lbl-logo.png | Bin .../userGuide/source/bestPractice.rst | 489 +- .../Documentation/userGuide/source/conf.py | 2 +- .../userGuide/source/development.rst | 502 +- .../userGuide/source/gettingStarted.rst | 50 +- .../source/img/MixingVolumeInitialization.pdf | Bin 0 -> 12176 bytes .../source/img/MixingVolumeInitialization.png | Bin 14945 -> 69640 bytes .../source/img/MixingVolumeInitialization.svg | 1181 ++ .../source/img/fanStepSchematics.pdf | Bin 0 -> 13880 bytes .../source/img/fanStepSchematics.png | Bin 5509 -> 54893 bytes .../source/img/fanStepSchematics.svg | 1063 ++ .../userGuide/source/img/flowCircuit.pdf | Bin 0 -> 13965 bytes .../userGuide/source/img/flowCircuit.png | Bin 0 -> 37843 bytes .../userGuide/source/img/flowCircuit.svg | 1501 ++ .../source/img/flowCircuitWithBoundary.pdf | Bin 0 -> 16131 bytes .../source/img/flowCircuitWithBoundary.png | Bin 24697 -> 55145 bytes .../source/img/flowCircuitWithBoundary.svg | 1851 +++ .../img/flowCircuitWithExpansionVessel.png | Bin 20311 -> 0 bytes .../source/img/fluidJunctionMixing.pdf | Bin 0 -> 25769 bytes .../source/img/fluidJunctionMixing.png | Bin 5045 -> 133173 bytes .../source/img/fluidJunctionMixing.svg | 2044 +++ .../img/fluidJunctionMixingSplitter.pdf | Bin 0 -> 56227 bytes .../img/fluidJunctionMixingSplitter.png | Bin 52480 -> 729320 bytes .../img/fluidJunctionMixingSplitter.svg | 8678 +++++++++++- .../fluidJunctionMixingSplitterCorrect.png | Bin 11593 -> 0 bytes .../img/fluidJunctionMixingSplitterWrong.png | Bin 10819 -> 0 bytes .../source/img/models/ExpansionVessel.mo | 20 - .../source/img/models/FixedPressure.mo | 20 - .../source/img/models/NoPressureReference.mo | 13 - .../source/img/models/PartialFluidLoop.mo | 23 - .../userGuide/source/img/models/package.mo | 4 - .../userGuide/source/img/models/package.order | 4 - .../source/img/resistanceValveSeries.pdf | Bin 0 -> 19106 bytes .../source/img/resistanceValveSeries.png | Bin 9148 -> 98594 bytes .../source/img/resistanceValveSeries.svg | 2016 +++ .../source/img/resistancesSeries.pdf | Bin 0 -> 14027 bytes .../source/img/resistancesSeries.png | Bin 7274 -> 79028 bytes .../source/img/resistancesSeries.svg | 1822 +++ .../source/img/valveNoResistance.pdf | Bin 0 -> 18484 bytes .../source/img/valveNoResistance.png | Bin 8456 -> 95123 bytes .../source/img/valveNoResistance.svg | 1531 +++ .../Documentation/userGuide/source/index.rst | 2 +- .../Documentation/userGuide/source/legal.rst | 2 +- .../userGuide/source/modelica/FlowCircuit.mo | 44 +- .../userGuide/source/workArounds.rst | 162 - .../OperationMode/Cool-downModeDefinition.png | Bin 20614 -> 19091 bytes .../OperationMode/Cool-downModeDefinition.svg | 265 +- .../OperationMode/SetbackModeDefinition.png | Bin 11547 -> 16045 bytes .../OperationMode/SetbackModeDefinition.svg | 672 +- .../OperationMode/SetupModeDefinition.png | Bin 11102 -> 15998 bytes .../OperationMode/SetupModeDefinition.svg | 683 +- .../OperationMode/Warm-upModeDefinition.png | Bin 19852 -> 18310 bytes .../OBC/CDL/Continuous/Sources/Pulse.png | Bin 6045 -> 13714 bytes .../OBC/CDL/Continuous/Sources/Pulse.svg | 232 +- .../Images/Controls/OBC/CDL/Logical/Latch.png | Bin 97102 -> 103777 bytes .../Images/Controls/OBC/CDL/Logical/Latch.svg | 3973 +++--- .../OBC/CDL/Logical/Sources/BooleanPulse.png | Bin 6159 -> 0 bytes .../OBC/CDL/Logical/Sources/BooleanPulse.svg | 328 - .../OBC/CDL/Logical/Sources/SampleTrigger.png | Bin 5544 -> 10145 bytes .../OBC/CDL/Logical/Sources/SampleTrigger.svg | 180 +- .../Controls/OBC/CDL/Logical/Toggle.png | Bin 99263 -> 100429 bytes .../Controls/OBC/CDL/Logical/Toggle.svg | 4217 +++--- .../Logical/TrueFalseHoldImplementation.png | Bin 63321 -> 44955 bytes .../Logical/TrueFalseHoldImplementation.svg | 1975 ++- .../TrueHoldWithResetImplementation.png | Bin 26848 -> 24343 bytes .../TrueHoldWithResetImplementation.svg | 1208 +- .../Examples/VAVReheat/vavBoxDualMax.png | Bin 0 -> 31444 bytes .../Examples/VAVReheat/vavBoxDualMax.svg | 657 + .../Images/Fluid/CHPs/control_volumes.png | Bin 0 -> 21399 bytes .../Images/Fluid/CHPs/control_volumes.svg | 505 + .../Images/Fluid/Sensors/warningIcon.png | Bin 0 -> 7556 bytes .../Images/Fluid/Sensors/warningIcon.svg | 91 + .../Images/Media/Steam/numericalError.pdf | Bin 13330 -> 0 bytes .../Images/Media/Steam/numericalError.png | Bin 23849 -> 0 bytes .../OBC/CDL/Continuous/HysteresisWithHold.png | Bin .../BESTEST/FF_temperature_600FF_Jan4.pdf | Bin 24040 -> 24039 bytes .../BESTEST/FF_temperature_650FF_Jul27.pdf | Bin 23677 -> 23677 bytes .../BESTEST/FF_temperature_650FF_Jul27.png | Bin 66915 -> 66914 bytes .../BESTEST/FF_temperature_900FF_Jan4.pdf | Bin 23871 -> 23871 bytes .../BESTEST/FF_temperature_950FF_Jul27.pdf | Bin 23590 -> 23590 bytes .../Validation/BESTEST/annual_cooling.pdf | Bin 18877 -> 18878 bytes .../Validation/BESTEST/annual_heating.pdf | Bin 19186 -> 19186 bytes .../Validation/BESTEST/ave_temperature.pdf | Bin 16234 -> 16234 bytes .../BESTEST/bin_temperature_900FF.pdf | Bin 24867 -> 24869 bytes .../BESTEST/bin_temperature_900FF.png | Bin 94436 -> 94394 bytes .../BESTEST/hourly_load_600_Jan4.pdf | Bin 23765 -> 23765 bytes .../BESTEST/hourly_load_900_Jan4.pdf | Bin 23564 -> 23564 bytes .../Validation/BESTEST/max_temperature.pdf | Bin 17253 -> 17253 bytes .../Validation/BESTEST/min_temperature.pdf | Bin 16830 -> 16830 bytes .../Validation/BESTEST/peak_cooling.pdf | Bin 18174 -> 18179 bytes .../Validation/BESTEST/peak_heating.pdf | Bin 18319 -> 18319 bytes .../EnergyPlus/EnergyPlusLogo.png | Bin 0 -> 21282 bytes .../EnergyPlus/spawn_icon_alonelowres.png | Bin 0 -> 25219 bytes .../spawn_icon_darkbluetxlowres.png | Bin 0 -> 32962 bytes .../spawn_icon_darkbluetxmedres.png | Bin 0 -> 81704 bytes .../Examples/KalmanFilter.png | Bin .../IO/{Python27 => Python36}/python.png | Bin .../linux32/libModelicaBuildingsPython2.7.so | Bin 16408 -> 0 bytes .../linux64/libModelicaBuildingsPython2.7.so | Bin 17792 -> 0 bytes .../linux64/libModelicaBuildingsPython3.6.so | Bin 0 -> 17832 bytes .../Library/linux64/libfmilib_shared.so | 3 + .../win64/ModelicaBuildingsPython3.6.dll | Bin 0 -> 97792 bytes .../win64/ModelicaBuildingsPython3.6.lib | Bin 0 -> 2580 bytes .../Resources/Library/win64/fmilib_shared.lib | 3 + .../Resources/Library/win64/python3.6.dll | Bin 0 -> 80384 bytes .../Resources/Python-Sources/KalmanFilter.py | 2 +- .../Resources/Python-Sources/SimpleRoom.py | 2 +- .../Resources/Python-Sources/testFunctions.py | 4 +- .../Python-Sources/testFunctions27.py | 56 + .../Validation/ControllerEconomizer.mos | 2 +- .../SingleZone/VAV/Examples/Guideline36.mos | 4 +- .../BaseClasses/Examples/PowerLaw.mos | 2 +- .../BaseClasses/Examples/PowerLawFixedM.mos | 2 +- .../Examples/WindPressureLowRise.mos | 2 +- .../Multizone/Examples/CO2TransportStep.mos | 2 +- .../Examples/ChimneyShaftNoVolume.mos | 2 +- .../Examples/ChimneyShaftWithVolume.mos | 2 +- .../Multizone/Examples/NaturalVentilation.mos | 2 +- .../Examples/OneEffectiveAirLeakageArea.mos | 2 +- .../Multizone/Examples/OneOpenDoor.mos | 2 +- .../Airflow/Multizone/Examples/OneRoom.mos | 2 +- .../Airflow/Multizone/Examples/Orifice.mos | 2 +- .../Multizone/Examples/ReverseBuoyancy.mos | 2 +- .../Examples/ReverseBuoyancy3Zones.mos | 2 +- .../Airflow/Multizone/Examples/ZonalFlow.mos | 2 +- .../Multizone/Validation/ThreeRoomsContam.mos | 6 - .../SkyTemperature/Examples/BlackBody.mos | 2 +- .../BaseClasses/Examples/AltitudeAngle.mos | 2 +- .../BaseClasses/Examples/Declination.mos | 2 +- .../BaseClasses/Examples/IncidenceAngle.mos | 2 +- .../BaseClasses/Examples/SolarAzimuth.mos | 2 +- .../BaseClasses/Examples/SolarHourAngle.mos | 2 +- .../BaseClasses/Examples/WallSolarAzimuth.mos | 2 +- .../BaseClasses/Examples/ZenithAngle.mos | 2 +- .../SolarGeometry/Examples/IncidenceAngle.mos | 2 +- .../SolarGeometry/Examples/ZenithAngle.mos | 2 +- .../Examples/BrighteningCoefficient.mos | 2 +- .../BaseClasses/Examples/DiffuseIsotropic.mos | 2 +- .../BaseClasses/Examples/RelativeAirMass.mos | 2 +- .../BaseClasses/Examples/SkyBrightness.mos | 2 +- .../BaseClasses/Examples/SkyClearness.mos | 2 +- .../Examples/DiffuseIsotropic.mos | 2 +- .../Examples/DiffusePerez.mos | 2 +- .../Examples/CheckBlackBodySkyTemperature.mos | 2 +- .../BaseClasses/Examples/CheckPressure.mos | 2 +- .../BaseClasses/Examples/CheckTemperature.mos | 2 +- .../BaseClasses/Examples/EquationOfTime.mos | 2 +- .../BaseClasses/Examples/GetTimeSpanTMY3.mos | 14 +- .../Examples/GetTimeSpanTMY3_NonzeroStart.mos | 14 +- .../BaseClasses/Examples/LimitMin.mos | 2 + .../BaseClasses/Examples/LocalCivilTime.mos | 2 +- .../BaseClasses/Examples/SolarTime.mos | 2 +- .../WeatherData/Examples/ReaderTMY3.mos | 2 +- .../Validation/DecemberToJanuary.mos | 2 +- .../Validation/OverAYear_usingOneYearData.mos | 2 +- .../Validation/ReaderTMY3HDirNor.mos | 2 +- .../Validation/ModeAndSetPoints.mos | 6 +- .../SetPoints/Validation/GroupStatus.mos | 13 + .../SetPoints/Validation/OperationMode.mos | 12 +- .../SetPoints/Validation/ZoneStatus.mos | 8 +- .../Reheat/Validation/DamperValves.mos | 2 +- .../Reheat/Validation/SystemRequests.mos | 2 +- .../TerminalUnits/Validation/Controller.mos | 4 +- .../Validation/TimeTableNegativeStartTime.mos | 2 +- .../CDL/Continuous/Validation/ChangeSign.mos | 2 - .../OBC/CDL/Continuous/Validation/Greater.mos | 4 +- .../Validation/GreaterEqualThreshold.mos | 2 - .../Validation/GreaterThreshold.mos | 4 +- .../Validation/IntegratorWithReset.mos | 11 +- .../OBC/CDL/Continuous/Validation/Less.mos | 4 +- .../Validation/LessEqualThreshold.mos | 2 - .../Continuous/Validation/LessThreshold.mos | 4 +- .../OBC/CDL/Continuous/Validation/PID.mos | 4 + ...put.mos => PIDInitialDerivativeOutput.mos} | 2 +- ...IDInitialState.mos => PIDInitialState.mos} | 2 +- .../CDL/Continuous/Validation/PIDScale.mos | 3 + .../Continuous/Validation/PIDWithReset.mos | 5 + .../Validation/PIDWithResetScale.mos | 4 + .../CDL/Integers/Sources/Validation/Pulse.mos | 5 + .../Integers/Sources/Validation/TimeTable.mos | 4 + .../Validation/TimeTableNegativeStartTime.mos | 4 + .../Validation/GreaterEqualThreshold.mos | 2 +- .../Integers/Validation/GreaterThreshold.mos | 2 +- .../Validation/LessEqualThreshold.mos | 2 +- .../CDL/Integers/Validation/LessThreshold.mos | 2 +- .../CDL/Logical/Sources/Validation/Pulse.mos | 6 +- .../Validation/PulseNegativeStartTime.mos | 4 + .../Validation/PulsePositiveStartTime.mos | 4 + .../Logical/Sources/Validation/TimeTable.mos | 4 + .../Validation/TimeTableNegativeStartTime.mos | 4 + .../OBC/CDL/Logical/Validation/Latch.mos | 8 +- .../OBC/CDL/Logical/Validation/Timer.mos | 23 +- .../Logical/Validation/TimerAccumulating.mos | 11 + .../TimerAccumulatingNegativeStartTime.mos | 13 + .../Validation/TimerNegativeStartTime.mos | 8 + .../OBC/CDL/Logical/Validation/Toggle.mos | 9 +- .../Validation/DewPoint_TDryBulPhi.mos | 5 + ...hi.mos => SpecificEnthalpy_TDryBulPhi.mos} | 2 +- .../Validation/WetBulb_TDryBulPhi.mos | 5 + .../Controls/SetPoints/Examples/Table.mos | 2 +- .../ConvertBuildings_from_6_to_7.0.0.mos | 56 +- .../Functions/Validation/SelectCable_low.mos | 2 + .../Functions/Validation/SelectCable_med.mos | 2 + .../Examples/ChillerSetPointControl.mos | 0 .../Controls/Examples/ChillerSwitch.mos | 0 .../BaseClasses/Controls/Examples/KMinusU.mos | 0 .../Controls/Examples/LinearPiecewiseTwo.mos | 0 .../Controls/Examples/RequestCounter.mos | 0 .../Controls/Examples/TrimAndRespond.mos | 0 .../Controls/Examples/WSEControl.mos | 0 .../DataCenterDiscreteTimeControl.mos | 0 .../VAVReheat/Controls/Examples/RoomVAV.mos | 5 + .../Dymola/Examples/VAVReheat/Guideline36.mos | 25 +- .../EqualPercentageDerivativeCheck.mos | 2 +- .../Actuators/Dampers/Examples/Damper.mos | 2 +- .../Actuators/Dampers/Examples/MixingBox.mos | 2 +- .../Dampers/Examples/VAVBoxExponential.mos | 2 +- .../Validation/PressureIndependent.mos | 22 + .../Actuators/Motors/Examples/IdealMotor.mos | 2 +- .../TwoWayValvePressureIndependent.mos | 2 +- .../Valves/Examples/TwoWayValveTable.mos | 2 +- .../Valves/Examples/TwoWayValves.mos | 2 +- .../Valves/Examples/TwoWayValvesMotor.mos | 2 +- .../Valves/Examples/TwoWayValvesTable.mos | 2 +- .../ThreeWayValveParameterization.mos | 2 +- .../TwoWayValveParameterization.mos | 2 +- .../BasicFlowFunction_dp_DerivativeCheck.mos | 2 +- .../BasicFlowFunction_dp_DerivativeCheck2.mos | 2 +- ...sicFlowFunction_m_flow_DerivativeCheck.mos | 2 +- ...icFlowFunction_m_flow_DerivativeCheck2.mos | 2 +- .../Validation/InverseFlowFunctions.mos | 2 +- .../InvertingBasicFlowFunction_dp.mos | 2 +- .../InvertingBasicFlowFunction_m_flow.mos | 2 +- .../Validation/MassFlowRateMultiplier.mos | 8 +- .../BaseClasses/Validation/AssertFuelFlow.mos | 4 + .../BaseClasses/Validation/AssertPower.mos | 6 + .../Validation/AssertWaterFlow.mos | 6 + .../Validation/AssertWaterTemperature.mos | 4 + .../BaseClasses/Validation/Controller.mos | 4 + .../CHPs/BaseClasses/Validation/CoolDown.mos | 4 + .../Validation/EnergyConversion.mos | 5 + .../Validation/EnergyConversionNormal.mos | 7 + .../Validation/EnergyConversionWarmUp.mos | 7 + .../Validation/EngineTemperature.mos | 6 + .../BaseClasses/Validation/FilterPower.mos | 4 + .../Validation/PowerConsumption.mos | 5 + .../CHPs/BaseClasses/Validation/StandBy.mos | 4 + .../Validation/WarmUpTemperature.mos | 5 + .../Validation/WarmUpTimeDelay.mos | 5 + .../Validation/WaterFlowControl.mos | 8 + .../CHPs/Validation/ElectricalFollowing.mos | 18 + .../CHPs/Validation/ThermalFollowing.mos | 18 + .../Fluid/Chillers/Examples/Carnot_TEva.mos | 2 +- .../Fluid/Chillers/Examples/Carnot_y.mos | 2 +- .../Chillers/Validation/CarnotVerifyCOP.mos | 2 +- .../Validation/CarnotVerifyEtaCarnot.mos | 2 +- .../Validation/Carnot_TEva_2ndLaw.mos | 2 +- .../Carnot_TEva_HighTemperature.mos | 2 +- .../Carnot_TEva_LimitedCapacity.mos | 2 +- .../Chillers/Validation/Carnot_TEva_etaPL.mos | 2 +- .../Validation/Carnot_TEva_reverseFlow.mos | 2 +- .../Chillers/Validation/Carnot_y_etaPL.mos | 2 +- .../Fluid/Examples/FlowSystem/Simplified2.mos | 4 - .../Fluid/Examples/Performance/Example1v1.mos | 2 +- .../Fluid/Examples/Performance/Example1v2.mos | 2 +- .../Fluid/Examples/Performance/Example2.mos | 2 +- .../Fluid/Examples/Performance/Example3.mos | 2 +- .../Fluid/Examples/Performance/Example4.mos | 2 +- .../Fluid/Examples/Performance/Example5.mos | 2 +- .../Fluid/Examples/Performance/Example6.mos | 2 +- .../Fluid/Examples/Performance/Example7.mos | 2 +- .../Fluid/Examples/Performance/Example8.mos | 2 +- .../Performance/PressureDrop/ParallelDp.mos | 2 +- .../PressureDrop/ParallelDpOptimised.mos | 2 +- .../Performance/PressureDrop/ParallelFlow.mos | 2 +- .../PressureDrop/ParallelFlowOptimised.mos | 2 +- .../Performance/PressureDrop/SeriesDp.mos | 2 +- .../PressureDrop/SeriesDpOptimised.mos | 2 +- .../Performance/PressureDrop/SeriesFlow.mos | 2 +- .../PressureDrop/SeriesFlowOptimised.mos | 2 +- .../PressureDrop/SeriesParallelDp.mos | 2 +- .../SeriesParallelDpOptimised.mos | 2 +- .../PressureDrop/SeriesParallelFlow.mos | 2 +- .../SeriesParallelFlowOptimised.mos | 2 +- .../Examples/ResistanceVolumeFlowReversal.mos | 2 +- .../Examples/ThermalZoneHVACNoExhaust.mos | 2 +- .../Examples/ThermalZoneHVACWithExhaust.mos | 2 +- .../FMI/Conversion/Validation/AirToOutlet.mos | 2 +- .../Validation/AirToOutletFlowReversal.mos | 2 +- .../Validation/InletToAirDryAir.mos | 2 +- .../Validation/InletToAirDryAirCO2.mos | 2 +- .../Validation/InletToAirMoistAir.mos | 2 +- .../Validation/InletToAirMoistAirCO2.mos | 2 +- .../Fluid/FMI/Validation/FlowSplitter_u.mos | 2 +- .../Dymola/Fluid/FMI/Validation/HeaterFan.mos | 2 +- .../Validation/HeaterFanPressureDriven.mos | 2 +- .../Validation/HeaterFan_noReverseFlow.mos | 2 +- .../BaseClasses/Validation/PlugFlowCore.mos | 2 +- .../Examples/FlowJunction.mos | 2 +- .../Examples/PlugFlowPipe.mos | 2 +- .../Examples/PressureDrop.mos | 2 +- .../Validation/FlowJunctionSteadyState.mos | 2 +- .../FlowJunctionSteadyStateNoPressureDrop.mos | 2 +- .../Validation/LosslessPipe.mos | 2 +- .../PlugFlowPipes/Data/TestData.mos | 2 +- .../Validation/PlugFlowPipes/FlowReversal.mos | 2 +- .../Validation/PlugFlowPipes/MSLAIT.mos | 2 +- .../Validation/PlugFlowPipes/MSLAIT2Nodes.mos | 2 +- .../Validation/PlugFlowPipes/PlugFlowAIT.mos | 10 +- .../Validation/PlugFlowPipes/PlugFlowULg.mos | 2 +- .../PlugFlowPipes/TransportWaterAir.mos | 2 +- .../Validation/PressureDropsExplicit.mos | 2 +- .../PressureDropsExplicitLinearized.mos | 2 +- .../Validation/PressureDropsParallel.mos | 2 +- .../Examples/InternalHEXOneUTube.mos | 2 +- .../Examples/InternalHEXTwoUTube.mos | 2 +- .../Examples/InternalResistancesOneUTube.mos | 2 +- .../Examples/InternalResistancesTwoUTube.mos | 2 +- .../ConvectionResistanceCircularPipe.mos | 14 +- .../InternalResistancesOneUTube.mos | 14 +- .../InternalResistancesOneUTubeNegative.mos | 14 +- .../InternalResistancesTwoUTube.mos | 14 +- .../InternalResistancesTwoUTubeNegative.mos | 14 +- .../MultipoleThermalResistances_OneUTube.mos | 14 +- .../MultipoleThermalResistances_TwoUTube.mos | 14 +- .../Boreholes/Examples/BoreholeDynamics.mos | 2 +- .../Boreholes/Examples/BoreholeOneUTube.mos | 2 +- .../Boreholes/Examples/BoreholeTwoUTube.mos | 2 +- .../Validation/CylindricalHeatSource.mos | 8 +- .../CylindricalHeatSource_Integrand.mos | 8 +- .../Validation/FiniteLineSource.mos | 2 +- .../Validation/FiniteLineSource_Erfint.mos | 2 +- .../Validation/FiniteLineSource_Integrand.mos | 2 +- .../FiniteLineSource_Integrand_Length.mos | 2 +- .../Validation/GFunction_100boreholes.mos | 8 +- .../GFunction_1borehole_5meters.mos | 8 +- .../GFunction_SmallScaleValidation.mos | 8 +- .../Validation/InfiniteLineSource.mos | 8 +- .../Validation/TimeGeometric.mos | 8 +- .../HeatTransfer/Validation/Cylindrical.mos | 8 +- .../BaseClasses/Examples/Convector.mos | 2 +- .../Examples/DerivateCubicSpline.mos | 2 +- .../Examples/ModificationFactor.mos | 2 +- .../Examples/CoolingAndHeating.mos | 2 +- .../ActiveBeams/Examples/CoolingOnly.mos | 2 +- .../ActiveBeams/Examples/HeatingOnly.mos | 2 +- .../ActiveBeams/Validation/NumberOfBeams.mos | 2 +- .../Validation/NumberOfBeamsDynamics.mos | 2 +- .../BaseClasses/Examples/HACoilInside.mos | 2 +- .../BaseClasses/Examples/HADryCoil.mos | 2 +- .../Examples/HANaturalCylinder.mos | 2 +- .../HeatExchangers/Examples/AirHeater_T.mos | 2 +- .../HeatExchangers/Examples/AirHeater_u.mos | 2 +- .../DryCoilEffectivenessNTUMassFlow.mos | 2 +- .../DryCoilEffectivenessNTUPControl.mos | 2 +- .../HeatExchangers/Examples/WaterCooler_T.mos | 2 +- .../HeatExchangers/Examples/WaterHeater_T.mos | 2 +- .../HeatExchangers/Examples/WaterHeater_u.mos | 2 +- .../Radiators/Examples/RadiatorEN442_2.mos | 2 +- .../Validation/ConstantEffectiveness.mos | 2 +- .../Validation/EvaporatorCondenser.mos | 2 +- .../Validation/HeaterCooler_u.mos | 2 +- .../Validation/PrescribedOutlet.mos | 2 +- .../Validation/PrescribedOutlet_dynamic.mos | 2 +- .../Calibration/ScrollWaterToWater.mos | 2 +- .../Validation/TemperatureProtection.mos | 2 +- .../Validation/ReciprocatingCompressor.mos | 2 +- .../ReciprocatingCompressor_ZeroInput.mos | 2 +- .../Validation/ScrollCompressor.mos | 2 +- .../Validation/ScrollCompressor_ZeroInput.mos | 2 +- .../Fluid/HeatPumps/Examples/Carnot_TCon.mos | 2 +- .../Fluid/HeatPumps/Examples/Carnot_y.mos | 2 +- ...quationFitReversible_CoolingClosedLoop.mos | 13 +- .../ScrollWaterToWater_OneRoomRadiator.mos | 2 +- .../Carnot_TCon_LimitedCapacity.mos | 2 +- .../Validation/Carnot_TCon_LowTemperature.mos | 2 +- .../Validation/Carnot_TCon_etaPL.mos | 2 +- .../Validation/Carnot_TCon_reverseFlow.mos | 2 +- .../HeatPumps/Validation/Carnot_y_etaCar.mos | 2 +- .../HeatPumps/Validation/Carnot_y_etaPL.mos | 2 +- .../ReciprocatingWaterToWater_Dynamic.mos | 2 +- ...eciprocatingWaterToWater_ScalingFactor.mos | 2 +- .../ReciprocatingWaterToWater_Static.mos | 2 +- ...eciprocatingWaterToWater_VariableSpeed.mos | 2 +- .../Validation/ScrollWaterToWater_Dynamic.mos | 2 +- .../ScrollWaterToWater_ScalingFactor.mos | 2 +- .../Validation/ScrollWaterToWater_Static.mos | 2 +- ...rollWaterToWater_TemperatureProtection.mos | 2 +- .../ScrollWaterToWater_VariableSpeed.mos | 2 +- .../Humidifiers/Examples/Humidifier_u.mos | 2 +- .../Validation/SprayAirWasher_X.mos | 2 +- .../Validation/SprayAirWasher_X_dynamic.mos | 2 +- .../Validation/SteamHumidifier_X.mos | 2 +- .../Validation/SteamHumidifier_X_dynamic.mos | 2 +- .../Examples/ConservationEquation.mos | 2 +- .../Examples/EightPortHeatMassExchanger.mos | 2 +- .../Examples/FourPortHeatMassExchanger.mos | 2 +- .../Interfaces/Examples/HeaterCooler_u.mos | 2 +- .../Interfaces/Examples/Humidifier_u.mos | 4 - .../Interfaces/Examples/PrescribedOutlet.mos | 2 +- .../Examples/PrescribedOutlet_TSetOnly.mos | 2 +- .../Examples/PrescribedOutlet_Water.mos | 2 +- .../Examples/PrescribedOutlet_X_wSetOnly.mos | 2 +- .../Examples/ReverseFlowHumidifier.mos | 2 +- .../Examples/ReverseFlowMassExchanger.mos | 2 +- .../Examples/ConstantEffectiveness.mos | 2 +- .../ConstantEffectivenessZeroFlow.mos | 2 +- ...nstantEffectivenessZeroFlowBothStreams.mos | 2 +- .../MixingVolumeHeatMoisturePort.mos | 2 +- .../Validation/MixingVolumeHeatPortAir.mos | 2 +- .../Validation/MixingVolumeHeatPortWater.mos | 2 +- .../Examples/MixingVolumeHeatConduction.mos | 2 +- .../MixingVolumePrescribedHeatFlowRate.mos | 2 +- .../MixingVolumeAdiabaticCooling.mos | 2 +- .../MixingVolumeHeatReverseFlow.mos | 2 +- ...eHeatReverseFlowPrescribedHeatFlowRate.mos | 2 +- .../Validation/MixingVolumeInitialization.mos | 2 +- .../Validation/MixingVolumeMFactor.mos | 2 +- .../Validation/MixingVolumeMassFlow.mos | 2 +- .../MixingVolumeMoistureReverseFlow.mos | 2 +- ...stureReverseFlowPrescribedHeatFlowRate.mos | 2 +- .../MixingVolumeSteadyStateMass.mos | 2 +- .../Validation/MixingVolumeTraceSubstance.mos | 2 +- .../MixingVolumeTraceSubstanceReverseFlow.mos | 2 +- ...tanceReverseFlowPrescribedHeatFlowRate.mos | 2 +- .../Validation/MixingVolumeZeroFlow.mos | 2 +- .../Validation/FlowMachineInterface.mos | 2 +- .../BaseClasses/Validation/PowerInterface.mos | 2 +- .../Fluid/Movers/Examples/ClosedLoop_y.mos | 2 +- .../Fluid/Movers/Examples/MoverContinuous.mos | 2 +- .../Fluid/Movers/Examples/MoverParameter.mos | 2 +- .../Fluid/Movers/Examples/MoverStages.mos | 2 +- .../Fluid/Movers/Examples/PumpsParallel.mos | 2 +- .../Fluid/Movers/Examples/PumpsSeries.mos | 2 +- .../Examples/SpeedControlled_y_pumpCurves.mos | 2 +- .../Validation/ControlledFlowMachine.mos | 2 +- .../ControlledFlowMachineDynamic.mos | 2 +- .../Movers/Validation/FlowControlled_dp.mos | 2 +- .../Validation/FlowControlled_dpSystem.mos | 2 +- .../Validation/FlowControlled_m_flow.mos | 2 +- .../Fluid/Movers/Validation/PowerExact.mos | 2 +- .../Movers/Validation/PowerSimplified.mos | 2 +- .../Validation/PumpCurveConstruction.mos | 2 +- .../Validation/PumpCurveDerivatives.mos | 2 +- .../Movers/Validation/Pump_Nrpm_stratos.mos | 2 +- .../Fluid/Movers/Validation/Pump_stratos.mos | 2 +- .../Validation/SpeedControlled_Nrpm.mos | 2 +- .../Movers/Validation/SpeedControlled_y.mos | 2 +- .../Validation/SpeedControlled_y_linear.mos | 2 +- .../Examples/To_VolumeFraction.mos | 2 +- .../Dymola/Fluid/Sensors/Examples/Density.mos | 2 +- .../Sensors/Examples/EnthalpyFlowRate.mos | 2 +- .../Sensors/Examples/EntropyFlowRate.mos | 2 +- .../Fluid/Sensors/Examples/MassFraction.mos | 2 +- .../Examples/MoistAirEnthalpyFlowRate.mos | 2 +- .../Dymola/Fluid/Sensors/Examples/PPM.mos | 2 +- .../Fluid/Sensors/Examples/Pressure.mos | 2 +- .../Sensors/Examples/RelativeHumidity.mos | 2 +- .../Sensors/Examples/SpecificEnthalpy.mos | 2 +- .../Sensors/Examples/SpecificEntropy.mos | 2 +- .../Sensors/Examples/TemperatureDryBulb.mos | 2 +- .../Sensors/Examples/TemperatureWetBulb.mos | 2 +- .../Sensors/Examples/TraceSubstances.mos | 2 +- .../Fluid/Sensors/Examples/Velocity.mos | 2 +- .../Fluid/Sensors/Examples/VolumeFlowRate.mos | 2 +- .../Examples/MassFlowSource_WeatherData.mos | 2 +- .../Dymola/Fluid/Sources/Examples/Outside.mos | 2 +- .../Sources/Examples/Outside_CpLowRise.mos | 2 +- .../Examples/TraceSubstancesFlowSource.mos | 2 +- .../Examples/IndirectTankHeatExchanger.mos | 2 +- .../Storage/Examples/ExpansionVessel.mos | 2 +- .../Fluid/Storage/Examples/Stratified.mos | 26 +- .../StratifiedEnhancedInternalHex.mos | 2 +- .../Validation/HeatExchangerDynamics.mos | 2 +- .../Validation/HeatExchangerLocation.mos | 2 +- .../Validation/StratifiedLoadingUnloading.mos | 2 +- .../StratifiedNonUniformInitial.mos | 2 +- .../Convection/Validation/ZeroWindSpeed.mos | 3 + .../Validation/PropyleneGlycolWater.mos | 2 +- .../Media/Examples/AirDerivativeCheck.mos | 2 +- .../Dymola/Media/Examples/AirProperties.mos | 2 +- .../AirTemperatureEnthalpyInversion.mos | 2 +- .../PropyleneGlycolWaterDerivativeCheck.mos | 2 +- .../PropyleneGlycolWaterProperties.mos | 2 +- ...lycolWaterTemperatureEnthalpyInversion.mos | 2 +- .../Dymola/Media/Examples/SteamProperties.mos | 70 - .../Examples/SteamSaturatedProperties.mos | 55 - .../Media/Examples/WaterDerivativeCheck.mos | 2 +- .../Dymola/Media/Examples/WaterProperties.mos | 2 +- .../WaterTemperatureEnthalpyInversion.mos | 2 +- .../R410A_dSpecificVolumeVap_pT.mos | 2 +- .../Examples/PerfectGasDerivativeCheck.mos | 2 +- ...PerfectGasTemperatureEnthalpyInversion.mos | 2 +- ...eratureDependentDensityDerivativeCheck.mos | 2 +- .../TemperatureDependentDensityProperties.mos | 2 +- ...entDensityTemperatureEnthalpyInversion.mos | 2 +- .../Water/Examples/WaterProperties_pT.mos | 2 +- .../CDL/Continuous/Validation/ChangeSign.mos | 2 + .../CDL/Continuous/Validation/Derivative.mos | 2 +- .../Continuous/Validation/GreaterEqual.mos | 2 +- .../Validation/GreaterEqualThreshold.mos | 2 + .../Validation/HysteresisWithHold.mos | 2 +- .../CDL/Continuous/Validation/LessEqual.mos | 2 +- .../Validation/LessEqualThreshold.mos | 2 + .../OBC/CDL/Continuous/Validation/LimPID.mos | 2 +- .../LimPIDInitialDerivativeOutput.mos | 2 + .../Validation/LimPIDInitialState.mos | 2 + .../Continuous/Validation/LimPIDWithReset.mos | 2 +- .../Validation/NumberOfRequests.mos | 2 +- .../OBC/CDL/Logical/Validation/Timer.mos | 15 + .../Validation/TDewPoi_TDryBulPhi.mos | 2 +- .../Validation/TWetBul_TDryBulPhi.mos | 2 +- .../Validation/h_TDryBulPhi.mos | 3 + .../Comfort/Validation/FangerCBE.mos | 3 + .../Cryptographics/Validation/SHA1.mos | 2 +- .../Diagnostics/Validation/CheckEquality.mos | 2 +- .../Utilities/IO/Files/Examples/CSVReader.mos | 2 +- .../Utilities/IO/Files/Examples/CSVWriter.mos | 2 +- .../Examples/KalmanFilter.mos | 2 +- .../Examples/SimpleRoom.mos | 2 +- .../Functions/Examples/Exchange.mos | 2 +- .../Examples/ExchangeWithPassPythonObject.mos | 2 +- .../IO/SignalExchange/Examples/FirstOrder.mos | 2 +- .../Utilities/Math/Examples/Average.mos | 2 +- .../Utilities/Math/Examples/BesselJ0.mos | 2 +- .../Utilities/Math/Examples/BesselJ1.mos | 2 +- .../Utilities/Math/Examples/BesselY0.mos | 2 +- .../Utilities/Math/Examples/BesselY1.mos | 2 +- .../Utilities/Math/Examples/Bicubic.mos | 2 +- .../Utilities/Math/Examples/Binomial.mos | 2 +- .../Utilities/Math/Examples/Biquadratic.mos | 2 +- .../Math/Examples/BooleanReplicator.mos | 2 +- .../Math/Examples/ExponentialIntegralE1.mos | 2 +- .../Utilities/Math/Examples/Factorial.mos | 2 +- .../Math/Examples/FallingFactorial.mos | 2 +- .../Math/Examples/IntegerReplicator.mos | 2 +- .../Math/Examples/IntegratorWithReset.mos | 2 +- .../Math/Examples/InverseXRegularized.mos | 2 +- .../Utilities/Math/Examples/Polynominal.mos | 2 +- .../Math/Examples/PowerLinearized.mos | 2 +- .../Math/Examples/QuadraticLinear.mos | 2 +- .../Math/Examples/RegNonZeroPower.mos | 2 +- .../Utilities/Math/Examples/SmoothBlocks.mos | 2 +- .../Math/Examples/SmoothExponential.mos | 2 +- .../Math/Examples/SmoothHeaviside.mos | 2 +- .../Utilities/Math/Examples/SmoothLimit.mos | 2 +- .../Utilities/Math/Examples/SmoothMin.mos | 2 +- .../Dymola/Utilities/Math/Examples/Splice.mos | 2 +- .../Math/Examples/VectorFunctions.mos | 2 +- .../Math/Functions/Examples/BesselJ0.mos | 2 +- .../Math/Functions/Examples/BesselJ1.mos | 2 +- .../Math/Functions/Examples/BesselY0.mos | 2 +- .../Math/Functions/Examples/BesselY1.mos | 2 +- .../Math/Functions/Examples/Binomial.mos | 2 +- .../Examples/ExponentialIntegralE1.mos | 2 +- .../Math/Functions/Examples/Factorial.mos | 2 +- .../Functions/Examples/FallingFactorial.mos | 2 +- .../Examples/InverseXDerivativeCheck.mos | 2 +- .../Examples/InverseXDerivative_2_Check.mos | 2 +- .../Examples/InverseXRegularized.mos | 2 +- .../Math/Functions/Examples/IsMonotonic.mos | 2 +- .../Math/Functions/Examples/Polynomial.mos | 2 +- .../Functions/Examples/PowerLinearized.mos | 2 +- .../Functions/Examples/QuinticHermite.mos | 2 +- .../Functions/Examples/RegNonZeroPower.mos | 2 +- .../RegNonZeroPowerDerivativeCheck.mos | 2 +- .../RegNonZeroPowerDerivative_2_Check.mos | 2 +- .../Math/Functions/Examples/RegStep.mos | 2 +- .../Math/Functions/Examples/Round.mos | 2 + .../SmoothExponentialDerivativeCheck.mos | 2 +- .../Functions/Examples/SpliceFunction.mos | 2 +- .../SpliceFunctionDerivativeCheck.mos | 2 +- .../Examples/TrapezoidalIntegration.mos | 2 +- .../Psychrometrics/Examples/Density_pTX.mos | 2 +- .../Examples/DewPointTemperature.mos | 2 +- .../Examples/HumidityRatioPressure.mos | 2 +- .../Examples/MassFraction_pTphi.mos | 2 +- .../Psychrometrics/Examples/Phi_pTX.mos | 2 +- .../Examples/SaturationPressure.mos | 2 +- .../Examples/SaturationPressureLiquid.mos | 2 +- .../Examples/SublimationPressureIce.mos | 2 +- .../Examples/TWetBul_TDryBulPhi.mos | 2 +- .../Examples/TWetBul_TDryBulXi.mos | 2 +- .../Examples/TotalAirDryAir.mos | 2 +- .../DewPointTemperatureDerivativeCheck.mos | 2 +- ...DewPointTemperatureDerivativeCheck_amb.mos | 2 +- ...DewPointTemperatureDerivativeCheck_amb.mos | 2 +- .../SaturationPressureDerivativeCheck.mos | 2 +- .../WaterVaporPressureDerivativeCheck.mos | 2 +- .../Functions/Examples/Density_pTX.mos | 2 +- .../Functions/Examples/SaturationPressure.mos | 2 +- .../Functions/Examples/X_pSatpphi.mos | 2 +- .../Functions/Examples/pW_TDewPoi.mos | 2 +- .../Examples/pW_TDewPoi_comparison.mos | 2 +- .../Functions/Examples/pW_X.mos | 2 +- .../Functions/Examples/phi_pTX.mos | 2 +- .../Utilities/Time/Examples/CalendarTime.mos | 2 +- .../Utilities/Time/Examples/ModelTime.mos | 2 +- .../Time/Validation/CalendarTimeMonths.mos | 2 +- .../Validation/CalendarTimeMonthsMinus.mos | 2 +- .../Validation/CalendarTimeMonthsPlus.mos | 2 +- ...lasses.Validation.ControllerEconomizer.mos | 3 +- ...ms.SingleZone.VAV.Examples.Guideline36.mos | 12 +- ...therData.BaseClasses.Examples.LimitMin.mos | 5 + ...SetPoints.Validation.ModeAndSetPoints.mos} | 6 +- ...neric.SetPoints.Validation.GroupStatus.mos | 34 + ...ric.SetPoints.Validation.OperationMode.mos | 13 +- ...eneric.SetPoints.Validation.ZoneStatus.mos | 30 +- ...alUnits.Reheat.Validation.DamperValves.mos | 1 - ...Units.Reheat.Validation.SystemRequests.mos | 2 +- ...R1.TerminalUnits.Validation.Controller.mos | 2 - ....OBC.CDL.Continuous.Validation.Greater.mos | 7 +- ...Continuous.Validation.GreaterThreshold.mos | 6 +- ...tinuous.Validation.IntegratorWithReset.mos | 11 +- ...ols.OBC.CDL.Continuous.Validation.Less.mos | 7 +- ...DL.Continuous.Validation.LessThreshold.mos | 6 +- ...rols.OBC.CDL.Continuous.Validation.PID.mos | 11 + ...Validation.PIDInitialDerivativeOutput.mos} | 0 ...Continuous.Validation.PIDInitialState.mos} | 0 ...OBC.CDL.Continuous.Validation.PIDScale.mos | 8 + ...DL.Continuous.Validation.PIDWithReset.mos} | 0 ...ontinuous.Validation.PIDWithResetScale.mos | 9 + ....CDL.Integers.Sources.Validation.Pulse.mos | 7 + ....Integers.Sources.Validation.TimeTable.mos | 8 + ....Validation.TimeTableNegativeStartTime.mos | 8 + ...egers.Validation.GreaterEqualThreshold.mos | 2 +- ...L.Integers.Validation.GreaterThreshold.mos | 2 +- ...Integers.Validation.LessEqualThreshold.mos | 2 +- ....CDL.Integers.Validation.LessThreshold.mos | 2 +- ...C.CDL.Logical.Sources.Validation.Pulse.mos | 16 +- ...rces.Validation.PulseNegativeStartTime.mos | 18 + ...rces.Validation.PulsePositiveStartTime.mos | 18 + ...L.Logical.Sources.Validation.TimeTable.mos | 9 + ....Validation.TimeTableNegativeStartTime.mos | 9 + ...trols.OBC.CDL.Logical.Validation.Latch.mos | 24 +- ...trols.OBC.CDL.Logical.Validation.Timer.mos | 26 +- ...L.Logical.Validation.TimerAccumulating.mos | 17 + ...ion.TimerAccumulatingNegativeStartTime.mos | 19 + ...ical.Validation.TimerNegativeStartTime.mos | 11 + ...rols.OBC.CDL.Logical.Validation.Toggle.mos | 24 +- ...etrics.Validation.DewPoint_TDryBulPhi.mos} | 0 ...alidation.SpecificEnthalpy_TDryBulPhi.mos} | 0 ...metrics.Validation.WetBulb_TDryBulPhi.mos} | 0 ...n.Functions.Validation.SelectCable_low.mos | 10 + ...n.Functions.Validation.SelectCable_med.mos | 10 + ...es.VAVReheat.Controls.Examples.RoomVAV.mos | 10 + ...ildings.Examples.VAVReheat.Guideline36.mos | 11 - ...Dampers.Validation.PressureIndependent.mos | 8 + ....BaseClasses.Validation.AssertFuelFlow.mos | 5 + ...HPs.BaseClasses.Validation.AssertPower.mos | 8 + ...BaseClasses.Validation.AssertWaterFlow.mos | 7 + ...sses.Validation.AssertWaterTemperature.mos | 6 + ...CHPs.BaseClasses.Validation.Controller.mos | 7 + ...d.CHPs.BaseClasses.Validation.CoolDown.mos | 6 + ...aseClasses.Validation.EnergyConversion.mos | 11 + ...sses.Validation.EnergyConversionNormal.mos | 9 + ...sses.Validation.EnergyConversionWarmUp.mos | 11 + ...seClasses.Validation.EngineTemperature.mos | 8 + ...HPs.BaseClasses.Validation.FilterPower.mos | 7 + ...aseClasses.Validation.PowerConsumption.mos | 5 + ...id.CHPs.BaseClasses.Validation.StandBy.mos | 6 + ...seClasses.Validation.WarmUpTemperature.mos | 9 + ...BaseClasses.Validation.WarmUpTimeDelay.mos | 8 + ...aseClasses.Validation.WaterFlowControl.mos | 7 + ...id.CHPs.Validation.ElectricalFollowing.mos | 20 + ...Fluid.CHPs.Validation.ThermalFollowing.mos | 28 + ...quationFitReversible_CoolingClosedLoop.mos | 1 + ...ings.Fluid.Storage.Examples.Stratified.mos | 22 +- ...er.Convection.Validation.ZeroWindSpeed.mos | 8 + ...ildings.Media.Examples.SteamProperties.mos | 6 - ...edia.Examples.SteamSaturatedProperties.mos | 12 - ...les.SteamTemperatureEnthalpyInversion.mos} | 0 ...eamTemperatureEnthalpyInversion.mos~master | 5 - ....CDL.Continuous.Validation.ChangeSign.mos} | 0 ....CDL.Continuous.Validation.Derivative.mos} | 0 ...DL.Continuous.Validation.GreaterEqual.mos} | 0 ...uous.Validation.GreaterEqualThreshold.mos} | 0 ...tinuous.Validation.HysteresisWithHold.mos} | 0 ...C.CDL.Continuous.Validation.LessEqual.mos} | 0 ...tinuous.Validation.LessEqualThreshold.mos} | 0 ....OBC.CDL.Continuous.Validation.LimPID.mos} | 0 ...lidation.LimPIDInitialDerivativeOutput.mos | 7 + ...ntinuous.Validation.LimPIDInitialState.mos | 7 + ....Continuous.Validation.LimPIDWithReset.mos | 15 + ...ontinuous.Validation.NumberOfRequests.mos} | 0 ...trols.OBC.CDL.Logical.Validation.Timer.mos | 17 + ...ometrics.Validation.TDewPoi_TDryBulPhi.mos | 9 + ...ometrics.Validation.TWetBul_TDryBulPhi.mos | 11 + ...Psychrometrics.Validation.h_TDryBulPhi.mos | 5 + ...es.FFD.Tutorial.MixedConvectionWithBox.mos | 8 - ...etailed.Examples.ISAT.ForcedConvection.mos | 5 - ....ISAT.ForcedConvectionWithExteriorWall.mos | 5 - ...Examples.ISAT.Tutorial.MixedConvection.mos | 5 - ...s.ISAT.Tutorial.MixedConvectionWithBox.mos | 5 - ...amples.ISAT.Tutorial.NaturalConvection.mos | 5 - ...lasses.Validation.FMUZoneAdapterZones1.mos | 5 + ...lasses.Validation.FMUZoneAdapterZones2.mos | 7 + ...lasses.Validation.FMUZoneAdapterZones3.mos | 9 + ...ltipleBuildings.ThreeZonesTwoBuildings.mos | 6 + ...Buildings.TwoIdenticalOneZoneBuildings.mos | 5 + ...Buildings.TwoIdenticalTwoZoneBuildings.mos | 9 + ...utputVariable.OneZoneOneOutputVariable.mos | 5 + ...ariable.OneZoneOneOutputVariableSummer.mos | 5 + ...ble.OneZoneTwoDifferentOutputVariables.mos | 6 + ...ble.OneZoneTwoIdenticalOutputVariables.mos | 6 + ...hedule.EquipmentScheduleOutputVariable.mos | 6 + ...us.Validation.ThermalZone.InternalGain.mos | 19 + ...ne.OneZoneCompareZoneTemperatureOutput.mos | 5 + ...idation.ThermalZone.RefBldgSmallOffice.mos | 17 + ...rmalZone.ZoneTemperatureInitialization.mos | 6 + ...s.SimpleRoomFourElementsTraceSubstance.mos | 5 + ...Utilities.Comfort.Validation.FangerCBE.mos | 5 + ...ies.IO.Python36.Examples.KalmanFilter.mos} | 0 ...ities.IO.Python36.Examples.SimpleRoom.mos} | 0 ....Python36.Functions.Examples.Exchange.mos} | 0 ...Examples.ExchangeWithPassPythonObject.mos} | 0 ...tilities.Math.Functions.Examples.Round.mos | 8 + Buildings/Resources/Scripts/travis/Makefile | 54 +- .../Resources/Scripts/travis/dymola/dymola | 10 +- .../Scripts/travis/jmodelica/jm_ipython.sh | 0 .../Scripts/travis/omc/testOpenModelica.sh | 64 + .../Scripts/travis/optimica/jm_ipython.sh | 0 .../Resources/bin/ConvertWeatherData.jar | Bin 8481 -> 8850 bytes .../EnergyPlus/C-Sources/cryptographicsHash.c | 317 + .../ThermalZones/EnergyPlus/FMUs/README.md | 12 + .../ThermalZones/EnergyPlus/FMUs/RoomModel.mo | 125 + .../ThermalZones/EnergyPlus/FMUs/Zones1.mo | 53 + .../ThermalZones/EnergyPlus/FMUs/Zones3.mo | 134 + .../ThermalZones/EnergyPlus/FMUs/jmodelica.py | 41 + .../convertEPW/doc/ConvertWeatherData.html | 625 +- .../src/convertEPW/doc/allclasses-frame.html | 31 - .../convertEPW/doc/allclasses-noframe.html | 31 - .../src/convertEPW/doc/constant-values.html | 244 +- .../src/convertEPW/doc/deprecated-list.html | 242 +- .../Resources/src/convertEPW/doc/element-list | 1 + .../src/convertEPW/doc/help-doc.html | 429 +- .../src/convertEPW/doc/index-all.html | 307 +- .../Resources/src/convertEPW/doc/index.html | 39 - .../images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 0 -> 335 bytes .../images/ui-bg_glass_65_dadada_1x400.png | Bin 0 -> 262 bytes .../images/ui-bg_glass_75_dadada_1x400.png | Bin 0 -> 262 bytes .../images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 0 -> 262 bytes .../images/ui-bg_glass_95_fef1ec_1x400.png | Bin 0 -> 332 bytes .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 0 -> 280 bytes .../jquery/images/ui-icons_222222_256x240.png | Bin 0 -> 6922 bytes .../jquery/images/ui-icons_2e83ff_256x240.png | Bin 0 -> 4549 bytes .../jquery/images/ui-icons_454545_256x240.png | Bin 0 -> 6992 bytes .../jquery/images/ui-icons_888888_256x240.png | Bin 0 -> 6999 bytes .../jquery/images/ui-icons_cd0a0a_256x240.png | Bin 0 -> 4549 bytes .../src/convertEPW/doc/jquery/jquery-3.3.1.js | 10364 ++++++++++++++ .../doc/jquery/jquery-migrate-3.0.1.js | 628 + .../src/convertEPW/doc/jquery/jquery-ui.css | 582 + .../src/convertEPW/doc/jquery/jquery-ui.js | 2659 ++++ .../convertEPW/doc/jquery/jquery-ui.min.css | 7 + .../convertEPW/doc/jquery/jquery-ui.min.js | 6 + .../doc/jquery/jquery-ui.structure.css | 156 + .../doc/jquery/jquery-ui.structure.min.css | 5 + .../jquery/jszip-utils/dist/jszip-utils-ie.js | 56 + .../jszip-utils/dist/jszip-utils-ie.min.js | 10 + .../jquery/jszip-utils/dist/jszip-utils.js | 118 + .../jszip-utils/dist/jszip-utils.min.js | 10 + .../convertEPW/doc/jquery/jszip/dist/jszip.js | 11367 ++++++++++++++++ .../doc/jquery/jszip/dist/jszip.min.js | 13 + .../src/convertEPW/doc/overview-tree.html | 256 +- .../src/convertEPW/doc/package-frame.html | 32 - .../Resources/src/convertEPW/doc/package-list | 1 - .../convertEPW/doc/package-search-index.js | 1 + .../src/convertEPW/doc/package-summary.html | 254 +- .../src/convertEPW/doc/package-tree.html | 257 +- .../src/convertEPW/doc/resources/glass.png | Bin 0 -> 499 bytes .../src/convertEPW/doc/resources/x.png | Bin 0 -> 394 bytes .../Resources/src/convertEPW/doc/script.js | 149 + .../Resources/src/convertEPW/doc/search.js | 326 + .../src/convertEPW/doc/stylesheet.css | 920 +- .../src/convertEPW/doc/type-search-index.js | 1 + .../convertEPW/src/ConvertWeatherData.java | 2 + .../Resources/src/fmi-library/CMakeLists.txt | 148 + .../doc/FMILIB_Acknowledgements.txt | 31 + .../src/fmi-library/doc/FMILIB_License.txt | 32 + .../src/fmi-library/doc/FMILIB_Readme.txt | 267 + .../include/FMI/fmi_import_context.h | 136 + .../fmi-library/include/FMI/fmi_import_util.h | 73 + .../src/fmi-library/include/FMI/fmi_util.h | 54 + .../src/fmi-library/include/FMI/fmi_version.h | 52 + .../src/fmi-library/include/FMI1/fmi1_enums.h | 114 + .../fmi-library/include/FMI1/fmi1_functions.h | 136 + .../fmi-library/include/FMI1/fmi1_import.h | 259 + .../include/FMI1/fmi1_import_capabilities.h | 70 + .../include/FMI1/fmi1_import_capi.h | 507 + .../include/FMI1/fmi1_import_convenience.h | 142 + .../include/FMI1/fmi1_import_cosim.h | 62 + .../include/FMI1/fmi1_import_type.h | 161 + .../include/FMI1/fmi1_import_unit.h | 103 + .../include/FMI1/fmi1_import_variable.h | 213 + .../include/FMI1/fmi1_import_variable_list.h | 130 + .../FMI1/fmi1_import_vendor_annotations.h | 81 + .../src/fmi-library/include/FMI1/fmi1_types.h | 80 + .../fmi-library/include/FMI1/fmiFunctions.h | 231 + .../include/FMI1/fmiModelFunctions.h | 210 + .../fmi-library/include/FMI1/fmiModelTypes.h | 91 + .../include/FMI1/fmiPlatformTypes.h | 73 + .../include/FMI2/fmi2FunctionTypes.h | 243 + .../fmi-library/include/FMI2/fmi2Functions.h | 333 + .../include/FMI2/fmi2TypesPlatform.h | 115 + .../src/fmi-library/include/FMI2/fmi2_enums.h | 242 + .../fmi-library/include/FMI2/fmi2_functions.h | 197 + .../fmi-library/include/FMI2/fmi2_import.h | 381 + .../include/FMI2/fmi2_import_capi.h | 577 + .../include/FMI2/fmi2_import_convenience.h | 147 + .../include/FMI2/fmi2_import_type.h | 171 + .../include/FMI2/fmi2_import_unit.h | 130 + .../include/FMI2/fmi2_import_variable.h | 233 + .../include/FMI2/fmi2_import_variable_list.h | 130 + .../src/fmi-library/include/FMI2/fmi2_types.h | 80 + .../include/FMI2/fmi2_xml_callbacks.h | 80 + .../src/fmi-library/include/JM/jm_callbacks.h | 225 + .../src/fmi-library/include/JM/jm_named_ptr.h | 100 + .../fmi-library/include/JM/jm_portability.h | 144 + .../src/fmi-library/include/JM/jm_stack.h | 192 + .../fmi-library/include/JM/jm_string_set.h | 122 + .../src/fmi-library/include/JM/jm_types.h | 72 + .../src/fmi-library/include/JM/jm_vector.h | 385 + .../include/JM/jm_vector_template.h | 238 + .../src/fmi-library/include/fmilib.h | 31 + .../include/fmilib_config-darwin64.h | 163 + .../include/fmilib_config-linux64.h | 163 + .../fmi-library/include/fmilib_config-win64.h | 163 + .../src/fmi-library/include/fmilib_config.h | 22 + .../src/fmi-library/src/fmilib_config.h | 22 + Buildings/Resources/src/python/Makefile.linux | 10 +- .../Resources/src/python/Makefile.windows.bat | 17 +- .../src/python/ModelicaBuildingsPython3.6.def | 2 + .../Resources/src/python/pythonInterpreter.c | 7 + .../Detailed/Examples/MixedAirCO2.mo | 3 +- .../Validation/BESTEST/Cases6xx/Case600.mo | 28 +- .../Validation/BESTEST/Cases6xx/Case600FF.mo | 6 +- .../Detailed/Validation/BESTEST/UsersGuide.mo | 6 +- .../BaseClasses/SingleZoneFloorHeater.mo | 4 +- .../LBNL_71T/RoomB/ElectroChromicWindow.mo | 3 +- .../BaseClasses/Validation/package.mo | 23 + .../BaseClasses/Validation/package.order | 3 + .../EnergyPlus/Examples/package.mo | 15 + .../EnergyPlus/Types/LogLevels.mo | 52 + .../ThermalZones/EnergyPlus/Types/Units.mo | 125 + .../ThermalZones/EnergyPlus/Types/package.mo | 21 + .../EnergyPlus/Types/package.order | 2 + .../TwoIdenticalTwoZoneBuildings.mo | 42 + .../Validation/MultipleBuildings/package.mo | 13 + .../MultipleBuildings/package.order | 3 + .../OneZoneTwoDifferentOutputVariables.mo | 33 + .../OneZoneTwoIdenticalOutputVariables.mo | 33 + .../Validation/OutputVariable/package.mo | 13 + .../EnergyPlus/Validation/Schedule/package.mo | 13 + .../Validation/ThermalZone/package.mo | 13 + .../EnergyPlus/Validation/package.mo | 23 + .../Examples/SimpleRoomFourElements.mo | 2 +- .../SimpleRoomFourElementsTraceSubstance.mo | 113 + .../ReducedOrder/Examples/package.order | 1 + .../ReducedOrder/RC/OneElement.mo | 20 +- .../Validation/VDI6007/TestCase11.mo | 1 - .../Validation/VDI6007/TestCase7.mo | 1 - .../Utilities/Comfort/Examples/Fanger.mo | 8 + Buildings/Utilities/Comfort/Fanger.mo | 70 +- .../Utilities/Comfort/Validation/FangerCBE.mo | 108 + .../Utilities/Comfort/Validation/package.mo | 12 + .../Comfort/Validation/package.order | 1 + Buildings/Utilities/Comfort/package.order | 1 + .../Utilities/IO/BCVTB/BaseClasses/package.mo | 0 .../Utilities/IO/BCVTB/Examples/MoistAir.mo | 2 - .../Utilities/IO/BCVTB/Examples/package.mo | 0 .../Python27/Functions/Examples/Exchange.mo | 176 - .../Examples/KalmanFilter.mo | 11 +- .../Examples/SimpleRoom.mo | 24 +- .../Examples/package.mo | 6 +- .../Examples/package.order | 0 .../Functions/BaseClasses/PythonObject.mo | 39 +- .../Functions/BaseClasses/exchange.mo | 25 +- .../Functions/BaseClasses/package.mo | 2 +- .../Functions/BaseClasses/package.order | 0 .../Python36/Functions/Examples/Exchange.mo | 180 + .../Examples/ExchangeWithPassPythonObject.mo | 18 +- .../Functions/Examples/package.mo | 6 +- .../Functions/Examples/package.order | 0 .../Functions/exchange.mo | 18 +- .../Functions/package.mo | 2 +- .../Functions/package.order | 0 .../IO/{Python27 => Python36}/Real_Real.mo | 59 +- .../IO/{Python27 => Python36}/UsersGuide.mo | 216 +- .../IO/{Python27 => Python36}/package.mo | 11 +- .../IO/{Python27 => Python36}/package.order | 0 .../Math/Functions/Examples/Round.mo | 35 + .../Math/Functions/Examples/package.order | 1 + .../Utilities/Math/Functions/package.order | 1 + Buildings/Utilities/Math/Functions/round.mo | 56 + .../Examples/BaseClasses/CoolingCoilValve.mo | 42 +- .../Validation/CoolingCoilValve.mo | 14 +- .../ControlsVerification_CoolingCoilValve.mo | 40 +- .../der_saturationPressureLiquid.mo | 14 +- .../BaseClasses/der_sublimationPressureIce.mo | 11 +- Buildings/legal.html | 2 +- Buildings/package.mo | 241 +- Buildings/package.order | 0 bin/cleanHTML.py | 4 +- bin/verifyFiles.py | 2 +- 1420 files changed, 109622 insertions(+), 33282 deletions(-) delete mode 100644 Buildings/Air/Systems/SingleZone/VAV/Examples/BaseClasses/InternalLoads.mo create mode 100644 Buildings/BoundaryConditions/SolarGeometry/BaseClasses/solarAzimuthNoEvent.mo create mode 100644 Buildings/BoundaryConditions/SolarGeometry/BaseClasses/solarAzimuthWithEvent.mo create mode 100644 Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/ModeAndSetPoints.mo create mode 100644 Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/Validation/ModeAndSetPoints.mo create mode 100644 Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/GroupStatus.mo delete mode 100644 Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/ModeAndSetPoints.mo delete mode 100644 Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/ModeAndSetPoints.mo rename Buildings/Controls/OBC/CDL/Continuous/Validation/{LimPIDInitialState.mo => PIDInitialState.mo} (60%) rename Buildings/Controls/OBC/CDL/Continuous/Validation/{LimPIDWithReset.mo => PIDWithReset.mo} (51%) rename Buildings/Controls/OBC/CDL/Psychrometrics/{TDewPoi_TDryBulPhi.mo => DewPoint_TDryBulPhi.mo} (70%) delete mode 100644 Buildings/Controls/OBC/CDL/Types/Reset.mo create mode 100644 Buildings/Electrical/Transmission/Functions/Validation/SelectCable_low.mo create mode 100644 Buildings/Electrical/Transmission/Functions/Validation/SelectCable_med.mo create mode 100644 Buildings/Electrical/Transmission/Functions/Validation/package.mo create mode 100644 Buildings/Electrical/Transmission/Functions/Validation/package.order mode change 100755 => 100644 Buildings/Examples/DualFanDualDuct/Controls/Examples/package.mo delete mode 100644 Buildings/Examples/DualFanDualDuct/Controls/FanVFD.mo mode change 100755 => 100644 Buildings/Examples/DualFanDualDuct/Controls/MixedAirTemperatureSetpoint.mo mode change 100755 => 100644 Buildings/Examples/DualFanDualDuct/Controls/package.mo mode change 100755 => 100644 Buildings/Examples/DualFanDualDuct/package.mo mode change 100755 => 100644 Buildings/Examples/HydronicHeating/package.mo mode change 100755 => 100644 Buildings/Examples/VAVCO2/BaseClasses/Occupancy.mo mode change 100755 => 100644 Buildings/Examples/VAVReheat/Controls/ControlBus.mo mode change 100755 => 100644 Buildings/Examples/VAVReheat/Controls/DuctStaticPressureSetpoint.mo delete mode 100755 Buildings/Examples/VAVReheat/Controls/EconomizerTemperatureControl.mo create mode 100644 Buildings/Examples/VAVReheat/Controls/Examples/RoomVAV.mo mode change 100755 => 100644 Buildings/Examples/VAVReheat/Controls/Examples/package.mo mode change 100755 => 100644 Buildings/Examples/VAVReheat/Controls/OperationModes.mo mode change 100755 => 100644 Buildings/Examples/VAVReheat/Controls/PreCoolingStarter.mo mode change 100755 => 100644 Buildings/Examples/VAVReheat/Controls/State.mo mode change 100755 => 100644 Buildings/Examples/VAVReheat/Controls/package.mo delete mode 100755 Buildings/Examples/VAVReheat/ThermalZones/package.mo mode change 100755 => 100644 Buildings/Examples/VAVReheat/package.mo mode change 100755 => 100644 Buildings/Fluid/Actuators/BaseClasses/Examples/package.order mode change 100755 => 100644 Buildings/Fluid/Actuators/BaseClasses/package.order mode change 100755 => 100644 Buildings/Fluid/Actuators/Dampers/Examples/package.order create mode 100644 Buildings/Fluid/Actuators/Dampers/Validation/PressureIndependent.mo create mode 100644 Buildings/Fluid/Actuators/Dampers/Validation/package.mo create mode 100644 Buildings/Fluid/Actuators/Dampers/Validation/package.order mode change 100755 => 100644 Buildings/Fluid/Actuators/Dampers/package.order mode change 100755 => 100644 Buildings/Fluid/Actuators/Motors/Examples/package.order mode change 100755 => 100644 Buildings/Fluid/Actuators/Motors/package.order mode change 100755 => 100644 Buildings/Fluid/Actuators/Valves/Examples/package.order mode change 100755 => 100644 Buildings/Fluid/Actuators/Valves/package.order mode change 100755 => 100644 Buildings/Fluid/Actuators/package.order mode change 100755 => 100644 Buildings/Fluid/BaseClasses/FlowModels/package.order create mode 100644 Buildings/Fluid/CHPs/BaseClasses/AssertFuelFlow.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/AssertPower.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/AssertWaterFlow.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/AssertWaterTemperature.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/Controller.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/EfficiencyCurve.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/EnergyConversion.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/EnergyConversionWarmUp.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/EngineTemperature.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/FilterPower.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/Functions/package.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/Functions/package.order create mode 100644 Buildings/Fluid/CHPs/BaseClasses/Functions/polynomialtrivariate.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/Interfaces/ModeTypeInput.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/Interfaces/ModeTypeOutput.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/Interfaces/package.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/Interfaces/package.order create mode 100644 Buildings/Fluid/CHPs/BaseClasses/PowerConsumption.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/Types/Mode.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/Types/package.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/Types/package.order create mode 100644 Buildings/Fluid/CHPs/BaseClasses/Validation/AssertFuelFlow.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/Validation/AssertPower.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/Validation/AssertWaterFlow.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/Validation/AssertWaterTemperature.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/Validation/Controller.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/Validation/CoolDown.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/Validation/EnergyConversion.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/Validation/EnergyConversionNormal.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/Validation/EnergyConversionWarmUp.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/Validation/EngineTemperature.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/Validation/FilterPower.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/Validation/PowerConsumption.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/Validation/StandBy.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/Validation/WarmUpTemperature.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/Validation/WarmUpTimeDelay.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/Validation/WaterFlowControl.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/Validation/package.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/Validation/package.order create mode 100644 Buildings/Fluid/CHPs/BaseClasses/WarmUpLeaving.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/WaterFlowControl.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/package.mo create mode 100644 Buildings/Fluid/CHPs/BaseClasses/package.order create mode 100644 Buildings/Fluid/CHPs/Data/Generic.mo create mode 100644 Buildings/Fluid/CHPs/Data/Senertech5_5kW.mo create mode 100644 Buildings/Fluid/CHPs/Data/ValidationData1.mo create mode 100644 Buildings/Fluid/CHPs/Data/ValidationData2.mo create mode 100644 Buildings/Fluid/CHPs/Data/ValidationData3.mo create mode 100644 Buildings/Fluid/CHPs/Data/package.mo create mode 100644 Buildings/Fluid/CHPs/Data/package.order create mode 100644 Buildings/Fluid/CHPs/Validation/ElectricalFollowing.mo create mode 100644 Buildings/Fluid/CHPs/Validation/ThermalFollowing.mo create mode 100644 Buildings/Fluid/CHPs/Validation/package.mo create mode 100644 Buildings/Fluid/CHPs/Validation/package.order create mode 100644 Buildings/Fluid/CHPs/package.mo create mode 100644 Buildings/Fluid/CHPs/package.order mode change 100755 => 100644 Buildings/Fluid/Chillers/Examples/package.order mode change 100755 => 100644 Buildings/Fluid/Chillers/package.order mode change 100755 => 100644 Buildings/Fluid/Delays/Examples/package.order mode change 100755 => 100644 Buildings/Fluid/Delays/package.order mode change 100755 => 100644 Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/Functions/package.mo mode change 100755 => 100644 Buildings/Fluid/HeatExchangers/Examples/package.order mode change 100755 => 100644 Buildings/Fluid/HeatExchangers/Radiators/Examples/package.order mode change 100755 => 100644 Buildings/Fluid/HeatExchangers/Radiators/package.order mode change 100755 => 100644 Buildings/Fluid/HeatExchangers/Validation/package.order mode change 100755 => 100644 Buildings/Fluid/HeatExchangers/package.order mode change 100755 => 100644 Buildings/Fluid/Movers/BaseClasses/package.order mode change 100755 => 100644 Buildings/Fluid/Movers/package.order mode change 100755 => 100644 Buildings/Fluid/Storage/BaseClasses/package.order mode change 100755 => 100644 Buildings/Fluid/Storage/Examples/package.order mode change 100755 => 100644 Buildings/Fluid/Storage/package.order mode change 100755 => 100644 Buildings/HeatTransfer/Conduction/BaseClasses/Examples/package.mo create mode 100644 Buildings/HeatTransfer/Convection/Validation/ZeroWindSpeed.mo create mode 100644 Buildings/HeatTransfer/Convection/Validation/package.mo create mode 100644 Buildings/HeatTransfer/Convection/Validation/package.order mode change 100755 => 100644 Buildings/HeatTransfer/Examples/package.mo mode change 100755 => 100644 Buildings/HeatTransfer/package.mo delete mode 100644 Buildings/Media/Examples/SteamSaturatedProperties.mo mode change 100755 => 100644 Buildings/Media/package.order rename Buildings/{ => Obsolete}/Controls/OBC/CDL/Continuous/ChangeSign.mo (84%) rename Buildings/{ => Obsolete}/Controls/OBC/CDL/Continuous/Derivative.mo (84%) rename Buildings/{ => Obsolete}/Controls/OBC/CDL/Continuous/GreaterEqual.mo (77%) rename Buildings/{ => Obsolete}/Controls/OBC/CDL/Continuous/GreaterEqualThreshold.mo (77%) rename Buildings/{ => Obsolete}/Controls/OBC/CDL/Continuous/HysteresisWithHold.mo (83%) rename Buildings/{ => Obsolete}/Controls/OBC/CDL/Continuous/LessEqual.mo (77%) rename Buildings/{ => Obsolete}/Controls/OBC/CDL/Continuous/LessEqualThreshold.mo (77%) rename Buildings/{ => Obsolete}/Controls/OBC/CDL/Continuous/LimPID.mo (71%) rename Buildings/{ => Obsolete}/Controls/OBC/CDL/Continuous/NumberOfRequests.mo (73%) rename Buildings/{ => Obsolete}/Controls/OBC/CDL/Continuous/Validation/ChangeSign.mo (79%) rename Buildings/{ => Obsolete}/Controls/OBC/CDL/Continuous/Validation/Derivative.mo (79%) rename Buildings/{ => Obsolete}/Controls/OBC/CDL/Continuous/Validation/GreaterEqual.mo (72%) rename Buildings/{ => Obsolete}/Controls/OBC/CDL/Continuous/Validation/GreaterEqualThreshold.mo (69%) rename Buildings/{ => Obsolete}/Controls/OBC/CDL/Continuous/Validation/HysteresisWithHold.mo (82%) rename Buildings/{ => Obsolete}/Controls/OBC/CDL/Continuous/Validation/LessEqual.mo (72%) rename Buildings/{ => Obsolete}/Controls/OBC/CDL/Continuous/Validation/LessEqualThreshold.mo (69%) rename Buildings/{ => Obsolete}/Controls/OBC/CDL/Continuous/Validation/LimPID.mo (84%) rename Buildings/{ => Obsolete}/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialDerivativeOutput.mo (81%) create mode 100644 Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialState.mo create mode 100644 Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/LimPIDWithReset.mo rename Buildings/{ => Obsolete}/Controls/OBC/CDL/Continuous/Validation/NumberOfRequests.mo (84%) create mode 100644 Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/package.mo create mode 100644 Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/package.order create mode 100644 Buildings/Obsolete/Controls/OBC/CDL/Continuous/package.mo create mode 100644 Buildings/Obsolete/Controls/OBC/CDL/Continuous/package.order create mode 100644 Buildings/Obsolete/Controls/OBC/CDL/Logical/Timer.mo create mode 100644 Buildings/Obsolete/Controls/OBC/CDL/Logical/Validation/package.mo create mode 100644 Buildings/Obsolete/Controls/OBC/CDL/Logical/Validation/package.order create mode 100644 Buildings/Obsolete/Controls/OBC/CDL/Logical/package.mo create mode 100644 Buildings/Obsolete/Controls/OBC/CDL/Logical/package.order create mode 100644 Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/TDewPoi_TDryBulPhi.mo rename Buildings/{ => Obsolete}/Controls/OBC/CDL/Psychrometrics/TWetBul_TDryBulPhi.mo (87%) rename Buildings/{ => Obsolete}/Controls/OBC/CDL/Psychrometrics/Validation/TDewPoi_TDryBulPhi.mo (72%) rename Buildings/{ => Obsolete}/Controls/OBC/CDL/Psychrometrics/Validation/TWetBul_TDryBulPhi.mo (78%) rename Buildings/{ => Obsolete}/Controls/OBC/CDL/Psychrometrics/Validation/h_TDryBulPhi.mo (77%) create mode 100644 Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/Validation/package.mo create mode 100644 Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/Validation/package.order rename Buildings/{ => Obsolete}/Controls/OBC/CDL/Psychrometrics/h_TDryBulPhi.mo (80%) create mode 100644 Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/package.mo create mode 100644 Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/package.order create mode 100644 Buildings/Obsolete/Controls/OBC/CDL/Types.mo rename Buildings/Resources/C-Sources/{python27Wrapper.c => pythonWrapper.c} (100%) delete mode 100644 Buildings/Resources/Data/Fluid/Chillers/Validation/IndirectAbsorptionChiller/modelica.csv mode change 100644 => 100755 Buildings/Resources/Data/Fluid/Chillers/Validation/IndirectAbsorptionChiller/run.sh delete mode 100644 Buildings/Resources/Data/Fluid/HeatExchangers/CoolingTowers/Validation/MerkelEnergyPlus/energyplus_to_modelica.py delete mode 100644 Buildings/Resources/Data/Fluid/HeatExchangers/CoolingTowers/Validation/MerkelEnergyPlus/modelica.csv mode change 100644 => 100755 Buildings/Resources/Data/Fluid/HeatExchangers/CoolingTowers/Validation/MerkelEnergyPlus/run.sh delete mode 100644 Buildings/Resources/Data/Fluid/HeatPumps/Validation/EquationFitReversible_EnergyPlus/energyplus_to_modelica_data.py delete mode 100644 Buildings/Resources/Data/Fluid/HeatPumps/Validation/EquationFitReversible_EnergyPlus/modelica.csv delete mode 100644 Buildings/Resources/Documentation/userGuide/build/html/_images/Merkel.png create mode 100644 Buildings/Resources/Documentation/userGuide/build/html/_images/Merkel.svg delete mode 100644 Buildings/Resources/Documentation/userGuide/build/html/_images/MixingVolumeInitialization.png create mode 100644 Buildings/Resources/Documentation/userGuide/build/html/_images/MixingVolumeInitialization.svg delete mode 100644 Buildings/Resources/Documentation/userGuide/build/html/_images/fanStepSchematics.png create mode 100644 Buildings/Resources/Documentation/userGuide/build/html/_images/fanStepSchematics.svg create mode 100644 Buildings/Resources/Documentation/userGuide/build/html/_images/flowCircuit.svg delete mode 100644 Buildings/Resources/Documentation/userGuide/build/html/_images/flowCircuitNoExpansion.png delete mode 100644 Buildings/Resources/Documentation/userGuide/build/html/_images/flowCircuitWithBoundary.png create mode 100644 Buildings/Resources/Documentation/userGuide/build/html/_images/flowCircuitWithBoundary.svg delete mode 100644 Buildings/Resources/Documentation/userGuide/build/html/_images/flowCircuitWithExpansionVessel.png delete mode 100644 Buildings/Resources/Documentation/userGuide/build/html/_images/fluidJunctionMixing.png create mode 100644 Buildings/Resources/Documentation/userGuide/build/html/_images/fluidJunctionMixing.svg delete mode 100644 Buildings/Resources/Documentation/userGuide/build/html/_images/fluidJunctionMixingSplitter.png create mode 100644 Buildings/Resources/Documentation/userGuide/build/html/_images/fluidJunctionMixingSplitter.svg delete mode 100644 Buildings/Resources/Documentation/userGuide/build/html/_images/resistanceValveSeries.png create mode 100644 Buildings/Resources/Documentation/userGuide/build/html/_images/resistanceValveSeries.svg delete mode 100644 Buildings/Resources/Documentation/userGuide/build/html/_images/resistancesSeries.png create mode 100644 Buildings/Resources/Documentation/userGuide/build/html/_images/resistancesSeries.svg delete mode 100644 Buildings/Resources/Documentation/userGuide/build/html/_images/valveNoResistance.png create mode 100644 Buildings/Resources/Documentation/userGuide/build/html/_images/valveNoResistance.svg delete mode 100644 Buildings/Resources/Documentation/userGuide/build/html/_sources/workArounds.rst.txt delete mode 100644 Buildings/Resources/Documentation/userGuide/build/html/workArounds.html mode change 100644 => 100755 Buildings/Resources/Documentation/userGuide/source/_static/lbl-logo.png create mode 100644 Buildings/Resources/Documentation/userGuide/source/img/MixingVolumeInitialization.pdf create mode 100644 Buildings/Resources/Documentation/userGuide/source/img/MixingVolumeInitialization.svg create mode 100644 Buildings/Resources/Documentation/userGuide/source/img/fanStepSchematics.pdf create mode 100644 Buildings/Resources/Documentation/userGuide/source/img/fanStepSchematics.svg create mode 100644 Buildings/Resources/Documentation/userGuide/source/img/flowCircuit.pdf create mode 100644 Buildings/Resources/Documentation/userGuide/source/img/flowCircuit.png create mode 100644 Buildings/Resources/Documentation/userGuide/source/img/flowCircuit.svg create mode 100644 Buildings/Resources/Documentation/userGuide/source/img/flowCircuitWithBoundary.pdf create mode 100644 Buildings/Resources/Documentation/userGuide/source/img/flowCircuitWithBoundary.svg delete mode 100644 Buildings/Resources/Documentation/userGuide/source/img/flowCircuitWithExpansionVessel.png create mode 100644 Buildings/Resources/Documentation/userGuide/source/img/fluidJunctionMixing.pdf create mode 100644 Buildings/Resources/Documentation/userGuide/source/img/fluidJunctionMixing.svg create mode 100644 Buildings/Resources/Documentation/userGuide/source/img/fluidJunctionMixingSplitter.pdf delete mode 100644 Buildings/Resources/Documentation/userGuide/source/img/fluidJunctionMixingSplitterCorrect.png delete mode 100644 Buildings/Resources/Documentation/userGuide/source/img/fluidJunctionMixingSplitterWrong.png delete mode 100644 Buildings/Resources/Documentation/userGuide/source/img/models/ExpansionVessel.mo delete mode 100644 Buildings/Resources/Documentation/userGuide/source/img/models/FixedPressure.mo delete mode 100644 Buildings/Resources/Documentation/userGuide/source/img/models/NoPressureReference.mo delete mode 100644 Buildings/Resources/Documentation/userGuide/source/img/models/PartialFluidLoop.mo delete mode 100644 Buildings/Resources/Documentation/userGuide/source/img/models/package.mo delete mode 100644 Buildings/Resources/Documentation/userGuide/source/img/models/package.order create mode 100644 Buildings/Resources/Documentation/userGuide/source/img/resistanceValveSeries.pdf create mode 100644 Buildings/Resources/Documentation/userGuide/source/img/resistanceValveSeries.svg create mode 100644 Buildings/Resources/Documentation/userGuide/source/img/resistancesSeries.pdf create mode 100644 Buildings/Resources/Documentation/userGuide/source/img/resistancesSeries.svg create mode 100644 Buildings/Resources/Documentation/userGuide/source/img/valveNoResistance.pdf create mode 100644 Buildings/Resources/Documentation/userGuide/source/img/valveNoResistance.svg delete mode 100644 Buildings/Resources/Documentation/userGuide/source/workArounds.rst delete mode 100644 Buildings/Resources/Images/Controls/OBC/CDL/Logical/Sources/BooleanPulse.png delete mode 100644 Buildings/Resources/Images/Controls/OBC/CDL/Logical/Sources/BooleanPulse.svg create mode 100644 Buildings/Resources/Images/Examples/VAVReheat/vavBoxDualMax.png create mode 100644 Buildings/Resources/Images/Examples/VAVReheat/vavBoxDualMax.svg create mode 100644 Buildings/Resources/Images/Fluid/CHPs/control_volumes.png create mode 100644 Buildings/Resources/Images/Fluid/CHPs/control_volumes.svg create mode 100644 Buildings/Resources/Images/Fluid/Sensors/warningIcon.png create mode 100644 Buildings/Resources/Images/Fluid/Sensors/warningIcon.svg delete mode 100644 Buildings/Resources/Images/Media/Steam/numericalError.pdf delete mode 100644 Buildings/Resources/Images/Media/Steam/numericalError.png rename Buildings/Resources/Images/{ => Obsolete}/Controls/OBC/CDL/Continuous/HysteresisWithHold.png (100%) create mode 100644 Buildings/Resources/Images/ThermalZones/EnergyPlus/EnergyPlusLogo.png create mode 100755 Buildings/Resources/Images/ThermalZones/EnergyPlus/spawn_icon_alonelowres.png create mode 100755 Buildings/Resources/Images/ThermalZones/EnergyPlus/spawn_icon_darkbluetxlowres.png create mode 100644 Buildings/Resources/Images/ThermalZones/EnergyPlus/spawn_icon_darkbluetxmedres.png rename Buildings/Resources/Images/Utilities/IO/{Python27 => Python36}/Examples/KalmanFilter.png (100%) rename Buildings/Resources/Images/Utilities/IO/{Python27 => Python36}/python.png (100%) delete mode 100755 Buildings/Resources/Library/linux32/libModelicaBuildingsPython2.7.so delete mode 100755 Buildings/Resources/Library/linux64/libModelicaBuildingsPython2.7.so create mode 100755 Buildings/Resources/Library/linux64/libModelicaBuildingsPython3.6.so create mode 100644 Buildings/Resources/Library/linux64/libfmilib_shared.so create mode 100644 Buildings/Resources/Library/win64/ModelicaBuildingsPython3.6.dll create mode 100644 Buildings/Resources/Library/win64/ModelicaBuildingsPython3.6.lib create mode 100644 Buildings/Resources/Library/win64/fmilib_shared.lib create mode 100644 Buildings/Resources/Library/win64/python3.6.dll create mode 100644 Buildings/Resources/Python-Sources/testFunctions27.py mode change 100755 => 100644 Buildings/Resources/Scripts/Dymola/BoundaryConditions/SkyTemperature/Examples/BlackBody.mos mode change 100755 => 100644 Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckPressure.mos create mode 100644 Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/LimitMin.mos mode change 100755 => 100644 Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/LocalCivilTime.mos mode change 100755 => 100644 Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/Examples/ReaderTMY3.mos rename Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/{TerminalUnits => AHUs/SingleZone/VAV/SetPoints}/Validation/ModeAndSetPoints.mos (63%) create mode 100644 Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/GroupStatus.mos delete mode 100644 Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/ChangeSign.mos delete mode 100644 Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/GreaterEqualThreshold.mos delete mode 100644 Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LessEqualThreshold.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/PID.mos rename Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/{LimPIDInitialDerivativeOutput.mos => PIDInitialDerivativeOutput.mos} (70%) rename Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/{LimPIDInitialState.mos => PIDInitialState.mos} (79%) create mode 100644 Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/PIDScale.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/PIDWithReset.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/PIDWithResetScale.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Sources/Validation/Pulse.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Sources/Validation/TimeTable.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Sources/Validation/TimeTableNegativeStartTime.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Sources/Validation/PulseNegativeStartTime.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Sources/Validation/PulsePositiveStartTime.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Sources/Validation/TimeTable.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Sources/Validation/TimeTableNegativeStartTime.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/TimerAccumulating.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/TimerAccumulatingNegativeStartTime.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/TimerNegativeStartTime.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Psychrometrics/Validation/DewPoint_TDryBulPhi.mos rename Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Psychrometrics/Validation/{h_TDryBulPhi.mos => SpecificEnthalpy_TDryBulPhi.mos} (73%) create mode 100644 Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Psychrometrics/Validation/WetBulb_TDryBulPhi.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Electrical/Transmission/Functions/Validation/SelectCable_low.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Electrical/Transmission/Functions/Validation/SelectCable_med.mos mode change 100755 => 100644 Buildings/Resources/Scripts/Dymola/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSetPointControl.mos mode change 100755 => 100644 Buildings/Resources/Scripts/Dymola/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSwitch.mos mode change 100755 => 100644 Buildings/Resources/Scripts/Dymola/Examples/ChillerPlant/BaseClasses/Controls/Examples/KMinusU.mos mode change 100755 => 100644 Buildings/Resources/Scripts/Dymola/Examples/ChillerPlant/BaseClasses/Controls/Examples/LinearPiecewiseTwo.mos mode change 100755 => 100644 Buildings/Resources/Scripts/Dymola/Examples/ChillerPlant/BaseClasses/Controls/Examples/RequestCounter.mos mode change 100755 => 100644 Buildings/Resources/Scripts/Dymola/Examples/ChillerPlant/BaseClasses/Controls/Examples/TrimAndRespond.mos mode change 100755 => 100644 Buildings/Resources/Scripts/Dymola/Examples/ChillerPlant/BaseClasses/Controls/Examples/WSEControl.mos mode change 100755 => 100644 Buildings/Resources/Scripts/Dymola/Examples/ChillerPlant/DataCenterDiscreteTimeControl.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Examples/VAVReheat/Controls/Examples/RoomVAV.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Dampers/Validation/PressureIndependent.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/AssertFuelFlow.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/AssertPower.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/AssertWaterFlow.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/AssertWaterTemperature.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/Controller.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/CoolDown.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/EnergyConversion.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/EnergyConversionNormal.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/EnergyConversionWarmUp.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/EngineTemperature.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/FilterPower.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/PowerConsumption.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/StandBy.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/WarmUpTemperature.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/WarmUpTimeDelay.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/WaterFlowControl.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Fluid/CHPs/Validation/ElectricalFollowing.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Fluid/CHPs/Validation/ThermalFollowing.mos mode change 100755 => 100644 Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/ControlledFlowMachine.mos create mode 100644 Buildings/Resources/Scripts/Dymola/HeatTransfer/Convection/Validation/ZeroWindSpeed.mos delete mode 100644 Buildings/Resources/Scripts/Dymola/Media/Examples/SteamSaturatedProperties.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/ChangeSign.mos rename Buildings/Resources/Scripts/Dymola/{ => Obsolete}/Controls/OBC/CDL/Continuous/Validation/Derivative.mos (62%) rename Buildings/Resources/Scripts/Dymola/{ => Obsolete}/Controls/OBC/CDL/Continuous/Validation/GreaterEqual.mos (51%) create mode 100644 Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/GreaterEqualThreshold.mos rename Buildings/Resources/Scripts/Dymola/{ => Obsolete}/Controls/OBC/CDL/Continuous/Validation/HysteresisWithHold.mos (85%) rename Buildings/Resources/Scripts/Dymola/{ => Obsolete}/Controls/OBC/CDL/Continuous/Validation/LessEqual.mos (52%) create mode 100644 Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/LessEqualThreshold.mos rename Buildings/Resources/Scripts/Dymola/{ => Obsolete}/Controls/OBC/CDL/Continuous/Validation/LimPID.mos (78%) create mode 100644 Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialDerivativeOutput.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialState.mos rename Buildings/Resources/Scripts/Dymola/{ => Obsolete}/Controls/OBC/CDL/Continuous/Validation/LimPIDWithReset.mos (81%) rename Buildings/Resources/Scripts/Dymola/{ => Obsolete}/Controls/OBC/CDL/Continuous/Validation/NumberOfRequests.mos (60%) create mode 100644 Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Logical/Validation/Timer.mos rename Buildings/Resources/Scripts/Dymola/{ => Obsolete}/Controls/OBC/CDL/Psychrometrics/Validation/TDewPoi_TDryBulPhi.mos (77%) rename Buildings/Resources/Scripts/Dymola/{ => Obsolete}/Controls/OBC/CDL/Psychrometrics/Validation/TWetBul_TDryBulPhi.mos (78%) create mode 100644 Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Psychrometrics/Validation/h_TDryBulPhi.mos create mode 100644 Buildings/Resources/Scripts/Dymola/Utilities/Comfort/Validation/FangerCBE.mos rename Buildings/Resources/Scripts/Dymola/Utilities/IO/{Python27 => Python36}/Examples/KalmanFilter.mos (93%) rename Buildings/Resources/Scripts/Dymola/Utilities/IO/{Python27 => Python36}/Examples/SimpleRoom.mos (85%) rename Buildings/Resources/Scripts/Dymola/Utilities/IO/{Python27 => Python36}/Functions/Examples/Exchange.mos (93%) rename Buildings/Resources/Scripts/Dymola/Utilities/IO/{Python27 => Python36}/Functions/Examples/ExchangeWithPassPythonObject.mos (89%) create mode 100644 Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/Round.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.BoundaryConditions.WeatherData.BaseClasses.Examples.LimitMin.mos rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Validation.ModeAndSetPoints.mos => Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.SetPoints.Validation.ModeAndSetPoints.mos} (77%) create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.Validation.GroupStatus.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.PID.mos rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Controls.OBC.CDL.Continuous.Validation.LimPIDInitialDerivativeOutput.mos => Buildings.Controls.OBC.CDL.Continuous.Validation.PIDInitialDerivativeOutput.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Controls.OBC.CDL.Continuous.Validation.LimPIDInitialState.mos => Buildings.Controls.OBC.CDL.Continuous.Validation.PIDInitialState.mos} (100%) create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.PIDScale.mos rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Controls.OBC.CDL.Continuous.Validation.LimPIDWithReset.mos => Buildings.Controls.OBC.CDL.Continuous.Validation.PIDWithReset.mos} (100%) create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.PIDWithResetScale.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Integers.Sources.Validation.Pulse.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Integers.Sources.Validation.TimeTable.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Integers.Sources.Validation.TimeTableNegativeStartTime.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Sources.Validation.PulseNegativeStartTime.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Sources.Validation.PulsePositiveStartTime.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Sources.Validation.TimeTable.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Sources.Validation.TimeTableNegativeStartTime.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Validation.TimerAccumulating.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Validation.TimerAccumulatingNegativeStartTime.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Validation.TimerNegativeStartTime.mos rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Controls.OBC.CDL.Psychrometrics.Validation.TDewPoi_TDryBulPhi.mos => Buildings.Controls.OBC.CDL.Psychrometrics.Validation.DewPoint_TDryBulPhi.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Controls.OBC.CDL.Psychrometrics.Validation.h_TDryBulPhi.mos => Buildings.Controls.OBC.CDL.Psychrometrics.Validation.SpecificEnthalpy_TDryBulPhi.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Controls.OBC.CDL.Psychrometrics.Validation.TWetBul_TDryBulPhi.mos => Buildings.Controls.OBC.CDL.Psychrometrics.Validation.WetBulb_TDryBulPhi.mos} (100%) create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Electrical.Transmission.Functions.Validation.SelectCable_low.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Electrical.Transmission.Functions.Validation.SelectCable_med.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Examples.VAVReheat.Controls.Examples.RoomVAV.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.Actuators.Dampers.Validation.PressureIndependent.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.AssertFuelFlow.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.AssertPower.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.AssertWaterFlow.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.AssertWaterTemperature.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.Controller.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.CoolDown.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.EnergyConversion.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.EnergyConversionNormal.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.EnergyConversionWarmUp.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.EngineTemperature.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.FilterPower.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.PowerConsumption.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.StandBy.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.WarmUpTemperature.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.WarmUpTimeDelay.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.WaterFlowControl.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.Validation.ElectricalFollowing.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.Validation.ThermalFollowing.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.HeatTransfer.Convection.Validation.ZeroWindSpeed.mos delete mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Media.Examples.SteamSaturatedProperties.mos rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Media.Examples.SteamTemperatureEnthalpyInversion.mos~HEAD => Buildings.Media.Examples.SteamTemperatureEnthalpyInversion.mos} (100%) delete mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Media.Examples.SteamTemperatureEnthalpyInversion.mos~master rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Controls.OBC.CDL.Continuous.Validation.ChangeSign.mos => Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.ChangeSign.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Controls.OBC.CDL.Continuous.Validation.Derivative.mos => Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.Derivative.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Controls.OBC.CDL.Continuous.Validation.GreaterEqual.mos => Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.GreaterEqual.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Controls.OBC.CDL.Continuous.Validation.GreaterEqualThreshold.mos => Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.GreaterEqualThreshold.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Controls.OBC.CDL.Continuous.Validation.HysteresisWithHold.mos => Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.HysteresisWithHold.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Controls.OBC.CDL.Continuous.Validation.LessEqual.mos => Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.LessEqual.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Controls.OBC.CDL.Continuous.Validation.LessEqualThreshold.mos => Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.LessEqualThreshold.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Controls.OBC.CDL.Continuous.Validation.LimPID.mos => Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.LimPID.mos} (100%) create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.LimPIDInitialDerivativeOutput.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.LimPIDInitialState.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.LimPIDWithReset.mos rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Controls.OBC.CDL.Continuous.Validation.NumberOfRequests.mos => Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.NumberOfRequests.mos} (100%) create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Logical.Validation.Timer.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics.Validation.TDewPoi_TDryBulPhi.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics.Validation.TWetBul_TDryBulPhi.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics.Validation.h_TDryBulPhi.mos delete mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.Detailed.Examples.FFD.Tutorial.MixedConvectionWithBox.mos delete mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.Detailed.Examples.ISAT.ForcedConvection.mos delete mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.Detailed.Examples.ISAT.ForcedConvectionWithExteriorWall.mos delete mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.Detailed.Examples.ISAT.Tutorial.MixedConvection.mos delete mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.Detailed.Examples.ISAT.Tutorial.MixedConvectionWithBox.mos delete mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.Detailed.Examples.ISAT.Tutorial.NaturalConvection.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.BaseClasses.Validation.FMUZoneAdapterZones1.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.BaseClasses.Validation.FMUZoneAdapterZones2.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.BaseClasses.Validation.FMUZoneAdapterZones3.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.MultipleBuildings.ThreeZonesTwoBuildings.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.MultipleBuildings.TwoIdenticalOneZoneBuildings.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.MultipleBuildings.TwoIdenticalTwoZoneBuildings.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneOneOutputVariable.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneOneOutputVariableSummer.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneTwoDifferentOutputVariables.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneTwoIdenticalOutputVariables.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.Schedule.EquipmentScheduleOutputVariable.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.InternalGain.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.OneZoneCompareZoneTemperatureOutput.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.RefBldgSmallOffice.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.ZoneTemperatureInitialization.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.ReducedOrder.Examples.SimpleRoomFourElementsTraceSubstance.mos create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Utilities.Comfort.Validation.FangerCBE.mos rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Utilities.IO.Python27.Examples.KalmanFilter.mos => Buildings.Utilities.IO.Python36.Examples.KalmanFilter.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Utilities.IO.Python27.Examples.SimpleRoom.mos => Buildings.Utilities.IO.Python36.Examples.SimpleRoom.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Utilities.IO.Python27.Functions.Examples.Exchange.mos => Buildings.Utilities.IO.Python36.Functions.Examples.Exchange.mos} (100%) rename Buildings/Resources/Scripts/OpenModelica/compareVars/{Buildings.Utilities.IO.Python27.Functions.Examples.ExchangeWithPassPythonObject.mos => Buildings.Utilities.IO.Python36.Functions.Examples.ExchangeWithPassPythonObject.mos} (100%) create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Utilities.Math.Functions.Examples.Round.mos mode change 100644 => 100755 Buildings/Resources/Scripts/travis/dymola/dymola mode change 100644 => 100755 Buildings/Resources/Scripts/travis/jmodelica/jm_ipython.sh create mode 100755 Buildings/Resources/Scripts/travis/omc/testOpenModelica.sh mode change 100644 => 100755 Buildings/Resources/Scripts/travis/optimica/jm_ipython.sh create mode 100644 Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/cryptographicsHash.c create mode 100644 Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/README.md create mode 100644 Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/RoomModel.mo create mode 100644 Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/Zones1.mo create mode 100644 Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/Zones3.mo create mode 100644 Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/jmodelica.py delete mode 100644 Buildings/Resources/src/convertEPW/doc/allclasses-frame.html delete mode 100644 Buildings/Resources/src/convertEPW/doc/allclasses-noframe.html create mode 100644 Buildings/Resources/src/convertEPW/doc/element-list create mode 100644 Buildings/Resources/src/convertEPW/doc/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png create mode 100644 Buildings/Resources/src/convertEPW/doc/jquery/images/ui-bg_glass_65_dadada_1x400.png create mode 100644 Buildings/Resources/src/convertEPW/doc/jquery/images/ui-bg_glass_75_dadada_1x400.png create mode 100644 Buildings/Resources/src/convertEPW/doc/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png create mode 100644 Buildings/Resources/src/convertEPW/doc/jquery/images/ui-bg_glass_95_fef1ec_1x400.png create mode 100644 Buildings/Resources/src/convertEPW/doc/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png create mode 100644 Buildings/Resources/src/convertEPW/doc/jquery/images/ui-icons_222222_256x240.png create mode 100644 Buildings/Resources/src/convertEPW/doc/jquery/images/ui-icons_2e83ff_256x240.png create mode 100644 Buildings/Resources/src/convertEPW/doc/jquery/images/ui-icons_454545_256x240.png create mode 100644 Buildings/Resources/src/convertEPW/doc/jquery/images/ui-icons_888888_256x240.png create mode 100644 Buildings/Resources/src/convertEPW/doc/jquery/images/ui-icons_cd0a0a_256x240.png create mode 100644 Buildings/Resources/src/convertEPW/doc/jquery/jquery-3.3.1.js create mode 100644 Buildings/Resources/src/convertEPW/doc/jquery/jquery-migrate-3.0.1.js create mode 100644 Buildings/Resources/src/convertEPW/doc/jquery/jquery-ui.css create mode 100644 Buildings/Resources/src/convertEPW/doc/jquery/jquery-ui.js create mode 100644 Buildings/Resources/src/convertEPW/doc/jquery/jquery-ui.min.css create mode 100644 Buildings/Resources/src/convertEPW/doc/jquery/jquery-ui.min.js create mode 100644 Buildings/Resources/src/convertEPW/doc/jquery/jquery-ui.structure.css create mode 100644 Buildings/Resources/src/convertEPW/doc/jquery/jquery-ui.structure.min.css create mode 100644 Buildings/Resources/src/convertEPW/doc/jquery/jszip-utils/dist/jszip-utils-ie.js create mode 100644 Buildings/Resources/src/convertEPW/doc/jquery/jszip-utils/dist/jszip-utils-ie.min.js create mode 100644 Buildings/Resources/src/convertEPW/doc/jquery/jszip-utils/dist/jszip-utils.js create mode 100644 Buildings/Resources/src/convertEPW/doc/jquery/jszip-utils/dist/jszip-utils.min.js create mode 100644 Buildings/Resources/src/convertEPW/doc/jquery/jszip/dist/jszip.js create mode 100644 Buildings/Resources/src/convertEPW/doc/jquery/jszip/dist/jszip.min.js delete mode 100644 Buildings/Resources/src/convertEPW/doc/package-frame.html delete mode 100644 Buildings/Resources/src/convertEPW/doc/package-list create mode 100644 Buildings/Resources/src/convertEPW/doc/package-search-index.js create mode 100644 Buildings/Resources/src/convertEPW/doc/resources/glass.png create mode 100644 Buildings/Resources/src/convertEPW/doc/resources/x.png create mode 100644 Buildings/Resources/src/convertEPW/doc/script.js create mode 100644 Buildings/Resources/src/convertEPW/doc/search.js create mode 100644 Buildings/Resources/src/convertEPW/doc/type-search-index.js create mode 100644 Buildings/Resources/src/fmi-library/CMakeLists.txt create mode 100644 Buildings/Resources/src/fmi-library/doc/FMILIB_Acknowledgements.txt create mode 100644 Buildings/Resources/src/fmi-library/doc/FMILIB_License.txt create mode 100644 Buildings/Resources/src/fmi-library/doc/FMILIB_Readme.txt create mode 100644 Buildings/Resources/src/fmi-library/include/FMI/fmi_import_context.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI/fmi_import_util.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI/fmi_util.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI/fmi_version.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI1/fmi1_enums.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI1/fmi1_functions.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_capabilities.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_capi.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_convenience.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_cosim.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_type.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_unit.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_variable.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_variable_list.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_vendor_annotations.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI1/fmi1_types.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI1/fmiFunctions.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI1/fmiModelFunctions.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI1/fmiModelTypes.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI1/fmiPlatformTypes.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI2/fmi2FunctionTypes.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI2/fmi2Functions.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI2/fmi2TypesPlatform.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI2/fmi2_enums.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI2/fmi2_functions.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI2/fmi2_import.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI2/fmi2_import_capi.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI2/fmi2_import_convenience.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI2/fmi2_import_type.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI2/fmi2_import_unit.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI2/fmi2_import_variable.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI2/fmi2_import_variable_list.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI2/fmi2_types.h create mode 100644 Buildings/Resources/src/fmi-library/include/FMI2/fmi2_xml_callbacks.h create mode 100644 Buildings/Resources/src/fmi-library/include/JM/jm_callbacks.h create mode 100644 Buildings/Resources/src/fmi-library/include/JM/jm_named_ptr.h create mode 100644 Buildings/Resources/src/fmi-library/include/JM/jm_portability.h create mode 100644 Buildings/Resources/src/fmi-library/include/JM/jm_stack.h create mode 100644 Buildings/Resources/src/fmi-library/include/JM/jm_string_set.h create mode 100644 Buildings/Resources/src/fmi-library/include/JM/jm_types.h create mode 100644 Buildings/Resources/src/fmi-library/include/JM/jm_vector.h create mode 100644 Buildings/Resources/src/fmi-library/include/JM/jm_vector_template.h create mode 100644 Buildings/Resources/src/fmi-library/include/fmilib.h create mode 100644 Buildings/Resources/src/fmi-library/include/fmilib_config-darwin64.h create mode 100644 Buildings/Resources/src/fmi-library/include/fmilib_config-linux64.h create mode 100644 Buildings/Resources/src/fmi-library/include/fmilib_config-win64.h create mode 100644 Buildings/Resources/src/fmi-library/include/fmilib_config.h create mode 100644 Buildings/Resources/src/fmi-library/src/fmilib_config.h create mode 100644 Buildings/Resources/src/python/ModelicaBuildingsPython3.6.def create mode 100644 Buildings/ThermalZones/EnergyPlus/BaseClasses/Validation/package.mo create mode 100644 Buildings/ThermalZones/EnergyPlus/BaseClasses/Validation/package.order create mode 100644 Buildings/ThermalZones/EnergyPlus/Examples/package.mo create mode 100644 Buildings/ThermalZones/EnergyPlus/Types/LogLevels.mo create mode 100644 Buildings/ThermalZones/EnergyPlus/Types/Units.mo create mode 100644 Buildings/ThermalZones/EnergyPlus/Types/package.mo create mode 100644 Buildings/ThermalZones/EnergyPlus/Types/package.order create mode 100644 Buildings/ThermalZones/EnergyPlus/Validation/MultipleBuildings/TwoIdenticalTwoZoneBuildings.mo create mode 100644 Buildings/ThermalZones/EnergyPlus/Validation/MultipleBuildings/package.mo create mode 100644 Buildings/ThermalZones/EnergyPlus/Validation/MultipleBuildings/package.order create mode 100644 Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneTwoDifferentOutputVariables.mo create mode 100644 Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneTwoIdenticalOutputVariables.mo create mode 100644 Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/package.mo create mode 100644 Buildings/ThermalZones/EnergyPlus/Validation/Schedule/package.mo create mode 100644 Buildings/ThermalZones/EnergyPlus/Validation/ThermalZone/package.mo create mode 100644 Buildings/ThermalZones/EnergyPlus/Validation/package.mo create mode 100644 Buildings/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElementsTraceSubstance.mo create mode 100644 Buildings/Utilities/Comfort/Validation/FangerCBE.mo create mode 100644 Buildings/Utilities/Comfort/Validation/package.mo create mode 100644 Buildings/Utilities/Comfort/Validation/package.order mode change 100755 => 100644 Buildings/Utilities/IO/BCVTB/BaseClasses/package.mo mode change 100755 => 100644 Buildings/Utilities/IO/BCVTB/Examples/package.mo delete mode 100644 Buildings/Utilities/IO/Python27/Functions/Examples/Exchange.mo rename Buildings/Utilities/IO/{Python27 => Python36}/Examples/KalmanFilter.mo (91%) rename Buildings/Utilities/IO/{Python27 => Python36}/Examples/SimpleRoom.mo (85%) rename Buildings/Utilities/IO/{Python27 => Python36}/Examples/package.mo (68%) rename Buildings/Utilities/IO/{Python27 => Python36}/Examples/package.order (100%) rename Buildings/Utilities/IO/{Python27 => Python36}/Functions/BaseClasses/PythonObject.mo (65%) rename Buildings/Utilities/IO/{Python27 => Python36}/Functions/BaseClasses/exchange.mo (77%) rename Buildings/Utilities/IO/{Python27 => Python36}/Functions/BaseClasses/package.mo (83%) rename Buildings/Utilities/IO/{Python27 => Python36}/Functions/BaseClasses/package.order (100%) create mode 100644 Buildings/Utilities/IO/Python36/Functions/Examples/Exchange.mo rename Buildings/Utilities/IO/{Python27 => Python36}/Functions/Examples/ExchangeWithPassPythonObject.mo (80%) rename Buildings/Utilities/IO/{Python27 => Python36}/Functions/Examples/package.mo (70%) rename Buildings/Utilities/IO/{Python27 => Python36}/Functions/Examples/package.order (100%) rename Buildings/Utilities/IO/{Python27 => Python36}/Functions/exchange.mo (88%) rename Buildings/Utilities/IO/{Python27 => Python36}/Functions/package.mo (86%) rename Buildings/Utilities/IO/{Python27 => Python36}/Functions/package.order (100%) rename Buildings/Utilities/IO/{Python27 => Python36}/Real_Real.mo (73%) rename Buildings/Utilities/IO/{Python27 => Python36}/UsersGuide.mo (61%) rename Buildings/Utilities/IO/{Python27 => Python36}/package.mo (65%) rename Buildings/Utilities/IO/{Python27 => Python36}/package.order (100%) create mode 100644 Buildings/Utilities/Math/Functions/Examples/Round.mo create mode 100644 Buildings/Utilities/Math/Functions/round.mo mode change 100755 => 100644 Buildings/package.order diff --git a/.gitignore b/.gitignore index 35134564af6..27c3dc7e43a 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,7 @@ funnel_comp # CMake build directory ###################################### /build +Buildings/Resources/src/fmi-library/build # Temporary files generated by emacs diff --git a/.travis.yml b/.travis.yml index dd2237fc56e..a51c831d1f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,8 @@ -<<<<<<< HEAD -dist: trusty -sudo: false -======= os: Linux dist: bionic ->>>>>>> master language: python + python: - "3.6" @@ -26,14 +22,6 @@ git: services: - docker -<<<<<<< HEAD - -env: - global: - - ENERGYPLUS_VERSION=EnergyPlus-9.2.0-921312fa1d-Linux-x86_64 - jobs: - - TEST_ARG="make test-documentation test-experiment-setup test-autogenerated-files test-verify-files" -======= - xvfb @@ -57,10 +45,12 @@ env: - TEST_ARG="make test-cdl-conformance" - TEST_ARG="make test-energyplus-validations" - TEST_ARG="make test-bestest test-spawn-portability" ->>>>>>> master - TEST_ARG="make test-dymola PACKAGE=\"Buildings.{Air,Examples}\"" - TEST_ARG="make test-optimica PACKAGE=\"Buildings.{Air,Examples}\"" - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.{Air,Examples}\"" + - TEST_ARG="make test-dymola PACKAGE=\"Buildings.ThermalZones.EnergyPlus\"" + - TEST_ARG="make test-optimica PACKAGE=\"Buildings.ThermalZones.EnergyPlus\"" + - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.ThermalZones.EnergyPlus\"" - TEST_ARG="make test-dymola PACKAGE=\"Buildings.ThermalZones.Detailed.{BaseClasses,Constructions,Examples}\"" - TEST_ARG="make test-optimica PACKAGE=\"Buildings.ThermalZones.Detailed.{BaseClasses,Constructions,Examples}\"" - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.ThermalZones.Detailed.{BaseClasses,Constructions,Examples}\"" @@ -70,12 +60,18 @@ env: - TEST_ARG="make test-dymola PACKAGE=\"Buildings.ThermalZones.Detailed.Validation.{Initialization,LBNL_71T,TestConditionalConstructions}\"" - TEST_ARG="make test-optimica PACKAGE=\"Buildings.ThermalZones.Detailed.Validation.{Initialization,LBNL_71T,TestConditionalConstructions}\"" - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.ThermalZones.Detailed.Validation.{Initialization,LBNL_71T,TestConditionalConstructions}\"" + - TEST_ARG="make test-dymola PACKAGE=\"Buildings.ThermalZones.Detailed.FLEXLAB\"" + - TEST_ARG="make test-optimica PACKAGE=\"Buildings.ThermalZones.Detailed.FLEXLAB\"" + - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.ThermalZones.Detailed.FLEXLAB\"" + - TEST_ARG="make test-dymola PACKAGE=\"Buildings.ThermalZones.ReducedOrder\"" + - TEST_ARG="make test-optimica PACKAGE=\"Buildings.ThermalZones.ReducedOrder\"" + - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.ThermalZones.ReducedOrder\"" - TEST_ARG="make test-dymola PACKAGE=\"Buildings.{Applications,Experimental}\"" - TEST_ARG="make test-optimica PACKAGE=\"Buildings.{Applications,Experimental}\"" - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.{Applications,Experimental}\"" - - TEST_ARG="make test-dymola PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,Delays}\"" - - TEST_ARG="make test-optimica PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,Delays}\"" - - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,Delays}\"" + - TEST_ARG="make test-dymola PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,CHPs,Delays}\"" + - TEST_ARG="make test-optimica PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,CHPs,Delays}\"" + - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,CHPs,Delays}\"" - TEST_ARG="make test-dymola PACKAGE=\"Buildings.Fluid.{Examples,FMI,FixedResistances,Geothermal}\"" - TEST_ARG="make test-optimica PACKAGE=\"Buildings.Fluid.{Examples,FMI,FixedResistances,Geothermal}\"" - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.Fluid.{Examples,FMI,FixedResistances,Geothermal}\"" @@ -85,12 +81,6 @@ env: - TEST_ARG="make test-dymola PACKAGE=\"Buildings.Fluid.{MassExchangers,MixingVolumes,Movers,Sensors,SolarCollectors,Sources,Storage,Utilities}\"" - TEST_ARG="make test-optimica PACKAGE=\"Buildings.Fluid.{MassExchangers,MixingVolumes,Movers,Sensors,SolarCollectors,Sources,Storage,Utilities}\"" - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.Fluid.{MassExchangers,MixingVolumes,Movers,Sensors,SolarCollectors,Sources,Storage,Utilities}\"" - - TEST_ARG="make test-dymola PACKAGE=\"Buildings.ThermalZones.Detailed.FLEXLAB\"" - - TEST_ARG="make test-optimica PACKAGE=\"Buildings.ThermalZones.Detailed.FLEXLAB\"" - - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.ThermalZones.Detailed.FLEXLAB\"" - - TEST_ARG="make test-dymola PACKAGE=\"Buildings.ThermalZones.ReducedOrder\"" - - TEST_ARG="make test-optimica PACKAGE=\"Buildings.ThermalZones.ReducedOrder\"" - - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.ThermalZones.ReducedOrder\"" - TEST_ARG="make test-dymola PACKAGE=\"Buildings.Electrical\"" - TEST_ARG="make test-optimica PACKAGE=\"Buildings.Electrical\"" - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.Electrical\"" @@ -100,37 +90,27 @@ env: - TEST_ARG="make test-dymola PACKAGE=\"Buildings.HeatTransfer\"" - TEST_ARG="make test-optimica PACKAGE=\"Buildings.HeatTransfer\"" - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.HeatTransfer\"" - - TEST_ARG="make test-dymola PACKAGE=\"Buildings.{Obsolete,Occupants,Media}\"" - - TEST_ARG="make test-optimica PACKAGE=\"Buildings.{Obsolete,Occupants,Media}\"" - - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.{Obsolete,Occupants,Media}\"" + - TEST_ARG="make test-dymola PACKAGE=\"Buildings.{Obsolete.Controls,Occupants,Media}\"" + - TEST_ARG="make test-optimica PACKAGE=\"Buildings.{Obsolete.Controls,Occupants,Media}\"" + - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.{Obsolete.Controls,Occupants,Media}\"" - TEST_ARG="make test-dymola PACKAGE=\"Buildings.Utilities\"" - TEST_ARG="make test-optimica PACKAGE=\"Buildings.Utilities\"" - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.Utilities\"" + - TEST_ARG="make test-omc" before_install: + - sudo apt-get -y install python3.6-minimal # Provides /usr/bin/python3.6m - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin -<<<<<<< HEAD - - if [[ "$TEST_ARG" == *test-dymola* ]]; then - docker pull "$DOCKER_USERNAME"/travis_ubuntu-1804_dymola-2020x-x86_64; - chmod +x Buildings/Resources/Scripts/travis/dymola/dymola; - cp Buildings/Resources/Scripts/travis/dymola/dymola $HOME/bin/; - fi; - - if [[ "$TEST_ARG" == *test-optimica* ]]; then - docker pull "$DOCKER_USERNAME"/travis-ubuntu-1804-optimica; - chmod +x Buildings/Resources/Scripts/travis/optimica/jm_ipython.sh; -======= - if [[ "$TEST_ARG" == *test-dymola* || "$TEST_ARG" == *test-bestest* || "$TEST_ARG" == *spawn-portability* ]]; then docker pull "$DOCKER_USERNAME"/travis_ubuntu-1804_dymola:2022-x86_64; cp Buildings/Resources/Scripts/travis/dymola/dymola $HOME/bin/; fi; - if [[ "$TEST_ARG" == *test-optimica* ]]; then docker pull "$DOCKER_USERNAME"/travis-ubuntu-1804-optimica:r19089; ->>>>>>> master cp Buildings/Resources/Scripts/travis/optimica/jm_ipython.sh $HOME/bin/jm_ipython.sh; fi; - if [[ "$TEST_ARG" == *test-jmodelica* ]]; then docker pull "$DOCKER_USERNAME"/ubuntu-1804_jmodelica_trunk; - chmod +x Buildings/Resources/Scripts/travis/jmodelica/jm_ipython.sh; cp Buildings/Resources/Scripts/travis/jmodelica/jm_ipython.sh $HOME/bin/jm_ipython.sh; fi; - if [[ "$TEST_ARG" == *test-energyplus* ]]; then @@ -167,3 +147,11 @@ install: # Execute tests script: - (cd Buildings/Resources/Scripts/travis && travis_wait 90 $TEST_ARG) + +after_failure: + - | + for ff in `find Buildings -maxdepth 1 -name '*.log'`; do + echo "*** Content of $ff" + cat $ff + echo "*** End of $ff" + done diff --git a/Buildings/.copiedFiles.txt b/Buildings/.copiedFiles.txt index 33dd51f7d4d..276c09870ef 100644 --- a/Buildings/.copiedFiles.txt +++ b/Buildings/.copiedFiles.txt @@ -82,6 +82,8 @@ Buildings/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo Buildings/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo Buildings/BoundaryConditions/SolarGeometry/BaseClasses/package.mo Buildings/BoundaryConditions/SolarGeometry/BaseClasses/package.order +Buildings/BoundaryConditions/SolarGeometry/BaseClasses/solarAzimuthNoEvent.mo +Buildings/BoundaryConditions/SolarGeometry/BaseClasses/solarAzimuthWithEvent.mo Buildings/BoundaryConditions/SolarGeometry/Examples/IncidenceAngle.mo Buildings/BoundaryConditions/SolarGeometry/Examples/ZenithAngle.mo Buildings/BoundaryConditions/SolarGeometry/Examples/package.mo @@ -257,6 +259,9 @@ Buildings/Fluid/Actuators/Dampers/Examples/package.order Buildings/Fluid/Actuators/Dampers/Exponential.mo Buildings/Fluid/Actuators/Dampers/MixingBox.mo Buildings/Fluid/Actuators/Dampers/PressureIndependent.mo +Buildings/Fluid/Actuators/Dampers/Validation/PressureIndependent.mo +Buildings/Fluid/Actuators/Dampers/Validation/package.mo +Buildings/Fluid/Actuators/Dampers/Validation/package.order Buildings/Fluid/Actuators/Dampers/package.mo Buildings/Fluid/Actuators/Dampers/package.order Buildings/Fluid/Actuators/Motors/Examples/IdealMotor.mo @@ -1216,11 +1221,7 @@ Buildings/Media/Examples/PropyleneGlycolWaterProperties.mo Buildings/Media/Examples/PropyleneGlycolWaterTemperatureEnthalpyInversion.mo Buildings/Media/Examples/SteamDerivativeCheck.mo Buildings/Media/Examples/SteamProperties.mo -<<<<<<< HEAD -Buildings/Media/Examples/SteamSaturatedProperties.mo -======= Buildings/Media/Examples/SteamSaturationConsistencyCheck.mo ->>>>>>> master Buildings/Media/Examples/SteamTemperatureEnthalpyInversion.mo Buildings/Media/Examples/WaterDerivativeCheck.mo Buildings/Media/Examples/WaterProperties.mo @@ -1407,6 +1408,8 @@ Buildings/Resources/Images/Fluid/Sensors/onePortHex.png Buildings/Resources/Images/Fluid/Sensors/onePortHex.tiff Buildings/Resources/Images/Fluid/Sensors/twoPortHex.png Buildings/Resources/Images/Fluid/Sensors/twoPortHex.tiff +Buildings/Resources/Images/Fluid/Sensors/warningIcon.png +Buildings/Resources/Images/Fluid/Sensors/warningIcon.svg Buildings/Resources/Images/Fluid/Storage/Stratified.pdf Buildings/Resources/Images/Fluid/Storage/Stratified.png Buildings/Resources/Images/Fluid/Storage/Stratified.svg @@ -1426,8 +1429,6 @@ Buildings/Resources/Images/Media/Antifreeze/PropyleneGlycolWaterError20degC.png Buildings/Resources/Images/Media/Antifreeze/PropyleneGlycolWaterProperties.pdf Buildings/Resources/Images/Media/Antifreeze/PropyleneGlycolWaterProperties.png Buildings/Resources/Images/Media/Antifreeze/propyleneGlycol.py -Buildings/Resources/Images/Media/Steam/numericalError.pdf -Buildings/Resources/Images/Media/Steam/numericalError.png Buildings/Resources/Images/Media/Water/plotCp.pdf Buildings/Resources/Images/Media/Water/plotCp.png Buildings/Resources/Images/Media/Water/plotCp.py @@ -1516,6 +1517,7 @@ Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Ex Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3.mos Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3LongHeader.mos Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3_NonzeroStart.mos +Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/LimitMin.mos Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/LocalCivilTime.mos Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/SolarTime.mos Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/Examples/ReaderTMY3.mos @@ -1544,6 +1546,7 @@ Buildings/Resources/Scripts/Dymola/Fluid/Actuators/BaseClasses/Examples/EqualPer Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Dampers/Examples/Damper.mos Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Dampers/Examples/MixingBox.mos Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Dampers/Examples/VAVBoxExponential.mos +Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Dampers/Validation/PressureIndependent.mos Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Motors/Examples/IdealMotor.mos Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Examples/ThreeWayValves.mos Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Examples/TwoWayValvePressureIndependent.mos @@ -1866,11 +1869,7 @@ Buildings/Resources/Scripts/Dymola/Media/Examples/PropyleneGlycolWaterProperties Buildings/Resources/Scripts/Dymola/Media/Examples/PropyleneGlycolWaterTemperatureEnthalpyInversion.mos Buildings/Resources/Scripts/Dymola/Media/Examples/SteamDerivativeCheck.mos Buildings/Resources/Scripts/Dymola/Media/Examples/SteamProperties.mos -<<<<<<< HEAD -Buildings/Resources/Scripts/Dymola/Media/Examples/SteamSaturatedProperties.mos -======= Buildings/Resources/Scripts/Dymola/Media/Examples/SteamSaturationConsistencyCheck.mos ->>>>>>> master Buildings/Resources/Scripts/Dymola/Media/Examples/SteamTemperatureEnthalpyInversion.mos Buildings/Resources/Scripts/Dymola/Media/Examples/WaterDerivativeCheck.mos Buildings/Resources/Scripts/Dymola/Media/Examples/WaterProperties.mos @@ -1883,6 +1882,7 @@ Buildings/Resources/Scripts/Dymola/Media/Specialized/Water/Examples/TemperatureD Buildings/Resources/Scripts/Dymola/Media/Specialized/Water/Examples/TemperatureDependentDensityTemperatureEnthalpyInversion.mos Buildings/Resources/Scripts/Dymola/Media/Specialized/Water/Examples/WaterProperties_pT.mos Buildings/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElements.mos +Buildings/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElementsTraceSubstance.mos Buildings/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Examples/SimpleRoomOneElement.mos Buildings/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Examples/SimpleRoomThreeElements.mos Buildings/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Examples/SimpleRoomTwoElements.mos @@ -1988,24 +1988,19 @@ Buildings/Resources/Scripts/Dymola/Utilities/Time/Validation/CalendarTimeMonths. Buildings/Resources/Scripts/Dymola/Utilities/Time/Validation/CalendarTimeMonthsMinus.mos Buildings/Resources/Scripts/Dymola/Utilities/Time/Validation/CalendarTimeMonthsPlus.mos Buildings/Resources/Scripts/JModelica/buildingspy_to_csv.py -<<<<<<< HEAD -Buildings/Resources/Scripts/travis/bin/dymola -Buildings/Resources/Scripts/travis/bin/jm_ipython.sh -======= Buildings/Resources/Scripts/travis/dymola/dymola ->>>>>>> master Buildings/Resources/bin/ConvertWeatherData.jar Buildings/Resources/src/convertEPW/Makefile Buildings/Resources/src/convertEPW/doc/ConvertWeatherData.html -Buildings/Resources/src/convertEPW/doc/allclasses-frame.html -Buildings/Resources/src/convertEPW/doc/allclasses-noframe.html +Buildings/Resources/src/convertEPW/doc/allclasses-index.html +Buildings/Resources/src/convertEPW/doc/allclasses.html +Buildings/Resources/src/convertEPW/doc/allpackages-index.html Buildings/Resources/src/convertEPW/doc/constant-values.html Buildings/Resources/src/convertEPW/doc/deprecated-list.html +Buildings/Resources/src/convertEPW/doc/element-list Buildings/Resources/src/convertEPW/doc/help-doc.html Buildings/Resources/src/convertEPW/doc/index-all.html Buildings/Resources/src/convertEPW/doc/index.html -<<<<<<< HEAD -======= Buildings/Resources/src/convertEPW/doc/jquery/external/jquery/jquery.js Buildings/Resources/src/convertEPW/doc/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png Buildings/Resources/src/convertEPW/doc/jquery/images/ui-bg_glass_65_dadada_1x400.png @@ -2035,14 +2030,19 @@ Buildings/Resources/src/convertEPW/doc/jquery/jszip/dist/jszip.js Buildings/Resources/src/convertEPW/doc/jquery/jszip/dist/jszip.min.js Buildings/Resources/src/convertEPW/doc/member-search-index.js Buildings/Resources/src/convertEPW/doc/member-search-index.zip ->>>>>>> master Buildings/Resources/src/convertEPW/doc/overview-tree.html -Buildings/Resources/src/convertEPW/doc/package-frame.html -Buildings/Resources/src/convertEPW/doc/package-list +Buildings/Resources/src/convertEPW/doc/package-search-index.js +Buildings/Resources/src/convertEPW/doc/package-search-index.zip Buildings/Resources/src/convertEPW/doc/package-summary.html Buildings/Resources/src/convertEPW/doc/package-tree.html +Buildings/Resources/src/convertEPW/doc/resources/glass.png Buildings/Resources/src/convertEPW/doc/resources/inherit.gif +Buildings/Resources/src/convertEPW/doc/resources/x.png +Buildings/Resources/src/convertEPW/doc/script.js +Buildings/Resources/src/convertEPW/doc/search.js Buildings/Resources/src/convertEPW/doc/stylesheet.css +Buildings/Resources/src/convertEPW/doc/type-search-index.js +Buildings/Resources/src/convertEPW/doc/type-search-index.zip Buildings/Resources/src/convertEPW/src/ConvertWeatherData.java Buildings/Resources/src/convertEPW/src/Makefile Buildings/Resources/src/convertEPW/src/Manifest.txt @@ -2060,6 +2060,7 @@ Buildings/ThermalZones/ReducedOrder/EquivalentAirTemperature/VDI6007WithWindow.m Buildings/ThermalZones/ReducedOrder/EquivalentAirTemperature/package.mo Buildings/ThermalZones/ReducedOrder/EquivalentAirTemperature/package.order Buildings/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElements.mo +Buildings/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElementsTraceSubstance.mo Buildings/ThermalZones/ReducedOrder/Examples/SimpleRoomOneElement.mo Buildings/ThermalZones/ReducedOrder/Examples/SimpleRoomThreeElements.mo Buildings/ThermalZones/ReducedOrder/Examples/SimpleRoomTwoElements.mo diff --git a/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerChillerDXHeatingEconomizer.mo b/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerChillerDXHeatingEconomizer.mo index 20e98caa8a3..bcf2e856340 100644 --- a/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerChillerDXHeatingEconomizer.mo +++ b/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerChillerDXHeatingEconomizer.mo @@ -6,127 +6,200 @@ model ControllerChillerDXHeatingEconomizer parameter Modelica.SIunits.Temperature TSupChi_nominal "Design value for chiller leaving water temperature"; parameter Real minAirFlo( - min=0, - max=1, - unit="1") = 0.2 - "Minimum airflow rate of system" - annotation(Dialog(group="Air design")); + final min=0, + final max=1, + final unit="1") + "Minimum airflow fraction of system" + annotation(Dialog(group="Setpoints")); + parameter Modelica.SIunits.DimensionlessRatio minOAFra + "Minimum outdoor air fraction of system" + annotation(Dialog(group="Setpoints")); + parameter Modelica.SIunits.Temperature TSetSupAir + "Cooling supply air temperature setpoint" + annotation(Dialog(group="Setpoints")); + parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerTypeHea= + Buildings.Controls.OBC.CDL.Types.SimpleController.PI + "Type of controller" + annotation(Dialog(group="Heating coil control")); + parameter Real kHea( + final unit="1/K")=0.1 + "Gain for heating coil control signal" + annotation(Dialog(group="Heating coil control")); + parameter Real TiHea( + final unit="s", + final quantity="Time")=900 + "Time constant of integrator block for heating coil control signal" + annotation(Dialog(group="Heating coil control", + enable=controllerTypeHea == Buildings.Controls.OBC.CDL.Types.SimpleController.PI + or controllerTypeHea == Buildings.Controls.OBC.CDL.Types.SimpleController.PID)); + parameter Real TdHea( + final unit="s", + final quantity="Time")=0.1 + "Time constant of derivative block for heating coil control signal" + annotation (Dialog(group="Heating coil control", + enable=controllerTypeHea == Buildings.Controls.OBC.CDL.Types.SimpleController.PD + or controllerTypeHea == Buildings.Controls.OBC.CDL.Types.SimpleController.PID)); + parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerTypeCoo= + Buildings.Controls.OBC.CDL.Types.SimpleController.PI + "Type of controller" + annotation(Dialog(group="Cooling coil control")); + parameter Real kCoo( + final unit="1/K")=0.1 + "Gain for cooling coil control signal" + annotation(Dialog(group="Cooling coil control")); + parameter Real TiCoo( + final unit="s")=900 + "Time constant of integrator block for cooling coil control signal" + annotation(Dialog(group="Cooling coil control", + enable=controllerTypeCoo == Buildings.Controls.OBC.CDL.Types.SimpleController.PI + or controllerTypeCoo == Buildings.Controls.OBC.CDL.Types.SimpleController.PID)); + parameter Real TdCoo( + final unit="s")=0.1 + "Time constant of derivative block for cooling coil control signal" + annotation (Dialog(group="Cooling coil control", + enable=controllerTypeCoo == Buildings.Controls.OBC.CDL.Types.SimpleController.PD + or controllerTypeCoo == Buildings.Controls.OBC.CDL.Types.SimpleController.PID)); + parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerTypeFan= + Buildings.Controls.OBC.CDL.Types.SimpleController.PI + "Type of controller" + annotation(Dialog(group="Fan control")); + parameter Real kFan(final unit="1/K")=0.1 + "Gain for fan signal" + annotation(Dialog(group="Fan control")); + parameter Real TiFan( + final unit="s", + final quantity="Time")=900 + "Time constant of integrator block for fan signal" + annotation(Dialog(group="Fan control", + enable=controllerTypeFan == Buildings.Controls.OBC.CDL.Types.SimpleController.PI + or controllerTypeFan == Buildings.Controls.OBC.CDL.Types.SimpleController.PID)); + parameter Real TdFan( + final unit="s", + final quantity="Time")=0.1 + "Time constant of derivative block for fan signal" + annotation (Dialog(group="Fan control", + enable=controllerTypeFan == Buildings.Controls.OBC.CDL.Types.SimpleController.PD + or controllerTypeFan == Buildings.Controls.OBC.CDL.Types.SimpleController.PID)); + parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerTypeEco= + Buildings.Controls.OBC.CDL.Types.SimpleController.PI + "Type of controller" + annotation(Dialog(group="Economizer control")); + parameter Real kEco(final unit="1/K")=0.1 + "Gain for economizer control signal" + annotation(Dialog(group="Economizer control")); + parameter Real TiEco=300 + "Time constant of integrator block for economizer control signal" + annotation(Dialog(group="Economizer control", + enable=controllerTypeEco == Buildings.Controls.OBC.CDL.Types.SimpleController.PI + or controllerTypeEco == Buildings.Controls.OBC.CDL.Types.SimpleController.PID)); + parameter Real TdEco( + final unit="s", + final quantity="Time")=0.1 + "Time constant of derivative block for economizer control signal" + annotation (Dialog(group="Economizer control", + enable=controllerTypeEco == Buildings.Controls.OBC.CDL.Types.SimpleController.PD + or controllerTypeEco == Buildings.Controls.OBC.CDL.Types.SimpleController.PID)); - parameter Modelica.SIunits.DimensionlessRatio minOAFra "Minimum outdoor air fraction of system" - annotation(Dialog(group="Air design")); - - parameter Modelica.SIunits.Temperature TSetSupAir "Cooling supply air temperature setpoint" - annotation(Dialog(group="Air design")); - - parameter Real kHea(min=Modelica.Constants.small) = 2 - "Gain of heating controller" - annotation(Dialog(group="Control gain")); - - parameter Real kCoo(min=Modelica.Constants.small)=1 - "Gain of controller for cooling valve" - annotation(Dialog(group="Control gain")); - - parameter Real kFan(min=Modelica.Constants.small) = 0.5 - "Gain of controller for fan" - annotation(Dialog(group="Control gain")); - - parameter Real kEco(min=Modelica.Constants.small) = 4 - "Gain of controller for economizer" - annotation(Dialog(group="Control gain")); - - Modelica.Blocks.Interfaces.RealInput TRoo( + Buildings.Controls.OBC.CDL.Interfaces.RealInput TSetRooCoo( final unit="K", - displayUnit="degC") "Zone temperature measurement" - annotation (Placement( - transformation( - extent={{-20,-20},{20,20}}, - origin={-120,-60}))); - - Modelica.Blocks.Interfaces.RealInput TSetRooCoo( + displayUnit="degC", + final quantity="ThermodynamicTemperature") + "Zone cooling setpoint temperature" + annotation (Placement(transformation(extent={{-140,40},{-100,80}}), + iconTransformation(extent={{-140,10},{-100,50}}))); + Buildings.Controls.OBC.CDL.Interfaces.RealInput TSetRooHea( final unit="K", - displayUnit="degC") - "Zone cooling setpoint temperature" annotation (Placement(transformation( - extent={{20,-20},{-20,20}}, - rotation=180, - origin={-120,60}))); - Modelica.Blocks.Interfaces.RealInput TSetRooHea( + displayUnit="degC", + final quantity="ThermodynamicTemperature") + "Zone heating setpoint temperature" + annotation (Placement(transformation(extent={{-140,100},{-100,140}}), + iconTransformation(extent={{-140,40},{-100,80}}))); + Buildings.Controls.OBC.CDL.Interfaces.RealInput TRoo( final unit="K", - displayUnit="degC") - "Zone heating setpoint temperature" annotation (Placement(transformation( - extent={{20,-20},{-20,20}}, - rotation=180, - origin={-120,100}))); - - Modelica.Blocks.Interfaces.RealInput TMix( + displayUnit="degC", + final quantity="ThermodynamicTemperature") + "Zone temperature measurement" + annotation (Placement(transformation(extent={{-20,-20},{20,20}},origin={-120,-80}), + iconTransformation(extent={{-20,-20},{20,20}},origin={-120,-60}))); + Buildings.Controls.OBC.CDL.Interfaces.RealInput TMix( final unit="K", - displayUnit="degC") + displayUnit="degC", + final quantity="ThermodynamicTemperature") "Measured mixed air temperature" - annotation (Placement(transformation(extent={{-140,0},{-100,40}}))); - - Modelica.Blocks.Interfaces.RealInput TSup( + annotation (Placement(transformation(extent={{-140,10},{-100,50}}), + iconTransformation(extent={{-140,70},{-100,110}}))); + Buildings.Controls.OBC.CDL.Interfaces.RealInput TSup( final unit="K", - displayUnit="degC") + displayUnit="degC", + final quantity="ThermodynamicTemperature") "Measured supply air temperature after the cooling coil" - annotation (Placement(transformation(extent={{-140,-110},{-100,-70}}))); - - Modelica.Blocks.Interfaces.RealInput TOut( + annotation (Placement(transformation(extent={{-140,-130},{-100,-90}}), + iconTransformation(extent={{-140,-110},{-100,-70}}))); + Buildings.Controls.OBC.CDL.Interfaces.RealInput TOut( final unit="K", - displayUnit="degC") + displayUnit="degC", + final quantity="ThermodynamicTemperature") "Measured outside air temperature" - annotation (Placement(transformation(extent={{-140,-40},{-100,0}}))); - - Modelica.Blocks.Interfaces.RealOutput yHea(final unit="1") "Control signal for heating coil" - annotation (Placement(transformation(extent={{100,50},{120,70}}))); - - Modelica.Blocks.Interfaces.RealOutput yFan(final unit="1") "Control signal for fan" - annotation (Placement(transformation(extent={{100,80},{120,100}}))); - - Modelica.Blocks.Interfaces.RealOutput yOutAirFra(final unit="1") + annotation (Placement(transformation(extent={{-140,-60},{-100,-20}}), + iconTransformation(extent={{-140,-50},{-100,-10}}))); + Buildings.Controls.OBC.CDL.Interfaces.RealOutput yHea( + final unit="1") "Control signal for heating coil" + annotation (Placement(transformation(extent={{100,44},{120,64}}), + iconTransformation(extent={{100,30},{140,70}}))); + Buildings.Controls.OBC.CDL.Interfaces.RealOutput yFan( + final unit="1") "Control signal for fan" + annotation (Placement(transformation(extent={{100,80},{120,100}}), + iconTransformation(extent={{100,60},{140,100}}))); + Buildings.Controls.OBC.CDL.Interfaces.RealOutput yOutAirFra( + final unit="1") "Control signal for outside air fraction" - annotation (Placement(transformation(extent={{100,20},{120,40}}))); - - Modelica.Blocks.Interfaces.RealOutput yCooCoiVal(final unit="1") + annotation (Placement(transformation(extent={{100,10},{120,30}}), + iconTransformation(extent={{100,0},{140,40}}))); + Buildings.Controls.OBC.CDL.Interfaces.RealOutput yCooCoiVal( + final unit="1") "Control signal for cooling coil valve" - annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - - Modelica.Blocks.Interfaces.RealOutput TSetSupChi( + annotation (Placement(transformation(extent={{100,-30},{120,-10}}), + iconTransformation(extent={{100,-40},{140,0}}))); + Buildings.Controls.OBC.CDL.Interfaces.RealOutput TSetSupChi( final unit="K", displayUnit="degC") "Set point for chiller leaving water temperature" - annotation (Placement(transformation(extent={{100,-90},{120,-70}}))); - - Modelica.Blocks.Interfaces.BooleanOutput chiOn "On signal for chiller" - annotation (Placement(transformation(extent={{100,-50},{120,-30}}))); + annotation (Placement(transformation(extent={{100,-100},{120,-80}}), + iconTransformation(extent={{100,-100},{140,-60}}))); + Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput chiOn + "On signal for chiller" + annotation (Placement(transformation(extent={{100,-64},{120,-44}}), + iconTransformation(extent={{100,-70},{140,-30}}))); BaseClasses.ControllerHeatingFan conSup( - minAirFlo = minAirFlo, - kHea = kHea, - kFan = kFan) "Heating coil, cooling coil and fan controller" - annotation (Placement(transformation(extent={{-40,70},{-20,90}}))); + final controllerTypeHea=controllerTypeHea, + final kHea=kHea, + final TiHea=TiHea, + final TdHea=TdHea, + final controllerTypeFan=controllerTypeFan, + final kFan=kFan, + final TiFan=TiFan, + final TdFan=TdFan, + final minAirFlo = minAirFlo) + "Heating coil and fan controller" + annotation (Placement(transformation(extent={{-60,80},{-40,100}}))); BaseClasses.ControllerEconomizer conEco( - final kEco = kEco) + final controllerTypeEco=controllerTypeEco, + final kEco=kEco, + final TiEco=TiEco, + final TdEco=TdEco) "Economizer control" - annotation (Placement(transformation(extent={{0,40},{20,60}}))); - - Controls.OBC.CDL.Continuous.Hysteresis hysChiPla( - uLow=-1, - uHigh=0) - "Hysteresis with delay to switch on cooling" - annotation (Placement(transformation(extent={{40,-50},{60,-30}}))); - - Modelica.Blocks.Math.Feedback errTRooCoo - "Control error on room temperature for cooling" - annotation (Placement(transformation(extent={{-42,-70},{-22,-50}}))); - Controls.Continuous.LimPID conCooVal( - controllerType=Modelica.Blocks.Types.SimpleController.P, + annotation (Placement(transformation(extent={{40,60},{60,80}}))); + Buildings.Controls.Continuous.LimPID conCooVal( + final controllerType=controllerTypeCoo, + final k=kCoo, + final Ti=TiCoo, + final Td=TdCoo, final yMax=1, final yMin=0, - final k=kCoo, - final reverseAction=true) + final reverseActing=false) "Cooling coil valve controller" annotation (Placement(transformation(extent={{0,-30},{20,-10}}))); -<<<<<<< HEAD:Buildings/Air/Systems/SingleZone/VAV/ChillerDXHeatingEconomizerController.mo -======= Buildings.Controls.OBC.CDL.Logical.Switch swi "Switch the outdoor air fraction to 0 when in unoccupied mode" annotation (Placement(transformation(extent={{0,20},{20,40}}))); @@ -152,73 +225,22 @@ model ControllerChillerDXHeatingEconomizer Buildings.Controls.OBC.CDL.Continuous.Greater chiOnTRoo(h=1) "Chiller on signal based on room temperature" annotation (Placement(transformation(extent={{20,-80},{40,-60}}))); ->>>>>>> master:Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerChillerDXHeatingEconomizer.mo protected Modelica.Blocks.Sources.Constant TSetSupChiConst( final k=TSupChi_nominal) "Set point for chiller temperature" - annotation (Placement(transformation(extent={{40,-90},{60,-70}}))); - + annotation (Placement(transformation(extent={{60,-100},{80,-80}}))); Modelica.Blocks.Sources.Constant conMinOAFra( final k=minOAFra) "Minimum outside air fraction" - annotation (Placement(transformation(extent={{-70,38},{-50,58}}))); - + annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); Modelica.Blocks.Sources.Constant TSetSupAirConst( final k=TSetSupAir) "Set point for supply air temperature" - annotation (Placement(transformation(extent={{-60,-30},{-40,-10}}))); + annotation (Placement(transformation(extent={{-40,-60},{-20,-40}}))); equation -<<<<<<< HEAD:Buildings/Air/Systems/SingleZone/VAV/ChillerDXHeatingEconomizerController.mo - connect(conMinOAFra.y,conEco. minOAFra) annotation (Line(points={{-49,48},{ - -26,48},{-1,48}}, color={0,0,127})); - connect(TSetSupAirConst.y, conEco.TMixSet) annotation (Line(points={{-39,-20}, - {-20,-20},{-20,58},{-1,58}}, color={0,0,127})); - connect(errTRooCoo.y, hysChiPla.u) annotation (Line(points={{-23,-60},{0,-60}, - {0,-40},{38,-40}}, color={0,0,127})); - connect(TSetRooCoo, errTRooCoo.u2) annotation (Line(points={{-120,60},{-80,60}, - {-80,-80},{-32,-80},{-32,-68}}, color={0,0,127})); - connect(errTRooCoo.u1, TRoo) annotation (Line(points={{-40,-60},{-74,-60},{ - -120,-60}}, color={0,0,127})); - connect(TSetSupAirConst.y,conCooVal. u_s) - annotation (Line(points={{-39,-20},{-2,-20}}, color={0,0,127})); - connect(conSup.TSetRooHea, TSetRooHea) annotation (Line(points={{-41,86},{-88, - 86},{-88,100},{-120,100}}, - color={0,0,127})); - connect(conSup.TSetRooCoo, TSetRooCoo) annotation (Line(points={{-41,80},{-80, - 80},{-80,60},{-120,60}}, color={0,0,127})); - connect(conSup.TRoo, TRoo) annotation (Line(points={{-41,74},{-74,74},{-74, - -60},{-120,-60}}, - color={0,0,127})); - connect(conSup.yHea, conEco.yHea) annotation (Line(points={{-19,76},{-10,76}, - {-10,42},{-1,42}},color={0,0,127})); - connect(conEco.TMix, TMix) annotation (Line(points={{-1,55},{-40,55},{-40,20}, - {-120,20}}, color={0,0,127})); - connect(conEco.TRet, TRoo) annotation (Line(points={{-1,52},{-34,52},{-34,12}, - {-88,12},{-88,-60},{-120,-60}}, color={0,0,127})); - connect(conEco.TOut, TOut) annotation (Line(points={{-1,45},{-30,45},{-30,8}, - {-94,8},{-94,-20},{-120,-20}}, color={0,0,127})); - connect(conSup.yHea, yHea) annotation (Line(points={{-19,76},{40,76},{40,60}, - {80,60},{110,60}}, - color={0,0,127})); - connect(conSup.yFan, yFan) annotation (Line(points={{-19,84},{40,84},{40,90}, - {40,90},{40,90},{110,90},{110,90}}, - color={0,0,127})); - connect(conEco.yOutAirFra, yOutAirFra) annotation (Line(points={{21,50},{80,50}, - {80,30},{110,30}}, color={0,0,127})); - connect(conCooVal.y, yCooCoiVal) - annotation (Line(points={{21,-20},{76,-20},{76,0},{110,0}}, - color={0,0,127})); - connect(TSetSupChiConst.y, TSetSupChi) - annotation (Line(points={{61,-80},{110,-80}}, color={0,0,127})); - connect(conCooVal.u_m, TSup) - annotation (Line(points={{10,-32},{10,-90},{-120,-90}}, color={0,0,127})); - connect(hysChiPla.y, chiOn) annotation (Line(points={{61,-40},{80,-40},{110, - -40}}, color={255,0,255})); - annotation (Icon(graphics={Line(points={{-100,-100},{0,2},{-100,100}}, color= -======= connect(TSetSupAirConst.y,conCooVal. u_s) annotation (Line(points={{-19,-50}, {-10,-50},{-10,-20},{-2,-20}}, color={0,0,127})); connect(conSup.TRoo, TRoo) annotation (Line(points={{-61,84},{-74,84},{-74, @@ -286,16 +308,14 @@ equation annotation ( defaultComponentName="conChiDXHeaEco", Icon(graphics={Line(points={{-100,-100},{0,2},{-100,100}}, color= ->>>>>>> master:Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerChillerDXHeatingEconomizer.mo {0,0,0})}), Documentation(info="

-This is the controller for the VAV system with economizer, heating coil and cooling coil. +This is a controller for the single-zone VAV system with an economizer, a +heating coil and a cooling coil.

", revisions=" -<<<<<<< HEAD:Buildings/Air/Systems/SingleZone/VAV/ChillerDXHeatingEconomizerController.mo -")); -end ChillerDXHeatingEconomizerController; -======= "), Diagram(coordinateSystem(extent={{-100,-120},{100,140}}))); end ControllerChillerDXHeatingEconomizer; ->>>>>>> master:Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerChillerDXHeatingEconomizer.mo diff --git a/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerEconomizer.mo b/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerEconomizer.mo index 2cea7bae3eb..a5b10f96a3c 100644 --- a/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerEconomizer.mo +++ b/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerEconomizer.mo @@ -2,92 +2,123 @@ within Buildings.Air.Systems.SingleZone.VAV.BaseClasses; model ControllerEconomizer "Controller for economizer" extends Modelica.Blocks.Icons.Block; - parameter Real kEco(min=Modelica.Constants.small) = 1 - "Gain of controller" - annotation(Dialog(group="Control gain")); + parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerTypeEco= + Buildings.Controls.OBC.CDL.Types.SimpleController.PI + "Type of controller" + annotation(Dialog(group="Economizer control signal")); + parameter Real kEco(final unit="1/K")=0.1 + "Gain for economizer control signal" + annotation(Dialog(group="Economizer control signal")); + parameter Real TiEco( + final unit="s", + final quantity="Time")=900 + "Time constant of integrator block for economizer control signal" + annotation(Dialog(group="Economizer control signal", + enable=controllerTypeEco == Buildings.Controls.OBC.CDL.Types.SimpleController.PI + or controllerTypeEco == Buildings.Controls.OBC.CDL.Types.SimpleController.PID)); + parameter Real TdEco( + final unit="s", + final quantity="Time")=0.1 + "Time constant of derivative block for economizer control signal" + annotation (Dialog(group="Economizer control signal", + enable=controllerTypeEco == Buildings.Controls.OBC.CDL.Types.SimpleController.PD + or controllerTypeEco == Buildings.Controls.OBC.CDL.Types.SimpleController.PID)); Modelica.Blocks.Interfaces.RealInput TMixSet( final unit="K", - displayUnit="degC") + displayUnit="degC", + final quantity="ThermodynamicTemperature") "Mixed air setpoint temperature" annotation (Placement(transformation(extent={{-120,70},{-100,90}}))); Modelica.Blocks.Interfaces.RealInput TMix( final unit="K", - displayUnit="degC") + displayUnit="degC", + final quantity="ThermodynamicTemperature") "Measured mixed air temperature" annotation (Placement(transformation(extent={{-120,40},{-100,60}}))); - Modelica.Blocks.Interfaces.RealInput TOut( final unit="K", - displayUnit="degC") + displayUnit="degC", + final quantity="ThermodynamicTemperature") "Measured outside air temperature" annotation (Placement( transformation(extent={{-120,-60},{-100,-40}}))); - Modelica.Blocks.Interfaces.RealInput yHea(final unit="1") - "Control signal for heating coil" annotation (Placement(transformation( - extent={{-120,-90},{-100,-70}}))); - + Modelica.Blocks.Interfaces.BooleanInput cooSta "Cooling status" + annotation (Placement(transformation(extent={{-120,-90},{-100,-70}}))); Modelica.Blocks.Interfaces.RealInput TRet( final unit="K", - displayUnit="degC") + displayUnit="degC", + final quantity="ThermodynamicTemperature") "Return air temperature" annotation (Placement(transformation(extent={{-120,10},{-100,30}}))); - Modelica.Blocks.Interfaces.RealInput minOAFra( - min = 0, - max = 1, + final min = 0, + final max = 1, final unit="1") "Minimum outside air fraction" annotation (Placement(transformation(extent={{-120,-30},{-100,-10}}))); - - Modelica.Blocks.Interfaces.RealOutput yOutAirFra(final unit="1") + Modelica.Blocks.Interfaces.RealOutput yOutAirFra( + final unit="1") "Control signal for outside air fraction" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - Modelica.Blocks.Nonlinear.VariableLimiter Limiter(strict=true) + Modelica.Blocks.Nonlinear.VariableLimiter Limiter( + final strict=true) "Signal limiter" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Modelica.Blocks.Sources.Constant const(final k=1) + Modelica.Blocks.Sources.Constant const( + final k=1) "Constant output signal with value 1" annotation (Placement(transformation(extent={{20,60},{40,80}}))); - Modelica.Blocks.Logical.Switch switch1 "Switch to select control output" annotation (Placement(transformation(extent={{20,10},{40,30}}))); - - Modelica.Blocks.MathBoolean.And and1(final nu=3) "Logical and" + Modelica.Blocks.MathBoolean.And and1( + final nu=3) "Logical and" annotation (Placement(transformation(extent={{20,-60},{40,-40}}))); Controls.Continuous.LimPID con( + final controllerType=controllerTypeEco, final k=kEco, - final reverseAction=true, + final Ti=TiEco, + final Td=TdEco, + final reverseActing=false, final yMax=Modelica.Constants.inf, - final yMin=-Modelica.Constants.inf, - controllerType=Modelica.Blocks.Types.SimpleController.P) + final yMin=-Modelica.Constants.inf) "Controller" annotation (Placement(transformation(extent={{-90,70},{-70,90}}))); Modelica.Blocks.Math.Feedback feedback "Control error" - annotation (Placement(transformation(extent={{-50,-38},{-30,-18}}))); - Buildings.Controls.OBC.CDL.Continuous.HysteresisWithHold hysYHea( - trueHoldDuration=60*15, - uLow=0.05, - uHigh=0.15) "Hysteresis with delay for heating signal" - annotation (Placement(transformation(extent={{-80,-90},{-60,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.HysteresisWithHold hysTMix( - uLow=-0.5, - uHigh=0.5, - trueHoldDuration=60*15) - "Hysteresis with delay for mixed air temperature" - annotation (Placement(transformation(extent={{-20,-60},{0,-40}}))); - Modelica.Blocks.Logical.Not not1 - annotation (Placement(transformation(extent={{-40,-90},{-20,-70}}))); - + annotation (Placement(transformation(extent={{-80,-40},{-60,-20}}))); Modelica.Blocks.Math.Feedback feedback1 - annotation (Placement(transformation(extent={{-70,20},{-50,40}}))); - Buildings.Controls.OBC.CDL.Continuous.HysteresisWithHold hysCooPot( - uHigh=0.5, - uLow=0, - trueHoldDuration=60*15) + annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); + Controls.OBC.CDL.Continuous.Hysteresis hysChiPla( + final uLow=0.95, + final uHigh=0.98) + "Hysteresis with delay to switch on cooling" + annotation (Placement(transformation(extent={{60,-60},{80,-40}}))); + Modelica.Blocks.Logical.Or or1 "Saturated ecnomizer or no economizer" + annotation (Placement(transformation(extent={{70,-90},{90,-70}}))); + Modelica.Blocks.Interfaces.BooleanOutput yCoiSta "Cooling coil status" + annotation (Placement(transformation(extent={{100,-90},{120,-70}}))); + Modelica.Blocks.Logical.Not not1 "No economizer" + annotation (Placement(transformation(extent={{40,-100},{60,-80}}))); + + Controls.OBC.CDL.Continuous.Hysteresis hysCooPot( + final uLow=0, + final uHigh=0.5) "Hysteresis with delay to check for cooling potential of outside air" - annotation (Placement(transformation(extent={{-40,20},{-20,40}}))); + annotation (Placement(transformation(extent={{-54,20},{-34,40}}))); + Controls.OBC.CDL.Logical.TrueFalseHold truFalHolCooPot( + final trueHoldDuration=60*15) + "True/false hold for cooling potential" + annotation (Placement(transformation(extent={{-26,20},{-6,40}}))); + Controls.OBC.CDL.Logical.TrueFalseHold truFalHolTMix( + final trueHoldDuration=60*15) + "True/false hold for mixing temperature" + annotation (Placement(transformation(extent={{-24,-40},{-4,-20}}))); + Controls.OBC.CDL.Continuous.Hysteresis hysTMix( + final uLow=-0.5, + final uHigh=0.5) + "Hysteresis with delay for mixed air temperature" + annotation (Placement(transformation(extent={{-52,-40},{-32,-20}}))); equation connect(Limiter.limit2, minOAFra) annotation (Line(points={{58,-8},{-20,-8},{ -20,-8},{-94,-8},{-94,-20},{-110,-20},{-110,-20}}, @@ -101,45 +132,61 @@ equation connect(and1.y, switch1.u2) annotation (Line(points={{41.5,-50},{48,-50},{48, -6},{10,-6},{10,20},{18,20}}, color={255,0,255})); - connect(con.u_s, TMixSet) - annotation (Line(points={{-92,80},{-92,80},{-110,80}}, color={0,0,127})); - connect(TMix, con.u_m) - annotation (Line(points={{-110,50},{-80,50},{-80,68}}, color={0,0,127})); + connect(con.u_s, TMixSet) annotation (Line(points={{-92,80},{-92,80},{-110,80}}, color={0,0,127})); + connect(TMix, con.u_m) annotation (Line(points={{-110,50},{-80,50},{-80,68}}, color={0,0,127})); connect(con.y, switch1.u1) annotation (Line(points={{-69,80},{12,80},{12,28}, {18,28}}, color={0,0,127})); - connect(TOut, feedback.u2) annotation (Line(points={{-110,-50},{-40,-50},{-40, - -36}}, color={0,0,127})); - connect(feedback.u1, TMix) annotation (Line(points={{-48,-28},{-80,-28},{-80, - 50},{-110,50}}, color={0,0,127})); - connect(Limiter.y, yOutAirFra) - annotation (Line(points={{81,0},{110,0}}, color={0,0,127})); - connect(hysYHea.u, yHea) - annotation (Line(points={{-82,-80},{-110,-80}}, color={0,0,127})); + connect(TOut, feedback.u2) annotation (Line(points={{-110,-50},{-70,-50},{-70, + -38}}, color={0,0,127})); + connect(feedback.u1, TMix) annotation (Line(points={{-78,-30},{-90,-30},{-90,50}, + {-110,50}}, color={0,0,127})); + connect(Limiter.y, yOutAirFra) annotation (Line(points={{81,0},{110,0}}, color={0,0,127})); + connect(feedback1.u1, TRet) annotation (Line(points={{-78,30},{-96,30},{-96, + 20},{-110,20}}, color={0,0,127})); + connect(feedback1.u2,TOut) annotation (Line(points={{-70,22},{-70,16},{-86, + 16},{-86,-50},{-110,-50}}, color={0,0,127})); + connect(Limiter.y, hysChiPla.u) annotation (Line(points={{81,0},{90,0},{90, + -20},{52,-20},{52,-50},{58,-50}}, color={0,0,127})); + connect(or1.y, yCoiSta) annotation (Line(points={{91,-80},{110,-80}}, color={255,0,255})); + connect(not1.y, or1.u2) annotation (Line(points={{61,-90},{64,-90},{64,-88},{ + 68,-88}}, color={255,0,255})); + connect(and1.y, not1.u) annotation (Line(points={{41.5,-50},{48,-50},{48,-70}, + {30,-70},{30,-90},{38,-90}}, color={255,0,255})); + connect(hysChiPla.y, or1.u1) annotation (Line(points={{82,-50},{88,-50},{88, + -64},{62,-64},{62,-80},{68,-80}}, color={255,0,255})); + connect(feedback.y, hysTMix.u) - annotation (Line(points={{-31,-28},{-28,-28},{-28,-50},{-22,-50}}, - color={0,0,127})); - connect(feedback1.u1, TRet) - annotation (Line(points={{-68,30},{-88,30},{-88,20},{-110,20}}, - color={0,0,127})); - connect(feedback1.u2,TOut) - annotation (Line(points={{-60,22},{-60,-50},{-110,-50}}, color={0,0,127})); + annotation (Line(points={{-61,-30},{-54,-30}}, color={0,0,127})); + connect(hysTMix.y, truFalHolTMix.u) + annotation (Line(points={{-30,-30},{-26,-30}}, color={255,0,255})); connect(feedback1.y, hysCooPot.u) - annotation (Line(points={{-51,30},{-42,30}}, color={0,0,127})); - connect(hysCooPot.y, and1.u[1]) annotation (Line(points={{-19,30},{6,30},{6, - -45.3333},{20,-45.3333}}, color={255,0,255})); - connect(hysTMix.y, and1.u[2]) - annotation (Line(points={{1,-50},{20,-50},{20,-50}}, color={255,0,255})); - connect(not1.y, and1.u[3]) annotation (Line(points={{-19,-80},{-19,-80},{6, - -80},{6,-54.6667},{20,-54.6667}}, color={255,0,255})); - connect(hysYHea.y, not1.u) annotation (Line(points={{-59,-80},{-42,-80},{-42, - -80}}, color={255,0,255})); - annotation ( Documentation(info=" + annotation (Line(points={{-61,30},{-56,30}}, color={0,0,127})); + connect(hysCooPot.y, truFalHolCooPot.u) + annotation (Line(points={{-32,30},{-28,30}}, color={255,0,255})); + connect(truFalHolCooPot.y, and1.u[1]) annotation (Line(points={{-4,30},{8,30}, + {8,-45.3333},{20,-45.3333}}, color={255,0,255})); + connect(truFalHolTMix.y, and1.u[2]) annotation (Line(points={{-2,-30},{4,-30}, + {4,-50},{20,-50}}, color={255,0,255})); + connect(cooSta, and1.u[3]) annotation (Line(points={{-110,-80},{-44,-80},{-44, + -54.6667},{20,-54.6667}}, color={255,0,255})); + annotation ( + defaultComponentName="conEco", + Documentation(info="

Economizer controller.

", revisions="