Merge pull request #10787 from NREL/UpdateTo251

Update to version 25.1
NREL · Oct 11, 2024 · 4cbe63d · 4cbe63d
2 parents 94a8878 + b141b9f
commit 4cbe63d
Show file tree

Hide file tree

Showing 841 changed files with 110,073 additions and 842 deletions.
diff --git a/cmake/Version.cmake b/cmake/Version.cmake
@@ -1,13 +1,13 @@
-set(CMAKE_VERSION_MAJOR 24)
-set(CMAKE_VERSION_MINOR 2)
+set(CMAKE_VERSION_MAJOR 25)
+set(CMAKE_VERSION_MINOR 1)
 set(CMAKE_VERSION_PATCH 0)
 
-set(CMAKE_PROJECTED_RELEASE_DATE "30 September 2024")
+set(CMAKE_PROJECTED_RELEASE_DATE "31 March 2025")
 
 set(PREV_RELEASE_MAJOR 24)
-set(PREV_RELEASE_MINOR 1)
+set(PREV_RELEASE_MINOR 2)
 set(PREV_RELEASE_PATCH 0)
-set(PREV_RELEASE_SHA "9d7789a")
+set(PREV_RELEASE_SHA "94a8878")
 
 set(ENERGYPLUS_VERSION "${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}.${CMAKE_VERSION_PATCH}")
 

diff --git a/idd/versions/V24-2-0-Energy+.idd b/idd/versions/V24-2-0-Energy+.idd
diff --git a/performance_tests/15zonePSZ.idf b/performance_tests/15zonePSZ.idf
@@ -119,7 +119,7 @@
 ! ZONE_TERMINAL_FAN_STATIC_PRESSURE=  298.69
 ! End WebInterface Parameters
 
-  Version,24.2;
+  Version,25.1;
 
   Timestep,4;
 

diff --git a/performance_tests/15zonePTAC.idf b/performance_tests/15zonePTAC.idf
@@ -119,7 +119,7 @@
 ! ZONE_TERMINAL_FAN_STATIC_PRESSURE=  298.69
 ! End WebInterface Parameters
 
-  Version,24.2;
+  Version,25.1;
 
   Timestep,4;
 

diff --git a/performance_tests/15zonePVAV.idf b/performance_tests/15zonePVAV.idf
@@ -119,7 +119,7 @@
 ! ZONE_TERMINAL_FAN_STATIC_PRESSURE=  298.69
 ! End WebInterface Parameters
 
-  Version,24.2;
+  Version,25.1;
 
   Timestep,4;
 

diff --git a/performance_tests/15zonevav.idf b/performance_tests/15zonevav.idf
@@ -119,7 +119,7 @@
 ! ZONE_TERMINAL_FAN_STATIC_PRESSURE=  298.69
 ! End WebInterface Parameters
 
-  Version,24.2;
+  Version,25.1;
 
   Timestep,4;
 

diff --git a/performance_tests/15zonevav_no_reports.idf b/performance_tests/15zonevav_no_reports.idf
@@ -119,7 +119,7 @@
 ! ZONE_TERMINAL_FAN_STATIC_PRESSURE=  298.69
 ! End WebInterface Parameters
 
-  Version,24.2;
+  Version,25.1;
 
   Timestep,4;
 

diff --git a/performance_tests/30zonePSZ.idf b/performance_tests/30zonePSZ.idf
@@ -119,7 +119,7 @@
 ! ZONE_TERMINAL_FAN_STATIC_PRESSURE=  298.69
 ! End WebInterface Parameters
 
-  Version,24.2;
+  Version,25.1;
 
   Timestep,4;
 

diff --git a/performance_tests/30zonePTAC.idf b/performance_tests/30zonePTAC.idf
@@ -119,7 +119,7 @@
 ! ZONE_TERMINAL_FAN_STATIC_PRESSURE=  298.69
 ! End WebInterface Parameters
 
-  Version,24.2;
+  Version,25.1;
 
   Timestep,4;
 

diff --git a/performance_tests/30zonePVAV.idf b/performance_tests/30zonePVAV.idf
@@ -119,7 +119,7 @@
 ! ZONE_TERMINAL_FAN_STATIC_PRESSURE=  298.69
 ! End WebInterface Parameters
 
-  Version,24.2;
+  Version,25.1;
 
   Timestep,4;
 

diff --git a/performance_tests/30zonevav.idf b/performance_tests/30zonevav.idf
@@ -119,7 +119,7 @@
 ! ZONE_TERMINAL_FAN_STATIC_PRESSURE=  298.69
 ! End WebInterface Parameters
 
-  Version,24.2;
+  Version,25.1;
 
   Timestep,4;
 

diff --git a/performance_tests/45zonePSZ.idf b/performance_tests/45zonePSZ.idf
@@ -119,7 +119,7 @@
 ! ZONE_TERMINAL_FAN_STATIC_PRESSURE=  298.69
 ! End WebInterface Parameters
 
-  Version,24.2;
+  Version,25.1;
 
   Timestep,4;
 

diff --git a/performance_tests/45zonePTAC.idf b/performance_tests/45zonePTAC.idf
@@ -119,7 +119,7 @@
 ! ZONE_TERMINAL_FAN_STATIC_PRESSURE=  298.69
 ! End WebInterface Parameters
 
-  Version,24.2;
+  Version,25.1;
 
   Timestep,4;
 

diff --git a/performance_tests/45zonePVAV.idf b/performance_tests/45zonePVAV.idf
@@ -119,7 +119,7 @@
 ! ZONE_TERMINAL_FAN_STATIC_PRESSURE=  298.69
 ! End WebInterface Parameters
 
-  Version,24.2;
+  Version,25.1;
 
   Timestep,4;
 

diff --git a/performance_tests/45zonevav.idf b/performance_tests/45zonevav.idf
@@ -119,7 +119,7 @@
 ! ZONE_TERMINAL_FAN_STATIC_PRESSURE=  298.69
 ! End WebInterface Parameters
 
-  Version,24.2;
+  Version,25.1;
 
   Timestep,4;
 

diff --git a/performance_tests/BenchmarkHospitalNew_USA_CA_SAN_FRANCISCO.idf b/performance_tests/BenchmarkHospitalNew_USA_CA_SAN_FRANCISCO.idf
@@ -78,7 +78,7 @@
 ! ExtWallConstruction=Mass
 ! End SimMetaData
 
-  Version,24.2;
+  Version,25.1;
 
 !
 !- Run Controls sections

diff --git a/performance_tests/BenchmarkLargeOfficeNew_USA_CA_SAN_FRANCISCO_10_windows_per_zone.idf b/performance_tests/BenchmarkLargeOfficeNew_USA_CA_SAN_FRANCISCO_10_windows_per_zone.idf
@@ -66,7 +66,7 @@
 ! ExtWallConstruction=Mass
 ! End SimMetaData
 
-  Version,24.2;
+  Version,25.1;
 
 !
 !- Run Controls sections

diff --git a/performance_tests/Benchmarklargeofficenew_usa_ca_san_francisco_no_reports.idf b/performance_tests/Benchmarklargeofficenew_usa_ca_san_francisco_no_reports.idf
@@ -66,7 +66,7 @@
 ! ExtWallConstruction=Mass
 ! End SimMetaData
 
-  Version,24.2;
+  Version,25.1;
 
 !
 !- Run Controls sections

diff --git a/performance_tests/Inactive/10zone1vav.idf b/performance_tests/Inactive/10zone1vav.idf
@@ -8,7 +8,7 @@
 ! Title5= VisualDOE 5.0.0
 ! \group Simulation Parameters
 
-  Version,24.2;
+  Version,25.1;
 
   Building,
     Green Design Tools,      !- Name

diff --git a/performance_tests/Inactive/20zone1vav.idf b/performance_tests/Inactive/20zone1vav.idf
@@ -8,7 +8,7 @@
 ! Title5= VisualDOE 5.0.0
 ! \group Simulation Parameters
 
-  Version,24.2;
+  Version,25.1;
 
   Building,
     Green Design Tools,      !- Name

diff --git a/performance_tests/Inactive/30zone1vav.idf b/performance_tests/Inactive/30zone1vav.idf
@@ -8,7 +8,7 @@
 ! Title5= VisualDOE 5.0.0
 ! \group Simulation Parameters
 
-  Version,24.2;
+  Version,25.1;
 
   Building,
     Green Design Tools,      !- Name

diff --git a/performance_tests/Inactive/40zone1vav.idf b/performance_tests/Inactive/40zone1vav.idf
@@ -8,7 +8,7 @@
 ! Title5= VisualDOE 5.0.0
 ! \group Simulation Parameters
 
-  Version,24.2;
+  Version,25.1;
 
   Building,
     Green Design Tools,      !- Name

diff --git a/performance_tests/Inactive/50zone1vav.idf b/performance_tests/Inactive/50zone1vav.idf
@@ -8,7 +8,7 @@
 ! Title5= VisualDOE 5.0.0
 ! \group Simulation Parameters
 
-  Version,24.2;
+  Version,25.1;
 
   Building,
     Green Design Tools,      !- Name

diff --git a/performance_tests/Inactive/60Zone1PVAV.idf b/performance_tests/Inactive/60Zone1PVAV.idf
@@ -8,7 +8,7 @@
 ! Title5= VisualDOE 5.0.0
 ! \group Simulation Parameters
 
-  Version,24.2;
+  Version,25.1;
 
   Building,
     Green Design Tools,      !- Name

diff --git a/performance_tests/Inactive/60Zone1VAV.idf b/performance_tests/Inactive/60Zone1VAV.idf
@@ -8,7 +8,7 @@
 ! Title5= VisualDOE 5.0.0
 ! \group Simulation Parameters
 
-  Version,24.2;
+  Version,25.1;
 
   Building,
     Green Design Tools,      !- Name

diff --git a/performance_tests/Inactive/60zone2PVAV.idf b/performance_tests/Inactive/60zone2PVAV.idf
@@ -8,7 +8,7 @@
 ! Title5= VisualDOE 5.0.0
 ! \group Simulation Parameters
 
-  Version,24.2;
+  Version,25.1;
 
   Building,
     Green Design Tools,      !- Name

diff --git a/performance_tests/Inactive/60zone3PVAV.idf b/performance_tests/Inactive/60zone3PVAV.idf
@@ -8,7 +8,7 @@
 ! Title5= VisualDOE 5.0.0
 ! \group Simulation Parameters
 
-  Version,24.2;
+  Version,25.1;
 
   Building,
     Green Design Tools,      !- Name

diff --git a/performance_tests/Inactive/60zone6PVAV.idf b/performance_tests/Inactive/60zone6PVAV.idf
@@ -8,7 +8,7 @@
 ! Title5= VisualDOE 5.0.0
 ! \group Simulation Parameters
 
-  Version,24.2;
+  Version,25.1;
 
   Building,
     Green Design Tools,      !- Name

diff --git a/performance_tests/PipingSystem_Underground_FHX.idf b/performance_tests/PipingSystem_Underground_FHX.idf
@@ -53,7 +53,7 @@
 !****** SIMULATION CONTROLS ********************************
 !***********************************************************
 
-  Version,24.2;
+  Version,25.1;
 
   Building,
     FHX House,               !- Name

diff --git a/src/Transition/CMakeLists.txt b/src/Transition/CMakeLists.txt
@@ -45,7 +45,7 @@ set(VERSIONS
     2_0_0  2_1_0  2_2_0  3_0_0  3_1_0  4_0_0  5_0_0  6_0_0  7_0_0  7_1_0  7_2_0
     8_0_0  8_1_0  8_2_0  8_3_0  8_4_0  8_5_0  8_6_0  8_7_0  8_8_0  8_9_0
     9_0_0  9_1_0  9_2_0  9_3_0  9_4_0  9_5_0  9_6_0
-    22_1_0 22_2_0 23_1_0 23_2_0 24_1_0 24_2_0
+    22_1_0 22_2_0 23_1_0 23_2_0 24_1_0 24_2_0 25_1_0
 )
 list(LENGTH VERSIONS VERSIONS_SIZE)
 math(EXPR end "${VERSIONS_SIZE} - 1")
@@ -104,6 +104,7 @@ install(FILES "InputRulesFiles/Rules22-2-0-to-23-1-0.md" DESTINATION "PreProcess
 install(FILES "InputRulesFiles/Rules23-1-0-to-23-2-0.md" DESTINATION "PreProcess/IDFVersionUpdater")
 install(FILES "InputRulesFiles/Rules23-2-0-to-24-1-0.md" DESTINATION "PreProcess/IDFVersionUpdater")
 install(FILES "InputRulesFiles/Rules24-1-0-to-24-2-0.md" DESTINATION "PreProcess/IDFVersionUpdater")
+install(FILES "InputRulesFiles/Rules24-2-0-to-25-1-0.md" DESTINATION "PreProcess/IDFVersionUpdater")
 
 install(FILES "OutputRulesFiles/OutputChanges9-0-0-to-9-1-0.md" DESTINATION "PreProcess/IDFVersionUpdater")
 install(FILES "OutputRulesFiles/OutputChanges9-1-0-to-9-2-0.md" DESTINATION "PreProcess/IDFVersionUpdater")
@@ -117,6 +118,7 @@ install(FILES "OutputRulesFiles/OutputChanges22-2-0-to-23-1-0.md" DESTINATION "P
 install(FILES "OutputRulesFiles/OutputChanges23-1-0-to-23-2-0.md" DESTINATION "PreProcess/IDFVersionUpdater")
 install(FILES "OutputRulesFiles/OutputChanges23-2-0-to-24-1-0.md" DESTINATION "PreProcess/IDFVersionUpdater")
 install(FILES "OutputRulesFiles/OutputChanges24-1-0-to-24-2-0.md" DESTINATION "PreProcess/IDFVersionUpdater")
+install(FILES "OutputRulesFiles/OutputChanges24-2-0-to-25-1-0.md" DESTINATION "PreProcess/IDFVersionUpdater")
 
 install(FILES "SupportFiles/Report Variables 9-0-0 to 9-1-0.csv" DESTINATION "PreProcess/IDFVersionUpdater/")
 install(FILES "SupportFiles/Report Variables 9-1-0 to 9-2-0.csv" DESTINATION "PreProcess/IDFVersionUpdater/")
@@ -130,3 +132,4 @@ install(FILES "SupportFiles/Report Variables 22-2-0 to 23-1-0.csv" DESTINATION "
 install(FILES "SupportFiles/Report Variables 23-1-0 to 23-2-0.csv" DESTINATION "PreProcess/IDFVersionUpdater/")
 install(FILES "SupportFiles/Report Variables 23-2-0 to 24-1-0.csv" DESTINATION "PreProcess/IDFVersionUpdater/")
 install(FILES "SupportFiles/Report Variables 24-1-0 to 24-2-0.csv" DESTINATION "PreProcess/IDFVersionUpdater/")
+install(FILES "SupportFiles/Report Variables 24-2-0 to 25-1-0.csv" DESTINATION "PreProcess/IDFVersionUpdater/")