Kd waterfuns #159
Kd waterfuns #159
Conversation
Merge branch 'master' Conflicts: DESCRIPTION DEV/scripts/ppr_crops_obic.R NEWS.md data/crops_obic.RData
…t waterfuns in obic wrapper
…d use and soil type
Merge branch 'master' Conflicts: DESCRIPTION NEWS.md vignettes/packages.bib
There was a problem hiding this comment.
that was a substantial update, and merging this in multiple steps might have been easier.
All water funs are present now given the latest study of Kees (in collaboration with KWR).
These functions are out commented in wrapper functions obic, obic_field and obic_field_dt as well the associated test functions.
All other tests were succesfull. Ready to merge!
|
@KeesDoolNMI , can you answer the issues raised by Sven, and update references where needed? |
NEWS.md
Outdated
| * N use norms of 1926 and 1927 (agrarisch natuurmengsel and overige akkerbouwgewassen), increased to match "Akkerbouwgewassen, overig" (RVO, 2022) | ||
|
|
||
| ## Deprecated | ||
| * Building and modifying crops.obic from a script in OBIC |
There was a problem hiding this comment.
To me it seems that this already happened in an earlier update of OBIC. The old script came along when merging the master into this branch. So this does not have to be added in the changelog
There was a problem hiding this comment.
Same for first point under Added, these crops are already available in main
| evaluate_logistic(D_PSP,0.04,180,2), | ||
| evaluate_logistic(D_PSP,0.05,300,2.5))] | ||
| # Calculate indicator score | ||
| dt[,I_PSP := evaluate_logistic(D_PSP,0.05,300,2.5)] |
There was a problem hiding this comment.
I checked how did this in the pilot and I saw that we used the same score for grassland and cropland. So I removed the separate evaluation of grassland and cropland
Functions for evaluating the effect of soil quality on water quality and quantity