diff --git a/.travis.yml b/.travis.yml
index 7686557168d..32e6739cee4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,7 @@ env:
- BUILDINGSPY_VERSION=BuildingsPy@0bc654fd913c83f64163be167807e8989eff0293
- OMC_VERSION=ubuntu-2204-omc:1.24.0-1
- OPTIMICA_VERSION=travis-ubuntu-2204-optimica:1.51.6
- - DYMOLA_VERSION=travis_ubuntu-2004_dymola:2024xRefresh1-x86_64
+ - DYMOLA_VERSION=travis_ubuntu-2004_dymola:2025x-x86_64
- ENERGYPLUS_9_6_0=EnergyPlus-9.6.0-f420c06a69-Linux-Ubuntu20.04-x86_64
- ENERGYPLUS_23_1_0=EnergyPlus-23.1.0-87ed9199d4-Linux-Ubuntu20.04-x86_64
- MODELICA_JSON_VERSION=6d950c3592fa021aa914ba4ff34a67cbb69962c6
diff --git a/Buildings/.copiedFiles.txt b/Buildings/.copiedFiles.txt
index efd53538b55..7afce42e55f 100644
--- a/Buildings/.copiedFiles.txt
+++ b/Buildings/.copiedFiles.txt
@@ -2446,6 +2446,34 @@ Buildings/Resources/Images/Media/Water/plotRho.png
Buildings/Resources/Images/Media/Water/plotkinVis.pdf
Buildings/Resources/Images/Media/Water/plotkinVis.png
Buildings/Resources/Images/Media/Water/plotkinVis.py
+Buildings/Resources/Images/ThermalZones/ISO13790/Validation/BESTEST/FF_temperature_600FF_Feb1.pdf
+Buildings/Resources/Images/ThermalZones/ISO13790/Validation/BESTEST/FF_temperature_600FF_Feb1.png
+Buildings/Resources/Images/ThermalZones/ISO13790/Validation/BESTEST/FF_temperature_650FF_Jul14.pdf
+Buildings/Resources/Images/ThermalZones/ISO13790/Validation/BESTEST/FF_temperature_650FF_Jul14.png
+Buildings/Resources/Images/ThermalZones/ISO13790/Validation/BESTEST/FF_temperature_900FF_Feb1.pdf
+Buildings/Resources/Images/ThermalZones/ISO13790/Validation/BESTEST/FF_temperature_900FF_Feb1.png
+Buildings/Resources/Images/ThermalZones/ISO13790/Validation/BESTEST/FF_temperature_950FF_Jul14.pdf
+Buildings/Resources/Images/ThermalZones/ISO13790/Validation/BESTEST/FF_temperature_950FF_Jul14.png
+Buildings/Resources/Images/ThermalZones/ISO13790/Validation/BESTEST/annual_cooling.pdf
+Buildings/Resources/Images/ThermalZones/ISO13790/Validation/BESTEST/annual_cooling.png
+Buildings/Resources/Images/ThermalZones/ISO13790/Validation/BESTEST/annual_heating.pdf
+Buildings/Resources/Images/ThermalZones/ISO13790/Validation/BESTEST/annual_heating.png
+Buildings/Resources/Images/ThermalZones/ISO13790/Validation/BESTEST/ave_temperature.pdf
+Buildings/Resources/Images/ThermalZones/ISO13790/Validation/BESTEST/ave_temperature.png
+Buildings/Resources/Images/ThermalZones/ISO13790/Validation/BESTEST/bin_temperature_900FF.pdf
+Buildings/Resources/Images/ThermalZones/ISO13790/Validation/BESTEST/bin_temperature_900FF.png
+Buildings/Resources/Images/ThermalZones/ISO13790/Validation/BESTEST/hourly_load_600_Feb1.pdf
+Buildings/Resources/Images/ThermalZones/ISO13790/Validation/BESTEST/hourly_load_600_Feb1.png
+Buildings/Resources/Images/ThermalZones/ISO13790/Validation/BESTEST/hourly_load_900_Feb1.pdf
+Buildings/Resources/Images/ThermalZones/ISO13790/Validation/BESTEST/hourly_load_900_Feb1.png
+Buildings/Resources/Images/ThermalZones/ISO13790/Validation/BESTEST/max_temperature.pdf
+Buildings/Resources/Images/ThermalZones/ISO13790/Validation/BESTEST/max_temperature.png
+Buildings/Resources/Images/ThermalZones/ISO13790/Validation/BESTEST/min_temperature.pdf
+Buildings/Resources/Images/ThermalZones/ISO13790/Validation/BESTEST/min_temperature.png
+Buildings/Resources/Images/ThermalZones/ISO13790/Validation/BESTEST/peak_cooling.pdf
+Buildings/Resources/Images/ThermalZones/ISO13790/Validation/BESTEST/peak_cooling.png
+Buildings/Resources/Images/ThermalZones/ISO13790/Validation/BESTEST/peak_heating.pdf
+Buildings/Resources/Images/ThermalZones/ISO13790/Validation/BESTEST/peak_heating.png
Buildings/Resources/Images/ThermalZones/ISO13790/Zone/5R1CNetwork.pdf
Buildings/Resources/Images/ThermalZones/ISO13790/Zone/5R1CNetwork.png
Buildings/Resources/Images/ThermalZones/ISO13790/Zone/5R1CNetwork.svg
@@ -3076,10 +3104,32 @@ Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Examples/FreeFloating.m
Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Examples/FreeFloatingHVAC.mos
Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Examples/HeatingCooling.mos
Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Examples/HeatingCoolingHVAC.mos
-Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Validation/BESTEST/Case600.mos
-Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Validation/BESTEST/Case600FF.mos
-Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Validation/BESTEST/Case900.mos
-Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Validation/BESTEST/Case900FF.mos
+Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/Case600.mos
+Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/Case600FF.mos
+Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/Case610.mos
+Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/Case620.mos
+Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/Case630.mos
+Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/Case640.mos
+Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/Case650.mos
+Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/Case650FF.mos
+Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/Case660.mos
+Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/Case670.mos
+Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/Case680.mos
+Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/Case680FF.mos
+Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/Case685.mos
+Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/Case695.mos
+Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Validation/BESTEST/Cases9xx/Case900.mos
+Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Validation/BESTEST/Cases9xx/Case900FF.mos
+Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Validation/BESTEST/Cases9xx/Case910.mos
+Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Validation/BESTEST/Cases9xx/Case920.mos
+Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Validation/BESTEST/Cases9xx/Case930.mos
+Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Validation/BESTEST/Cases9xx/Case940.mos
+Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Validation/BESTEST/Cases9xx/Case950.mos
+Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Validation/BESTEST/Cases9xx/Case950FF.mos
+Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Validation/BESTEST/Cases9xx/Case980.mos
+Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Validation/BESTEST/Cases9xx/Case980FF.mos
+Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Validation/BESTEST/Cases9xx/Case985.mos
+Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Validation/BESTEST/Cases9xx/Case995.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
@@ -3199,6 +3249,8 @@ Buildings/Resources/Scripts/JModelica/buildingspy_to_csv.py
Buildings/Resources/Scripts/travis/dymola/dymola
Buildings/Resources/Scripts/travis/omc/omc
Buildings/Resources/bin/ConvertWeatherData.jar
+Buildings/Resources/src/ThermalZones/ISO13790/Validation/BESTEST/ASHRAE140_data.dat
+Buildings/Resources/src/ThermalZones/ISO13790/Validation/BESTEST/simulateAndPlot.py
Buildings/Resources/src/convertEPW/Makefile
Buildings/Resources/src/convertEPW/src/ConvertWeatherData.java
Buildings/Resources/src/convertEPW/src/Makefile
@@ -3208,6 +3260,8 @@ Buildings/Resources/weatherdata/DRYCOLD.TMY
Buildings/Resources/weatherdata/DRYCOLD.mos
Buildings/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.epw
Buildings/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos
+Buildings/Resources/weatherdata/USA_CO_Denver.Intl.AP.725650_TMY3.epw
+Buildings/Resources/weatherdata/USA_CO_Denver.Intl.AP.725650_TMY3.mos
Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw
Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos
Buildings/Resources/www/navigation.png
@@ -3229,16 +3283,43 @@ Buildings/ThermalZones/ISO13790/Examples/HeatingCooling.mo
Buildings/ThermalZones/ISO13790/Examples/HeatingCoolingHVAC.mo
Buildings/ThermalZones/ISO13790/Examples/package.mo
Buildings/ThermalZones/ISO13790/Examples/package.order
-Buildings/ThermalZones/ISO13790/Validation/BESTEST/Case600.mo
-Buildings/ThermalZones/ISO13790/Validation/BESTEST/Case600FF.mo
-Buildings/ThermalZones/ISO13790/Validation/BESTEST/Case900.mo
-Buildings/ThermalZones/ISO13790/Validation/BESTEST/Case900FF.mo
+Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/Case600.mo
+Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/Case600FF.mo
+Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/Case610.mo
+Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/Case620.mo
+Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/Case630.mo
+Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/Case640.mo
+Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/Case650.mo
+Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/Case650FF.mo
+Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/Case660.mo
+Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/Case670.mo
+Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/Case680.mo
+Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/Case680FF.mo
+Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/Case685.mo
+Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/Case695.mo
+Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/package.mo
+Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/package.order
+Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases9xx/Case900.mo
+Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases9xx/Case900FF.mo
+Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases9xx/Case910.mo
+Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases9xx/Case920.mo
+Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases9xx/Case930.mo
+Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases9xx/Case940.mo
+Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases9xx/Case950.mo
+Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases9xx/Case950FF.mo
+Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases9xx/Case980.mo
+Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases9xx/Case980FF.mo
+Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases9xx/Case985.mo
+Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases9xx/Case995.mo
+Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases9xx/package.mo
+Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases9xx/package.order
Buildings/ThermalZones/ISO13790/Validation/BESTEST/Data/Case600FFResults.mo
Buildings/ThermalZones/ISO13790/Validation/BESTEST/Data/Case600Mass.mo
Buildings/ThermalZones/ISO13790/Validation/BESTEST/Data/Case600Results.mo
Buildings/ThermalZones/ISO13790/Validation/BESTEST/Data/Case900Mass.mo
Buildings/ThermalZones/ISO13790/Validation/BESTEST/Data/package.mo
Buildings/ThermalZones/ISO13790/Validation/BESTEST/Data/package.order
+Buildings/ThermalZones/ISO13790/Validation/BESTEST/UsersGuide.mo
Buildings/ThermalZones/ISO13790/Validation/BESTEST/package.mo
Buildings/ThermalZones/ISO13790/Validation/BESTEST/package.order
Buildings/ThermalZones/ISO13790/Validation/package.mo
diff --git a/Buildings/Controls/OBC/CDL/Constants.mo b/Buildings/Controls/OBC/CDL/Constants.mo
index 37a41cbbff3..82b75538047 100644
--- a/Buildings/Controls/OBC/CDL/Constants.mo
+++ b/Buildings/Controls/OBC/CDL/Constants.mo
@@ -21,7 +21,7 @@ This package provides often needed constants.
March 12, 2024, by Michael Wetter:
Changed small
to 1E-37.
This is for
-issue 3695.
+Buildings, issue 3695.
integerTrue
and integerFalse
are parameters.
May 17, 2022, by Hongxiang Fu:realTrue
and realFalse
are parameters.
May 17, 2022, by Hongxiang Fu:Modelica.Units.SI
.startTime
to allow model to work
also for negative start time without having to change the value of this
parameters.Modelica.Units.SI
.startTime
to allow model to work
also for negative start time without having to change the value of this
parameters.startTime
and sampleTime
as these are not needed for this block, and introduced parameter
y_start=0
.y
.
March 30, 2022, by Michael Wetter:discrete
keyword to sampled variable.equation
rather than an algorith