forked from NCAR/ccpp-physics
-
Notifications
You must be signed in to change notification settings - Fork 37
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
Adding Integrated Canopy Effects to CCPP/PBL Scheme #253
Open
drnimbusrain
wants to merge
55
commits into
ufs-community:ufs/dev
Choose a base branch
from
noaa-oar-arl:feature/aqm_canopy2
base: ufs/dev
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.
+346
−4
Open
Changes from 54 commits
Commits
Show all changes
55 commits
Select commit
Hold shift + click to select a range
67b693e
Testing hedmf change.
drnimbusrain e2c7f47
Rolled back hedmf test change.
drnimbusrain 1fb9060
Merge branch 'ufs-community:ufs/dev' into feature/aqm_canopy
drnimbusrain d825523
First draft commit of canopy turbulence effects in hedmf.f
drnimbusrain 574ad4e
Fixed non-ascii character
drnimbusrain 1665715
Changed from canopy in hedmf to satmedmvdifq for GFSv16.
drnimbusrain 1c587a3
Added more arguments for canopy varibles.
drnimbusrain fe808c6
Fixed non-ascii character.
drnimbusrain 634ebb1
Added canopy height grid cell conidtion.
drnimbusrain 08dd5a6
Updated to modify TKE instead of K for canopy.
drnimbusrain 22d3fd7
Rolled back to modifying K directly for canopy effects.
drnimbusrain 936a28e
Updated Meta data
drnimbusrain 989ed53
Added lai and vegtype to the meta
drnimbusrain 99ba757
Fixed bugs.
drnimbusrain de1c0b4
Added canopy_utils_mod and noahmp_tables to satmedmfvdifq meta depend…
drnimbusrain 90762fb
Changed some comments.
drnimbusrain 07bafc0
Fixed IF statement bug in canopy conditions.
drnimbusrain 6b686e5
Fixed bug in canopy variable inputs.
drnimbusrain ea79a91
Merge remote-tracking branch 'origin/develop' into feature/aqm_canopy
drnimbusrain be76560
Merge branch 'ufs-community:ufs/dev' into feature/aqm_canopy
drnimbusrain 8122173
Updated bugs.
drnimbusrain f99c2bb
Fixed bugs (again...).
drnimbusrain e68de59
Merge branch 'ufs-community:ufs/dev' into feature/aqm_canopy
drnimbusrain 92e33b2
Added "do_canopy" flag for eddy effects in TKE-EDMF
drnimbusrain d9d6465
Fixed bug in syntax
drnimbusrain da70f9b
Added canopy effects for multiple model layers...if necessary
drnimbusrain 3f5a1d5
Merge branch 'ufs-community:ufs/dev' into feature/aqm_canopy
drnimbusrain 03cbe6f
Updated canopy effect to use interface levels, zi.
drnimbusrain b8c61a3
Merge branch 'feature/aqm_canopy' of https://github.com/noaa-oar-arl/…
drnimbusrain b0465a5
Merge branch 'ufs-community:ufs/dev' into feature/aqm_canopy
drnimbusrain a962bdc
Merge branch 'ufs-community:ufs/dev' into feature/aqm_canopy
drnimbusrain 9490726
Merge branch 'ufs-community:ufs/dev' into feature/aqm_canopy
drnimbusrain 97d0417
Merge branch 'ufs-community:ufs/dev' into feature/aqm_canopy
drnimbusrain df68b5c
Merge branch 'ufs-community:ufs/dev' into feature/aqm_canopy
drnimbusrain 29033e2
Merge branch 'ufs-community:ufs/dev' into feature/aqm_canopy
drnimbusrain 911e4f9
Added TODO comments for input canopy variables and draft meta.
drnimbusrain 7aa45c4
Merge branch 'feature/aqm_canopy' of https://github.com/noaa-oar-arl/…
drnimbusrain 3a9338f
Fixed canopy height table and changed ffrac to frt.
drnimbusrain 1e28ccd
Removed noah_mp_table dependency for aqm_canopy
drnimbusrain b0706c2
Pass via interface 5 AQM canopy inputs and build-in diagnostic arrays…
iri01 7726000
Corrected canopy arrays meta names and dimensions for consistency wit…
iri01 4d171ce
Remove unnecessary definitions of canopy arrays
iri01 caee56d
Merge pull request #1 from noaa-oar-arl/feature/aqm_canopy_new
iri01 7a0e1e2
Fix to canopy arrays definitions: add intent
iri01 336447d
Merge pull request #2 from noaa-oar-arl/feature/aqm_canopy_new_fix
iri01 fc1fb3f
Fixed cfch and cpopu units in the canopy meta variables.
drnimbusrain cbcb544
Fixed standard_name for naux2d and naux3d in meta file.
drnimbusrain 8b82cf9
Bug fix to remove FCH and divide by ZFL.
drnimbusrain d3d17e9
Merge branch 'feature/aqm_canopy' into feature/aqm_canopy2
drnimbusrain eb85a48
Removed Files.
drnimbusrain 4065eb7
Commenting out aux arrays.
drnimbusrain 5016165
Fixed units of cpopu for canopy work.
drnimbusrain d98a4d7
Removed old lai/vegtype from canopy satmedmfvdifq
drnimbusrain aedd1c4
Use pi physical constant from ccpp, correct units of cpopu.
iri01 5abb270
Bug fix on the use of the canopy module
iri01 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 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.
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.
These aux arrays are purely for diagnosing the implemention, correct? I believe they need to be commented out or removed before merging this into ufs/dev
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.
Thank you for your comments here. Yes, indeed the aux arrays were for diagnosing the implementation. We can comment out for now if that's acceptable path forward.
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.
Yes please, thanks.