Integration of tropical PEATCLSM in GEOSldas (CLSM and CatchmentCN) - Round 1 #1
Conversation
This file contains hidden or 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
added 2 commits
May 3, 2022 16:18
…s the first changes for CN - catchmentCN.F90 is set-up so that GEOSldas compiles
mbechtold
reviewed
May 6, 2022
|
|
||
| ! MB: FOXY only called here, ZBAR unchanged | ||
| CALL OXYFAC ( & | ||
| NCH, ZBAR, POROS, & |
There was a problem hiding this comment.
ZBAR is input to this function but not calculated yet, see line above that you missed to add.
There was a problem hiding this comment.
Cannot add it to the line above. So I write it here. Add at line 1842:
!ZBAR defined here positive below ground and in meter
ZBAR(CHNO)=SQRT(1.e-20+CATDEF(CHNO)/BF1(CHNO))-BF2(CHNO)
compare with 3184 of https://github.com/mbechtold/PEATCLSM_T/blob/main/catchment.F90
mbechtold
reviewed
May 6, 2022
mbechtold
reviewed
May 16, 2022
| ! comments) | ||
| ZBAR1 = catch_calc_zbar( BF1(N), BF2(N), CATDEF(N) ) | ||
| SYSOIL = (2.*bf1(N)*amin1(amax1(zbar1,0.),PEATCLSM_ZBARMAX_4_SYSOIL) + 2.*bf1(N)*bf2(N))/1000. | ||
| SYSOIL = (2.*bf1(N)*amin1(amax1(zbar1,0.),0.45) + 2.*bf1(N)*bf2(N))/1000. |
There was a problem hiding this comment.
This should become and "if statement" where you have the three porosity cases, I assume.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
There are 4 files 'added' and 4 files 'adapted'.
The 4 added files: 3 of them _original are the original files and 1 of them _SA is not finished yet with my adaptations.
The 4 adapted files: catchment.F90, lsm_routines.F90 and catch_constants.f90 include my final adaptations and catchmentCN.F90 is adapted so that is allows GEOSldas to compile with my adaptation in the other 3 files but is still quite similar to the original one.