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

merge develop #53

Merged
merged 951 commits into from
Apr 10, 2024
Merged

merge develop #53

merged 951 commits into from
Apr 10, 2024
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Feb 7, 2024

  1. removed unnecessary display statements

    @FelicitasBeier
    FelicitasBeier committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    e142384 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'EATdietModel' of github.com:FelicitasBeier/magpie into … 

    …EATdietModel
    @FelicitasBeier
    FelicitasBeier committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    a99409e View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2024

  1. improvements recommended by Bennis review

    @FelicitasBeier
    FelicitasBeier committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    89854b6 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2024

  1. added roots switch to scenario config files

    @FelicitasBeier
    FelicitasBeier committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    c95f929 View commit details
    Browse the repository at this point in the history

  2. added new column with EATLancet 2 diet for coupled runs in magpie sce… 

    …nario config
    @FelicitasBeier
    FelicitasBeier committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    c81d111 View commit details
    Browse the repository at this point in the history

  3. added productivity increase in EATLancet 2 diet scenario

    @FelicitasBeier
    FelicitasBeier committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    0fc7724 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2024

  1. Update CHANGELOG.md 

    Update changelog
    @FelicitasBeier
    FelicitasBeier authored Feb 15, 2024
    Configuration menu
    Copy the full SHA
    28393d0 View commit details
    Browse the repository at this point in the history

  2. Update default.cfg 

    Added reference to Springmann et al. 2018
    @FelicitasBeier
    FelicitasBeier authored Feb 15, 2024
    Configuration menu
    Copy the full SHA
    af7249d View commit details
    Browse the repository at this point in the history

  3. Update literature.bib 

    added springmann reference
    @FelicitasBeier
    FelicitasBeier authored Feb 15, 2024
    Configuration menu
    Copy the full SHA
    003c3e7 View commit details
    Browse the repository at this point in the history

  4. Update default.cfg

    @FelicitasBeier
    FelicitasBeier authored Feb 15, 2024
    Configuration menu
    Copy the full SHA
    156bed0 View commit details
    Browse the repository at this point in the history

  5. Update default.cfg 

    updated additional data
    @FelicitasBeier
    FelicitasBeier authored Feb 15, 2024
    Configuration menu
    Copy the full SHA
    1f2f969 View commit details
    Browse the repository at this point in the history

  6. Update default.cfg

    @FelicitasBeier
    FelicitasBeier authored Feb 15, 2024
    Configuration menu
    Copy the full SHA
    9a673b9 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2024

  1. updated EAT2p0 start script

    @FelicitasBeier
    FelicitasBeier committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    34b9621 View commit details
    Browse the repository at this point in the history

  2. Update default.cfg

    @FelicitasBeier
    FelicitasBeier authored Feb 19, 2024
    Configuration menu
    Copy the full SHA
    1f4add9 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'EATdietModel' of github.com:FelicitasBeier/magpie into … 

    …EATdietModel
    @FelicitasBeier
    FelicitasBeier committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    9cbd71f View commit details
    Browse the repository at this point in the history

  4. small fixed requested in the review from Isabelle and renaming to sti… 

    …ck to the coding etiquette
    @FelicitasBeier
    FelicitasBeier committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    efefb22 View commit details
    Browse the repository at this point in the history

  5. changed SEALS reporting and underlying function

    @pvjeetze
    pvjeetze committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    d47d7cb View commit details
    Browse the repository at this point in the history

  6. changelog

    @pvjeetze
    pvjeetze committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    8934a35 View commit details
    Browse the repository at this point in the history

  7. update nuts correction based on Isabelles review

    @FelicitasBeier
    FelicitasBeier committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    fa1c114 View commit details
    Browse the repository at this point in the history

  8. bugfixes

    @FelicitasBeier
    FelicitasBeier committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    fb8fad1 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2024

  1. Merge pull request magpiemodel#629 from pvjeetze/develop 

    changed SEALS reporting and underlying function
    @pvjeetze
    pvjeetze authored Feb 20, 2024
    Configuration menu
    Copy the full SHA
    8028dff View commit details
    Browse the repository at this point in the history

  2. bugfixes

    @FelicitasBeier
    FelicitasBeier committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    9917c46 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2024

  1. Merge branch 'magpiemodel:develop' into develop

    @FelicitasBeier
    FelicitasBeier authored Feb 21, 2024
    Configuration menu
    Copy the full SHA
    faab9ff View commit details
    Browse the repository at this point in the history

  2. merged develop into EAT branch

    @FelicitasBeier
    FelicitasBeier committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    8062a89 View commit details
    Browse the repository at this point in the history

  3. memory spike avoiding ncdf4 based nc writing

    @pascal-sauer
    pascal-sauer committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    6774271 View commit details
    Browse the repository at this point in the history

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

    @pascal-sauer
    pascal-sauer committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    0ef6619 View commit details
    Browse the repository at this point in the history

  5. changelog

    @pascal-sauer
    pascal-sauer committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    80383c3 View commit details
    Browse the repository at this point in the history

  6. reduce disaggregation.R memory footprint with rm

    @pascal-sauer
    pascal-sauer committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    4eaa922 View commit details
    Browse the repository at this point in the history

  7. write terra-compatible nc files

    @pascal-sauer
    pascal-sauer committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    d30d13a View commit details
    Browse the repository at this point in the history

  8. use compression

    @pascal-sauer
    pascal-sauer committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    37fb30f View commit details
    Browse the repository at this point in the history

  9. code cleanup: remove unused scalars

    @FelicitasBeier
    FelicitasBeier committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    42ce67c View commit details
    Browse the repository at this point in the history

  10. Merge branch 'EATdietModel' of github.com:FelicitasBeier/magpie into … 

    …EATdietModel
    @FelicitasBeier
    FelicitasBeier committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    787dc29 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2024

  1. updated comment in default.cfg

    @FelicitasBeier
    FelicitasBeier committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    4b4c75b View commit details
    Browse the repository at this point in the history

  2. bugfix v21_manna_from_heaven highres.R

    @flohump
    flohump committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    4903474 View commit details
    Browse the repository at this point in the history

  3. added switch to default.cfg

    @flohump
    flohump committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    19b606e View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2024

  1. Merge pull request magpiemodel#625 from FelicitasBeier/EATdietModel 

    New EAT Lancet Diet Implementation
    @FelicitasBeier
    FelicitasBeier authored Feb 24, 2024
    Configuration menu
    Copy the full SHA
    6a9f24a View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2024

  1. bugfix s21_manna_from_heaven

    @flohump
    flohump committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    c78a8fa View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2024

  1. Merge pull request magpiemodel#631 from flohump/develop 

    bugfix v21_manna_from_heaven highres.R
    @flohump
    flohump authored Feb 26, 2024
    Configuration menu
    Copy the full SHA
    94339ec View commit details
    Browse the repository at this point in the history

  2. updated additional data in scenario_fsec config file

    @FelicitasBeier
    FelicitasBeier committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    3129c4a View commit details
    Browse the repository at this point in the history

  3. use new magclass nc writing

    @pascal-sauer
    pascal-sauer committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    2e08d55 View commit details
    Browse the repository at this point in the history

  4. fix disaggregation_LUH2.R

    @pascal-sauer
    pascal-sauer committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    c8aa381 View commit details
    Browse the repository at this point in the history

  5. remove yield calibration from FSEC config

    @FelicitasBeier
    FelicitasBeier committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    7f8fa02 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

  1. update scenario config to rev 4.99 input data

    @FelicitasBeier
    FelicitasBeier committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    fdecc79 View commit details
    Browse the repository at this point in the history

  2. fixes in disaggregation_LUH2.R

    @pascal-sauer
    pascal-sauer committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    ba540f0 View commit details
    Browse the repository at this point in the history

  3. changelog

    @pascal-sauer
    pascal-sauer committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    78d4380 View commit details
    Browse the repository at this point in the history

  4. Set yieldcalib back to 1 in FSEC for now

    @FelicitasBeier
    FelicitasBeier authored Feb 27, 2024
    Configuration menu
    Copy the full SHA
    3b310cb View commit details
    Browse the repository at this point in the history

  5. Merge pull request magpiemodel#632 from FelicitasBeier/develop 

    Small fixes before release
    @FelicitasBeier
    FelicitasBeier authored Feb 27, 2024
    Configuration menu
    Copy the full SHA
    326a5b5 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2024

  1. Merge pull request magpiemodel#630 from pascal-sauer/develop 

    ncdf4-based nc writing for disaggregation.R to avoid memory spike
    @pascal-sauer
    pascal-sauer authored Feb 28, 2024
    Configuration menu
    Copy the full SHA
    16c6786 View commit details
    Browse the repository at this point in the history

  2. magpie release 4.7.1

    @pascal-sauer
    pascal-sauer committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    66b0d87 View commit details
    Browse the repository at this point in the history

  3. added input files

    @flohump
    flohump committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    32f577b View commit details
    Browse the repository at this point in the history

  4. PR valdiation_cell

    @emolinab
    emolinab committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    2105696 View commit details
    Browse the repository at this point in the history

  5. Merge pull request magpiemodel#634 from pascal-sauer/develop 

    MAgPIE release 4.7.1
    @pascal-sauer
    pascal-sauer authored Feb 28, 2024
    Configuration menu
    Copy the full SHA
    421b4f6 View commit details
    Browse the repository at this point in the history

  6. read file

    @flohump
    flohump committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    b6c7bde View commit details
    Browse the repository at this point in the history

Commits on Feb 29, 2024

  1. Merge pull request magpiemodel#635 from emolinab/develop 

    Validation cell pdf
    @emolinab
    emolinab authored Feb 29, 2024
    Configuration menu
    Copy the full SHA
    b2c2e31 View commit details
    Browse the repository at this point in the history

  2. AgroForestry implementation

    @flohump
    flohump committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    5c444f5 View commit details
    Browse the repository at this point in the history

  3. AgroForestry implementation in default.cfg

    @flohump
    flohump committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    7e037b0 View commit details
    Browse the repository at this point in the history

  4. fix tabs to spaces

    @FelicitasBeier
    FelicitasBeier committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    4e5186f View commit details
    Browse the repository at this point in the history

  5. test

    @flohump
    flohump committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    7bd65fe View commit details
    Browse the repository at this point in the history

  6. reverting back

    @flohump
    flohump committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    31073df View commit details
    Browse the repository at this point in the history

  7. implemented cropland relocation at the aggregated level in response t… 

    …o SNV policy
    @pvjeetze
    pvjeetze committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    eb31104 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2024

  1. bugfix in agmip output script

    @FelicitasBeier
    FelicitasBeier committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    2c28ce0 View commit details
    Browse the repository at this point in the history

  2. removed AgroForestry code

    @flohump
    flohump committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    4f4cb7d View commit details
    Browse the repository at this point in the history

  3. revert

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

  4. revert

    @flohump
    flohump committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    948e050 View commit details
    Browse the repository at this point in the history

  5. revert

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

  6. revert

    @flohump
    flohump committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    91185de View commit details
    Browse the repository at this point in the history

  7. revert

    @flohump
    flohump committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    557c97a View commit details
    Browse the repository at this point in the history

  8. description fixes

    @pvjeetze
    pvjeetze committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    c189d33 View commit details
    Browse the repository at this point in the history

  9. changelog

    @pvjeetze
    pvjeetze committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    f7656ac View commit details
    Browse the repository at this point in the history

  10. moved PAL scenario from energy to humanWelfare (institutions)

    @FelicitasBeier
    FelicitasBeier committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    59aab55 View commit details
    Browse the repository at this point in the history

  11. updated FSDP_collect: added Davids variables and the status from revi… 

    …sion branch
    @FelicitasBeier
    FelicitasBeier committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    d1bc943 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2024

  1. added labor productivity scenarios as sensitivity check for FSEC revi… 

    …sion
    @FelicitasBeier
    FelicitasBeier committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    3441ff4 View commit details
    Browse the repository at this point in the history

  2. switched off yield calib for FSEC runs

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

  3. bugfix: missing comma in fsec.R

    @FelicitasBeier
    FelicitasBeier committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    3d0c41c View commit details
    Browse the repository at this point in the history

  4. corrected typo in FSEC scenario config calibration tgz

    @FelicitasBeier
    FelicitasBeier committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    4767d06 View commit details
    Browse the repository at this point in the history

  5. merge master into develop

    @pascal-sauer
    pascal-sauer committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    f02e2ae View commit details
    Browse the repository at this point in the history

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

    @pascal-sauer
    pascal-sauer committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    2d4f249 View commit details
    Browse the repository at this point in the history

  7. Merge pull request magpiemodel#640 from pascal-sauer/develop 

    merge master into develop
    @pascal-sauer
    pascal-sauer authored Mar 4, 2024
    Configuration menu
    Copy the full SHA
    b1e64c1 View commit details
    Browse the repository at this point in the history

  8. add capitalization exclusion list for gms::codeCheck

    @fbenke-pik
    fbenke-pik committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    d3a66ff View commit details
    Browse the repository at this point in the history

  9. Merge branch 'magpiemodel:develop' into develop

    @FelicitasBeier
    FelicitasBeier authored Mar 4, 2024
    Configuration menu
    Copy the full SHA
    bdb569d View commit details
    Browse the repository at this point in the history

  10. removed not needed iso files

    @flohump
    flohump committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    111fb07 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2024

  1. change 1e-10 to 1e-6 for if condition of peatland equation

    @FelicitasBeier
    FelicitasBeier committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    e1ba1cc View commit details
    Browse the repository at this point in the history

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

    @FelicitasBeier
    FelicitasBeier committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    1ee0fd6 View commit details
    Browse the repository at this point in the history

  3. rename codeCheck file

    @fbenke-pik
    fbenke-pik committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    d805903 View commit details
    Browse the repository at this point in the history

  4. update CHANGELOG.md

    @fbenke-pik
    fbenke-pik committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    c79ab5d View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop'

    @fbenke-pik
    fbenke-pik committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    fc9ec5e View commit details
    Browse the repository at this point in the history

  6. update CHANGELOG

    @fbenke-pik
    fbenke-pik committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    b381cc5 View commit details
    Browse the repository at this point in the history

  7. Merge pull request magpiemodel#641 from fbenke-pik/master 

    add capitalization exclusion list for gms::codeCheck
    @fbenke-pik
    fbenke-pik authored Mar 5, 2024
    Configuration menu
    Copy the full SHA
    90e9ca4 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'develop' of github.com:magpiemodel/magpie into f_SNV

    @flohump
    flohump committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    b7ff908 View commit details
    Browse the repository at this point in the history

  9. sm_fix_cc correction, which makes sure that before 2020 the same valu… 

    …es are used irrespective of the choosen RCP
    @flohump
    flohump committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    577b558 View commit details
    Browse the repository at this point in the history

  10. si set removed

    @flohump
    flohump committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    ac23b7a View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2024

  1. minor fixes

    @pvjeetze
    pvjeetze committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    1eabaf5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'f_SNV' of https://github.com/flohump/magpie into f_SNV 

    Merge branch 'f_SNV' of https://github.com/flohump/magpie into f_SNV
    @pvjeetze
    pvjeetze committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    06980d0 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2024

  1. changed som if condition to 1e-15

    @FelicitasBeier
    FelicitasBeier committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    da72373 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'magpiemodel:develop' into develop

    @FelicitasBeier
    FelicitasBeier authored Mar 7, 2024
    Configuration menu
    Copy the full SHA
    8a315a1 View commit details
    Browse the repository at this point in the history

  3. changed protection scenario to 30by30 in FSEC and added additional ou… 

    …tput scripts to EAT project for deep dive analysis
    @FelicitasBeier
    FelicitasBeier committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    4737d9a View commit details
    Browse the repository at this point in the history

  4. bugfix: we want the NAs included in the mif for AgMIP reporting becau… 

    …se of irrigated bioenergy
    @FelicitasBeier
    FelicitasBeier committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    59dd8f2 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2024

  1. added GFDL climate scenario preprocessing to 2p6 scenario in eat star… 

    …t script
    @FelicitasBeier
    FelicitasBeier committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    52010fc View commit details
    Browse the repository at this point in the history

  2. changed if conditions to 1e-10 in peatland and carbon modules

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

  3. use historic values for factor requirements for livestock and 2010 as… 

    … calibration year
    Debbora Leip committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    c68117d View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2024

  1. main.gms revert

    @pvjeetze
    pvjeetze committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    53d7594 View commit details
    Browse the repository at this point in the history

  2. main.gms revert

    @pvjeetze
    pvjeetze committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    e44fded View commit details
    Browse the repository at this point in the history

  3. Merge pull request magpiemodel#637 from flohump/f_SNV 

    Improved cropland relocation in response to SNV policy & sm_fix_cc correction
    @pvjeetze
    pvjeetze authored Mar 11, 2024
    Configuration menu
    Copy the full SHA
    f540330 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' of github.com:magpiemodel/magpie into f_histLi… 

    …vstFacReqAndCalibYear
    Debbora Leip committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    fbe9731 View commit details
    Browse the repository at this point in the history

  5. added set missing in SNV PR

    Debbora Leip committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    f466f79 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2024

  1. updated input data revision

    Debbora Leip committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    51f57b5 View commit details
    Browse the repository at this point in the history

  2. updated changelog

    Debbora Leip committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    bc7fc25 View commit details
    Browse the repository at this point in the history

  3. fix csv separator in scenario configs

    Debbora Leip committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    1508e0a View commit details
    Browse the repository at this point in the history

  4. second try fixing the csvs...

    Debbora Leip committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    dc9c178 View commit details
    Browse the repository at this point in the history

  5. updated additional data

    Debbora Leip committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    015349a View commit details
    Browse the repository at this point in the history

  6. added indicators to FSDP_collect

    @FelicitasBeier
    FelicitasBeier committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    d9290c3 View commit details
    Browse the repository at this point in the history

  7. revert update in additional data as that also depends on changes in P… 

    …R 639
    Debbora Leip committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    edcbef9 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2024

  1. Merge branch 'magpiemodel:develop' into develop

    @FelicitasBeier
    FelicitasBeier authored Mar 13, 2024
    Configuration menu
    Copy the full SHA
    7495110 View commit details
    Browse the repository at this point in the history

  2. commented out lines that will be necessary only later

    @FelicitasBeier
    FelicitasBeier committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    3b20103 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of github.com:FelicitasBeier/magpie into develop

    @FelicitasBeier
    FelicitasBeier committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    24c9c14 View commit details
    Browse the repository at this point in the history

  4. only use historic livst factor requirements if switch is set to regio… 

    …nal factor requirements
    Debbora Leip committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    8a25ddc View commit details
    Browse the repository at this point in the history

  5. use regression values for period without historic factor requirement … 

    …data
    Debbora Leip committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    0a4710e View commit details
    Browse the repository at this point in the history

  6. Merge pull request magpiemodel#643 from deleip/f_histLivstFacReqAndCa… 

    …libYear

update of livestock factor requirements
    @deleip
    deleip authored Mar 13, 2024
    Configuration menu
    Copy the full SHA
    7d39948 View commit details
    Browse the repository at this point in the history

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

    @FelicitasBeier
    FelicitasBeier committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    78e94e3 View commit details
    Browse the repository at this point in the history

  8. updated FSEC version number

    @FelicitasBeier
    FelicitasBeier committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    62855d1 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2024

  1. updated calibration

    @FelicitasBeier
    FelicitasBeier committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    4706b8e View commit details
    Browse the repository at this point in the history

  2. updated changelog

    @FelicitasBeier
    FelicitasBeier committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    5a07b63 View commit details
    Browse the repository at this point in the history

  3. bugfix in scenario_fsec config related to climate labor shocks

    @FelicitasBeier
    FelicitasBeier committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    b83c85c View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2024

  1. fix for roundwood issue in MEA

    @FelicitasBeier
    FelicitasBeier committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    b2dab9b View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2024

  1. wood trade

    @flohump
    flohump committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    4c0b838 View commit details
    Browse the repository at this point in the history

  2. v2

    @flohump
    flohump committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    174acc1 View commit details
    Browse the repository at this point in the history

  3. timber trade

    @flohump
    flohump committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    ca98fc4 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2024

  1. test

    @flohump
    flohump committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    9ddf689 View commit details
    Browse the repository at this point in the history

  2. test

    @flohump
    flohump committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    6efc6fe View commit details
    Browse the repository at this point in the history

  3. update

    @flohump
    flohump committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    0011e55 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2024

  1. test

    @flohump
    flohump committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    b63ce6d View commit details
    Browse the repository at this point in the history

  2. bugfix

    @flohump
    flohump committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    7b90d5d View commit details
    Browse the repository at this point in the history

  3. bugfix in FSDP_collect

    @FelicitasBeier
    FelicitasBeier committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    0b38710 View commit details
    Browse the repository at this point in the history

  4. test

    @flohump
    flohump committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    258c5ee View commit details
    Browse the repository at this point in the history

  5. bugfix

    @flohump
    flohump committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    6130b40 View commit details
    Browse the repository at this point in the history

  6. updated fsec scripts

    @FelicitasBeier
    FelicitasBeier committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    fc35c7f View commit details
    Browse the repository at this point in the history

  7. activated yield calibration for FSEC runs

    @FelicitasBeier
    FelicitasBeier committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    32256fd View commit details
    Browse the repository at this point in the history

  8. changed title of calibration file

    @FelicitasBeier
    FelicitasBeier committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    22d4e4c View commit details
    Browse the repository at this point in the history

  9. Merge pull request magpiemodel#636 from FelicitasBeier/develop 

    Updated FSEC and EAT Lancet 2.0 start scripts
    @FelicitasBeier
    FelicitasBeier authored Mar 18, 2024
    Configuration menu
    Copy the full SHA
    b8af6d8 View commit details
    Browse the repository at this point in the history

  10. reverting

    @flohump
    flohump committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    f8a4ef3 View commit details
    Browse the repository at this point in the history

  11. PR

    @flohump
    flohump committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    b47a021 View commit details
    Browse the repository at this point in the history

  12. fix

    @flohump
    flohump committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    dd2455a View commit details
    Browse the repository at this point in the history

  13. update

    @flohump
    flohump committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    9ce9965 View commit details
    Browse the repository at this point in the history

  14. changelog

    @flohump
    flohump committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    5c57247 View commit details
    Browse the repository at this point in the history

  15. default settings

    @flohump
    flohump committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    56da8d7 View commit details
    Browse the repository at this point in the history

  16. bugfix

    @flohump
    flohump committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    5cb53e7 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. revert

    @flohump
    flohump committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    51ff179 View commit details
    Browse the repository at this point in the history

  2. fix

    @flohump
    flohump committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    7bbb9bb View commit details
    Browse the repository at this point in the history

  3. fix

    @flohump
    flohump committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    d7418ce View commit details
    Browse the repository at this point in the history

  4. fix

    @flohump
    flohump committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    c5a2c60 View commit details
    Browse the repository at this point in the history

  5. fix

    @flohump
    flohump committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    beec1a9 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2024

  1. test

    @flohump
    flohump committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    6bf5ae5 View commit details
    Browse the repository at this point in the history

  2. update

    @flohump
    flohump committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    a2b4bdb View commit details
    Browse the repository at this point in the history

  3. log

    @flohump
    flohump committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    5d008ee View commit details
    Browse the repository at this point in the history

  4. bugfixes

    @flohump
    flohump committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    9251061 View commit details
    Browse the repository at this point in the history

  5. update

    @flohump
    flohump committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    35e3491 View commit details
    Browse the repository at this point in the history

  6. changelog and output scripts

    @flohump
    flohump committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    2776734 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2024

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

    # Conflicts:
#	scripts/output/projects/FSDP_collect.R
    @flohump
    flohump committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    483dbfd View commit details
    Browse the repository at this point in the history

  2. Merge pull request magpiemodel#645 from flohump/f_woodtrade 

    Bugfix Trade Timber Products
    @flohump
    flohump authored Mar 21, 2024
    Configuration menu
    Copy the full SHA
    96ad158 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2024

  1. bugfix solve

    @flohump
    flohump committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    97bd7ee View commit details
    Browse the repository at this point in the history

  2. changelod

    @flohump
    flohump committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    ee597da View commit details
    Browse the repository at this point in the history

  3. fix

    @flohump
    flohump committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    b2e2614 View commit details
    Browse the repository at this point in the history

  4. calib factors

    @flohump
    flohump committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    b9f3c35 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2024

  1. update

    @flohump
    flohump committed Mar 23, 2024
    Configuration menu
    Copy the full SHA
    0acb60b View commit details
    Browse the repository at this point in the history

  2. land conversion cost calibration update

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

  3. priority

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

  4. fix

    @flohump
    flohump committed Mar 23, 2024
    Configuration menu
    Copy the full SHA
    adbf280 View commit details
    Browse the repository at this point in the history

  5. update calib

    @flohump
    flohump committed Mar 23, 2024
    Configuration menu
    Copy the full SHA
    497638c View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2024

  1. bugfix

    @flohump
    flohump committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    bc94b1b View commit details
    Browse the repository at this point in the history

  2. update land conversion cost calibration

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

  3. updates

    @flohump
    flohump committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    e4eacf2 View commit details
    Browse the repository at this point in the history

  4. doc

    @flohump
    flohump committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    573ad7e View commit details
    Browse the repository at this point in the history

  5. fsec BH_IFL

    @flohump
    flohump committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    b350a7c View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2024

  1. slightly modified BII reporting in FSDP_collect & additional reportin… 

    …g for SEALS
    @pvjeetze
    pvjeetze committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    47b302b View commit details
    Browse the repository at this point in the history

  2. removed extra scripts

    @pvjeetze
    pvjeetze committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    8679da0 View commit details
    Browse the repository at this point in the history

  3. changelog

    @pvjeetze
    pvjeetze committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    96183c5 View commit details
    Browse the repository at this point in the history

  4. FSDP_collect script update

    @flohump
    flohump committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    1758ab4 View commit details
    Browse the repository at this point in the history

  5. FSDP_collect script update

    @flohump
    flohump committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    9013755 View commit details
    Browse the repository at this point in the history

  6. Move lowpass filter to other function for consistency between reporte… 

    …d and used calibration factors.
    @flohump
    flohump committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    04229a9 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2024

  1. update calibration factors

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

  2. Merge pull request magpiemodel#647 from pvjeetze/develop 

    Changed BII reporting in FSDP collect + minor addition in SEALS reporting script
    @pvjeetze
    pvjeetze authored Mar 26, 2024
    Configuration menu
    Copy the full SHA
    c4c266b View commit details
    Browse the repository at this point in the history

  3. update rev 4.103

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

  4. Merge branch 'develop' of github.com:magpiemodel/magpie into f_woodtrade

    @flohump
    flohump committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    3246c13 View commit details
    Browse the repository at this point in the history

  5. clean up config

    @flohump
    flohump committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    12689ee View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. Update rds_report.R 

    as.quitte(mif) changed the naming from "GLO" to "World", which conflicts with shinyapp
    @bodirsky
    bodirsky authored Mar 27, 2024
    Configuration menu
    Copy the full SHA
    a1dc8f7 View commit details
    Browse the repository at this point in the history

  2. removing jump into fully grown forest in the last age class

    @bodirsky
    bodirsky authored Mar 27, 2024
    Configuration menu
    Copy the full SHA
    61e008c View commit details
    Browse the repository at this point in the history

  3. Update CHANGELOG.md

    @bodirsky
    bodirsky authored Mar 27, 2024
    Configuration menu
    Copy the full SHA
    6b68750 View commit details
    Browse the repository at this point in the history

  4. changing settings for conopt

    @bodirsky
    bodirsky authored Mar 27, 2024
    Configuration menu
    Copy the full SHA
    aa69df2 View commit details
    Browse the repository at this point in the history

  5. cfg$gms$s35_secdf_distribution <- 2 

    age classes reactivated for secondary forest
    @bodirsky
    bodirsky authored Mar 27, 2024
    Configuration menu
    Copy the full SHA
    a3cd517 View commit details
    Browse the repository at this point in the history

  6. Update CHANGELOG.md

    @bodirsky
    bodirsky authored Mar 27, 2024
    Configuration menu
    Copy the full SHA
    37fdc5b View commit details
    Browse the repository at this point in the history

  7. Update fsec.R

    @bodirsky
    bodirsky authored Mar 27, 2024
    Configuration menu
    Copy the full SHA
    79fdbf1 View commit details
    Browse the repository at this point in the history

  8. Change order of scnearios, starting with most important first

    @bodirsky
    bodirsky authored Mar 27, 2024
    Configuration menu
    Copy the full SHA
    87fded4 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. update solver setting optfile

    @flohump
    flohump committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    72883be View commit details
    Browse the repository at this point in the history

  2. dont force renv 0.16.0, set renv.download.override on windows

    @pascal-sauer
    pascal-sauer committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    a88e03c View commit details
    Browse the repository at this point in the history

  3. how to install v1

    @pascal-sauer
    pascal-sauer committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    0745bb8 View commit details
    Browse the repository at this point in the history

  4. minimum wood yield fix part 1

    @bodirsky
    bodirsky authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    1590804 View commit details
    Browse the repository at this point in the history

  5. Minimum wood yield fix part 2

    @bodirsky
    bodirsky authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    10bbb7f View commit details
    Browse the repository at this point in the history

  6. minimum wood yield bugfix part 3

    @bodirsky
    bodirsky authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    e3880e1 View commit details
    Browse the repository at this point in the history

  7. Minimum wood yield bugfix part 4

    @bodirsky
    bodirsky authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    83a3476 View commit details
    Browse the repository at this point in the history

  8. setup instructions restructure

    @pascal-sauer
    pascal-sauer committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    ffe8669 View commit details
    Browse the repository at this point in the history

  9. Update README.md

    @pascal-sauer
    pascal-sauer authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    2824b09 View commit details
    Browse the repository at this point in the history

  10. Update README.md

    @pascal-sauer
    pascal-sauer authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    5f7c1a2 View commit details
    Browse the repository at this point in the history

  11. Update README.md

    @pascal-sauer
    pascal-sauer authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    66ee2d6 View commit details
    Browse the repository at this point in the history

  12. upgrade to renv 1.0.5

    @pascal-sauer
    pascal-sauer committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    856b5aa View commit details
    Browse the repository at this point in the history

  13. Merge branch 'develop' of github.com:pascal-sauer/magpiemodel into de… 

    …velop
    @pascal-sauer
    pascal-sauer committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    3c56e88 View commit details
    Browse the repository at this point in the history

  14. added compatibility of master to recent gms package release

    @tscheypidi
    tscheypidi committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    8591bee View commit details
    Browse the repository at this point in the history

  15. always install piamenv

    @pascal-sauer
    pascal-sauer committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    394b295 View commit details
    Browse the repository at this point in the history

  16. Merge pull request magpiemodel#652 from tscheypidi/master 

    added compatibility of master to recent gms package release
    @tscheypidi
    tscheypidi authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    64fc0a3 View commit details
    Browse the repository at this point in the history

  17. Merge pull request magpiemodel#651 from pascal-sauer/develop 

    How-to-install rewrite
    @pascal-sauer
    pascal-sauer authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    6c85d90 View commit details
    Browse the repository at this point in the history

  18. Revert setting change of FSEC script related to PR no.621 

    See: magpiemodel#621
    @FelicitasBeier
    FelicitasBeier authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    d340244 View commit details
    Browse the repository at this point in the history

  19. Update version number

    @bodirsky
    bodirsky authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    e726460 View commit details
    Browse the repository at this point in the history

  20. bugfix trade implementation 

    all countries can now extra-import, also countries with self-sufficiency of 1 (which is the case for woodfuel, which is not traded a lot)
    @bodirsky
    bodirsky authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    3bfe721 View commit details
    Browse the repository at this point in the history

  21. Update CHANGELOG.md

    @bodirsky
    bodirsky authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    601788a View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2024

  1. switching fsec script from NPI baseline to NDC baseline

    @bodirsky
    bodirsky authored Mar 30, 2024
    Configuration menu
    Copy the full SHA
    9141e3d View commit details
    Browse the repository at this point in the history

  2. Update fsec.R

    @bodirsky
    bodirsky authored Mar 30, 2024
    Configuration menu
    Copy the full SHA
    5251a92 View commit details
    Browse the repository at this point in the history

  3. Update scenario_fsec.csv

    @bodirsky
    bodirsky authored Mar 30, 2024
    Configuration menu
    Copy the full SHA
    b5746f4 View commit details
    Browse the repository at this point in the history

  4. Update fsec.R

    @bodirsky
    bodirsky authored Mar 30, 2024
    Configuration menu
    Copy the full SHA
    293ebde View commit details
    Browse the repository at this point in the history

  5. new inputdata revision

    @bodirsky
    bodirsky authored Mar 30, 2024
    Configuration menu
    Copy the full SHA
    2564552 View commit details
    Browse the repository at this point in the history

  6. Update sets.gms for NDC scenarios

    @bodirsky
    bodirsky authored Mar 30, 2024
    Configuration menu
    Copy the full SHA
    dfe926b View commit details
    Browse the repository at this point in the history

  7. Update sets.gms for NDC scenarios

    @bodirsky
    bodirsky authored Mar 30, 2024
    Configuration menu
    Copy the full SHA
    e8ef895 View commit details
    Browse the repository at this point in the history

  8. Update default.cfg for new NDC and new inputdata

    @bodirsky
    bodirsky authored Mar 30, 2024
    Configuration menu
    Copy the full SHA
    ad447aa View commit details
    Browse the repository at this point in the history

  9. Update CHANGELOG.md

    @bodirsky
    bodirsky authored Mar 30, 2024
    Configuration menu
    Copy the full SHA
    6a126b0 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2024

  1. .Rprofile tweaks

    @pascal-sauer
    pascal-sauer committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    fc81609 View commit details
    Browse the repository at this point in the history

  2. copyright 2024

    @pascal-sauer
    pascal-sauer committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    081bd04 View commit details
    Browse the repository at this point in the history

  3. Merge pull request magpiemodel#653 from pascal-sauer/develop 

    copyright 2024
    @pascal-sauer
    pascal-sauer authored Apr 2, 2024
    Configuration menu
    Copy the full SHA
    a3b20ba View commit details
    Browse the repository at this point in the history

  4. release 4.7.2

    @pascal-sauer
    pascal-sauer committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    ab37df1 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into develop

    @tscheypidi
    tscheypidi authored Apr 2, 2024
    Configuration menu
    Copy the full SHA
    1654d70 View commit details
    Browse the repository at this point in the history

  6. Merge pull request magpiemodel#654 from pascal-sauer/develop 

    MAgPIE release 4.7.2
    @pascal-sauer
    pascal-sauer authored Apr 2, 2024
    Configuration menu
    Copy the full SHA
    eba5036 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2024

  1. merge master into develop

    @pascal-sauer
    pascal-sauer committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    413bc61 View commit details
    Browse the repository at this point in the history

  2. Merge pull request magpiemodel#655 from pascal-sauer/develop 

    merge master into develop
    @pascal-sauer
    pascal-sauer authored Apr 3, 2024
    Configuration menu
    Copy the full SHA
    9919c63 View commit details
    Browse the repository at this point in the history

  3. reducing timber penalty term by 2 orders of magnitude to improve mode… 

    …l performance

model got stuck in HR run with too high penalty
    @bodirsky
    bodirsky authored Apr 3, 2024
    Configuration menu
    Copy the full SHA
    30c5dcd View commit details
    Browse the repository at this point in the history

  4. Update input.gms

    @bodirsky
    bodirsky authored Apr 3, 2024
    Configuration menu
    Copy the full SHA
    d6bc996 View commit details
    Browse the repository at this point in the history

  5. Updated description of free production

    @bodirsky
    bodirsky authored Apr 3, 2024
    Configuration menu
    Copy the full SHA
    53a0ae9 View commit details
    Browse the repository at this point in the history

  6. remove double solve in nlp_par, as solves would be executed in parallel

    @bodirsky
    bodirsky authored Apr 3, 2024
    Configuration menu
    Copy the full SHA
    fb75425 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2024

  1. Update fsec.R

    @bodirsky
    bodirsky authored Apr 4, 2024
    Configuration menu
    Copy the full SHA
    30b2f90 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2024

  1. Update fsec.R

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

  2. remove scaling as it caused infeasibilty in one run

    @bodirsky
    bodirsky authored Apr 5, 2024
    Configuration menu
    Copy the full SHA
    9e1b5f4 View commit details
    Browse the repository at this point in the history

  3. Update scaling.gms

    @bodirsky
    bodirsky authored Apr 5, 2024
    Configuration menu
    Copy the full SHA
    77161c5 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2024

  1. Update fsec.R

    @bodirsky
    bodirsky authored Apr 7, 2024
    Configuration menu
    Copy the full SHA
    04af6d0 View commit details
    Browse the repository at this point in the history

  2. avoid division by zero by moving to lhs of equation

    @bodirsky
    bodirsky authored Apr 7, 2024
    Configuration menu
    Copy the full SHA
    28d9f11 View commit details
    Browse the repository at this point in the history

  3. removed scaling for v58_scalingFactorExp

    @flohump
    flohump committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    925514f View commit details
    Browse the repository at this point in the history

  4. default settings

    @flohump
    flohump committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    0e8681f View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2024

  1. update changelog and defaults

    @flohump
    flohump committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    b50dfae View commit details
    Browse the repository at this point in the history

  2. removed validation_short output script from calibration scripts

    @flohump
    flohump committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    3e342ab View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of github.com:magpiemodel/magpie into f_woodtrade 

    # Conflicts:
#	CHANGELOG.md
#	modules/58_peatland/v2/scaling.gms
    @flohump
    flohump committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    09ea7a5 View commit details
    Browse the repository at this point in the history

  4. fix changelog

    @flohump
    flohump committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    139f736 View commit details
    Browse the repository at this point in the history

  5. fix changelog

    @flohump
    flohump committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    6ca7706 View commit details
    Browse the repository at this point in the history

  6. Update FSDP_collect.R

    @bodirsky
    bodirsky authored Apr 8, 2024
    Configuration menu
    Copy the full SHA
    0bf7f17 View commit details
    Browse the repository at this point in the history

  7. Update FSDP_collect2.R

    @bodirsky
    bodirsky authored Apr 8, 2024
    Configuration menu
    Copy the full SHA
    346e668 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2024

  1. Merge pull request magpiemodel#646 from flohump/f_woodtrade 

    bugfix solve statement + revised calibration approach for land conversion costs
    @flohump
    flohump authored Apr 9, 2024
    Configuration menu
    Copy the full SHA
    ed7354b View commit details
    Browse the repository at this point in the history