Update start year, fuel switching to resistance, reporting

The start year was hardcoded in the preparation module and supporting heating/cooling totals data to 2024. For fuel switching measures that convert to electric resistance, keys for the switched to technology remain identical to the baseline for the cooling end use (e.g., if it's a NG + central AC baseline, switched to mseg information would indicate electric resistance heater + central AC). The YML files were updated such that the run module always reports out stock information across scenarios in the BSS batch run.

batch/high.yml

@@ -187,9 +187,4 @@ ecm_prep:
     grid_decarb_level: 100by2035
     grid_assessment_timing: before
 run:
-  results_directory: null
-  verbose: false
-  mkt_fracs: false
-  trim_results: false
-  report_stk: false
-  report_cfs: false
+  report_stk: true

batch/ineff.yml

@@ -14,6 +14,7 @@ ecm_prep:
     "(R) Ref. Case NG Heat, No Cooling",
     "(R) Ref. Case Resist. Heat, No Cooling",
     "(R) Ref. Case Secondary Electric Heating",
+    "(R) Ref. Case Secondary Fossil Heating",
     "(R) Electric FS (Secondary Fossil Heating)",
     "(R) Min. Efficiency ASHP FS (Other Fossil Furnace)",
     "(R) Ref. Case Elec. Boiler FS (Other Fossil Boiler)",
@@ -90,9 +91,4 @@ ecm_prep:
   detail_brkout: [regions]
   alt_ref_carb: MidCase
 run:
-  results_directory: null
-  verbose: false
-  mkt_fracs: false
-  trim_results: false
-  report_stk: false
-  report_cfs: false
+  report_stk: true

batch/mid.yml

@@ -188,9 +188,4 @@ ecm_prep:
     grid_decarb_level: 95by2050
     grid_assessment_timing: before
 run:
-  results_directory: null
-  verbose: false
-  mkt_fracs: false
-  trim_results: false
-  report_stk: false
-  report_cfs: false
+  report_stk: true

batch/stated.yml

@@ -138,9 +138,4 @@ ecm_prep:
   detail_brkout: [regions]
   alt_ref_carb: MidCase
 run:
-  results_directory: null
-  verbose: false
-  mkt_fracs: false
-  trim_results: false
-  report_stk: false
-  report_cfs: false
+  report_stk: true

scout/ecm_prep.py

@@ -497,8 +497,8 @@ def __init__(self, base_dir, handyfiles, opts):
         self.regions = opts.alt_regions
         # Load metadata including AEO year range
         aeo_yrs = Utils.load_json(handyfiles.metadata)
-        # Set minimum modeling year to current year
-        aeo_min = 2018
+        # Set minimum modeling year
+        aeo_min = 2024
         # Set maximum modeling year
         aeo_max = aeo_yrs["max year"]
         # Derive time horizon from min/max years
@@ -3175,7 +3175,12 @@ def fill_mkts(self, msegs, msegs_cpl, convert_data, tsv_data_init, opts,
                         elif "GSHP" in self.tech_switch_to:
                             mskeys_swtch_tech = "GSHP"
                         else:
-                            mskeys_swtch_tech = self.tech_switch_to
+                            # Set to original cooling tech./fuel if not switching to HP
+                            if "cooling" in mskeys:
+                                mskeys_swtch_tech, mskeys_swtch_fuel = [
+                                    mskeys[-2], mskeys[3]]
+                            else:
+                                mskeys_swtch_tech = "resistance heat"
                     # Water heating
                     elif mskeys[4] == "water heating":
                         mskeys_swtch_tech = "electric WH"
@@ -3211,7 +3216,12 @@ def fill_mkts(self, msegs, msegs_cpl, convert_data, tsv_data_init, opts,
                                 mskeys[4] == "cooling":
                             mskeys_swtch_tech = "comm_GSHP-cool"
                         else:
-                            mskeys_swtch_tech = self.tech_switch_to
+                            # Set to original cooling tech./fuel if not switching to HP
+                            if "cooling" in mskeys:
+                                mskeys_swtch_tech, mskeys_swtch_fuel = [
+                                    mskeys[-2], mskeys[3]]
+                            else:
+                                mskeys_swtch_tech = "elec_boiler"
                     # Water heating
                     elif mskeys[4] == "water heating":
                         mskeys_swtch_tech = "HP water heater"

scout/htcl_totals.py

@@ -108,7 +108,7 @@ def __init__(self, handyfiles):
                     handyfiles.metadata + "': " + str(e)) from None
         # Set minimum AEO modeling year
         # aeo_min = aeo_yrs["min year"]
-        aeo_min = datetime.today().year
+        aeo_min = 2024
         # Set maximum AEO modeling year
         aeo_max = aeo_yrs["max year"]
         # Derive time horizon from min/max years