Merge pull request #326 from NREL/upgrade-name

Small update in sim output measure. Sync projects.
NREL · Sep 30, 2019 · fea197d · fea197d
2 parents 4b7c562 + 07eaef7
commit fea197d
Show file tree

Hide file tree

Showing 11 changed files with 3,963 additions and 2,044 deletions.
diff --git a/measures/SimulationOutputReport/measure.rb b/measures/SimulationOutputReport/measure.rb
@@ -592,10 +592,12 @@ def run(runner, user_arguments)
     # UPGRADE NAME
     upgrade_name = get_value_from_runner_past_results(runner, "upgrade_name", "apply_upgrade", false)
     if upgrade_name.nil?
-      upgrade_name = "(blank)"
+      register_value(runner, "upgrade_name", "")
+      runner.registerInfo("Registering (blank) for upgrade_name.")
+    else
+      register_value(runner, "upgrade_name", upgrade_name)
+      runner.registerInfo("Registering #{upgrade_name} for upgrade_name.")
     end
-    register_value(runner, "upgrade_name", upgrade_name)
-    runner.registerInfo("Registering #{upgrade_name} for upgrade_name.")
 
     # UPGRADE COSTS
 

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>2fcf622c-757d-47cb-bad7-84ba81c25a78</version_id>
-  <version_modified>20190830T143840Z</version_modified>
+  <version_id>baf9e1c9-915b-4de4-bd37-99ff249bbfa1</version_id>
+  <version_modified>20190930T145213Z</version_modified>
   <xml_checksum>2C8A3EEF</xml_checksum>
   <class_name>SimulationOutputReport</class_name>
   <display_name>Simulation Output Report</display_name>
@@ -779,7 +779,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>9872BCB8</checksum>
+      <checksum>68A0D358</checksum>
     </file>
   </files>
 </measure>
diff --git a/project_multifamily_beta/measures/SimulationOutputReport/measure.rb b/project_multifamily_beta/measures/SimulationOutputReport/measure.rb
@@ -592,10 +592,12 @@ def run(runner, user_arguments)
     # UPGRADE NAME
     upgrade_name = get_value_from_runner_past_results(runner, "upgrade_name", "apply_upgrade", false)
     if upgrade_name.nil?
-      upgrade_name = "(blank)"
+      register_value(runner, "upgrade_name", "")
+      runner.registerInfo("Registering (blank) for upgrade_name.")
+    else
+      register_value(runner, "upgrade_name", upgrade_name)
+      runner.registerInfo("Registering #{upgrade_name} for upgrade_name.")
     end
-    register_value(runner, "upgrade_name", upgrade_name)
-    runner.registerInfo("Registering #{upgrade_name} for upgrade_name.")
 
     # UPGRADE COSTS
 

diff --git a/project_multifamily_beta/measures/SimulationOutputReport/measure.xml b/project_multifamily_beta/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>2fcf622c-757d-47cb-bad7-84ba81c25a78</version_id>
-  <version_modified>20190830T143840Z</version_modified>
+  <version_id>baf9e1c9-915b-4de4-bd37-99ff249bbfa1</version_id>
+  <version_modified>20190930T145213Z</version_modified>
   <xml_checksum>2C8A3EEF</xml_checksum>
   <class_name>SimulationOutputReport</class_name>
   <display_name>Simulation Output Report</display_name>
@@ -779,7 +779,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>9872BCB8</checksum>
+      <checksum>68A0D358</checksum>
     </file>
   </files>
 </measure>