Skip to content

refactor(eeio): remove use_cornerstone_2026_model_schema gating#291

Draft
briantobin-99 wants to merge 1 commit intobtobin__cleanup-ghg-methodfrom
btobin__cleanup-schema-gating
Draft

refactor(eeio): remove use_cornerstone_2026_model_schema gating#291
briantobin-99 wants to merge 1 commit intobtobin__cleanup-ghg-methodfrom
btobin__cleanup-schema-gating

Conversation

@briantobin-99
Copy link
Contributor

cc:
Closes:

What changed? Why?

Keep only Cornerstone branches in ~10 files. Simplify MECS mapping selectors in 4 CO2 allocators (industrial_coal.py, industrial_natural_gas.py, non_energy_fuels_natural_gas.py, non_energy_fuels_petrol.py), get_allocation_sectors() in utils.py, waste_562000_allocation_series_ceda_allocator_to_cornerstone_schema() in waste_utils.py, and load_bea_use_table() in extract/allocation/bea.py. Simplify 6 functions in eeio/derived.py to thin wrappers delegating to derived_cornerstone.py. Delete CEDA v7 dead code: derive_B_usa_via_vnorm, derive_v5_U_usa, derive_v5_detail_Ytot_usa_matrix_set.

Stack: 2/5 — depends on #1 (GHG method cleanup).

Testing

Updated test_bea_use_table_schema.py for Cornerstone-only BEA loader. Existing allocation and EEIO tests pass.

Made with Cursor

Keep only Cornerstone branches in ~10 files. Simplify MECS mapping
selectors in 4 CO2 allocators, get_allocation_sectors(), waste_utils,
bea.py use table loader, and 6 functions in eeio/derived.py (now thin
wrappers delegating to derived_cornerstone.py). Delete CEDA v7 dead
code paths: derive_B_usa_via_vnorm, derive_v5_U_usa,
derive_v5_detail_Ytot_usa_matrix_set.
@briantobin-99
Copy link
Contributor Author

Stack

  1. refactor(allocation): remove GHG if/elif chain and simplify E pipeline #290 — refactor(allocation): remove GHG if/elif chain and simplify E pipeline
  2. refactor(eeio): remove use_cornerstone_2026_model_schema gating #291 — refactor(eeio): remove use_cornerstone_2026_model_schema gating
  3. refactor(eeio): remove waste_disagg and use_E_data_year gating #292 — refactor(eeio): remove waste_disagg and use_E_data_year gating
  4. fix(epa): fix data year validation and remove diagnostics gating #293 — fix(epa): fix data year validation and remove diagnostics gating
  5. refactor(config): remove 14 USAConfig flags and delete obsolete YAMLs #294 — refactor(config): remove 14 USAConfig flags and delete obsolete YAMLs

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant