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.

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

New EAT Lancet Diet Implementation #625

Merged
merged 88 commits into from
Feb 24, 2024
Merged
Show file tree
Hide file tree
Changes from 62 commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
6d85f03
model-internal EAT Lancet diet implementation following Isabelles draft
FelicitasBeier Aug 10, 2023
52afec6
add standalone tests
FelicitasBeier Aug 11, 2023
f9a9b55
bugfixing standalone scripts
FelicitasBeier Aug 15, 2023
346022c
included display statements for checking
FelicitasBeier Aug 21, 2023
e70ab17
Merge branch 'develop' into EATdietModel
FelicitasBeier Aug 21, 2023
3d58d99
added EAT2p0 start script for scenarios to be reported by MAgPIE
FelicitasBeier Aug 25, 2023
ada0952
Merge branch 'magpiemodel:develop' into develop
FelicitasBeier Aug 29, 2023
958950f
Merge branch 'magpiemodel:develop' into develop
FelicitasBeier Nov 29, 2023
36cd9fb
added eat2p0 reporting output script and eat2p0 start script for core…
FelicitasBeier Nov 29, 2023
bcae77d
bugfix in eat2p0 start script
FelicitasBeier Nov 29, 2023
77e33c2
Merge branch 'magpiemodel:master' into EATdietModel
FelicitasBeier Dec 4, 2023
924dabd
updated EAT2p0 related start and output scripts
FelicitasBeier Dec 4, 2023
6ab8aba
merge newest develop into EATdietModel branch
FelicitasBeier Dec 4, 2023
851e1f8
update agmip output script
FelicitasBeier Dec 4, 2023
d664588
new sets in standalone food demand model
FelicitasBeier Dec 4, 2023
2e8003c
updated preprocessing for EAT runs
FelicitasBeier Dec 5, 2023
f11de07
remove TRUE argument from getReportAgMIP as it might cause error
FelicitasBeier Dec 5, 2023
b454033
Merge branch 'magpiemodel:develop' into develop
FelicitasBeier Dec 11, 2023
f819166
added small amount to p15_intake_detail where sum over food products …
FelicitasBeier Dec 12, 2023
791c26b
bugfix of too many )
FelicitasBeier Dec 13, 2023
0be1aa2
splitting cassav_sp category in starchy fruits and roots
FelicitasBeier Dec 20, 2023
9b30b18
bugfix dimension mismatch in fruitveg2others ratio
FelicitasBeier Dec 20, 2023
60122c0
bugfix of starchyfruit
FelicitasBeier Dec 20, 2023
d29556a
bugfix wrong staples definition with new cassava treatment in new imp…
FelicitasBeier Dec 20, 2023
6c130ce
test summation mapping and parentheses
FelicitasBeier Jan 4, 2024
3ffd65b
bugfix in display statements
FelicitasBeier Jan 4, 2024
dcd3300
bugfix in display statment
FelicitasBeier Jan 4, 2024
22c8d9c
bugfixes after Benni's code review
FelicitasBeier Jan 5, 2024
af41e84
decomposing EATLancet diet into single targets
FelicitasBeier Jan 5, 2024
ddabcec
correct typo
FelicitasBeier Jan 5, 2024
245c11b
re-introduced mapping between magpie and eat categories for division …
FelicitasBeier Jan 8, 2024
3ab7734
updated preprocessing tgzs
FelicitasBeier Jan 8, 2024
ce560c6
bugfixes in new DietImplementation with target separation
FelicitasBeier Jan 9, 2024
37e3537
groundnuts is allocated to nuts because of dietary target
FelicitasBeier Jan 9, 2024
0099c45
bugfix in old diet implementation
FelicitasBeier Jan 10, 2024
bd40509
Merge branch 'magpiemodel:develop' into develop
FelicitasBeier Jan 10, 2024
03e71db
merged newest develop into EATdietModel branch
FelicitasBeier Jan 10, 2024
da7cac1
separation of peanuts from nuts
FelicitasBeier Jan 11, 2024
4960920
bugfix in peanuts implementation and in eat1 as it diverged from develop
FelicitasBeier Jan 11, 2024
dc9f7d5
changed iso-level fruitveg ratio to regional level
FelicitasBeier Jan 12, 2024
207de3e
bugfix in way fruitveg2other parameter is written into the future
FelicitasBeier Jan 15, 2024
a200ed4
bugfix balancing equation
FelicitasBeier Jan 17, 2024
9195bcc
separation of targets is now the same as before (monogastric and rumi…
FelicitasBeier Jan 17, 2024
400eb2d
abort statement if intake_detail_scen_target is negative
FelicitasBeier Jan 18, 2024
c121a67
clean-up
FelicitasBeier Jan 18, 2024
857034b
Merge branch 'magpiemodel:develop' into develop
FelicitasBeier Jan 18, 2024
a4a3a8e
Merge branch 'develop' into EATdietModel
FelicitasBeier Jan 18, 2024
0f666a3
clean up after check worflow run failed
FelicitasBeier Jan 18, 2024
2b67fe5
added missing description
FelicitasBeier Jan 18, 2024
8bc839d
nuts in others are scaled by the same amount as fruits and vegetables…
FelicitasBeier Jan 22, 2024
77e0f63
scaling of nuts together with fruits and veggies and abort statement …
FelicitasBeier Jan 29, 2024
bc3eea9
code improvements following Bennis suggestions and correction of calo…
FelicitasBeier Jan 29, 2024
1d12ac6
set already under control fix
FelicitasBeier Jan 29, 2024
7e9cd64
small bufix
FelicitasBeier Jan 29, 2024
8f1f0ac
cleanup
FelicitasBeier Jan 30, 2024
e6f66de
re-introduced combined target for nuts (seeds and groundnut)
FelicitasBeier Feb 1, 2024
ce8201e
Merge branch 'magpiemodel:develop' into develop
FelicitasBeier Feb 1, 2024
b341a7e
merged new develop into eatDiet branch
FelicitasBeier Feb 1, 2024
511181a
bugfixes and update of brans and alcohol default
FelicitasBeier Feb 1, 2024
c460715
updated config and included test
FelicitasBeier Feb 1, 2024
ef4fd1e
updated preprocessing revision to 4.99
FelicitasBeier Feb 5, 2024
3e4b0a8
delte testing script
FelicitasBeier Feb 5, 2024
89eb613
updated renv setting
FelicitasBeier Feb 7, 2024
adbbca6
Shuffled authors in food module
FelicitasBeier Feb 7, 2024
e142384
removed unnecessary display statements
FelicitasBeier Feb 7, 2024
a99409e
Merge branch 'EATdietModel' of github.com:FelicitasBeier/magpie into …
FelicitasBeier Feb 7, 2024
89854b6
improvements recommended by Bennis review
FelicitasBeier Feb 9, 2024
c95f929
added roots switch to scenario config files
FelicitasBeier Feb 12, 2024
c81d111
added new column with EATLancet 2 diet for coupled runs in magpie sce…
FelicitasBeier Feb 12, 2024
0fc7724
added productivity increase in EATLancet 2 diet scenario
FelicitasBeier Feb 12, 2024
28393d0
Update CHANGELOG.md
FelicitasBeier Feb 15, 2024
af7249d
Update default.cfg
FelicitasBeier Feb 15, 2024
003c3e7
Update literature.bib
FelicitasBeier Feb 15, 2024
156bed0
Update default.cfg
FelicitasBeier Feb 15, 2024
1f2f969
Update default.cfg
FelicitasBeier Feb 15, 2024
9a673b9
Update default.cfg
FelicitasBeier Feb 15, 2024
34b9621
updated EAT2p0 start script
FelicitasBeier Feb 19, 2024
1f4add9
Update default.cfg
FelicitasBeier Feb 19, 2024
9cbd71f
Merge branch 'EATdietModel' of github.com:FelicitasBeier/magpie into …
FelicitasBeier Feb 19, 2024
efefb22
small fixed requested in the review from Isabelle and renaming to sti…
FelicitasBeier Feb 19, 2024
fa1c114
update nuts correction based on Isabelles review
FelicitasBeier Feb 19, 2024
fb8fad1
bugfixes
FelicitasBeier Feb 19, 2024
9917c46
bugfixes
FelicitasBeier Feb 20, 2024
faab9ff
Merge branch 'magpiemodel:develop' into develop
FelicitasBeier Feb 21, 2024
8062a89
merged develop into EAT branch
FelicitasBeier Feb 21, 2024
42ce67c
code cleanup: remove unused scalars
FelicitasBeier Feb 21, 2024
787dc29
Merge branch 'EATdietModel' of github.com:FelicitasBeier/magpie into …
FelicitasBeier Feb 21, 2024
4b4c75b
updated comment in default.cfg
FelicitasBeier Feb 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [Unreleased]

### changed
- **15_food** Added improved EAT Lancet diet implementation (EAT 2p0)
- **default.cfg** update input data to rev 4.99 (new validation data, new EATLancet recommendations, new semi-natural vegtation cropland data)
- **start_functions** Check if cfg$recalibrate is consistent with cfg$gms$s14_use_yield_calib
- **31_past** in grasslands_apr22 realization: changed structure of f31_pastr_suitability to align with ssp-rcp specific input data formulation. Changed input filename from cs3 to cs2. Added `cc`, `nocc` and `nocc_hist` options for `i31_manpast_suit` and changed input gams code from table to parameter. Climate scenario assignment moved from preloop.gms to input.gms. Removed pastSuit set in sets.gms as not needed anymore. Adjusted not_used.txt in both grasslands_apr22 and static realizations.
- **default.cfg** Default for cfg$gms$peatland changed from `on` to `v2`
Expand All @@ -16,7 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- **scenario_config.csv** settings for cfg$gms$s35_secdf_distribution in `ForestryEndo` and `ForestryExo` changed from `2` to `0`
- **scenario_config.csv** removed erroneous setting `cc` from column `input`
- **default.cfg** update default `cfg$gms$c56_pollutant_prices` and `cfg$gms$c60_2ndgen_biodem` to `R32M46-SSP2EU-NPi`
- **default.cfg** update input data to rev 4.96
- **default.cfg** update input data to rev 4.96
FelicitasBeier marked this conversation as resolved.
Show resolved Hide resolved
- **default.cfg** changed default for `cfg$gms$s56_buffer_aff` from 0.2 to 0.5
- **default.cfg** changed default for `cfg$gms$s32_aff_prot` from 0 to 1
- **21_trade** s21_trade_bal_damper for roundwood changed from 0.75 to 0.65
Expand Down
100 changes: 55 additions & 45 deletions config/default.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ cfg$model <- "main.gms" #def = "main.gms"
#### input settings ####

# which input data sets should be used?
cfg$input <- c(regional = "rev4.96_h12_magpie.tgz",
cellular = "rev4.96_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz",
validation = "rev4.96_h12_validation.tgz",
additional = "additional_data_rev4.47.tgz",
cfg$input <- c(regional = "rev4.99_h12_magpie.tgz",
cellular = "rev4.99_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz",
validation = "rev4.99_h12_validation.tgz",
additional = "additional_data_rev4.46.tgz",
FelicitasBeier marked this conversation as resolved.
Show resolved Hide resolved
calibration = "calibration_H12_per_ton_fao_may22_glo_08Aug23.tgz")

# NOTE: It is recommended to recalibrate the model when changing cellular input data
Expand Down Expand Up @@ -56,8 +56,8 @@ cfg$force_download <- FALSE
cfg$force_replace <- FALSE

# Settings for the yield calibration
# For this yield calibration (that uses results from a special MAgPIE calibration run
# triggered by the recalibrate switch) to be activated the switch s14_use_yield_calib needs
# For this yield calibration (that uses results from a special MAgPIE calibration run
# triggered by the recalibrate switch) to be activated the switch s14_use_yield_calib needs
# to be turned on. (Default is off)
# This switch should only be activated for penalty_apr22 crop realization.
# For other realizations, it is recommended not to use this yield calibration.
Expand Down Expand Up @@ -325,7 +325,7 @@ cfg$gms$s14_degradation <- 0 # def = 0

# Switch to toggle the use of yield calibration factors (that resulted from a calibration run).
# If 0, no yield calibration factors are used, meaning all calibration factors are set to 1.
# If 1, yield calibration factors are used. (For this option to function, either an existing calibration file
# If 1, yield calibration factors are used. (For this option to function, either an existing calibration file
# must be supplied in the input directory, or yields must be recalibrated during preprocessing.)
# This switch should only be activated for penalty_apr22 crop realization.
# For other realizations, it is recommended not to use this yield calibration.
Expand Down Expand Up @@ -421,16 +421,25 @@ cfg$gms$s15_exo_waste <- 0 # def = 0
# * (1.2): corresponds to 20% food waste ~ half waste of HIC
cfg$gms$s15_waste_scen <- 1.2 # def = 1.2

# * switch for transition to exogenous diet scenarios (EAT Lancet and National Institute of Nutrition (NIN))
# * (2): transition towards exogenous diets (NIN for India and EAT for other regions)
# * Please use this switch in combination with cfg$gms$c15_EAT_scen <- "FLX_hmilk"
# * If only India's diet needs to be changed, then set cfg$gms$scen_countries15 <- "IND"
# * (1): transition towards exogenous diets and food demand
# * (0): regression-based estimation of diets and food demand
# * Switch for transition to exogenous diet scenarios
# * (EAT Lancet and National Institute of Nutrition (NIN))
# * (3): MAgPIE-specific realization of the EAT-Lancet diet, where model-internal
# * (regression-based) food demand projections are constrained by ranges for
# * intake targets of food groups to ensure healthy and sustainable diets as
# * recommended by the EAT-Lancet Commission
# * (2): transition towards exogenous diets (NIN for India and EAT for other regions)
# * Please use this switch in combination with cfg$gms$c15_EAT_scen <- "FLX_hmilk"
# * If only India's diet needs to be changed, then set cfg$gms$scen_countries15 <- "IND"
# * (1): transition towards exogenous diets and food demand parametrized
# * to a food-specific data set published by the EAT-Lancet Commission
# * (Willett et al., 2019). This EATLancet implementation is deprecated.
FelicitasBeier marked this conversation as resolved.
Show resolved Hide resolved
# * Please use MAgPIE-specific realization of the EAT-Lancet diet (3)
# * for EATLancet diet.
# * (0): regression-based estimation of diets and food demand
cfg$gms$s15_exo_diet <- 0 # def = 0

# * exogenous calorie scenario (EAT Lancet diet scenarios)
# * only activated if s15_exo_diet is set to 1
# * only activated if s15_exo_diet is > 0
# * options: healthy_BMI, 2100kcal, 2500kcal,
# * endo, no_underweight, no_overweight
# * half_overweight, no_underweight_half_overweight
Expand All @@ -445,35 +454,36 @@ cfg$gms$s15_exo_diet <- 0 # def = 0
cfg$gms$c15_kcal_scen <- "healthy_BMI" # def = healthy_BMI
#
# * exogenous food-specific diet scenario (EAT Lancet diet scenarios)
# * only activated if s15_exo_diet is set to 1
FelicitasBeier marked this conversation as resolved.
Show resolved Hide resolved
# * only activated if s15_exo_diet is > 0
# * options: BMK, FLX, PSC, VEG, VGN, FLX_hmilk, FLX_hredmeat
cfg$gms$c15_EAT_scen <- "FLX" # def = FLX

# * Subspecifications: Which commodities shall be included in the diet shift
# * Sub-specifications: Which commodities shall be included in the diet shift
# * towards cfg$gms$c15_EAT_scen ? Only selected (1) commodities will be
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

replace "included in the diet shift towards cfg$gms$c15_EAT_scen" with
"included in the shift towards the selected scenario diet"

# * included, while the others will remain to be endogenous.
# * Any shift will be compensated to reach the calorie target by adjusting
# * staple calories.
cfg$gms$s15_exo_monogastric <- 1 # def = 1, options: 0,1
cfg$gms$s15_exo_ruminant <- 1 # def = 1, options: 0,1
cfg$gms$s15_exo_fish <- 1 # def = 1, options: 0,1
cfg$gms$s15_exo_fruitvegnut <- 1 # def = 1, options: 0,1
cfg$gms$s15_exo_pulses <- 1 # def = 1, options: 0,1
cfg$gms$s15_exo_sugar <- 1 # def = 1, options: 0,1
cfg$gms$s15_exo_oils <- 1 # def = 1, options: 0,1
cfg$gms$s15_exo_brans <- 1 # def = 1, options: 0,1
cfg$gms$s15_exo_scp <- 1 # def = 1, options: 0,1
cfg$gms$s15_exo_monogastric <- 1 # def = 1, options: 0,1
cfg$gms$s15_exo_ruminant <- 1 # def = 1, options: 0,1
cfg$gms$s15_exo_fish <- 1 # def = 1, options: 0,1
cfg$gms$s15_exo_fruitvegnutroots <- 1 # def = 1, options: 0,1
FelicitasBeier marked this conversation as resolved.
Show resolved Hide resolved
cfg$gms$s15_exo_pulses <- 1 # def = 1, options: 0,1
cfg$gms$s15_exo_sugar <- 1 # def = 1, options: 0,1
cfg$gms$s15_exo_oils <- 1 # def = 1, options: 0,1
cfg$gms$s15_exo_brans <- 0 # def = 0 (as no target defined in EATLancet. with 1: brans are set to 0), options: 0,1
cfg$gms$s15_exo_scp <- 1 # def = 1, options: 0,1

# * Scenario target for the inclusion of alcohol in the EAT-Lancet diet
# * The EAT-Lancet diet only allows for added sugars, but does not include processed food or
# * alcohol.
# * only activated if s15_exo_diet is set to 1
cfg$gms$s15_exo_alcohol <- 1 # default: 1
# * The EAT-Lancet diet only allows for added sugars,
# * but does not include processed food or alcohol.
# * Only activated if s15_exo_diet is set to 1
FelicitasBeier marked this conversation as resolved.
Show resolved Hide resolved
cfg$gms$s15_exo_alcohol <- 1 # def = 1, options: 0,1
# * Via 's15_alc_scen' a maximum target for alcohol consumption can be defined.
# * Only activated if s15_exo_alcohol = 1
# * (0): no alcohol consumption, as in the original version of the EAT-Lancet diet
# * (0.014): maximum target for alcohol consumption is 1.4% of total calorie consumption
# * (see Lassen et al., 2020)
cfg$gms$s15_alc_scen <- 0.014 # def = 0.014
cfg$gms$s15_alc_scen <- 0 # def = 0
#
#
# * Switch and specification of countries for which exogenous food scenarios
Expand Down Expand Up @@ -772,11 +782,11 @@ cfg$gms$s32_max_aff_area <- Inf # def = Inf
# Protection of afforested areas (endogenous CO2 price driven)
# 0=until end of planning horizon (see s32_planing_horizon)
# 1=forever
# Note: Without a price on CO2 emissions from land-use change in module 32_forestry,
# which is the current default (c56_emis_policy <- "reddnatveg_nosoil"),
# the recommended setting for s32_aff_prot is 1.
# Otherwise, the model can do re/afforestation on existing re/afforestation areas
# after the end of planning horizon without penalty for CO2 emissions.
# Note: Without a price on CO2 emissions from land-use change in module 32_forestry,
# which is the current default (c56_emis_policy <- "reddnatveg_nosoil"),
# the recommended setting for s32_aff_prot is 1.
# Otherwise, the model can do re/afforestation on existing re/afforestation areas
# after the end of planning horizon without penalty for CO2 emissions.
cfg$gms$s32_aff_prot <- 1 # def = 1

# Type of afforestation constraint
Expand Down Expand Up @@ -1271,7 +1281,7 @@ cfg$gms$c50_scen_neff_noselect <- "baseeff_add3_add5_add10_max65" # def = base

# * For pastures, only two scenarios exist: a constant scenario, and one where
# * the minimum NUE increases to 55,60 and 65% for 2020,2050 and 2100, to avoid
# * that pastures which dont have a nutrient deficit are fertilized
# * that pastures which do not have a nutrient deficit are fertilized
# * (historical NUE may be low despite no fertilization)
# * Options:
# * constant, constant_min55_min60_min65
Expand Down Expand Up @@ -1364,7 +1374,7 @@ cfg$gms$s56_cprice_red_factor <- 1 # def = 1
# * Note: For best consistency it is recommended to use trajectories from the most recent
# * coupled REMIND-MAgPIE runs. Currently, this is R32M46.
# * Available options:
# * none: no 2nd generation bioenergy demand
# * none: no 2nd generation bioenergy demand
# * R32M46: Coupled REMIND-MAgPIE runs with REMIND 3.2.1.dev412 and MAgPIE 4.6.11
# * NPi: Current policies; limit peak warming to 3.0°C
# * NDC: Nationally determined contributions; limit peak warming to 2.5°C
Expand Down Expand Up @@ -1463,9 +1473,9 @@ cfg$gms$c56_cprice_aff <- "secdforest_vegc" # def = secdforest_vegc
# * should not be higher than s32_planing_horizon
cfg$gms$s56_c_price_exp_aff <- 50 # def = 50

# * Share of carbon credits for re/afforestation projects set aside in a buffer to
# * Share of carbon credits for re/afforestation projects set aside in a buffer to
# * account for potential failure of permanent carbon storage.
# * Alternatively, this parameter can be interpreted as a reduction factor
# * Alternatively, this parameter can be interpreted as a reduction factor
# * of the carbon price for non-permanent CDR.
# * Values > 0 will reduce the incentive for c-price-induced re/afforestation
cfg$gms$s56_buffer_aff <- 0.5 # def = 0.5
Expand Down Expand Up @@ -1548,10 +1558,10 @@ cfg$gms$s57_maxmac_ch4_awms <- -1 # def = -1

# ***--------------------- 58_peatland ------------------------------------
# * (off): Peatland area and associated GHG emissions are assumed zero
# * (v2): Peatland area is initialized with degraded and intact peatland area for the year 2022,
# * (v2): Peatland area is initialized with degraded and intact peatland area for the year 2022,
# * and projected into the future based on changes in managed land.
# * For boreal and tropical climates, GHG emissions are calculated using emission
# * factors from the IPCC 2013 Wetland supplement. For temperate climates, more recent
# * For boreal and tropical climates, GHG emissions are calculated using emission
# * factors from the IPCC 2013 Wetland supplement. For temperate climates, more recent
# * estimates from Tiemeyer et al 2020 are used.
cfg$gms$peatland <- "v2" # def = v2

Expand All @@ -1572,8 +1582,8 @@ cfg$gms$s58_cost_drain_rewet_onetime <- 0 # def = 0
cfg$gms$s58_cost_drain_recur <- 0 # def = 0


# * Switch for fixing peatland area until the year given by s58_fix_peatland to historic levels (not available in `off`).
# * Note: In the realisation `v2`, historic peatland area is only available for the year 2022.
# * Switch for fixing peatland area until the year given by s58_fix_peatland to historic levels (not available in `off`).
# * Note: In the realisation `v2`, historic peatland area is only available for the year 2022.
# * Due to the 5-year time step limitation in MAgPIE, the suggested default is 2020.
# * Fixing peatland area in previous time steps provides a better
# * proxy for GHG emissions from peatlands than assuming no peatland area.
Expand Down Expand Up @@ -1625,7 +1635,7 @@ cfg$gms$c60_1stgen_biodem <- "const2020" # def = const2020
# * Note: For best consistency it is recommended to use trajectories from the most recent
# * coupled REMIND-MAgPIE runs. Currently, this is R32M46.
# * Available options:
# * none: no 2nd generation bioenergy demand
# * none: no 2nd generation bioenergy demand
# * R32M46: Coupled REMIND-MAgPIE runs with REMIND 3.2.1.dev412 and MAgPIE 4.6.11
# * NPi: Current policies; limit peak warming to 3.0°C
# * NDC: Nationally determined contributions; limit peak warming to 2.5°C
Expand Down
1 change: 1 addition & 0 deletions config/scenario_config.csv
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ gms$s15_exo_oils;;;;;;;;;;1;0;1;1;;;;;;;1;1;1;1;1;1;1;;;;;;;;;;;;;;;;;;;
gms$s15_exo_brans;;;;;;;;;;1;0;1;1;;;;;;;1;1;1;1;1;1;1;;;;;;;;;;;;;;;;;;;
gms$s15_exo_scp;;;;;;;;;;1;0;1;1;;;;;;;1;1;1;1;1;1;1;;;;;;;;;;;;;;;;;;;
gms$s15_exo_alcohol;;;;;;;;;;1;0;1;1;;;;;;;1;1;1;1;1;1;1;;;;;;;;;;;;;;;;;;;
gms$s15_alc_scen;0.014;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
gms$c21_trade_liberalization;;;;l908080r807070;l909090r808080;l909090r808080;l909595r809090;l908080r807070;l908080r807070;l908080r807070;l908080r807070;l909595r809090;l908080r807070;;;;;;;;;l908080r807070;l908080r807070;l908080r807070;l908080r807070;l908080r807070;;;;;;;;;;;;;;;;;;;
gms$c22_protect_scenario;;;;none;none;none;none;none;none;BH;none;BH_IFL;BH;;;;;;;BH;;BH_IFL;BH_IFL;BH_IFL;BH_IFL;BH_IFL;;;;;;;;;;;;;;;;;;;
gms$c22_protect_scenario_noselect;;;;;;;;;;;;;;;;;;;;;;none;none;BH_IFL;none;BH_IFL;;;;;;;;;;;;;;;;;;;
Expand Down
7 changes: 4 additions & 3 deletions config/scenario_fsec.csv
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ gms$s15_exo_sugar;;;;;;;;0;0;0;0;0;0;1;0;0;;;;;;;;;;;;;;;;;1;1;;;;;;;;;;;;;;;
gms$s15_exo_oils;;;;;;;;0;0;0;0;0;0;1;0;0;;;;;;;;;;;;;;;;;1;1;;;;;;;;;;;;;;;
gms$s15_exo_scp;;;;;;;;0;0;0;0;0;0;1;0;0;;;;;;;;;;;;;;;;;1;1;;;;;;;;;;;;;;;
gms$s15_exo_alcohol;;;;;;;;0;0;0;0;0;0;1;0;0;;;;;;;;;;;;;;;;;1;1;;;;;;;;;;;;;;;
gms$s15_alc_scen;0.014;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
gms$c15_food_scenario;;;SSP1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
gms$c21_trade_liberalization;;;;;;;;;;;;;;;;;;;;;;;l908080r807070;;;;;;;;;;;;;;;;;;;;;;;;;;
gms$c22_protect_scenario;;;;;;;;;;;;;;;;;;;;;;;;;;;;;BH_IFL;;;;;;;;;;;;;;;;;;;;
Expand Down Expand Up @@ -65,9 +66,9 @@ gms$s62_max_dem_bioplastic;0;;;;400;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
gms$c70_fac_req_regr;reg;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
gms$c70_feed_scen;;;;;;;;;;;;;;;;;;ssp1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
gms$c73_build_demand;;;;;;;;;;;;;;;;;;;;;;;;50pc;;;;;;;;;;;;;;;;;;;;;;;;;
input['cellular'];rev4.96_FSEC_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;rev4.96_FSEC_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.96_FSEC_6819938d_cellularmagpie_c200_MRI-ESM2-0-ssp126_lpjml-8e6c5eb1.tgz;;rev4.96_FSEC_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;rev4.96_FSEC_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;rev4.96_FSEC_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz;rev4.96_FSEC_09a63995_cellularmagpie_c200_MRI-ESM2-0-ssp585_lpjml-8e6c5eb1.tgz;
input['regional'];rev4.96_FSEC_magpie.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
input['validation'];rev4.96_FSEC_validation.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
input['cellular'];rev4.99_FSEC_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;rev4.99_FSEC_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.99_FSEC_6819938d_cellularmagpie_c200_MRI-ESM2-0-ssp126_lpjml-8e6c5eb1.tgz;;rev4.99_FSEC_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;rev4.99_FSEC_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;rev4.99_FSEC_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz;rev4.99_FSEC_09a63995_cellularmagpie_c200_MRI-ESM2-0-ssp585_lpjml-8e6c5eb1.tgz;
input['regional'];rev4.99_FSEC_magpie.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
input['validation'];rev4.99_FSEC_validation.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
input['additional'];additional_data_rev4.47.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
input['calibration'];calibration_FSEC_24Mar23.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
magicc_emis_scen;bjoernAR6_C_SSP2-NDC.mif;;;bjoernAR6_C_SSP2-PkBudg900.mif;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;bjoernAR6_C_SSP1-NDC.mif;;;;;;;;;;;;bjoernAR6_C_SSP1-PkBudg900.mif
Loading
Loading