Skip to content

Commit

Permalink
Merge pull request #91 from NREL/blank-upgrade-characteristics
Browse files Browse the repository at this point in the history 
Blank out building characteristics for upgrades. Closes #86.
  • Loading branch information
@shorowit
shorowit committed Sep 22, 2017
2 parents e75003d + 5cd6a88 commit 6d374d4
Show file tree
Hide file tree
Showing 37 changed files with 2,430 additions and 1,847 deletions.
22 changes: 7 additions & 15 deletions measures/BuildingCharacteristicsReport/measure.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,26 +53,18 @@ def run(runner, user_arguments)

characteristics = {}

# Get existing building characteristics
runner.workflow.workflowSteps.each do |step|
next if not step.result.is_initialized
step_result = step.result.get
next if !step_result.measureName.is_initialized or step_result.measureName.get != "build_existing_model"
step_result.stepValues.each do |step_value|
begin
# All building characteristics will be strings
characteristics[step_value.name] = step_value.valueAsString
rescue
runner.registerInfo("Skipping #{step_value.name}.")
end
end
# Exit if this is an upgrade datapoint
upgrade_name = get_value_from_runner_past_results(runner, "upgrade_name", "apply_upgrade", false)
if not upgrade_name.nil?
runner.registerInfo("Upgrade datapoint, no building characteristics will be reported.")
return true
end

# Override building characteristics with any upgrades that applied
# Get existing building characteristics
runner.workflow.workflowSteps.each do |step|
next if not step.result.is_initialized
step_result = step.result.get
next if !step_result.measureName.is_initialized or step_result.measureName.get != "apply_upgrade"
next if !step_result.measureName.is_initialized or step_result.measureName.get != "build_existing_model"
step_result.stepValues.each do |step_value|
begin
# All building characteristics will be strings
Expand Down
13 changes: 3 additions & 10 deletions measures/BuildingCharacteristicsReport/measure.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<schema_version>3.0</schema_version>
<name>building_characteristics_report</name>
<uid>90eecbe2-d8e2-47db-9079-5d9029fb3e67</uid>
<version_id>96ed058f-12e1-4f75-bbc1-752a8266607d</version_id>
<version_modified>20170717T184839Z</version_modified>
<version_id>b1236162-5685-4c0c-906f-3996ba6e3290</version_id>
<version_modified>20170922T163652Z</version_modified>
<xml_checksum>2EA103AF</xml_checksum>
<class_name>BuildingCharacteristicsReport</class_name>
<display_name>Building Characteristics Report</display_name>
Expand Down Expand Up @@ -578,13 +578,6 @@
<type>String</type>
<model_dependent>false</model_dependent>
</output>
<output>
<name>hvac_sizing</name>
<display_name>hvac_sizing</display_name>
<short_name>hvac_sizing</short_name>
<type>String</type>
<model_dependent>false</model_dependent>
</output>
<output>
<name>location_city</name>
<display_name>location_city</display_name>
Expand Down Expand Up @@ -640,7 +633,7 @@
<filename>measure.rb</filename>
<filetype>rb</filetype>
<usage_type>script</usage_type>
<checksum>FFDD45E0</checksum>
<checksum>5B0F2258</checksum>
</file>
</files>
</measure>
30 changes: 3 additions & 27 deletions measures/TimeseriesCSVExport/measure.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<schema_version>3.0</schema_version>
<name>timeseries_csv_export</name>
<uid>2a3442c1-944d-4e91-9e11-11e0cf368c64</uid>
<version_id>00b4e8f5-340c-491c-a123-0b161179b50d</version_id>
<version_modified>20170914T175619Z</version_modified>
<version_id>ce010a29-ffde-405f-8465-3983e6f20d43</version_id>
<version_modified>20170922T180942Z</version_modified>
<xml_checksum>15BF4E57</xml_checksum>
<class_name>TimeseriesCSVExport</class_name>
<display_name>Timeseries CSV Export</display_name>
Expand Down Expand Up @@ -85,31 +85,7 @@
<filename>measure.rb</filename>
<filetype>rb</filetype>
<usage_type>script</usage_type>
<checksum>74F2FACB</checksum>
</file>
<file>
<filename>DuPage_17043_725300_880860.epw</filename>
<filetype>epw</filetype>
<usage_type>resource</usage_type>
<checksum>AD5BB8D6</checksum>
</file>
<file>
<filename>timeseries_csv_export_test.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>85934CF9</checksum>
</file>
<file>
<filename>SFD_Successful_EnergyPlus_Run.osm</filename>
<filetype>osm</filetype>
<usage_type>test</usage_type>
<checksum>2EA0987A</checksum>
</file>
<file>
<filename>USA_CO_Denver_Intl_AP_725650_TMY3.epw</filename>
<filetype>epw</filetype>
<usage_type>resource</usage_type>
<checksum>E23378AA</checksum>
<checksum>DA21C8B9</checksum>
</file>
</files>
</measure>
68 changes: 19 additions & 49 deletions measures/UtilityBillCalculations/measure.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<schema_version>3.0</schema_version>
<name>utility_bill_calculations</name>
<uid>872cd20c-55df-459e-9ac9-f42c93ab665c</uid>
<version_id>148c785f-92c6-4de5-8276-3ad03aefff8d</version_id>
<version_modified>20170912T211250Z</version_modified>
<version_id>9a14be96-2d19-439a-8449-874559bc489d</version_id>
<version_modified>20170922T180942Z</version_modified>
<xml_checksum>6159342E</xml_checksum>
<class_name>UtilityBillCalculations</class_name>
<display_name>Utility Bill Calculations</display_name>
Expand Down Expand Up @@ -75,9 +75,9 @@
<model_dependent>false</model_dependent>
</output>
<output>
<name>total_fuel_oil</name>
<display_name>total_fuel_oil</display_name>
<short_name>total_fuel_oil</short_name>
<name>total_oil</name>
<display_name>total_oil</display_name>
<short_name>total_oil</short_name>
<type>Double</type>
<model_dependent>false</model_dependent>
</output>
Expand All @@ -100,36 +100,12 @@
<usage_type>resource</usage_type>
<checksum>C9F510A2</checksum>
</file>
<file>
<filename>USA_CO_Denver_Intl_AP_725650_TMY3.epw</filename>
<filetype>epw</filetype>
<usage_type>test</usage_type>
<checksum>E23378AA</checksum>
</file>
<file>
<filename>sam-sdk-2017-1-17-r1.zip</filename>
<filetype>zip</filetype>
<usage_type>resource</usage_type>
<checksum>14339B8F</checksum>
</file>
<file>
<filename>enduse_timeseries.csv</filename>
<filetype>csv</filetype>
<usage_type>test</usage_type>
<checksum>42875535</checksum>
</file>
<file>
<filename>utilities.csv</filename>
<filetype>csv</filetype>
<usage_type>resource</usage_type>
<checksum>49E7C310</checksum>
</file>
<file>
<filename>result.json</filename>
<filetype>json</filetype>
<usage_type>test</usage_type>
<checksum>EF682B2D</checksum>
</file>
<file>
<filename>by_nsrdb.csv</filename>
<filetype>csv</filetype>
Expand All @@ -142,23 +118,23 @@
<usage_type>resource</usage_type>
<checksum>3ADEAEFE</checksum>
</file>
<file>
<filename>SFD_2000sqft_2story_SL_UA_Denver.osm</filename>
<filetype>osm</filetype>
<usage_type>test</usage_type>
<checksum>15DB60CF</checksum>
</file>
<file>
<filename>Natural gas.csv</filename>
<filetype>csv</filetype>
<usage_type>resource</usage_type>
<checksum>43EDF817</checksum>
</file>
<file>
<filename>utility_bill_calculations_test.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>346ACD95</checksum>
<filename>Oil.csv</filename>
<filetype>csv</filetype>
<usage_type>resource</usage_type>
<checksum>FBAE07C0</checksum>
</file>
<file>
<filename>Propane.csv</filename>
<filetype>csv</filetype>
<usage_type>resource</usage_type>
<checksum>D205D809</checksum>
</file>
<file>
<version>
Expand All @@ -169,19 +145,13 @@
<filename>measure.rb</filename>
<filetype>rb</filetype>
<usage_type>script</usage_type>
<checksum>E137BB9B</checksum>
</file>
<file>
<filename>Oil.csv</filename>
<filetype>csv</filetype>
<usage_type>resource</usage_type>
<checksum>FBAE07C0</checksum>
<checksum>07180FC4</checksum>
</file>
<file>
<filename>Propane.csv</filename>
<filetype>csv</filetype>
<filename>sam-sdk-2017-1-17-r1.zip</filename>
<filetype>zip</filetype>
<usage_type>resource</usage_type>
<checksum>D205D809</checksum>
<checksum>9E486EA4</checksum>
</file>
</files>
</measure>
22 changes: 7 additions & 15 deletions project_resstock_comed/measures/BuildingCharacteristicsReport/measure.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,26 +53,18 @@ def run(runner, user_arguments)

characteristics = {}

# Get existing building characteristics
runner.workflow.workflowSteps.each do |step|
next if not step.result.is_initialized
step_result = step.result.get
next if !step_result.measureName.is_initialized or step_result.measureName.get != "build_existing_model"
step_result.stepValues.each do |step_value|
begin
# All building characteristics will be strings
characteristics[step_value.name] = step_value.valueAsString
rescue
runner.registerInfo("Skipping #{step_value.name}.")
end
end
# Exit if this is an upgrade datapoint
upgrade_name = get_value_from_runner_past_results(runner, "upgrade_name", "apply_upgrade", false)
if not upgrade_name.nil?
runner.registerInfo("Upgrade datapoint, no building characteristics will be reported.")
return true
end

# Override building characteristics with any upgrades that applied
# Get existing building characteristics
runner.workflow.workflowSteps.each do |step|
next if not step.result.is_initialized
step_result = step.result.get
next if !step_result.measureName.is_initialized or step_result.measureName.get != "apply_upgrade"
next if !step_result.measureName.is_initialized or step_result.measureName.get != "build_existing_model"
step_result.stepValues.each do |step_value|
begin
# All building characteristics will be strings
Expand Down
13 changes: 3 additions & 10 deletions project_resstock_comed/measures/BuildingCharacteristicsReport/measure.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<schema_version>3.0</schema_version>
<name>building_characteristics_report</name>
<uid>90eecbe2-d8e2-47db-9079-5d9029fb3e67</uid>
<version_id>96ed058f-12e1-4f75-bbc1-752a8266607d</version_id>
<version_modified>20170717T184839Z</version_modified>
<version_id>b1236162-5685-4c0c-906f-3996ba6e3290</version_id>
<version_modified>20170922T163652Z</version_modified>
<xml_checksum>2EA103AF</xml_checksum>
<class_name>BuildingCharacteristicsReport</class_name>
<display_name>Building Characteristics Report</display_name>
Expand Down Expand Up @@ -578,13 +578,6 @@
<type>String</type>
<model_dependent>false</model_dependent>
</output>
<output>
<name>hvac_sizing</name>
<display_name>hvac_sizing</display_name>
<short_name>hvac_sizing</short_name>
<type>String</type>
<model_dependent>false</model_dependent>
</output>
<output>
<name>location_city</name>
<display_name>location_city</display_name>
Expand Down Expand Up @@ -640,7 +633,7 @@
<filename>measure.rb</filename>
<filetype>rb</filetype>
<usage_type>script</usage_type>
<checksum>FFDD45E0</checksum>
<checksum>5B0F2258</checksum>
</file>
</files>
</measure>

0 comments on commit 6d374d4

Please sign in to comment.