Skip to content

Commit

Permalink
Merge pull request #4658 from NREL/v22.2.0-IOFreeze
Browse files Browse the repository at this point in the history 
Update to v22.2.0
  • Loading branch information
@jmarrec
jmarrec committed Sep 28, 2022
2 parents 92da27b + f6af133 commit 3ffe2f0
Show file tree
Hide file tree
Showing 290 changed files with 19,568 additions and 4,009 deletions.
34 changes: 11 additions & 23 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,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.4.1)
project(OpenStudio VERSION 3.5.0)

# The RT Manifest file and C# SDK only support the digit portion of patch
string(APPEND PROJECT_VERSION_PATCH_DIGIT ${PROJECT_VERSION_PATCH})
Expand Down Expand Up @@ -187,15 +187,15 @@ endif()

# EnergyPlus Idd version
set(ENERGYPLUS_VERSION_MAJOR 22)
set(ENERGYPLUS_VERSION_MINOR 1)
set(ENERGYPLUS_VERSION_MINOR 2)
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 "ed759b17ee")
set(ENERGYPLUS_BUILD_SHA "c249759bad")

# ENERGYPLUS_RELEASE_NAME is used to locate the E+ download
# from the github releases
set(ENERGYPLUS_RELEASE_NAME "v22.1.0")
set(ENERGYPLUS_RELEASE_NAME "v22.2.0")

# Radiance
set(RADIANCE_VERSION "5.0.a.12")
Expand Down Expand Up @@ -579,10 +579,10 @@ endif()
if(UNIX)
if(APPLE)
if (ARCH MATCHES "arm64")
set(ENERGYPLUS_EXPECTED_HASH f8ccbd2a907c82ee3319f8105f00efe0)
set(ENERGYPLUS_EXPECTED_HASH 48af06ee5b4b0393444e6e57f4adadd5)
set(ENERGYPLUS_PLATFORM "Darwin-macOS12.1-arm64")
else()
set(ENERGYPLUS_EXPECTED_HASH a8b7727f57273d6e80c5763b1c73945d)
set(ENERGYPLUS_EXPECTED_HASH 92a76c5d60cf91536bdeacbe780d135a)
set(ENERGYPLUS_PLATFORM "Darwin-macOS10.15-x86_64")
endif()
elseif(LSB_RELEASE_ID_SHORT MATCHES "CentOS")
Expand All @@ -591,9 +591,9 @@ if(UNIX)
set(ENERGYPLUS_PLATFORM "Centos7-x86_64")
else()
if(LSB_RELEASE_VERSION_SHORT MATCHES "20.04")
set(ENERGYPLUS_EXPECTED_HASH 70dde5907e3e7f6aeee45bdff5145bc2)
set(ENERGYPLUS_EXPECTED_HASH f8a45aa0a01523b5f904d5c2ae8302f8)
else() # 18.04
set(ENERGYPLUS_EXPECTED_HASH dc9f4b3d30260c625aaaaf6e53046412)
set(ENERGYPLUS_EXPECTED_HASH 58b8397f55c2a1ede7ed08c5892e62ed)
endif()
set(ENERGYPLUS_PLATFORM "Linux${ENERGYPLUS_SYSTEM_VERSION}-x86_64")
endif()
Expand Down Expand Up @@ -625,11 +625,11 @@ 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 871afa6f931f295eb203bc892468fbce)
set(ENERGYPLUS_EXPECTED_HASH c6d296be45420d6e497f33727f044676)
else()
set(ENERGYPLUS_PATH "EnergyPlus-${ENERGYPLUS_VERSION}-${ENERGYPLUS_BUILD_SHA}-Windows-i386")
set(ENERGYPLUS_ARCH 32)
set(ENERGYPLUS_EXPECTED_HASH e5c8b2fa8b71c3c04e06ff366ab7fefc)
set(ENERGYPLUS_EXPECTED_HASH 68108677fceb17bd58be1c9c7a68f418)
endif()
if(EXISTS "${PROJECT_BINARY_DIR}/${ENERGYPLUS_PATH}.zip")
file(MD5 "${PROJECT_BINARY_DIR}/${ENERGYPLUS_PATH}.zip" ENERGYPLUS_HASH)
Expand Down Expand Up @@ -1310,16 +1310,7 @@ install(DIRECTORY "${ENERGYPLUS_DIR}/python_standard_lib" DESTINATION ./EnergyPl
install(DIRECTORY "${ENERGYPLUS_DIR}/pyenergyplus" DESTINATION ./EnergyPlus/ COMPONENT EnergyPlus)

if(APPLE)
install(PROGRAMS "${ENERGYPLUS_DIR}/libgfortran.5.dylib" DESTINATION ./EnergyPlus/ COMPONENT EnergyPlus)
if (ARCH MATCHES arm64)
install(PROGRAMS "${ENERGYPLUS_DIR}/libgcc_s.1.1.dylib" DESTINATION ./EnergyPlus/ COMPONENT EnergyPlus)
install(PROGRAMS "${ENERGYPLUS_DIR}/libintl.8.dylib" DESTINATION ./EnergyPlus/ COMPONENT EnergyPlus)
# TODO: quadmath / intl?
else()
install(PROGRAMS "${ENERGYPLUS_DIR}/libquadmath.0.dylib" DESTINATION ./EnergyPlus/ COMPONENT EnergyPlus)
install(PROGRAMS "${ENERGYPLUS_DIR}/libgcc_s.1.dylib" DESTINATION ./EnergyPlus/ COMPONENT EnergyPlus)
install(PROGRAMS "${ENERGYPLUS_DIR}/libintl.8.dylib" DESTINATION ./EnergyPlus/ COMPONENT EnergyPlus)
endif()
install(PROGRAMS "${ENERGYPLUS_DIR}/libintl.8.dylib" DESTINATION ./EnergyPlus/ COMPONENT EnergyPlus)
#install(PROGRAMS "${ENERGYPLUS_DIR}/Python" DESTINATION ./EnergyPlus/ COMPONENT EnergyPlus)
file(GLOB ENERGYPLUS_PYTHON_LIBS "${ENERGYPLUS_DIR}/libpython*")
foreach(python_lib IN LISTS ENERGYPLUS_PYTHON_LIBS)
Expand Down Expand Up @@ -1357,9 +1348,6 @@ elseif(UNIX)
foreach(python_lib IN LISTS ENERGYPLUS_PYTHON_LIBS)
install(PROGRAMS "${python_lib}" DESTINATION ./EnergyPlus/ COMPONENT EnergyPlus)
endforeach()
else()
#install(PROGRAMS "${ENERGYPLUS_PATH}/libgfortran.5.dylib" DESTINATION ./EnergyPlus/)
#install(PROGRAMS "${ENERGYPLUS_PATH}/libquadmath.0.dylib" DESTINATION ./EnergyPlus/)
endif()

if(WIN32)
Expand Down
7 changes: 6 additions & 1 deletion developer/doc/ReleaseNotes/OpenStudio_Release_Notes_3_4_1_TBD.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,17 @@ You can also refer to the [OpenStudio SDK Python Binding Version Compatibility M
* [#4642](https://github.com/NREL/OpenStudio/pull/4642) - Addresses #4575, API change for EvaporativeCoolerFluid:SingleSpeed
* `EvaporativeCoolerFluid:SingleSpeed` has an API-breaking change related to its `performanceInputMethod` getter. It is now a required field that returns `std::string` instead of `boost::optional<std::string>`.
* [#4644](https://github.com/NREL/OpenStudio/pull/4644) - Addresses #4575, API change for Coil:Cooling:DX:SingleSpeed and Coil:Cooling:DX:TwoSpeed
* ` Coil:Cooling:DX:SingleSpeed` and `Coil:Cooling:DX:TwoSpeed` have API-breaking changes related to many of their getters. They are now required fields that return `double` instead of `boost::optional<double>`. Also removes many deprecated methods.
* `Coil:Cooling:DX:SingleSpeed` and `Coil:Cooling:DX:TwoSpeed` have API-breaking changes related to many of their getters. They are now required fields that return `double` instead of `boost::optional<double>`. Also removes many deprecated methods.
* [#4632](https://github.com/NREL/OpenStudio/pull/4632) - Remove deprecated methods for AirWallMaterial, Node, SizingSystem, ZoneAirMassFlowConservation
* Removes the deprecated `AirWallMaterial` class completely, in favor of `ConstructionAirBoundary`
* Removes functions in `Node` that have been deprecated for 9+ years
* Removes deprecated methods in the `SizingSystem`, `ZoneAirMassFlowConservation`, `PlantLoop` & `AirLoopHVAC`, `AvailablilityManagerNightCycle`, `ZoneVentilationDesignFlowRate` classes
* Refer to the CSV file at [developer/ruby/deprecated_methods.csv](https://github.com/NREL/OpenStudio/blob/develop/developer/ruby/deprecated_methods.csv) for more information
* [#4665](https://github.com/NREL/OpenStudio/pull/4665) - Deprecate methods on Coil DX objects
* `Coil:Cooling:DX:SingleSpeed`, `Coil:Cooling:DX:MultiSpeed:StageData`, and `Coil:Cooling:DX:CurveFit:Speed`: `ratedEvaporatorFanPowerPerVolumeFlowRate` and `setRatedEvaporatorFanPowerPerVolumeFlowRate` in favor of `ratedEvaporatorFanPowerPerVolumeFlowRate2017` and `setRatedEvaporatorFanPowerPerVolumeFlowRate2017`
* `Coil:Heating:DX:SingleSpeed` and `Coil:Heating:DX:MultiSpeed:StageData`: `ratedSupplyFanPowerPerVolumeFlowRate` and `setRatedSupplyFanPowerPerVolumeFlowRate` in favor of `ratedSupplyFanPowerPerVolumeFlowRate2017` and `setRatedSupplyFanPowerPerVolumeFlowRate2017`
* [#4666](https://github.com/NREL/OpenStudio/pull/4666) - Changes related to availability schedule methods
* `Coil:Heating:Gas:MultiStage` has an API-breaking change related to its `availabilitySchedule` getter. It is now a required field that returns `Schedule` instead of `boost::optional<Schedule>`. Method `resetAvailabilitySchedule` is also removed.


## Minor changes and bug fixes
Expand Down
2 changes: 1 addition & 1 deletion developer/ruby/GenerateClass.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ def forwardTranslate(options)

# VIRTUAL DESTRUCTORS

hpp << " virtual ~" << className << "() {}\n\n"
hpp << " virtual ~" << className << "() = default;\n\n"
hpp << " //@}\n\n"

if pImpl
Expand Down
2 changes: 1 addition & 1 deletion developer/ruby/SubProjectClassGenerators/SubProjectClassGenerator.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ def cppPublicClassProtectedImpl()
if @baseClassName.empty?
result << " : m_impl(impl)\n"
else
result << " : " << baseClassName << "(impl)\n"
result << " : " << baseClassName << "(std::move(impl))\n"
end
result << "{}\n"
end
Expand Down
2 changes: 2 additions & 0 deletions resources/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ set(utilities_resources_src
utilities/SqlFile/1ZoneEvapCooler-V9-5-0.sql
utilities/SqlFile/1ZoneEvapCooler-V9-6-0.sql
utilities/SqlFile/1ZoneEvapCooler-V22-1-0.sql
utilities/SqlFile/1ZoneEvapCooler-V22-2-0.sql
utilities/xml/base.xml
utilities/xml/hpxml_with_error.xml
utilities/xml/schema/HPXML.xsd
Expand Down Expand Up @@ -161,6 +162,7 @@ set(model_resources_src
model/offset_tests.osm
model/ParkUnder_Retail_Office_C2.osm
model/ASHRAECourthouse.osm
model/A205ExampleChiller.RS0001.a205.cbor
)


Expand Down
7 changes: 5 additions & 2 deletions resources/eefg/dummy.idf
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
! Version,
! 9.1; !- Version Identifier

! Version,
! 22.2; !- Version Identifier

Building,
Building1, !- Name
Big, !- North Axis {deg}
Suburbs, !- Terrain
.04, !- Loads Convergence Tolerance Value
.04, !- Loads Convergence Tolerance Value {W}
.4, !- Temperature Convergence Tolerance Value {deltaC}
FullExterior, !- Solar Distribution
25, !- Maximum Number of Warmup Days
Expand All @@ -15,7 +18,7 @@
Building2, !- Name
Small, !- North Axis {deg}
Suburbs, !- Terrain
.04, !- Loads Convergence Tolerance Value
.04, !- Loads Convergence Tolerance Value {W}
.4, !- Temperature Convergence Tolerance Value {deltaC}
FullExterior, !- Solar Distribution
25, !- Maximum Number of Warmup Days
Expand Down
77 changes: 56 additions & 21 deletions resources/energyplus/5ZoneAirCooled/in.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
! Environmental Emissions: None
! Utility Tariffs: None

Version,22.1;
Version,22.2;

Building,
Building, !- Name
Expand Down Expand Up @@ -820,12 +820,12 @@

ZoneInfiltration:DesignFlowRate,
SPACE1-1 Infil 1, !- Name
SPACE1-1, !- Zone or ZoneList Name
SPACE1-1, !- Zone or ZoneList or Space or SpaceList Name
INFIL-SCH, !- Schedule Name
flow/zone, !- Design Flow Rate Calculation Method
0.032, !- Design Flow Rate {m3/s}
, !- Flow per Zone Floor Area {m3/s-m2}
, !- Flow per Exterior Surface Area {m3/s-m2}
, !- Flow Rate per Floor Area {m3/s-m2}
, !- Flow Rate per Exterior Surface Area {m3/s-m2}
, !- Air Changes per Hour {1/hr}
0, !- Constant Term Coefficient
0, !- Temperature Term Coefficient
Expand Down Expand Up @@ -1035,12 +1035,12 @@

ZoneInfiltration:DesignFlowRate,
SPACE2-1 Infil 1, !- Name
SPACE2-1, !- Zone or ZoneList Name
SPACE2-1, !- Zone or ZoneList or Space or SpaceList Name
INFIL-SCH, !- Schedule Name
flow/zone, !- Design Flow Rate Calculation Method
0.014, !- Design Flow Rate {m3/s}
, !- Flow per Zone Floor Area {m3/s-m2}
, !- Flow per Exterior Surface Area {m3/s-m2}
, !- Flow Rate per Floor Area {m3/s-m2}
, !- Flow Rate per Exterior Surface Area {m3/s-m2}
, !- Air Changes per Hour {1/hr}
0, !- Constant Term Coefficient
0, !- Temperature Term Coefficient
Expand Down Expand Up @@ -1215,12 +1215,12 @@

ZoneInfiltration:DesignFlowRate,
SPACE3-1 Infil 1, !- Name
SPACE3-1, !- Zone or ZoneList Name
SPACE3-1, !- Zone or ZoneList or Space or SpaceList Name
INFIL-SCH, !- Schedule Name
flow/zone, !- Design Flow Rate Calculation Method
0.032, !- Design Flow Rate {m3/s}
, !- Flow per Zone Floor Area {m3/s-m2}
, !- Flow per Exterior Surface Area {m3/s-m2}
, !- Flow Rate per Floor Area {m3/s-m2}
, !- Flow Rate per Exterior Surface Area {m3/s-m2}
, !- Air Changes per Hour {1/hr}
0, !- Constant Term Coefficient
0, !- Temperature Term Coefficient
Expand Down Expand Up @@ -1410,12 +1410,12 @@

ZoneInfiltration:DesignFlowRate,
SPACE4-1 Infil 1, !- Name
SPACE4-1, !- Zone or ZoneList Name
SPACE4-1, !- Zone or ZoneList or Space or SpaceList Name
INFIL-SCH, !- Schedule Name
flow/zone, !- Design Flow Rate Calculation Method
0.014, !- Design Flow Rate {m3/s}
, !- Flow per Zone Floor Area {m3/s-m2}
, !- Flow per Exterior Surface Area {m3/s-m2}
, !- Flow Rate per Floor Area {m3/s-m2}
, !- Flow Rate per Exterior Surface Area {m3/s-m2}
, !- Air Changes per Hour {1/hr}
0, !- Constant Term Coefficient
0, !- Temperature Term Coefficient
Expand Down Expand Up @@ -1590,12 +1590,12 @@

ZoneInfiltration:DesignFlowRate,
SPACE5-1 Infil 1, !- Name
SPACE5-1, !- Zone or ZoneList Name
SPACE5-1, !- Zone or ZoneList or Space or SpaceList Name
INFIL-SCH, !- Schedule Name
flow/zone, !- Design Flow Rate Calculation Method
0.062, !- Design Flow Rate {m3/s}
, !- Flow per Zone Floor Area {m3/s-m2}
, !- Flow per Exterior Surface Area {m3/s-m2}
, !- Flow Rate per Floor Area {m3/s-m2}
, !- Flow Rate per Exterior Surface Area {m3/s-m2}
, !- Air Changes per Hour {1/hr}
0, !- Constant Term Coefficient
0, !- Temperature Term Coefficient
Expand Down Expand Up @@ -1774,7 +1774,14 @@
No, !- Account for Dedicated Outdoor Air System
NeutralSupplyAir, !- Dedicated Outdoor Air System Control Strategy
autosize, !- Dedicated Outdoor Air Low Setpoint Temperature for Design {C}
autosize; !- Dedicated Outdoor Air High Setpoint Temperature for Design {C}
autosize, !- Dedicated Outdoor Air High Setpoint Temperature for Design {C}
Sensible Load Only No Latent Load, !- Zone Load Sizing Method
HumidityRatioDifference, !- Zone Latent Cooling Design Supply Air Humidity Ratio Input Method
, !- Zone Dehumidification Design Supply Air Humidity Ratio {kgWater/kgDryAir}
0.005, !- Zone Cooling Design Supply Air Humidity Ratio Difference {kgWater/kgDryAir}
HumidityRatioDifference, !- Zone Latent Heating Design Supply Air Humidity Ratio Input Method
, !- Zone Humidification Design Supply Air Humidity Ratio {kgWater/kgDryAir}
0.005; !- Zone Humidification Design Supply Air Humidity Ratio Difference {kgWater/kgDryAir}

DesignSpecification:OutdoorAir,
SZ DSOA SPACE1-1, !- Name
Expand Down Expand Up @@ -1810,7 +1817,14 @@
No, !- Account for Dedicated Outdoor Air System
NeutralSupplyAir, !- Dedicated Outdoor Air System Control Strategy
autosize, !- Dedicated Outdoor Air Low Setpoint Temperature for Design {C}
autosize; !- Dedicated Outdoor Air High Setpoint Temperature for Design {C}
autosize, !- Dedicated Outdoor Air High Setpoint Temperature for Design {C}
Sensible Load Only No Latent Load, !- Zone Load Sizing Method
HumidityRatioDifference, !- Zone Latent Cooling Design Supply Air Humidity Ratio Input Method
, !- Zone Dehumidification Design Supply Air Humidity Ratio {kgWater/kgDryAir}
0.005, !- Zone Cooling Design Supply Air Humidity Ratio Difference {kgWater/kgDryAir}
HumidityRatioDifference, !- Zone Latent Heating Design Supply Air Humidity Ratio Input Method
, !- Zone Humidification Design Supply Air Humidity Ratio {kgWater/kgDryAir}
0.005; !- Zone Humidification Design Supply Air Humidity Ratio Difference {kgWater/kgDryAir}

DesignSpecification:OutdoorAir,
SZ DSOA SPACE2-1, !- Name
Expand Down Expand Up @@ -1846,7 +1860,14 @@
No, !- Account for Dedicated Outdoor Air System
NeutralSupplyAir, !- Dedicated Outdoor Air System Control Strategy
autosize, !- Dedicated Outdoor Air Low Setpoint Temperature for Design {C}
autosize; !- Dedicated Outdoor Air High Setpoint Temperature for Design {C}
autosize, !- Dedicated Outdoor Air High Setpoint Temperature for Design {C}
Sensible Load Only No Latent Load, !- Zone Load Sizing Method
HumidityRatioDifference, !- Zone Latent Cooling Design Supply Air Humidity Ratio Input Method
, !- Zone Dehumidification Design Supply Air Humidity Ratio {kgWater/kgDryAir}
0.005, !- Zone Cooling Design Supply Air Humidity Ratio Difference {kgWater/kgDryAir}
HumidityRatioDifference, !- Zone Latent Heating Design Supply Air Humidity Ratio Input Method
, !- Zone Humidification Design Supply Air Humidity Ratio {kgWater/kgDryAir}
0.005; !- Zone Humidification Design Supply Air Humidity Ratio Difference {kgWater/kgDryAir}

DesignSpecification:OutdoorAir,
SZ DSOA SPACE3-1, !- Name
Expand Down Expand Up @@ -1882,7 +1903,14 @@
No, !- Account for Dedicated Outdoor Air System
NeutralSupplyAir, !- Dedicated Outdoor Air System Control Strategy
autosize, !- Dedicated Outdoor Air Low Setpoint Temperature for Design {C}
autosize; !- Dedicated Outdoor Air High Setpoint Temperature for Design {C}
autosize, !- Dedicated Outdoor Air High Setpoint Temperature for Design {C}
Sensible Load Only No Latent Load, !- Zone Load Sizing Method
HumidityRatioDifference, !- Zone Latent Cooling Design Supply Air Humidity Ratio Input Method
, !- Zone Dehumidification Design Supply Air Humidity Ratio {kgWater/kgDryAir}
0.005, !- Zone Cooling Design Supply Air Humidity Ratio Difference {kgWater/kgDryAir}
HumidityRatioDifference, !- Zone Latent Heating Design Supply Air Humidity Ratio Input Method
, !- Zone Humidification Design Supply Air Humidity Ratio {kgWater/kgDryAir}
0.005; !- Zone Humidification Design Supply Air Humidity Ratio Difference {kgWater/kgDryAir}

DesignSpecification:OutdoorAir,
SZ DSOA SPACE4-1, !- Name
Expand Down Expand Up @@ -1918,7 +1946,14 @@
No, !- Account for Dedicated Outdoor Air System
NeutralSupplyAir, !- Dedicated Outdoor Air System Control Strategy
autosize, !- Dedicated Outdoor Air Low Setpoint Temperature for Design {C}
autosize; !- Dedicated Outdoor Air High Setpoint Temperature for Design {C}
autosize, !- Dedicated Outdoor Air High Setpoint Temperature for Design {C}
Sensible Load Only No Latent Load, !- Zone Load Sizing Method
HumidityRatioDifference, !- Zone Latent Cooling Design Supply Air Humidity Ratio Input Method
, !- Zone Dehumidification Design Supply Air Humidity Ratio {kgWater/kgDryAir}
0.005, !- Zone Cooling Design Supply Air Humidity Ratio Difference {kgWater/kgDryAir}
HumidityRatioDifference, !- Zone Latent Heating Design Supply Air Humidity Ratio Input Method
, !- Zone Humidification Design Supply Air Humidity Ratio {kgWater/kgDryAir}
0.005; !- Zone Humidification Design Supply Air Humidity Ratio Difference {kgWater/kgDryAir}

DesignSpecification:OutdoorAir,
SZ DSOA SPACE5-1, !- Name
Expand Down

0 comments on commit 3ffe2f0

Please sign in to comment.