rerun ymls

NREL · Aug 14, 2024 · 4e997a5 · 4e997a5
1 parent 7c43b50
commit 4e997a5
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 12 deletions.
diff --git a/project_national/EUSSRR2_project_30k_AMY2018.yml b/project_national/EUSSRR2_project_30k_AMY2018.yml
@@ -3,7 +3,7 @@ os_version: 3.7.0
 os_sha: d5269793f1
 buildstock_directory: ../ # Relative to this file or absolute
 project_directory: project_national # Relative to buildstock_directory
-output_directory: /kfs2/projects/enduse/qc_runs/timestep_medium_amy
+output_directory: /kfs2/projects/enduse/qc_runs/timestep_medium_amy_env_only
 weather_files_path: /kfs2/shared-projects/buildstock/weather/BuildStock_2018_FIPS.zip
 
 sampler:
@@ -529,10 +529,11 @@ upgrades:
 
   - upgrade_name: Geothermal heat pump
 
-    package_apply_logic: &remove_shared_heating_cooling
+    package_apply_logic: &remove_shared_heating_cooling_ghp
       - not: Heating Fuel|Wood
       - not: Heating Fuel|Other Fuel
       - not: Heating Fuel|None
+      - HVAC Has Ducts|Yes      
       - not:
         - or:
           - HVAC Shared Efficiencies|Boiler Baseboards Heating Only, Electricity
@@ -808,7 +809,7 @@ upgrades:
 
   - upgrade_name: Geothermal heat pump + Light Touch Envelope
 
-    package_apply_logic: *remove_shared_heating_cooling
+    package_apply_logic: *remove_shared_heating_cooling_ghp
 
 
     options:
@@ -1089,7 +1090,7 @@ upgrades:
 
   - upgrade_name: Geothermal heat pump + Light Touch Envelope + Full Appliance Electrification with Efficiency
 
-    package_apply_logic: *remove_shared_heating_cooling
+    package_apply_logic: *remove_shared_heating_cooling_ghp
 
     options:
       - *ducted_GTHP
@@ -1120,4 +1121,12 @@ upgrades:
       - *energystar_electric_dryer_for_non-electric_dryer
       - *induction_range_oven_for_non-electric_cooking
       - *electric_pool_heaters
-      - *electric_spa_heaters
+      - *electric_spa_heaters
+
+  - upgrade_name: Envelope Only - Light Touch Envelope
+    options:
+        ### -- Light Touch Envelope -- ###
+      - *attic_insulation_IECC_CZ1A
+      - *attic_insulation_IECC_CZ2A-2B-3A-3B-3C
+      - *attic_insulation_IECC_CZ4A-4B-4C-5A-5B-6A-6B-7A-7B
+      - *infiltration_30pct_reduction
diff --git a/project_national/EUSSRR2_project_30k_TMY3.yml b/project_national/EUSSRR2_project_30k_TMY3.yml
@@ -3,7 +3,7 @@ os_version: 3.7.0
 os_sha: d5269793f1
 buildstock_directory: ../ # Relative to this file or absolute
 project_directory: project_national # Relative to buildstock_directory
-output_directory: /kfs2/projects/enduse/qc_runs/timestep_medium_tmy
+output_directory: /kfs2/projects/enduse/qc_runs/timestep_medium_tmy_env_only
 weather_files_path: /kfs2/shared-projects/buildstock/weather/BuildStock_TMY3_FIPS.zip
 
 sampler:
@@ -528,10 +528,11 @@ upgrades:
 
   - upgrade_name: Geothermal heat pump
 
-    package_apply_logic: &remove_shared_heating_cooling
+    package_apply_logic: &remove_shared_heating_cooling_ghp
       - not: Heating Fuel|Wood
       - not: Heating Fuel|Other Fuel
       - not: Heating Fuel|None
+      - HVAC Has Ducts|Yes      
       - not:
         - or:
           - HVAC Shared Efficiencies|Boiler Baseboards Heating Only, Electricity
@@ -807,7 +808,7 @@ upgrades:
 
   - upgrade_name: Geothermal heat pump + Light Touch Envelope
 
-    package_apply_logic: *remove_shared_heating_cooling
+    package_apply_logic: *remove_shared_heating_cooling_ghp
 
 
     options:
@@ -1088,7 +1089,7 @@ upgrades:
 
   - upgrade_name: Geothermal heat pump + Light Touch Envelope + Full Appliance Electrification with Efficiency
 
-    package_apply_logic: *remove_shared_heating_cooling
+    package_apply_logic: *remove_shared_heating_cooling_ghp
 
     options:
       - *ducted_GTHP
@@ -1119,4 +1120,12 @@ upgrades:
       - *energystar_electric_dryer_for_non-electric_dryer
       - *induction_range_oven_for_non-electric_cooking
       - *electric_pool_heaters
-      - *electric_spa_heaters
+      - *electric_spa_heaters
+
+  - upgrade_name: Envelope Only - Light Touch Envelope
+    options:
+        ### -- Light Touch Envelope -- ###
+      - *attic_insulation_IECC_CZ1A
+      - *attic_insulation_IECC_CZ2A-2B-3A-3B-3C
+      - *attic_insulation_IECC_CZ4A-4B-4C-5A-5B-6A-6B-7A-7B
+      - *infiltration_30pct_reduction
diff --git a/project_national/EUSSRR2_project_500k_AMY2018.yml b/project_national/EUSSRR2_project_500k_AMY2018.yml
@@ -3,7 +3,7 @@ os_version: 3.7.0
 os_sha: d5269793f1
 buildstock_directory: ../ # Relative to this file or absolute
 project_directory: project_national # Relative to buildstock_directory
-output_directory: /kfs2/projects/enduse/production_runs/final_15min_550k_amy
+output_directory: /kfs2/projects/enduse/production_runs/final_15min_550k_amy_envelope
 weather_files_path: /kfs2/shared-projects/buildstock/weather/BuildStock_2018_FIPS.zip
 
 sampler:

diff --git a/project_national/EUSSRR2_project_500k_TMY3.yml b/project_national/EUSSRR2_project_500k_TMY3.yml
@@ -3,7 +3,7 @@ os_version: 3.7.0
 os_sha: d5269793f1
 buildstock_directory: ../ # Relative to this file or absolute
 project_directory: project_national # Relative to buildstock_directory
-output_directory: /kfs2/projects/enduse/production_runs/final_15min_550k_tmy
+output_directory: /kfs2/projects/enduse/production_runs/final_15min_550k_tmy_envelope
 weather_files_path: /kfs2/shared-projects/buildstock/weather/BuildStock_TMY3_FIPS.zip
 
 sampler: