Move run_measure argument to the bottom of the ApplyUpgrade measure s…

…o it doesn't get in the way of our users.
NREL · Aug 25, 2017 · ef0b1fa · ef0b1fa
1 parent f84ba2b
commit ef0b1fa
Show file tree

Hide file tree

Showing 13 changed files with 8,154 additions and 374 deletions.
diff --git a/measures/ApplyUpgrade/measure.rb b/measures/ApplyUpgrade/measure.rb
@@ -44,13 +44,6 @@ def arguments(model)
     upgrade_name.setDefaultValue("My Upgrade")
     args << upgrade_name 
 
-    # Make integer arg to run measure [1 is run, 0 is no run]
-    run_measure = OpenStudio::Ruleset::OSArgument::makeIntegerArgument("run_measure",true)
-    run_measure.setDisplayName("Run Measure")
-    run_measure.setDescription("integer argument to run measure [1 is run, 0 is no run]")
-    run_measure.setDefaultValue(1)
-    args << run_measure 
-
     for option_num in 1..num_options
 
         # Option name argument
@@ -108,6 +101,13 @@ def arguments(model)
     package_apply_logic.setDescription("Logic that specifies if the entire package upgrade (all options) will apply based on the existing building's options. Specify one or more parameter|option as found in resources\\options_lookup.tsv. When multiple are included, they must be separated by '||' for OR and '&&' for AND, and using parentheses as appropriate. Prefix an option with '!' for not.")
     args << package_apply_logic
 
+    # Make integer arg to run measure [1 is run, 0 is no run]
+    run_measure = OpenStudio::Ruleset::OSArgument::makeIntegerArgument("run_measure",true)
+    run_measure.setDisplayName("Run Measure")
+    run_measure.setDescription("integer argument to run measure [1 is run, 0 is no run]")
+    run_measure.setDefaultValue(1)
+    args << run_measure 
+
     return args
   end
 

diff --git a/measures/ApplyUpgrade/measure.xml b/measures/ApplyUpgrade/measure.xml
@@ -2,8 +2,8 @@
   <schema_version>3.0</schema_version>
   <name>apply_upgrade</name>
   <uid>33f1654c-f734-43d1-b35d-9d2856e41b5a</uid>
-  <version_id>54e5d0fb-4224-4452-95bd-1818ab548150</version_id>
-  <version_modified>20170824T182418Z</version_modified>
+  <version_id>60181c1e-e6a7-48cd-8c7c-40c874925e21</version_id>
+  <version_modified>20170825T102441Z</version_modified>
   <xml_checksum>9339BE01</xml_checksum>
   <class_name>ApplyUpgrade</class_name>
   <display_name>Apply Upgrade</display_name>
@@ -19,15 +19,6 @@
       <model_dependent>false</model_dependent>
       <default_value>My Upgrade</default_value>
     </argument>
-    <argument>
-      <name>run_measure</name>
-      <display_name>Run Measure</display_name>
-      <description>integer argument to run measure [1 is run, 0 is no run]</description>
-      <type>Integer</type>
-      <required>true</required>
-      <model_dependent>false</model_dependent>
-      <default_value>1</default_value>
-    </argument>
     <argument>
       <name>option_1</name>
       <display_name>Option 1</display_name>
@@ -1796,6 +1787,15 @@
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
+    <argument>
+      <name>run_measure</name>
+      <display_name>Run Measure</display_name>
+      <description>integer argument to run measure [1 is run, 0 is no run]</description>
+      <type>Integer</type>
+      <required>true</required>
+      <model_dependent>false</model_dependent>
+      <default_value>1</default_value>
+    </argument>
   </arguments>
   <outputs/>
   <provenances/>
@@ -1864,7 +1864,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>7FAAD63C</checksum>
+      <checksum>BDC62298</checksum>
     </file>
   </files>
 </measure>
diff --git a/project_resstock_dsgrid/pat.json b/project_resstock_dsgrid/pat.json
@@ -279,7 +279,7 @@
       "seed": "EmptySeedModel.osm",
       "workflow_index": 0,
       "options": [],
-      "instanceId": 0.6333217162592226,
+      "instanceId": 0.7582763240094812,
       "skip": false,
       "$$hashKey": "object:2655",
       "showWarningText": false,
@@ -1190,7 +1190,7 @@
       "seed": "EmptySeedModel.osm",
       "workflow_index": 1,
       "options": [],
-      "instanceId": 0.5033719972180655,
+      "instanceId": 0.9654967328889297,
       "skip": false,
       "$$hashKey": "object:12818",
       "outputMeasure": true,
@@ -2403,9 +2403,9 @@
       ]
     },
     {
-      "measure_dir": "C:/Users/shorowit/Documents/GitHub/OpenStudio-BuildStock/measures/SimulationOutputReport",
+      "measure_dir": "C:\\Users\\shorowit\\Documents\\GitHub\\OpenStudio-BuildStock\\project_resstock_dsgrid\\measures\\SimulationOutputReport",
       "name": "simulation_output_report",
-      "directory": "C:/Users/shorowit/Documents/GitHub/OpenStudio-BuildStock/measures/SimulationOutputReport",
+      "directory": "C:\\Users\\shorowit\\Documents\\GitHub\\OpenStudio-BuildStock\\project_resstock_dsgrid\\measures\\SimulationOutputReport",
       "uid": "fc337100-8634-404e-8966-01243d292a79",
       "uuid": "{fc337100-8634-404e-8966-01243d292a79}",
       "version_id": "7d3c8688-2379-4809-b7bd-13f48d6f51e6",
@@ -2726,7 +2726,7 @@
       "seed": "EmptySeedModel.osm",
       "workflow_index": 2,
       "options": [],
-      "instanceId": 0.6963325931397644,
+      "instanceId": 0.4282437355894986,
       "skip": false,
       "$$hashKey": "object:12817",
       "outputMeasure": true,
@@ -3208,7 +3208,7 @@
       "seed": "EmptySeedModel.osm",
       "workflow_index": 3,
       "options": [],
-      "instanceId": 0.6691966638805533,
+      "instanceId": 0.7121026220289399,
       "skip": false,
       "$$hashKey": "object:119609",
       "outputMeasure": false
@@ -3255,7 +3255,7 @@
       "seed": "EmptySeedModel.osm",
       "workflow_index": 4,
       "options": [],
-      "instanceId": 0.09124519039806689,
+      "instanceId": 0.05782113121297816,
       "skip": false,
       "$$hashKey": "object:657521",
       "outputMeasure": false
@@ -3294,6 +3294,6 @@
     }
   },
   "designAlternatives": [],
-  "analysisID": "",
+  "analysisID": null,
   "datapoints": []
 }
diff --git a/project_resstock_national/measures/ApplyUpgrade/measure.rb b/project_resstock_national/measures/ApplyUpgrade/measure.rb
@@ -44,13 +44,6 @@ def arguments(model)
     upgrade_name.setDefaultValue("My Upgrade")
     args << upgrade_name 
 
-    # Make integer arg to run measure [1 is run, 0 is no run]
-    run_measure = OpenStudio::Ruleset::OSArgument::makeIntegerArgument("run_measure",true)
-    run_measure.setDisplayName("Run Measure")
-    run_measure.setDescription("integer argument to run measure [1 is run, 0 is no run]")
-    run_measure.setDefaultValue(1)
-    args << run_measure 
-
     for option_num in 1..num_options
 
         # Option name argument
@@ -108,6 +101,13 @@ def arguments(model)
     package_apply_logic.setDescription("Logic that specifies if the entire package upgrade (all options) will apply based on the existing building's options. Specify one or more parameter|option as found in resources\\options_lookup.tsv. When multiple are included, they must be separated by '||' for OR and '&&' for AND, and using parentheses as appropriate. Prefix an option with '!' for not.")
     args << package_apply_logic
 
+    # Make integer arg to run measure [1 is run, 0 is no run]
+    run_measure = OpenStudio::Ruleset::OSArgument::makeIntegerArgument("run_measure",true)
+    run_measure.setDisplayName("Run Measure")
+    run_measure.setDescription("integer argument to run measure [1 is run, 0 is no run]")
+    run_measure.setDefaultValue(1)
+    args << run_measure 
+
     return args
   end
 

diff --git a/project_resstock_national/measures/ApplyUpgrade/measure.xml b/project_resstock_national/measures/ApplyUpgrade/measure.xml
@@ -2,8 +2,8 @@
   <schema_version>3.0</schema_version>
   <name>apply_upgrade</name>
   <uid>33f1654c-f734-43d1-b35d-9d2856e41b5a</uid>
-  <version_id>54e5d0fb-4224-4452-95bd-1818ab548150</version_id>
-  <version_modified>20170824T182418Z</version_modified>
+  <version_id>60181c1e-e6a7-48cd-8c7c-40c874925e21</version_id>
+  <version_modified>20170825T102441Z</version_modified>
   <xml_checksum>9339BE01</xml_checksum>
   <class_name>ApplyUpgrade</class_name>
   <display_name>Apply Upgrade</display_name>
@@ -19,15 +19,6 @@
       <model_dependent>false</model_dependent>
       <default_value>My Upgrade</default_value>
     </argument>
-    <argument>
-      <name>run_measure</name>
-      <display_name>Run Measure</display_name>
-      <description>integer argument to run measure [1 is run, 0 is no run]</description>
-      <type>Integer</type>
-      <required>true</required>
-      <model_dependent>false</model_dependent>
-      <default_value>1</default_value>
-    </argument>
     <argument>
       <name>option_1</name>
       <display_name>Option 1</display_name>
@@ -1796,6 +1787,15 @@
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
+    <argument>
+      <name>run_measure</name>
+      <display_name>Run Measure</display_name>
+      <description>integer argument to run measure [1 is run, 0 is no run]</description>
+      <type>Integer</type>
+      <required>true</required>
+      <model_dependent>false</model_dependent>
+      <default_value>1</default_value>
+    </argument>
   </arguments>
   <outputs/>
   <provenances/>
@@ -1864,7 +1864,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>7FAAD63C</checksum>
+      <checksum>BDC62298</checksum>
     </file>
   </files>
 </measure>