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

Removing pasture suitability calibration from calcPastureSuit.R from the preprocessing #41

Merged
merged 33 commits into from
Jun 18, 2024

Conversation

mppalves
Copy link
Member

Changes summary:

  • Updated cell area calculations by using land initialization areas instead of raster area calculations.
  • Removed the script section that calibrated pasture suitability areas projected with historical values.
  • These changes do not alter the output format; thus, MAGPIE remains functional regardless of the input generated. This is a minor improvement and the calibration removed from the preprocessing is now performed at the preloop stage of MAGPIE calculations.

@mppalves mppalves added the enhancement New feature or request label Apr 14, 2024
Copy link
Member

@k4rst3ns k4rst3ns left a comment

Choose a reason for hiding this comment

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

Hey Marcos,
that looks all really good :) I added some comments.
I guess the only think where I would ask you to check is LN:96, the rest is kind of optional.

cool that you found time to fix this :)

R/calcPastureSuit.R Outdated Show resolved Hide resolved
R/calcPastureSuit.R Outdated Show resolved Hide resolved
R/calcPastureSuit.R Outdated Show resolved Hide resolved
R/calcPastureSuit.R Outdated Show resolved Hide resolved
R/calcPastureSuit.R Outdated Show resolved Hide resolved
R/calcPastureSuit.R Outdated Show resolved Hide resolved
R/calcPastureSuit.R Outdated Show resolved Hide resolved
Copy link
Member

@tscheypidi tscheypidi left a comment

Choose a reason for hiding this comment

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

the reordering and cell renaming looks suspicious to me and should be removed if possible. Rest looks good to me

R/calcPastureSuit.R Outdated Show resolved Hide resolved
Copy link
Member

@tscheypidi tscheypidi left a comment

Choose a reason for hiding this comment

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

looks good. Just fix the merge conflicts and build again and you should be from my perspective ready to go

Copy link
Member

@k4rst3ns k4rst3ns left a comment

Choose a reason for hiding this comment

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

I just had a quick look if my comments have been addressed and it looks very good :)
Thanks Marcos for addressing everything. Good to go from my side :)

DavidhoPIK and others added 3 commits May 16, 2024 17:15
comply with new convention to have column names "region", "country", "superregion" in regionmappings
@mppalves mppalves merged commit f74c7e3 into pik-piam:master Jun 18, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants