Merge branch 'develop' into MultispeedFans

NREL · Jan 9, 2023 · 9206678 · 9206678 · nrel-bot · Jan 9, 2023
2 parents ee4cbff + 70df7b9
commit 9206678
Show file tree

Hide file tree

Showing 1,859 changed files with 136,446 additions and 27,855 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -362,9 +362,9 @@ if(BUILD_FORTRAN)
     PROJECT Transition
     CMAKE_COMMAND_LINE ${TRANSITION_EXTRA_FLAGS}
     NO_EXTERNAL_INSTALL)
-  file(COPY "idd/V22-1-0-Energy+.idd" DESTINATION "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
-  configure_file(idd/Energy+.idd.in "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/V22-2-0-Energy+.idd")
-  file(COPY "src/Transition/SupportFiles/Report Variables 22-1-0 to 22-2-0.csv" DESTINATION "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
+  file(COPY "idd/V22-2-0-Energy+.idd" DESTINATION "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
+  configure_file(idd/Energy+.idd.in "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/V23-1-0-Energy+.idd")
+  file(COPY "src/Transition/SupportFiles/Report Variables 22-2-0 to 23-1-0.csv" DESTINATION "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
   cmake_add_fortran_subdirectory(
     src/Basement
     PROJECT Basement

diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-EnergyPlus, Copyright (c) 1996-2022, The Board of Trustees of the University of Illinois, The Regents of the University of California, through Lawrence Berkeley National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy), Oak Ridge National Laboratory, managed by UT-Battelle, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.
+EnergyPlus, Copyright (c) 1996-2023, The Board of Trustees of the University of Illinois, The Regents of the University of California, through Lawrence Berkeley National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy), Oak Ridge National Laboratory, managed by UT-Battelle, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.
 
 NOTICE: This Software was developed under funding from the U.S. Department of Energy and the U.S. Government consequently retains certain rights. As such, the U.S. Government has been granted for itself and others acting on its behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software to reproduce, distribute copies to the public, prepare derivative works, and perform publicly and display publicly, and to permit others to do so.
 

diff --git a/cmake/Install.cmake b/cmake/Install.cmake
@@ -358,7 +358,7 @@ install(
 
 # TODO Remove version from file name or generate
 # These files names are stored in variables because they also appear as start menu shortcuts later.
-set(RULES_XLS Rules22-1-0-to-22-2-0.md)
+set(RULES_XLS Rules22-2-0-to-22-3-0.md)
 install(FILES "${PROJECT_SOURCE_DIR}/release/Bugreprt.txt" DESTINATION "./")
 install(FILES "${PROJECT_SOURCE_DIR}/release/favicon.png" DESTINATION "./")
 configure_file("${PROJECT_SOURCE_DIR}/release/readme.in.html" "${PROJECT_BINARY_DIR}/release/readme.html" @ONLY)
@@ -372,8 +372,8 @@ set(CPACK_RESOURCE_FILE_README "${PROJECT_BINARY_DIR}/release/readme.html")
 
 install(FILES "${PROJECT_SOURCE_DIR}/bin/CurveFitTools/IceStorageCurveFitTool.xlsm" DESTINATION "PreProcess/HVACCurveFitTool/")
 install(FILES "${PROJECT_SOURCE_DIR}/bin/CurveFitTools/CurveFitTool.xlsm" DESTINATION "PreProcess/HVACCurveFitTool/")
-install(FILES "${PROJECT_SOURCE_DIR}/idd/V22-1-0-Energy+.idd" DESTINATION "PreProcess/IDFVersionUpdater/")
-install(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Energy+.idd" DESTINATION "PreProcess/IDFVersionUpdater/" RENAME "V22-2-0-Energy+.idd")
+install(FILES "${PROJECT_SOURCE_DIR}/idd/V22-2-0-Energy+.idd" DESTINATION "PreProcess/IDFVersionUpdater/")
+install(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Energy+.idd" DESTINATION "PreProcess/IDFVersionUpdater/" RENAME "V23-1-0-Energy+.idd")
 
 # Workflow stuff, takes about 40KB, so not worth it proposing to not install it
 install(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/workflows/app_g_postprocess.py" DESTINATION "workflows/") # COMPONENT Workflows)

diff --git a/cmake/PythonCopyStandardLib.py b/cmake/PythonCopyStandardLib.py
@@ -1,4 +1,4 @@
-# EnergyPlus, Copyright (c) 1996-2022, The Board of Trustees of the University
+# EnergyPlus, Copyright (c) 1996-2023, The Board of Trustees of the University
 # of Illinois, The Regents of the University of California, through Lawrence
 # Berkeley National Laboratory (subject to receipt of any required approvals
 # from the U.S. Dept. of Energy), Oak Ridge National Laboratory, managed by UT-

diff --git a/cmake/PythonGetBitSize.py b/cmake/PythonGetBitSize.py
@@ -1,4 +1,4 @@
-# EnergyPlus, Copyright (c) 1996-2022, The Board of Trustees of the University
+# EnergyPlus, Copyright (c) 1996-2023, The Board of Trustees of the University
 # of Illinois, The Regents of the University of California, through Lawrence
 # Berkeley National Laboratory (subject to receipt of any required approvals
 # from the U.S. Dept. of Energy), Oak Ridge National Laboratory, managed by UT-

diff --git a/cmake/ReverseDDPostProcess.py b/cmake/ReverseDDPostProcess.py
@@ -1,4 +1,4 @@
-# EnergyPlus, Copyright (c) 1996-2022, The Board of Trustees of the University
+# EnergyPlus, Copyright (c) 1996-2023, The Board of Trustees of the University
 # of Illinois, The Regents of the University of California, through Lawrence
 # Berkeley National Laboratory (subject to receipt of any required approvals
 # from the U.S. Dept. of Energy), Oak Ridge National Laboratory, managed by UT-

diff --git a/cmake/Version.cmake b/cmake/Version.cmake
@@ -1,13 +1,13 @@
-set(CMAKE_VERSION_MAJOR 22)
-set(CMAKE_VERSION_MINOR 2)
+set(CMAKE_VERSION_MAJOR 23)
+set(CMAKE_VERSION_MINOR 1)
 set(CMAKE_VERSION_PATCH 0)
 
-set(CMAKE_PROJECTED_RELEASE_DATE "30 September 2022")
+set(CMAKE_PROJECTED_RELEASE_DATE "31 March 2023")
 
 set(PREV_RELEASE_MAJOR 22)
-set(PREV_RELEASE_MINOR 1)
+set(PREV_RELEASE_MINOR 2)
 set(PREV_RELEASE_PATCH 0)
-set(PREV_RELEASE_SHA "ed759b1")
+set(PREV_RELEASE_SHA "c249759")
 
 set(ENERGYPLUS_VERSION "${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}.${CMAKE_VERSION_PATCH}")
 

diff --git a/design/FY2017/NFP-GlazingEnhancements.md b/design/FY2017/NFP-GlazingEnhancements.md
@@ -1236,7 +1236,7 @@ insert text
 
 I have got extensive help from Simon, LBNL, to develop this design document. Sincere thanks is expressed here.
 
-This section describes code changes and additions in EnergyPlus in HeatBalanceManager, CurveManager, DataHeatBalance, WindowManagerExteriorData, WindowManagerExteriorOptical, and WCE. The WCE contains 3 main projects: SPectralAveraging, SingleLayerOptics, and MultipleLayerOptics.
+This section describes code changes and additions in EnergyPlus in HeatBalanceManager, Curve, DataHeatBalance, WindowManagerExteriorData, WindowManagerExteriorOptical, and WCE. The WCE contains 3 main projects: SPectralAveraging, SingleLayerOptics, and MultipleLayerOptics.
 
 The code changes will be composed of 3 sections. The first section is data input and commonly required by both WCE and existing one. The second section is used in WCE only. The third section will be used by existing one only. 
 
@@ -1256,7 +1256,7 @@ The additions are mainly used to catch the changes in revised idd object: Window
 
 A section of the GetMaterialData function in the HeatBalanceManager module will be revised to accommodate the idd changes. The changes also cover to get the table curve numbers for 3 optical properties.  
 
-### CurveManager (Common) ###
+### Curve (Common) ###
 
 The changes of this module include new and revised functions.
 

diff --git a/design/FY2021/EquationFitCoilCurveReference.md b/design/FY2021/EquationFitCoilCurveReference.md
@@ -49,7 +49,7 @@ As described above, both quad-linear and quint-linear curves are needed for  Coi
 
 Once the above decision are made:
 
- - A new curve type will be added or current curve type will be modified in CurveManager and other curve related codes/data structures. The curve will be very similar to current quad-linear curve, eg.
+ - A new curve type will be added or current curve type will be modified in Curve and other curve related codes/data structures. The curve will be very similar to current quad-linear curve, eg.
  ```
 CURVE:QUINTLINEAR,
   SensCapCurve, ! Curve Name

diff --git a/design/FY2022/NFP-RefCondsWtrToAirCoils.md b/design/FY2022/NFP-RefCondsWtrToAirCoils.md
@@ -45,7 +45,7 @@ ratioTWB = (MixWetBulb + 273.15) / 283.15;
 [...]
 ratioTS = (((85.0 - 32.0) / 1.8) + 273.15) / 283.15;
 [...]
-TotCapTempModFac = CurveManager::CurveValue(state, simpleWatertoAirHP.TotalCoolCapCurveIndex, ratioTWB, ratioTS, 1.0, 1.0);
+TotCapTempModFac = Curve::CurveValue(state, simpleWatertoAirHP.TotalCoolCapCurveIndex, ratioTWB, ratioTS, 1.0, 1.0);
 [...]
 RatedCapCoolTotalDes = CoolCapAtPeak / TotCapTempModFac
 [...]