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 git commit #258

Closed
wants to merge 529 commits into from
Closed

bugfix git commit #258

wants to merge 529 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Jan 20, 2021

  1. some documentation and beauty

    @bodirsky
    bodirsky committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    43df6c8 View commit details
    Browse the repository at this point in the history

  2. Eual dist run. Only shift fire

    @abhimishr
    abhimishr committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    8ccff7a View commit details
    Browse the repository at this point in the history

  3. Eual dist run. Only shift fire

    @abhimishr
    abhimishr committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    7e856dc View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2021

  1. convergence measure should be NA in first timestep

    @bodirsky
    bodirsky committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    0613767 View commit details
    Browse the repository at this point in the history

  2. NDC as other plantations init, activate shiting agri fire. Activate p… 

    …oulter dist in secdf
    @abhimishr
    abhimishr committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    f2e5a15 View commit details
    Browse the repository at this point in the history

  3. name fix

    @abhimishr
    abhimishr committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    c7ea959 View commit details
    Browse the repository at this point in the history

  4. NDC as other plantations init, activate shiting agri fire. Activate p… 

    …oulter dist in secdf
    @abhimishr
    abhimishr committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    53d1522 View commit details
    Browse the repository at this point in the history

  5. Cleanup for harvesting costs and cheaper multiplier. Other land harve… 

    …st cheaper
    @abhimishr
    abhimishr committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    f05f4fa View commit details
    Browse the repository at this point in the history

  6. Updated scenario for plantation estb h2s1l05

    @abhimishr
    abhimishr committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    4dc5211 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2021

  1. test script for emission dynamics of improved NUE

    @bodirsky
    bodirsky committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    efb30b7 View commit details
    Browse the repository at this point in the history

  2. some extra comments

    @bodirsky
    bodirsky committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    6fc25a7 View commit details
    Browse the repository at this point in the history

  3. update calibration parameters

    @bodirsky
    bodirsky committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    7bd99a8 View commit details
    Browse the repository at this point in the history

  4. update runscript

    @bodirsky
    bodirsky committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    ec3ffc5 View commit details
    Browse the repository at this point in the history

  5. calibration file

    @bodirsky
    bodirsky committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    7595700 View commit details
    Browse the repository at this point in the history

  6. marked missing NUE scenario for pastures (neff85_85_starty2010)

    @bodirsky
    bodirsky committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    44ee541 View commit details
    Browse the repository at this point in the history

  7. update runscript

    @bodirsky
    bodirsky committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    7523b39 View commit details
    Browse the repository at this point in the history

  8. bugfix inconsistent input data

    @bodirsky
    bodirsky committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    7b47519 View commit details
    Browse the repository at this point in the history

  9. bugfix

    @bodirsky
    bodirsky committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    76dfb3d View commit details
    Browse the repository at this point in the history

  10. update

    @bodirsky
    bodirsky committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    422f3ab View commit details
    Browse the repository at this point in the history

  11. revert back additional scen

    @abhimishr
    abhimishr committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    0a469a1 View commit details
    Browse the repository at this point in the history

  12. documentation 

    changelog
    @bodirsky
    bodirsky committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    a3aa318 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2021

  1. deleted unnecessary files 

    renamed and shortened setnames
added some comments
removed typos
    @bodirsky
    bodirsky committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    15537f0 View commit details
    Browse the repository at this point in the history

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

    # Conflicts:
#	modules/15_food/anthropometrics_jan18/input.gms
#	modules/15_food/anthropometrics_jan18/presolve.gms
    @flohump
    flohump committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    ed91d6b View commit details
    Browse the repository at this point in the history

  3. changelog

    @caviddhen
    caviddhen committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    eb01ed4 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/develop' into develop

    @caviddhen
    caviddhen committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    764cc5c View commit details
    Browse the repository at this point in the history

  5. yield test run

    @caviddhen
    caviddhen committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    21cc641 View commit details
    Browse the repository at this point in the history

  6. update input cfg

    @caviddhen
    caviddhen committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    2de40a2 View commit details
    Browse the repository at this point in the history

  7. update default.cfg

    @caviddhen
    caviddhen committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    8ce7842 View commit details
    Browse the repository at this point in the history

  8. update default cfg

    @caviddhen
    caviddhen committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    7386a10 View commit details
    Browse the repository at this point in the history

  9. bugfix default cfg

    @caviddhen
    caviddhen committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    17a4968 View commit details
    Browse the repository at this point in the history

  10. update default.cfg

    @caviddhen
    caviddhen committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    dd2d13c View commit details
    Browse the repository at this point in the history

  11. update SCP

    @flohump
    flohump committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    4073c9c View commit details
    Browse the repository at this point in the history

  12. update

    @flohump
    flohump committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    4d485ee View commit details
    Browse the repository at this point in the history

  13. Test

    @flohump
    flohump committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    327a51e View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2021

  1. remove empty file

    @bodirsky
    bodirsky committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    df99cc0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request magpiemodel#244 from bodirsky/develop 

    Develop
    @bodirsky
    bodirsky committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    0e0fce3 View commit details
    Browse the repository at this point in the history

  3. TEST

    @flohump
    flohump committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    0169c85 View commit details
    Browse the repository at this point in the history

  4. revision upgarde input data

    @abhimishr
    abhimishr committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    653207d View commit details
    Browse the repository at this point in the history

  5. Merge pull request #39 from magpiemodel/develop 

    Develop
    @abhimishr
    abhimishr committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    ab2cfe7 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' into develop_forestry

    @abhimishr
    abhimishr committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    029bb86 View commit details
    Browse the repository at this point in the history

  7. Forest protection and expanded demand runs

    @abhimishr
    abhimishr committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    6a5ae95 View commit details
    Browse the repository at this point in the history

  8. typo fix

    @abhimishr
    abhimishr committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    7e13dcf View commit details
    Browse the repository at this point in the history

  9. Revert to old data

    @abhimishr
    abhimishr committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    2360244 View commit details
    Browse the repository at this point in the history

  10. update

    @flohump
    flohump committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    85b1a6d View commit details
    Browse the repository at this point in the history

  11. update

    @flohump
    flohump committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    bc33cac View commit details
    Browse the repository at this point in the history

  12. exogenous food demand

    @abhimishr
    abhimishr committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    003a166 View commit details
    Browse the repository at this point in the history

  13. Food demand exo

    @abhimishr
    abhimishr committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    d5e5ce9 View commit details
    Browse the repository at this point in the history

  14. msg

    @abhimishr
    abhimishr committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    4f40236 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2021

  1. merge conflict config

    @caviddhen
    caviddhen committed Jan 27, 2021
    Configuration menu
    Copy the full SHA
    4d434fd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'magpiemodel-develop' into develop

    @caviddhen
    caviddhen committed Jan 27, 2021
    Configuration menu
    Copy the full SHA
    fe434a9 View commit details
    Browse the repository at this point in the history

  3. switching demand module to exogenous as default. 

    Currently shadow prices are not good enough, such that endogenous demand does not improve the results quality.
Furthermore, fish production cost issue has to be tackled first.
    @bodirsky
    bodirsky committed Jan 27, 2021
    Configuration menu
    Copy the full SHA
    5b3f0ce View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2021

  1. updating prodcution costs of fish

    @bodirsky
    bodirsky committed Jan 28, 2021
    Configuration menu
    Copy the full SHA
    026b966 View commit details
    Browse the repository at this point in the history

  2. Parametrize estb

    @abhimishr
    abhimishr committed Jan 28, 2021
    Configuration menu
    Copy the full SHA
    877b86d View commit details
    Browse the repository at this point in the history

  3. typo

    @abhimishr
    abhimishr committed Jan 28, 2021
    Configuration menu
    Copy the full SHA
    d491c29 View commit details
    Browse the repository at this point in the history

  4. calibration test

    @abhimishr
    abhimishr committed Jan 28, 2021
    Configuration menu
    Copy the full SHA
    f82c6cf View commit details
    Browse the repository at this point in the history

  5. reducing current estabölishments

    @abhimishr
    abhimishr committed Jan 28, 2021
    Configuration menu
    Copy the full SHA
    68b1b22 View commit details
    Browse the repository at this point in the history

  6. Lower harvesting costs. lower prod cost from natveg

    @abhimishr
    abhimishr committed Jan 28, 2021
    Configuration menu
    Copy the full SHA
    31e103a View commit details
    Browse the repository at this point in the history

  7. Run flag increment

    @abhimishr
    abhimishr committed Jan 28, 2021
    Configuration menu
    Copy the full SHA
    d6ab2c2 View commit details
    Browse the repository at this point in the history

  8. Update

    @flohump
    flohump committed Jan 28, 2021
    Configuration menu
    Copy the full SHA
    9d36fe1 View commit details
    Browse the repository at this point in the history

  9. lower harvesting costs. lower prod cost from natveg

    @abhimishr
    abhimishr committed Jan 28, 2021
    Configuration menu
    Copy the full SHA
    59e08b6 View commit details
    Browse the repository at this point in the history

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

    # Conflicts:
#	modules/15_food/anthropometrics_jan18/declarations.gms
#	modules/15_food/anthropometrics_jan18/preloop.gms
    @flohump
    flohump committed Jan 28, 2021
    Configuration menu
    Copy the full SHA
    17da193 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2021

  1. Merge pull request magpiemodel#245 from bodirsky/develop 

    Develop
    @tscheypidi
    tscheypidi committed Jan 29, 2021
    Configuration menu
    Copy the full SHA
    7252323 View commit details
    Browse the repository at this point in the history

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

    # Conflicts:
#	config/default.cfg
    @flohump
    flohump committed Jan 29, 2021
    Configuration menu
    Copy the full SHA
    40797c9 View commit details
    Browse the repository at this point in the history

  3. changelog

    @flohump
    flohump committed Jan 29, 2021
    Configuration menu
    Copy the full SHA
    b5fcb56 View commit details
    Browse the repository at this point in the history

  4. delete

    @flohump
    flohump committed Jan 29, 2021
    Configuration menu
    Copy the full SHA
    5015ed5 View commit details
    Browse the repository at this point in the history

  5. update

    @flohump
    flohump committed Jan 29, 2021
    Configuration menu
    Copy the full SHA
    6627667 View commit details
    Browse the repository at this point in the history

  6. re-added scenario switches lost during merging

    @flohump
    flohump committed Jan 29, 2021
    Configuration menu
    Copy the full SHA
    8e4facd View commit details
    Browse the repository at this point in the history

  7. cfg$gms$s31_unequal

    @flohump
    flohump committed Jan 29, 2021
    Configuration menu
    Copy the full SHA
    6636b05 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2021

  1. Jumpy woodfueld demand fix between 2015 and 2020

    @abhimishr
    abhimishr committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    e8efd9a View commit details
    Browse the repository at this point in the history

  2. Jumpy woodfueld demand fix between 2015 and 2020"

    @abhimishr
    abhimishr committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    1b1ed1f View commit details
    Browse the repository at this point in the history

  3. Prodn ratio matched to reported GS. Jumpy woodfueld demand fix betwee… 

    …n 2015 and 2020
    @abhimishr
    abhimishr committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    146cff0 View commit details
    Browse the repository at this point in the history

  4. Pasture production cost after CALIBRATION

    @abhimishr
    abhimishr committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    584f9f1 View commit details
    Browse the repository at this point in the history

  5. Revert cheaper prodn of woodfuel from other land.

    @abhimishr
    abhimishr committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    d5d94a2 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2021

  1. Pasture equality. Again activate cheaper prodn of woodfuel from other… 

    … land. Pasture production cost after CALIBRATION
    @abhimishr
    abhimishr committed Jan 31, 2021
    Configuration menu
    Copy the full SHA
    9b1442c View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2021

  1. Revert pasture module changes, add residue prodn from indrw, add othe… 

    …r land conversion eqn
    @abhimishr
    abhimishr committed Feb 1, 2021
    Configuration menu
    Copy the full SHA
    61d91cb View commit details
    Browse the repository at this point in the history

  2. Removed pasture switch

    @flohump
    flohump committed Feb 1, 2021
    Configuration menu
    Copy the full SHA
    58de8b4 View commit details
    Browse the repository at this point in the history

  3. Update PR

    @flohump
    flohump committed Feb 1, 2021
    Configuration menu
    Copy the full SHA
    dc727d1 View commit details
    Browse the repository at this point in the history

  4. update start script

    @flohump
    flohump committed Feb 1, 2021
    Configuration menu
    Copy the full SHA
    e64fbbf View commit details
    Browse the repository at this point in the history

  5. Easier trade with relaxed self suff pool. Revert pasture module chang… 

    …es, add residue prodn from indrw, add other land conversion eqn
    @abhimishr
    abhimishr committed Feb 1, 2021
    Configuration menu
    Copy the full SHA
    93f01f9 View commit details
    Browse the repository at this point in the history

  6. Merge pull request magpiemodel#246 from flohump/f_SCP2 

    Single Cell Protein as Food and Feed replacement (exogenous assumptions)
    @bodirsky
    bodirsky committed Feb 1, 2021
    Configuration menu
    Copy the full SHA
    34db19b View commit details
    Browse the repository at this point in the history

  7. added output script for disaggregation of land transitions

    @flohump
    flohump committed Feb 1, 2021
    Configuration menu
    Copy the full SHA
    bf62825 View commit details
    Browse the repository at this point in the history

  8. changelog

    @flohump
    flohump committed Feb 1, 2021
    Configuration menu
    Copy the full SHA
    53a29a4 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2021

  1. No class 15 from poulter data

    @abhimishr
    abhimishr committed Feb 2, 2021
    Configuration menu
    Copy the full SHA
    0113377 View commit details
    Browse the repository at this point in the history

  2. Added back class 15 from poulter data

    @abhimishr
    abhimishr committed Feb 2, 2021
    Configuration menu
    Copy the full SHA
    31eb219 View commit details
    Browse the repository at this point in the history

  3. remove class 15 from distribution but cheaper LC estb and clearing costs

    @abhimishr
    abhimishr committed Feb 2, 2021
    Configuration menu
    Copy the full SHA
    b5c28cd View commit details
    Browse the repository at this point in the history

  4. AC0 in initialization set but no ac0 in calibration step. Added class… 

    … 15 again.
    @abhimishr
    abhimishr committed Feb 2, 2021
    Configuration menu
    Copy the full SHA
    4daee5f View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2021

  1. bugfix chancelog

    @flohump
    flohump committed Feb 3, 2021
    Configuration menu
    Copy the full SHA
    9e8f828 View commit details
    Browse the repository at this point in the history

  2. bugfix missing files

    @flohump
    flohump committed Feb 3, 2021
    Configuration menu
    Copy the full SHA
    bd3532e View commit details
    Browse the repository at this point in the history

  3. Merge pull request magpiemodel#248 from flohump/f_SCP2 

    Bugfix missing files 20_processing
    @tscheypidi
    tscheypidi committed Feb 3, 2021
    Configuration menu
    Copy the full SHA
    6885898 View commit details
    Browse the repository at this point in the history

  4. Merge pull request magpiemodel#247 from flohump/develop 

    output script for disaggregation of land transitions
    @tscheypidi
    tscheypidi committed Feb 3, 2021
    Configuration menu
    Copy the full SHA
    6d147c9 View commit details
    Browse the repository at this point in the history

  5. Calibrate natveg gs

    @abhimishr
    abhimishr committed Feb 3, 2021
    Configuration menu
    Copy the full SHA
    151422f View commit details
    Browse the repository at this point in the history

  6. Lowest ac with highest weight for land distribution

    @abhimishr
    abhimishr committed Feb 3, 2021
    Configuration menu
    Copy the full SHA
    dde83d9 View commit details
    Browse the repository at this point in the history

  7. bugfix shifting age-classes 1st timestep

    @flohump
    flohump committed Feb 3, 2021
    Configuration menu
    Copy the full SHA
    795a615 View commit details
    Browse the repository at this point in the history

  8. Test different distributions. Calibrate natveg gs

    @abhimishr
    abhimishr committed Feb 3, 2021
    Configuration menu
    Copy the full SHA
    fe46a79 View commit details
    Browse the repository at this point in the history

  9. naming fix

    @abhimishr
    abhimishr committed Feb 3, 2021
    Configuration menu
    Copy the full SHA
    e7e70cf View commit details
    Browse the repository at this point in the history

  10. bugfix ac dist and establishment

    @flohump
    flohump committed Feb 3, 2021
    Configuration menu
    Copy the full SHA
    cfd0114 View commit details
    Browse the repository at this point in the history

  11. update

    @flohump
    flohump committed Feb 3, 2021
    Configuration menu
    Copy the full SHA
    38f1ba2 View commit details
    Browse the repository at this point in the history

  12. BUgfix final rotation class exclusion

    @abhimishr
    abhimishr committed Feb 3, 2021
    Configuration menu
    Copy the full SHA
    214a024 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2021

  1. Bugfix final rotation class exclusion

    @abhimishr
    abhimishr committed Feb 4, 2021
    Configuration menu
    Copy the full SHA
    ad112f7 View commit details
    Browse the repository at this point in the history

  2. Bugfix final rotation class exclusion

    @abhimishr
    abhimishr committed Feb 4, 2021
    Configuration menu
    Copy the full SHA
    1308407 View commit details
    Browse the repository at this point in the history

  3. 5 year steps

    @abhimishr
    abhimishr committed Feb 4, 2021
    Configuration menu
    Copy the full SHA
    f1d4e07 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #40 from magpiemodel/develop 

    Develop
    @abhimishr
    abhimishr committed Feb 4, 2021
    Configuration menu
    Copy the full SHA
    c3b790c View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into develop_forestry

    @abhimishr
    abhimishr committed Feb 4, 2021
    Configuration menu
    Copy the full SHA
    6be2028 View commit details
    Browse the repository at this point in the history

  6. Runs after pull. Bioen subsidy 0

    @abhimishr
    abhimishr committed Feb 4, 2021
    Configuration menu
    Copy the full SHA
    db24635 View commit details
    Browse the repository at this point in the history

  7. Pasture equality. Bioen subsidy 0

    @abhimishr
    abhimishr committed Feb 4, 2021
    Configuration menu
    Copy the full SHA
    fe970e7 View commit details
    Browse the repository at this point in the history

  8. flag update

    @abhimishr
    abhimishr committed Feb 4, 2021
    Configuration menu
    Copy the full SHA
    dc41768 View commit details
    Browse the repository at this point in the history

  9. Estb equality. pasture reverted to less than specification

    @abhimishr
    abhimishr committed Feb 4, 2021
    Configuration menu
    Copy the full SHA
    ef0a436 View commit details
    Browse the repository at this point in the history

  10. flag update

    @abhimishr
    abhimishr committed Feb 4, 2021
    Configuration menu
    Copy the full SHA
    6e20d14 View commit details
    Browse the repository at this point in the history

  11. Ceiling jump 2.5%

    @abhimishr
    abhimishr committed Feb 4, 2021
    Configuration menu
    Copy the full SHA
    96cf8f3 View commit details
    Browse the repository at this point in the history

  12. new land conversion cost module realization

    @flohump
    flohump committed Feb 4, 2021
    Configuration menu
    Copy the full SHA
    66c8955 View commit details
    Browse the repository at this point in the history

  13. DEVState Runs

    @abhimishr
    abhimishr committed Feb 4, 2021
    Configuration menu
    Copy the full SHA
    2d7bc72 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2021

  1. Manual fix for LAM demand. and LAM and OAS prod contrib

    @abhimishr
    abhimishr committed Feb 5, 2021
    Configuration menu
    Copy the full SHA
    b7a5e76 View commit details
    Browse the repository at this point in the history

  2. typo fix

    @abhimishr
    abhimishr committed Feb 5, 2021
    Configuration menu
    Copy the full SHA
    63a65a8 View commit details
    Browse the repository at this point in the history

  3. typo fix

    @abhimishr
    abhimishr committed Feb 5, 2021
    Configuration menu
    Copy the full SHA
    a6f320d View commit details
    Browse the repository at this point in the history

  4. bugfix default run

    @abhimishr
    abhimishr committed Feb 5, 2021
    Configuration menu
    Copy the full SHA
    1e0bd9a View commit details
    Browse the repository at this point in the history

  5. Additional calib for estb in hist period. p32_land_star_ac fix instea… 

    …d of p32_land
    @abhimishr
    abhimishr committed Feb 5, 2021
    Configuration menu
    Copy the full SHA
    bfce17d View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2021

  1. Update land conversion costs. devstate_feb21 should work out-of-the-b… 

    …ox with default values for both cases, default and forestry,
    @flohump
    flohump committed Feb 6, 2021
    Configuration menu
    Copy the full SHA
    628dd5b View commit details
    Browse the repository at this point in the history

  2. update calibration factors

    @flohump
    flohump committed Feb 6, 2021
    Configuration menu
    Copy the full SHA
    fbe30c1 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2021

  1. Turned off hist calib for testing. Fixed demand gaps properly

    @abhimishr
    abhimishr committed Feb 7, 2021
    Configuration menu
    Copy the full SHA
    2460f4f View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2021

  1. No additional calib for estb in hist period. GS Scaling reduced for L… 

    …AM and MEA
    @abhimishr
    abhimishr committed Feb 8, 2021
    Configuration menu
    Copy the full SHA
    0645f85 View commit details
    Browse the repository at this point in the history

  2. bugfix ac_est v73_prod_forestry fixed to zero

    @flohump
    flohump committed Feb 8, 2021
    Configuration menu
    Copy the full SHA
    ef3c151 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop_forestry' of github.com:abhimishr/magpie into d… 

    …evelop_forestry
    @flohump
    flohump committed Feb 8, 2021
    Configuration menu
    Copy the full SHA
    4c5ba9e View commit details
    Browse the repository at this point in the history

  4. Manual estb calib for all time steps

    @abhimishr
    abhimishr committed Feb 8, 2021
    Configuration menu
    Copy the full SHA
    5e6f97a View commit details
    Browse the repository at this point in the history

  5. Manual estb calib for all time steps - coming through mrland

    @abhimishr
    abhimishr committed Feb 8, 2021
    Configuration menu
    Copy the full SHA
    888f4e6 View commit details
    Browse the repository at this point in the history

  6. typo fix

    @abhimishr
    abhimishr committed Feb 8, 2021
    Configuration menu
    Copy the full SHA
    9f04ee2 View commit details
    Browse the repository at this point in the history

  7. typo fix and added file

    @abhimishr
    abhimishr committed Feb 8, 2021
    Configuration menu
    Copy the full SHA
    173380a View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2021

  1. Timber module cost overhaul

    @abhimishr
    abhimishr committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    611498c View commit details
    Browse the repository at this point in the history

  2. Bugfix devstate_feb21

    @flohump
    flohump committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    1943172 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2021

  1. bugfix

    @flohump
    flohump committed Feb 10, 2021
    Configuration menu
    Copy the full SHA
    f6a5369 View commit details
    Browse the repository at this point in the history

  2. Timber simple realization. In dev.

    @flohump
    flohump committed Feb 10, 2021
    Configuration menu
    Copy the full SHA
    6891dda View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2021

  1. Update

    @flohump
    flohump committed Feb 11, 2021
    Configuration menu
    Copy the full SHA
    78898f9 View commit details
    Browse the repository at this point in the history

  2. General cleanup

    @abhimishr
    abhimishr committed Feb 11, 2021
    Configuration menu
    Copy the full SHA
    c658342 View commit details
    Browse the repository at this point in the history

  3. Correct MEA cellular land information

    @abhimishr
    abhimishr committed Feb 11, 2021
    Configuration menu
    Copy the full SHA
    f114b6e View commit details
    Browse the repository at this point in the history

  4. MEA planted area cellular fix

    @abhimishr
    abhimishr committed Feb 11, 2021
    Configuration menu
    Copy the full SHA
    e641401 View commit details
    Browse the repository at this point in the history

  5. turn on optfile

    @abhimishr
    abhimishr committed Feb 11, 2021
    Configuration menu
    Copy the full SHA
    1916d3a View commit details
    Browse the repository at this point in the history

  6. revert s32_max_self_suff to 0.8

    @abhimishr
    abhimishr committed Feb 11, 2021
    Configuration menu
    Copy the full SHA
    f40606d View commit details
    Browse the repository at this point in the history

  7. added new realizations in 32, 35 and 73

    @flohump
    flohump committed Feb 11, 2021
    Configuration menu
    Copy the full SHA
    5a260a1 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2021

  1. bugfix

    @flohump
    flohump committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    90ebf6f View commit details
    Browse the repository at this point in the history

  2. bugfix

    @flohump
    flohump committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    1c46679 View commit details
    Browse the repository at this point in the history

  3. General cleanup

    @abhimishr
    abhimishr committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    20618aa View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop_forestry' of github.com:abhimishr/magpie into d… 

    …evelop_forestry
    @abhimishr
    abhimishr committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    fe8ee0a View commit details
    Browse the repository at this point in the history

  5. bugfix2

    @flohump
    flohump committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    912cb50 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop_forestry' of github.com:abhimishr/magpie into d… 

    …evelop_forestry
    @abhimishr
    abhimishr committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    3ebfddc View commit details
    Browse the repository at this point in the history

  7. more cleanup

    @abhimishr
    abhimishr committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    bf6b8c8 View commit details
    Browse the repository at this point in the history

  8. start script change

    @abhimishr
    abhimishr committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    d2e7446 View commit details
    Browse the repository at this point in the history

  9. deafult timber module change

    @abhimishr
    abhimishr committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    ba65f1e View commit details
    Browse the repository at this point in the history

  10. typo fix

    @abhimishr
    abhimishr committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    94b2066 View commit details
    Browse the repository at this point in the history

  11. update of scaling factors for hvara

    @flohump
    flohump committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    17e264a View commit details
    Browse the repository at this point in the history

  12. Bugfix causing timber demand also in default runs till 2015

    @abhimishr
    abhimishr committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    c20fd24 View commit details
    Browse the repository at this point in the history

  13. run flag update

    @abhimishr
    abhimishr committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    0209e77 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'develop_forestry' of github.com:abhimishr/magpie into d… 

    …evelop_forestry
    @abhimishr
    abhimishr committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    b03d280 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2021

  1. added missing fille

    @flohump
    flohump committed Feb 13, 2021
    Configuration menu
    Copy the full SHA
    24c658b View commit details
    Browse the repository at this point in the history

  2. update of scaling factors

    @flohump
    flohump committed Feb 13, 2021
    Configuration menu
    Copy the full SHA
    64defc3 View commit details
    Browse the repository at this point in the history

  3. several bugfixes 

    s32_hvarea switch for q32_establishment_dynamic and q32_establishment_fixed was not working
s32_hvarea/s35_hvarea = 1 was infeasible.
v32_land_reduction(j,est) was a free variable
v35_x_reduction(j,est) was a free variable
timber plantation harvest at rotation age is now fixed. no negative costs needed anymore.
f32_estb_calib("EUR") = 0.8 - somewhat more plantations, less strong decline of secdforest growing stock
    @flohump
    flohump committed Feb 13, 2021
    Configuration menu
    Copy the full SHA
    7cb77b0 View commit details
    Browse the repository at this point in the history

  4. Use all avail threads

    @abhimishr
    abhimishr committed Feb 13, 2021
    Configuration menu
    Copy the full SHA
    1711091 View commit details
    Browse the repository at this point in the history

  5. update module data

    @abhimishr
    abhimishr committed Feb 13, 2021
    Configuration menu
    Copy the full SHA
    e787b35 View commit details
    Browse the repository at this point in the history

  6. Bugfix try (runs dont compile)

    @abhimishr
    abhimishr committed Feb 13, 2021
    Configuration menu
    Copy the full SHA
    4a10403 View commit details
    Browse the repository at this point in the history

  7. Bugfix. Having Text=Num breaks gams

    @abhimishr
    abhimishr committed Feb 13, 2021
    Configuration menu
    Copy the full SHA
    eb42f52 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2021

  1. costs can be defined as positive variable

    @flohump
    flohump committed Feb 14, 2021
    Configuration menu
    Copy the full SHA
    fe69665 View commit details
    Browse the repository at this point in the history

  2. costs can be defined as positive variable

    @flohump
    flohump committed Feb 14, 2021
    Configuration menu
    Copy the full SHA
    4756563 View commit details
    Browse the repository at this point in the history

  3. reverting back changes in 73_timber to =e= for production 

    moving the solution to 21_trade. No upper bound on wood/woodfuel production to allow for exogenous scenarios.
    @flohump
    flohump committed Feb 14, 2021
    Configuration menu
    Copy the full SHA
    5ec6a8e View commit details
    Browse the repository at this point in the history

  4. lower costs for free variables possible because production costs are … 

    …now defined per ton DM and because plantations are harvested at rotation age.
    @flohump
    flohump committed Feb 14, 2021
    Configuration menu
    Copy the full SHA
    f11eb76 View commit details
    Browse the repository at this point in the history

  5. Start script update

    @abhimishr
    abhimishr committed Feb 14, 2021
    Configuration menu
    Copy the full SHA
    8a5c3c8 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2021

  1. Cleanup modules

    @abhimishr
    abhimishr committed Feb 15, 2021
    Configuration menu
    Copy the full SHA
    b458ff9 View commit details
    Browse the repository at this point in the history

  2. CodeCheck pass

    @abhimishr
    abhimishr committed Feb 15, 2021
    Configuration menu
    Copy the full SHA
    0f0bcd3 View commit details
    Browse the repository at this point in the history

  3. Added residuals approach for dist=4

    @abhimishr
    abhimishr committed Feb 15, 2021
    Configuration menu
    Copy the full SHA
    0ca4532 View commit details
    Browse the repository at this point in the history

  4. description changes

    @abhimishr
    abhimishr committed Feb 15, 2021
    Configuration menu
    Copy the full SHA
    9b33baa View commit details
    Browse the repository at this point in the history

  5. mr-uni input data update

    @abhimishr
    abhimishr committed Feb 15, 2021
    Configuration menu
    Copy the full SHA
    a154f05 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2021

  1. start script change

    @abhimishr
    abhimishr committed Feb 16, 2021
    Configuration menu
    Copy the full SHA
    df8a75e View commit details
    Browse the repository at this point in the history

  2. Threads test

    @abhimishr
    abhimishr committed Feb 16, 2021
    Configuration menu
    Copy the full SHA
    a89cf9d View commit details
    Browse the repository at this point in the history

  3. revert back thread option

    @abhimishr
    abhimishr committed Feb 16, 2021
    Configuration menu
    Copy the full SHA
    a3d4cc7 View commit details
    Browse the repository at this point in the history

  4. Tests for PR

    @abhimishr
    abhimishr committed Feb 16, 2021
    Configuration menu
    Copy the full SHA
    141c6b7 View commit details
    Browse the repository at this point in the history

  5. typo

    @abhimishr
    abhimishr committed Feb 16, 2021
    Configuration menu
    Copy the full SHA
    2049ca9 View commit details
    Browse the repository at this point in the history

  6. Input data update

    @abhimishr
    abhimishr committed Feb 16, 2021
    Configuration menu
    Copy the full SHA
    5d85de3 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2021

  1. Documentation update

    @abhimishr
    abhimishr committed Feb 17, 2021
    Configuration menu
    Copy the full SHA
    d0d60c9 View commit details
    Browse the repository at this point in the history

  2. added test PR template

    @abhimishr
    abhimishr committed Feb 17, 2021
    Configuration menu
    Copy the full SHA
    8bcb23f View commit details
    Browse the repository at this point in the history

  3. Updated changelog

    @abhimishr
    abhimishr committed Feb 17, 2021
    Configuration menu
    Copy the full SHA
    9926724 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2021

  1. removed new PR template draft

    @abhimishr
    abhimishr committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    4f52ecd View commit details
    Browse the repository at this point in the history

  2. Changelog update

    @abhimishr
    abhimishr committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    570f5bf View commit details
    Browse the repository at this point in the history

  3. start script change

    @abhimishr
    abhimishr committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    9cfe198 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2021

  1. Config changes from current default (model defaults should not differ… 

    … from config default)
    @abhimishr
    abhimishr committed Feb 19, 2021
    Configuration menu
    Copy the full SHA
    d9da271 View commit details
    Browse the repository at this point in the history

  2. Run flag update

    @abhimishr
    abhimishr committed Feb 19, 2021
    Configuration menu
    Copy the full SHA
    e823434 View commit details
    Browse the repository at this point in the history

  3. forestry run

    @abhimishr
    abhimishr committed Feb 19, 2021
    Configuration menu
    Copy the full SHA
    0135a9c View commit details
    Browse the repository at this point in the history

  4. run flag update

    @abhimishr
    abhimishr committed Feb 19, 2021
    Configuration menu
    Copy the full SHA
    e995aed View commit details
    Browse the repository at this point in the history

  5. biodem level and subsidy level test

    @abhimishr
    abhimishr committed Feb 19, 2021
    Configuration menu
    Copy the full SHA
    470cd37 View commit details
    Browse the repository at this point in the history

  6. start run

    @abhimishr
    abhimishr committed Feb 19, 2021
    Configuration menu
    Copy the full SHA
    4312866 View commit details
    Browse the repository at this point in the history

  7. documentation changes

    @abhimishr
    abhimishr committed Feb 19, 2021
    Configuration menu
    Copy the full SHA
    8c1bb5d View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2021

  1. Start script update

    @abhimishr
    abhimishr committed Feb 20, 2021
    Configuration menu
    Copy the full SHA
    8f508f6 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2021

  1. start scriot update. Revert to defaults

    @abhimishr
    abhimishr committed Feb 22, 2021
    Configuration menu
    Copy the full SHA
    ef576a2 View commit details
    Browse the repository at this point in the history

  2. typo fix

    @abhimishr
    abhimishr committed Feb 22, 2021
    Configuration menu
    Copy the full SHA
    92b749f View commit details
    Browse the repository at this point in the history

  3. Codecheck bugfix and start script update

    @abhimishr
    abhimishr committed Feb 22, 2021
    Configuration menu
    Copy the full SHA
    a0588e9 View commit details
    Browse the repository at this point in the history

  4. Added correct deafults

    @abhimishr
    abhimishr committed Feb 22, 2021
    Configuration menu
    Copy the full SHA
    a0e2d22 View commit details
    Browse the repository at this point in the history

  5. redirected slurm log from full.log -> slurm.log to avoid write access… 

    … problems
    @tscheypidi
    tscheypidi committed Feb 22, 2021
    Configuration menu
    Copy the full SHA
    e5b20b8 View commit details
    Browse the repository at this point in the history

  6. Merge pull request magpiemodel#252 from tscheypidi/develop 

    redirected slurm log from full.log -> slurm.log
    @tscheypidi
    tscheypidi committed Feb 22, 2021
    Configuration menu
    Copy the full SHA
    a40cbdc View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2021

  1. Header update and previous calibrartion factors added (temporarily)

    @abhimishr
    abhimishr committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    fff8b57 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #41 from magpiemodel/develop 

    Merget latest develop branch
    @abhimishr
    abhimishr committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    6274012 View commit details
    Browse the repository at this point in the history

  3. bugfix recalibrate script

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

  4. reverting back default title

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

  5. Merge pull request #42 from magpiemodel/develop 

    Develop
    @abhimishr
    abhimishr committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    13e7be3 View commit details
    Browse the repository at this point in the history

  6. update of calibration factors

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

  7. start script update

    @abhimishr
    abhimishr committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    aa0b90a View commit details
    Browse the repository at this point in the history

  8. Start script update

    @abhimishr
    abhimishr committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    8886dbd View commit details
    Browse the repository at this point in the history

  9. update and cleanup scenario_config.csv for forestry runs 

    added a simple start script for forestry
    @flohump
    flohump committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    dce259b View commit details
    Browse the repository at this point in the history

  10. merged changes

    @abhimishr
    abhimishr committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    a2c6253 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'develop_forestry' of github.com:abhimishr/magpie into d… 

    …evelop_forestry
    @abhimishr
    abhimishr committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    117af00 View commit details
    Browse the repository at this point in the history

  12. start script update and better code legibility

    @abhimishr
    abhimishr committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    db08d88 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2021

  1. update of scenario_config. removed WDPA setting, which is not needed.

    @flohump
    flohump committed Feb 24, 2021
    Configuration menu
    Copy the full SHA
    a7f88e3 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2021

  1. update growing stock calibration

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

  2. upper bound for timber plantations at rotation age.

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

  3. start script update

    @abhimishr
    abhimishr committed Feb 25, 2021
    Configuration menu
    Copy the full SHA
    f908ed9 View commit details
    Browse the repository at this point in the history

  4. Reverting back changes in trade module to avoid jumping production ti… 

    …mber patterns
    @flohump
    flohump committed Feb 25, 2021
    Configuration menu
    Copy the full SHA
    c9fcfbe View commit details
    Browse the repository at this point in the history

  5. Start script update

    @abhimishr
    abhimishr committed Feb 25, 2021
    Configuration menu
    Copy the full SHA
    09bb438 View commit details
    Browse the repository at this point in the history

  6. update ForestryExo scenario

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

Commits on Feb 26, 2021

  1. Merge branch 'magpiemodel-develop' into develop

    David Chen committed Feb 26, 2021
    Configuration menu
    Copy the full SHA
    35c6def View commit details
    Browse the repository at this point in the history

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

    …develop

Merge branch 'magpiemodel-develop' into develop
    David Chen committed Feb 26, 2021
    Configuration menu
    Copy the full SHA
    588be7e View commit details
    Browse the repository at this point in the history

  3. merge cleanup

    David Chen committed Feb 26, 2021
    Configuration menu
    Copy the full SHA
    621fd89 View commit details
    Browse the repository at this point in the history

  4. merge cleanup

    David Chen committed Feb 26, 2021
    Configuration menu
    Copy the full SHA
    4d5b73d View commit details
    Browse the repository at this point in the history

  5. merge cleanup

    David Chen committed Feb 26, 2021
    Configuration menu
    Copy the full SHA
    c644ef0 View commit details
    Browse the repository at this point in the history

  6. update changelog

    David Chen committed Feb 26, 2021
    Configuration menu
    Copy the full SHA
    856959f View commit details
    Browse the repository at this point in the history

  7. Start script update and trade test

    @abhimishr
    abhimishr committed Feb 26, 2021
    Configuration menu
    Copy the full SHA
    2e94fe0 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'develop_forestry' of github.com:abhimishr/magpie into d… 

    …evelop_forestry
    @abhimishr
    abhimishr committed Feb 26, 2021
    Configuration menu
    Copy the full SHA
    7b70dd8 View commit details
    Browse the repository at this point in the history

  9. Fixed starnge scenario config change

    @abhimishr
    abhimishr committed Feb 26, 2021
    Configuration menu
    Copy the full SHA
    c3ca070 View commit details
    Browse the repository at this point in the history

  10. updated not_used file

    @abhimishr
    abhimishr committed Feb 26, 2021
    Configuration menu
    Copy the full SHA
    77364c1 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2021

  1. update establishment constraint. An average regional yield is used to… 

    … ovoid overspecialization of plantation establishment towards highly productive cells.
    @flohump
    flohump committed Feb 27, 2021
    Configuration menu
    Copy the full SHA
    2b364d8 View commit details
    Browse the repository at this point in the history

  2. typo fixes

    @abhimishr
    abhimishr committed Feb 27, 2021
    Configuration menu
    Copy the full SHA
    7605577 View commit details
    Browse the repository at this point in the history

  3. Stable runs for forestry paper. Pending codecheck and cleanup

    @abhimishr
    abhimishr committed Feb 27, 2021
    Configuration menu
    Copy the full SHA
    bbe357a View commit details
    Browse the repository at this point in the history

  4. Bugfix ForestryExo scenario. s73_timber_demand_switch needs to be 1 a… 

    …nd s35_hvarea = 2., otherwise infeasible (Upper bound in trade module).
    @flohump
    flohump committed Feb 27, 2021
    Configuration menu
    Copy the full SHA
    ce5f23d View commit details
    Browse the repository at this point in the history

  5. Updated documentation, general cleaup, codeCheck pass

    @abhimishr
    abhimishr committed Feb 27, 2021
    Configuration menu
    Copy the full SHA
    e91f5a8 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop_forestry' of github.com:abhimishr/magpie into d… 

    …evelop_forestry
    @abhimishr
    abhimishr committed Feb 27, 2021
    Configuration menu
    Copy the full SHA
    3ebd8d7 View commit details
    Browse the repository at this point in the history

  7. automatic sets for scen56 and scen60

    @flohump
    flohump committed Feb 27, 2021
    Configuration menu
    Copy the full SHA
    158661e View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2021

  1. Merge pull request magpiemodel#249 from abhimishr/develop_forestry 

    Reshuffling of forestry, natveg and timber module code : Better routine for timber production inclusing performance updates
    @abhimishr
    abhimishr committed Feb 28, 2021
    Configuration menu
    Copy the full SHA
    b00d4dd View commit details
    Browse the repository at this point in the history

  2. automatic sets for scen56 and scen60

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

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

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

  4. Update of Emission policy scenarios

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

Commits on Mar 1, 2021

  1. update of functions to avoid code replication

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

  2. update of start_functions

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

  3. Merge pull request magpiemodel#254 from flohump/f_BioenGHG 

    Automatic sets in 56_ghg_policy and 60_bioenergy and update of GHG emission policies
    @flohump
    flohump committed Mar 1, 2021
    Configuration menu
    Copy the full SHA
    5028f4f View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2021

  1. Merge branch 'develop' into develop

    @bodirsky
    bodirsky committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    2bf1bc6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request magpiemodel#253 from caviddhen/develop 

    GAINS output script
    @bodirsky
    bodirsky committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    a4d10fe View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2021

  1. Merge pull request #43 from magpiemodel/develop 

    merge develop
    @abhimishr
    abhimishr committed Mar 4, 2021
    Configuration menu
    Copy the full SHA
    5af9349 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2021

  1. added pre-commit hook to prevent big files from being committed

    @tscheypidi
    tscheypidi committed Mar 8, 2021
    Configuration menu
    Copy the full SHA
    8437e67 View commit details
    Browse the repository at this point in the history

  2. added info to CHANGELOG

    @tscheypidi
    tscheypidi committed Mar 8, 2021
    Configuration menu
    Copy the full SHA
    e9cff6c View commit details
    Browse the repository at this point in the history

  3. reduced file size of images > 512kb 

    updated pre-commit hook to check all git managed files
added file size check to github actions
    @tscheypidi
    tscheypidi committed Mar 8, 2021
    Configuration menu
    Copy the full SHA
    306e6a9 View commit details
    Browse the repository at this point in the history

  4. tweaked hook

    @tscheypidi
    tscheypidi committed Mar 8, 2021
    Configuration menu
    Copy the full SHA
    a3424e9 View commit details
    Browse the repository at this point in the history

  5. bugfixes

    @tscheypidi
    tscheypidi committed Mar 8, 2021
    Configuration menu
    Copy the full SHA
    9ac96ea View commit details
    Browse the repository at this point in the history

  6. Merge pull request magpiemodel#255 from tscheypidi/develop 

    Added pre-commit hook
    @tscheypidi
    tscheypidi committed Mar 8, 2021
    Configuration menu
    Copy the full SHA
    a006468 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2021

  1. tweaked pre-commit hook (max filesize is now 250kB) and added codeCheck 

    tweaked github actions workflow
    @tscheypidi
    tscheypidi committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    e3a867f View commit details
    Browse the repository at this point in the history

  2. Merge pull request magpiemodel#257 from tscheypidi/develop 

    tweaked pre-commit hook and github actions workflow
    @tscheypidi
    tscheypidi committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    9b312bb View commit details
    Browse the repository at this point in the history

  3. Merge pull request #45 from magpiemodel/develop 

    Develop
    @abhimishr
    abhimishr committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    b1e9114 View commit details
    Browse the repository at this point in the history

  4. bugfix for windows platform. If gms is not found it'll be installed.

    @abhimishr
    abhimishr committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    f280166 View commit details
    Browse the repository at this point in the history