-
Notifications
You must be signed in to change notification settings - Fork 340
Surface roughness modifications (cont'd) #2045
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
Merged
Merged
Changes from all commits
Commits
Show all changes
72 commits
Select commit
Hold shift + click to select a range
7e5d438
Adapted model to machine and added soil column separation and local t…
db0b16f
Saving current state
492c158
Saving state
def8ee3
Saving state
4018d56
Saving state
4a52aa7
Saving state
e78b02f
Saving state
37d7d0c
Saving state
d218ff5
Saving state
fc20d00
State at first submission
2e7b2c3
For PR
864f336
Removing statements of sensitivity experiments. Add more comments fol…
8318cad
Small correction to proposed statement in CanopyFluxes
c611d6e
Add user-mod directories for the surface roughness changes from Ronny…
ekluzek 9ae6e30
Remove use_z0v_forest because it's not connected to anything in the F…
ekluzek 0ee8c69
Handle very small values of htop and snowmelt_accum with new Meier202…
ekluzek 02be2d8
Don't set z0mg and displa on first step of run for RonnyMeier2022 rou…
ekluzek 0b7fd39
Skip first few steps as htop isn't set until after first do_alb step
ekluzek 0e71cb2
Correct subscript
ekluzek 84396e6
Add write of rh if negative or over 100 when DEBUG on
ekluzek 23601a7
Write out warning if ustar*thvstar is positive to prevent a cube root…
ekluzek 4eabfbb
Set human stress indices to calculate NONE when Meier surface roughne…
ekluzek f644624
Fix subscript
ekluzek 32dbda8
Rename test mods to highlight these are non-crop cases
ekluzek b9d402a
Add tests with Meier surface roughness
ekluzek 8789ca2
Add a bit to not die if htop is zero and it's crop and beginning of t…
ekluzek 821df3c
Correct new testname, and add two tests to the expected fails
ekluzek d3dee39
Change MeierXXXX namelist to Meier2022
ekluzek 95fb900
Remove commented out line
ekluzek b0f2856
Remove local time history changes as they are treated seperately in #…
ekluzek c7ade8d
Remove soil columns on a seperate soil column as handled in #1249
ekluzek 684d61b
Merge tag 'ctsm5.1.dev077'
ekluzek 7916475
Add more compilers for the surf roughness changes
ekluzek b531f92
Changes to get the updated code to compile on cheyenne_gnu
ekluzek 6e31171
Changes needed to work with nag compiler on izumi, negative sign need…
ekluzek f0fe877
Update paramsfile for Meier surface roughness changes to latest version
ekluzek cf0934b
Some updates from @olyson that get more tests to work
ekluzek 7570395
Merge branch 'main' of github.com:RonnyMeier/CTSM into main
ekluzek 1f1cce9
Update forcing height variables and rename/move snomelt_accum to Wate…
olyson 546f615
Merge branch 'main' of https://www.github.com/RonnyMeier/ctsm
olyson 382441c
Add forcing height change back into CanopyFluxesMod after rebase.
olyson e7579c9
Encapsulated forcing height update in Meier2022 to maintain bfb with …
olyson 902f1cb
Update forcing heights and restrict zeta to less than 20 for now
olyson 46e2dad
Revert restriction on zeta in FrictionVelocityMod
olyson 189f9f9
Remove restriction on calc_human_stress_indices
olyson c08d09d
Change zetamaxstable for z0param_method == 'Meier2022' to 2.0
olyson 6be9820
Make zeta a global variable and fix zetamaxstable namelist
olyson ed9610b
Remove use_z0mg_2d code to read in roughness from surface dataset tha…
ekluzek 0badb30
Remove more use_z0mg_2d
ekluzek 357fea5
Correct so will compile
ekluzek a924de8
Merge branch 'main' of github.com:RonnyMeier/CTSM into main
ekluzek e5cd7b0
Use parenthesis to clarify statement as required by the nag compiler …
ekluzek e9e7d52
Merge tag 'ctsm5.1.dev129'
slevis-lmwg 180206c
Removing use_z0mg_2d from the Meier2022_surf_rough testmods
slevis-lmwg f2767b5
Follow-up to conflict resolutions in order for the code to build
slevis-lmwg b1a46db
BFB refactor: replace magic numbers with parameters
slevis-lmwg 09e0012
Answer-changing refactor: repl. some divisions w multiplications
slevis-lmwg 548e8be
Change if statement back to what we have in main
slevis-lmwg a57f188
Eliminate repetitive code in LakeFluxesMod
slevis-lmwg 0f263e7
Rm if(use_biomass_heat_storage) and return to original code here
slevis-lmwg c21e88f
Replace more divisions with multiplications in Meier2022 code
slevis-lmwg d8ba6c7
Change zetamaxstable in namelist_defaults_ctsm to get BFB with baseline
slevis-lmwg 6774f45
Merge remote-tracking branch 'escomp/master' into meier_main_pr1596
slevis-lmwg 1432e20
First draft of ChangeLog/Sum
slevis-lmwg 53722d2
Merge remote-tracking branch 'escomp/master' into meier_main_pr1596
slevis-lmwg 1d962dd
Revisions part 1 in response to Erik's review
slevis-lmwg 59745d0
Revisions part 2: add missing comment
slevis-lmwg fea92f2
Revert delt_threshold param back to hardwired values
slevis-lmwg 7a39c65
Ensure that ZengWang2007 and use_z0m_snowmelt NOT true simultaneously
slevis-lmwg 9e54cd5
Merge remote-tracking branch 'escomp/master' into meier_main_pr1596
slevis-lmwg 0875c51
Removed white space that appears red in git diff
slevis-lmwg f206914
Merge remote-tracking branch 'escomp/master' into meier_main_pr1596
slevis-lmwg File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
1 change: 1 addition & 0 deletions
1
cime_config/testdefs/testmods_dirs/clm/Meier2022_surf_rough/include_user_mods
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../default |
4 changes: 4 additions & 0 deletions
4
cime_config/testdefs/testmods_dirs/clm/Meier2022_surf_rough/user_nl_clm
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| z0param_method = 'Meier2022' | ||
| use_z0m_snowmelt = .true. | ||
| paramfile = '$DIN_LOC_ROOT/lnd/clm2/paramdata/ctsm51_params.RMz0.c220304.nc' | ||
|
|
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
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.