Move update_args_hash into resource file.

NREL · Oct 4, 2024 · 5ee112d · 5ee112d
1 parent 1e736d7
commit 5ee112d
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 25 deletions.
diff --git a/measures/ApplyUpgrade/measure.rb b/measures/ApplyUpgrade/measure.rb
@@ -263,15 +263,17 @@ def run(model, runner, user_arguments)
         # Get measure name and arguments associated with the option
         options_measure_args, _errors = get_measure_args_from_option_names(lookup_csv_data, [option_name], parameter_name, lookup_file, runner)
         options_measure_args[option_name].each do |measure_subdir, args_hash|
-          update_args_hash(measures, measure_subdir, args_hash, false)
+          update_args_hash(measures, measure_subdir, args_hash)
         end
       end
 
       if halt_workflow(runner, measures)
         return false
       end
 
-      measures['ResStockArguments'] = [{}] if !measures.keys.include?('ResStockArguments') # upgrade is via another measure
+      if !measures.keys.include?('ResStockArguments') # upgrade is via another measure
+        measures['ResStockArguments'] = [{}]
+      end
 
       # Add measure arguments from existing building if needed
       parameters = get_parameters_ordered_from_options_lookup_tsv(lookup_csv_data, characteristics_dir)
@@ -290,7 +292,7 @@ def run(model, runner, user_arguments)
 
               new_args_hash[k] = v
             end
-            update_args_hash(measures, measure_subdir, new_args_hash, false)
+            update_args_hash(measures, measure_subdir, new_args_hash)
           end
         end
       end

diff --git a/measures/ApplyUpgrade/measure.xml b/measures/ApplyUpgrade/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>apply_upgrade</name>
   <uid>33f1654c-f734-43d1-b35d-9d2856e41b5a</uid>
-  <version_id>e0b6d3af-6941-45e2-8627-9d8f568ebe1a</version_id>
-  <version_modified>2024-09-04T23:38:38Z</version_modified>
+  <version_id>bdafc4c0-e705-4aec-bcd1-4e662b31f968</version_id>
+  <version_modified>2024-10-04T15:40:22Z</version_modified>
   <xml_checksum>9339BE01</xml_checksum>
   <class_name>ApplyUpgrade</class_name>
   <display_name>Apply Upgrade</display_name>
@@ -6342,7 +6342,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>8E47BE40</checksum>
+      <checksum>F73DDD7C</checksum>
     </file>
     <file>
       <filename>constants.rb</filename>

diff --git a/measures/BuildExistingModel/measure.rb b/measures/BuildExistingModel/measure.rb
@@ -323,7 +323,7 @@ def run(model, runner, user_arguments)
       print_option_assignment(parameter_name, option_name, runner)
       options_measure_args, _errors = get_measure_args_from_option_names(lookup_csv_data, [option_name], parameter_name, lookup_file, runner)
       options_measure_args[option_name].each do |measure_subdir, args_hash|
-        update_args_hash(measures, measure_subdir, args_hash, false)
+        update_args_hash(measures, measure_subdir, args_hash)
       end
     end
 

diff --git a/measures/BuildExistingModel/measure.xml b/measures/BuildExistingModel/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>build_existing_model</name>
   <uid>dedf59bb-3b88-4f16-8755-2c1ff5519cbf</uid>
-  <version_id>be99be23-ddd9-49c4-804a-cb9853764e3e</version_id>
-  <version_modified>2024-09-04T21:01:10Z</version_modified>
+  <version_id>a901b49d-d749-45b2-94fc-d5122935fd30</version_id>
+  <version_modified>2024-10-04T15:40:23Z</version_modified>
   <xml_checksum>2C38F48B</xml_checksum>
   <class_name>BuildExistingModel</class_name>
   <display_name>Build Existing Model</display_name>
@@ -349,7 +349,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>18614B0C</checksum>
+      <checksum>E660DFB7</checksum>
     </file>
   </files>
 </measure>
diff --git a/resources/buildstock.rb b/resources/buildstock.rb
@@ -4,6 +4,21 @@
 
 require_relative '../resources/hpxml-measures/HPXMLtoOpenStudio/resources/meta_measure'
 
+module Version
+  ResStock_Version = '3.3.0' # Version of ResStock
+  BuildStockBatch_Version = '2023.10.0' # Minimum required version of BuildStockBatch
+  WorkflowGenerator_Version = '2024.07.20' # Version of buildstockbatch workflow generator
+
+  def self.check_buildstockbatch_version
+    if ENV.keys.include?('BUILDSTOCKBATCH_VERSION') # buildstockbatch is installed
+      bsb_version = ENV['BUILDSTOCKBATCH_VERSION']
+      if Gem::Version.new(bsb_version) < Gem::Version.new(BuildStockBatch_Version)
+        fail "BuildStockBatch version #{BuildStockBatch_Version} or above is required. Found version: #{bsb_version}"
+      end
+    end
+  end
+end
+
 class TsvFile
   def initialize(full_path, runner)
     @full_path = full_path
@@ -404,6 +419,16 @@ def get_data_for_sample(buildstock_csv_path, building_id, runner)
   fail msg
 end
 
+def update_args_hash(hash, key, args)
+  if not hash.keys.include? key
+    hash[key] = [args]
+  else # merge new arguments into existing
+    args.each do |k, v|
+      hash[key][0][k] = v
+    end
+  end
+end
+
 class RunOSWs
   require 'openstudio'
   require 'csv'
@@ -520,18 +545,3 @@ def self.write_summary_results(results_dir, filename, results)
     return csv_out
   end
 end
-
-module Version
-  ResStock_Version = '3.3.0' # Version of ResStock
-  BuildStockBatch_Version = '2023.10.0' # Minimum required version of BuildStockBatch
-  WorkflowGenerator_Version = '2024.07.20' # Version of buildstockbatch workflow generator
-
-  def self.check_buildstockbatch_version
-    if ENV.keys.include?('BUILDSTOCKBATCH_VERSION') # buildstockbatch is installed
-      bsb_version = ENV['BUILDSTOCKBATCH_VERSION']
-      if Gem::Version.new(bsb_version) < Gem::Version.new(BuildStockBatch_Version)
-        fail "BuildStockBatch version #{BuildStockBatch_Version} or above is required. Found version: #{bsb_version}"
-      end
-    end
-  end
-end