Fix CI failures.

NREL · Nov 8, 2023 · 496f240 · 496f240
1 parent 64ba96c
commit 496f240
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/ReportSimulationOutput/measure.rb b/ReportSimulationOutput/measure.rb
@@ -560,9 +560,8 @@ def run(runner, user_arguments)
       args[:use_dview_format] = false
     end
 
-    output_dir = File.dirname(runner.lastEpwFilePath.get.to_s)
-
     hpxml_defaults_path = @model.getBuilding.additionalProperties.getFeatureAsString('hpxml_defaults_path').get
+    output_dir = File.dirname(hpxml_defaults_path)
     building_id = @model.getBuilding.additionalProperties.getFeatureAsString('building_id').get
     hpxml = HPXML.new(hpxml_path: hpxml_defaults_path, building_id: building_id)
 

diff --git a/ReportSimulationOutput/measure.xml b/ReportSimulationOutput/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>report_simulation_output</name>
   <uid>df9d170c-c21a-4130-866d-0d46b06073fd</uid>
-  <version_id>24e7b614-2b4f-4273-ba8a-e3617d8d0409</version_id>
-  <version_modified>2023-11-06T20:36:46Z</version_modified>
+  <version_id>c711b3fd-66c2-4d05-ade1-8822d5e96da3</version_id>
+  <version_modified>2023-11-08T22:40:39Z</version_modified>
   <xml_checksum>9BF1E6AC</xml_checksum>
   <class_name>ReportSimulationOutput</class_name>
   <display_name>HPXML Simulation Output Report</display_name>
@@ -1929,7 +1929,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>BF3DF39A</checksum>
+      <checksum>6E0C5161</checksum>
     </file>
     <file>
       <filename>test_report_sim_output.rb</filename>

diff --git a/ReportUtilityBills/measure.rb b/ReportUtilityBills/measure.rb
@@ -237,10 +237,9 @@ def run(runner, user_arguments)
 
     args = get_arguments(runner, arguments(model), user_arguments)
 
-    output_dir = File.dirname(runner.lastEpwFilePath.get.to_s)
-
     hpxml_path = @model.getBuilding.additionalProperties.getFeatureAsString('hpxml_path').get
     hpxml_defaults_path = @model.getBuilding.additionalProperties.getFeatureAsString('hpxml_defaults_path').get
+    output_dir = File.dirname(hpxml_defaults_path)
     building_id = @model.getBuilding.additionalProperties.getFeatureAsString('building_id').get
     hpxml = HPXML.new(hpxml_path: hpxml_defaults_path, building_id: building_id)
 

diff --git a/ReportUtilityBills/measure.xml b/ReportUtilityBills/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>report_utility_bills</name>
   <uid>ca88a425-e59a-4bc4-af51-c7e7d1e960fe</uid>
-  <version_id>65fc31a4-1c57-4d29-9bd4-ef00e35c5c5f</version_id>
-  <version_modified>2023-11-02T14:40:05Z</version_modified>
+  <version_id>f0cf0ead-74b8-477b-943f-b6ebdd45a11d</version_id>
+  <version_modified>2023-11-08T22:40:40Z</version_modified>
   <xml_checksum>15BF4E57</xml_checksum>
   <class_name>ReportUtilityBills</class_name>
   <display_name>Utility Bills Report</display_name>
@@ -142,7 +142,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>9F95708E</checksum>
+      <checksum>4A038500</checksum>
     </file>
     <file>
       <filename>detailed_rates/Sample Flat Rate Min Annual Charge.json</filename>