Update to v24.1.0-IOFreeze

CMakeLists.txt

@@ -18,7 +18,7 @@ if(CCACHE_PROGRAM)
 endif()
 
 # Project macro can only take digits in the version, it splits these out to specific variables
-project(OpenStudio VERSION 3.7.0)
+project(OpenStudio VERSION 3.8.0)
 
 include(CMake/compiler_flags.cmake)
 
@@ -191,18 +191,18 @@ if(hasParent)
 endif()
 
 # EnergyPlus Idd version
-set(ENERGYPLUS_VERSION_MAJOR 23)
-set(ENERGYPLUS_VERSION_MINOR 2)
+set(ENERGYPLUS_VERSION_MAJOR 24)
+set(ENERGYPLUS_VERSION_MINOR 1)
 set(ENERGYPLUS_VERSION_PATCH 0)
 set(ENERGYPLUS_VERSION "${ENERGYPLUS_VERSION_MAJOR}.${ENERGYPLUS_VERSION_MINOR}.${ENERGYPLUS_VERSION_PATCH}")
 # Build SHA is not required to have a value, but if it does OpenStudio will require this build.
-set(ENERGYPLUS_BUILD_SHA "7636e6b3e9")
+set(ENERGYPLUS_BUILD_SHA "69e977a26e")
 
 # ENERGYPLUS_RELEASE_NAME is used to locate the E+ download
 # from the github releases
-set(ENERGYPLUS_RELEASE_NAME "v23.2.0-WithMacStaticLibs")
+set(ENERGYPLUS_RELEASE_NAME "v24.1.0-IOFreeze")
 
-set(ENERGYPLUS_REPO "jmarrec") # TODO: temp
+set(ENERGYPLUS_REPO "NREL")
 
 # Radiance
 set(RADIANCE_VERSION "5.0.a.12")
@@ -625,25 +625,25 @@ endif()
 if(UNIX)
   if(APPLE)
     if (ARCH MATCHES "arm64")
-      set(ENERGYPLUS_EXPECTED_HASH 72948a3f884ce9fe44145210eceb8259)
+      set(ENERGYPLUS_EXPECTED_HASH f27b5abefcbe850f9107b1a84ec313b2)
       set(ENERGYPLUS_PLATFORM "Darwin-macOS12.1-arm64")
     else()
-      set(ENERGYPLUS_EXPECTED_HASH 219c1a5cfec7b6fd6bd8507c043b82ab)
+      set(ENERGYPLUS_EXPECTED_HASH 17819846a562cd7d39bb1c3fa57fe448)
       set(ENERGYPLUS_PLATFORM "Darwin-macOS10.15-x86_64")
     endif()
   elseif(LSB_RELEASE_ID_SHORT MATCHES "CentOS")
     # TODO: There aren't any redhat releases anymore, see PR #3145 too
-    set(ENERGYPLUS_EXPECTED_HASH 0edcf8a13c7f0e05b65e1559cb7624cd)
+    set(ENERGYPLUS_EXPECTED_HASH TBD_TODO_TBD) # TODO
     set(ENERGYPLUS_PLATFORM "Linux-CentOS7.9.2009-x86_64")
   else()
     if(LSB_RELEASE_VERSION_SHORT MATCHES "22.04")
       if (ARCH MATCHES "arm64")
-        set(ENERGYPLUS_EXPECTED_HASH 363c537aff1f9c664192451139a85964)
+        set(ENERGYPLUS_EXPECTED_HASH 33fc7793ff2f6c2e87461b006580b2d8)
       else()
-        set(ENERGYPLUS_EXPECTED_HASH 773dc61ddb6f3dc633ac4df0bdaa3337)
+        set(ENERGYPLUS_EXPECTED_HASH 2aa4ab0527c569751b20d836266dd9b8)
       endif()
     elseif(LSB_RELEASE_VERSION_SHORT MATCHES "20.04")
-      set(ENERGYPLUS_EXPECTED_HASH b8644c02e287e3ffee89023e98ac5a13)
+      set(ENERGYPLUS_EXPECTED_HASH 2041c17eff76dead3fc3c4c6dc71b60a)
     else() # 18.04
       message(FATAL_ERROR "EnergyPlus no longer provides packages for Ubuntu 18.04")
     endif()
@@ -679,7 +679,7 @@ elseif(WIN32)
   if(CMAKE_SIZEOF_VOID_P EQUAL 8) # 64 bit
     set(ENERGYPLUS_PATH "EnergyPlus-${ENERGYPLUS_VERSION}-${ENERGYPLUS_BUILD_SHA}-Windows-x86_64")
     set(ENERGYPLUS_ARCH 64)
-    set(ENERGYPLUS_EXPECTED_HASH 7fbc694629ba6abbe400854661ebe1ae)
+    set(ENERGYPLUS_EXPECTED_HASH 3d16d187117fa2409b0b32776738bcac)
   else()
     set(ENERGYPLUS_PATH "EnergyPlus-${ENERGYPLUS_VERSION}-${ENERGYPLUS_BUILD_SHA}-Windows-i386")
     set(ENERGYPLUS_ARCH 32)

developer/doc/ReleaseNotes/OpenStudio_Release_Notes_3_8_0_TBD.md

@@ -0,0 +1,96 @@
+# OpenStudio Version 3.8.0
+
+_Release Notes_ - _TBD_
+
+These release notes describe version 3.8.0 of the OpenStudio SDK developed by the National Renewable Energy Laboratory (NREL), Buildings and Thermal Sciences Center, Commercial Buildings Research Group, Tools Development Section, and associated collaborators. The notes are organized into the following sections:
+
+-  Overview
+-  Where to Find OpenStudio Documentation
+-  Installation Notes
+-  OpenStudio SDK: Changelog
+
+# Overview
+
+As of April 2020, development and distribution of the OpenStudioApplication and the SketchUp plugin have transitioned to the OpenStudio Coalition, who is independently managing and distributing the software through its own [openstudiocoalition/OpenStudioApplication](https://github.com/openstudiocoalition/OpenStudioApplication) repository. The OpenStudio SDK is continuing to be actively developed and distributed by NREL and is released two times per year, through a spring and a fall release.
+
+Below is the list of components that is included in this SDK installer:
+
+__**OpenStudio SDK 3.8.0**__
+- EnergyPlus
+- Command Line Interface (CLI)
+- Radiance
+- Ruby API
+- C++ SDK
+
+**Note** that [PAT](https://github.com/NREL/OpenStudio-PAT) is not included in either the SDK or the OpenStudio Coalition's Application installers. You will need to install PAT separately which is distributed on the [OpenStudio-PAT](https://github.com/NREL/OpenStudio-PAT) GitHub page.
+
+# Where to Find OpenStudio SDK Documentation
+
+- OpenStudio SDK release documentation, including these release notes, tutorials, and other user documentation, is available at [https://www.openstudio.net/](https://www.openstudio.net/.)
+- C++ API documentation is available at [https://openstudio-sdk-documentation.s3.amazonaws.com/index.html](https://openstudio-sdk-documentation.s3.amazonaws.com/index.html)
+- Measure development documentation is available at [http://nrel.github.io/OpenStudio-user-documentation/reference/measure_writing_guide/](http://nrel.github.io/OpenStudio-user-documentation/reference/measure_writing_guide/ )
+- A roadmap for planned features is available at http://nrel.github.io/OpenStudio-user-documentation/getting_started/roadmap/.
+
+# Installation Notes
+
+OpenStudio SDK 3.8.0 is supported on:
+
+* 64-bit Windows 7 – 11
+* macOS: 10.15+ x86_64, 12.1+ arm64
+* Ubuntu: 20.04 x86_64, 22.04 x86_64, 22.04 arm64
+* Centos7
+
+OpenStudio SDK 3.8.0 supports [EnergyPlus Release 24.1.0](https://github.com/NREL/EnergyPlus/releases/tag/v24.1.0), which is bundled with the OpenStudio installer. It is no longer necessary to download and install EnergyPlus separately. Other builds of EnergyPlus are not supported by OpenStudio SDK 3.8.0.
+
+OpenStudio SDK 3.8.0 supports Radiance 5.0.a.12, which is bundled with the OpenStudio installer; users no longer must install Radiance separately, and OpenStudio will use the included Radiance version regardless of any other versions that may be installed on the system. Other builds of Radiance are not supported by OpenStudio SDK 3.8.0.
+
+As usual, you can refer to the **[OpenStudio SDK Compatibility Matrix](https://github.com/NREL/OpenStudio/wiki/OpenStudio-SDK-Version-Compatibility-Matrix)** for more information.
+
+
+## Installation Steps
+
+- Download and install [OpenStudio SDK](https://github.com/NREL/openstudio) and/or [openstudiocoalition/OpenStudioApplication](https://github.com/openstudiocoalition/OpenStudioApplication) depending on your needs. Select components for installation. Note that OpenStudio Application is a standalone app and does not require you to install OpenStudio SDK.
+- Setup a Building Component Library (BCL) account to access online building components and measures. View instructions on how to setup your account and configure the key in OpenStudio.
+- The OpenStudio Application SketchUp Plug-in requires SketchUp 2021-2022 (not available for Linux). The OpenStudio Application SketchUp Plug-in does not support older versions of SketchUp. SketchUp must be installed before OpenStudio Application to automatically activate the plugin. If you install SketchUp after OpenStudio Application, simply re-run the OpenStudio Application installer.
+
+For help with common installation problems please visit, http://nrel.github.io/OpenStudio-user-documentation/getting_started/getting_started/.
+
+# OpenStudio SDK:
+
+The 3.8.0 is a **major** release. This update includes several new features, performance improvements, and bug fixes.
+
+## C++ Workflow code
+
+As of OpenStudio SDK 3.7.0 a re-written workflow written in C++ is used by default in place of the Ruby based Workflow Gem that had been used in the past. This enhancement is in support of Python measures being used in an OpenStudio workflow, including mixed language workflows that include both Ruby Measures and Python Measures. If you need to use the older Workflow Gem implementation, you can do that by using the `classic` subcommand after `openstudio`. `classic` will be deprecated in a future version of OpenStudio. 
+
+## Python Bindings
+
+As of OpenStudio SDK 3.2.0, Python bindings are officially supported and distributed through Python Package Index (PyPI). To install, users will need to have Python3 installed along with pip and simply run the following command in a terminal window.
+
+`pip install openstudio==3.8.0`
+
+Please see [openstudio on PyPi](https://pypi.org/project/openstudio/) for further instructions on how to install. Users can also visit the test channel at [openstudio on TestPyPi](https://test.pypi.org/project/openstudio/) to install development bindings.
+
+You can also refer to the [OpenStudio SDK Python Binding Version Compatibility Matrix](https://github.com/NREL/OpenStudio/wiki/OpenStudio-SDK-Python-Binding-Version-Compatibility-Matrix) to see the list of supported platforms and python versions.
+
+## New Features, Major Fixes and API-breaking changes
+
+* 
+* 
+* 
+
+## Minor changes and bug fixes
+
+* 
+*
+*
+
+## Known Issues / Limitations
+
+*
+*
+*
+
+**Full Changelog**: https://github.com/NREL/OpenStudio/compare/v3.7.0...v3.8.0
+
+**New Contributors**:

resources/CMakeLists.txt

@@ -125,6 +125,7 @@ set(utilities_resources_src
   utilities/SqlFile/1ZoneEvapCooler-V22-2-0.sql
   utilities/SqlFile/1ZoneEvapCooler-V23-1-0.sql
   utilities/SqlFile/1ZoneEvapCooler-V23-2-0.sql
+  utilities/SqlFile/1ZoneEvapCooler-V24-1-0.sql
   utilities/xml/base.xml
   utilities/xml/hpxml_with_error.xml
   utilities/xml/schema/HPXML.xsd

resources/IdfFilesToTransition.lst.in

@@ -1,3 +1,4 @@
+${PROJECT_SOURCE_DIR}/resources/eefg/dummy.idf
 ${PROJECT_SOURCE_DIR}/resources/energyplus/5ZoneAirCooled/in.idf
 ${PROJECT_SOURCE_DIR}/resources/energyplus/AllFuelTypes/in.idf
 ${PROJECT_SOURCE_DIR}/resources/energyplus/BestestEx/in.idf
@@ -13,16 +14,24 @@ ${PROJECT_SOURCE_DIR}/resources/energyplus/Components/idf_designday_4/Annual_Coo
 ${PROJECT_SOURCE_DIR}/resources/energyplus/Components/idf_designday_5/Annual_Heating_Wind_99.idf
 ${PROJECT_SOURCE_DIR}/resources/energyplus/Daylighting_Office/in.idf
 ${PROJECT_SOURCE_DIR}/resources/energyplus/Daylighting_School/in.idf
-${PROJECT_SOURCE_DIR}/resources/energyplus/HospitalBaseline/in.idf
 ${PROJECT_SOURCE_DIR}/resources/energyplus/FrameAndDivider/in.idf
+${PROJECT_SOURCE_DIR}/resources/energyplus/HospitalBaseline/in.idf
 ${PROJECT_SOURCE_DIR}/resources/energyplus/Office_With_Many_HVAC_Types/in.idf
 ${PROJECT_SOURCE_DIR}/resources/energyplus/RefLargeOffice/RefBldgLargeOfficeNew2004_Chicago.idf
+${PROJECT_SOURCE_DIR}/resources/energyplus/ScheduleFile/in.idf
+${PROJECT_SOURCE_DIR}/resources/energyplus/SimpleSurfaces/4ZoneWithShading_Simple_2.idf
 ${PROJECT_SOURCE_DIR}/resources/energyplus/SimpleSurfaces/SimpleSurfaces_Reference.idf
 ${PROJECT_SOURCE_DIR}/resources/energyplus/SimpleSurfaces/SimpleSurfaces_Relative.idf
+${PROJECT_SOURCE_DIR}/resources/energyplus/SmallOffice/SmallOffice.idf
 ${PROJECT_SOURCE_DIR}/resources/energyplus/TranslatorV2_Tests/Simple_Construction.idf
 ${PROJECT_SOURCE_DIR}/resources/energyplus/ZoneBoundaryCondition/Bug_486_zone_bdr_test.idf
 ${PROJECT_SOURCE_DIR}/resources/energyplus/NewFileTemplate.idf
-${PROJECT_SOURCE_DIR}/resources/energyplus/SmallOffice/SmallOffice.idf
+${PROJECT_SOURCE_DIR}/resources/utilities/Idf/CommentTest.idf
+${PROJECT_SOURCE_DIR}/resources/utilities/Idf/DosLineEndingTest.idf
+${PROJECT_SOURCE_DIR}/resources/utilities/Idf/FormatPropertyTest_Formatted.idf
+${PROJECT_SOURCE_DIR}/resources/utilities/Idf/FormatPropertyTest_Unformatted.idf
+${PROJECT_SOURCE_DIR}/resources/utilities/Idf/MixedLineEndingTest.idf
+${PROJECT_SOURCE_DIR}/resources/utilities/Idf/UnixLineEndingTest.idf
 ${PROJECT_SOURCE_DIR}/src/energyplus/Resources/LCCusePriceEscalationDataSet2011.idf
 ${PROJECT_SOURCE_DIR}/src/energyplus/Resources/NH3_FluidPropertiesDataSet.idf
 ${PROJECT_SOURCE_DIR}/src/energyplus/Resources/R11_FluidPropertiesDataSet.idf
@@ -35,12 +44,3 @@ ${PROJECT_SOURCE_DIR}/src/energyplus/Resources/R407a_FluidPropertiesDataSet.idf
 ${PROJECT_SOURCE_DIR}/src/energyplus/Resources/R410a_FluidPropertiesDataSet.idf
 ${PROJECT_SOURCE_DIR}/src/energyplus/Resources/R507a_FluidPropertiesDataSet.idf
 ${PROJECT_SOURCE_DIR}/src/energyplus/Resources/R744_FluidPropertiesDataSet.idf
-${PROJECT_SOURCE_DIR}/resources/eefg/dummy.idf
-${PROJECT_SOURCE_DIR}/resources/energyplus/ScheduleFile/in.idf
-${PROJECT_SOURCE_DIR}/resources/energyplus/SimpleSurfaces/4ZoneWithShading_Simple_2.idf
-${PROJECT_SOURCE_DIR}/resources/utilities/Idf/CommentTest.idf
-${PROJECT_SOURCE_DIR}/resources/utilities/Idf/DosLineEndingTest.idf
-${PROJECT_SOURCE_DIR}/resources/utilities/Idf/FormatPropertyTest_Formatted.idf
-${PROJECT_SOURCE_DIR}/resources/utilities/Idf/FormatPropertyTest_Unformatted.idf
-${PROJECT_SOURCE_DIR}/resources/utilities/Idf/MixedLineEndingTest.idf
-${PROJECT_SOURCE_DIR}/resources/utilities/Idf/UnixLineEndingTest.idf

resources/IdfFilesToTransition.lst.md

@@ -0,0 +1,7 @@
+- Run an initial build to produce build/resources/IdfFilesToTransition.lst from resources/IdfFilesToTransition.lst.in.
+- Install the appropriate version of EnergyPlus.
+- Open EnergyPlus/PreProcess/IDFVersionUpdater/IDFVersionUpdate.exe.
+- Choose File to Update... > build/resources/IdfFilesToTransition.lst.
+- New Version should auto-populate to version of EnergyPlus.
+- Create Intermediate Version Files > No.
+- Delete Original Files > Yes.

resources/energyplus/5ZoneAirCooled/in.idf

@@ -100,7 +100,7 @@
 ! Environmental Emissions:        None
 ! Utility Tariffs:                None
 
-  Version,23.2;
+  Version,24.1;
 
   Building,
     Building,                !- Name
@@ -850,7 +850,7 @@
     LIGHTS-1,                !- Schedule Name
     LightingLevel,           !- Design Level Calculation Method
     1584,                    !- Lighting Level {W}
-    ,                        !- Watts per Zone Floor Area {W/m2}
+    ,                        !- Watts per Floor Area {W/m2}
     ,                        !- Watts per Person {W/person}
     0.2,                     !- Return Air Fraction
     0.59,                    !- Fraction Radiant
@@ -864,7 +864,7 @@
     EQUIP-1,                 !- Schedule Name
     EquipmentLevel,          !- Design Level Calculation Method
     1056,                    !- Design Level {W}
-    ,                        !- Watts per Zone Floor Area {W/m2}
+    ,                        !- Watts per Floor Area {W/m2}
     ,                        !- Watts per Person {W/person}
     0,                       !- Fraction Latent
     0.3,                     !- Fraction Radiant
@@ -1065,7 +1065,7 @@
     LIGHTS-1,                !- Schedule Name
     LightingLevel,           !- Design Level Calculation Method
     684,                     !- Lighting Level {W}
-    ,                        !- Watts per Zone Floor Area {W/m2}
+    ,                        !- Watts per Floor Area {W/m2}
     ,                        !- Watts per Person {W/person}
     0.2,                     !- Return Air Fraction
     0.59,                    !- Fraction Radiant
@@ -1079,7 +1079,7 @@
     EQUIP-1,                 !- Schedule Name
     EquipmentLevel,          !- Design Level Calculation Method
     456,                     !- Design Level {W}
-    ,                        !- Watts per Zone Floor Area {W/m2}
+    ,                        !- Watts per Floor Area {W/m2}
     ,                        !- Watts per Person {W/person}
     0,                       !- Fraction Latent
     0.3,                     !- Fraction Radiant
@@ -1245,7 +1245,7 @@
     LIGHTS-1,                !- Schedule Name
     LightingLevel,           !- Design Level Calculation Method
     1584,                    !- Lighting Level {W}
-    ,                        !- Watts per Zone Floor Area {W/m2}
+    ,                        !- Watts per Floor Area {W/m2}
     ,                        !- Watts per Person {W/person}
     0.2,                     !- Return Air Fraction
     0.59,                    !- Fraction Radiant
@@ -1259,7 +1259,7 @@
     EQUIP-1,                 !- Schedule Name
     EquipmentLevel,          !- Design Level Calculation Method
     1056,                    !- Design Level {W}
-    ,                        !- Watts per Zone Floor Area {W/m2}
+    ,                        !- Watts per Floor Area {W/m2}
     ,                        !- Watts per Person {W/person}
     0,                       !- Fraction Latent
     0.3,                     !- Fraction Radiant
@@ -1440,7 +1440,7 @@
     LIGHTS-1,                !- Schedule Name
     LightingLevel,           !- Design Level Calculation Method
     684,                     !- Lighting Level {W}
-    ,                        !- Watts per Zone Floor Area {W/m2}
+    ,                        !- Watts per Floor Area {W/m2}
     ,                        !- Watts per Person {W/person}
     0.2,                     !- Return Air Fraction
     0.59,                    !- Fraction Radiant
@@ -1454,7 +1454,7 @@
     EQUIP-1,                 !- Schedule Name
     EquipmentLevel,          !- Design Level Calculation Method
     456,                     !- Design Level {W}
-    ,                        !- Watts per Zone Floor Area {W/m2}
+    ,                        !- Watts per Floor Area {W/m2}
     ,                        !- Watts per Person {W/person}
     0,                       !- Fraction Latent
     0.3,                     !- Fraction Radiant
@@ -1620,7 +1620,7 @@
     LIGHTS-1,                !- Schedule Name
     LightingLevel,           !- Design Level Calculation Method
     2964,                    !- Lighting Level {W}
-    ,                        !- Watts per Zone Floor Area {W/m2}
+    ,                        !- Watts per Floor Area {W/m2}
     ,                        !- Watts per Person {W/person}
     0.2,                     !- Return Air Fraction
     0.59,                    !- Fraction Radiant
@@ -1634,7 +1634,7 @@
     EQUIP-1,                 !- Schedule Name
     EquipmentLevel,          !- Design Level Calculation Method
     1976,                    !- Design Level {W}
-    ,                        !- Watts per Zone Floor Area {W/m2}
+    ,                        !- Watts per Floor Area {W/m2}
     ,                        !- Watts per Person {W/person}
     0,                       !- Fraction Latent
     0.3,                     !- Fraction Radiant