openstudio-ee 0.12.3 → 0.12.4

data/lib/measures/EnableDemandControlledVentilation/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>enable_demand_controlled_ventilation</name>
   <uid>3ff4b412-8689-4b11-a588-935c621dc97d</uid>
-  <version_id>99de1cf0-2a9b-46f9-9e7f-d66cbe8e8b8a</version_id>
-  <version_modified>2025-08-08T15:15:56Z</version_modified>
+  <version_id>708475fa-7ed5-4cd0-b329-567329e2d602</version_id>
+  <version_modified>2025-09-25T15:33:42Z</version_modified>
   <xml_checksum>ECE70A70</xml_checksum>
   <class_name>EnableDemandControlledVentilation</class_name>
   <display_name>Enable Demand Controlled Ventilation</display_name>
@@ -102,7 +102,7 @@ The cost arguments are user arguments that start with a default of $0.</modeler_
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>AE953EFB</checksum>
+      <checksum>0F3A5367</checksum>
     </file>
     <file>
       <filename>0320_ModelWithHVAC_01.osm</filename>
@@ -114,7 +114,7 @@ The cost arguments are user arguments that start with a default of $0.</modeler_
       <filename>EnableDemandControlledVentilation_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>FE1D9051</checksum>
+      <checksum>BAB1432E</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/EnableEconomizerControl/measure.rb

@@ -10,11 +10,11 @@ class EnableEconomizerControl < OpenStudio::Measure::ModelMeasure
   # define the name that a user will see, this method may be deprecated as
   # the display name in PAT comes from the name field in measure.xml
   def name
-    return 'Enable Economizer Control'
+    'Enable Economizer Control'
   end
 
   # define the arguments that the user will input
-  def arguments(model)
+  def arguments(_model)
     args = OpenStudio::Measure::OSArgumentVector.new
 
     # make choice argument economizer control type
@@ -38,7 +38,7 @@ class EnableEconomizerControl < OpenStudio::Measure::ModelMeasure
     econoMinDryBulbTemp.setDefaultValue(-148.0)
     args << econoMinDryBulbTemp
 
-    return args
+    args
   end
 
   # define what happens when the measure is cop
@@ -46,9 +46,7 @@ class EnableEconomizerControl < OpenStudio::Measure::ModelMeasure
     super(model, runner, user_arguments)
 
     # use the built-in error checking
-    if !runner.validateUserArguments(arguments(model), user_arguments)
-      return false
-    end
+    return false unless runner.validateUserArguments(arguments(model), user_arguments)
 
     # assign the user inputs to variables
     economizer_type = runner.getStringArgumentValue('economizer_type', user_arguments)
@@ -64,11 +62,11 @@ class EnableEconomizerControl < OpenStudio::Measure::ModelMeasure
 
     # short def to make numbers pretty (converts 4125001.25641 to 4,125,001.26 or 4,125,001). The definition be called through this measure
     def neat_numbers(number, roundto = 2) # round to 0 or 2)
-      if roundto == 2
-        number = format '%.2f', number
-      else
-        number = number.round
-      end
+      number = if roundto == 2
+                 format '%.2f', number
+               else
+                 number.round
+               end
       # regex to add commas
       number.to_s.reverse.gsub(/([0-9]{3}(?=([0-9])))/, '\\1,').reverse
     end
@@ -82,42 +80,43 @@ class EnableEconomizerControl < OpenStudio::Measure::ModelMeasure
       # find AirLoopHVACOutdoorAirSystem on loop
       air_loop.supplyComponents.each do |supply_component|
         hVACComponent = supply_component.to_AirLoopHVACOutdoorAirSystem
-        if hVACComponent.is_initialized
-          hVACComponent = hVACComponent.get
+        next unless hVACComponent.is_initialized
 
-          # set flag that at least one air loop has outdoor air objects
-          loops_with_outdoor_air = true
+        hVACComponent = hVACComponent.get
 
-          # get ControllerOutdoorAir
-          controller_oa = hVACComponent.getControllerOutdoorAir
+        # set flag that at least one air loop has outdoor air objects
+        loops_with_outdoor_air = true
 
-          # get ControllerMechanicalVentilation
-          controller_mv = controller_oa.controllerMechanicalVentilation # not using this
+        # get ControllerOutdoorAir
+        controller_oa = hVACComponent.getControllerOutdoorAir
 
-          if controller_oa.getEconomizerControlType == economizer_type
-            # report info about air loop
-            runner.registerInfo("#{air_loop.name} already has the requested economizer type of #{economizer_type}.")
-          else
-            # store starting economizer type
-            starting_econo_control_type = controller_oa.getEconomizerControlType
+        # get ControllerMechanicalVentilation
+        controller_mv = controller_oa.controllerMechanicalVentilation # not using this
 
-            # set economizer to the requested control type
-            controller_oa.setEconomizerControlType(economizer_type)
+        if controller_oa.getEconomizerControlType == economizer_type
+          # report info about air loop
+          runner.registerInfo("#{air_loop.name} already has the requested economizer type of #{economizer_type}.")
+        else
+          # store starting economizer type
+          starting_econo_control_type = controller_oa.getEconomizerControlType
 
-            # report info about air loop
-            runner.registerInfo("Changing Economizer Control Type on #{air_loop.name} from #{starting_econo_control_type} to #{controller_oa.getEconomizerControlType} and adjusting temperature and enthalpy limits per measure arguments.")
+          # set economizer to the requested control type
+          controller_oa.setEconomizerControlType(economizer_type)
 
-            air_loops_changed << air_loop
+          # report info about air loop
+          runner.registerInfo("Changing Economizer Control Type on #{air_loop.name} from #{starting_econo_control_type} to #{controller_oa.getEconomizerControlType} and adjusting temperature and enthalpy limits per measure arguments.")
 
-          end
+          air_loops_changed << air_loop
 
-          # set maximum limit drybulb temperature
-          controller_oa.setEconomizerMaximumLimitDryBulbTemperature(OpenStudio.convert(econoMaxDryBulbTemp, 'F', 'C').get)
+        end
 
-          # set minimum limit drybulb temperature
-          controller_oa.setEconomizerMinimumLimitDryBulbTemperature(OpenStudio.convert(econoMinDryBulbTemp, 'F', 'C').get)
+        # set maximum limit drybulb temperature
+        controller_oa.setEconomizerMaximumLimitDryBulbTemperature(OpenStudio.convert(econoMaxDryBulbTemp, 'F',
+                                                                                     'C').get)
 
-        end
+        # set minimum limit drybulb temperature
+        controller_oa.setEconomizerMinimumLimitDryBulbTemperature(OpenStudio.convert(econoMinDryBulbTemp, 'F',
+                                                                                     'C').get)
       end
     end
 
@@ -136,7 +135,7 @@ class EnableEconomizerControl < OpenStudio::Measure::ModelMeasure
     # Report the final condition of model
     runner.registerFinalCondition("#{air_loops_changed.size} air loops now have economizers.")
 
-    return true
+    true
   end
 end
 

data/lib/measures/EnableEconomizerControl/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>enable_economizer_control</name>
   <uid>f8cc920d-8ae3-411a-922f-e6fed3223c4d</uid>
-  <version_id>50469df5-0b35-42a9-b0f8-b689e1d29209</version_id>
-  <version_modified>2025-08-08T15:15:56Z</version_modified>
+  <version_id>0a64dc7a-3455-437b-b187-386ad6d373ab</version_id>
+  <version_modified>2025-09-25T15:33:42Z</version_modified>
   <xml_checksum>ECE70A70</xml_checksum>
   <class_name>EnableEconomizerControl</class_name>
   <display_name>Enable Economizer Control</display_name>
@@ -159,7 +159,7 @@ The cost arguments are user arguments that start with a default of $0.
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>09B34548</checksum>
+      <checksum>A51BE018</checksum>
     </file>
     <file>
       <filename>0320_ModelWithHVAC_01.osm</filename>
@@ -171,7 +171,7 @@ The cost arguments are user arguments that start with a default of $0.
       <filename>measure_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>6A1E7B4A</checksum>
+      <checksum>76136CAF</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/GLHEProExportLoadsforGroundHeatExchangerSizing/measure.rb

@@ -19,14 +19,12 @@ class GLHEProExportLoadsforGroundHeatExchangerSizing < OpenStudio::Measure::Repo
   # define the name that a user will see, this method may be deprecated as
   # the display name in PAT comes from the name field in measure.xml
   def name
-    return 'GLHEProExportLoadsforGroundHeatExchangerSizing'
+    'GLHEProExportLoadsforGroundHeatExchangerSizing'
   end
 
   # define the arguments that the user will input
-  def arguments(model = nil)
-    args = OpenStudio::Measure::OSArgumentVector.new
-
-    return args
+  def arguments(_model = nil)
+    OpenStudio::Measure::OSArgumentVector.new
   end
 
   def energyPlusOutputRequests(runner, user_arguments)
@@ -35,11 +33,9 @@ class GLHEProExportLoadsforGroundHeatExchangerSizing < OpenStudio::Measure::Repo
     result = OpenStudio::IdfObjectVector.new
 
     # use the built-in error checking
-    unless runner.validateUserArguments(arguments, user_arguments)
-      return result
-    end
+    return result unless runner.validateUserArguments(arguments, user_arguments)
 
-    # note: these variable requests replace the functionality of GLHEProSetupExportLoadsforGroundHeatExchangerSizing measure
+    # NOTE: these variable requests replace the functionality of GLHEProSetupExportLoadsforGroundHeatExchangerSizing measure
 
     result << OpenStudio::IdfObject.load('Output:Variable,,District Heating Water Rate,hourly;').get
     result << OpenStudio::IdfObject.load('Output:Variable,,District Cooling Water Rate,hourly;').get
@@ -75,9 +71,7 @@ class GLHEProExportLoadsforGroundHeatExchangerSizing < OpenStudio::Measure::Repo
     super(runner, user_arguments)
 
     # use the built-in error checking
-    if !runner.validateUserArguments(arguments, user_arguments)
-      return false
-    end
+    return false unless runner.validateUserArguments(arguments, user_arguments)
 
     # Get the model and sql file
     model = runner.lastOpenStudioModel
@@ -117,20 +111,16 @@ class GLHEProExportLoadsforGroundHeatExchangerSizing < OpenStudio::Measure::Repo
       js_time = js_time.gsub('Sep', '09')
       js_time = js_time.gsub('Oct', '10')
       js_time = js_time.gsub('Nov', '11')
-      js_time = js_time.gsub('Dec', '12')
-
-      return js_time
+      js_time.gsub('Dec', '12')
     end
 
     # Get the weather file (as opposed to design day) run period
     annEnvPd = nil
     sql.availableEnvPeriods.each do |envPd|
       envType = sql.environmentType(envPd)
-      if !envType.empty?
-        if envType.get == 'WeatherRunPeriod'.to_EnvironmentType
-          annEnvPd = envPd
-        end
-      end
+      next if envType.empty?
+
+      annEnvPd = envPd if envType.get == 'WeatherRunPeriod'.to_EnvironmentType
     end
 
     # Find the names of all plant loops in the model that contain both a
@@ -148,9 +138,7 @@ class GLHEProExportLoadsforGroundHeatExchangerSizing < OpenStudio::Measure::Repo
         end
       end
 
-      if dist_htg_name && dist_clg_name
-        loop_names << [loop.name.get, dist_htg_name, dist_clg_name]
-      end
+      loop_names << [loop.name.get, dist_htg_name, dist_clg_name] if dist_htg_name && dist_clg_name
     end
 
     # Report any loops that were found that appear to be
@@ -264,14 +252,12 @@ class GLHEProExportLoadsforGroundHeatExchangerSizing < OpenStudio::Measure::Repo
       graph['title'] = "#{loop_name} - Hourly Heating and Cooling Power"
       graph['xaxislabel'] = 'Time'
       graph['yaxislabel'] = 'Power (kBtu/hr)'
-      graph['labels'] = ['Date', 'Heating', 'Cooling']
+      graph['labels'] = %w[Date Heating Cooling]
       graph['colors'] = ['#FF5050', '#0066FF']
       graph['timeseries'] = hourly_vals
 
       # This measure requires ruby 2.0.0 to create the JSON for the report graph
-      if RUBY_VERSION >= '2.0.0'
-        annualGraphData << graph
-      end
+      annualGraphData << graph if RUBY_VERSION >= '2.0.0'
 
       # Save out hourly load data to CSV
       File.open("./Annual Hourly Loads for #{loop_name}.csv", 'w') do |file|
@@ -355,15 +341,15 @@ class GLHEProExportLoadsforGroundHeatExchangerSizing < OpenStudio::Measure::Repo
 
       # Save the monthly load data for import into GLHEPro (.gt1)
       File.open("./Monthly Loads for #{loop_name}.gt1", 'w') do |file|
-        file.puts 'Clg/Htg Consumption (kBtu),'\
-                  "#{mon_clg_cons.join(',')},"\
-                  "#{ann_clg_cons},"\
-                  "#{mon_htg_cons.join(',')},"\
+        file.puts 'Clg/Htg Consumption (kBtu),' \
+                  "#{mon_clg_cons.join(',')}," \
+                  "#{ann_clg_cons}," \
+                  "#{mon_htg_cons.join(',')}," \
                   "#{ann_htg_cons}"
-        file.puts 'Clg/Htg Demand (Btuh),'\
-                  "#{mon_clg_dmd.join(',')},"\
-                  "#{ann_clg_dmd},"\
-                  "#{mon_htg_dmd.join(',')},"\
+        file.puts 'Clg/Htg Demand (Btuh),' \
+                  "#{mon_clg_dmd.join(',')}," \
+                  "#{ann_clg_dmd}," \
+                  "#{mon_htg_dmd.join(',')}," \
                   "#{ann_htg_dmd}"
       end
 
@@ -381,11 +367,11 @@ class GLHEProExportLoadsforGroundHeatExchangerSizing < OpenStudio::Measure::Repo
 
     # Read in the HTML report template
     html_in_path = "#{File.dirname(__FILE__)}/resources/report.html.in"
-    if File.exist?(html_in_path)
-      html_in_path = html_in_path
-    else
-      html_in_path = "#{File.dirname(__FILE__)}/report.html.in"
-    end
+    html_in_path = if File.exist?(html_in_path)
+                     html_in_path
+                   else
+                     "#{File.dirname(__FILE__)}/report.html.in"
+                   end
     html_in = ''
     File.open(html_in_path, 'r') do |file|
       html_in = file.read
@@ -410,7 +396,7 @@ class GLHEProExportLoadsforGroundHeatExchangerSizing < OpenStudio::Measure::Repo
     # Close the sql file
     sql.close
 
-    return true
+    true
   end
 end
 

data/lib/measures/GLHEProExportLoadsforGroundHeatExchangerSizing/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>glhe_pro_export_loadsfor_ground_heat_exchanger_sizing</name>
   <uid>7bb0ce67-cffb-4ef6-b7fb-093c7c43e263</uid>
-  <version_id>0f94f8bc-7ac5-4e87-82f2-768d4aafa52a</version_id>
-  <version_modified>2025-08-08T15:15:55Z</version_modified>
+  <version_id>f6942ed0-43ab-4423-86f1-1ef38469a968</version_id>
+  <version_modified>2025-09-25T15:33:42Z</version_modified>
   <xml_checksum>2C8A3EEF</xml_checksum>
   <class_name>GLHEProExportLoadsforGroundHeatExchangerSizing</class_name>
   <display_name>GLHEProExportLoadsforGroundHeatExchangerSizing</display_name>
@@ -134,7 +134,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>5F643BE6</checksum>
+      <checksum>86B7579E</checksum>
     </file>
     <file>
       <filename>report.html.in</filename>
@@ -152,7 +152,7 @@
       <filename>GLHEProExportLoadsforGroundHeatExchangerSizing_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>4E5FE874</checksum>
+      <checksum>AB9FCD20</checksum>
     </file>
     <file>
       <filename>USA_CO_Golden-NREL.724666_TMY3.epw</filename>

data/lib/measures/GLHEProGFunctionImport/measure.rb

@@ -19,7 +19,7 @@ class GLHEProGFunctionImport < OpenStudio::Measure::ModelMeasure
   # define the name that a user will see, this method may be deprecated as
   # the display name in PAT comes from the name field in measure.xml
   def name
-    return 'GLHEProGFunctionImport'
+    'GLHEProGFunctionImport'
   end
 
   # define the arguments that the user will input
@@ -57,7 +57,7 @@ class GLHEProGFunctionImport < OpenStudio::Measure::ModelMeasure
     object.setDisplayName('Select plant loop to add GLHX to')
     args << object
 
-    return args
+    args
   end
 
   # define what happens when the measure is run
@@ -65,16 +65,14 @@ class GLHEProGFunctionImport < OpenStudio::Measure::ModelMeasure
     super(model, runner, user_arguments)
 
     # Use the built-in error checking
-    if !runner.validateUserArguments(arguments(model), user_arguments)
-      return false
-    end
+    return false unless runner.validateUserArguments(arguments(model), user_arguments)
 
     # Assign the user inputs to variables
     g_function_path = runner.getStringArgumentValue('g_function_path', user_arguments)
     object = runner.getOptionalWorkspaceObjectChoiceValue('object', user_arguments, model)
 
     # Check to make sure the g function file exists
-    if !File.exist?(g_function_path)
+    unless File.exist?(g_function_path)
       runner.registerError("The G Function file '#{g_function_path}' could not be found.")
       return false
     end
@@ -89,17 +87,15 @@ class GLHEProGFunctionImport < OpenStudio::Measure::ModelMeasure
         runner.registerError("The selected loop with handle '#{handle}' was not found in the model. It may have been removed by another measure.")
       end
       return false
+    elsif object.get.to_PlantLoop.is_initialized
+      loop = object.get.to_PlantLoop.get
     else
-      if object.get.to_PlantLoop.is_initialized
-        loop = object.get.to_PlantLoop.get
-      else
-        runner.registerError('Script Error - argument not showing up as loop.')
-        return false
-      end
+      runner.registerError('Script Error - argument not showing up as loop.')
+      return false
     end
 
     # Check the location of the GFunction
-    if !File.exist?(g_function_path)
+    unless File.exist?(g_function_path)
       runner.registerError("Coulnd't find the G Function file.  Check file path and try again: '#{g_function_path}'.")
     end
 
@@ -178,7 +174,7 @@ class GLHEProGFunctionImport < OpenStudio::Measure::ModelMeasure
 
     # Add the G Function pairs after removing all old ones
     glhx.removeAllGFunctions
-    pair_range = 22..(76 * 2 + 22 - 2) # Pairs start on field 22
+    pair_range = 22..((76 * 2) + 22 - 2) # Pairs start on field 22
     pair_range.step(2) do |i|
       lntts = glhx_idf.getDouble(i)
       gfnc = glhx_idf.getDouble(i + 1)
@@ -193,7 +189,7 @@ class GLHEProGFunctionImport < OpenStudio::Measure::ModelMeasure
       glhx.addGFunction(lntts, gfnc)
     end
 
-    return true
+    true
   end
 end
 

data/lib/measures/GLHEProGFunctionImport/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>glhe_pro_g_function_import</name>
   <uid>001536d4-5048-4bc7-a327-57852f33c263</uid>
-  <version_id>575884e4-a720-40c7-8444-011f9d111df3</version_id>
-  <version_modified>2025-08-08T15:15:56Z</version_modified>
+  <version_id>342cf1e3-cef2-4ce1-aa76-a04aa4d92788</version_id>
+  <version_modified>2025-09-25T15:33:42Z</version_modified>
   <xml_checksum>4435983D</xml_checksum>
   <class_name>GLHEProGFunctionImport</class_name>
   <display_name>GLHEProGFunctionImport</display_name>
@@ -71,13 +71,13 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>DF9B7C02</checksum>
+      <checksum>49E95B56</checksum>
     </file>
     <file>
       <filename>GLHEProGFunctionImport_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>A8B1BDF5</checksum>
+      <checksum>4092679A</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/GLHEProSetupExportLoadsforGroundHeatExchangerSizing/measure.rb

@@ -16,14 +16,12 @@ class GLHEProSetupExportLoadsforGroundHeatExchangerSizing < OpenStudio::Measure:
   # define the name that a user will see, this method may be deprecated as
   # the display name in PAT comes from the name field in measure.xml
   def name
-    return 'GLHEProSetupExportLoadsforGroundHeatExchangerSizing'
+    'GLHEProSetupExportLoadsforGroundHeatExchangerSizing'
   end
 
   # define the arguments that the user will input
-  def arguments(model)
-    args = OpenStudio::Measure::OSArgumentVector.new
-
-    return args
+  def arguments(_model)
+    OpenStudio::Measure::OSArgumentVector.new
   end
 
   # define what happens when the measure is run
@@ -31,9 +29,7 @@ class GLHEProSetupExportLoadsforGroundHeatExchangerSizing < OpenStudio::Measure:
     super(model, runner, user_arguments)
 
     # use the built-in error checking
-    if !runner.validateUserArguments(arguments(model), user_arguments)
-      return false
-    end
+    return false unless runner.validateUserArguments(arguments(model), user_arguments)
 
     # Define the reporting frequency
     reporting_frequency = 'hourly'
@@ -67,7 +63,7 @@ class GLHEProSetupExportLoadsforGroundHeatExchangerSizing < OpenStudio::Measure:
       end
     end
 
-    return true
+    true
   end
 end
 

data/lib/measures/GLHEProSetupExportLoadsforGroundHeatExchangerSizing/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>glhe_pro_setup_export_loadsfor_ground_heat_exchanger_sizing</name>
   <uid>9fd3ea9b-ed9f-423a-95dd-fb2bcea0d641</uid>
-  <version_id>6dc4bb63-a809-4d22-9d12-2f97d1573c27</version_id>
-  <version_modified>2025-08-08T15:15:55Z</version_modified>
+  <version_id>afd0593a-7d83-4a91-8475-6d7b8af2a06e</version_id>
+  <version_modified>2025-09-25T15:33:42Z</version_modified>
   <xml_checksum>9DEA48C0</xml_checksum>
   <class_name>GLHEProSetupExportLoadsforGroundHeatExchangerSizing</class_name>
   <display_name>GLHEProSetupExportLoadsforGroundHeatExchangerSizing</display_name>
@@ -66,7 +66,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>D232EB4B</checksum>
+      <checksum>AA22CE65</checksum>
     </file>
   </files>
 </measure>