Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated GHG FBS #406

Merged
merged 74 commits into from
Jul 2, 2024
Merged

Updated GHG FBS #406

merged 74 commits into from
Jul 2, 2024

Commits on Feb 26, 2024

  1. Updated file for 2024 drafts

    @ysrivas08
    ysrivas08 committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    642a8ef View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2024

  1. initial temporary updates to point to external data directory for zip… 

    … file
    @bl-young
    bl-young committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    531e17d View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2024

  1. Updated EPA_GHGI.py file to reflect updated table names for 2024 release

    @ysrivas08
    ysrivas08 committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    af9cdfd View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2024

  1. consolidate USDA_CoA modules

    @bl-young
    bl-young committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    651d6e7 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2024

  1. update USGS_MYB_Lead to 2020

    @bl-young
    bl-young committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    588f49a View commit details
    Browse the repository at this point in the history

  2. update CoA crosswalks with new activities in 2022

    @bl-young
    bl-young committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    611a9ce View commit details
    Browse the repository at this point in the history

  3. streamline Lead activity assignment; fix extra space

    @bl-young
    bl-young committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    5129a0a View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2024

  1. update table numbers and target_naics_year for national models 2017… 

    …-2020
    @bl-young
    bl-young committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    6693f0d View commit details
    Browse the repository at this point in the history

  2. specify CoA year for 2017-2020 fbs models; update 2020 usgs_myb lead … 

    …year to 2020
    @bl-young
    bl-young committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    d6bff73 View commit details
    Browse the repository at this point in the history

  3. align 2018 GHGI table for EIA MECS with new number

    @bl-young
    bl-young committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    659e838 View commit details
    Browse the repository at this point in the history

  4. update 3-24b with data through 2021

    @bl-young
    bl-young committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    57dafc8 View commit details
    Browse the repository at this point in the history

  5. update handling of 3-22 -> 3-24

    @bl-young
    bl-young committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    c9bc0f6 View commit details
    Browse the repository at this point in the history

  6. update pointer to report in comment

    @bl-young
    bl-young committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    68930d6 View commit details
    Browse the repository at this point in the history

  7. add 2021 and 2022 FBS model specs

    @bl-young
    bl-young committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    02699b0 View commit details
    Browse the repository at this point in the history

  8. point to more current ghg fbs for testing

    @bl-young
    bl-young committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    90bf88c View commit details
    Browse the repository at this point in the history

  9. 🚧 temporarily turn off test for ghg fbs

    @bl-young
    bl-young committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    ee0731e View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2024

  1. update supply and use (summary 2017-2022 and detail 2017 tables) from… 

    … useeior v1.5
    @bl-young
    bl-young committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    eb955fe View commit details
    Browse the repository at this point in the history

  2. minor edits for new GO file

    @bl-young
    bl-young committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    8595c3c View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2024

  1. drop testing for old GHG FBS methods

    @bl-young
    bl-young committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    1129850 View commit details
    Browse the repository at this point in the history

  2. 🐛 fix 4_102 -> 4_124

    @bl-young
    bl-young committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    5b2c0a7 View commit details
    Browse the repository at this point in the history

  3. update table numbers for 2012-2016 ghg models

    @bl-young
    bl-young committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    3c87ee2 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2024

  1. Merge pull request #405 from USEPA/usda_coa 

    USDA Census of Ag (2022) and USGS_MYB_Lead (2020)
    @bl-young
    bl-young authored Mar 26, 2024
    Configuration menu
    Copy the full SHA
    75dbba9 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2024

  1. Added footnotes for corrected name conversions

    @ysrivas08
    ysrivas08 committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    48f5c1b View commit details
    Browse the repository at this point in the history

  2. formatting updated for 4-16, 4-37, 4-57, 4-100, no longer req… 

    …uires bespoke formatting
    @bl-young
    bl-young committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    73eaeef View commit details
    Browse the repository at this point in the history

  3. Merge branch 'ghg_2024_updates' of https://github.com/USEPA/flowsa in… 

    …to ghg_2024_updates
    @bl-young
    bl-young committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    7f28c4c View commit details
    Browse the repository at this point in the history

  4. consolidate footnotes to fix errors in 3-13

    @bl-young
    bl-young committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    48fd955 View commit details
    Browse the repository at this point in the history

  5. fix footnotes

    @bl-young
    bl-young committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    a2d973a View commit details
    Browse the repository at this point in the history

  6. minor fixes to units

    @bl-young
    bl-young committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    5859c85 View commit details
    Browse the repository at this point in the history

  7. fix error with missing rows in some appendix tables

    @bl-young
    bl-young committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    730ae22 View commit details
    Browse the repository at this point in the history

  8. fix error reading in new 3_24 table

    @bl-young
    bl-young committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    f32ff37 View commit details
    Browse the repository at this point in the history

  9. update some activity names

    @bl-young
    bl-young committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    3022ac7 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2024

  1. update NAICS crosswalks from script

    @bl-young
    bl-young committed Apr 6, 2024
    Configuration menu
    Copy the full SHA
    dcea037 View commit details
    Browse the repository at this point in the history

  2. fix footnotes in flows for 4-122

    @bl-young
    bl-young committed Apr 6, 2024
    Configuration menu
    Copy the full SHA
    dc615a5 View commit details
    Browse the repository at this point in the history

  3. update to use fedefl mapping file aligned with AR5-100 yr GWPs

    @bl-young
    bl-young committed Apr 6, 2024
    Configuration menu
    Copy the full SHA
    66bdc84 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. Added missing table numbers in description

    @ysrivas08
    ysrivas08 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    e3dfcd2 View commit details
    Browse the repository at this point in the history

  2. Added missing table numbers for descriptions

    @ysrivas08
    ysrivas08 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    eabc4e9 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'ghg_2024_updates' of https://github.com/USEPA/flowsa in… 

    …to ghg_2024_updates

# Conflicts:
#	flowsa/methods/flowbyactivitymethods/EPA_GHGI.yaml
    @ysrivas08
    ysrivas08 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    7d8ff8c View commit details
    Browse the repository at this point in the history

  4. Added missing table numbers for 'desc'

    @ysrivas08
    ysrivas08 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    5d58610 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2024

  1. add 3-116 to multi chem names

    @bl-young
    bl-young committed Apr 21, 2024
    Configuration menu
    Copy the full SHA
    1cea324 View commit details
    Browse the repository at this point in the history

  2. tag supressed data and set to 0

    @bl-young
    bl-young committed Apr 21, 2024
    Configuration menu
    Copy the full SHA
    16e5c27 View commit details
    Browse the repository at this point in the history

  3. add 4-61, 4-62, 4-132

    @bl-young
    bl-young committed Apr 21, 2024
    Configuration menu
    Copy the full SHA
    ca6bdee View commit details
    Browse the repository at this point in the history

  4. add activities for 4-61 and 4-132

    @bl-young
    bl-young committed Apr 21, 2024
    Configuration menu
    Copy the full SHA
    baf4bb2 View commit details
    Browse the repository at this point in the history

  5. fix additional descriptions

    @bl-young
    bl-young committed Apr 21, 2024
    Configuration menu
    Copy the full SHA
    a9388a5 View commit details
    Browse the repository at this point in the history

  6. post-meter no longer a subset of distribution for NG tables

    @bl-young
    bl-young committed Apr 21, 2024
    Configuration menu
    Copy the full SHA
    cc60efa View commit details
    Browse the repository at this point in the history

  7. add missing activity for 3-13 parsing

    @bl-young
    bl-young committed Apr 21, 2024
    Configuration menu
    Copy the full SHA
    a23a093 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2024

  1. add 4-61, 4-62, 4-132 to FBS methods for time series

    @bl-young
    bl-young committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    f7bc809 View commit details
    Browse the repository at this point in the history

  2. temporarily use 2018 data for new tables due to lack of csv data for … 

    …2017
    @bl-young
    bl-young committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    6ab176a View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

  1. update to 2024 csv zip files

    @bl-young
    bl-young committed May 7, 2024
    Configuration menu
    Copy the full SHA
    b72067f View commit details
    Browse the repository at this point in the history

  2. update some table names with revises GHGI release

    @bl-young
    bl-young committed May 7, 2024
    Configuration menu
    Copy the full SHA
    9353337 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. additional table number changes in chapter 4; fix to 4-121

    @bl-young
    bl-young committed May 8, 2024
    Configuration menu
    Copy the full SHA
    d38ccfe View commit details
    Browse the repository at this point in the history

  2. fix error in parsing 3-13

    @bl-young
    bl-young committed May 8, 2024
    Configuration menu
    Copy the full SHA
    5885663 View commit details
    Browse the repository at this point in the history

  3. update 4-121 to include the specific activities

    @bl-young
    bl-young committed May 8, 2024
    Configuration menu
    Copy the full SHA
    64ffee4 View commit details
    Browse the repository at this point in the history

  4. drop temporary year update

    @bl-young
    bl-young committed May 8, 2024
    Configuration menu
    Copy the full SHA
    56c6da4 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2024

  1. add 2012-2016 summary tables for 2017 schema

    @bl-young
    bl-young committed May 23, 2024
    Configuration menu
    Copy the full SHA
    2912327 View commit details
    Browse the repository at this point in the history

  2. update notes for pulling BEA data

    @bl-young
    bl-young committed May 23, 2024
    Configuration menu
    Copy the full SHA
    d364a7c View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. add 2012 detail SUT tables in 2017 schema

    @bl-young
    bl-young committed May 24, 2024
    Configuration menu
    Copy the full SHA
    0d4140d View commit details
    Browse the repository at this point in the history

  2. update 2012 - 2016 FBS to use Supply/Use tables consistent with 2017-… 

    …2022 models; use 2012 detail table as source of disaggregated summary tables
    @bl-young
    bl-young committed May 24, 2024
    Configuration menu
    Copy the full SHA
    68774c0 View commit details
    Browse the repository at this point in the history

  3. update GO FBA

    @bl-young
    bl-young committed May 24, 2024
    Configuration menu
    Copy the full SHA
    13722f4 View commit details
    Browse the repository at this point in the history

  4. add 2012 to Detail Supply and Use fba methods

    @bl-young
    bl-young committed May 24, 2024
    Configuration menu
    Copy the full SHA
    6b91cca View commit details
    Browse the repository at this point in the history

  5. fix typo

    @bl-young
    bl-young committed May 24, 2024
    Configuration menu
    Copy the full SHA
    48790f8 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. remove old tables

    @bl-young
    bl-young committed May 28, 2024
    Configuration menu
    Copy the full SHA
    e5c9b4e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #412 from USEPA/2017tables 

    Updated BEA data for 2012-2016 models
    @bl-young
    bl-young authored May 28, 2024
    Configuration menu
    Copy the full SHA
    14b14ac View commit details
    Browse the repository at this point in the history

  3. Merge branch 'ghg_2024_updates' of https://github.com/USEPA/flowsa in… 

    …to ghg_2024_updates
    @bl-young
    bl-young committed May 28, 2024
    Configuration menu
    Copy the full SHA
    17a9b0c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into ghg_2024_updates

    @bl-young
    bl-young committed May 28, 2024
    Configuration menu
    Copy the full SHA
    c01539c View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into ghg_2024_updates

    @bl-young
    bl-young committed May 28, 2024
    Configuration menu
    Copy the full SHA
    1ebb314 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2024

  1. ensure git version uses tags with 'v'

    @bl-young
    bl-young committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    a910648 View commit details
    Browse the repository at this point in the history

  2. update with 2024 annex files

    @bl-young
    bl-young committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    40d214c View commit details
    Browse the repository at this point in the history

  3. fix error related to some annex tables with mis aligned columns

    @bl-young
    bl-young committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    d92df80 View commit details
    Browse the repository at this point in the history

  4. update A_92 to A_89

    @bl-young
    bl-young committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    c7d96b9 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. Merge branch 'develop' into ghg_2024_updates

    @bl-young
    bl-young committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    5bb0bca View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. update chapter names for zip file

    @bl-young
    bl-young committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    1e60399 View commit details
    Browse the repository at this point in the history

  2. add appendix A-13 back in for 2012 data

    @bl-young
    bl-young committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    dcd3a25 View commit details
    Browse the repository at this point in the history

  3. adjust mapping for liming to avoid dropping of emissions data, where … 

    …no liming use for agricultural sectors
    @bl-young
    bl-young committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    24a3f74 View commit details
    Browse the repository at this point in the history

  4. exclude more fields to avoid warnings

    @bl-young
    bl-young committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    1cb504c View commit details
    Browse the repository at this point in the history