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

Add industry module #340

Merged
merged 28 commits into from
May 14, 2024
Merged

Add industry module #340

merged 28 commits into from
May 14, 2024

Commits on Apr 8, 2024

  1. Create industry modulle file structure

    Ivan Ruiz Manuel committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    0cf664e View commit details
    Browse the repository at this point in the history

  2. Initial setup for steel/iron industry 

    Co-authored-by: Meijun Chen (tud-mchen6)
    Ivan Ruiz Manuel committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    b995777 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2024

  1. added formatting of steel and iron industry

    Ivan Ruiz Manuel committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    65ebb01 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. Finish the addition of the steel industry processing. 

    Co-authored-by: Meijun Chen (github/tud-mchen6)
    Ivan Ruiz Manuel committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    c04b284 View commit details
    Browse the repository at this point in the history

  2. Minor fix: correct config[input] usage in rule: steel industry

    Ivan Ruiz Manuel committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    80e6e6d View commit details
    Browse the repository at this point in the history

  3. Minor PR fixes

    Ivan Ruiz Manuel committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    dc4240e View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. PR fixes: passed scrap steel share to the cnf. Fixed year range. 

    Co-authored by: Meijun Chen (tud-mchen6)
    Ivan Ruiz Manuel committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    4151c5e View commit details
    Browse the repository at this point in the history

  2. Update modules/industry/src/steel_industry.py

    @brynpickering
    brynpickering authored Apr 11, 2024
    Configuration menu
    Copy the full SHA
    5c60a7f View commit details
    Browse the repository at this point in the history

  3. Add documentation of the industry module

    Meijun Chen committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    1f892bf View commit details
    Browse the repository at this point in the history

  4. minor corrections and initial schema file

    @irm-codebase
    irm-codebase committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    fd0aa3c View commit details
    Browse the repository at this point in the history

  5. Add validation for the industry module configuration. 

    For now only the steel sector configuration is validated.
    @irm-codebase
    irm-codebase committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    7e4f565 View commit details
    Browse the repository at this point in the history

  6. Remove changes to Snakefile

    @irm-codebase
    irm-codebase committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    3a647f3 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/develop' into add-industry-module

    @irm-codebase
    irm-codebase committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    f40ccf1 View commit details
    Browse the repository at this point in the history

  8. Fix reintroduction of Snakefile merge issue

    @irm-codebase
    irm-codebase committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    2820d7b View commit details
    Browse the repository at this point in the history

  9. PR fixes: change folder names

    @irm-codebase
    irm-codebase committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    fb4844e View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2024

  1. Add schema validation for the industry module 

    Co-authored-by: Meijun Chen (tud-mchen6)
    @irm-codebase
    irm-codebase committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    fa3f456 View commit details
    Browse the repository at this point in the history

  2. Fix conflict with schema validation in GitHub.

    @irm-codebase
    irm-codebase committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    632f92c View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/add-jrc-idees-industry-processin… 

    …g' into add-industry-module
    @irm-codebase
    irm-codebase committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    3f3048f View commit details
    Browse the repository at this point in the history

  4. Integrate JRC processing script, removed raw_data 

    Co-authored with Ivan Ruiz Manuel (irm-codebase)
    Meijun Chen committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    87dfea5 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. xarray processing for steel up to specific demand

    @irm-codebase
    irm-codebase committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    7e1160f View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. Generalized JRC functions.

    @irm-codebase
    irm-codebase committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    80ea10a View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2024

  1. Added formatting xarray support

    @irm-codebase
    irm-codebase committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    931ff81 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2024

  1. Final xarray updates. Steel output is now .nc

    @irm-codebase
    irm-codebase committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    c83c40f View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

  1. Merge remote-tracking branch 'origin/develop' into add-industry-module

    @irm-codebase
    irm-codebase committed May 7, 2024
    Configuration menu
    Copy the full SHA
    d518419 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. Updated to newest JRC processing version.

    @irm-codebase
    irm-codebase committed May 8, 2024
    Configuration menu
    Copy the full SHA
    626b5d1 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2024

  1. Improved naming and assertion tests. Updated type annotations.

    @irm-codebase
    irm-codebase committed May 13, 2024
    Configuration menu
    Copy the full SHA
    e49651d View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. Fix default.env merge conflict (no longer used in industry module)

    @irm-codebase
    irm-codebase committed May 14, 2024
    Configuration menu
    Copy the full SHA
    21d0195 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into add-industry-module

    @irm-codebase
    irm-codebase authored May 14, 2024
    Configuration menu
    Copy the full SHA
    09e708c View commit details
    Browse the repository at this point in the history