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

Integrated MAGICC7/AR6 climate assessments between REMIND iterations #1653

Merged
merged 68 commits into from
May 27, 2024
Merged

Integrated MAGICC7/AR6 climate assessments between REMIND iterations #1653

merged 68 commits into from
May 27, 2024

Commits on Sep 7, 2023

  1. ignore files created by the standalone scripts

    @gabriel-abrahao
    gabriel-abrahao committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    d32a491 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. Rscripts interfacing with OpenSCM

    Tonn Rüter committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    f2a204c View commit details
    Browse the repository at this point in the history

  2. Copy coupling Rscripts

    Tonn Rüter committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    b4e9e79 View commit details
    Browse the repository at this point in the history

  3. Introduce pre-post-solve phase

    Tonn Rüter committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    16293ba View commit details
    Browse the repository at this point in the history

  4. New module MAGICC7/AR6 integration

    Tonn Rüter committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    c87f647 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into pr/tonnrueter/4

    @gabriel-abrahao
    gabriel-abrahao committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    2b064d1 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' into pr/tonnrueter/4

    @gabriel-abrahao
    gabriel-abrahao committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    4cfc663 View commit details
    Browse the repository at this point in the history

  7. Merge pull request remindmodel#4 from tonnrueter/dev/ar6 

    Basis for MAGICC7/AR6-REMIND coupling
    @gabriel-abrahao
    gabriel-abrahao authored Mar 19, 2024
    Configuration menu
    Copy the full SHA
    d160379 View commit details
    Browse the repository at this point in the history

  8. Fix legacy reference to p15_gmt_conv

    @gabriel-abrahao
    gabriel-abrahao committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    003ba0c View commit details
    Browse the repository at this point in the history

  9. Sense working dir, create timestamped log file

    Tonn Rüter committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    f389c72 View commit details
    Browse the repository at this point in the history

  10. Disable REMIND python support for the time being

    Tonn Rüter committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    4b8d4fb View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2024

  1. Re-wrote and integrated *_prepare.R

    Tonn Rüter committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    2f73ba7 View commit details
    Browse the repository at this point in the history

  2. Scenario config for MAGICC7/AR6 debugging

    Tonn Rüter committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    256e730 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of github.com:remindmodel/remind into dev/ar6

    Tonn Rüter committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    04ffb23 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2024

  1. Post REMIND/develop merge: Renamed cm_peakBudgYr -> c_peakBudgYr

    Tonn Rüter committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    759e5b0 View commit details
    Browse the repository at this point in the history

  2. Post REMIND/develop merge: Renamed p15_gmt_conv -> pm_gmt_conv; pm_gm… 

    …t_conv init value set to 1; fixed in-file module names
    Tonn Rüter committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    050bac4 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. Add lucode to dependencies

    Tonn Rüter committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    2a76e94 View commit details
    Browse the repository at this point in the history

  2. Finished rewrite of *_run.R

    Tonn Rüter committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    c324861 View commit details
    Browse the repository at this point in the history

  3. Rewrite of *_writegdx

    Tonn Rüter committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    7db4d48 View commit details
    Browse the repository at this point in the history

  4. Corrected associateVariablesAndFiles

    Tonn Rüter committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    cf09cd3 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. Added GAMS related envs, fixed bug in temp dir creation

    Tonn Rüter committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    6931473 View commit details
    Browse the repository at this point in the history

  2. Added *_writegdx.R to *_run.R

    Tonn Rüter committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    0963ba2 View commit details
    Browse the repository at this point in the history

  3. Removed *_prepare.R, *_writegdxs.R

    Tonn Rüter committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    f37b174 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into dev/ar6

    Tonn Rüter committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    9cf1520 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2024

  1. Removed todos, commentary

    Tonn Rüter committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    f505956 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2024

  1. env var R_GAMS_SYSDIR required for gdxrrw usage

    Tonn Rüter committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    37b8b45 View commit details
    Browse the repository at this point in the history

  2. Removed unnecessary renameVariableRemindToMagicc7 function

    Tonn Rüter committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    caa0e9c View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2024

  1. Infiller db & probability file from config

    Tonn Rüter committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    dd40853 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of github.com:remindmodel/remind into dev/ar6

    Tonn Rüter committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    d19b364 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of github.com:remindmodel/remind into develop

    Tonn Rüter committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    98a96d4 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2024

  1. Need to use years/periods from initial emi report

    @tonnrueter
    tonnrueter committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    57eb5ff View commit details
    Browse the repository at this point in the history

  2. Ignore input folder in root dir, but allow files from /scripts/input

    @tonnrueter
    tonnrueter committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    363f157 View commit details
    Browse the repository at this point in the history

  3. climate_assessment_r_gams_dir removed, use GAMSROOT instead

    @tonnrueter
    tonnrueter committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    82b2f6c View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2024

  1. Moved gdx unload to postsolve, fixed filename

    Tonn Rüter committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    4b691e7 View commit details
    Browse the repository at this point in the history

  2. Remove superfluous MAGICC6 call

    Tonn Rüter committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    a1f0702 View commit details
    Browse the repository at this point in the history

  3. Removed deprecated emiscen forcing target

    Tonn Rüter committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    7a4849f View commit details
    Browse the repository at this point in the history

  4. Removed outcommented gdx dump

    Tonn Rüter committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    726d708 View commit details
    Browse the repository at this point in the history

  5. Introducing script for temperature impulse response for SCC/MAGICC7 runs

    Tonn Rüter committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    62f58f1 View commit details
    Browse the repository at this point in the history

  6. Exclude /scripts/input folder from .gitignore

    Tonn Rüter committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    f58c9bb View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop' of github.com:remindmodel/remind into dev/ar6_pr

    Tonn Rüter committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    693e7b4 View commit details
    Browse the repository at this point in the history

  8. Set R_GAMS_SYSDIR to GAMSROOT

    Tonn Rüter committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    2901e76 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. Removed scenario_config_magicc.csv

    Tonn Rüter committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    fa91c5c View commit details
    Browse the repository at this point in the history

  2. Renamed climate realization 'ar6' to 'magicc7_ar6'

    Tonn Rüter committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    df9cc75 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of github.com:remindmodel/remind into develop

    Tonn Rüter committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    1de03fc View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dev/ar6_pr' into develop

    Tonn Rüter committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    805943b View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' of github.com:remindmodel/remind into dev/ar6_pr

    Tonn Rüter committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    67640b9 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' into dev/ar6_pr

    Tonn Rüter committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    fcb4438 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2024

  1. Merge branch 'develop' of github.com:remindmodel/remind into develop

    Tonn Rüter committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    4ffcd41 View commit details
    Browse the repository at this point in the history

  2. Removed pm_budgetCO2eq, sm_budgetCO2eqGlob from climate realization m… 

    …agicc7_ar6
    Tonn Rüter committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    8ba0fba View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. Consolidated runtime logging

    Tonn Rüter committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    ccc587e View commit details
    Browse the repository at this point in the history

  2. Archiving, entire log goes to log_climate.txt includung system(..) ca… 

    …lls, Report runtimes in sec
    Tonn Rüter committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    ef4bdb1 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2024

  1. Do not archive fulldata_postsolve.gdx

    Tonn Rüter committed May 2, 2024
    Configuration menu
    Copy the full SHA
    6d2eff5 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. Draft openscm runner interface

    @gabriel-abrahao
    gabriel-abrahao committed May 24, 2024
    Configuration menu
    Copy the full SHA
    1413a63 View commit details
    Browse the repository at this point in the history

  2. First version of new TIRF script

    @gabriel-abrahao
    gabriel-abrahao committed May 24, 2024
    Configuration menu
    Copy the full SHA
    0f1f876 View commit details
    Browse the repository at this point in the history

  3. Added MAGICC7_AR6 to default output scripts

    Tonn Rüter committed May 24, 2024
    Configuration menu
    Copy the full SHA
    b366deb View commit details
    Browse the repository at this point in the history

  4. Cleanup to make linter happy

    Tonn Rüter committed May 24, 2024
    Configuration menu
    Copy the full SHA
    0c957f2 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'dev/ar6_pr' into develop

    Tonn Rüter committed May 24, 2024
    Configuration menu
    Copy the full SHA
    2cd6af6 View commit details
    Browse the repository at this point in the history

  6. Removed unnecessary comment

    Tonn Rüter committed May 24, 2024
    Configuration menu
    Copy the full SHA
    ff8d6ed View commit details
    Browse the repository at this point in the history

  7. Use SCM conda environment on cluster

    Tonn Rüter committed May 24, 2024
    Configuration menu
    Copy the full SHA
    f99c408 View commit details
    Browse the repository at this point in the history

  8. Turn archiving off per default

    Tonn Rüter committed May 24, 2024
    Configuration menu
    Copy the full SHA
    d357121 View commit details
    Browse the repository at this point in the history

  9. Use moste recent version of remind2 (new convGDX2Mif)

    Tonn Rüter committed May 24, 2024
    Configuration menu
    Copy the full SHA
    f16748a View commit details
    Browse the repository at this point in the history

  10. Remove superfluous data dump

    Tonn Rüter committed May 24, 2024
    Configuration menu
    Copy the full SHA
    284c0a0 View commit details
    Browse the repository at this point in the history

  11. Removed python script

    Tonn Rüter committed May 24, 2024
    Configuration menu
    Copy the full SHA
    7de93f9 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'develop' of github.com:remindmodel/remind into develop

    Tonn Rüter committed May 24, 2024
    Configuration menu
    Copy the full SHA
    ee3eec6 View commit details
    Browse the repository at this point in the history

  13. Assume temperatures keep constant after 2100

    @gabriel-abrahao
    gabriel-abrahao authored May 24, 2024
    Configuration menu
    Copy the full SHA
    49f3fa0 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2024

  1. Changed folder to climate-assessment-data, extended run time reporting

    Tonn Rüter committed May 27, 2024
    Configuration menu
    Copy the full SHA
    03bead9 View commit details
    Browse the repository at this point in the history

  2. Fix call to TIRF script

    @gabriel-abrahao
    gabriel-abrahao committed May 27, 2024
    Configuration menu
    Copy the full SHA
    868f2a3 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of https://github.com/tonnrueter/remind into d… 

    …evelop
    @gabriel-abrahao
    gabriel-abrahao committed May 27, 2024
    Configuration menu
    Copy the full SHA
    b326f00 View commit details
    Browse the repository at this point in the history