Merge pull request #1085 from NREL/upgrade-yml-fixes

Upgrade yml anchor fixes
NREL · Jun 13, 2023 · ec155ed · ec155ed
2 parents 9c08240 + 0f7a0e0
commit ec155ed
Show file tree

Hide file tree

Showing 7 changed files with 35,198 additions and 35,202 deletions.
diff --git a/project_national/national_upgrades.yml b/project_national/national_upgrades.yml
@@ -193,8 +193,7 @@ upgrades:
           - value: 50.0
             multiplier: Size, Heating System Primary (kBtu/h)
         lifetime: 30
-      - &hvac_cooling_efficiency_non_ducted_heat_pump
-        option: HVAC Cooling Efficiency|Non-Ducted Heat Pump
+      - *hvac_cooling_efficiency_ducted_heat_pump
 
   - upgrade_name: HPWH
     options:
@@ -243,7 +242,6 @@ upgrades:
       - *holiday_lighting_no_exterior_use
       - *hvac_heating_efficiency_ashp_seer_22_10_hspf
       - *hvac_cooling_efficiency_ducted_heat_pump
-      - *hvac_cooling_efficiency_non_ducted_heat_pump
       - *water_heater_efficiency_electric_heat_pump_66_gal_3_pt_35_uef
       - *solar_hot_water_40_sqft_south_roof_pitch
       - *has_pv_yes

diff --git a/project_testing/testing_upgrades.yml b/project_testing/testing_upgrades.yml
@@ -226,8 +226,7 @@ upgrades:
           - value: 50.0
             multiplier: Size, Heating System Primary (kBtu/h)
         lifetime: 30
-      - &hvac_cooling_efficiency_non_ducted_heat_pump
-        option: HVAC Cooling Efficiency|Non-Ducted Heat Pump
+      - *hvac_cooling_efficiency_ducted_heat_pump
 
   - upgrade_name: HPWH
     options:
@@ -282,7 +281,6 @@ upgrades:
       - *holiday_lighting_no_exterior_use
       - *hvac_heating_efficiency_ashp_seer_22_10_hspf
       - *hvac_cooling_efficiency_ducted_heat_pump
-      - *hvac_cooling_efficiency_non_ducted_heat_pump
       - *water_heater_efficiency_electric_heat_pump_66_gal_3_pt_35_uef
       - *solar_hot_water_40_sqft_south_roof_pitch
       - *has_pv_yes

diff --git a/resources/options_lookup.tsv b/resources/options_lookup.tsv
@@ -645,7 +645,7 @@ HVAC Cooling Type	Ducted Heat Pump
 HVAC Cooling Type	Non-Ducted Heat Pump																									
 HVAC Cooling Type	Evaporative or swamp cooler																									
 HVAC Cooling Efficiency	None	ResStockArguments	cooling_system_type=none	cooling_system_cooling_efficiency_type=SEER	cooling_system_cooling_efficiency=0	cooling_system_cooling_capacity=auto	cooling_system_is_ducted=false																			
-HVAC Cooling Efficiency	Ducted Heat Pump	ResStockArguments	cooling_system_type=none	cooling_system_cooling_efficiency_type=SEER	cooling_system_cooling_efficiency=0	cooling_system_cooling_capacity=auto	cooling_system_is_ducted=true																			
+HVAC Cooling Efficiency	Ducted Heat Pump	ResStockArguments	cooling_system_type=none	cooling_system_cooling_efficiency_type=SEER	cooling_system_cooling_efficiency=0	cooling_system_cooling_capacity=auto	cooling_system_is_ducted=false																			
 HVAC Cooling Efficiency	Non-Ducted Heat Pump	ResStockArguments	cooling_system_type=none	cooling_system_cooling_efficiency_type=SEER	cooling_system_cooling_efficiency=0	cooling_system_cooling_capacity=auto	cooling_system_is_ducted=false																			
 HVAC Cooling Efficiency	Shared Cooling																									
 HVAC Cooling Efficiency	"AC, SEER 8"	ResStockArguments	cooling_system_type=central air conditioner	cooling_system_cooling_efficiency_type=SEER	cooling_system_cooling_efficiency=8	cooling_system_cooling_capacity=auto	cooling_system_is_ducted=false																			

diff --git a/test/base_results/baseline/timeseries/buildstockbatch.csv b/test/base_results/baseline/timeseries/buildstockbatch.csv
diff --git a/test/base_results/baseline/timeseries/results_output.csv b/test/base_results/baseline/timeseries/results_output.csv
diff --git a/test/base_results/upgrades/annual/results_output.csv b/test/base_results/upgrades/annual/results_output.csv
diff --git a/test/process_bsb_analysis.py b/test/process_bsb_analysis.py
@@ -109,10 +109,10 @@
 
   df_testings.append(df_testing)
 
-df_national = reduce(lambda x, y: x.add(y, fill_value=0), df_nationals).round(2)
+df_national = reduce(lambda x, y: x.add(y, fill_value=0), df_nationals).round(1)
 df_national['PROJECT'] = 'project_national'
 
-df_testing = reduce(lambda x, y: x.add(y, fill_value=0), df_testings).round(2)
+df_testing = reduce(lambda x, y: x.add(y, fill_value=0), df_testings).round(1)
 df_testing['PROJECT'] = 'project_testing'
 
 results_output = pd.concat([df_national, df_testing]).fillna(0)
@@ -144,10 +144,10 @@
 
     df_testings.append(df_testing)
 
-df_national = reduce(lambda x, y: x.add(y, fill_value=0), df_nationals).round(2)
+df_national = reduce(lambda x, y: x.add(y, fill_value=0), df_nationals).round(1)
 df_national['PROJECT'] = 'project_national'
 
-df_testing = reduce(lambda x, y: x.add(y, fill_value=0), df_testings).round(2)
+df_testing = reduce(lambda x, y: x.add(y, fill_value=0), df_testings).round(1)
 df_testing['PROJECT'] = 'project_testing'
 
 buildstockbatch = pd.concat([df_national, df_testing]).fillna(0)