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

develop #502

Closed
wants to merge 149 commits into from
Closed

develop #502

wants to merge 149 commits into from

Commits on Oct 14, 2022

  1. add renv + bootstrapping

    @pfuehrlich-pik
    pfuehrlich-pik committed Oct 14, 2022
    Configuration menu
    Copy the full SHA
    72645ce View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2022

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

    @pfuehrlich-pik
    pfuehrlich-pik committed Oct 26, 2022
    Configuration menu
    Copy the full SHA
    2ec84a2 View commit details
    Browse the repository at this point in the history

  2. main renv + bootstrapping

    @pfuehrlich-pik
    pfuehrlich-pik committed Oct 26, 2022
    Configuration menu
    Copy the full SHA
    c30ffac View commit details
    Browse the repository at this point in the history

  3. remove blackmagicc for now

    @pfuehrlich-pik
    pfuehrlich-pik committed Oct 26, 2022
    Configuration menu
    Copy the full SHA
    7352ce6 View commit details
    Browse the repository at this point in the history

  4. fix here paths

    @pfuehrlich-pik
    pfuehrlich-pik committed Oct 26, 2022
    Configuration menu
    Copy the full SHA
    ed2cb48 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2022

  1. create run renv in start_run

    @pfuehrlich-pik
    pfuehrlich-pik committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    3d98cf8 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2022

  1. add DESCRIPTION

    @pfuehrlich-pik
    pfuehrlich-pik committed Nov 7, 2022
    Configuration menu
    Copy the full SHA
    226d43f View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2022

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

    @pfuehrlich-pik
    pfuehrlich-pik committed Nov 8, 2022
    Configuration menu
    Copy the full SHA
    fe7aeb2 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2022

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

    @pfuehrlich-pik
    pfuehrlich-pik committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    fa2f665 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2022

  1. use piamenv

    @pfuehrlich-pik
    pfuehrlich-pik committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    67bc08f View commit details
    Browse the repository at this point in the history

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

    @pfuehrlich-pik
    pfuehrlich-pik committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    0f3ae81 View commit details
    Browse the repository at this point in the history

  3. up version number to 4.6

    @pfuehrlich-pik
    pfuehrlich-pik committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    66cbc36 View commit details
    Browse the repository at this point in the history

  4. add Makefile

    @pfuehrlich-pik
    pfuehrlich-pik committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    59006e8 View commit details
    Browse the repository at this point in the history

  5. remove renv scripts

    @pfuehrlich-pik
    pfuehrlich-pik committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    e69c8fe View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2022

  1. no main renv.lock

    @pfuehrlich-pik
    pfuehrlich-pik committed Nov 21, 2022
    Configuration menu
    Copy the full SHA
    88ec735 View commit details
    Browse the repository at this point in the history

  2. ruse gms::getLine, create run renv

    @pfuehrlich-pik
    pfuehrlich-pik committed Nov 21, 2022
    Configuration menu
    Copy the full SHA
    9318e73 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2022

  1. Update SHAPE settings

    @weindl
    weindl committed Nov 22, 2022
    Configuration menu
    Copy the full SHA
    8be822e View commit details
    Browse the repository at this point in the history

  2. Update SDP-EI settings in scenario_config.csv

    @weindl
    weindl committed Nov 22, 2022
    Configuration menu
    Copy the full SHA
    6c23b28 View commit details
    Browse the repository at this point in the history

  3. Update scenario_config.csv

    @weindl
    weindl committed Nov 22, 2022
    Configuration menu
    Copy the full SHA
    af516eb View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2022

  1. minor things

    @pfuehrlich-pik
    pfuehrlich-pik committed Nov 23, 2022
    Configuration menu
    Copy the full SHA
    742ae06 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2022

  1. added water output script and adjusted cellular input scenarios

    @FelicitasBeier
    FelicitasBeier committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    253998d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into FSEC

    @FelicitasBeier
    FelicitasBeier committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    b30b691 View commit details
    Browse the repository at this point in the history

  3. updated to v 7.48 preprocessing

    @FelicitasBeier
    FelicitasBeier committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    dd70c9e View commit details
    Browse the repository at this point in the history

  4. updated version number

    @FelicitasBeier
    FelicitasBeier committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    401c888 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2022

  1. added new scnearios for FSEC

    @FelicitasBeier
    FelicitasBeier committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    3ae5129 View commit details
    Browse the repository at this point in the history

  2. output.R update check, other stuff

    @pfuehrlich-pik
    pfuehrlich-pik committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    faac2e4 View commit details
    Browse the repository at this point in the history

  3. add qgraph as suggests, show goxygen warnings

    @pfuehrlich-pik
    pfuehrlich-pik committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    7153d2f View commit details
    Browse the repository at this point in the history

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

    @pfuehrlich-pik
    pfuehrlich-pik committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    c2d2b7d View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2022

  1. master back into develop

    @pfuehrlich-pik
    pfuehrlich-pik committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    c2ddf45 View commit details
    Browse the repository at this point in the history

  2. bugfix removed mapping

    @FelicitasBeier
    FelicitasBeier committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    1f34c5e View commit details
    Browse the repository at this point in the history

  3. skip renv for snapshots

    @pfuehrlich-pik
    pfuehrlich-pik committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    2aa6c63 View commit details
    Browse the repository at this point in the history

  4. simpler ask

    @pfuehrlich-pik
    pfuehrlich-pik committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    1055532 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' of github.com:magpiemodel/magpie into renv-magpie

    @pfuehrlich-pik
    pfuehrlich-pik committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    8869622 View commit details
    Browse the repository at this point in the history

  6. require piamenv 0.3.2

    @pfuehrlich-pik
    pfuehrlich-pik committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    452031f View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2022

  1. fix / in output script name

    @pfuehrlich-pik
    pfuehrlich-pik committed Dec 1, 2022
    Configuration menu
    Copy the full SHA
    3d81885 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2022

  1. adjusted scaling

    @FelicitasBeier
    FelicitasBeier committed Dec 2, 2022
    Configuration menu
    Copy the full SHA
    9349bf2 View commit details
    Browse the repository at this point in the history

  2. set tolerances back to default

    @FelicitasBeier
    FelicitasBeier committed Dec 2, 2022
    Configuration menu
    Copy the full SHA
    d460272 View commit details
    Browse the repository at this point in the history

  3. handle multiple output scripts/run folder

    @pfuehrlich-pik
    pfuehrlich-pik committed Dec 2, 2022
    Configuration menu
    Copy the full SHA
    d2eb127 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2022

  1. bugfix missing slash

    @FelicitasBeier
    FelicitasBeier committed Dec 5, 2022
    Configuration menu
    Copy the full SHA
    b64e688 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2022

  1. changelog, readme

    @pfuehrlich-pik
    pfuehrlich-pik committed Dec 6, 2022
    Configuration menu
    Copy the full SHA
    791bdfb View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2022

  1. make help using Rscript

    @pfuehrlich-pik
    pfuehrlich-pik committed Dec 8, 2022
    Configuration menu
    Copy the full SHA
    2b804c3 View commit details
    Browse the repository at this point in the history

  2. alignment

    @pfuehrlich-pik
    pfuehrlich-pik committed Dec 8, 2022
    Configuration menu
    Copy the full SHA
    0220dc8 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2022

  1. flexibilize EFP transition period with start and endyear scalar

    @FelicitasBeier
    FelicitasBeier committed Dec 9, 2022
    Configuration menu
    Copy the full SHA
    b29e014 View commit details
    Browse the repository at this point in the history

  2. updated some solver settings and FSEC emis scens and output scripts

    @FelicitasBeier
    FelicitasBeier committed Dec 9, 2022
    Configuration menu
    Copy the full SHA
    ce72c18 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2022

  1. Merge branch 'develop' into FSEC

    @FelicitasBeier
    FelicitasBeier committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    41abb6e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into EFP

    @FelicitasBeier
    FelicitasBeier committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    1d17db2 View commit details
    Browse the repository at this point in the history

  3. code clean up

    @FelicitasBeier
    FelicitasBeier committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    17bf5d5 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2022

  1. updated additional data

    @FelicitasBeier
    FelicitasBeier committed Dec 13, 2022
    Configuration menu
    Copy the full SHA
    73c2ddc View commit details
    Browse the repository at this point in the history

  2. updated changelog

    @FelicitasBeier
    FelicitasBeier committed Dec 13, 2022
    Configuration menu
    Copy the full SHA
    d09220f View commit details
    Browse the repository at this point in the history

  3. correction of FSDP_collect

    @FelicitasBeier
    FelicitasBeier committed Dec 13, 2022
    Configuration menu
    Copy the full SHA
    06a91ca View commit details
    Browse the repository at this point in the history

  4. updated FSDP_collect

    @FelicitasBeier
    FelicitasBeier committed Dec 13, 2022
    Configuration menu
    Copy the full SHA
    92b54f1 View commit details
    Browse the repository at this point in the history

  5. set minimum wage to 3

    @FelicitasBeier
    FelicitasBeier committed Dec 13, 2022
    Configuration menu
    Copy the full SHA
    965c9b4 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into develop

    @pfuehrlich-pik
    pfuehrlich-pik committed Dec 13, 2022
    Configuration menu
    Copy the full SHA
    4883b6e View commit details
    Browse the repository at this point in the history

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

    @pfuehrlich-pik
    pfuehrlich-pik committed Dec 13, 2022
    Configuration menu
    Copy the full SHA
    a56ae93 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #486 from pfuehrlich-pik/develop 

    merge master back into develop
    @pfuehrlich-pik
    pfuehrlich-pik committed Dec 13, 2022
    Configuration menu
    Copy the full SHA
    7e3eab8 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'develop' of github.com:magpiemodel/magpie into renv-magpie

    @pfuehrlich-pik
    pfuehrlich-pik committed Dec 13, 2022
    Configuration menu
    Copy the full SHA
    eeaabae View commit details
    Browse the repository at this point in the history

  10. Add reporting script to output that generates a short mif containing … 

    …only variables relevant for the REMIND coupling.
    @dklein-pik
    dklein-pik committed Dec 13, 2022
    Configuration menu
    Copy the full SHA
    f412b05 View commit details
    Browse the repository at this point in the history

  11. Only load libraries we need. Move function getReportShortForREMIND to… 

    … magpie4 library.
    @dklein-pik
    dklein-pik committed Dec 13, 2022
    Configuration menu
    Copy the full SHA
    b49f443 View commit details
    Browse the repository at this point in the history

  12. adjusted linear interpolation macro such that start year can be equal… 

    … to target year and then receive target value without fading in
    @FelicitasBeier
    FelicitasBeier committed Dec 13, 2022
    Configuration menu
    Copy the full SHA
    606b2c4 View commit details
    Browse the repository at this point in the history

  13. Update CHANGELOG.md

    @dklein-pik
    dklein-pik committed Dec 13, 2022
    Configuration menu
    Copy the full SHA
    6fa8fe0 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2022

  1. Fix styling issues.

    @dklein-pik
    dklein-pik committed Dec 14, 2022
    Configuration menu
    Copy the full SHA
    1c20906 View commit details
    Browse the repository at this point in the history

  2. Update to new function name

    @dklein-pik
    dklein-pik committed Dec 14, 2022
    Configuration menu
    Copy the full SHA
    e49fd3c View commit details
    Browse the repository at this point in the history

  3. Update scripts/output/extra/reportShortForREMIND.R 

    Co-authored-by: Pascal Führlich <82826417+pfuehrlich-pik@users.noreply.github.com>
    @dklein-pik @pfuehrlich-pik
    dklein-pik and pfuehrlich-pik committed Dec 14, 2022
    Configuration menu
    Copy the full SHA
    57ac6fd View commit details
    Browse the repository at this point in the history

  4. Update scripts/output/extra/reportShortForREMIND.R 

    Co-authored-by: Pascal Führlich <82826417+pfuehrlich-pik@users.noreply.github.com>
    @dklein-pik @pfuehrlich-pik
    dklein-pik and pfuehrlich-pik committed Dec 14, 2022
    Configuration menu
    Copy the full SHA
    2f47b74 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2022

  1. Use local environment to keep option settings local.

    @dklein-pik
    dklein-pik committed Dec 15, 2022
    Configuration menu
    Copy the full SHA
    8e1aee0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into EFP

    @FelicitasBeier
    FelicitasBeier committed Dec 15, 2022
    Configuration menu
    Copy the full SHA
    4c2cfbb View commit details
    Browse the repository at this point in the history

  3. Merge pull request #492 from FelicitasBeier/EFP 

    Flexibilization of fading in of Environmental Flow Policy
    @FelicitasBeier
    FelicitasBeier committed Dec 15, 2022
    Configuration menu
    Copy the full SHA
    a780468 View commit details
    Browse the repository at this point in the history

  4. adjustment in highres script and FSDP_collect to allow high-res runs … 

    …in different folder
    @FelicitasBeier
    FelicitasBeier committed Dec 15, 2022
    Configuration menu
    Copy the full SHA
    b0b7afe View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into FSEC

    @FelicitasBeier
    FelicitasBeier committed Dec 15, 2022
    Configuration menu
    Copy the full SHA
    575a0d8 View commit details
    Browse the repository at this point in the history

  6. removed FSDP_process for better runtime

    @FelicitasBeier
    FelicitasBeier committed Dec 15, 2022
    Configuration menu
    Copy the full SHA
    71247af View commit details
    Browse the repository at this point in the history

  7. added new EFP scenario fading scenario

    @FelicitasBeier
    FelicitasBeier committed Dec 15, 2022
    Configuration menu
    Copy the full SHA
    e5d8cb9 View commit details
    Browse the repository at this point in the history

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

    @pfuehrlich-pik
    pfuehrlich-pik committed Dec 15, 2022
    Configuration menu
    Copy the full SHA
    b7fb262 View commit details
    Browse the repository at this point in the history

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

    …develop
    @dklein-pik
    dklein-pik committed Dec 15, 2022
    Configuration menu
    Copy the full SHA
    a9c8023 View commit details
    Browse the repository at this point in the history

  10. DESC -> DEPENDENCIES

    @pfuehrlich-pik
    pfuehrlich-pik committed Dec 15, 2022
    Configuration menu
    Copy the full SHA
    5d98b53 View commit details
    Browse the repository at this point in the history

  11. reverted changed solver settings

    @FelicitasBeier
    FelicitasBeier committed Dec 15, 2022
    Configuration menu
    Copy the full SHA
    618c1d4 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2022

  1. bugfixes

    @FelicitasBeier
    FelicitasBeier committed Dec 16, 2022
    Configuration menu
    Copy the full SHA
    dbe44b7 View commit details
    Browse the repository at this point in the history

  2. Update scripts/output/extra/reportShortForREMIND.R 

    Co-authored-by: Pascal Führlich <82826417+pfuehrlich-pik@users.noreply.github.com>
    @dklein-pik @pfuehrlich-pik
    dklein-pik and pfuehrlich-pik committed Dec 16, 2022
    Configuration menu
    Copy the full SHA
    969e004 View commit details
    Browse the repository at this point in the history

  3. Rename script to use the same name as the underlying reporting function.

    @dklein-pik
    dklein-pik committed Dec 16, 2022
    Configuration menu
    Copy the full SHA
    c828555 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' of https://github.com/dklein-pik/magpie into d… 

    …evelop
    @dklein-pik
    dklein-pik committed Dec 16, 2022
    Configuration menu
    Copy the full SHA
    b1c792d View commit details
    Browse the repository at this point in the history

  5. missing commas

    @FelicitasBeier
    FelicitasBeier committed Dec 16, 2022
    Configuration menu
    Copy the full SHA
    0fc42f2 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #493 from dklein-pik/develop 

    Add reporting script to output that generates a short mif for REMIND
    @dklein-pik
    dklein-pik committed Dec 16, 2022
    Configuration menu
    Copy the full SHA
    40114b7 View commit details
    Browse the repository at this point in the history

  7. updated version number to 28

    @FelicitasBeier
    FelicitasBeier committed Dec 16, 2022
    Configuration menu
    Copy the full SHA
    2a0a9a6 View commit details
    Browse the repository at this point in the history

  8. use DEPENDENCIES in bootstrapping

    @pfuehrlich-pik
    pfuehrlich-pik committed Dec 16, 2022
    Configuration menu
    Copy the full SHA
    1369c45 View commit details
    Browse the repository at this point in the history

  9. use identical

    @pfuehrlich-pik
    pfuehrlich-pik committed Dec 16, 2022
    Configuration menu
    Copy the full SHA
    6967976 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2022

  1. some bufixes in FSDP_collect

    @FelicitasBeier
    FelicitasBeier committed Dec 17, 2022
    Configuration menu
    Copy the full SHA
    ce6ba71 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2022

  1. bugfix in FSDP_collect

    @FelicitasBeier
    FelicitasBeier committed Dec 19, 2022
    Configuration menu
    Copy the full SHA
    49db44b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into FSEC

    @FelicitasBeier
    FelicitasBeier committed Dec 19, 2022
    Configuration menu
    Copy the full SHA
    287f311 View commit details
    Browse the repository at this point in the history

  3. updated changelog

    @FelicitasBeier
    FelicitasBeier committed Dec 19, 2022
    Configuration menu
    Copy the full SHA
    87b9086 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2022

  1. update

    @flohump
    flohump committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    db2d2f0 View commit details
    Browse the repository at this point in the history

  2. included costs from maccs in employment calculation

    Debbora Leip committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    5d33ad1 View commit details
    Browse the repository at this point in the history

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

    …ment_MACCs
    Debbora Leip committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    116278c View commit details
    Browse the repository at this point in the history

  4. updated changelog

    Debbora Leip committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    23c580b View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2022

  1. updated documentation

    Debbora Leip committed Dec 23, 2022
    Configuration menu
    Copy the full SHA
    a78937c View commit details
    Browse the repository at this point in the history

  2. update

    @flohump
    flohump committed Dec 23, 2022
    Configuration menu
    Copy the full SHA
    197d867 View commit details
    Browse the repository at this point in the history

  3. addressed comments

    Debbora Leip committed Dec 23, 2022
    Configuration menu
    Copy the full SHA
    3a5386f View commit details
    Browse the repository at this point in the history

Commits on Dec 25, 2022

  1. Performance improvements rds files. Selection of needed variables in … 

    …regional report.
    @flohump
    flohump committed Dec 25, 2022
    Configuration menu
    Copy the full SHA
    a3914f9 View commit details
    Browse the repository at this point in the history

  2. bugfix

    @flohump
    flohump committed Dec 25, 2022
    Configuration menu
    Copy the full SHA
    5b9c4c8 View commit details
    Browse the repository at this point in the history

  3. bugfix

    @flohump
    flohump committed Dec 25, 2022
    Configuration menu
    Copy the full SHA
    597b5e1 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2023

  1. Merge pull request #495 from FelicitasBeier/FSEC 

    FSEC v28
    @flohump
    flohump committed Jan 2, 2023
    Configuration menu
    Copy the full SHA
    4884131 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2023

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

    @pfuehrlich-pik
    pfuehrlich-pik committed Jan 4, 2023
    Configuration menu
    Copy the full SHA
    55f5274 View commit details
    Browse the repository at this point in the history

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

    …ment_MACCs
    Debbora Leip committed Jan 4, 2023
    Configuration menu
    Copy the full SHA
    72e855a View commit details
    Browse the repository at this point in the history

  3. Merge pull request #496 from deleip/f_employment_MACCs 

    employment from maccs
    @deleip
    deleip committed Jan 4, 2023
    Configuration menu
    Copy the full SHA
    e44d200 View commit details
    Browse the repository at this point in the history

  4. re-add blackmagicc script

    @pfuehrlich-pik
    pfuehrlich-pik committed Jan 4, 2023
    Configuration menu
    Copy the full SHA
    eca7174 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2023

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

    @pfuehrlich-pik
    pfuehrlich-pik committed Jan 5, 2023
    Configuration menu
    Copy the full SHA
    db63947 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2023

  1. set RENV_PATHS_LIBRARY

    @pfuehrlich-pik
    pfuehrlich-pik committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    f084929 View commit details
    Browse the repository at this point in the history

  2. set RENV_PATHS_LIBRARY when creating run renvs

    @pfuehrlich-pik
    pfuehrlich-pik committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    9b9da1a View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2023

  1. Merge branch 'f_SHAPE3_dev' into develop

    @weindl
    weindl committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    1acd337 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #62 from weindl/develop 

    Develop
    @weindl
    weindl committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    a11f07c View commit details
    Browse the repository at this point in the history

  3. Update CHANGELOG.md

    @weindl
    weindl committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    297839e View commit details
    Browse the repository at this point in the history

  4. Update SHAPE SDP switches in scenario_config.csv

    @weindl
    weindl committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    ecf93df View commit details
    Browse the repository at this point in the history

  5. Update SDP-EI setting

    @weindl
    weindl committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    99cf223 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2023

  1. Merge pull request #482 from pfuehrlich-pik/renv-magpie 

    renv integration
    @pfuehrlich-pik
    pfuehrlich-pik committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    ca4d2ec View commit details
    Browse the repository at this point in the history

  2. Merge pull request #63 from magpiemodel/develop 

    Develop
    @weindl
    weindl committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    872b739 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2023

  1. added sub-national validation output script for India

    @PrantikaDas
    PrantikaDas committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    c24e404 View commit details
    Browse the repository at this point in the history

  2. Updated calibration factor

    @weindl
    weindl committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    ce7c13b View commit details
    Browse the repository at this point in the history

  3. Update scripts/output/projects/FABLE_India_subnational_validation.R 

    Co-authored-by: Pascal Führlich <82826417+pfuehrlich-pik@users.noreply.github.com>
    @mishkos @pfuehrlich-pik
    mishkos and pfuehrlich-pik committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    eb77d9f View commit details
    Browse the repository at this point in the history

  4. Update scripts/output/projects/FABLE_India_subnational_validation.R 

    Co-authored-by: Pascal Führlich <82826417+pfuehrlich-pik@users.noreply.github.com>
    @mishkos @pfuehrlich-pik
    mishkos and pfuehrlich-pik committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    44a8beb View commit details
    Browse the repository at this point in the history

  5. Merge pull request #498 from weindl/f_SHAPE4_dev 

    Update SHAPE SDP scenario switches
    @weindl
    weindl committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    7c1d377 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2023

  1. Update scripts/output/projects/FABLE_India_subnational_validation.R 

    Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
    @PrantikaDas @mishkos
    PrantikaDas and mishkos committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    e57ae8f View commit details
    Browse the repository at this point in the history

  2. Update scripts/output/projects/FABLE_India_subnational_validation.R 

    Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
    @PrantikaDas @mishkos
    PrantikaDas and mishkos committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    5303b0c View commit details
    Browse the repository at this point in the history

  3. Update scripts/output/projects/FABLE_India_subnational_validation.R 

    Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
    @PrantikaDas @mishkos
    PrantikaDas and mishkos committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    7c6bd68 View commit details
    Browse the repository at this point in the history

  4. Update scripts/output/projects/FABLE_India_subnational_validation.R 

    Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
    @PrantikaDas @mishkos
    PrantikaDas and mishkos committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    54a3319 View commit details
    Browse the repository at this point in the history

  5. Update scripts/output/projects/FABLE_India_subnational_validation.R 

    Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
    @PrantikaDas @mishkos
    PrantikaDas and mishkos committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    dc6b9d8 View commit details
    Browse the repository at this point in the history

  6. Update scripts/output/projects/FABLE_India_subnational_validation.R 

    Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
    @PrantikaDas @mishkos
    PrantikaDas and mishkos committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    35fb0d1 View commit details
    Browse the repository at this point in the history

  7. Update scripts/output/projects/FABLE_India_subnational_validation.R 

    Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
    @PrantikaDas @mishkos
    PrantikaDas and mishkos committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    6be25a2 View commit details
    Browse the repository at this point in the history

  8. Update scripts/output/projects/FABLE_India_subnational_validation.R 

    Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
    @PrantikaDas @mishkos
    PrantikaDas and mishkos committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    0de9439 View commit details
    Browse the repository at this point in the history

  9. Update scripts/output/projects/FABLE_India_subnational_validation.R 

    Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
    @PrantikaDas @mishkos
    PrantikaDas and mishkos committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    01cb9c8 View commit details
    Browse the repository at this point in the history

  10. Update scripts/output/projects/FABLE_India_subnational_validation.R 

    Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
    @PrantikaDas @mishkos
    PrantikaDas and mishkos committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    6e951ce View commit details
    Browse the repository at this point in the history

  11. Update scripts/output/projects/FABLE_India_subnational_validation.R 

    Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
    @PrantikaDas @mishkos
    PrantikaDas and mishkos committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    0f77313 View commit details
    Browse the repository at this point in the history

  12. Update scripts/output/projects/FABLE_India_subnational_validation.R 

    Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
    @PrantikaDas @mishkos
    PrantikaDas and mishkos committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    d79b8d6 View commit details
    Browse the repository at this point in the history

  13. Update scripts/output/projects/FABLE_India_subnational_validation.R 

    Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
    @PrantikaDas @mishkos
    PrantikaDas and mishkos committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    422b551 View commit details
    Browse the repository at this point in the history

  14. Update scripts/output/projects/FABLE_India_subnational_validation.R 

    Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
    @PrantikaDas @mishkos
    PrantikaDas and mishkos committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    cedc5d7 View commit details
    Browse the repository at this point in the history

  15. Update scripts/output/projects/FABLE_India_subnational_validation.R 

    Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
    @PrantikaDas @mishkos
    PrantikaDas and mishkos committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    6df5a9c View commit details
    Browse the repository at this point in the history

  16. Update scripts/output/projects/FABLE_India_subnational_validation.R 

    Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
    @PrantikaDas @mishkos
    PrantikaDas and mishkos committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    0eee3e4 View commit details
    Browse the repository at this point in the history

  17. Update scripts/output/projects/FABLE_India_subnational_validation.R 

    Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
    @PrantikaDas @mishkos
    PrantikaDas and mishkos committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    a9f21e3 View commit details
    Browse the repository at this point in the history

  18. Update scripts/output/projects/FABLE_India_subnational_validation.R 

    Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
    @PrantikaDas @mishkos
    PrantikaDas and mishkos committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    fc33a50 View commit details
    Browse the repository at this point in the history

  19. Merge pull request #500 from PrantikaDas/develop 

    added sub-national validation output script for India
    @mishkos
    mishkos committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    ab8472c View commit details
    Browse the repository at this point in the history

  20. copyright 2023

    @pfuehrlich-pik
    pfuehrlich-pik committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    fb924ea View commit details
    Browse the repository at this point in the history

  21. run insertheader.R

    @pfuehrlich-pik
    pfuehrlich-pik committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    1a520bc View commit details
    Browse the repository at this point in the history

  22. delete empty not_used.txt

    @pfuehrlich-pik
    pfuehrlich-pik committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    5fddf72 View commit details
    Browse the repository at this point in the history

  23. remove empty not_used.txt, remove header

    @pfuehrlich-pik
    pfuehrlich-pik committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    ac2a531 View commit details
    Browse the repository at this point in the history

  24. remove copyright not_used

    @pfuehrlich-pik
    pfuehrlich-pik committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    c6e1b75 View commit details
    Browse the repository at this point in the history

  25. insertheader -txt

    @pfuehrlich-pik
    pfuehrlich-pik committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    3030e92 View commit details
    Browse the repository at this point in the history

  26. start release script

    @pfuehrlich-pik
    pfuehrlich-pik committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    38d737e View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2023

  1. Merge pull request #501 from pfuehrlich-pik/develop 

    update copyright to 2023
    @pfuehrlich-pik
    pfuehrlich-pik committed Jan 12, 2023
    Configuration menu
    Copy the full SHA
    b261bc8 View commit details
    Browse the repository at this point in the history

  2. minor

    @pfuehrlich-pik
    pfuehrlich-pik committed Jan 12, 2023
    Configuration menu
    Copy the full SHA
    73772d4 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of github.com:pfuehrlich-pik/magpiemodel into … 

    …develop
    @pfuehrlich-pik
    pfuehrlich-pik committed Jan 12, 2023
    Configuration menu
    Copy the full SHA
    b0ecdbc View commit details
    Browse the repository at this point in the history

  4. more

    @pfuehrlich-pik
    pfuehrlich-pik committed Jan 12, 2023
    Configuration menu
    Copy the full SHA
    99a19ad View commit details
    Browse the repository at this point in the history

  5. magpie release 4.6.2

    @pfuehrlich-pik
    pfuehrlich-pik committed Jan 12, 2023
    Configuration menu
    Copy the full SHA
    7d50ddd View commit details
    Browse the repository at this point in the history