diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml index b01262dd396..31d5ad682e2 100644 --- a/.github/workflows/formatting.yml +++ b/.github/workflows/formatting.yml @@ -40,7 +40,7 @@ jobs: run: pip3 install --upgrade pip wheel - name: "Install BuildingsPy" - run: pip3 install git+https://github.com/lbl-srg/BuildingsPy@v5.1.0 + run: pip3 install git+https://github.com/lbl-srg/BuildingsPy@0bc654fd913c83f64163be167807e8989eff0293 - name: Check for UTF-8 BOM run : | diff --git a/.travis.yml b/.travis.yml index 367347e5c99..5d01ccba26a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ services: env: global: - DOCKER_REPONAME=lbnlblum - - BUILDINGSPY_VERSION=BuildingsPy@v5.1.0 + - BUILDINGSPY_VERSION=BuildingsPy@0bc654fd913c83f64163be167807e8989eff0293 - OMC_VERSION=ubuntu-2204-omc:1.22.1-1 - OPTIMICA_VERSION=travis-ubuntu-2204-optimica:1.48.2 - DYMOLA_VERSION=travis_ubuntu-2004_dymola:2024x-x86_64 diff --git a/Buildings/.copiedFiles.txt b/Buildings/.copiedFiles.txt index 506ec78b27f..d21f3ece5b2 100644 --- a/Buildings/.copiedFiles.txt +++ b/Buildings/.copiedFiles.txt @@ -861,6 +861,51 @@ Buildings/Fluid/Chillers/Examples/Carnot_TEva.mo Buildings/Fluid/Chillers/Examples/Carnot_y.mo Buildings/Fluid/Chillers/Examples/package.mo Buildings/Fluid/Chillers/Examples/package.order +Buildings/Fluid/Chillers/ModularReversible/BaseClasses/RefrigerantCycle.mo +Buildings/Fluid/Chillers/ModularReversible/BaseClasses/package.mo +Buildings/Fluid/Chillers/ModularReversible/BaseClasses/package.order +Buildings/Fluid/Chillers/ModularReversible/CarnotWithLosses.mo +Buildings/Fluid/Chillers/ModularReversible/Controls/Safety/OperationalEnvelope.mo +Buildings/Fluid/Chillers/ModularReversible/Controls/Safety/package.mo +Buildings/Fluid/Chillers/ModularReversible/Controls/Safety/package.order +Buildings/Fluid/Chillers/ModularReversible/Controls/package.mo +Buildings/Fluid/Chillers/ModularReversible/Controls/package.order +Buildings/Fluid/Chillers/ModularReversible/Data/TableData2D/EN14511/Carrier30XWP1012_1MW.mo +Buildings/Fluid/Chillers/ModularReversible/Data/TableData2D/EN14511/SingleSplitRXM20R.mo +Buildings/Fluid/Chillers/ModularReversible/Data/TableData2D/EN14511/Vitocal251A08.mo +Buildings/Fluid/Chillers/ModularReversible/Data/TableData2D/EN14511/package.mo +Buildings/Fluid/Chillers/ModularReversible/Data/TableData2D/EN14511/package.order +Buildings/Fluid/Chillers/ModularReversible/Data/TableData2D/Generic.mo +Buildings/Fluid/Chillers/ModularReversible/Data/TableData2D/package.mo +Buildings/Fluid/Chillers/ModularReversible/Data/TableData2D/package.order +Buildings/Fluid/Chillers/ModularReversible/Data/package.mo +Buildings/Fluid/Chillers/ModularReversible/Data/package.order +Buildings/Fluid/Chillers/ModularReversible/Examples/CarnotWithLosses.mo +Buildings/Fluid/Chillers/ModularReversible/Examples/LargeScaleWaterToWater.mo +Buildings/Fluid/Chillers/ModularReversible/Examples/Modular.mo +Buildings/Fluid/Chillers/ModularReversible/Examples/package.mo +Buildings/Fluid/Chillers/ModularReversible/Examples/package.order +Buildings/Fluid/Chillers/ModularReversible/LargeScaleWaterToWater.mo +Buildings/Fluid/Chillers/ModularReversible/Modular.mo +Buildings/Fluid/Chillers/ModularReversible/RefrigerantCycle/BaseClasses/NoCooling.mo +Buildings/Fluid/Chillers/ModularReversible/RefrigerantCycle/BaseClasses/PartialChillerCycle.mo +Buildings/Fluid/Chillers/ModularReversible/RefrigerantCycle/BaseClasses/package.mo +Buildings/Fluid/Chillers/ModularReversible/RefrigerantCycle/BaseClasses/package.order +Buildings/Fluid/Chillers/ModularReversible/RefrigerantCycle/ConstantCarnotEffectiveness.mo +Buildings/Fluid/Chillers/ModularReversible/RefrigerantCycle/TableData2D.mo +Buildings/Fluid/Chillers/ModularReversible/RefrigerantCycle/package.mo +Buildings/Fluid/Chillers/ModularReversible/RefrigerantCycle/package.order +Buildings/Fluid/Chillers/ModularReversible/UsersGuide.mo +Buildings/Fluid/Chillers/ModularReversible/Validation/BaseClasses/PartialModularComparison.mo +Buildings/Fluid/Chillers/ModularReversible/Validation/BaseClasses/package.mo +Buildings/Fluid/Chillers/ModularReversible/Validation/BaseClasses/package.order +Buildings/Fluid/Chillers/ModularReversible/Validation/Carnot_y.mo +Buildings/Fluid/Chillers/ModularReversible/Validation/ConstantCarnotEffectiveness.mo +Buildings/Fluid/Chillers/ModularReversible/Validation/TableData2D.mo +Buildings/Fluid/Chillers/ModularReversible/Validation/package.mo +Buildings/Fluid/Chillers/ModularReversible/Validation/package.order +Buildings/Fluid/Chillers/ModularReversible/package.mo +Buildings/Fluid/Chillers/ModularReversible/package.order Buildings/Fluid/Chillers/Validation/CarnotVerifyCOP.mo Buildings/Fluid/Chillers/Validation/CarnotVerifyEtaCarnot.mo Buildings/Fluid/Chillers/Validation/Carnot_TEva_2ndLaw.mo @@ -1404,6 +1449,122 @@ Buildings/Fluid/HeatPumps/Examples/Carnot_y.mo Buildings/Fluid/HeatPumps/Examples/ScrollWaterToWater_OneRoomRadiator.mo Buildings/Fluid/HeatPumps/Examples/package.mo Buildings/Fluid/HeatPumps/Examples/package.order +Buildings/Fluid/HeatPumps/ModularReversible/AirToWaterTableData2D.mo +Buildings/Fluid/HeatPumps/ModularReversible/BaseClasses/CalculateEfficiency.mo +Buildings/Fluid/HeatPumps/ModularReversible/BaseClasses/EvaporatorCondenserWithCapacity.mo +Buildings/Fluid/HeatPumps/ModularReversible/BaseClasses/LargeScaleWaterToWaterDeclarations.mo +Buildings/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialModularRefrigerantCycle.mo +Buildings/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo +Buildings/Fluid/HeatPumps/ModularReversible/BaseClasses/RefrigerantCycle.mo +Buildings/Fluid/HeatPumps/ModularReversible/BaseClasses/RefrigerantMachineControlBus.mo +Buildings/Fluid/HeatPumps/ModularReversible/BaseClasses/package.mo +Buildings/Fluid/HeatPumps/ModularReversible/BaseClasses/package.order +Buildings/Fluid/HeatPumps/ModularReversible/CarnotWithLosses.mo +Buildings/Fluid/HeatPumps/ModularReversible/Controls/Safety/AntiFreeze.mo +Buildings/Fluid/HeatPumps/ModularReversible/Controls/Safety/BaseClasses/BoundaryMap.mo +Buildings/Fluid/HeatPumps/ModularReversible/Controls/Safety/BaseClasses/CycleRateBoundary.mo +Buildings/Fluid/HeatPumps/ModularReversible/Controls/Safety/BaseClasses/OnOffFuzzyLogic.mo +Buildings/Fluid/HeatPumps/ModularReversible/Controls/Safety/BaseClasses/OnPastThreshold.mo +Buildings/Fluid/HeatPumps/ModularReversible/Controls/Safety/BaseClasses/PartialOperationalEnvelope.mo +Buildings/Fluid/HeatPumps/ModularReversible/Controls/Safety/BaseClasses/PartialSafety.mo +Buildings/Fluid/HeatPumps/ModularReversible/Controls/Safety/BaseClasses/PartialSafetyWithCounter.mo +Buildings/Fluid/HeatPumps/ModularReversible/Controls/Safety/BaseClasses/package.mo +Buildings/Fluid/HeatPumps/ModularReversible/Controls/Safety/BaseClasses/package.order +Buildings/Fluid/HeatPumps/ModularReversible/Controls/Safety/Data/Generic.mo +Buildings/Fluid/HeatPumps/ModularReversible/Controls/Safety/Data/Wuellhorst2021.mo +Buildings/Fluid/HeatPumps/ModularReversible/Controls/Safety/Data/package.mo +Buildings/Fluid/HeatPumps/ModularReversible/Controls/Safety/Data/package.order +Buildings/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/AntiFreeze.mo +Buildings/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/BaseClasses/PartialSafety.mo +Buildings/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/BaseClasses/package.mo +Buildings/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/BaseClasses/package.order +Buildings/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/MinimalFlowRate.mo +Buildings/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/OnOff.mo +Buildings/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/OperationalEnvelope.mo +Buildings/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/Safety.mo +Buildings/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/package.mo +Buildings/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/package.order +Buildings/Fluid/HeatPumps/ModularReversible/Controls/Safety/MinimalFlowRate.mo +Buildings/Fluid/HeatPumps/ModularReversible/Controls/Safety/OnOff.mo +Buildings/Fluid/HeatPumps/ModularReversible/Controls/Safety/OperationalEnvelope.mo +Buildings/Fluid/HeatPumps/ModularReversible/Controls/Safety/Safety.mo +Buildings/Fluid/HeatPumps/ModularReversible/Controls/Safety/package.mo +Buildings/Fluid/HeatPumps/ModularReversible/Controls/Safety/package.order +Buildings/Fluid/HeatPumps/ModularReversible/Controls/package.mo +Buildings/Fluid/HeatPumps/ModularReversible/Controls/package.order +Buildings/Fluid/HeatPumps/ModularReversible/Data/TableData2D/EN14511/SingleSplitRXM20R.mo +Buildings/Fluid/HeatPumps/ModularReversible/Data/TableData2D/EN14511/Vitocal251A08.mo +Buildings/Fluid/HeatPumps/ModularReversible/Data/TableData2D/EN14511/WAMAK_WaterToWater_220kW.mo +Buildings/Fluid/HeatPumps/ModularReversible/Data/TableData2D/EN14511/package.mo +Buildings/Fluid/HeatPumps/ModularReversible/Data/TableData2D/EN14511/package.order +Buildings/Fluid/HeatPumps/ModularReversible/Data/TableData2D/Generic.mo +Buildings/Fluid/HeatPumps/ModularReversible/Data/TableData2D/GenericAirToWater.mo +Buildings/Fluid/HeatPumps/ModularReversible/Data/TableData2D/GenericHeatPump.mo +Buildings/Fluid/HeatPumps/ModularReversible/Data/TableData2D/package.mo +Buildings/Fluid/HeatPumps/ModularReversible/Data/TableData2D/package.order +Buildings/Fluid/HeatPumps/ModularReversible/Data/package.mo +Buildings/Fluid/HeatPumps/ModularReversible/Data/package.order +Buildings/Fluid/HeatPumps/ModularReversible/Examples/AirToWater2D_OneRoomRadiator.mo +Buildings/Fluid/HeatPumps/ModularReversible/Examples/BaseClasses/OneRoomRadiatorHeatPumpControl.mo +Buildings/Fluid/HeatPumps/ModularReversible/Examples/BaseClasses/PartialOneRoomRadiator.mo +Buildings/Fluid/HeatPumps/ModularReversible/Examples/BaseClasses/package.mo +Buildings/Fluid/HeatPumps/ModularReversible/Examples/BaseClasses/package.order +Buildings/Fluid/HeatPumps/ModularReversible/Examples/CarnotWithLosses_OneRoomRadiator.mo +Buildings/Fluid/HeatPumps/ModularReversible/Examples/LargeScaleWaterToWater_OneRoomRadiator.mo +Buildings/Fluid/HeatPumps/ModularReversible/Examples/Modular_OneRoomRadiator.mo +Buildings/Fluid/HeatPumps/ModularReversible/Examples/package.mo +Buildings/Fluid/HeatPumps/ModularReversible/Examples/package.order +Buildings/Fluid/HeatPumps/ModularReversible/LargeScaleWaterToWater.mo +Buildings/Fluid/HeatPumps/ModularReversible/Modular.mo +Buildings/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/NoHeating.mo +Buildings/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialCarnot.mo +Buildings/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialHeatPumpCycle.mo +Buildings/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialRefrigerantCycle.mo +Buildings/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialTableData2D.mo +Buildings/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/package.mo +Buildings/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/package.order +Buildings/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/ConstantCarnotEffectiveness.mo +Buildings/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/Frosting/BaseClasses/PartialIcingFactor.mo +Buildings/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/Frosting/BaseClasses/package.mo +Buildings/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/Frosting/BaseClasses/package.order +Buildings/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/Frosting/FunctionalIcingFactor.mo +Buildings/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/Frosting/Functions/package.mo +Buildings/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/Frosting/Functions/package.order +Buildings/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/Frosting/Functions/partialIcingFactor.mo +Buildings/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/Frosting/Functions/wetterAfjei1997.mo +Buildings/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/Frosting/NoFrosting.mo +Buildings/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/Frosting/package.mo +Buildings/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/Frosting/package.order +Buildings/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/Inertias/BaseClasses/PartialInertia.mo +Buildings/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/Inertias/BaseClasses/package.mo +Buildings/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/Inertias/BaseClasses/package.order +Buildings/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/Inertias/NoInertia.mo +Buildings/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/Inertias/VariableOrder.mo +Buildings/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/Inertias/package.mo +Buildings/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/Inertias/package.order +Buildings/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/TableData2D.mo +Buildings/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/package.mo +Buildings/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/package.order +Buildings/Fluid/HeatPumps/ModularReversible/TableData2D.mo +Buildings/Fluid/HeatPumps/ModularReversible/UsersGuide.mo +Buildings/Fluid/HeatPumps/ModularReversible/Validation/BaseClasses/PartialValidation.mo +Buildings/Fluid/HeatPumps/ModularReversible/Validation/BaseClasses/package.mo +Buildings/Fluid/HeatPumps/ModularReversible/Validation/BaseClasses/package.order +Buildings/Fluid/HeatPumps/ModularReversible/Validation/Comparative/BaseClasses/PartialComparison.mo +Buildings/Fluid/HeatPumps/ModularReversible/Validation/Comparative/BaseClasses/PartialModularComparison.mo +Buildings/Fluid/HeatPumps/ModularReversible/Validation/Comparative/BaseClasses/package.mo +Buildings/Fluid/HeatPumps/ModularReversible/Validation/Comparative/BaseClasses/package.order +Buildings/Fluid/HeatPumps/ModularReversible/Validation/Comparative/Carnot_y.mo +Buildings/Fluid/HeatPumps/ModularReversible/Validation/Comparative/ConstantCarnotEffectiveness.mo +Buildings/Fluid/HeatPumps/ModularReversible/Validation/Comparative/TableData2D.mo +Buildings/Fluid/HeatPumps/ModularReversible/Validation/Comparative/package.mo +Buildings/Fluid/HeatPumps/ModularReversible/Validation/Comparative/package.order +Buildings/Fluid/HeatPumps/ModularReversible/Validation/ConstantCarnotEffectiveness.mo +Buildings/Fluid/HeatPumps/ModularReversible/Validation/TableData2D.mo +Buildings/Fluid/HeatPumps/ModularReversible/Validation/package.mo +Buildings/Fluid/HeatPumps/ModularReversible/Validation/package.order +Buildings/Fluid/HeatPumps/ModularReversible/package.mo +Buildings/Fluid/HeatPumps/ModularReversible/package.order Buildings/Fluid/HeatPumps/ReciprocatingWaterToWater.mo Buildings/Fluid/HeatPumps/ScrollWaterToWater.mo Buildings/Fluid/HeatPumps/Validation/Carnot_TCon_LimitedCapacity.mo @@ -1722,6 +1883,78 @@ Buildings/Fluid/Sensors/Velocity.mo Buildings/Fluid/Sensors/VolumeFlowRate.mo Buildings/Fluid/Sensors/package.mo Buildings/Fluid/Sensors/package.order +Buildings/Fluid/SolarCollectors/ASHRAE93.mo +Buildings/Fluid/SolarCollectors/BaseClasses/ASHRAEHeatLoss.mo +Buildings/Fluid/SolarCollectors/BaseClasses/ASHRAESolarGain.mo +Buildings/Fluid/SolarCollectors/BaseClasses/EN12975HeatLoss.mo +Buildings/Fluid/SolarCollectors/BaseClasses/EN12975SolarGain.mo +Buildings/Fluid/SolarCollectors/BaseClasses/Examples/ASHRAEHeatLoss.mo +Buildings/Fluid/SolarCollectors/BaseClasses/Examples/ASHRAESolarGain.mo +Buildings/Fluid/SolarCollectors/BaseClasses/Examples/EN12975HeatLoss.mo +Buildings/Fluid/SolarCollectors/BaseClasses/Examples/EN12975SolarGain.mo +Buildings/Fluid/SolarCollectors/BaseClasses/Examples/package.mo +Buildings/Fluid/SolarCollectors/BaseClasses/Examples/package.order +Buildings/Fluid/SolarCollectors/BaseClasses/IAM.mo +Buildings/Fluid/SolarCollectors/BaseClasses/PartialHeatLoss.mo +Buildings/Fluid/SolarCollectors/BaseClasses/PartialParameters.mo +Buildings/Fluid/SolarCollectors/BaseClasses/PartialSolarCollector.mo +Buildings/Fluid/SolarCollectors/BaseClasses/package.mo +Buildings/Fluid/SolarCollectors/BaseClasses/package.order +Buildings/Fluid/SolarCollectors/Controls/BaseClasses/Examples/GCritCalc.mo +Buildings/Fluid/SolarCollectors/Controls/BaseClasses/Examples/package.mo +Buildings/Fluid/SolarCollectors/Controls/BaseClasses/Examples/package.order +Buildings/Fluid/SolarCollectors/Controls/BaseClasses/GCritCalc.mo +Buildings/Fluid/SolarCollectors/Controls/BaseClasses/package.mo +Buildings/Fluid/SolarCollectors/Controls/BaseClasses/package.order +Buildings/Fluid/SolarCollectors/Controls/CollectorPump.mo +Buildings/Fluid/SolarCollectors/Controls/Examples/SolarPumpController.mo +Buildings/Fluid/SolarCollectors/Controls/Examples/package.mo +Buildings/Fluid/SolarCollectors/Controls/Examples/package.order +Buildings/Fluid/SolarCollectors/Controls/package.mo +Buildings/Fluid/SolarCollectors/Controls/package.order +Buildings/Fluid/SolarCollectors/Data/BaseClasses/Generic.mo +Buildings/Fluid/SolarCollectors/Data/BaseClasses/package.mo +Buildings/Fluid/SolarCollectors/Data/BaseClasses/package.order +Buildings/Fluid/SolarCollectors/Data/BaseClasses/validateAngles.mo +Buildings/Fluid/SolarCollectors/Data/GenericASHRAE93.mo +Buildings/Fluid/SolarCollectors/Data/GenericEN12975.mo +Buildings/Fluid/SolarCollectors/Data/GlazedFlatPlate/FP_GuangdongFSPTY95.mo +Buildings/Fluid/SolarCollectors/Data/GlazedFlatPlate/FP_SolahartKf.mo +Buildings/Fluid/SolarCollectors/Data/GlazedFlatPlate/FP_TRNSYSValidation.mo +Buildings/Fluid/SolarCollectors/Data/GlazedFlatPlate/FP_ThermaLiteHS20.mo +Buildings/Fluid/SolarCollectors/Data/GlazedFlatPlate/FP_VerificationModel.mo +Buildings/Fluid/SolarCollectors/Data/GlazedFlatPlate/package.mo +Buildings/Fluid/SolarCollectors/Data/GlazedFlatPlate/package.order +Buildings/Fluid/SolarCollectors/Data/Tubular/T_AMKCollectraAGOWR20.mo +Buildings/Fluid/SolarCollectors/Data/Tubular/T_JiaxingDiyiC0130.mo +Buildings/Fluid/SolarCollectors/Data/Tubular/package.mo +Buildings/Fluid/SolarCollectors/Data/Tubular/package.order +Buildings/Fluid/SolarCollectors/Data/package.mo +Buildings/Fluid/SolarCollectors/Data/package.order +Buildings/Fluid/SolarCollectors/EN12975.mo +Buildings/Fluid/SolarCollectors/Examples/FlatPlate.mo +Buildings/Fluid/SolarCollectors/Examples/FlatPlateShaCoeTrue.mo +Buildings/Fluid/SolarCollectors/Examples/FlatPlateTotalArea.mo +Buildings/Fluid/SolarCollectors/Examples/FlatPlateWithTank.mo +Buildings/Fluid/SolarCollectors/Examples/Tubular.mo +Buildings/Fluid/SolarCollectors/Examples/package.mo +Buildings/Fluid/SolarCollectors/Examples/package.order +Buildings/Fluid/SolarCollectors/Types/HeatCapacity.mo +Buildings/Fluid/SolarCollectors/Types/NumberSelection.mo +Buildings/Fluid/SolarCollectors/Types/SystemConfiguration.mo +Buildings/Fluid/SolarCollectors/Types/package.mo +Buildings/Fluid/SolarCollectors/Types/package.order +Buildings/Fluid/SolarCollectors/UsersGuide.mo +Buildings/Fluid/SolarCollectors/Validation/EN12975NPanels.mo +Buildings/Fluid/SolarCollectors/Validation/EN12975_Array.mo +Buildings/Fluid/SolarCollectors/Validation/EN12975_Series.mo +Buildings/Fluid/SolarCollectors/Validation/ExtremeAmbientConditions.mo +Buildings/Fluid/SolarCollectors/Validation/FlatPlate.mo +Buildings/Fluid/SolarCollectors/Validation/FlatPlateNPanels.mo +Buildings/Fluid/SolarCollectors/Validation/package.mo +Buildings/Fluid/SolarCollectors/Validation/package.order +Buildings/Fluid/SolarCollectors/package.mo +Buildings/Fluid/SolarCollectors/package.order Buildings/Fluid/Sources/BaseClasses/Outside.mo Buildings/Fluid/Sources/BaseClasses/PartialAirSource.mo Buildings/Fluid/Sources/BaseClasses/PartialPropertySource.mo @@ -1928,6 +2161,9 @@ Buildings/Resources/Data/Fluid/FixedResistances/Validation/PlugFlowPipes/PipeDat Buildings/Resources/Data/Fluid/Geothermal/Borefields/HeatTransfer/Validation/Analytic_20Years.txt Buildings/Resources/Data/Fluid/Geothermal/Borefields/HeatTransfer/Validation/Beier_Smith_Spitler_2011_SandBox.txt Buildings/Resources/Data/Fluid/Geothermal/Borefields/HeatTransfer/Validation/Cimmino_Bernier_2015_SmallScale.txt +Buildings/Resources/Data/Fluid/HeatPumps/ModularReversible/BaseClasses/LargeScaleWaterToWaterDeclarations.xlsx +Buildings/Resources/Data/Fluid/HeatPumps/Validation/MeasuredHeatPumpData.txt +Buildings/Resources/Data/Fluid/SolarCollectors/Validation/FlatPlate/TRNSYSAnnualData.txt Buildings/Resources/Data/Utilities/IO/Files/Examples/CSVReader/Data.txt Buildings/Resources/Data/schedule.txt Buildings/Resources/Data/scheduleWindows.txt @@ -2102,6 +2338,9 @@ Buildings/Resources/Images/Fluid/Geothermal/Borefields/LoadAggregation_11.png Buildings/Resources/Images/Fluid/Geothermal/Borefields/LoadAggregation_12.png Buildings/Resources/Images/Fluid/HeatExchangers/ActiveBeams/schematicAB.png Buildings/Resources/Images/Fluid/HeatExchangers/ActiveBeams/schematicAB.svg +Buildings/Resources/Images/Fluid/HeatPumps/ModularReversible/Controls/SafetyControls/OperationalEnvelope_1.png +Buildings/Resources/Images/Fluid/HeatPumps/ModularReversible/Controls/SafetyControls/OperationalEnvelope_2.png +Buildings/Resources/Images/Fluid/HeatPumps/ModularReversible/Controls/SafetyControls/OperationalEnvelope_3.png Buildings/Resources/Images/Fluid/HeatPumps/WaterToWater_Cycle.png Buildings/Resources/Images/Fluid/Movers/BaseClasses/Characteristics/MotorEfficiencyCurves.png Buildings/Resources/Images/Fluid/Movers/BaseClasses/Euler/EulerCurve.png @@ -2407,6 +2646,12 @@ Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/Validation/ActuatorFilter.m Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/Validation/MassFlowRateMultiplier.mos Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Examples/Carnot_TEva.mos Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Examples/Carnot_y.mos +Buildings/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Examples/CarnotWithLosses.mos +Buildings/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Examples/LargeScaleWaterToWater.mos +Buildings/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Examples/Modular.mos +Buildings/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Validation/Carnot_y.mos +Buildings/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Validation/ConstantCarnotEffectiveness.mos +Buildings/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Validation/TableData2D.mos Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/CarnotVerifyCOP.mos Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/CarnotVerifyEtaCarnot.mos Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/Carnot_TEva_2ndLaw.mos @@ -2586,6 +2831,20 @@ Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Compressors/Validation/Scroll Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Examples/Carnot_TCon.mos Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Examples/Carnot_y.mos Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Examples/ScrollWaterToWater_OneRoomRadiator.mos +Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/AntiFreeze.mos +Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/MinimalFlowRate.mos +Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/OnOff.mos +Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/OperationalEnvelope.mos +Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/Safety.mos +Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Examples/AirToWater2D_OneRoomRadiator.mos +Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Examples/CarnotWithLosses_OneRoomRadiator.mos +Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Examples/LargeScaleWaterToWater_OneRoomRadiator.mos +Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Examples/Modular_OneRoomRadiator.mos +Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Validation/Comparative/Carnot_y.mos +Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Validation/Comparative/ConstantCarnotEffectiveness.mos +Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Validation/Comparative/TableData2D.mos +Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Validation/ConstantCarnotEffectiveness.mos +Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Validation/TableData2D.mos Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/Carnot_TCon_LimitedCapacity.mos Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/Carnot_TCon_LowTemperature.mos Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/Carnot_TCon_etaPL.mos @@ -2703,6 +2962,23 @@ Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/TemperatureWetBulb.mos Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/TraceSubstances.mos Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/Velocity.mos Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/VolumeFlowRate.mos +Buildings/Resources/Scripts/Dymola/Fluid/SolarCollectors/BaseClasses/Examples/ASHRAEHeatLoss.mos +Buildings/Resources/Scripts/Dymola/Fluid/SolarCollectors/BaseClasses/Examples/ASHRAESolarGain.mos +Buildings/Resources/Scripts/Dymola/Fluid/SolarCollectors/BaseClasses/Examples/EN12975HeatLoss.mos +Buildings/Resources/Scripts/Dymola/Fluid/SolarCollectors/BaseClasses/Examples/EN12975SolarGain.mos +Buildings/Resources/Scripts/Dymola/Fluid/SolarCollectors/Controls/BaseClasses/Examples/GCritCalc.mos +Buildings/Resources/Scripts/Dymola/Fluid/SolarCollectors/Controls/Examples/SolarPumpController.mos +Buildings/Resources/Scripts/Dymola/Fluid/SolarCollectors/Examples/FlatPlate.mos +Buildings/Resources/Scripts/Dymola/Fluid/SolarCollectors/Examples/FlatPlateShaCoeTrue.mos +Buildings/Resources/Scripts/Dymola/Fluid/SolarCollectors/Examples/FlatPlateTotalArea.mos +Buildings/Resources/Scripts/Dymola/Fluid/SolarCollectors/Examples/FlatPlateWithTank.mos +Buildings/Resources/Scripts/Dymola/Fluid/SolarCollectors/Examples/Tubular.mos +Buildings/Resources/Scripts/Dymola/Fluid/SolarCollectors/Validation/EN12975NPanels.mos +Buildings/Resources/Scripts/Dymola/Fluid/SolarCollectors/Validation/EN12975_Array.mos +Buildings/Resources/Scripts/Dymola/Fluid/SolarCollectors/Validation/EN12975_Series.mos +Buildings/Resources/Scripts/Dymola/Fluid/SolarCollectors/Validation/ExtremeAmbientConditions.mos +Buildings/Resources/Scripts/Dymola/Fluid/SolarCollectors/Validation/FlatPlate.mos +Buildings/Resources/Scripts/Dymola/Fluid/SolarCollectors/Validation/FlatPlateNPanels.mos Buildings/Resources/Scripts/Dymola/Fluid/Sources/Examples/MassFlowSource_WeatherData.mos Buildings/Resources/Scripts/Dymola/Fluid/Sources/Examples/Outside.mos Buildings/Resources/Scripts/Dymola/Fluid/Sources/Examples/Outside_CpData.mos diff --git a/Buildings/Controls/OBC/CDL/Logical/Latch.mo b/Buildings/Controls/OBC/CDL/Logical/Latch.mo index 8f87877d59d..2c4ce673505 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Latch.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Latch.mo @@ -1,6 +1,6 @@ within Buildings.Controls.OBC.CDL.Logical; block Latch - "Maintains a true signal until change condition" + "Maintains a true signal until cleared" Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u "Latch input" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); @@ -10,40 +10,11 @@ block Latch Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Output signal" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); - -initial equation - pre(y)=false; - pre(u)=false; - pre(clr)=false; - equation when initial() then - //scenario = 1; - y=if clr then - false - else - u; - elsewhen - (not clr) and change(u) and - (pre(u) == false) then - //scenario = 2; - y=not clr; - elsewhen - (not clr) and change(u) and - (pre(u) == true) then - //scenario = 3; - y=if clr then - false - else - pre(y); - elsewhen change(clr) and - (pre(clr) == true) and - (not u) then - //scenario = 4; - y=false; - elsewhen clr then - //scenario = 5; - y=false; + y=not clr and u; + elsewhen {clr, u} then + y=not clr and u; end when; annotation ( defaultComponentName="lat", @@ -148,6 +119,11 @@ At initial time, if clr = false, then the output will be revisions="