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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FSEC modeling script for global runs #426

Merged
merged 66 commits into from
Aug 17, 2022
Merged

FSEC modeling script for global runs #426

merged 66 commits into from
Aug 17, 2022

Commits on Jul 12, 2022

  1. Merge pull request #47 from magpiemodel/develop 

    Develop
    @FelicitasBeier
    FelicitasBeier committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    ca6f684 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2022

  1. rewrite of FSEC script structure

    @FelicitasBeier
    FelicitasBeier committed Jul 14, 2022
    Configuration menu
    Copy the full SHA
    4df0c5a View commit details
    Browse the repository at this point in the history

  2. add scenario config for FSEC

    @FelicitasBeier
    FelicitasBeier committed Jul 14, 2022
    Configuration menu
    Copy the full SHA
    0029e10 View commit details
    Browse the repository at this point in the history

  3. bugfix

    @FelicitasBeier
    FelicitasBeier committed Jul 14, 2022
    Configuration menu
    Copy the full SHA
    3f5dd13 View commit details
    Browse the repository at this point in the history

  4. removed missing switch from scenario config

    @FelicitasBeier
    FelicitasBeier committed Jul 14, 2022
    Configuration menu
    Copy the full SHA
    c1eaf9f View commit details
    Browse the repository at this point in the history

  5. bugfix

    @FelicitasBeier
    FelicitasBeier committed Jul 14, 2022
    Configuration menu
    Copy the full SHA
    ee47d9b View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2022

  1. set results folder title

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

  2. delted results folder line as already default

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

Commits on Jul 18, 2022

  1. Merge branch 'magpiemodel:develop' into develop

    @FelicitasBeier
    FelicitasBeier committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    40336c8 View commit details
    Browse the repository at this point in the history

  2. included idea of scenario combinations

    @FelicitasBeier
    FelicitasBeier committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    ee68b7a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into FSECmodeling

    @FelicitasBeier
    FelicitasBeier committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    a473681 View commit details
    Browse the repository at this point in the history

  4. updated and clean up FSEC starting scripts

    @FelicitasBeier
    FelicitasBeier committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    c7da28e View commit details
    Browse the repository at this point in the history

  5. updated to newest preprocessing

    @FelicitasBeier
    FelicitasBeier committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    6c76ddf View commit details
    Browse the repository at this point in the history

  6. bugfix: missing comma and deleted old file

    @FelicitasBeier
    FelicitasBeier committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    55d80c3 View commit details
    Browse the repository at this point in the history

  7. bufix: comma

    @FelicitasBeier
    FelicitasBeier committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    d5d1cd8 View commit details
    Browse the repository at this point in the history

  8. bugfix: introduced comma instead of semicolon by accident

    @FelicitasBeier
    FelicitasBeier committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    39204f6 View commit details
    Browse the repository at this point in the history

  9. changed version number call

    @FelicitasBeier
    FelicitasBeier committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    131cd6f View commit details
    Browse the repository at this point in the history

  10. food realization in quotes

    @FelicitasBeier
    FelicitasBeier committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    cca8eea View commit details
    Browse the repository at this point in the history

  11. test of excluding FSEC from BAU

    @FelicitasBeier
    FelicitasBeier committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    d32a448 View commit details
    Browse the repository at this point in the history

  12. update

    @FelicitasBeier
    FelicitasBeier committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    4277c66 View commit details
    Browse the repository at this point in the history

  13. updated calibration file

    @FelicitasBeier
    FelicitasBeier committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    7d746b5 View commit details
    Browse the repository at this point in the history

  14. update

    @FelicitasBeier
    FelicitasBeier committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    720aad5 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2022

  1. update fsdp setting

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

  2. Merge branch 'magpiemodel:develop' into develop

    @FelicitasBeier
    FelicitasBeier committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    714052b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into FSECmodeling

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

  4. bugfix: missing comma

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

  5. old calibration file

    @FelicitasBeier
    FelicitasBeier committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    58bb2b1 View commit details
    Browse the repository at this point in the history

  6. update calibration run file

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

  7. bugfix:missing r

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

  8. bugfix: missing r in monogastrics

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

Commits on Jul 25, 2022

  1. updated scenario names

    @FelicitasBeier
    FelicitasBeier committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    c6166df View commit details
    Browse the repository at this point in the history

  2. included airPollution in FSDP and allEnvironment

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

  3. updated version number

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

  4. updated recalibration run number

    @FelicitasBeier
    FelicitasBeier committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    0d46db3 View commit details
    Browse the repository at this point in the history

  5. included non-food system emission switch

    @FelicitasBeier
    FelicitasBeier committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    b9bfafe View commit details
    Browse the repository at this point in the history

  6. updated calibration script

    @FelicitasBeier
    FelicitasBeier committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    343d239 View commit details
    Browse the repository at this point in the history

  7. revert calib for new calibration run

    @FelicitasBeier
    FelicitasBeier committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    7961569 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2022

  1. updated calibration title

    @FelicitasBeier
    FelicitasBeier committed Jul 26, 2022
    Configuration menu
    Copy the full SHA
    78e2f42 View commit details
    Browse the repository at this point in the history

  2. updated scenario naming

    @FelicitasBeier
    FelicitasBeier committed Jul 26, 2022
    Configuration menu
    Copy the full SHA
    4042462 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2022

  1. Merge branch 'magpiemodel:develop' into develop

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

  2. updated scripts

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

  3. updated recalibration script

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

  4. Merge branch 'develop' into FSECmodeling

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

  5. added output scripts

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

  6. included new pasture realization

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

  7. added population scenario output script

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

Commits on Jul 29, 2022

  1. updated calibration

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

  2. bugfix: typo in timberCities

    @FelicitasBeier
    FelicitasBeier committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    434ff32 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2022

  1. bugfix: allDiet and allDietAndWaste

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

Commits on Aug 3, 2022

  1. changed naming of SSPs and FSDP scenarios

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

  2. updated scripts for version 13

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

  3. Merge branch 'magpiemodel:develop' into develop

    @FelicitasBeier
    FelicitasBeier committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    72b562e View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into FSECmodelingTest

    @FelicitasBeier
    FelicitasBeier committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    31944ac View commit details
    Browse the repository at this point in the history

  5. removed grid population from scenario_fsec.csv for now

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

Commits on Aug 6, 2022

  1. relaxed tau constraint to make land sparing possible

    @FelicitasBeier
    FelicitasBeier committed Aug 6, 2022
    Configuration menu
    Copy the full SHA
    86a37d7 View commit details
    Browse the repository at this point in the history

  2. updated model version

    @FelicitasBeier
    FelicitasBeier committed Aug 6, 2022
    Configuration menu
    Copy the full SHA
    7ce3964 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2022

  1. added griddedPopulation download

    @FelicitasBeier
    FelicitasBeier committed Aug 8, 2022
    Configuration menu
    Copy the full SHA
    eca1fcf View commit details
    Browse the repository at this point in the history

  2. bugfix related to gridded population data download

    @FelicitasBeier
    FelicitasBeier committed Aug 8, 2022
    Configuration menu
    Copy the full SHA
    fec156a View commit details
    Browse the repository at this point in the history

  3. updated getReport to include waterIndicators

    @FelicitasBeier
    FelicitasBeier committed Aug 8, 2022
    Configuration menu
    Copy the full SHA
    dfa1357 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2022

  1. updated Changelog and minor fixes

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

Commits on Aug 10, 2022

  1. requested changes for PR

    @FelicitasBeier
    FelicitasBeier committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    1723be2 View commit details
    Browse the repository at this point in the history

  2. magicc_emis_scen to NULL by default

    @FelicitasBeier
    FelicitasBeier committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    1e95eb8 View commit details
    Browse the repository at this point in the history

  3. changed order of allEmis call in FSDP scenario

    @FelicitasBeier
    FelicitasBeier committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    96302b7 View commit details
    Browse the repository at this point in the history

  4. bugfix in magicc_emis NULL in quotes

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

Commits on Aug 15, 2022

  1. updated rds_report_iso.R output script to include directory argument

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

Commits on Aug 16, 2022

  1. magicc back to ssp2 default

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