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

Clean up Materials migration branch #189

Merged
merged 60 commits into from
May 24, 2024
Merged

Clean up Materials migration branch #189

merged 60 commits into from
May 24, 2024

Commits on May 23, 2024

  1. Addition of data files and sets

    @GamzeUnlu95 @macflo8
    GamzeUnlu95 authored and macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    efd1bec View commit details
    Browse the repository at this point in the history

  2. Resolve conflict 2

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    9e460ad View commit details
    Browse the repository at this point in the history

  3. Resolve rebase conflict

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    a859eef View commit details
    Browse the repository at this point in the history

  4. Test run with china model

    @Jihoon @macflo8
    Jihoon authored and macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    636916b View commit details
    Browse the repository at this point in the history

  5. Updated data with cement

    @Jihoon @macflo8
    Jihoon authored and macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    572c64c View commit details
    Browse the repository at this point in the history

  6. Data updated

    @GamzeUnlu95 @macflo8
    GamzeUnlu95 authored and macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    508b09f View commit details
    Browse the repository at this point in the history

  7. Data update

    @GamzeUnlu95 @macflo8
    GamzeUnlu95 authored and macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    2b5d219 View commit details
    Browse the repository at this point in the history

  8. Add sets for petrochemical sector

    @GamzeUnlu95 @macflo8
    GamzeUnlu95 authored and macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    948f5cb View commit details
    Browse the repository at this point in the history

  9. Changes to integrate petro_chemicals

    @GamzeUnlu95 @macflo8
    GamzeUnlu95 authored and macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    806c01b View commit details
    Browse the repository at this point in the history

  10. Updated buildings data

    @Jihoon @macflo8
    Jihoon authored and macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    2eb478e View commit details
    Browse the repository at this point in the history

  11. Add initial scripts and data for buildings work

    @Jihoon @macflo8
    Jihoon authored and macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    46577e5 View commit details
    Browse the repository at this point in the history

  12. Resolve rebasing conflict with buildings file

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    8a312c5 View commit details
    Browse the repository at this point in the history

  13. Resolve rebase conflict 3

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    402d8e4 View commit details
    Browse the repository at this point in the history

  14. Small correction of description

    @volker-krey @macflo8
    volker-krey authored and macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    874fb4f View commit details
    Browse the repository at this point in the history

  15. Update data

    @GamzeUnlu95 @macflo8
    GamzeUnlu95 authored and macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    440d227 View commit details
    Browse the repository at this point in the history

  16. Fix data files

    @GamzeUnlu95 @macflo8
    GamzeUnlu95 authored and macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    c570322 View commit details
    Browse the repository at this point in the history

  17. Update region names in the data files for r12

    @GamzeUnlu95 @macflo8
    GamzeUnlu95 authored and macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    09bd802 View commit details
    Browse the repository at this point in the history

  18. Update the region names to r12

    @GamzeUnlu95 @macflo8
    GamzeUnlu95 authored and macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    87998bc View commit details
    Browse the repository at this point in the history

  19. Remove unnecessary vintage years

    @GamzeUnlu95 @macflo8
    GamzeUnlu95 authored and macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    f057b73 View commit details
    Browse the repository at this point in the history

  20. Update n-fertilizer_techno-economic_new.xlsx

    @GamzeUnlu95 @macflo8
    GamzeUnlu95 authored and macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    f641b5c View commit details
    Browse the repository at this point in the history

  21. Fix ccs units

    @GamzeUnlu95 @macflo8
    GamzeUnlu95 authored and macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    5c71658 View commit details
    Browse the repository at this point in the history

  22. Update data to match base year statistics

    @GamzeUnlu95 @macflo8
    GamzeUnlu95 authored and macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    47389ad View commit details
    Browse the repository at this point in the history

  23. Resolve conflict with input filea

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    a6577c6 View commit details
    Browse the repository at this point in the history

  24. Remove deprecated input files and modules

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    7ddb914 View commit details
    Browse the repository at this point in the history

  25. Modify imports and adjust data handling

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    fcf7a6b View commit details
    Browse the repository at this point in the history

  26. Register material-ix as subcommand in CLI

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    68910ca View commit details
    Browse the repository at this point in the history

  27. Fix typo in parameter string

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    94f4e43 View commit details
    Browse the repository at this point in the history

  28. Remove duplicated function definition

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    49ba610 View commit details
    Browse the repository at this point in the history

  29. Remove unused technology from set.yaml

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    cc9be29 View commit details
    Browse the repository at this point in the history

  30. Remove deprecated files from rebase 

    These files were accidentally added during rebasing
    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    a5001c9 View commit details
    Browse the repository at this point in the history

  31. Delete duplicated codes in set.yaml

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    9cb260c View commit details
    Browse the repository at this point in the history

  32. Apply ruff reformatting

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    ec87103 View commit details
    Browse the repository at this point in the history

  33. Add docstrings and type hints for materials util functions

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    86a29ca View commit details
    Browse the repository at this point in the history

  34. Change data input directory to message-ix-models

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    47db910 View commit details
    Browse the repository at this point in the history

  35. Resolve code quality warnings

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    3cd63f5 View commit details
    Browse the repository at this point in the history

  36. Apply black to materials modules

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    4580fb6 View commit details
    Browse the repository at this point in the history

  37. Resolve remaining code quality issues

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    a480bc2 View commit details
    Browse the repository at this point in the history

  38. Resolve code quality issues in materials reporting

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    b4886bd View commit details
    Browse the repository at this point in the history

  39. Resolve code quality issues in material demand module

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    b1352f6 View commit details
    Browse the repository at this point in the history

  40. Remove ntfy in materials commands

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    0654db4 View commit details
    Browse the repository at this point in the history

  41. Comment unused variable in reporting

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    02b905e View commit details
    Browse the repository at this point in the history

  42. Delete unused materials submodule

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    ddfa1f3 View commit details
    Browse the repository at this point in the history

  43. Refactor materials data module functions 

    Split materials data processing functions that have a code complexity
greater than 11.

Functions in several data modules violated C901
    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    6c48963 View commit details
    Browse the repository at this point in the history

  44. Add missing import for materials build

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    6a2ab7b View commit details
    Browse the repository at this point in the history

  45. Fix wrong data paths 

    Change data paths from message-ix-models to message_data for some files
    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    7d0845a View commit details
    Browse the repository at this point in the history

  46. Apply formatting to data_util

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    3b2e3cd View commit details
    Browse the repository at this point in the history

  47. Add missing parameter in docstring in bare.py

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    277c2f5 View commit details
    Browse the repository at this point in the history

  48. Add comment to FIXME mnemonic

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    d12642b View commit details
    Browse the repository at this point in the history

  49. Migrate functions required by materials reporting from m_data 

    * Migrate already-present functions to common location
* Exclude that location from ruff :(
* Adapt imports in material and legacy reporting
    @glatterf42 @macflo8
    glatterf42 authored and macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    e88d836 View commit details
    Browse the repository at this point in the history

  50. Mark forgotten personal reference as FIXME

    @glatterf42 @macflo8
    glatterf42 authored and macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    d39c074 View commit details
    Browse the repository at this point in the history

  51. Format and tidy up reporting notebook

    @glatterf42 @macflo8
    glatterf42 authored and macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    5f8e890 View commit details
    Browse the repository at this point in the history

  52. Adapt final imports from message_data

    @glatterf42 @macflo8
    glatterf42 authored and macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    0b49e53 View commit details
    Browse the repository at this point in the history

  53. Migrate more required functions from m_data

    @glatterf42 @macflo8
    glatterf42 authored and macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    4150176 View commit details
    Browse the repository at this point in the history

  54. Reduce complexity of methanol module

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    ef842df View commit details
    Browse the repository at this point in the history

  55. Apply ruff format to data_util

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    19d04fb View commit details
    Browse the repository at this point in the history

  56. Apply ruff formatting with ruff 0.4.4

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    cb3031f View commit details
    Browse the repository at this point in the history

  57. Move doc file and update 

    Move doc.rst in material folder, rename to index.rst and pull updated
contents from branch "migrate-materials-tidy"
    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    2e26923 View commit details
    Browse the repository at this point in the history

  58. Reformat materials demand module after rebase

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    39d494f View commit details
    Browse the repository at this point in the history

  59. Delete unused data files from data/material

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    63ec181 View commit details
    Browse the repository at this point in the history

  60. Add #188, #189 to doc/whatsnew

    @macflo8
    macflo8 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    cc2e59f View commit details
    Browse the repository at this point in the history