Merge 4.5.0 back into develop #414
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Start script for India run specifications
Update fable_india start script
prepared release 4.5.0
Release of MAgPIE 4.5.0
|
|
||
| - **scripts** The disaggregation_LUH2.R was extended to include the changes used to generate ISIMIP3b maps for LUH harmonization. The largest changes are: 1) The convertLUH function now breaks the grid level magpie objects by groups of years, then creates the raster for the groups and aggregates them to create the final map at a quarter of a degree resolution (this speeds up the process). 2) The mapping between LUH and MAgPIE is now defined by country and magpie-LUH types (not 1 to 1 anymore). 3) The split of MAgPIE's pasture land type between pasture and rangeland changed. Rangeland is assumed to stay constant after 2015, and changes in MAgPIE's pasture are due to pasture. 4) IFs were added so if a certain map already exists in the output folder, it will not generate it once again. 5) Flooded land now corresponds to a share of rice cropland, based on historical values. 6) To speed calculations, yields are read at the cell level, the crops are aggregated based on the new MAgPIE-LUH mapping, and then disaggregated to grid level. | ||
| - **scripts** added new disaggregation script to provide grid cell level BII | ||
| - **scripts** removed test script "irrig_dep_test" from "start" folder to "extra" folder |
There was a problem hiding this comment.
So it was moved and not removed, right?
| @@ -35,7 +33,11 @@ cfg$repositories <- append(list("https://rse.pik-potsdam.de/data/magpie/public"= | |||
| #Download input data | |||
| cfg$force_download <- TRUE | |||
|
|
|||
| #Specifying the value of pumping costs switch as 1 for India default analysis | |||
| #Setting pumping to 1 | |||
| cfg$gms$s42_pumping <- 1 | |||
There was a problem hiding this comment.
The changes in this file seem to be actual changes to the model while the rest is just documentation. Is this intentional?
There was a problem hiding this comment.
yes, there was this single fix which went into the release candidate directly. All the rest came from develop.
CHANGELOG.md
Outdated
| - **09_drivers** changed `i09_gdp_pc_mer_iso` to `im_gdp_pc_mer_iso` | ||
| - **32_forestry** simplification and bugfix of afforestation limit. `c32_max_aff_area_glo` renamed to `s32_max_aff_area_glo` in default.cfg. | ||
|
|
||
| - **scripts** The disaggregation_LUH2.R was extended to include the changes used to generate ISIMIP3b maps for LUH harmonization. The largest changes are: 1) The convertLUH function now breaks the grid level magpie objects by groups of years, then creates the raster for the groups and aggregates them to create the final map at a quarter of a degree resolution (this speeds up the process). 2) The mapping between LUH and MAgPIE is now defined by country and magpie-LUH types (not 1 to 1 anymore). 3) The split of MAgPIE's pasture land type between pasture and rangeland changed. Rangeland is assumed to stay constant after 2015, and changes in MAgPIE's pasture are due to pasture. 4) IFs were added so if a certain map already exists in the output folder, it will not generate it once again. 5) Flooded land now corresponds to a share of rice cropland, based on historical values. 6) To speed calculations, yields are read at the cell level, the crops are aggregated based on the new MAgPIE-LUH mapping, and then disaggregated to grid level. |
There was a problem hiding this comment.
changes in MAgPIE's pasture are due to managed pasture.
Co-authored-by: pfuehrlich-pik <82826417+pfuehrlich-pik@users.noreply.github.com>
Co-authored-by: pfuehrlich-pik <82826417+pfuehrlich-pik@users.noreply.github.com>
tscheypidi
commented
Jul 8, 2022
pfuehrlich-pik
approved these changes
Jul 8, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
🐦 Purpose of this PR 🐦
🔧 Checklist for PR creator 🔧
📉 Performance loss/gain from current default behavior 📈
Added changes to
CHANGELOG.mdCompilation check (model starts without compilation errors - use
gams main.gms action=cin 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
goxygenis okay (usegoxygen::goxygen()for testing).Changes to
magpie4R 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 🚨
CHANGELOGis updated correctly🚨 Checklist for MAgPIE reviewer 🚨
CHANGELOGis updated correctly