Call ResStockArgumentsPostHPXML properly

Author: rajeee

measures/ApplyUpgrade/measure.rb

@@ -270,7 +270,6 @@ def run(model, runner, user_arguments)
       if halt_workflow(runner, measures)
         return false
       end
-
       measures['ResStockArguments'] = [{}] if !measures.keys.include?('ResStockArguments') # upgrade is via another measure
 
       # Add measure arguments from existing building if needed
@@ -517,9 +516,10 @@ def run(model, runner, user_arguments)
       register_logs(runner, new_runner)
       return false
     end
-
-    measures['ResStockArgumentsPostHPXML'] = [{ 'hpxml_path' => hpxml_path,
-                                                'output_csv_path' => File.expand_path('../schedules.csv') }]
+    measures['ResStockArgumentsPostHPXML'] = [{}] if !measures.keys.include?('ResStockArgumentsPostHPXML')
+    measures['ResStockArgumentsPostHPXML'][0]['hpxml_path'] = hpxml_path
+    measures['ResStockArgumentsPostHPXML'][0]['output_csv_path'] = File.expand_path('../schedules.csv')
+    measures['ResStockArgumentsPostHPXML'][0]['building_id'] = values['building_id']
     measures_hash = { 'ResStockArgumentsPostHPXML' => measures['ResStockArgumentsPostHPXML'] }
     if not apply_measures(measures_dir, measures_hash, new_runner, model, true, 'OpenStudio::Measure::ModelMeasure', nil)
       register_logs(runner, new_runner)
@@ -544,14 +544,14 @@ def run(model, runner, user_arguments)
       register_logs(runner, new_runner)
       return false
     end
-
     # Copy upgraded.xml to home.xml for downstream HPXMLtoOpenStudio
     # This will overwrite home.xml from BuildExistingModel
     # We need upgraded.xml (and not just home.xml) for UpgradeCosts
     in_path = File.expand_path('../home.xml')
     FileUtils.cp(hpxml_path, in_path)
 
     register_logs(runner, resstock_arguments_runner)
+    register_logs(runner, new_runner)
 
     return true
   end

measures/BuildExistingModel/measure.rb

@@ -752,8 +752,10 @@ def run(model, runner, user_arguments)
       end
     end
 
-    measures['ResStockArgumentsPostHPXML'] = [{ 'hpxml_path' => hpxml_path,
-                                                'output_csv_path' => File.expand_path('../schedules.csv') }]
+    measures['ResStockArgumentsPostHPXML'] = [{}] if !measures.keys.include?('ResStockArgumentsPostHPXML')
+    measures['ResStockArgumentsPostHPXML'][0]['hpxml_path'] = hpxml_path
+    measures['ResStockArgumentsPostHPXML'][0]['output_csv_path'] = File.expand_path('../schedules.csv')
+    measures['ResStockArgumentsPostHPXML'][0]['building_id'] = values['building_id']
     measures_hash = { 'ResStockArgumentsPostHPXML' => measures['ResStockArgumentsPostHPXML'] }
     if not apply_measures(measures_dir, measures_hash, new_runner, model, true, 'OpenStudio::Measure::ModelMeasure', nil)
       register_logs(runner, new_runner)
@@ -810,6 +812,7 @@ def run(model, runner, user_arguments)
     end
 
     register_logs(runner, resstock_arguments_runner)
+    register_logs(runner, new_runner)
 
     return true
   end