Merge pull request #1173 from NREL/yml-upgrade-gshp

Add GSHP upgrade to sample yml files
NREL · Dec 6, 2023 · febef99 · febef99
2 parents 1b4cf70 + 9332c4d
commit febef99
Show file tree

Hide file tree

Showing 9 changed files with 35,098 additions and 35,056 deletions.
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
@@ -191,8 +191,8 @@ jobs:
           path: |
             project_national/national_baseline/results_csvs/results_up00.csv
             project_testing/testing_baseline/results_csvs/results_up00.csv
-            project_national/national_upgrades/results_csvs/results_up16.csv
-            project_testing/testing_upgrades/results_csvs/results_up16.csv
+            project_national/national_upgrades/results_csvs/results_up17.csv
+            project_testing/testing_upgrades/results_csvs/results_up17.csv
           name: buildstockbatch_results_csvs
 
       - name: Run tests

diff --git a/project_national/national_upgrades.yml b/project_national/national_upgrades.yml
@@ -215,6 +215,18 @@ upgrades:
         option: HVAC Cooling Efficiency|Non-Ducted Heat Pump
       - *heat_pump_backup_use_existing_system
 
+  - upgrade_name: GSHP
+    options:
+      - &hvac_heating_efficiency_gshp_eer_20_pt_2_cop_4_pt_2
+        option: HVAC Heating Efficiency|GSHP, EER 20.2, COP 4.2
+        apply_logic:
+          - HVAC Has Ducts|Yes
+        costs:
+          - value: 50.0
+            multiplier: Size, Heating System Primary (kBtu/h)
+        lifetime: 30
+      - *hvac_cooling_efficiency_ducted_heat_pump
+
   - upgrade_name: HPWH
     options:
       - &water_heater_efficiency_electric_heat_pump_66_gal_3_pt_35_uef

diff --git a/project_testing/testing_upgrades.yml b/project_testing/testing_upgrades.yml
@@ -248,6 +248,18 @@ upgrades:
         option: HVAC Cooling Efficiency|Non-Ducted Heat Pump
       - *heat_pump_backup_use_existing_system
 
+  - upgrade_name: GSHP
+    options:
+      - &hvac_heating_efficiency_gshp_eer_20_pt_2_cop_4_pt_2
+        option: HVAC Heating Efficiency|GSHP, EER 20.2, COP 4.2
+        apply_logic:
+          - HVAC Has Ducts|Yes
+        costs:
+          - value: 50.0
+            multiplier: Size, Heating System Primary (kBtu/h)
+        lifetime: 30
+      - *hvac_cooling_efficiency_ducted_heat_pump
+
   - upgrade_name: HPWH
     options:
       - &water_heater_efficiency_electric_heat_pump_66_gal_3_pt_35_uef

diff --git a/test/base_results/upgrades/annual/results_output.csv b/test/base_results/upgrades/annual/results_output.csv
diff --git a/test/base_results/upgrades/timeseries/buildstockbatch.csv b/test/base_results/upgrades/timeseries/buildstockbatch.csv
diff --git a/test/base_results/upgrades/timeseries/results_output.csv b/test/base_results/upgrades/timeseries/results_output.csv
diff --git a/test/test_analysis_tools.rb b/test/test_analysis_tools.rb
@@ -32,7 +32,9 @@ def test_baseline_columns
 
   def test_upgrades_columns
     ['national', 'testing'].each do |project|
-      buildstockbatch_path = File.join(@buildstock_directory, "buildstockbatch/project_#{project}/#{project}_upgrades/results_csvs/results_up16.csv")
+      results_csvs = Dir[File.join(@buildstock_directory, "buildstockbatch/project_#{project}/#{project}_upgrades/results_csvs/results_up*.csv")]
+      assert_equal(1, results_csvs.size)
+      buildstockbatch_path = results_csvs[0]
       buildstockbatch = CSV.read(buildstockbatch_path, headers: true)
 
       run_analysis_path = File.join(@buildstock_directory, "run_analysis/project_#{project}/results-AllUpgrades.csv")
@@ -102,7 +104,9 @@ def test_upgrades_results
     columns = ['report_simulation_output.energy_use_total_m_btu']
 
     ['national', 'testing'].each do |project|
-      buildstockbatch_path = File.join(@buildstock_directory, "buildstockbatch/project_#{project}/#{project}_upgrades/results_csvs/results_up16.csv")
+      results_csvs = Dir[File.join(@buildstock_directory, "buildstockbatch/project_#{project}/#{project}_upgrades/results_csvs/results_up*.csv")]
+      assert_equal(1, results_csvs.size)
+      buildstockbatch_path = results_csvs[0]
       buildstockbatch = CSV.read(buildstockbatch_path, headers: true)
 
       run_analysis_path = File.join(@buildstock_directory, "run_analysis/project_#{project}/results-AllUpgrades.csv")

diff --git a/test/test_bsb_analysis.rb b/test/test_bsb_analysis.rb
@@ -53,13 +53,14 @@ def test_testing_upgrades
 
     _test_contents(contents, false, true)
 
-    assert(File.exist?(File.join(@testing_upgrades, 'results_csvs', 'results_up16.csv')))
-    results = CSV.read(File.join(@testing_upgrades, 'results_csvs', 'results_up16.csv'), headers: true)
+    num_upgrade_scenarios = Dir[File.join(@testing_upgrades, 'results_csvs', 'results_up*')].count - 1
+    assert(File.exist?(File.join(@testing_upgrades, 'results_csvs', "results_up#{num_upgrade_scenarios}.csv")))
+    results = CSV.read(File.join(@testing_upgrades, 'results_csvs', "results_up#{num_upgrade_scenarios}.csv"), headers: true)
 
     _test_columns(results, true)
 
-    assert(File.exist?(File.join(@testing_upgrades, 'simulation_output', 'up16', 'bldg0000001', 'run')))
-    contents = Dir[File.join(@testing_upgrades, 'simulation_output', 'up16', 'bldg0000001', 'run/*')].collect { |x| File.basename(x) }
+    assert(File.exist?(File.join(@testing_upgrades, 'simulation_output', "up#{num_upgrade_scenarios}", 'bldg0000001', 'run')))
+    contents = Dir[File.join(@testing_upgrades, 'simulation_output', "up#{num_upgrade_scenarios}", 'bldg0000001', 'run/*')].collect { |x| File.basename(x) }
 
     _test_contents(contents, true, true)
 
@@ -78,13 +79,14 @@ def test_national_upgrades
 
     _test_contents(contents, false, false)
 
-    assert(File.exist?(File.join(@national_upgrades, 'results_csvs', 'results_up16.csv')))
-    results = CSV.read(File.join(@national_upgrades, 'results_csvs', 'results_up16.csv'), headers: true)
+    num_upgrade_scenarios = Dir[File.join(@national_upgrades, 'results_csvs', 'results_up*')].count - 1
+    assert(File.exist?(File.join(@national_upgrades, 'results_csvs', "results_up#{num_upgrade_scenarios}.csv")))
+    results = CSV.read(File.join(@national_upgrades, 'results_csvs', "results_up#{num_upgrade_scenarios}.csv"), headers: true)
 
     _test_columns(results, true)
 
-    assert(File.exist?(File.join(@national_upgrades, 'simulation_output', 'up16', 'bldg0000001', 'run')))
-    contents = Dir[File.join(@national_upgrades, 'simulation_output', 'up16', 'bldg0000001', 'run/*')].collect { |x| File.basename(x) }
+    assert(File.exist?(File.join(@national_upgrades, 'simulation_output', "up#{num_upgrade_scenarios}", 'bldg0000001', 'run')))
+    contents = Dir[File.join(@national_upgrades, 'simulation_output', "up#{num_upgrade_scenarios}", 'bldg0000001', 'run/*')].collect { |x| File.basename(x) }
 
     _test_contents(contents, true, false)
 

diff --git a/test/test_run_analysis.rb b/test/test_run_analysis.rb
@@ -448,8 +448,9 @@ def test_testing_upgrades
 
     _test_columns(results, true)
 
-    assert(File.exist?(File.join(@testing_upgrades, 'run76', 'run')))
-    contents = Dir[File.join(@testing_upgrades, 'run76', 'run/*')].collect { |x| File.basename(x) }
+    num_run_folders = Dir[File.join(@testing_upgrades, 'run*')].count
+    assert(File.exist?(File.join(@testing_upgrades, "run#{num_run_folders}", 'run')))
+    contents = Dir[File.join(@testing_upgrades, "run#{num_run_folders}", 'run/*')].collect { |x| File.basename(x) }
 
     _test_contents(contents, true, true)
 
@@ -502,8 +503,9 @@ def test_national_upgrades
 
     _test_columns(results, true)
 
-    assert(File.exist?(File.join(@national_upgrades, 'run76', 'run')))
-    contents = Dir[File.join(@national_upgrades, 'run76', 'run/*')].collect { |x| File.basename(x) }
+    num_run_folders = Dir[File.join(@national_upgrades, 'run*')].count
+    assert(File.exist?(File.join(@national_upgrades, "run#{num_run_folders}", 'run')))
+    contents = Dir[File.join(@national_upgrades, "run#{num_run_folders}", 'run/*')].collect { |x| File.basename(x) }
 
     _test_contents(contents, true, false)