Merge pull request #234 from NREL/3.5.0-rc1

updates for OS SDK 3.5.0-rc1

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.14.0)
 cmake_policy(SET CMP0048 NEW)
 
-project(ParametricAnalysisTool VERSION 3.4.0)
+project(ParametricAnalysisTool VERSION 3.5.0)
 
 find_package(Git)
 

app/package.json

@@ -3,7 +3,7 @@
   "productName": "ParametricAnalysisTool",
   "identifier": "gov.nrel.openstudio.pat",
   "description": "OpenStudio Parametric Analysis Tool",
-  "version": "3.4.0",
+  "version": "3.5.0",
   "author": "National Renewable Energy Laboratory",
   "main": "background.js",
   "dependencies": {

manifest.json

@@ -1,17 +1,17 @@
 {
   "endpoint": "https://openstudio-resources.s3.amazonaws.com/pat-dependencies3/",
   "energyplus": [{
-    "name": "EnergyPlus-22.1.0-win32.tar.gz",
+    "name": "EnergyPlus-22.2.0-win32.tar.gz",
     "platform": "win32",
     "arch": "x64",
     "type": "energyplus"
   }, {
-    "name": "EnergyPlus-22.1.0-darwin.tar.gz",
+    "name": "EnergyPlus-22.2.0-darwin.tar.gz",
     "platform": "darwin",
     "arch": "x64",
     "type": "energyplus"
   }, {
-    "name": "EnergyPlus-22.1.0-linux.tar.gz",
+    "name": "EnergyPlus-22.2.0-linux.tar.gz",
     "platform": "linux",
     "arch": "x64",
     "type": "energyplus"
@@ -60,33 +60,33 @@
     "type": "mongo"
   }],
   "openstudio": [{
-    "name": "OpenStudio-3.4.0-Windows.tar.gz",
+    "name": "OpenStudio-3.5.0-rc1-Windows.tar.gz",
     "platform": "win32",
     "arch": "x64",
     "type": "openstudio"
   }, {
-    "name": "OpenStudio-3.4.0-Darwin.tar.gz",
+    "name": "OpenStudio-3.5.0-rc1-Darwin.tar.gz",
     "platform": "darwin",
     "arch": "x64",
     "type": "openstudio"
   }, {
-    "name": "OpenStudio-3.4.0-Linux.tar.gz",
+    "name": "OpenStudio-3.5.0-rc1-Linux.tar.gz",
     "platform": "linux",
     "arch": "x64",
     "type": "OpenStudio"
   }],
   "openstudioServer": [{
-    "name": "OpenStudio-server-88db5b902e-win32.tar.gz",
+    "name": "OpenStudio-server-a98b4b3dff-win32.tar.gz",
     "platform": "win32",
     "arch": "x64",
     "type": "OpenStudio-server"
   }, {
-    "name": "OpenStudio-server-88db5b902e-darwin.tar.gz",
+    "name": "OpenStudio-server-a98b4b3dff-darwin.tar.gz",
     "platform": "darwin",
     "arch": "x64",
     "type": "OpenStudio-server"
   }, {
-    "name": "OpenStudio-server-88db5b902e-linux.tar.gz",
+    "name": "OpenStudio-server-a98b4b3dff-linux.tar.gz",
     "platform": "linux",
     "arch": "x64",
     "type": "OpenStudio-server"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "openstudio-pat",
-  "version": "3.4.0",
+  "version": "3.5.0",
   "devDependencies": {
     "@babel/core": "~7.19.1",
     "@babel/eslint-parser": "~7.19.1",

sample_projects/Office_HVAC/measures/13d5289f-43f6-4c51-a890-d3542daa7be0/measure.rb

@@ -301,4 +301,4 @@ def run(model, runner, user_arguments)
 end #end the measure
 
 #this allows the measure to be used by the application
-AedgOfficeHvacRadiantDoas.new.registerWithApplication
+AedgOfficeHvacRadiantDoas.new.registerWithApplication

sample_projects/Office_HVAC/measures/13d5289f-43f6-4c51-a890-d3542daa7be0/resources/OsLib_AedgMeasures.rb

@@ -461,4 +461,4 @@ def OsLib_AedgMeasures.getSmMdOffTips
 
   end #end of OsLib_AedgMeasures.getSmMdOffTips
 
-end # end of module OsLib_AedgMeasures
+end # end of module OsLib_AedgMeasures

sample_projects/Office_HVAC/measures/13d5289f-43f6-4c51-a890-d3542daa7be0/resources/OsLib_Constructions.rb

@@ -226,4 +226,4 @@ def OsLib_Constructions.getConstructionSRI(construction)
     return result
   end # end of OsLib_Constructions.getConstructionSRI
 
-end
+end

sample_projects/Office_HVAC/measures/13d5289f-43f6-4c51-a890-d3542daa7be0/resources/OsLib_Geometry.rb

@@ -44,4 +44,4 @@ def OsLib_Geometry.lowerSurfaceZvalue(surfaceArray, zValueTarget)
   end
 
 
-end
+end

sample_projects/Office_HVAC/measures/13d5289f-43f6-4c51-a890-d3542daa7be0/resources/OsLib_HVAC.rb

@@ -811,7 +811,7 @@ def OsLib_HVAC.createPrimaryAirLoops(model, runner, options)
         # create air loop fan
         if options["primaryHVAC"]["fan"] == "Variable"
           # create variable speed fan and set system sizing accordingly
-          sizing_system.setMinimumSystemAirFlowRatio(0.3) #DCV
+          sizing_system.setCentralHeatingMaximumSystemAirFlowRatio(0.3) #DCV
           # variable speed fan
           fan = OpenStudio::Model::FanVariableVolume.new(model, model.alwaysOnDiscreteSchedule())
           fan.setFanEfficiency(0.69)
@@ -822,7 +822,7 @@ def OsLib_HVAC.createPrimaryAirLoops(model, runner, options)
           fan.setMotorInAirstreamFraction(1.0)
           air_loop_comps << fan
         else
-          sizing_system.setMinimumSystemAirFlowRatio(1.0) # No DCV
+          sizing_system.setCentralHeatingMaximumSystemAirFlowRatio(1.0) # No DCV
           # constant speed fan
           fan = OpenStudio::Model::FanConstantVolume.new(model, model.alwaysOnDiscreteSchedule())
           fan.setFanEfficiency(0.6)
@@ -1078,13 +1078,13 @@ def OsLib_HVAC.createSecondaryAirLoops(model, runner, options)
         sizing_system.setTypeofLoadtoSizeOn("Sensible") #PSZ
         sizing_system.setAllOutdoorAirinCooling(false) #PSZ
         sizing_system.setAllOutdoorAirinHeating(false) #PSZ
-        sizing_system.setMinimumSystemAirFlowRatio(1.0) #Constant volume fan
+        sizing_system.setCentralHeatingMaximumSystemAirFlowRatio(1.0) #Constant volume fan
         air_loop_comps = []
         # set availability schedule (HVAC operation schedule)
         airloop_secondary.setAvailabilitySchedule(options["hvac_schedule"])
         if options["secondaryHVAC"]["fan"] == "Variable"
           # create variable speed fan and set system sizing accordingly
-          sizing_system.setMinimumSystemAirFlowRatio(0.3) #DCV
+          sizing_system.setCentralHeatingMaximumSystemAirFlowRatio(0.3) #DCV
           # variable speed fan
           fan = OpenStudio::Model::FanVariableVolume.new(model, model.alwaysOnDiscreteSchedule())
           fan.setFanEfficiency(0.69)
@@ -1095,7 +1095,7 @@ def OsLib_HVAC.createSecondaryAirLoops(model, runner, options)
           fan.setMotorInAirstreamFraction(1.0)
           air_loop_comps << fan
         else
-          sizing_system.setMinimumSystemAirFlowRatio(1.0) # No DCV
+          sizing_system.setCentralHeatingMaximumSystemAirFlowRatio(1.0) # No DCV
           # constant speed fan
           fan = OpenStudio::Model::FanConstantVolume.new(model, model.alwaysOnDiscreteSchedule())
           fan.setFanEfficiency(0.6)
@@ -1633,4 +1633,4 @@ def OsLib_HVAC.addDCV(model, runner, options)
     end
   end # end of def
 
-end
+end

sample_projects/Office_HVAC/measures/13d5289f-43f6-4c51-a890-d3542daa7be0/resources/OsLib_HelperMethods.rb

@@ -119,4 +119,4 @@ def OsLib_HelperMethods.checkDoubleArguments(runner, min, max, argumentHash)
   # OpenStudio has built in helper for unit conversion. That can be done using OpenStudio::convert() as shown below.
   # OpenStudio::convert(double,"from unit string","to unit string").get
 
-end
+end

sample_projects/Office_HVAC/measures/13d5289f-43f6-4c51-a890-d3542daa7be0/resources/OsLib_LightingAndEquipment.rb

@@ -101,4 +101,4 @@ def OsLib_LightingAndEquipment.addExteriorLights(model,runner, options = {})
 
   end #end of OsLib_LightingAndEquipment.addExteriorLights
 
-end
+end

sample_projects/Office_HVAC/measures/13d5289f-43f6-4c51-a890-d3542daa7be0/resources/OsLib_Schedules.rb

@@ -146,4 +146,4 @@ def OsLib_Schedules.createComplexSchedule(model, options = {})
 
   end #end of OsLib_Schedules.createComplexSchedule
 
-end
+end

sample_projects/Office_HVAC/measures/3ccda33f-1aea-4d7e-a6dc-5113b7ce6719/tests/XcelEDATariffSelectionandModelSetup_Test.rb

@@ -111,4 +111,4 @@ def test_XcelEDATariffSelectionandModelSetup_good_model
 
   end
 
-end
+end

sample_projects/Office_HVAC/measures/54185015-71f9-4397-b3f2-b0f3254fbc54/measure.rb

@@ -301,4 +301,4 @@ def run(model, runner, user_arguments)
 end #end the measure
 
 #this allows the measure to be used by the application
-AedgOfficeHvacVavChW.new.registerWithApplication
+AedgOfficeHvacVavChW.new.registerWithApplication

sample_projects/Office_HVAC/measures/54185015-71f9-4397-b3f2-b0f3254fbc54/resources/OsLib_AedgMeasures.rb

@@ -461,4 +461,4 @@ def OsLib_AedgMeasures.getSmMdOffTips
 
   end #end of OsLib_AedgMeasures.getSmMdOffTips
 
-end # end of module OsLib_AedgMeasures
+end # end of module OsLib_AedgMeasures

sample_projects/Office_HVAC/measures/54185015-71f9-4397-b3f2-b0f3254fbc54/resources/OsLib_Constructions.rb

@@ -226,4 +226,4 @@ def OsLib_Constructions.getConstructionSRI(construction)
     return result
   end # end of OsLib_Constructions.getConstructionSRI
 
-end
+end

sample_projects/Office_HVAC/measures/54185015-71f9-4397-b3f2-b0f3254fbc54/resources/OsLib_Geometry.rb

@@ -44,4 +44,4 @@ def OsLib_Geometry.lowerSurfaceZvalue(surfaceArray, zValueTarget)
   end
 
 
-end
+end

sample_projects/Office_HVAC/measures/54185015-71f9-4397-b3f2-b0f3254fbc54/resources/OsLib_HVAC.rb

@@ -811,7 +811,7 @@ def OsLib_HVAC.createPrimaryAirLoops(model, runner, options)
         # create air loop fan
         if options["primaryHVAC"]["fan"] == "Variable"
           # create variable speed fan and set system sizing accordingly
-          sizing_system.setMinimumSystemAirFlowRatio(0.3) #DCV
+          sizing_system.setCentralHeatingMaximumSystemAirFlowRatio(0.3) #DCV
           # variable speed fan
           fan = OpenStudio::Model::FanVariableVolume.new(model, model.alwaysOnDiscreteSchedule())
           fan.setFanEfficiency(0.69)
@@ -822,7 +822,7 @@ def OsLib_HVAC.createPrimaryAirLoops(model, runner, options)
           fan.setMotorInAirstreamFraction(1.0)
           air_loop_comps << fan
         else
-          sizing_system.setMinimumSystemAirFlowRatio(1.0) # No DCV
+          sizing_system.setCentralHeatingMaximumSystemAirFlowRatio(1.0) # No DCV
           # constant speed fan
           fan = OpenStudio::Model::FanConstantVolume.new(model, model.alwaysOnDiscreteSchedule())
           fan.setFanEfficiency(0.6)
@@ -1078,13 +1078,13 @@ def OsLib_HVAC.createSecondaryAirLoops(model, runner, options)
         sizing_system.setTypeofLoadtoSizeOn("Sensible") #PSZ
         sizing_system.setAllOutdoorAirinCooling(false) #PSZ
         sizing_system.setAllOutdoorAirinHeating(false) #PSZ
-        sizing_system.setMinimumSystemAirFlowRatio(1.0) #Constant volume fan
+        sizing_system.setCentralHeatingMaximumSystemAirFlowRatio(1.0) #Constant volume fan
         air_loop_comps = []
         # set availability schedule (HVAC operation schedule)
         airloop_secondary.setAvailabilitySchedule(options["hvac_schedule"])
         if options["secondaryHVAC"]["fan"] == "Variable"
           # create variable speed fan and set system sizing accordingly
-          sizing_system.setMinimumSystemAirFlowRatio(0.3) #DCV
+          sizing_system.setCentralHeatingMaximumSystemAirFlowRatio(0.3) #DCV
           # variable speed fan
           fan = OpenStudio::Model::FanVariableVolume.new(model, model.alwaysOnDiscreteSchedule())
           fan.setFanEfficiency(0.69)
@@ -1095,7 +1095,7 @@ def OsLib_HVAC.createSecondaryAirLoops(model, runner, options)
           fan.setMotorInAirstreamFraction(1.0)
           air_loop_comps << fan
         else
-          sizing_system.setMinimumSystemAirFlowRatio(1.0) # No DCV
+          sizing_system.setCentralHeatingMaximumSystemAirFlowRatio(1.0) # No DCV
           # constant speed fan
           fan = OpenStudio::Model::FanConstantVolume.new(model, model.alwaysOnDiscreteSchedule())
           fan.setFanEfficiency(0.6)
@@ -1633,4 +1633,4 @@ def OsLib_HVAC.addDCV(model, runner, options)
     end
   end # end of def
 
-end
+end

sample_projects/Office_HVAC/measures/54185015-71f9-4397-b3f2-b0f3254fbc54/resources/OsLib_HelperMethods.rb

@@ -119,4 +119,4 @@ def OsLib_HelperMethods.checkDoubleArguments(runner, min, max, argumentHash)
   # OpenStudio has built in helper for unit conversion. That can be done using OpenStudio::convert() as shown below.
   # OpenStudio::convert(double,"from unit string","to unit string").get
 
-end
+end

sample_projects/Office_HVAC/measures/54185015-71f9-4397-b3f2-b0f3254fbc54/resources/OsLib_LightingAndEquipment.rb

@@ -101,4 +101,4 @@ def OsLib_LightingAndEquipment.addExteriorLights(model,runner, options = {})
 
   end #end of OsLib_LightingAndEquipment.addExteriorLights
 
-end
+end

sample_projects/Office_HVAC/measures/54185015-71f9-4397-b3f2-b0f3254fbc54/resources/OsLib_Schedules.rb

@@ -146,4 +146,4 @@ def OsLib_Schedules.createComplexSchedule(model, options = {})
 
   end #end of OsLib_Schedules.createComplexSchedule
 
-end
+end

sample_projects/Office_HVAC/measures/750e74e3-ebb1-45c9-a463-9563d1137d03/measure.rb

@@ -301,4 +301,4 @@ def run(model, runner, user_arguments)
 end #end the measure
 
 #this allows the measure to be used by the application
-AedgOfficeHvacVavDx.new.registerWithApplication
+AedgOfficeHvacVavDx.new.registerWithApplication

sample_projects/Office_HVAC/measures/750e74e3-ebb1-45c9-a463-9563d1137d03/resources/OsLib_AedgMeasures.rb

@@ -461,4 +461,4 @@ def OsLib_AedgMeasures.getSmMdOffTips
 
   end #end of OsLib_AedgMeasures.getSmMdOffTips
 
-end # end of module OsLib_AedgMeasures
+end # end of module OsLib_AedgMeasures

sample_projects/Office_HVAC/measures/750e74e3-ebb1-45c9-a463-9563d1137d03/resources/OsLib_Constructions.rb

@@ -226,4 +226,4 @@ def OsLib_Constructions.getConstructionSRI(construction)
     return result
   end # end of OsLib_Constructions.getConstructionSRI
 
-end
+end

sample_projects/Office_HVAC/measures/750e74e3-ebb1-45c9-a463-9563d1137d03/resources/OsLib_Geometry.rb

@@ -44,4 +44,4 @@ def OsLib_Geometry.lowerSurfaceZvalue(surfaceArray, zValueTarget)
   end
 
 
-end
+end

sample_projects/Office_HVAC/measures/750e74e3-ebb1-45c9-a463-9563d1137d03/resources/OsLib_HVAC.rb

@@ -811,7 +811,7 @@ def OsLib_HVAC.createPrimaryAirLoops(model, runner, options)
         # create air loop fan
         if options["primaryHVAC"]["fan"] == "Variable"
           # create variable speed fan and set system sizing accordingly
-          sizing_system.setMinimumSystemAirFlowRatio(0.3) #DCV
+          sizing_system.setCentralHeatingMaximumSystemAirFlowRatio(0.3) #DCV
           # variable speed fan
           fan = OpenStudio::Model::FanVariableVolume.new(model, model.alwaysOnDiscreteSchedule())
           fan.setFanEfficiency(0.69)
@@ -822,7 +822,7 @@ def OsLib_HVAC.createPrimaryAirLoops(model, runner, options)
           fan.setMotorInAirstreamFraction(1.0)
           air_loop_comps << fan
         else
-          sizing_system.setMinimumSystemAirFlowRatio(1.0) # No DCV
+          sizing_system.setCentralHeatingMaximumSystemAirFlowRatio(1.0) # No DCV
           # constant speed fan
           fan = OpenStudio::Model::FanConstantVolume.new(model, model.alwaysOnDiscreteSchedule())
           fan.setFanEfficiency(0.6)
@@ -1078,13 +1078,13 @@ def OsLib_HVAC.createSecondaryAirLoops(model, runner, options)
         sizing_system.setTypeofLoadtoSizeOn("Sensible") #PSZ
         sizing_system.setAllOutdoorAirinCooling(false) #PSZ
         sizing_system.setAllOutdoorAirinHeating(false) #PSZ
-        sizing_system.setMinimumSystemAirFlowRatio(1.0) #Constant volume fan
+        sizing_system.setCentralHeatingMaximumSystemAirFlowRatio(1.0) #Constant volume fan
         air_loop_comps = []
         # set availability schedule (HVAC operation schedule)
         airloop_secondary.setAvailabilitySchedule(options["hvac_schedule"])
         if options["secondaryHVAC"]["fan"] == "Variable"
           # create variable speed fan and set system sizing accordingly
-          sizing_system.setMinimumSystemAirFlowRatio(0.3) #DCV
+          sizing_system.setCentralHeatingMaximumSystemAirFlowRatio(0.3) #DCV
           # variable speed fan
           fan = OpenStudio::Model::FanVariableVolume.new(model, model.alwaysOnDiscreteSchedule())
           fan.setFanEfficiency(0.69)
@@ -1095,7 +1095,7 @@ def OsLib_HVAC.createSecondaryAirLoops(model, runner, options)
           fan.setMotorInAirstreamFraction(1.0)
           air_loop_comps << fan
         else
-          sizing_system.setMinimumSystemAirFlowRatio(1.0) # No DCV
+          sizing_system.setCentralHeatingMaximumSystemAirFlowRatio(1.0) # No DCV
           # constant speed fan
           fan = OpenStudio::Model::FanConstantVolume.new(model, model.alwaysOnDiscreteSchedule())
           fan.setFanEfficiency(0.6)
@@ -1633,4 +1633,4 @@ def OsLib_HVAC.addDCV(model, runner, options)
     end
   end # end of def
 
-end
+end