-
Notifications
You must be signed in to change notification settings - Fork 159
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
Inclusion of AQUASTAT calibration factors for yields #457
Inclusion of AQUASTAT calibration factors for yields #457
Conversation
Note moved.
config/default.cfg
Outdated
@@ -899,12 +901,15 @@ cfg$gms$c37_labor_uncertainty <- "ensmean" # default = "ensmean" | |||
# * (per_ton_fao_may22) factor costs fixed per ton | |||
# * (sticky_feb18) factor costs including investments in capital | |||
# * (sticky_labor) based on sticky_feb18 + labor productivity factor included | |||
# NOTE: It is recommended to recalibrate the model when changing this setting! | |||
# NOTE: It is recommended to use best_calib only for sticky factor cost realizations! |
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.
are we still sure about that? Perhaps skip that line?
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.
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.
where exactly?
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.
It refers to this chunk:
# ***--------------------- 38_factor_costs -------------------------------
# * Make sure you use the corresponding calibration file to the selected realization
# * Please, check details in input settings.
# * (per_ton_fao_may22) factor costs fixed per ton
# * (sticky_feb18) factor costs including investments in capital
# * (sticky_labor) based on sticky_feb18 + labor productivity factor included
# NOTE: It is recommended to recalibrate the model when changing this setting!
# NOTE: It is recommended to use best_calib only for sticky factor cost realizations!
cfg$gms$factor_costs <- "per_ton_fao_may22" # default = per_ton_fao_may22
And the question is whether we leave the line: "# NOTE: It is recommended to use best_calib only for sticky factor cost realizations!". Jan was not sure if this still applies or not. Kristine and I understood that this was the case.
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.
Please change it to: "In case the maximum number of iterations is reached without convergence, please consider to use the best_calib setting"
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.
The test results in general look reasonable, also for China. Just a remark that the ir-rf calibration makes the rainfed yields higher and the irrigated yields lower for India. How can this give a larger amount of agricultural water use in the run with ir-rf calibration?
Co-authored-by: Jan Dietrich <dietrich@pik-potsdam.de>
Co-authored-by: Jan Dietrich <dietrich@pik-potsdam.de>
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.
From the calculation aspect all looks fine from my side.
Hey @xiaoxi: I am unsure with the actual irrgitaed yields will tell us something on regional scales as they are always weighted by the actual crop pattern which can lead to different results. E.g. imagine MAgPIE is now doing more irrigation at places with not so high yield than before. If so irrigated yield of IND will be dropping. |
I have added the indicator "Yields after calibraiton" for both rainfed and irrigated yields. I think this explains why there is an incentive to irrigate (i.e. higher withdrawals and higher irrigated area in India). Please confirm. |
All good. Thanks for the clarification, Feli and Kristine :) |
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.
My comments have been resolved.
config/default.cfg
Outdated
@@ -899,12 +901,15 @@ cfg$gms$c37_labor_uncertainty <- "ensmean" # default = "ensmean" | |||
# * (per_ton_fao_may22) factor costs fixed per ton | |||
# * (sticky_feb18) factor costs including investments in capital | |||
# * (sticky_labor) based on sticky_feb18 + labor productivity factor included | |||
# NOTE: It is recommended to recalibrate the model when changing this setting! | |||
# NOTE: It is recommended to use best_calib only for sticky factor cost realizations! |
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.
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.
I just found one line where the goxygen comment prefix is missing (see my suggested change and please incorporate it). Other than that it looks ready to go for me.
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.
just a very tiny edit in the description requested.
…secCHA Inclusion of AQUASTAT calibration factors for yields magpiemodel#457
🐦 Purpose of this PR 🐦
Inclusion of AQUASTAT rainfed vs irrigation calibration factors as a switch to improve yield ratios
🔧 Checklist for PR creator 🔧
High risk
📉 Performance loss/gain from current default behavior 📈
Added changes to
CHANGELOG.md
Compilation check (model starts without compilation errors - use
gams main.gms action=c
in model folder for testing).No hard coded numbers and cluster/country/region names.
The new code doesn't contain declared but unused parameters or variables.
Where relevant, In-code comments added including documentation comments.
Made sure that documentation created with
goxygen
is okay (usegoxygen::goxygen()
for testing).Changes to
magpie4
R library for post processing of model output (ideally backward compatible).Self-review of my own code.
In case of updated cellular input tgz file in default.cfg: scenario_config.csv has been updated accordingly (rcp1p9, rcp2p6 etc)
For high risk runs: validation of major model indicators - Land-use, emissions, food prices, Tau. %Delete this line in case it is not a high risk run%
NA
🚨 Checklist for RSE reviewer 🚨
CHANGELOG
is updated correctly🚨 Checklist for MAgPIE reviewer 🚨
CHANGELOG
is updated correctly