-
Notifications
You must be signed in to change notification settings - Fork 338
Multilayer Canopy #1996
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
Draft
slevis-lmwg
wants to merge
15
commits into
ESCOMP:master
Choose a base branch
from
slevis-lmwg:multilayer_canopy
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Multilayer Canopy #1996
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
29c72a9
Untested first draft of Multilayer Canopy code
slevis-lmwg b3f245a
Corrections for the code to build and begin running
slevis-lmwg 4641c8d
Corrections and updates to get past certain errors
slevis-lmwg 7518e79
Increase some error tolerances
slevis-lmwg 447fc97
Code updates provided by @gbonan
slevis-lmwg b996a7a
Merge remote-tracking branch 'escomp/master' into multilayer_canopy
slevis-lmwg 90fcf64
Merge remote-tracking branch 'olyson/PLUMBERcsv' into multilayer_canopy
slevis-lmwg 018ac84
Merge tag 'ctsm5.1.dev170' into multilayer_canopy
slevis-lmwg fb60fe8
Correct typo in PLUMBER2/defaults/shell_commands
slevis-lmwg 9152d3a
Correct conflict that got missed in a "git merge" earlier
slevis-lmwg 5146260
Rm QFLX_SUB_SNOW from requested history vars as it doesn't exist
slevis-lmwg 95710d8
Rename QFLX_SUB_SNOW -> QFLX_SOLIDEVAP_FROM_TOP_LAYER in user_nl_clm
slevis-lmwg 76deeb3
Code updates as a result of debugging
slevis-lmwg d730e34
Debugging updates
slevis-lmwg 7de8f78
Multilayer canopy code to run at US-NR1
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
Some comments aren't visible on the classic Files Changed page.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -186,12 +186,13 @@ subroutine CanopyNitrogenProfile (num_filter, filter, mlcanopy_inst) | |
end do | ||
|
||
! Check that canopy sum of vcmax25 equals the expected value obtained by analytical integration | ||
! NB slevis 2024/3/22: The next was a valid error check before introducing minimum dlai and dsai | ||
|
||
numerical = sum(vcmax25_profile(p,1:ncan(p)) * dpai(p,1:ncan(p))) | ||
analytical = vcmax25top * (1._r8 - exp(-kn*(lai(p) + sai(p)))) / kn | ||
if (abs(numerical-analytical) > 1.e-06_r8) then | ||
call endrun (msg='ERROR: CanopyNitrogenProfile: canopy integration error') | ||
end if | ||
! if (abs(numerical-analytical) > 1.e-06_r8) then | ||
! call endrun (msg='ERROR: CanopyNitrogenProfile: canopy integration error') | ||
! end if | ||
|
||
|
||
end do | ||
|
||
|
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 was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Gordon, these are the lines that you recommended changing (410 - 411).