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.

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

hotfix for rds_report.R output script: fix units in "report.rds" file #739

Closed
wants to merge 118 commits into from

Commits on Apr 19, 2024

  1. Configuration menu
    Copy the full SHA
    5e665b5 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2024

  1. Configuration menu
    Copy the full SHA
    9bd989a View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2024

  1. Configuration menu
    Copy the full SHA
    e02000c View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2024

  1. Configuration menu
    Copy the full SHA
    e8a8ddd View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2024

  1. Configuration menu
    Copy the full SHA
    ae8910c View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2024

  1. update units to 2017USD

    David Chen committed Aug 31, 2024
    Configuration menu
    Copy the full SHA
    3ffe1fc View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2024

  1. update monetary unit to 2017 base year

    David Chen committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    0fc701c View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2024

  1. Changed water equation and add start script

    Singh committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    875028e View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2024

  1. Configuration menu
    Copy the full SHA
    d669334 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'develop' of https://github.com/magpiemodel/magpie into …

    …waterTest
    Singh committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    0928023 View commit details
    Browse the repository at this point in the history
  3. Updated with develop

    Singh committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    dad292d View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2024

  1. Merge branch 'develop' of https://github.com/magpiemodel/magpie into …

    …waterTest
    Singh committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    54284c0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    652bd70 View commit details
    Browse the repository at this point in the history
  3. update to 2017 base year

    caviddhen committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    3e22473 View commit details
    Browse the repository at this point in the history
  4. merge develop

    caviddhen committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    8674f22 View commit details
    Browse the repository at this point in the history
  5. update config

    caviddhen committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    41cf111 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2024

  1. Configuration menu
    Copy the full SHA
    9b25c76 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. Configuration menu
    Copy the full SHA
    18809fb View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2024

  1. Merge branch 'develop' of github.com:magpiemodel/magpie into gdp2017

    # Conflicts:
    #	CHANGELOG.md
    #	config/default.cfg
    #	modules/29_cropland/detail_apr24/input.gms
    #	modules/58_peatland/v2/declarations.gms
    #	modules/58_peatland/v2/input.gms
    flohump committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    057dec2 View commit details
    Browse the repository at this point in the history
  2. bugfixes

    flohump committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    bb16e1d View commit details
    Browse the repository at this point in the history
  3. revert default title

    flohump committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    01d91af View commit details
    Browse the repository at this point in the history
  4. Merge branch 'develop' of https://github.com/magpiemodel/magpie into …

    …waterTest
    Singh committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    a40e7d4 View commit details
    Browse the repository at this point in the history
  5. Removed start test script for water bug

    Singh committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    84546b8 View commit details
    Browse the repository at this point in the history
  6. Merge branch 'waterTest' of https://github.com/vartika271987/magpie i…

    …nto waterTest
    Singh committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    f6676bb View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2024

  1. pkgType

    pascal-sauer committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    134ada7 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'develop' of https://github.com/magpiemodel/magpie into …

    …waterTest
    Singh committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    20e7ac8 View commit details
    Browse the repository at this point in the history
  3. Updated change log

    Singh committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    8dc7d46 View commit details
    Browse the repository at this point in the history
  4. merge master into develop

    jdrtommey committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    88503ba View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    391a188 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    62dfe6c View commit details
    Browse the repository at this point in the history
  7. Edited changelog

    Singh committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    50aaadd View commit details
    Browse the repository at this point in the history
  8. Merge pull request magpiemodel#728 from jdrtommey/develop

    Merge master into develop
    jdrtommey authored Sep 24, 2024
    Configuration menu
    Copy the full SHA
    e1df200 View commit details
    Browse the repository at this point in the history
  9. Merge branch 'develop' of github.com:magpiemodel/magpie into gdp2017

    # Conflicts:
    #	CHANGELOG.md
    flohump committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    fcdf2ae View commit details
    Browse the repository at this point in the history
  10. count-up start script

    flohump committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    7e22298 View commit details
    Browse the repository at this point in the history
  11. bugfix

    flohump committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    6b93227 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

  1. Fixed gti conflict in Changelog

    Singh committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    e7eb67c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0a39ce2 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2024

  1. Merge pull request magpiemodel#727 from vartika271987/waterTest

    Bugfix in water cost equation
    vartika271987 authored Sep 26, 2024
    Configuration menu
    Copy the full SHA
    59f0599 View commit details
    Browse the repository at this point in the history
  2. Update config/default.cfg

    Co-authored-by: Jan Dietrich <[email protected]>
    flohump and tscheypidi authored Sep 26, 2024
    Configuration menu
    Copy the full SHA
    63dd571 View commit details
    Browse the repository at this point in the history
  3. Update config/default.cfg

    Co-authored-by: Pascal Sauer <[email protected]>
    flohump and pascal-sauer authored Sep 26, 2024
    Configuration menu
    Copy the full SHA
    51b94fc View commit details
    Browse the repository at this point in the history
  4. Update modules/39_landconversion/calib/input.gms

    Co-authored-by: Pascal Sauer <[email protected]>
    flohump and pascal-sauer authored Sep 26, 2024
    Configuration menu
    Copy the full SHA
    8b03f07 View commit details
    Browse the repository at this point in the history
  5. Update modules/29_cropland/detail_apr24/input.gms

    Co-authored-by: Pascal Sauer <[email protected]>
    flohump and pascal-sauer authored Sep 26, 2024
    Configuration menu
    Copy the full SHA
    672a0f7 View commit details
    Browse the repository at this point in the history
  6. Update config/default.cfg

    Co-authored-by: Pascal Sauer <[email protected]>
    flohump and pascal-sauer authored Sep 26, 2024
    Configuration menu
    Copy the full SHA
    ea4ed1f View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    13ab4a1 View commit details
    Browse the repository at this point in the history
  8. Merge branch 'develop' of github.com:magpiemodel/magpie into gdp2017

    # Conflicts:
    #	CHANGELOG.md
    #	main.gms
    flohump committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    16cc022 View commit details
    Browse the repository at this point in the history
  9. updated some more currency units

    Debbora Leip committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    b649f77 View commit details
    Browse the repository at this point in the history
  10. macc USD unit corrections

    flohump committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    8f33e04 View commit details
    Browse the repository at this point in the history
  11. Merge branch 'gdp2017' of github.com:caviddhen/magpie into gdp2017

    # Conflicts:
    #	config/default.cfg
    flohump committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    82c5f15 View commit details
    Browse the repository at this point in the history
  12. update in livestock regression and cost share regressions

    Debbora Leip committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    2d2c3d6 View commit details
    Browse the repository at this point in the history
  13. defaults

    flohump committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    9ace917 View commit details
    Browse the repository at this point in the history
  14. defaults

    flohump committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    e4e09b8 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2024

  1. Update config/projects/scenario_config_fsec.csv

    Co-authored-by: Debbora Leip <[email protected]>
    flohump and deleip authored Sep 27, 2024
    Configuration menu
    Copy the full SHA
    bf485ed View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    11de788 View commit details
    Browse the repository at this point in the history
  3. bugfix sticky_labor

    flohump committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    878d2d1 View commit details
    Browse the repository at this point in the history
  4. bugfix warnings

    flohump committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    d797404 View commit details
    Browse the repository at this point in the history
  5. FSEC calib factors

    flohump committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    e24ba0b View commit details
    Browse the repository at this point in the history
  6. fix warnings

    flohump committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    1c467f3 View commit details
    Browse the repository at this point in the history
  7. H16 calib factors

    flohump committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    fa640a9 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2024

  1. update GDP17

    flohump committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    b9a6940 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. update start scripts

    flohump committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    1f5f594 View commit details
    Browse the repository at this point in the history
  2. magpie4 lib version

    flohump committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    52090d1 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e7e62d7 View commit details
    Browse the repository at this point in the history
  4. update scaling factors

    flohump committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    98e6fd1 View commit details
    Browse the repository at this point in the history
  5. start scripts update

    flohump committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    019121a View commit details
    Browse the repository at this point in the history
  6. bugfix

    flohump committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    c5c92aa View commit details
    Browse the repository at this point in the history
  7. scaling update

    flohump committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    60d5bb8 View commit details
    Browse the repository at this point in the history
  8. start scripts

    flohump committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    82fb440 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2024

  1. start script update

    flohump committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    774765e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    95feb29 View commit details
    Browse the repository at this point in the history
  3. Merge pull request magpiemodel#717 from caviddhen/gdp2017

    Update GDP to 2017 base year
    flohump authored Oct 3, 2024
    Configuration menu
    Copy the full SHA
    8ef5c64 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2024

  1. Configuration menu
    Copy the full SHA
    bd5d8d3 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2024

  1. Merge pull request magpiemodel#729 from orichters/develop

    Adjust US$2005 -> 2017 for data read from REMIND
    orichters authored Oct 7, 2024
    Configuration menu
    Copy the full SHA
    3d40b84 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2024

  1. bugfix tree cover on cropland

    flohump committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    064cd47 View commit details
    Browse the repository at this point in the history
  2. added option to turn off future bioplastic demand

    Debbora Leip committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    58cfd17 View commit details
    Browse the repository at this point in the history
  3. set s62_include_bioplastic to default value

    Debbora Leip committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    f00d6a3 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. Merge pull request magpiemodel#731 from deleip/bioplastic_fix

    switch to turn off future bioplastic demand
    deleip authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    c491be7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7d851fb View commit details
    Browse the repository at this point in the history
  3. changelog

    flohump committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    b7fda06 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2024

  1. Configuration menu
    Copy the full SHA
    c98299c View commit details
    Browse the repository at this point in the history
  2. renv 1.0.11

    pascal-sauer committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    f3bea2e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    408062e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8a85fd1 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2024

  1. Merge pull request magpiemodel#732 from flohump/f_ABCDR

    bugfix tree cover on cropland
    flohump authored Oct 17, 2024
    Configuration menu
    Copy the full SHA
    29b3595 View commit details
    Browse the repository at this point in the history
  2. update input files

    flohump committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    1d3b234 View commit details
    Browse the repository at this point in the history
  3. bugfix

    flohump committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    389b22d View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2024

  1. Configuration menu
    Copy the full SHA
    4264621 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    79c633a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    379b088 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2024

  1. Configuration menu
    Copy the full SHA
    9d70e39 View commit details
    Browse the repository at this point in the history
  2. Merge pull request magpiemodel#734 from flohump/f_updateInput

    update input files to rev4.113
    flohump authored Oct 19, 2024
    Configuration menu
    Copy the full SHA
    74e7c2a View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2024

  1. Configuration menu
    Copy the full SHA
    1baf266 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2024

  1. Merge pull request magpiemodel#735 from flohump/f_updateInput

    bugfix warning in highres output script
    flohump authored Oct 22, 2024
    Configuration menu
    Copy the full SHA
    9ac2af8 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2024

  1. Configuration menu
    Copy the full SHA
    63d96f3 View commit details
    Browse the repository at this point in the history
  2. bugfix

    flohump committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    890353b View commit details
    Browse the repository at this point in the history
  3. Update

    flohump committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    435e527 View commit details
    Browse the repository at this point in the history
  4. changelog

    flohump committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    3bf13a8 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2024

  1. Merge pull request magpiemodel#736 from flohump/f_updateInput

    added scenarios to scenario_config
    flohump authored Oct 25, 2024
    Configuration menu
    Copy the full SHA
    7db3bc3 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2024

  1. bugfix age-class

    flohump committed Oct 26, 2024
    Configuration menu
    Copy the full SHA
    1879c5f View commit details
    Browse the repository at this point in the history
  2. bugfix

    flohump committed Oct 26, 2024
    Configuration menu
    Copy the full SHA
    162048e View commit details
    Browse the repository at this point in the history
  3. bugfix

    flohump committed Oct 26, 2024
    Configuration menu
    Copy the full SHA
    d28d56a View commit details
    Browse the repository at this point in the history
  4. update

    flohump committed Oct 26, 2024
    Configuration menu
    Copy the full SHA
    6aec7dc View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2024

  1. test

    flohump committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    3afc331 View commit details
    Browse the repository at this point in the history
  2. test

    flohump committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    3f492da View commit details
    Browse the repository at this point in the history
  3. test

    flohump committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    1abf76d View commit details
    Browse the repository at this point in the history
  4. test

    flohump committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    f2a7044 View commit details
    Browse the repository at this point in the history
  5. test

    flohump committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    a687663 View commit details
    Browse the repository at this point in the history
  6. test

    flohump committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    68a0eac View commit details
    Browse the repository at this point in the history
  7. bugfix

    flohump committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    5ecc0a9 View commit details
    Browse the repository at this point in the history
  8. test

    flohump committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    ae79626 View commit details
    Browse the repository at this point in the history
  9. update

    flohump committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    981756c View commit details
    Browse the repository at this point in the history
  10. age-class update

    flohump committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    47af91c View commit details
    Browse the repository at this point in the history
  11. changelog

    flohump committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    a7bfcf6 View commit details
    Browse the repository at this point in the history
  12. changelog

    flohump committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    7eb9e6b View commit details
    Browse the repository at this point in the history
  13. changelog

    flohump committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    606689d View commit details
    Browse the repository at this point in the history
  14. changelog

    flohump committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    9a09d4c View commit details
    Browse the repository at this point in the history
  15. update

    flohump committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    91b5c6e View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2024

  1. Update modules/28_ageclass/oct24/preloop.gms

    Co-authored-by: Pascal Sauer <[email protected]>
    flohump and pascal-sauer authored Oct 28, 2024
    Configuration menu
    Copy the full SHA
    e826a09 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2024

  1. bugfix output scripts report

    flohump committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    de33503 View commit details
    Browse the repository at this point in the history