From e9f74378b982320303c0406a12a416ec03b07d72 Mon Sep 17 00:00:00 2001 From: Ben Young Date: Thu, 12 Nov 2026 21:19:43 -0500 Subject: [PATCH] cleanup(iot): retire Detail_Use/Make FBS and CAP_HAP 2014/2020 Nowcast never used the summary-to-detail Use/Make methods; only CAP_HAP 2014/2020 nested them. Keep CAP_HAP 2017 and BEA_Summary_Use_SUT. --- bedrock/analysis/nowcasting/plan.md | 11 ++- .../cap_hap/CAP_HAP_Nonpoint_2014.yaml | 77 ------------------- .../cap_hap/CAP_HAP_Nonpoint_2020.yaml | 77 ------------------- .../cap_hap/CAP_HAP_Nonroad_2014.yaml | 76 ------------------ .../cap_hap/CAP_HAP_Nonroad_2020.yaml | 34 -------- .../cap_hap/CAP_HAP_Onroad_2014.yaml | 33 -------- .../cap_hap/CAP_HAP_Onroad_2020.yaml | 33 -------- .../cap_hap/CAP_HAP_national_2014_m1.yaml | 37 --------- .../cap_hap/CAP_HAP_national_2020_m1.yaml | 28 ------- .../cap_hap/CAP_HAP_state_2014_m1.yaml | 36 --------- .../cap_hap/CAP_HAP_state_2020_m1.yaml | 27 ------- bedrock/transform/iot/Detail_Make.yaml | 45 ----------- bedrock/transform/iot/Detail_Use.yaml | 59 -------------- bedrock/transform/iot/Detail_Use_SUT.yaml | 58 -------------- bedrock/utils/config/source_catalog.yaml | 16 ---- bedrock/utils/validation/method_status.yaml | 7 -- 16 files changed, 5 insertions(+), 649 deletions(-) delete mode 100644 bedrock/transform/cap_hap/CAP_HAP_Nonpoint_2014.yaml delete mode 100644 bedrock/transform/cap_hap/CAP_HAP_Nonpoint_2020.yaml delete mode 100644 bedrock/transform/cap_hap/CAP_HAP_Nonroad_2014.yaml delete mode 100644 bedrock/transform/cap_hap/CAP_HAP_Nonroad_2020.yaml delete mode 100644 bedrock/transform/cap_hap/CAP_HAP_Onroad_2014.yaml delete mode 100644 bedrock/transform/cap_hap/CAP_HAP_Onroad_2020.yaml delete mode 100644 bedrock/transform/cap_hap/CAP_HAP_national_2014_m1.yaml delete mode 100644 bedrock/transform/cap_hap/CAP_HAP_national_2020_m1.yaml delete mode 100644 bedrock/transform/cap_hap/CAP_HAP_state_2014_m1.yaml delete mode 100644 bedrock/transform/cap_hap/CAP_HAP_state_2020_m1.yaml delete mode 100644 bedrock/transform/iot/Detail_Make.yaml delete mode 100644 bedrock/transform/iot/Detail_Use.yaml delete mode 100644 bedrock/transform/iot/Detail_Use_SUT.yaml diff --git a/bedrock/analysis/nowcasting/plan.md b/bedrock/analysis/nowcasting/plan.md index 2971cd434..e571fea56 100644 --- a/bedrock/analysis/nowcasting/plan.md +++ b/bedrock/analysis/nowcasting/plan.md @@ -204,12 +204,11 @@ conversion and redefinition steps need is already loadable** — no new extract before→after transform. - [`inflation_helpers_usa.py`](../../utils/economic/inflation_helpers_usa.py) — bedrock's own commodity-inflation approach, referenced by #497. -- [`Detail_Supply_Mix.yaml`](../../transform/iot/Detail_Supply_Mix.yaml) / - [`Detail_Use_SUT.yaml`](../../transform/iot/Detail_Use_SUT.yaml) — existing FBS methods that - disaggregate a **Summary SUT** to detail using 2017 detail proportions. Their own headers warn *"The - resulting tables do not reflect valid balanced Supply/Use tables"*, so they are not the deliverable — - but they are a ready-made **fallback seed / cross-check** for any SUT block we can't source directly, - and they already encode which codes to exclude from each framework. +- [`Detail_Supply_Mix.yaml`](../../transform/iot/Detail_Supply_Mix.yaml) — FBS method that + disaggregates published summary domestic output onto the 2017 detail mix for the nowcast Supply + seed (`nowcast_supply_go_control` → `assemble`). The method header warns the output is not a + valid balanced Supply table; balanced Use comes from `Balanced_Detail_Use_SUT`, not a parallel + summary→detail Use FBS. **Not in bedrock, to be ported:** commodity mix / intermediate nowcasting (`CalculateIntermediateUseAndCommodityMix.R`, per #497). The Step 5 **engine** diff --git a/bedrock/transform/cap_hap/CAP_HAP_Nonpoint_2014.yaml b/bedrock/transform/cap_hap/CAP_HAP_Nonpoint_2014.yaml deleted file mode 100644 index bf705f596..000000000 --- a/bedrock/transform/cap_hap/CAP_HAP_Nonpoint_2014.yaml +++ /dev/null @@ -1,77 +0,0 @@ -# This is the 2014 target year method for CAP_HAP which builds off the generic -# method in CAP_HAP_common. This state level method is at the detail level. -# This FBS is for the Nonpoint portion ONLY - -!include:BEA_detail_target.yaml -target_naics_year: 2012 -target_geoscale: state # used for geographical correlation -geoscale: state - -_emission_year: &year 2014 - -sources_to_cache: - Detail_Use_2014: - !include:Detail_Use.yaml - year: *year - source_names: - BEA_Summary_Use_PRO_BeforeRedef: - !include:Detail_Use.yaml:source_names:BEA_Summary_Use_PRO_BeforeRedef - year: *year - - EIA_MECS_Energy: - !include:CAP_HAP_common.yaml:sources_to_cache:EIA_MECS_Energy_state - year: 2014 - attribution_source: - Employment_state_2014: # Update to MECS year - data_format: FBS - geoscale: national # Uses national at this stage prior to attributing to states - year: 2014 - clean_source: - Employment_state_2014: - data_format: FBS - -source_names: - EPA_NEI_Nonpoint: - !include:CAP_HAP_common.yaml:source_names:EPA_NEI_Nonpoint - year: *year - activity_sets: - !include:CAP_HAP_common.yaml:source_names:EPA_NEI_Nonpoint:activity_sets - - # Update some activities with correct BEA year - mobile_and_fuel_storage: - !include:CAP_HAP_common.yaml:source_names:EPA_NEI_Nonpoint:activity_sets:mobile_and_fuel_storage - attribution_source: - Detail_Use_2014: - geoscale: national - selection_fields: - SectorProducedBy: {'32411': ''} # Petroleum - - fertilizers: - !include:CAP_HAP_common.yaml:source_names:EPA_NEI_Nonpoint:activity_sets:fertilizers - attribution_source: - Detail_Use_2014: - geoscale: national - selection_fields: - SectorProducedBy: {'32531': ''} # Fertilizers - - pesticides: - !include:CAP_HAP_common.yaml:source_names:EPA_NEI_Nonpoint:activity_sets:pesticides - attribution_source: - Detail_Use_2014: - geoscale: national - selection_fields: - SectorProducedBy: {'32532': ''} # Pesticides - - output_allocation: # Gross Output - !include:CAP_HAP_common.yaml:source_names:EPA_NEI_Nonpoint:activity_sets:output_allocation - attribution_source: - BEA_Detail_GrossOutput_IO: - year: *year - geoscale: national - activity_to_sector_mapping: BEA_2012_Detail - attribution_method: proportional - attribution_source: - Employment_national_2014: - data_format: FBS - year: *year - diff --git a/bedrock/transform/cap_hap/CAP_HAP_Nonpoint_2020.yaml b/bedrock/transform/cap_hap/CAP_HAP_Nonpoint_2020.yaml deleted file mode 100644 index aa598f88f..000000000 --- a/bedrock/transform/cap_hap/CAP_HAP_Nonpoint_2020.yaml +++ /dev/null @@ -1,77 +0,0 @@ -# This is the 2020 target year method for CAP_HAP which builds off the generic -# method in CAP_HAP_common. This state level method is at the detail level. -# This FBS is for the Nonpoint portion ONLY - -!include:BEA_detail_target.yaml -target_naics_year: 2012 -target_geoscale: state # used for geographical correlation -geoscale: state - -_emission_year: &year 2020 - -sources_to_cache: - Detail_Use_2020: - !include:Detail_Use_SUT.yaml - year: *year - source_names: - BEA_Summary_Use_SUT: - !include:Detail_Use_SUT.yaml:source_names:BEA_Summary_Use_SUT - year: *year - - EIA_MECS_Energy: - !include:CAP_HAP_common.yaml:sources_to_cache:EIA_MECS_Energy_state - year: 2018 - attribution_source: - Employment_state_2018: # Update to MECS year - data_format: FBS - geoscale: national # Uses national at this stage prior to attributing to states - year: 2018 - clean_source: - Employment_state_2018: - data_format: FBS - -source_names: - EPA_NEI_Nonpoint: - !include:CAP_HAP_common.yaml:source_names:EPA_NEI_Nonpoint - year: *year - activity_sets: - !include:CAP_HAP_common.yaml:source_names:EPA_NEI_Nonpoint:activity_sets - - # Update some activities with correct BEA year - mobile_and_fuel_storage: - !include:CAP_HAP_common.yaml:source_names:EPA_NEI_Nonpoint:activity_sets:mobile_and_fuel_storage - attribution_source: - Detail_Use_2020: - geoscale: national - selection_fields: - SectorProducedBy: {'32411': ''} # Petroleum - - fertilizers: - !include:CAP_HAP_common.yaml:source_names:EPA_NEI_Nonpoint:activity_sets:fertilizers - attribution_source: - Detail_Use_2020: - geoscale: national - selection_fields: - SectorProducedBy: {'32531': ''} # Fertilizers - - pesticides: - !include:CAP_HAP_common.yaml:source_names:EPA_NEI_Nonpoint:activity_sets:pesticides - attribution_source: - Detail_Use_2020: - geoscale: national - selection_fields: - SectorProducedBy: {'32532': ''} # Pesticides - - output_allocation: # Gross Output - !include:CAP_HAP_common.yaml:source_names:EPA_NEI_Nonpoint:activity_sets:output_allocation - attribution_source: - BEA_Detail_GrossOutput_IO: - year: *year - geoscale: national - activity_to_sector_mapping: BEA_2012_Detail - attribution_method: proportional - attribution_source: - Employment_national_2020: - data_format: FBS - year: *year - diff --git a/bedrock/transform/cap_hap/CAP_HAP_Nonroad_2014.yaml b/bedrock/transform/cap_hap/CAP_HAP_Nonroad_2014.yaml deleted file mode 100644 index fabd6d8a6..000000000 --- a/bedrock/transform/cap_hap/CAP_HAP_Nonroad_2014.yaml +++ /dev/null @@ -1,76 +0,0 @@ -# This is the 2014 target year method for CAP_HAP which builds off the generic -# method in CAP_HAP_common. This state level method is at the detail level. -# This FBS is for the Nonroad portion ONLY - -!include:BEA_detail_target.yaml -target_naics_year: 2012 -target_geoscale: state # used for geographical correlation -geoscale: state - -_emission_year: &year 2014 - -sources_to_cache: - Detail_Use_2014: - !include:Detail_Use.yaml - year: *year - source_names: - BEA_Summary_Use_PRO_BeforeRedef: - !include:Detail_Use.yaml:source_names:BEA_Summary_Use_PRO_BeforeRedef - year: *year - -source_names: - EPA_NEI_Nonroad: - !include:CAP_HAP_common.yaml:source_names:EPA_NEI_Nonroad - year: *year - activity_sets: - direct_allocation: - selection_fields: - PrimaryActivity: !from_index:NEI_Nonroad_asets.csv direct_allocation - attribution_method: direct - # These activity sets are broken out into multiple sections to avoid - # MemoryErrors - offroad_vehicles_equipment_a: - selection_fields: - PrimaryActivity: !from_index:NEI_Nonroad_asets.csv offroad_vehicles_equipment_a - attribution_method: proportional - attribution_source: - Detail_Use_2014: - geoscale: national - selection_fields: - SectorProducedBy: {'32411': ''} # Petroleum - offroad_vehicles_equipment_b: - selection_fields: - PrimaryActivity: !from_index:NEI_Nonroad_asets.csv offroad_vehicles_equipment_b - attribution_method: proportional - attribution_source: - Detail_Use_2014: - geoscale: national - selection_fields: - SectorProducedBy: {'32411': ''} # Petroleum - offroad_vehicles_equipment_c: - selection_fields: - PrimaryActivity: !from_index:NEI_Nonroad_asets.csv offroad_vehicles_equipment_c - attribution_method: proportional - attribution_source: - Detail_Use_2014: - geoscale: national - selection_fields: - SectorProducedBy: {'32411': ''} # Petroleum - offroad_vehicles_equipment_d: - selection_fields: - PrimaryActivity: !from_index:NEI_Nonroad_asets.csv offroad_vehicles_equipment_d - attribution_method: proportional - attribution_source: - Detail_Use_2014: - geoscale: national - selection_fields: - SectorProducedBy: {'32411': ''} # Petroleum - offroad_vehicles_equipment_e: - selection_fields: - PrimaryActivity: !from_index:NEI_Nonroad_asets.csv offroad_vehicles_equipment_e - attribution_method: proportional - attribution_source: - Detail_Use_2014: - geoscale: national - selection_fields: - SectorProducedBy: {'32411': ''} # Petroleum diff --git a/bedrock/transform/cap_hap/CAP_HAP_Nonroad_2020.yaml b/bedrock/transform/cap_hap/CAP_HAP_Nonroad_2020.yaml deleted file mode 100644 index 9fe7e8b81..000000000 --- a/bedrock/transform/cap_hap/CAP_HAP_Nonroad_2020.yaml +++ /dev/null @@ -1,34 +0,0 @@ -# This is the 2020 target year method for CAP_HAP which builds off the generic -# method in CAP_HAP_common. This state level method is at the detail level. -# This FBS is for the Nonroad portion ONLY - -!include:BEA_detail_target.yaml -target_naics_year: 2012 -target_geoscale: state # used for geographical correlation -geoscale: state - -_emission_year: &year 2020 - -sources_to_cache: - Detail_Use_2020: - !include:Detail_Use_SUT.yaml - year: *year - source_names: - BEA_Summary_Use_SUT: - !include:Detail_Use_SUT.yaml:source_names:BEA_Summary_Use_SUT - year: *year - -source_names: - EPA_NEI_Nonroad: - !include:CAP_HAP_common.yaml:source_names:EPA_NEI_Nonroad - year: *year - activity_sets: - !include:CAP_HAP_common.yaml:source_names:EPA_NEI_Nonroad:activity_sets - offroad_vehicles_equipment: - !include:CAP_HAP_common.yaml:source_names:EPA_NEI_Nonroad:activity_sets:offroad_vehicles_equipment - attribution_source: - Detail_Use_2020: - geoscale: national - selection_fields: - SectorProducedBy: {'32411': ''} # Petroleum - diff --git a/bedrock/transform/cap_hap/CAP_HAP_Onroad_2014.yaml b/bedrock/transform/cap_hap/CAP_HAP_Onroad_2014.yaml deleted file mode 100644 index 4091855f9..000000000 --- a/bedrock/transform/cap_hap/CAP_HAP_Onroad_2014.yaml +++ /dev/null @@ -1,33 +0,0 @@ -# This is the 2014 target year method for CAP_HAP which builds off the generic -# method in CAP_HAP_common. This state level method is at the detail level. -# This FBS is for the Onroad portion ONLY - -!include:BEA_detail_target.yaml -target_naics_year: 2012 -target_geoscale: state # used for geographical correlation -geoscale: state - -_emission_year: &year 2014 - -sources_to_cache: - Detail_Use_2014: - !include:Detail_Use.yaml - year: *year - source_names: - BEA_Summary_Use_PRO_BeforeRedef: - !include:Detail_Use.yaml:source_names:BEA_Summary_Use_PRO_BeforeRedef - year: *year - -source_names: - EPA_NEI_Onroad: - !include:CAP_HAP_common.yaml:source_names:EPA_NEI_Onroad - year: *year - activity_sets: - !include:CAP_HAP_common.yaml:source_names:EPA_NEI_Onroad:activity_sets - onroad_vehicles_gas_stations: - !include:CAP_HAP_common.yaml:source_names:EPA_NEI_Onroad:activity_sets:onroad_vehicles_gas_stations - attribution_source: - Detail_Use_2014: - geoscale: national - selection_fields: - SectorProducedBy: {'32411': ''} # Petroleum diff --git a/bedrock/transform/cap_hap/CAP_HAP_Onroad_2020.yaml b/bedrock/transform/cap_hap/CAP_HAP_Onroad_2020.yaml deleted file mode 100644 index 5e59ac526..000000000 --- a/bedrock/transform/cap_hap/CAP_HAP_Onroad_2020.yaml +++ /dev/null @@ -1,33 +0,0 @@ -# This is the 2020 target year method for CAP_HAP which builds off the generic -# method in CAP_HAP_common. This state level method is at the detail level. -# This FBS is for the Onroad portion ONLY - -!include:BEA_detail_target.yaml -target_naics_year: 2012 -target_geoscale: state # used for geographical correlation -geoscale: state - -_emission_year: &year 2020 - -sources_to_cache: - Detail_Use_2020: - !include:Detail_Use_SUT.yaml - year: *year - source_names: - BEA_Summary_Use_SUT: - !include:Detail_Use_SUT.yaml:source_names:BEA_Summary_Use_SUT - year: *year - -source_names: - EPA_NEI_Onroad: - !include:CAP_HAP_common.yaml:source_names:EPA_NEI_Onroad - year: *year - activity_sets: - !include:CAP_HAP_common.yaml:source_names:EPA_NEI_Onroad:activity_sets - onroad_vehicles_gas_stations: - !include:CAP_HAP_common.yaml:source_names:EPA_NEI_Onroad:activity_sets:onroad_vehicles_gas_stations - attribution_source: - Detail_Use_2020: - geoscale: national - selection_fields: - SectorProducedBy: {'32411': ''} # Petroleum diff --git a/bedrock/transform/cap_hap/CAP_HAP_national_2014_m1.yaml b/bedrock/transform/cap_hap/CAP_HAP_national_2014_m1.yaml deleted file mode 100644 index d1dddbdc3..000000000 --- a/bedrock/transform/cap_hap/CAP_HAP_national_2014_m1.yaml +++ /dev/null @@ -1,37 +0,0 @@ -# This is the 2014 target year method for National detail models -# It aggregates the state detail models - -!include:BEA_detail_target.yaml -target_naics_year: 2012 -geoscale: national - -_emission_year: &year 2014 - -source_names: - CAP_HAP_Nonpoint_2014: # detail state model - year: *year - data_format: FBS - - CAP_HAP_Nonroad_2014: # detail state model - year: *year - data_format: FBS - # Rename MetaSources - selection_fields: - MetaSources: - 'EPA_NEI_Nonroad.direct_allocation': 'EPA_NEI_Nonroad.direct_allocation' - 'EPA_NEI_Nonroad.offroad_vehicles_equipment_a': 'EPA_NEI_Nonroad.offroad_vehicles_equipment' - 'EPA_NEI_Nonroad.offroad_vehicles_equipment_b': 'EPA_NEI_Nonroad.offroad_vehicles_equipment' - 'EPA_NEI_Nonroad.offroad_vehicles_equipment_c': 'EPA_NEI_Nonroad.offroad_vehicles_equipment' - 'EPA_NEI_Nonroad.offroad_vehicles_equipment_d': 'EPA_NEI_Nonroad.offroad_vehicles_equipment' - 'EPA_NEI_Nonroad.offroad_vehicles_equipment_e': 'EPA_NEI_Nonroad.offroad_vehicles_equipment' - - CAP_HAP_Onroad_2014: # detail state model - year: *year - data_format: FBS - - stewiFBS: - !include:CAP_HAP_common.yaml:source_names:stewiFBS - inventory_dict: - NEI: *year - TRI: *year - local_inventory_name: NEI_TRI_air_2014 diff --git a/bedrock/transform/cap_hap/CAP_HAP_national_2020_m1.yaml b/bedrock/transform/cap_hap/CAP_HAP_national_2020_m1.yaml deleted file mode 100644 index fb2bb8b9c..000000000 --- a/bedrock/transform/cap_hap/CAP_HAP_national_2020_m1.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# This is the 2020 target year method for National detail models -# It aggregates the state detail models - -!include:BEA_detail_target.yaml -target_naics_year: 2012 -geoscale: national - -_emission_year: &year 2020 - -source_names: - CAP_HAP_Nonpoint_2020: # detail state model - year: *year - data_format: FBS - - CAP_HAP_Nonroad_2020: # detail state model - year: *year - data_format: FBS - - CAP_HAP_Onroad_2020: # detail state model - year: *year - data_format: FBS - - stewiFBS: - !include:CAP_HAP_common.yaml:source_names:stewiFBS - inventory_dict: - NEI: *year - TRI: *year - local_inventory_name: NEI_TRI_air_2020 diff --git a/bedrock/transform/cap_hap/CAP_HAP_state_2014_m1.yaml b/bedrock/transform/cap_hap/CAP_HAP_state_2014_m1.yaml deleted file mode 100644 index 3a3618a00..000000000 --- a/bedrock/transform/cap_hap/CAP_HAP_state_2014_m1.yaml +++ /dev/null @@ -1,36 +0,0 @@ -# This is the 2014 target year method for Summary state models -# It aggregates the detail models to the summary level - -!include:USEEIO_summary_target.yaml -target_naics_year: 2012 -geoscale: state -_emission_year: &year 2014 - -source_names: - CAP_HAP_Nonpoint_2014: # detail state model - year: *year - data_format: FBS - - CAP_HAP_Nonroad_2014: # detail state model - year: *year - data_format: FBS - # Rename MetaSources - selection_fields: - MetaSources: - 'EPA_NEI_Nonroad.direct_allocation': 'EPA_NEI_Nonroad.direct_allocation' - 'EPA_NEI_Nonroad.offroad_vehicles_equipment_a': 'EPA_NEI_Nonroad.offroad_vehicles_equipment' - 'EPA_NEI_Nonroad.offroad_vehicles_equipment_b': 'EPA_NEI_Nonroad.offroad_vehicles_equipment' - 'EPA_NEI_Nonroad.offroad_vehicles_equipment_c': 'EPA_NEI_Nonroad.offroad_vehicles_equipment' - 'EPA_NEI_Nonroad.offroad_vehicles_equipment_d': 'EPA_NEI_Nonroad.offroad_vehicles_equipment' - 'EPA_NEI_Nonroad.offroad_vehicles_equipment_e': 'EPA_NEI_Nonroad.offroad_vehicles_equipment' - - CAP_HAP_Onroad_2014: # detail state model - year: *year - data_format: FBS - - stewiFBS: - !include:CAP_HAP_common.yaml:source_names:stewiFBS - inventory_dict: - NEI: *year - TRI: *year - local_inventory_name: NEI_TRI_air_2014 diff --git a/bedrock/transform/cap_hap/CAP_HAP_state_2020_m1.yaml b/bedrock/transform/cap_hap/CAP_HAP_state_2020_m1.yaml deleted file mode 100644 index f93ccd098..000000000 --- a/bedrock/transform/cap_hap/CAP_HAP_state_2020_m1.yaml +++ /dev/null @@ -1,27 +0,0 @@ -# This is the 2020 target year method for Summary state models -# It aggregates the detail models to the summary level - -!include:USEEIO_summary_target.yaml -target_naics_year: 2012 -geoscale: state -_emission_year: &year 2020 - -source_names: - CAP_HAP_Nonpoint_2020: # detail state model - year: *year - data_format: FBS - - CAP_HAP_Nonroad_2020: # detail state model - year: *year - data_format: FBS - - CAP_HAP_Onroad_2020: # detail state model - year: *year - data_format: FBS - - stewiFBS: - !include:CAP_HAP_common.yaml:source_names:stewiFBS - inventory_dict: - NEI: *year - TRI: *year - local_inventory_name: NEI_TRI_air_2020 diff --git a/bedrock/transform/iot/Detail_Make.yaml b/bedrock/transform/iot/Detail_Make.yaml deleted file mode 100644 index 2eb663c00..000000000 --- a/bedrock/transform/iot/Detail_Make.yaml +++ /dev/null @@ -1,45 +0,0 @@ -# This method disaggregates a Summary Make table for target use based on the -# 2012 Detail Make table. The resulting tables do not reflect valid balanced -# Make tables - -# The full FBS for any year can be cached using: -# sources_to_cache: -# Detail_Make_2015: -# !include:Detail_Make.yaml -# year: *year -# source_names: -# BEA_Summary_Make_BeforeRedef: -# !include:Detail_Use.yaml:source_names:BEA_Summary_Use_PRO_BeforeRedef -# year: *year - -!include:BEA_detail_target.yaml -year: &summary_year 2015 -target_naics_year: 2012 -geoscale: national - -data_format: FBS -activity_schema: NAICS_2012_Code # <- necessary? (long term just look at the FBS) - -source_names: - BEA_Summary_Make_BeforeRedef: - geoscale: national - year: *summary_year - activity_to_sector_mapping: BEA_2012_Summary - primary_action_type: Consumed # speeds processing - # Drop unneeded codes - exclusion_fields: - ActivityConsumedBy: ['Other', 'Used', 'Total Industry Output'] - ActivityProducedBy: ['Total Commodity Output'] - attribution_method: proportional - attribute_on: ['PrimarySector', 'SecondarySector'] - attribution_source: - BEA_Detail_Make_BeforeRedef: - year: 2012 - activity_to_sector_mapping: BEA_2012_Detail - primary_action_type: Consumed # speeds processing - # Drop unneeded codes - exclusion_fields: - ActivityConsumedBy: ['S00300', 'S00401', 'S00402', # Noncomparable imports, Scrap, Used - 'T008'] - ActivityProducedBy: ['T007'] - attribution_method: equal diff --git a/bedrock/transform/iot/Detail_Use.yaml b/bedrock/transform/iot/Detail_Use.yaml deleted file mode 100644 index 153bea998..000000000 --- a/bedrock/transform/iot/Detail_Use.yaml +++ /dev/null @@ -1,59 +0,0 @@ -# This method disaggregates a Summary Use table for target use based on the -# 2012 Detail Use table. The resulting tables do not reflect valid balanced -# Use tables - -# The full FBS for any year can be cached using: -# sources_to_cache: -# Detail_Use_2015: -# !include:Detail_Use.yaml -# year: *year -# source_names: -# BEA_Summary_Use_PRO_BeforeRedef: -# !include:Detail_Use.yaml:source_names:BEA_Summary_Use_PRO_BeforeRedef -# year: *year - -!include:BEA_detail_target.yaml -year: &summary_year 2015 -target_naics_year: 2012 -geoscale: national - -data_format: FBS -activity_schema: NAICS_2012_Code # <- necessary? (long term just look at the FBS) - -source_names: - BEA_Summary_Use_PRO_BeforeRedef: - geoscale: national - year: *summary_year - activity_to_sector_mapping: BEA_2012_Summary - primary_action_type: Consumed # speeds processing - - # Drop unneeded codes - exclusion_fields: - ActivityConsumedBy: ['F02E', 'F02N', 'F02R', 'F02S', 'F030', - 'F040', 'F050', 'F051', 'F06C', 'F06E', 'F06N', 'F06S', - 'F07C', 'F07E', 'F07N', 'F07S', 'F10C', 'F10E', - 'F10N', 'F10S', - 'Total Commodity Output', 'Total Final Uses (GDP)', - 'Total Intermediate'] - ActivityProducedBy: ['Total Industry Output', 'Total Value Added', - 'Total Intermediate', 'V001', 'V002', 'V003', - 'Other', 'Used'] - attribution_method: proportional - attribute_on: ['PrimarySector', 'SecondarySector'] - attribution_source: - BEA_Detail_Use_PRO_BeforeRedef: - year: 2012 - activity_to_sector_mapping: BEA_2012_Detail - primary_action_type: Consumed # speeds processing - # Drop unneeded codes - exclusion_fields: - ActivityConsumedBy: ['F02E00', 'F02N00', 'F02R00', 'F02S00', - 'F03000', 'F04000', 'F05000', 'F06C00', 'F06E00', - 'F06N00', 'F06S00', 'F07C00', 'F07E00', 'F07N00', - 'F07S00', 'F10C00', 'F10E00', 'F10N00', 'F10S00', - 'T001', 'T004', 'T007'] - ActivityProducedBy: ['T005', 'T006', 'T008', - 'V00100', 'V00200', 'V00300', - 'S00300', 'S00401', 'S00402', # Noncomparable imports, Scrap, Used - ] - attribution_method: equal diff --git a/bedrock/transform/iot/Detail_Use_SUT.yaml b/bedrock/transform/iot/Detail_Use_SUT.yaml deleted file mode 100644 index 2dd0f701f..000000000 --- a/bedrock/transform/iot/Detail_Use_SUT.yaml +++ /dev/null @@ -1,58 +0,0 @@ -# This method disaggregates a Summary Use table for target use based on the -# 2017 Detail Use table. The resulting tables do not reflect valid balanced -# Use tables - -# The full FBS for any year can be cached using: -# sources_to_cache: -# Detail_Use_2019: -# !include:Detail_Use_SUT.yaml -# year: *year -# source_names: -# BEA_Summary_Use_SUT: -# !include:Detail_Use_SUT.yaml:source_names:BEA_Summary_Use_SUT -# year: *year - -!include:BEA_detail_target.yaml -year: &summary_year 2018 -target_naics_year: 2017 -geoscale: national - -data_format: FBS -activity_schema: NAICS_2017_Code # <- necessary? (long term just look at the FBS) - -source_names: - BEA_Summary_Use_SUT: - geoscale: national - year: *summary_year - activity_to_sector_mapping: BEA_2017_Summary - primary_action_type: Consumed # speeds processing - - # Drop unneeded codes - exclusion_fields: - ActivityProducedBy: ['T00OSUB', 'T00OTOP', 'T00SUB', 'T00TOP', 'T018', - 'V001', 'V003', 'VABAS', 'VAPRO', 'T005', - 'Other', 'Used'] - ActivityConsumedBy: ['F02E', 'F02N', 'F02R', 'F02S', - 'F030', 'F040', 'F06C', 'F06E', 'F06N', 'F06S', 'F07C', 'F07E', - 'F07N', 'F07S', 'F10C', 'F10E', 'F10N', 'F10S', - 'T001', 'T019'] - attribution_method: proportional - attribute_on: ['PrimarySector', 'SecondarySector'] - attribution_source: - BEA_Detail_Use_SUT: - year: 2017 - activity_to_sector_mapping: BEA_2017_Detail - primary_action_type: Consumed # speeds processing - - # Drop unneeded codes - exclusion_fields: - ActivityConsumedBy: ['T001', 'F02E00', 'F02N00', 'F02R00', - 'F02S00', 'F03000', 'F04000', 'F06C00', 'F06E00', - 'F06N00', 'F06S00', 'F07C00', 'F07E00', 'F07N00', - 'F07S00', 'F10C00', 'F10E00', 'F10N00', 'F10S00', - 'T019'] - ActivityProducedBy: ['T005', 'V00100', 'T00OTOP', 'V00300', 'VABAS', - 'T018', 'T00TOP', 'T00SUB', 'VAPRO', - 'S00300', 'S00401', 'S00402'] # Noncomparable imports, Scrap, Used - - attribution_method: equal diff --git a/bedrock/utils/config/source_catalog.yaml b/bedrock/utils/config/source_catalog.yaml index 16980ec06..4f9c51ff2 100644 --- a/bedrock/utils/config/source_catalog.yaml +++ b/bedrock/utils/config/source_catalog.yaml @@ -46,22 +46,6 @@ BEA_Detail_Use_PRO_BeforeRedef: bea: year: 2012 hierarchy: flat -BEA_Summary_Make_BeforeRedef: - data_format: FBA - class: - - Money - activity_schema: - bea: - year: 2012 - hierarchy: flat -BEA_Summary_Use_PRO_BeforeRedef: - data_format: FBA - class: - - Money - activity_schema: - bea: - year: 2012 - hierarchy: flat BEA_Detail_Use_SUT: data_format: FBA class: diff --git a/bedrock/utils/validation/method_status.yaml b/bedrock/utils/validation/method_status.yaml index 75ef09557..b3a5f4681 100644 --- a/bedrock/utils/validation/method_status.yaml +++ b/bedrock/utils/validation/method_status.yaml @@ -52,10 +52,3 @@ CAP_HAP_national_2017_m2: Active: True Status: During action causes memory error; too long -CAP_HAP_Nonroad_2014: - Active: True - Status: During action causes memory error; too long - -CAP_HAP_national_2014_m1: - Active: True - Status: Issue with CAP_HAP_Nonroad_2014 prevents method completion