-
Notifications
You must be signed in to change notification settings - Fork 178
Adding New Vegetative Canopy Data for AQM Coupling #928
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
120 commits
Select commit
Hold shift + click to select a range
0bd70bd
Updated gitmodules and for feature/aqm_canopy
drnimbusrain d831fcd
Changed ccpp-physics submodule to GMU-SESS-AQ org for now.
drnimbusrain 6e5f1b2
Reverted back to noaa-oar-arl submodule for aqm_canopy.
drnimbusrain 877fe1c
Updated ccpp-physics submodule for hedmf
drnimbusrain 0818ab1
Updated ccpp/physics submodule
drnimbusrain 272ebf3
Updated gitmodules for noaa-oar-arl fork.
drnimbusrain e8d3584
Updated .gitmodule to our noaa-oar-arl fork.
drnimbusrain 9c9b25c
Updated submodules
drnimbusrain 625989a
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain 3af7403
Updated submodule ccpp-physics
drnimbusrain 2f8e62d
Updated ccpp-physics submodule.
drnimbusrain 46979f0
Merge branch 'develop' into feature/aqm_canopy
drnimbusrain a54ecd8
Updating ccpp submodules.
drnimbusrain 0cc41af
Updated ccpp-physics submodule.
drnimbusrain c520b97
Merge branch 'develop' of https://github.com/noaa-oar-arl/fv3atm into…
drnimbusrain 9120189
Merging develop into aqm_canopy
drnimbusrain 7fff457
Updated ccpp-physcis submodule.
drnimbusrain 4925fc3
Updated ccpp-physics submodule for bugs
drnimbusrain ae10dd5
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain 25aa1c6
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain 776c183
Merge remote-tracking branch 'origin/develop' into feature/aqm_canopy
drnimbusrain 2de3356
Updated ccpp-physics submodule for aqm_canopy
drnimbusrain eebcdcc
Updated ccpp/framework for arl develop
drnimbusrain 835b652
Added do_canopy option.
drnimbusrain 128edc8
Updating ccpp-physics submodule for do_canopy
drnimbusrain 916254a
Updated ccpp-physics submodule for bug.
drnimbusrain 2bdfe0e
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain 4506835
Updated submodule for aqm_canopy layer changes.
drnimbusrain 8221a8e
Updated submodule for ccpp canopy changes to zi.
drnimbusrain ddc135c
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain a51dcf0
Merge branch 'develop' into feature/aqm_canopy
drnimbusrain 5c34d6a
Updated ccpp/physics submodule for aqm_canopy.
drnimbusrain 866673a
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain d4b4fc0
Merge branch 'NOAA-EMC:develop' into feature/aqm_canopy
drnimbusrain e4a7b8b
Removed conflicts from develop to aqm_canopy.
drnimbusrain 7dde4c1
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain d28eae9
Merge remote-tracking branch 'origin' into feature/aqm_canopy
drnimbusrain 51027e6
Merge branch 'develop' into feature/aqm_canopy
drnimbusrain 29c2431
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain 01e1e48
Merge remote-tracking branch 'upstream/develop' into develop
zmoon bce4c9b
Merge branch 'develop' into feature/aqm_canopy
drnimbusrain af54a10
Merge branch 'NOAA-EMC:develop' into feature/aqm_canopy
drnimbusrain 8f8b2d3
Updating submodules.
drnimbusrain 6f71860
Merge branch 'feature/aqm_canopy' of https://github.com/noaa-oar-arl/…
drnimbusrain 35287a3
Merge branch 'NOAA-EMC:develop' into develop
zmoon ce67d1c
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain eef6593
Merge branch 'develop' into feature/aqm_canopy
drnimbusrain 7e5e5b8
Updated ccpp-physics submodule.
drnimbusrain 6648685
Updated do_canopy flags to include units etc.
drnimbusrain 5a74f65
Fixed do_canopy argument syntax due to upstream changes.
eb13b11
Reverting upp submodule hash to develop.
ae97c6f
Adding inital canopy variables to GFS_typdefs.meta
drnimbusrain 425771e
Fixed units of canopyffrac and canopyclu in GFS meta.
drnimbusrain 925ca94
Added canopy variables to GFS typdefs and diagnostic codes.
drnimbusrain 0b1c2a0
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain dbbfa0b
Merge branch 'develop' into feature/aqm_canopy
drnimbusrain b3a7c94
Updating ccpp-physics submodule
drnimbusrain bd6b4b8
Added ozphys_2015 scheme back to suite_FV3_GFS_v16.xml
drnimbusrain b27a529
Removed ozphys_2015 in GFSv16 physics suite file.
drnimbusrain 00baafe
Changed ffrac to frt
drnimbusrain 1e64e8e
Updating ccpp-physics submodule for feature/aqm_canopy
drnimbusrain 4f4f5b5
Changed ffrac to frt
drnimbusrain 74c9ea5
Updated ccpp-physics submodule for aqm_canopy
drnimbusrain 2168aca
Import 5 canopy arrays and 3 photdiag arrays from AQM
iri01 ead383c
Add diagnostics for coupled air quality model 3 canopy arrays and 3 p…
iri01 5a3ec8e
Comment out unused canopy arrays
iri01 610593f
Merge pull request #1 from noaa-oar-arl/feature/aqm_canopy_new
iri01 2551923
Updating ccpp-physics submodule for feature/aqm_canopy
drnimbusrain 495574b
Update fv3atm for ccpp-physics submodule (fix to canopy arrays intent)
iri01 41e177b
Merge branch 'feature/aqm_canopy' of https://github.com/noaa-oar-arl/…
iri01 2c7423e
Updating ccpp-physics submodule for add intent = in/out in canopy var…
drnimbusrain 5608049
Updated cpopu units to match ccpp-physics meta definitions.
drnimbusrain 0aea978
Updated ccpp-physis for feature/aqm_canopy units changes.
drnimbusrain 9af8766
Updated submodule for feature/aqm_canopy naux2d and naux3d changes.
drnimbusrain 3e08719
Merge branch 'feature/aqm_canopy' of https://github.com/noaa-oar-arl/…
iri01 0183d43
Change canopy vars type to GFS_diag_type (formerly GFS_sfcprop_type).
iri01 476adf0
Merge pull request #3 from noaa-oar-arl/feature/aqm_canopy_new_diag
iri01 bb1bd25
Update ccpp-physics submodule for canopy bugfix.
drnimbusrain 54b9dd8
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain cfa7fcb
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain e8701c2
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain d5ef1f3
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain aa35f23
Rolling back gitmodules in develop.
drnimbusrain 9ba987d
Change to authoritative repos.
drnimbusrain 4326cf2
Merge branch 'develop' into feature/aqm_canopy
drnimbusrain 14f26d7
Updating ccpp-physics submodule to feature/aqm_canopy2
drnimbusrain babad81
Fixed cpopu units for canopy work.
drnimbusrain d1960ad
Updated ccpp-physics submodule.
drnimbusrain 0951a82
Updating ccpp-physics submodule.
drnimbusrain b6523c7
Updated canopy diagnostics.
drnimbusrain d22c3eb
Updated canopy diagnostics again.
drnimbusrain af743e1
Updating .gitmodules to use older upp hash
drnimbusrain 407082c
Reverting upp to develop branch.
drnimbusrain d502635
Clean up unused (obsolete) canopy fields
iri01 af0433b
Bugfix handling of the canopy fields
iri01 5547c50
Correct units of cpopu canopy data.
iri01 ddb5de6
Updated canopy variable units.
drnimbusrain 378327f
Updating ccpp-physics for canopy cleanup etc.
drnimbusrain 2ed895d
Updated ccpp-physics submodule for pi, intent=in
drnimbusrain a355021
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain f2cd16a
Merge branch 'develop' into feature/aqm_canopy
drnimbusrain 9b88513
Commenting out canopy print statements.
drnimbusrain 2b6d0d2
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain 2229fca
Merge branch 'develop' into feature/aqm_canopy
grantfirl 72107e6
fix compilation error in GFS_diagnostics.F90 after merging top-of-dev…
grantfirl 2d33a0a
fix another compilation error in GFS_diagnostics.F90 and add active a…
grantfirl f59b6cf
add new canopy variable dependence on do_canopy
grantfirl b6ecda1
add do_canopy dependence
grantfirl ca5c8b4
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain 42f53cc
Merge branch 'NOAA-EMC:develop' into feature/aqm_canopy
drnimbusrain 527b2e6
Merge branch 'develop' into feature/aqm_canopy
grantfirl aab1fea
Updating ccpp/physics submodule for canopy.
drnimbusrain dbe6bcc
Updating ccpp/physics submodule for ufs/dev to feature/aqm_canopy2 me…
drnimbusrain 701d312
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain 7d5bed0
Merge branch 'develop' into feature/aqm_canopy
drnimbusrain de1513a
Add back 'pi' in ccpp-physics submodule for canopy.
drnimbusrain da3cfbc
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain 965b275
Merge branch 'develop' into feature/aqm_canopy
drnimbusrain 9cd1c69
Updating ccpp/physics hash
drnimbusrain 6b49d37
update ccpp/physics hash and revert .gitmodules
BrianCurtis-NOAA 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
Submodule physics
updated
3 files
| +236 −7 | physics/PBL/SATMEDMF/satmedmfvdifq.F | |
| +69 −2 | physics/PBL/SATMEDMF/satmedmfvdifq.meta | |
| +27 −0 | physics/tools/canopy_utils_mod.f |
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.