Bugfix for heating capacity cost multiplier error.

NREL · Aug 30, 2017 · 6e27c47 · 6e27c47
1 parent e3c7896
commit 6e27c47
Show file tree

Hide file tree

Showing 15 changed files with 196 additions and 423 deletions.
diff --git a/measures/SimulationOutputReport/measure.rb b/measures/SimulationOutputReport/measure.rb
@@ -323,7 +323,7 @@ def run(runner, user_arguments)
 
         elsif cost_mult_type == "HVAC Heating Capacity (kBtuh)"
             if heating_capacity_w.is_initialized
-                cost_mult = OpenStudio::convert(total_heating_capacity_w,"W","kBtu/h").get
+                cost_mult = OpenStudio::convert(heating_capacity_w.get,"W","kBtu/h").get
             end
 
         elsif cost_mult_type != ""

diff --git a/measures/SimulationOutputReport/measure.xml b/measures/SimulationOutputReport/measure.xml
@@ -2,8 +2,8 @@
   <schema_version>3.0</schema_version>
   <name>simulation_output_report</name>
   <uid>fc337100-8634-404e-8966-01243d292a79</uid>
-  <version_id>7d3c8688-2379-4809-b7bd-13f48d6f51e6</version_id>
-  <version_modified>20170824T182419Z</version_modified>
+  <version_id>9ed4c40c-728d-4b84-b280-5e34be557525</version_id>
+  <version_modified>20170830T003440Z</version_modified>
   <xml_checksum>2C8A3EEF</xml_checksum>
   <class_name>SimulationOutputReport</class_name>
   <display_name>Simulation Output Report</display_name>
@@ -234,7 +234,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>0898FAEC</checksum>
+      <checksum>68646D93</checksum>
     </file>
   </files>
 </measure>
diff --git a/project_resstock_dsgrid/measures/SimulationOutputReport/measure.rb b/project_resstock_dsgrid/measures/SimulationOutputReport/measure.rb
@@ -323,7 +323,7 @@ def run(runner, user_arguments)
 
         elsif cost_mult_type == "HVAC Heating Capacity (kBtuh)"
             if heating_capacity_w.is_initialized
-                cost_mult = OpenStudio::convert(total_heating_capacity_w,"W","kBtu/h").get
+                cost_mult = OpenStudio::convert(heating_capacity_w.get,"W","kBtu/h").get
             end
 
         elsif cost_mult_type != ""

diff --git a/project_resstock_dsgrid/measures/SimulationOutputReport/measure.xml b/project_resstock_dsgrid/measures/SimulationOutputReport/measure.xml
@@ -2,8 +2,8 @@
   <schema_version>3.0</schema_version>
   <name>simulation_output_report</name>
   <uid>fc337100-8634-404e-8966-01243d292a79</uid>
-  <version_id>7d3c8688-2379-4809-b7bd-13f48d6f51e6</version_id>
-  <version_modified>20170824T182419Z</version_modified>
+  <version_id>9ed4c40c-728d-4b84-b280-5e34be557525</version_id>
+  <version_modified>20170830T003440Z</version_modified>
   <xml_checksum>2C8A3EEF</xml_checksum>
   <class_name>SimulationOutputReport</class_name>
   <display_name>Simulation Output Report</display_name>
@@ -234,7 +234,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>0898FAEC</checksum>
+      <checksum>68646D93</checksum>
     </file>
   </files>
 </measure>