Fix CRU vpd (when vapr wasn't requested) #73
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
…g column 'vapr' This fixes VPD for CRU, when vapr was not requested. This commit moves computation of vpd with calc_vpd() inside of ingest_globalfields() for CRU, watch_wfdei, and wfde5. This results in consistent code between these 3 sources and also irrespective of the user calling ingest() or ingest_bysite(). Hence, this reduces code replication. Furthermore, calc_vpd() is now re-computed (in ingest() or ingest_bysite()) only in cases when there is bias correction of `vapr` with WorldClim data. This code is still repeated across ingest() and ingest_bysite().
All three cases now compute 'vapr' in Pa within 'ingest_globalfields()'. Previously for CRU there was a variable 'vap' in hPa.
The bug resulted in not using bias-corrected vapr for VPD in watch_wfdei and wfde5 when calling ingest(). It was however bias-corrected when using ingest_bysite().
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.
This PR fixes a number of things:
ingest(), it was however fine foringest_bysite()Further this includes streamlining of code:
ingest()andingest_bysite()to work towards the long-term aim to makeingest()a simple wrapper (reduce this large code duplication that lead to the 2nd bug)