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

Update 58_peatland and 80_optimization modules #714

Merged
merged 33 commits into from
Sep 13, 2024
Merged

Update 58_peatland and 80_optimization modules #714

merged 33 commits into from
Sep 13, 2024

Commits on Jul 21, 2024

  1. save

    @flohump
    flohump committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    bca09d9 View commit details
    Browse the repository at this point in the history

  2. save

    @flohump
    flohump committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    eee6654 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. update

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

Commits on Jul 23, 2024

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

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

  2. documentation

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

Commits on Jul 24, 2024

  1. documentation

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

Commits on Jul 25, 2024

  1. revision of scaling factor

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

  2. defaults

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

Commits on Jul 26, 2024

  1. update

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

Commits on Aug 12, 2024

  1. test

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

Commits on Aug 13, 2024

  1. test

    @flohump
    flohump committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    b9714cd View commit details
    Browse the repository at this point in the history

  2. test

    @flohump
    flohump committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    83349da View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2024

  1. bugfix

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

  2. test

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

  3. update

    @flohump
    flohump committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    37ebeca View commit details
    Browse the repository at this point in the history

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

    …f_peatland2

# Conflicts:
#	CHANGELOG.md
    @flohump
    flohump committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    0412e2d View commit details
    Browse the repository at this point in the history

  5. update

    @flohump
    flohump committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    2f8c182 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2024

  1. changelog

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

  2. update changelog

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

Commits on Aug 20, 2024

  1. bugfix for variables levels not obeying the bounds in nlp_par, `conop… 

    …t` changed to `conopt3`
    @flohump
    flohump committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    f7acc2d View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2024

  1. doc forestry

    @flohump
    flohump committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    94f2f30 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2024

  1. update doc

    @flohump
    flohump committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    0286b8b View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2024

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

    …f_peatland2

# Conflicts:
#	CHANGELOG.md
    @flohump
    flohump committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    aeb5c01 View commit details
    Browse the repository at this point in the history

  2. update R packages

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

Commits on Sep 6, 2024

  1. Update AgroForestry ABCDR

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

Commits on Sep 9, 2024

  1. added output script for conversion of validation.mif file into valida… 

    …tion.rds
    @flohump
    flohump committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    4cda7f6 View commit details
    Browse the repository at this point in the history

  2. update start script

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

  3. additional data update additional_data_rev4.53.tgz

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

  4. update start script

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

Commits on Sep 11, 2024

  1. update start script

    @flohump
    flohump committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    4e882c4 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2024

  1. bugfix peatland

    @flohump
    flohump committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    3c35246 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2024

  1. bugfix 35_natveg

    @flohump
    flohump committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    1585a96 View commit details
    Browse the repository at this point in the history

  2. changelog

    @flohump
    flohump committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    905875f View commit details
    Browse the repository at this point in the history