-
Notifications
You must be signed in to change notification settings - Fork 177
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
Bugfix in grasslands_apr22 pasture realization. #614
Changes from 2 commits
e97eabd
5085935
a52044b
8f829ad
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -112,7 +112,13 @@ authors: | |
affiliation: "Potsdam Institute for Climate Impact Research" | ||
email: [email protected] | ||
|
||
- family-names: Lotze-Campen | ||
- family-names: Köberle | ||
given-names: Alexandre | ||
orcid: https://orcid.org/0000-0003-0328-4750 | ||
affiliation: "Potsdam Institute for Climate Impact Research" | ||
email: [email protected] | ||
|
||
- family-names: Lotze-Campen | ||
given-names: Hermann | ||
orcid: https://orcid.org/0000-0002-0003-5508 | ||
affiliation: "Potsdam Institute for Climate Impact Research" | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,26 +11,26 @@ scalars | |
s31_cost_grass_prod Grasslands factor costs (USD05MER per tDM) / 1 / | ||
; | ||
|
||
$setglobal c31_past_suit_scen ssp370 | ||
$setglobal c31_grassl_yld_scenario cc | ||
* options: cc (climate change) | ||
* nocc (no climate change) | ||
* nocc_hist (no climate change after year defined by sm_fix_cc) | ||
|
||
table f31_pastr_suitability(t_all,j,ssp_past) Areas suitable for pasture management (mio. ha) | ||
parameter f31_pastr_suitability(t_all,j) Areas suitable for pasture management (mio. ha) | ||
/ | ||
$ondelim | ||
$include "./modules/31_past/input/f31_pastr_suitability.cs3" | ||
$include "./modules/31_past/input/f31_pastr_suitability.cs2" | ||
$offdelim | ||
; | ||
/; | ||
|
||
i31_manpast_suit(t_all,j) = f31_pastr_suitability(t_all,j) | ||
* set values to 1995 if nocc scenario is used, or to sm_fix_cc after sm_fix_cc if nocc_hist is used | ||
$if "%c31_grassl_yld_scenario%" == "nocc" i31_manpast_suit(t_all,j) = f31_pastr_suitability("y1995",j); | ||
$if "%c31_grassl_yld_scenario%" == "nocc_hist" i31_manpast_suit(t_all,j)$(m_year(t_all) > sm_fix_cc) = i31_manpast_suit(t_all,j)$(m_year(t_all) = sm_fix_cc); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. why has this been moved here? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I followed @k4rst3ns recommendation to do this, following same logic as for f31_grassl_yld a few lines down (L41-42), and as done for the the yield module: https://github.com/magpiemodel/magpie/blob/master/modules/14_yields/managementcalib_aug19/input.gms There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ok, in that case lets keep it here |
||
|
||
table f31_LUH2v2(t_all,j,f31_luh) Different land type areas (mio. ha) | ||
$ondelim | ||
$include "./modules/31_past/input/f31_LUH2v2.cs3" | ||
$offdelim | ||
; | ||
|
||
scalar s31_limit_calib Relative managament calibration switch (1=limited 0=pure relative) / 1 /; | ||
|
||
$setglobal c31_grassl_yld_scenario cc | ||
* options: cc (climate change) | ||
* nocc (no climate change) | ||
* nocc_hist (no climate change after year defined by sm_fix_cc) | ||
|
||
table f31_grassl_yld(t_all,j,grassland,w) LPJmL potential yields per cell (rainfed only) (tDM per ha) | ||
$ondelim | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,15 +5,6 @@ | |
*** | MAgPIE License Exception, version 1.0 (see LICENSE file). | ||
*** | Contact: [email protected] | ||
|
||
$ifthen "%c31_past_suit_scen%" == "nocc" | ||
i31_manpast_suit(t_all,j) = f31_pastr_suitability("y1995",j,"ssp245"); | ||
$elseif "%c31_past_suit_scen%" == "nocc_hist" | ||
i31_manpast_suit(t_all,j) = f31_pastr_suitability(t_all,j,"ssp245"); | ||
i31_manpast_suit(t_all,j)$(m_year(t_all) > sm_fix_cc) = f31_pastr_suitability(t_all,j,"ssp245")$(m_year(t_all) = sm_fix_cc); | ||
$else | ||
i31_manpast_suit(t_all,j) = f31_pastr_suitability(t_all,j,"%c31_past_suit_scen%"); | ||
i31_manpast_suit(t_all,j)$(m_year(t_all) <= sm_fix_SSP2) = f31_pastr_suitability(t_all,j,"ssp245"); | ||
$endif | ||
|
||
pc31_grass(j,grassland) = f31_LUH2v2("y1995",j,grassland); | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
* list of files that are required here | ||
f31_pastr_suitability.cs3 | ||
f31_pastr_suitability.cs2 | ||
f31_LUH2v2.cs3 | ||
f31_grassl_yld.cs3 | ||
f31_grass_bio_hist.cs3 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
removal of switches fits better into the "removed" category
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Moved to "removed" section of CHANGELOG.md