Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into Weather1
Browse files Browse the repository at this point in the history
  • Loading branch information
@Myoldmopar
Myoldmopar committed Oct 17, 2023
2 parents ec5e763 + 393c023 commit c429f6c
Show file tree
Hide file tree
Showing 829 changed files with 109,422 additions and 829 deletions.
10 changes: 5 additions & 5 deletions cmake/Version.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
set(CMAKE_VERSION_MAJOR 23)
set(CMAKE_VERSION_MINOR 2)
set(CMAKE_VERSION_MAJOR 24)
set(CMAKE_VERSION_MINOR 1)
set(CMAKE_VERSION_PATCH 0)

set(CMAKE_PROJECTED_RELEASE_DATE "30 September 2023")
set(CMAKE_PROJECTED_RELEASE_DATE "31 March 2024")

set(PREV_RELEASE_MAJOR 23)
set(PREV_RELEASE_MINOR 1)
set(PREV_RELEASE_MINOR 2)
set(PREV_RELEASE_PATCH 0)
set(PREV_RELEASE_SHA "87ed919")
set(PREV_RELEASE_SHA "7636e6b")

set(ENERGYPLUS_VERSION "${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}.${CMAKE_VERSION_PATCH}")

Expand Down
107,467 changes: 107,467 additions & 0 deletions idd/versions/V23-2-0-Energy+.idd
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion performance_tests/15zonePSZ.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
! ZONE_TERMINAL_FAN_STATIC_PRESSURE= 298.69
! End WebInterface Parameters

Version,23.2;
Version,24.1;

Timestep,4;

Expand Down
2 changes: 1 addition & 1 deletion performance_tests/15zonePTAC.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
! ZONE_TERMINAL_FAN_STATIC_PRESSURE= 298.69
! End WebInterface Parameters

Version,23.2;
Version,24.1;

Timestep,4;

Expand Down
2 changes: 1 addition & 1 deletion performance_tests/15zonePVAV.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
! ZONE_TERMINAL_FAN_STATIC_PRESSURE= 298.69
! End WebInterface Parameters

Version,23.2;
Version,24.1;

Timestep,4;

Expand Down
2 changes: 1 addition & 1 deletion performance_tests/15zonevav.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
! ZONE_TERMINAL_FAN_STATIC_PRESSURE= 298.69
! End WebInterface Parameters

Version,23.2;
Version,24.1;

Timestep,4;

Expand Down
2 changes: 1 addition & 1 deletion performance_tests/15zonevav_no_reports.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
! ZONE_TERMINAL_FAN_STATIC_PRESSURE= 298.69
! End WebInterface Parameters

Version,23.2;
Version,24.1;

Timestep,4;

Expand Down
2 changes: 1 addition & 1 deletion performance_tests/30zonePSZ.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
! ZONE_TERMINAL_FAN_STATIC_PRESSURE= 298.69
! End WebInterface Parameters

Version,23.2;
Version,24.1;

Timestep,4;

Expand Down
2 changes: 1 addition & 1 deletion performance_tests/30zonePTAC.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
! ZONE_TERMINAL_FAN_STATIC_PRESSURE= 298.69
! End WebInterface Parameters

Version,23.2;
Version,24.1;

Timestep,4;

Expand Down
2 changes: 1 addition & 1 deletion performance_tests/30zonePVAV.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
! ZONE_TERMINAL_FAN_STATIC_PRESSURE= 298.69
! End WebInterface Parameters

Version,23.2;
Version,24.1;

Timestep,4;

Expand Down
2 changes: 1 addition & 1 deletion performance_tests/30zonevav.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
! ZONE_TERMINAL_FAN_STATIC_PRESSURE= 298.69
! End WebInterface Parameters

Version,23.2;
Version,24.1;

Timestep,4;

Expand Down
2 changes: 1 addition & 1 deletion performance_tests/45zonePSZ.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
! ZONE_TERMINAL_FAN_STATIC_PRESSURE= 298.69
! End WebInterface Parameters

Version,23.2;
Version,24.1;

Timestep,4;

Expand Down
2 changes: 1 addition & 1 deletion performance_tests/45zonePTAC.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
! ZONE_TERMINAL_FAN_STATIC_PRESSURE= 298.69
! End WebInterface Parameters

Version,23.2;
Version,24.1;

Timestep,4;

Expand Down
2 changes: 1 addition & 1 deletion performance_tests/45zonePVAV.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
! ZONE_TERMINAL_FAN_STATIC_PRESSURE= 298.69
! End WebInterface Parameters

Version,23.2;
Version,24.1;

Timestep,4;

Expand Down
2 changes: 1 addition & 1 deletion performance_tests/45zonevav.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
! ZONE_TERMINAL_FAN_STATIC_PRESSURE= 298.69
! End WebInterface Parameters

Version,23.2;
Version,24.1;

Timestep,4;

Expand Down
2 changes: 1 addition & 1 deletion performance_tests/BenchmarkHospitalNew_USA_CA_SAN_FRANCISCO.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
! ExtWallConstruction=Mass
! End SimMetaData

Version,23.2;
Version,24.1;

!
!- Run Controls sections
Expand Down
2 changes: 1 addition & 1 deletion performance_tests/BenchmarkLargeOfficeNew_USA_CA_SAN_FRANCISCO_10_windows_per_zone.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
! ExtWallConstruction=Mass
! End SimMetaData

Version,23.2;
Version,24.1;

!
!- Run Controls sections
Expand Down
2 changes: 1 addition & 1 deletion performance_tests/Benchmarklargeofficenew_usa_ca_san_francisco_no_reports.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
! ExtWallConstruction=Mass
! End SimMetaData

Version,23.2;
Version,24.1;

!
!- Run Controls sections
Expand Down
2 changes: 1 addition & 1 deletion performance_tests/Inactive/10zone1vav.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
! Title5= VisualDOE 5.0.0
! \group Simulation Parameters

Version,23.2;
Version,24.1;

Building,
Green Design Tools, !- Name
Expand Down
2 changes: 1 addition & 1 deletion performance_tests/Inactive/20zone1vav.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
! Title5= VisualDOE 5.0.0
! \group Simulation Parameters

Version,23.2;
Version,24.1;

Building,
Green Design Tools, !- Name
Expand Down
2 changes: 1 addition & 1 deletion performance_tests/Inactive/30zone1vav.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
! Title5= VisualDOE 5.0.0
! \group Simulation Parameters

Version,23.2;
Version,24.1;

Building,
Green Design Tools, !- Name
Expand Down
2 changes: 1 addition & 1 deletion performance_tests/Inactive/40zone1vav.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
! Title5= VisualDOE 5.0.0
! \group Simulation Parameters

Version,23.2;
Version,24.1;

Building,
Green Design Tools, !- Name
Expand Down
2 changes: 1 addition & 1 deletion performance_tests/Inactive/50zone1vav.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
! Title5= VisualDOE 5.0.0
! \group Simulation Parameters

Version,23.2;
Version,24.1;

Building,
Green Design Tools, !- Name
Expand Down
2 changes: 1 addition & 1 deletion performance_tests/Inactive/60Zone1PVAV.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
! Title5= VisualDOE 5.0.0
! \group Simulation Parameters

Version,23.2;
Version,24.1;

Building,
Green Design Tools, !- Name
Expand Down
2 changes: 1 addition & 1 deletion performance_tests/Inactive/60Zone1VAV.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
! Title5= VisualDOE 5.0.0
! \group Simulation Parameters

Version,23.2;
Version,24.1;

Building,
Green Design Tools, !- Name
Expand Down
2 changes: 1 addition & 1 deletion performance_tests/Inactive/60zone2PVAV.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
! Title5= VisualDOE 5.0.0
! \group Simulation Parameters

Version,23.2;
Version,24.1;

Building,
Green Design Tools, !- Name
Expand Down
2 changes: 1 addition & 1 deletion performance_tests/Inactive/60zone3PVAV.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
! Title5= VisualDOE 5.0.0
! \group Simulation Parameters

Version,23.2;
Version,24.1;

Building,
Green Design Tools, !- Name
Expand Down
2 changes: 1 addition & 1 deletion performance_tests/Inactive/60zone6PVAV.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
! Title5= VisualDOE 5.0.0
! \group Simulation Parameters

Version,23.2;
Version,24.1;

Building,
Green Design Tools, !- Name
Expand Down
2 changes: 1 addition & 1 deletion performance_tests/PipingSystem_Underground_FHX.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
!****** SIMULATION CONTROLS ********************************
!***********************************************************

Version,23.2;
Version,24.1;

Building,
FHX House, !- Name
Expand Down
5 changes: 4 additions & 1 deletion src/Transition/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ set(VERSIONS
1_0_0 1_0_1 1_0_2 1_0_3 1_1_0 1_1_1 1_2_0 1_2_1 1_2_2 1_2_3 1_3_0 1_4_0
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
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
)
list(LENGTH VERSIONS VERSIONS_SIZE)
math(EXPR end "${VERSIONS_SIZE} - 1")
Expand Down Expand Up @@ -92,6 +92,7 @@ install(FILES "InputRulesFiles/Rules9-6-0-to-22-1-0.md" DESTINATION "PreProcess/
install(FILES "InputRulesFiles/Rules22-1-0-to-22-2-0.md" DESTINATION "PreProcess/IDFVersionUpdater")
install(FILES "InputRulesFiles/Rules22-2-0-to-23-1-0.md" DESTINATION "PreProcess/IDFVersionUpdater")
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 "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")
Expand All @@ -103,6 +104,7 @@ install(FILES "OutputRulesFiles/OutputChanges9-6-0-to-22-1-0.md" DESTINATION "Pr
install(FILES "OutputRulesFiles/OutputChanges22-1-0-to-22-2-0.md" DESTINATION "PreProcess/IDFVersionUpdater")
install(FILES "OutputRulesFiles/OutputChanges22-2-0-to-23-1-0.md" DESTINATION "PreProcess/IDFVersionUpdater")
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 "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/")
Expand All @@ -114,3 +116,4 @@ install(FILES "SupportFiles/Report Variables 9-6-0 to 22-1-0.csv" DESTINATION "P
install(FILES "SupportFiles/Report Variables 22-1-0 to 22-2-0.csv" DESTINATION "PreProcess/IDFVersionUpdater/")
install(FILES "SupportFiles/Report Variables 22-2-0 to 23-1-0.csv" DESTINATION "PreProcess/IDFVersionUpdater/")
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/")
Loading

5 comments on commit c429f6c

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Weather1 (Myoldmopar) - Win64-Windows-10-VisualStudio-16: OK (2749 of 2749 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-3
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Weather1 (Myoldmopar) - x86_64-MacOS-10.17-clang-14.0.0: OK (3529 of 3535 tests passed, 36 test warnings)

Messages:\n

  • 5 tests had: EDD diffs.
  • 28 tests had: ESO small diffs.
  • 29 tests had: EIO diffs.
  • 20 tests had: MTR small diffs.
  • 21 tests had: Table small diffs.
  • 3 tests had: ESO big diffs.
  • 5 tests had: Table big diffs.
  • 2 tests had: ERR diffs.
  • 2 tests had: MTR big diffs.

Failures:\n

regression Test Summary

  • Passed: 779
  • Failed: 6

Build Badge Test Badge

@nrel-bot-2b
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Weather1 (Myoldmopar) - x86_64-Linux-Ubuntu-22.04-gcc-11.4: OK (3570 of 3576 tests passed, 34 test warnings)

Messages:\n

  • 5 tests had: EDD diffs.
  • 27 tests had: EIO diffs.
  • 24 tests had: ESO small diffs.
  • 20 tests had: MTR small diffs.
  • 20 tests had: Table small diffs.
  • 3 tests had: ESO big diffs.
  • 5 tests had: Table big diffs.
  • 2 tests had: MTR big diffs.
  • 1 test had: ERR diffs.

Failures:\n

regression Test Summary

  • Passed: 799
  • Failed: 6

Build Badge Test Badge

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Weather1 (Myoldmopar) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-UnitTestsCoverage-Debug: OK (1963 of 1963 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Weather1 (Myoldmopar) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-IntegrationCoverage-Debug: OK (789 of 789 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

Please sign in to comment.