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

Bugfix SOM, TC cost and Biodiversity Module + new Biodiversity Module realization #399

Merged
merged 61 commits into from
Jun 3, 2022
Merged

Bugfix SOM, TC cost and Biodiversity Module + new Biodiversity Module realization #399

merged 61 commits into from
Jun 3, 2022

Commits on May 6, 2022

  1. update

    @flohump
    flohump committed May 6, 2022
    Configuration menu
    Copy the full SHA
    04a1da9 View commit details
    Browse the repository at this point in the history

  2. update

    @flohump
    flohump committed May 6, 2022
    Configuration menu
    Copy the full SHA
    8234f82 View commit details
    Browse the repository at this point in the history

  3. update

    @flohump
    flohump committed May 6, 2022
    Configuration menu
    Copy the full SHA
    fb901f1 View commit details
    Browse the repository at this point in the history

  4. update

    @flohump
    flohump committed May 6, 2022
    Configuration menu
    Copy the full SHA
    95ca719 View commit details
    Browse the repository at this point in the history

  5. update

    @flohump
    flohump committed May 6, 2022
    Configuration menu
    Copy the full SHA
    c22927e View commit details
    Browse the repository at this point in the history

Commits on May 7, 2022

  1. update

    @flohump
    flohump committed May 7, 2022
    Configuration menu
    Copy the full SHA
    aeeea0d View commit details
    Browse the repository at this point in the history

  2. update

    @flohump
    flohump committed May 7, 2022
    Configuration menu
    Copy the full SHA
    dbd8216 View commit details
    Browse the repository at this point in the history

  3. update

    @flohump
    flohump committed May 7, 2022
    Configuration menu
    Copy the full SHA
    1e9bbd0 View commit details
    Browse the repository at this point in the history

  4. update

    @flohump
    flohump committed May 7, 2022
    Configuration menu
    Copy the full SHA
    74b7f4a View commit details
    Browse the repository at this point in the history

  5. update

    @flohump
    flohump committed May 7, 2022
    Configuration menu
    Copy the full SHA
    a49c74b View commit details
    Browse the repository at this point in the history

  6. update

    @flohump
    flohump committed May 7, 2022
    Configuration menu
    Copy the full SHA
    509f50b View commit details
    Browse the repository at this point in the history

  7. update

    @flohump
    flohump committed May 7, 2022
    Configuration menu
    Copy the full SHA
    9657494 View commit details
    Browse the repository at this point in the history

  8. update

    @flohump
    flohump committed May 7, 2022
    Configuration menu
    Copy the full SHA
    4ee82a5 View commit details
    Browse the repository at this point in the history

  9. update

    @flohump
    flohump committed May 7, 2022
    Configuration menu
    Copy the full SHA
    ddc0f31 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2022

  1. update

    @flohump
    flohump committed May 8, 2022
    Configuration menu
    Copy the full SHA
    911255f View commit details
    Browse the repository at this point in the history

  2. update

    @flohump
    flohump committed May 8, 2022
    Configuration menu
    Copy the full SHA
    6295b6a View commit details
    Browse the repository at this point in the history

  3. update

    @flohump
    flohump committed May 8, 2022
    Configuration menu
    Copy the full SHA
    c75bf3b View commit details
    Browse the repository at this point in the history

  4. update

    @flohump
    flohump committed May 8, 2022
    Configuration menu
    Copy the full SHA
    80fef69 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2022

  1. update

    @flohump
    flohump committed May 9, 2022
    Configuration menu
    Copy the full SHA
    e66a231 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2022

  1. update

    @flohump
    flohump committed May 11, 2022
    Configuration menu
    Copy the full SHA
    d2cec7a View commit details
    Browse the repository at this point in the history

  2. update

    @flohump
    flohump committed May 11, 2022
    Configuration menu
    Copy the full SHA
    f00c373 View commit details
    Browse the repository at this point in the history

  3. update

    @flohump
    flohump committed May 11, 2022
    Configuration menu
    Copy the full SHA
    5ab7740 View commit details
    Browse the repository at this point in the history

  4. update

    @flohump
    flohump committed May 11, 2022
    Configuration menu
    Copy the full SHA
    f3bc210 View commit details
    Browse the repository at this point in the history

  5. update

    @flohump
    flohump committed May 11, 2022
    Configuration menu
    Copy the full SHA
    f5cd8dc View commit details
    Browse the repository at this point in the history

  6. update

    @flohump
    flohump committed May 11, 2022
    Configuration menu
    Copy the full SHA
    659f06f View commit details
    Browse the repository at this point in the history

  7. update

    @flohump
    flohump committed May 11, 2022
    Configuration menu
    Copy the full SHA
    212a137 View commit details
    Browse the repository at this point in the history

  8. update

    @flohump
    flohump committed May 11, 2022
    Configuration menu
    Copy the full SHA
    b44b49d View commit details
    Browse the repository at this point in the history

  9. update

    @flohump
    flohump committed May 11, 2022
    Configuration menu
    Copy the full SHA
    f605d8a View commit details
    Browse the repository at this point in the history

Commits on May 12, 2022

  1. test

    @flohump
    flohump committed May 12, 2022
    Configuration menu
    Copy the full SHA
    43014b5 View commit details
    Browse the repository at this point in the history

  2. update

    @flohump
    flohump committed May 12, 2022
    Configuration menu
    Copy the full SHA
    7f21e35 View commit details
    Browse the repository at this point in the history

  3. update

    @flohump
    flohump committed May 12, 2022
    Configuration menu
    Copy the full SHA
    3cab683 View commit details
    Browse the repository at this point in the history

  4. update

    @flohump
    flohump committed May 12, 2022
    Configuration menu
    Copy the full SHA
    e26a2d0 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2022

  1. update

    @flohump
    flohump committed May 18, 2022
    Configuration menu
    Copy the full SHA
    fc267c9 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2022

  1. update

    @flohump
    flohump committed May 19, 2022
    Configuration menu
    Copy the full SHA
    bd48a19 View commit details
    Browse the repository at this point in the history

  2. udpate

    @flohump
    flohump committed May 19, 2022
    Configuration menu
    Copy the full SHA
    b0bb952 View commit details
    Browse the repository at this point in the history

  3. update

    @flohump
    flohump committed May 19, 2022
    Configuration menu
    Copy the full SHA
    ea82ad2 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2022

  1. Merge branch 'f_WDPABaselineNew' of github.com:pvjeetze/magpie into f… 

    …_BIITarget
    @flohump
    flohump committed May 31, 2022
    Configuration menu
    Copy the full SHA
    069d71d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of github.com:magpiemodel/magpie into f_BIITarget

    @flohump
    flohump committed May 31, 2022
    Configuration menu
    Copy the full SHA
    2b9e482 View commit details
    Browse the repository at this point in the history

  3. bugfixes and improvments

    @flohump
    flohump committed May 31, 2022
    Configuration menu
    Copy the full SHA
    bf8f846 View commit details
    Browse the repository at this point in the history

  4. update

    @flohump
    flohump committed May 31, 2022
    Configuration menu
    Copy the full SHA
    7c502e7 View commit details
    Browse the repository at this point in the history

  5. bugfix

    @flohump
    flohump committed May 31, 2022
    Configuration menu
    Copy the full SHA
    6bf36b2 View commit details
    Browse the repository at this point in the history

  6. bugfix

    @flohump
    flohump committed May 31, 2022
    Configuration menu
    Copy the full SHA
    d5f2ca6 View commit details
    Browse the repository at this point in the history

  7. changelog

    @flohump
    flohump committed May 31, 2022
    Configuration menu
    Copy the full SHA
    ebcf820 View commit details
    Browse the repository at this point in the history

  8. bugfix

    @flohump
    flohump committed May 31, 2022
    Configuration menu
    Copy the full SHA
    1cf46da View commit details
    Browse the repository at this point in the history

  9. bugfix

    @flohump
    flohump committed May 31, 2022
    Configuration menu
    Copy the full SHA
    2de1ee4 View commit details
    Browse the repository at this point in the history

  10. changelog

    @flohump
    flohump committed May 31, 2022
    Configuration menu
    Copy the full SHA
    0c3bf54 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2022

  1. update additional data revision 4.21

    @flohump
    flohump committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    a7555c9 View commit details
    Browse the repository at this point in the history

  2. update tc cost bound + default values

    @flohump
    flohump committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    70a6f0a View commit details
    Browse the repository at this point in the history

  3. bugfix

    @flohump
    flohump committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    f498011 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2022

  1. changelog

    @flohump
    flohump committed Jun 2, 2022
    Configuration menu
    Copy the full SHA
    9549d06 View commit details
    Browse the repository at this point in the history

  2. update scenario_config.csv tgz files for RCPs

    @flohump
    flohump committed Jun 2, 2022
    Configuration menu
    Copy the full SHA
    2acc37e View commit details
    Browse the repository at this point in the history

  3. update: bii target formuation

    @flohump
    flohump committed Jun 2, 2022
    Configuration menu
    Copy the full SHA
    ca1f9af View commit details
    Browse the repository at this point in the history

  4. test

    @flohump
    flohump committed Jun 2, 2022
    Configuration menu
    Copy the full SHA
    1554602 View commit details
    Browse the repository at this point in the history

  5. update

    @flohump
    flohump committed Jun 2, 2022
    Configuration menu
    Copy the full SHA
    895ecb7 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2022

  1. final update

    @flohump
    flohump committed Jun 3, 2022
    Configuration menu
    Copy the full SHA
    c8d78d5 View commit details
    Browse the repository at this point in the history

  2. update

    @flohump
    flohump committed Jun 3, 2022
    Configuration menu
    Copy the full SHA
    41a1b4c View commit details
    Browse the repository at this point in the history

  3. Update config/default.cfg 

    Co-authored-by: pvjeetze <50408549+pvjeetze@users.noreply.github.com>
    @flohump @pvjeetze
    flohump and pvjeetze committed Jun 3, 2022
    Configuration menu
    Copy the full SHA
    71a52d7 View commit details
    Browse the repository at this point in the history

  4. Update config/default.cfg 

    Co-authored-by: pvjeetze <50408549+pvjeetze@users.noreply.github.com>
    @flohump @pvjeetze
    flohump and pvjeetze committed Jun 3, 2022
    Configuration menu
    Copy the full SHA
    6213850 View commit details
    Browse the repository at this point in the history

  5. Update modules/44_biodiversity/bii_target/presolve.gms 

    Co-authored-by: pvjeetze <50408549+pvjeetze@users.noreply.github.com>
    @flohump @pvjeetze
    flohump and pvjeetze committed Jun 3, 2022
    Configuration menu
    Copy the full SHA
    aa9ae9c View commit details
    Browse the repository at this point in the history

  6. bugfix

    @flohump
    flohump committed Jun 3, 2022
    Configuration menu
    Copy the full SHA
    792b22d View commit details
    Browse the repository at this point in the history

  7. bugfix

    @flohump
    flohump committed Jun 3, 2022
    Configuration menu
    Copy the full SHA
    6778c13 View commit details
    Browse the repository at this point in the history