openstudio-aedg 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3180c0ce5a040ec4aee8a13a76b4abe8da2a5a602001892e5d82ed0df26543c1
-  data.tar.gz: 7a02d5e4785b0a5bb22733771dfdc097e70ff06ca17877064d6ed15d2620ef88
+  metadata.gz: e52f7cec4aa618a49cd9fceb2ca693648e29768b9f912d227d9021a91776f32c
+  data.tar.gz: 4e1d8e1f97d5e5be0c7e6da36f35c6b2b0bf374e84594988b5afdc4a7f30fd5e
 SHA512:
-  metadata.gz: 801f4731974a291ad8e08f0de832fa5cbcb1458500a603a368bb69e9369ed63e80e717c5168ae009c0f81d7d77328755dc475eca3ed3645c8da3a1667d9cc98e
-  data.tar.gz: c34728b0fa0a41e86800e7d342ae375bcf8b8aa82ba9856f3c4ee7e345bb2c0c7d4c5a802262f741354ab44e7eb433597f0f5c068bd9a45d7b35be0ac987d5d7
+  metadata.gz: 7ac7bfea2953254ca8b98ccc8704d7bff2fb4dd841afb8a68e4d858cbd06702c395f5240193e5232632550bef0b792468999d32a0a16305c149e3b44f240105b
+  data.tar.gz: 53226e7aff5702d75030d73f467ad6467435ecb42b744c0df60937dbe4516a8e6159e468d43708c6955f13efe2c7c5cd6df66e886c47dddccbefde2e5d01d8e2

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # OpenStudio AEDG Gem
 
+## Version 0.7.0
+* Support for OpenStudio 3.5 (upgrade to standards gem 0.3.0, extension gem 0.6.0)
+
+## Version 0.6.0
+* Support for OpenStudio 3.4 (upgrade to standards gem 0.2.16, no extension gem upgrade)
+
 ## Version 0.5.0
 * Support for OpenStudio 3.3 (upgrade to extension gem 0.5.1 and standards gem 0.2.15)
 

data/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted 
 provided that the following conditions are met:

data/README.md

@@ -22,6 +22,8 @@ Or install it yourself as:
 
 |OpenStudio AEDG Gem|OpenStudio|Ruby|
 |:--------------:|:----------:|:--------:|
+| 0.7.0 | 3.5      | 2.7    |
+| 0.6.0 | 3.4      | 2.7    |
 | 0.5.0 | 3.3      | 2.7    |
 | 0.4.0 | 3.2      | 2.7    |
 | 0.3.0 | 3.1      | 2.5    |
@@ -39,7 +41,11 @@ Please review the [OpenStudio Contribution Policy](https://openstudio.net/openst
 # Releasing
 
 * Update CHANGELOG.md
-* Run `rake rubocop:auto_correct`
+* Run `rake openstudio:rubocop:auto_correct`
+* Run `rake openstudio:update_copyright`
+* Run `rake openstudio:update_measures` (this has to be done last since prior tasks alter measure files)
+* Update version in `readme.md`
+* Update version in `openstudio-aedg.gemspec`
 * Update version in `/lib/openstudio/aedg_measures/version.rb`
 * Create PR to master, after tests and reviews complete, then merge
 * Locally - from the master branch, run `rake release`

data/lib/measures/zedgk_12_hvac_fan_coil_doas/resources/OsLib_HVAC_zedg_fan_coil.rb

@@ -822,7 +822,7 @@ module OsLib_HVAC_zedg_fan_coil
         # 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.6)
@@ -833,7 +833,7 @@ module OsLib_HVAC_zedg_fan_coil
           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)
@@ -1087,13 +1087,13 @@ module OsLib_HVAC_zedg_fan_coil
         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.6)
@@ -1104,7 +1104,7 @@ module OsLib_HVAC_zedg_fan_coil
           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)

data/lib/measures/zedgk_12_hvac_fan_coil_doas_air_cooled_chiller/resources/OsLib_HVAC_zedg_fan_coil_air_cooled.rb

@@ -822,7 +822,7 @@ module OsLib_HVAC_zedg_fan_coil_air_cooled
         # 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.6)
@@ -833,7 +833,7 @@ module OsLib_HVAC_zedg_fan_coil_air_cooled
           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)
@@ -1087,13 +1087,13 @@ module OsLib_HVAC_zedg_fan_coil_air_cooled
         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.6)
@@ -1104,7 +1104,7 @@ module OsLib_HVAC_zedg_fan_coil_air_cooled
           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)

data/lib/measures/zedgk_12_hvac_gshp_doas/resources/OsLib_HVAC_zedg_gshp.rb

@@ -1090,7 +1090,7 @@ module OsLib_HVAC_zedg_gshp
     demand_side_components << unitary_component_b
 
     # TODO: - do I need to set system sizing?
-    # sizing_system.setMinimumSystemAirFlowRatio(0.3) #DCV
+    # sizing_system.setCentralHeatingMaximumSystemAirFlowRatio(0.3) #DCV
 
     return demand_side_components
   end
@@ -1159,7 +1159,7 @@ module OsLib_HVAC_zedg_gshp
           # 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)
@@ -1170,7 +1170,7 @@ module OsLib_HVAC_zedg_gshp
             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)
@@ -1429,7 +1429,7 @@ module OsLib_HVAC_zedg_gshp
         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'])
@@ -1446,7 +1446,7 @@ module OsLib_HVAC_zedg_gshp
 
           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)
@@ -1457,7 +1457,7 @@ module OsLib_HVAC_zedg_gshp
             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)

data/lib/measures/zedgk_12_hvac_vrf_with_doas/README.md

@@ -2,7 +2,7 @@
 
 ###### (Automatically generated documentation)
 
-# ZEDG VRF with DOAS
+# 
 
 ## Description
 
@@ -19,30 +19,8 @@ ModelMeasure
 ## Arguments
 
 
-### This space type should be part of a ceiling return air plenum.
-
-**Name:** ceilingReturnPlenumSpaceType,
-**Type:** Choice,
-**Units:** ,
-**Required:** false,
-**Model Dependent:** false
-
-### Total Cost for HVAC System ($).
-
-**Name:** costTotalHVACSystem,
-**Type:** Double,
-**Units:** ,
-**Required:** true,
-**Model Dependent:** false
-
-### Apply recommended availability and ventilation schedules for air handlers?
-
-**Name:** remake_schedules,
-**Type:** Boolean,
-**Units:** ,
-**Required:** true,
-**Model Dependent:** false
 
 
+This measure does not have any user arguments
 
 

data/lib/measures/zedgk_12_hvac_vrf_with_doas/measure.rb

@@ -295,10 +295,13 @@ class ZEDGVRFWithDOAS < OpenStudio::Measure::ModelMeasure
       options['heat_pump_loop'] = heat_pump_loop
     end
 
+    # string check for components used twice
+    string_check = 'v350.osc' # change to `old.osc` to test using 1.x source OSC files
+
     # added in custom code to load components to be used by createVRFAirConditioners
     files = Dir.entries("#{File.dirname(__FILE__)}/resources/")
     files.each do |new_object|
-      next if !new_object.include?('.osc')
+      next if !new_object.include?(string_check)
 
       # load the osc file
       new_object_path = OpenStudio::Path.new("#{File.dirname(__FILE__)}/resources/#{new_object}")
@@ -409,7 +412,7 @@ class ZEDGVRFWithDOAS < OpenStudio::Measure::ModelMeasure
     base_vrf_terminalUnit = nil
     files = Dir.entries("#{File.dirname(__FILE__)}/resources/")
     files.each do |new_object|
-      next if !new_object.include?('.osc')
+      next if !new_object.include?(string_check)
       runner.registerInfo("Importing component from #{new_object}")
 
       # load the osc file

data/lib/measures/zedgk_12_hvac_vrf_with_doas/measure.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <measure>
   <schema_version>3.0</schema_version>
+  <error>Unable to extract OpenStudio::Measure::OSMeasure object from /Users/dgoldwas/Documents/github/nrel/openstudio-aedg-gem/lib/measures/zedgk_12_hvac_vrf_with_doas/measure.rb. The script should contain a class that derives from OpenStudio::Measure::OSMeasure and should close with a line stating the class name followed by .new.registerWithApplication.</error>
   <name>zedgvrf_with_doas</name>
   <uid>633b8efc-7bcb-4aa0-8821-d0ee08f960db</uid>
-  <version_id>9cb92f03-be3e-405b-a5ca-202fda032373</version_id>
-  <version_modified>20210429T165034Z</version_modified>
+  <version_id>7428198c-0e3e-4932-811d-4fa40bf26884</version_id>
+  <version_modified>20221130T070053Z</version_modified>
   <xml_checksum>87BA8B1E</xml_checksum>
   <class_name>ZEDGVRFWithDOAS</class_name>
   <display_name>ZEDG VRF with DOAS</display_name>
@@ -15,22 +16,33 @@
     <argument>
       <name>ceilingReturnPlenumSpaceType</name>
       <display_name>This space type should be part of a ceiling return air plenum.</display_name>
+      <description></description>
       <type>Choice</type>
+      <units></units>
       <required>false</required>
       <model_dependent>false</model_dependent>
+      <default_value></default_value>
+      <min_value></min_value>
+      <max_value></max_value>
     </argument>
     <argument>
       <name>costTotalHVACSystem</name>
       <display_name>Total Cost for HVAC System ($).</display_name>
+      <description></description>
       <type>Double</type>
+      <units></units>
       <required>true</required>
       <model_dependent>false</model_dependent>
       <default_value>0</default_value>
+      <min_value></min_value>
+      <max_value></max_value>
     </argument>
     <argument>
       <name>remake_schedules</name>
       <display_name>Apply recommended availability and ventilation schedules for air handlers?</display_name>
+      <description></description>
       <type>Boolean</type>
+      <units></units>
       <required>true</required>
       <model_dependent>false</model_dependent>
       <default_value>true</default_value>
@@ -44,6 +56,8 @@
           <display_name>false</display_name>
         </choice>
       </choices>
+      <min_value></min_value>
+      <max_value></max_value>
     </argument>
   </arguments>
   <outputs />
@@ -76,30 +90,12 @@
       <usage_type>test</usage_type>
       <checksum>9D7EFAB2</checksum>
     </file>
-    <file>
-      <filename>VRF_AC.osc</filename>
-      <filetype>osc</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>B44F5D91</checksum>
-    </file>
-    <file>
-      <filename>VRF_Terminal.osc</filename>
-      <filetype>osc</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>49418453</checksum>
-    </file>
     <file>
       <filename>README.md.erb</filename>
       <filetype>erb</filetype>
       <usage_type>readmeerb</usage_type>
       <checksum>703C9964</checksum>
     </file>
-    <file>
-      <filename>README.md</filename>
-      <filetype>md</filetype>
-      <usage_type>readme</usage_type>
-      <checksum>8F22CB1F</checksum>
-    </file>
     <file>
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
@@ -121,13 +117,43 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>A672A989</checksum>
+      <checksum>1DC4506F</checksum>
     </file>
     <file>
       <filename>OsLib_HVAC_zedg_vrf.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>FFB4CB27</checksum>
+      <checksum>7B7AF853</checksum>
+    </file>
+    <file>
+      <filename>VRF_Terminal_old.osc</filename>
+      <filetype>osc</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>49418453</checksum>
+    </file>
+    <file>
+      <filename>VRF_AC_old.osc</filename>
+      <filetype>osc</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>B44F5D91</checksum>
+    </file>
+    <file>
+      <filename>VRF_Terminal_v350.osc</filename>
+      <filetype>osc</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>DCAF494D</checksum>
+    </file>
+    <file>
+      <filename>VRF_AC_v350.osc</filename>
+      <filetype>osc</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>EAE2D7D6</checksum>
+    </file>
+    <file>
+      <filename>README.md</filename>
+      <filetype>md</filetype>
+      <usage_type>readme</usage_type>
+      <checksum>0B68E96D</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/zedgk_12_hvac_vrf_with_doas/resources/OsLib_HVAC_zedg_vrf.rb

@@ -862,7 +862,7 @@ module OsLib_HVAC_zedg_vrf
         # 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.6)
@@ -873,7 +873,7 @@ module OsLib_HVAC_zedg_vrf
           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)