Skip to content
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

Update develop from gsd/develop 2020/11/20: Unified gravity wave drag, updates to other GSL physics #202

Merged
Merged
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
282 commits
Select commit Hold shift + click to select a range
b2404b5
Merge pull request #7 from climbfuji/update_submodule_pointers_20191122
climbfuji Nov 22, 2019
2124b57
Merge pull request #4 from grantfirl/fix_cires_ugwp_compilation_warning
climbfuji Nov 25, 2019
e726454
Update submodule pointer for ccpp-physics
climbfuji Nov 25, 2019
cb7e389
Merge pull request #9 from climbfuji/fv3atm_update_submodule_pointer_…
climbfuji Nov 25, 2019
a550ddf
Merge FV3 gsd/develop into fv3atm dtc/develop, squashed commit of the…
climbfuji Nov 26, 2019
1688b29
ccpp/config/ccpp_prebuild_config.py: add new configuration item DEFAU…
climbfuji Nov 26, 2019
07af073
Update submodule pointers for ccpp-framework and ccpp-physics
climbfuji Nov 26, 2019
661e98c
Update submodule pointers for ccpp/framework and ccpp/physics
climbfuji Nov 27, 2019
bc31689
Merge pull request #10 from climbfuji/merge_gsd_develop_and_update_ba…
climbfuji Nov 27, 2019
03f7d78
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into HEAD
climbfuji Nov 27, 2019
9caa172
Update submodule pointer for ccpp/physics
climbfuji Nov 27, 2019
ac71e23
ccpp/CMakeLists.txt: add flag '-Wall' to DEBUG flags for GNU compiler
climbfuji Nov 30, 2019
2de4377
Update submodule pointers for ccpp-framework and ccpp-physics
climbfuji Dec 2, 2019
eae6786
Update submodule pointers for atmos_cubed_sphere, ccpp/framework, ccp…
climbfuji Dec 3, 2019
88e87e9
Merge pull request #11 from climbfuji/dtc_develop_udpate_from_emc_201…
climbfuji Dec 3, 2019
bace3d3
Update CODEOWNERS, .gitmodules and submodule pointers for gsd/develop
climbfuji Dec 3, 2019
1bb3370
Update .gitmodules to point to noaa-gsd instead of climbfuji
climbfuji Dec 12, 2019
cc0f89a
Update CODEOWNERS for move to NOAA-GSD, update submodule pointers
climbfuji Dec 12, 2019
77bb53e
allow for radiation being called on physics timestep for first nhfrad…
climbfuji Dec 6, 2019
502ef17
Merge pull request #1 from climbfuji/first_n_radiation_calls_on_physi…
DomHeinzeller Dec 12, 2019
28f8cb3
Add README.md skeleton containing a disclaimer for compliance with th…
climbfuji Dec 12, 2019
088ec20
Merge pull request #2 from climbfuji/add_disclaimer
DomHeinzeller Dec 12, 2019
df0e6ea
add qdiag3d support
SamuelTrahanNOAA Dec 19, 2019
c7ad1a3
add qdiag3d support
SamuelTrahanNOAA Dec 27, 2019
8b16470
Move CCPP initialization to just before the first timestep
climbfuji Dec 31, 2019
dc10a75
Further bug fixes to tendency accumulation
SamuelTrahanNOAA Jan 3, 2020
9d4959f
Update CCPP prebuild config with changes for Thompson initialization;…
climbfuji Dec 31, 2019
53b365f
Revert change to .gitmodules, update submodule pointer for ccpp-physics
climbfuji Jan 6, 2020
0dcce97
Merge pull request #5 from climbfuji/thompson_init_update
DomHeinzeller Jan 6, 2020
8789b87
Moved number concentration approximation from cu_gf_driver to interst…
hannahcbarnes Jan 6, 2020
2200678
fix several bugs mentioned in code review
SamuelTrahanNOAA Jan 6, 2020
0d60589
Merge branch 'merge-me' into gsd/develop
SamuelTrahanNOAA Jan 6, 2020
2398c9c
atmos_model.F90: bugfix for retaining b4b identical results for GFDL-…
climbfuji Jan 10, 2020
6ec41e8
Update submodule pointer for ccpp-physics
climbfuji Jan 10, 2020
a15f74b
Update submodule pointer for ccpp-physics
climbfuji Jan 12, 2020
af8915b
Merge pull request #7 from climbfuji/bugfix_b4b_identical_restarts
DomHeinzeller Jan 12, 2020
538a1d8
add a pbl_generic_tend flag to tell whether the GFS_PBL_generic modul…
SamuelTrahanNOAA Jan 14, 2020
fbc1826
Move PBL tendencies into the PBL run subroutine.
SamuelTrahanNOAA Jan 14, 2020
ff725de
add ldiag3d and qdiag3d support to physics/module_MYNNPBL_wrapper.F90…
SamuelTrahanNOAA Jan 16, 2020
7b299c5
Point to sam's repo
SamuelTrahanNOAA Jan 16, 2020
f40f215
Merge branch 'NCmove' of https://github.com/hannahcbarnes/fv3atm into…
climbfuji Jan 22, 2020
322c846
Merge branch 'develop' of https://github.com/noaa-emc/fv3atm into HEAD
climbfuji Jan 27, 2020
d257b2a
Update .gitmodules for code review and testing
climbfuji Jan 27, 2020
e95f8ab
add model and ccpp tendency calculations
SamuelTrahanNOAA Jan 28, 2020
5275fb9
physics-level changes for tendencies
SamuelTrahanNOAA Jan 28, 2020
1e0619f
Revert change to .gitmodules, update submodule pointers
climbfuji Jan 30, 2020
e9eaddf
Merge pull request #9 from climbfuji/update_gsd_develop_from_develop
DomHeinzeller Jan 30, 2020
bc13d22
Changed order of calls in three suites: first MYNNrad_pre or
tanyasmirnova Jan 31, 2020
73586f0
Added qci_conv for convective clouds.
tanyasmirnova Jan 31, 2020
c135174
Added module_SGSCloud_RadPre.F90 and module_SGSCloud_RadPost.F90.
tanyasmirnova Jan 31, 2020
cf3d933
Correct tendency flag names, implement some more diagnostic tendencie…
SamuelTrahanNOAA Feb 6, 2020
dd8f27e
remove model_tend_pre&post from fast physics, add to stochastic
SamuelTrahanNOAA Feb 7, 2020
9ca064c
merge latest gsd/develop
SamuelTrahanNOAA Feb 7, 2020
1216e7c
Update submodule pointer for ccpp-physics
climbfuji Feb 13, 2020
e4c9eb8
Merge pull request #11 from climbfuji/update_submodule_pointer
DomHeinzeller Feb 13, 2020
f4fecfd
All gfs v15p2 and v16beta 3d diagnostic tendencies look reasonable; a…
SamuelTrahanNOAA Feb 13, 2020
ee400da
Merge branch 'gsd/develop' of https://github.com/noaa-gsd/fv3atm into…
climbfuji Feb 13, 2020
2c3d99c
Update .gitmodules and submodule pointers for ccpp-framework and ccpp…
climbfuji Feb 17, 2020
e43103d
ccpp/suites/*.xml: fix suite_FV3_GSD_SAR.xml, move GFS_DCNV_generic_p…
climbfuji Feb 17, 2020
815476d
Revert change to .gitmodules, update submodule pointers for ccpp-fram…
climbfuji Feb 18, 2020
3300660
Merge pull request #12 from climbfuji/move_number_concentration_bugfi…
DomHeinzeller Feb 18, 2020
5395a66
Merge branch 'gsd-dev-clouds' of https://github.com/tanyasmirnova/fv3…
climbfuji Feb 19, 2020
b8bcb32
Remove mynnrad_{pre,post} from CCPP prebuild config, replace with sgs…
climbfuji Feb 21, 2020
ae4f6be
Update .gitmodules and submodule pointer for ccpp-physics for code re…
climbfuji Feb 21, 2020
f23fa37
Fix restarts for suites using the GF scheme
climbfuji Feb 25, 2020
7a3ab3a
gfsphysics/GFS_layer/GFS_restart.F90: bugfix, adjust dimension of 3d …
climbfuji Feb 26, 2020
596a0b5
Update to MYNN Surface Layer Scheme and related modules - part II
joeolson42 Feb 28, 2020
7d4d569
Add timestep_init and timestep_final actions to CCPP. Update code so …
SamuelTrahanNOAA Mar 4, 2020
d46ebe8
Remove debug prints and commented-out code.
SamuelTrahanNOAA Mar 4, 2020
9f8b18f
Add total tendency calculations for gfsv15p2 and gsdv0. Calculate pbl…
SamuelTrahanNOAA Mar 12, 2020
71ecc5b
Update submodule pointer for ccpp/physics
climbfuji Mar 12, 2020
3338fe0
Revert change to .gitmodules, update submodule pointer for ccpp-physics
climbfuji Mar 13, 2020
2a05c53
Merge pull request #13 from climbfuji/gsd-dev-clouds_thompson-no-aero…
DomHeinzeller Mar 13, 2020
cd2583d
Add some #ifdef CCPP to avoid breaking non-CCPP runs
SamuelTrahanNOAA Mar 17, 2020
7648548
Merge branch 'gsd/develop' of https://github.com/joeolson42/fv3atm in…
climbfuji Mar 17, 2020
3972587
Update .gitmodules and submodule pointer for ccpp-physics for code re…
climbfuji Mar 17, 2020
78586f4
Mirror changes to CCPP version of GFS_debug.F90 in IPD version
climbfuji Mar 17, 2020
934cf14
Revert change to move composite interstitials to persistent data types
climbfuji Mar 19, 2020
001d24f
Add SDF suite_FV3_GSD_v0_mynnsfc.xml
climbfuji Mar 20, 2020
859cdd2
suites/suite_FV3_GSD_v0_mynnsfc.xml: correct name of suite
climbfuji Mar 23, 2020
ddec8ae
Update submodule pointer for ccpp-physics
climbfuji Mar 26, 2020
58670cc
Move qss from GFS_interstitial_type to GFS_sfcprop_type
climbfuji Mar 28, 2020
c6e032e
Bugfix in ccpp/suites/suite_FV3_GSD_v0_mynnsfc.xml, new SDF ccpp/suit…
climbfuji Apr 1, 2020
544cbe5
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Apr 3, 2020
5b6a22d
Merge pull request #16 from climbfuji/mynnsfclay_from_joe_in_latest_code
DomHeinzeller Apr 3, 2020
2dd765a
merge gsd/develop
SamuelTrahanNOAA Apr 3, 2020
19fb05e
merge gsd/develop submodule ccpp/framework
SamuelTrahanNOAA Apr 3, 2020
e09316a
Correction: Diag%hpbl => Tbd%hpbl
SamuelTrahanNOAA Apr 6, 2020
fcc27ec
Correction: Diag%hpbl => Tbd%hpbl
SamuelTrahanNOAA Apr 6, 2020
af8c130
tbd => Tbd in gfsphysics/GFS_layer/GFS_physics_driver.F90
SamuelTrahanNOAA Apr 6, 2020
0963476
Merge pull request #18 from SamuelTrahanNOAA/bugfix/diaghpbl_to_tbdhpbl
DomHeinzeller Apr 6, 2020
8c8137c
Update .gitmodules and submodule pointer for ccpp-physics for code re…
climbfuji Apr 16, 2020
522342e
Revert unnecessary changes made in original PR
climbfuji Apr 16, 2020
66e9859
gfsphysics/GFS_layer/GFS_physics_driver.F90: change case tbd% -> Tbd%
climbfuji Apr 16, 2020
fed81f9
Bugfix for several suite definition files: rename sgscloud_radpre to …
climbfuji Apr 16, 2020
68d4033
Update standard names and descriptions as per code review, add missin…
climbfuji Apr 16, 2020
1e2a188
Merge pull request #1 from NOAA-GSD/gsd/develop
joeolson42 Apr 17, 2020
6608e46
Updating MYNN-EDMF part II: fv3atm part
joeolson42 Apr 17, 2020
00953fd
Calculate non-physics tendencies in atmos_model.F90, configure output…
climbfuji Apr 17, 2020
2f78145
gfsphysics/GFS_layer/GFS_typedefs.F90: qdiag3d requires ldiag3d
climbfuji Apr 17, 2020
9406b7a
Calculate non-physics tendencies before radiation, and physics tenden…
climbfuji Apr 18, 2020
ab8d4dd
Add physics tendency summation scheme to FV3_GFS_v15p2 and FV3_GFS_v1…
climbfuji Apr 20, 2020
ab8e41b
gfsphysics/GFS_layer/GFS_typedefs.F90: bugfix, neet ntqv index for IPD
climbfuji Apr 21, 2020
13928aa
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Apr 22, 2020
537df51
Merge pull request #19 from climbfuji/tendencies_sam_with_dom_mods
DomHeinzeller Apr 22, 2020
893d935
Add host model variables and metadata to output auxiliary 2d/3d data …
climbfuji Apr 24, 2020
c9ec6e9
gfsphysics/GFS_layer/GFS_typedefs.F90: reset to zero and not clear_val
climbfuji Apr 24, 2020
e4d2ba8
gfsphysics/GFS_layer/GFS_typedefs.F90: remove unnecessary aux2d/3d_ra…
climbfuji Apr 24, 2020
6b19505
bug fix for restart applications
joeolson42 Apr 28, 2020
662333a
Merge branch 'add_aux_output' of https://github.com/climbfuji/fv3atm …
climbfuji Apr 28, 2020
f43eb0f
Update gfsphysics/physics/GFS_debug.F90 with changes from ccpp-physic…
climbfuji Apr 28, 2020
f0e8419
Update .gitmodules for code review and testing
climbfuji Apr 28, 2020
c18619c
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Apr 29, 2020
df3f9e4
Merge pull request #22 from climbfuji/combine_joe_mynnpbl_update_and_…
DomHeinzeller Apr 29, 2020
ab95ad8
Updated GSL orographic drag suite to enable use of custom orographic …
mdtoyNOAA May 1, 2020
3abf078
Update .gitmodules and submodule pointer for ccpp-physics for code re…
climbfuji May 12, 2020
e3e84fa
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji May 13, 2020
1193c21
Merge pull request #27 from climbfuji/hannah_nc_bugfix
DomHeinzeller May 13, 2020
bfe13b0
fix bugs found in pbl and ozone 3d diagnostic tendencies (#26)
SamuelTrahanNOAA May 14, 2020
325ebd2
Update .gitmodules and submodule pointers for GFDL_atmos_cubed_sphere…
climbfuji May 15, 2020
a7cd9d1
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into upd…
climbfuji May 15, 2020
f1cfcfd
Update submodule pointer for ccpp-physics
climbfuji May 15, 2020
f87cbd4
Fix bugs from merge process
climbfuji May 15, 2020
dabf9e6
Add CCPP annotation to GFS_physics_driver.F90, add new suite suite_FV…
climbfuji May 19, 2020
acbc575
Merging with updated version of NOAA-GSD/fv3atm gsd/develop branch
mdtoyNOAA May 20, 2020
3a0490d
Merge branch 'gsd/develop' of https://github.com/NOAA-GSD/fv3atm into…
mdtoyNOAA May 20, 2020
94b3ee0
ccpp/config/ccpp_prebuild_config.py: remove pset logic and unused GFS…
climbfuji May 20, 2020
7af8c0a
Revert change to .gitmodules and update submodule pointers for GFDL_a…
climbfuji May 20, 2020
c441a8e
Merge pull request #28 from climbfuji/update_gsd_develop_from_develop
DomHeinzeller May 20, 2020
7b5bdf9
Merge branch 'gsd/develop' of https://github.com/NOAA-GSD/fv3atm into…
climbfuji May 26, 2020
499accf
ccpp/config/ccpp_prebuild_config.py: fix incorrect optional arguments
climbfuji May 27, 2020
dec6867
gfsphysics/CCPP_layer/CCPP_data.meta: fix incorrect dimensions used
climbfuji May 27, 2020
b6411ba
gfsphysics/GFS_layer/GFS_typedefs.{F90,meta}: replace Model%blksz2 wi…
climbfuji May 27, 2020
45337f7
Update .gitmodules and submodule pointers for ccpp-physics and ccpp-f…
climbfuji May 27, 2020
289edfc
Minor bugfixes for handling conditionally allocated variables
climbfuji May 28, 2020
7ef6827
Revert change to .gitmodules and update submodule pointers for ccpp-f…
climbfuji Jun 1, 2020
2a5c1b8
Merge pull request #30 from climbfuji/gsd_develop_blocked_data_struct…
DomHeinzeller Jun 1, 2020
92005bd
ccpp/config/ccpp_prebuild_config.py: turn off calculation of cloud ef…
climbfuji Jun 2, 2020
df3378e
Update .gitmodules and submodule pointer for ccpp-physics for code re…
climbfuji Jun 2, 2020
f9b4dcc
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Jun 3, 2020
d78e553
Merge pull request #31 from climbfuji/thompson_mp_cloud_effective_rad…
DomHeinzeller Jun 3, 2020
71f6e3f
Merge branch 'updated_GSL_drag_suite_apr2020' of https://github.com/m…
climbfuji Jun 3, 2020
358697c
Change suite FV3_RAPHRRR to FV3_HRRR
climbfuji Jun 3, 2020
739da03
Update .gitmodules and submodule pointer for ccpp-physics
climbfuji Jun 4, 2020
27eaec1
Use GSL drag suite instead of CIRES UGWP in suite_FV3_HRRR.xml, add s…
climbfuji Jun 4, 2020
c996a9a
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Jun 5, 2020
eca86da
Merge pull request #32 from climbfuji/add_drag_suite_and_other_updates
DomHeinzeller Jun 5, 2020
1d72809
Update .gitmodules and submodule pointer for ccpp-physics for code re…
climbfuji Jun 5, 2020
392a0b0
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Jun 5, 2020
170500c
Merge pull request #33 from climbfuji/radcloud_cleanup
DomHeinzeller Jun 5, 2020
9795ea7
Update .gitmodules and submodule pointer for ccpp-physics for code re…
climbfuji Jun 8, 2020
0883e97
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Jun 9, 2020
18d2dc1
Merge pull request #34 from climbfuji/joe_mynn_changes_20200608
DomHeinzeller Jun 9, 2020
ac8f47a
Update .gitmodules and submodule pointer for ccpp-physics for code re…
climbfuji Jun 9, 2020
4dfe737
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Jun 12, 2020
4deb117
Merge pull request #35 from climbfuji/rollback_thompson
DomHeinzeller Jun 12, 2020
5dde84c
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into HEAD
climbfuji Jun 17, 2020
a249ccb
Update .gitmodules and submodule pointers for atmos_cubed_sphere, ccp…
climbfuji Jun 17, 2020
dc22afe
io/FV3GFS_io.F90: wrap new orographic data in #ifdef CCPP
climbfuji Jun 17, 2020
2ea9d39
Update submodule pointer for ccpp-physics
climbfuji Jun 18, 2020
06d596e
Revert change to .gitmodules and update submodule pointers for GFDL_a…
climbfuji Jun 19, 2020
cef892d
Merge pull request #37 from climbfuji/update_gsd_develop_from_develop…
DomHeinzeller Jun 19, 2020
61b8b6d
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into HEAD
climbfuji Jun 25, 2020
c73d384
Update .gitmodules and submodule pointer for GFDL_atmos_cubed_sphere …
climbfuji Jun 25, 2020
fb31f76
Update .gitmodules and submodule pointer for ccpp-physics
climbfuji Jun 25, 2020
ff91cff
Revert change to .gitmodules and update submodule pointer for GFDL_at…
climbfuji Jun 25, 2020
6f26ccf
Merge pull request #38 from climbfuji/update_gsd_develop_from_dev_emc…
DomHeinzeller Jun 25, 2020
80732fa
Update .gitmodules and submodule pointers for GFDL_atmos_cubed_sphere…
climbfuji Jun 29, 2020
eed6517
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into dyc…
climbfuji Jun 29, 2020
1074e93
Revert change to .gitmodules and update submodule pointers for GFDL_a…
climbfuji Jun 29, 2020
fb4cc41
Merge pull request #39 from climbfuji/dycore_bugfixes_and_sgscloud_up…
DomHeinzeller Jun 29, 2020
f5f7dbd
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into HEAD
climbfuji Jul 7, 2020
026b0aa
Update .gitmodules and submodule pointers for GFDL_atmos_cubed_sphere…
climbfuji Jul 7, 2020
9f191ae
Revert change to .gitmodules and update submodule pointers for GFDL_a…
climbfuji Jul 8, 2020
0db9261
Merge pull request #40 from climbfuji/update_gsd_develop_from_emc_dev…
DomHeinzeller Jul 8, 2020
59f6f86
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into HEAD
climbfuji Aug 6, 2020
8ad85d3
Revert change to .gitmodules and update submodule pointers for GFDL_a…
climbfuji Aug 7, 2020
1c64e70
Merge pull request #43 from climbfuji/update_gsd_develop_from_develop
DomHeinzeller Aug 7, 2020
85f55c2
Add tracer sanitizer to list of CCPP schemes and to two suite definit…
climbfuji Aug 10, 2020
f3ed818
Update .gitmodules and submodule pointer for ccpp-physics for code re…
climbfuji Aug 10, 2020
84c727d
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into tra…
climbfuji Aug 10, 2020
9d2fb58
Fix linker problem in gfsphysics/CMakeLists.txt by removing physics/p…
climbfuji Aug 11, 2020
9bd419c
Comment out tracer_sanitizer scheme
climbfuji Aug 11, 2020
30f40e8
Update submodule pointer for ccpp-physics
climbfuji Aug 11, 2020
5811a05
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Aug 11, 2020
a8d8d93
Merge pull request #44 from climbfuji/tracer_sanitizer
DomHeinzeller Aug 11, 2020
2b61cd4
Update .gitmodules and submodule pointer for ccpp-physics
climbfuji Aug 13, 2020
6e824a0
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Aug 14, 2020
e904618
Merge pull request #45 from climbfuji/HFIP_GFchanges
DomHeinzeller Aug 14, 2020
36d546f
Update submodule pointer for ccpp-physics
climbfuji Aug 28, 2020
707f68d
Merge pull request #46 from climbfuji/ccpp_physics_submodule_update_2…
DomHeinzeller Aug 28, 2020
bd32c9e
Update .gitmodules and ccpp/physics for code review and testing
climbfuji Sep 2, 2020
b51c4fc
gfsphysics/GFS_layer/GFS_typedefs.F90: remove guard that prevents usi…
climbfuji Sep 2, 2020
a5a066a
1st attempt - Sept. 2
mdtoyNOAA Sep 2, 2020
1d8b258
Update submodule pointer for ccpp-physics
climbfuji Sep 3, 2020
0776fc6
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Sep 3, 2020
926001c
Merge pull request #47 from climbfuji/tanya_gcycle
DomHeinzeller Sep 3, 2020
968ad2e
Update .gitmodules and submodule pointer for ccpp-physics for code re…
climbfuji Sep 3, 2020
23b8770
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Sep 3, 2020
4e6475e
Merge pull request #48 from climbfuji/pretty_print_sfcsub
DomHeinzeller Sep 3, 2020
4ff714c
2nd try -- Sept. 3 -- two scheme test
mdtoyNOAA Sep 4, 2020
b916806
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into HEAD
climbfuji Sep 4, 2020
034d8f2
Update .gitmodules for code review and testing
climbfuji Sep 4, 2020
9b224af
Update submodule pointer for ccpp-physics
climbfuji Sep 4, 2020
345fd93
Bug fix -- Sept. 10
mdtoyNOAA Sep 10, 2020
936da62
Sept. 12 edition
mdtoyNOAA Sep 13, 2020
9784248
Sept. 12 bug fix
mdtoyNOAA Sep 13, 2020
dc619e5
Update .gitmodules and submodule pointer for ccpp-physics for code re…
climbfuji Sep 14, 2020
14f852f
Sept. 17 -- debugging
mdtoyNOAA Sep 17, 2020
0e07005
Bug fixes -- Sept. 18
mdtoyNOAA Sep 18, 2020
00084c0
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into upd…
climbfuji Oct 1, 2020
39fcfe1
Revert changes to .gitmodules and update submodule pointer for GFDL_a…
climbfuji Oct 2, 2020
4a64b78
Merge pull request #49 from climbfuji/update_gsd_develop_from_develop…
DomHeinzeller Oct 2, 2020
b094ffe
Merge branch 'gsd/develop' of https://github.com/NOAA-GSD/fv3atm into…
mdtoyNOAA Oct 5, 2020
5c424d0
Updated .gitmodules for ccpp/physics
mdtoyNOAA Oct 5, 2020
c7bfd3c
Merge branch 'gsd/develop' of https://github.com/NOAA-GSD/fv3atm into…
climbfuji Oct 6, 2020
ebaef7e
Oct. 7 update
mdtoyNOAA Oct 7, 2020
0ffbb3c
updated submodule for ccpp-physics and added suite_FV3_GSD_v0_unified…
mdtoyNOAA Oct 8, 2020
42bebfc
Updated unified_ugwp documentation.
mdtoyNOAA Oct 13, 2020
6b1efbc
Add MYNNEDMF diagnostic variables to Diag%phys_zero routine
climbfuji Oct 14, 2020
d7906d8
Update .gitmodules and submodule pointers for ccpp-framework and ccpp…
climbfuji Oct 14, 2020
48f348e
Move RUC LSM variable zs (depth of soil layers) from block-dependent …
climbfuji Oct 14, 2020
e3919c2
Revert change to .gitmodules and update submodule pointers for ccpp-f…
climbfuji Oct 15, 2020
bf64848
Merge pull request #51 from climbfuji/ruclsm_rucinit_in_lsm_ruc_init
DomHeinzeller Oct 15, 2020
c71cab0
Modified code per PR recommendations
mdtoyNOAA Oct 22, 2020
5cdb622
Modified code per G. Firl's PR recommendations
mdtoyNOAA Oct 26, 2020
4f638e2
cires_vert_orodis_v1.F90 bug fix
mdtoyNOAA Oct 27, 2020
2371123
Added FV3_GSD_v0_no_drag suite for testing purposes only
mdtoyNOAA Oct 29, 2020
da639d0
Deleted no_drag SDF and added version=1 designation to unified_ugwp SDFs
mdtoyNOAA Nov 5, 2020
0ac7e4f
Update submodule pointer for ccpp-physics
mdtoyNOAA Nov 5, 2020
bf5cfab
Merge branch 'gsd/develop' of https://github.com/NOAA-GSD/fv3atm into…
mdtoyNOAA Nov 5, 2020
daced91
Update .gitmodules and submodule pointer for ccpp-physics
climbfuji Nov 16, 2020
8061355
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Nov 17, 2020
bcf422d
Merge pull request #57 from climbfuji/mike_unified_ugwp_with_dom_mods
DomHeinzeller Nov 17, 2020
f752b12
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into HEAD
climbfuji Nov 18, 2020
f5dcd1f
Update .gitmodules for code review and testing
climbfuji Nov 18, 2020
9b8458c
ccpp/config/ccpp_prebuild_config.py: add tracer_sanitizer.F90 back in…
climbfuji Nov 19, 2020
cc2df74
Fix conflict from merge in gfsphysics/GFS_layer/GFS_typedefs.F90: RUC…
climbfuji Nov 19, 2020
3919ec5
Update submodule pointer for ccpp-physics
climbfuji Nov 19, 2020
84b00df
Revert change to .gitmodules and update submodule pointers for GFDL_a…
climbfuji Nov 20, 2020
ae66853
Merge pull request #58 from climbfuji/update_gsd_develop_from_develop…
DomHeinzeller Nov 20, 2020
5e95e56
Update .gitmodules and submodule pointers for ccpp-framework and ccpp…
climbfuji Nov 21, 2020
a664d01
Merge branch 'gsd/develop' of https://github.com/NOAA-GSD/fv3atm into…
climbfuji Nov 21, 2020
cdd6897
ccpp/suites/suite_FV3_GSD_noah.xml: comment out tracer_sanitizer scheme
climbfuji Nov 22, 2020
34a9337
Add --debug to ccpp_prebuild.py call in DEBUG mode, pretty-print of c…
climbfuji Nov 22, 2020
c289028
Add CCPP suite ccpp/suites/suite_FV3_GFS_v16beta_coupled.xml
climbfuji Nov 22, 2020
64da3d8
Revert unintended change of GFDL_atmos_cubed_sphere info in .gitmodules
climbfuji Nov 23, 2020
8d1cd72
Bugfix in CMakeLists.txt, pass _ccpp_debug_arg to ccpp_prebuild.py call
climbfuji Nov 23, 2020
fdc3543
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into upd…
climbfuji Nov 23, 2020
23423c6
Revert change to .gitmodules and update submodule pointers for ccpp-f…
climbfuji Nov 24, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@
branch = dev/emc
[submodule "ccpp/framework"]
path = ccpp/framework
url = https://github.com/NCAR/ccpp-framework
branch = master
#url = https://github.com/NCAR/ccpp-framework
#branch = master
url = https://github.com/climbfuji/ccpp-framework
branch = update_master_from_gsd_develop_20201120
[submodule "ccpp/physics"]
path = ccpp/physics
url = https://github.com/NCAR/ccpp-physics
branch = master
#url = https://github.com/NCAR/ccpp-physics
#branch = master
url = https://github.com/climbfuji/ccpp-physics
branch = update_master_from_gsd_develop_20201120
7 changes: 6 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
if(CCPP)

if(DEBUG)
set(_ccpp_debug_arg "--debug")
aerorahul marked this conversation as resolved.
Show resolved Hide resolved
endif()
if(DEFINED CCPP_SUITES)
set(_ccpp_suites_arg "--suites=${CCPP_SUITES}")
message("Calling CCPP code generator (ccpp_prebuild.py) for suites ${_ccpp_suites_arg} ...")
else()
message("Calling CCPP code generator (ccpp_prebuild.py) for all available suites ...")
endif()
message("Calling CCPP code generator (ccpp_prebuild.py) ... ${_ccpp_suites_arg}")
execute_process(COMMAND ${Python_EXECUTABLE}
"ccpp/framework/scripts/ccpp_prebuild.py"
"--config=ccpp/config/ccpp_prebuild_config.py"
Expand Down
3 changes: 3 additions & 0 deletions ccpp/config/ccpp_prebuild_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@
'ccpp/physics/physics/GFS_time_vary_pre.fv3.F90',
'ccpp/physics/physics/cires_ugwp.F90',
'ccpp/physics/physics/cires_ugwp_post.F90',
'ccpp/physics/physics/unified_ugwp.F90',
'ccpp/physics/physics/unified_ugwp_post.F90',
'ccpp/physics/physics/cnvc90.f',
'ccpp/physics/physics/cs_conv.F90',
'ccpp/physics/physics/cs_conv_aw_adj.F90',
Expand Down Expand Up @@ -157,6 +159,7 @@
'ccpp/physics/physics/ozphys_2015.f',
'ccpp/physics/physics/precpd.f',
'ccpp/physics/physics/phys_tend.F90',
'ccpp/physics/physics/tracer_sanitizer.F90',
'ccpp/physics/physics/radlw_main.F90',
'ccpp/physics/physics/radsw_main.F90',
'ccpp/physics/physics/rascnv.F90',
Expand Down
2 changes: 1 addition & 1 deletion ccpp/framework
Submodule framework updated 1 files
+58 −61 scripts/mkstatic.py
93 changes: 93 additions & 0 deletions ccpp/suites/suite_FV3_GFS_v16beta_coupled.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_v16beta_coupled" version="1">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
<scheme>fv_sat_adj</scheme>
</subcycle>
</group>
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
<scheme>GFS_rrtmg_setup</scheme>
<scheme>GFS_rad_time_vary</scheme>
<scheme>GFS_phys_time_vary</scheme>
</subcycle>
</group>
<group name="radiation">
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw_pre</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
</subcycle>
</group>
<group name="physics">
<subcycle loop="1">
<scheme>GFS_suite_interstitial_phys_reset</scheme>
<scheme>GFS_suite_stateout_reset</scheme>
<scheme>get_prs_fv3</scheme>
<scheme>GFS_suite_interstitial_1</scheme>
<scheme>GFS_surface_generic_pre</scheme>
<scheme>GFS_surface_composites_pre</scheme>
<scheme>dcyc2t3</scheme>
<scheme>GFS_surface_composites_inter</scheme>
<scheme>GFS_suite_interstitial_2</scheme>
</subcycle>
<!-- Surface iteration loop -->
<subcycle loop="2">
<scheme>sfc_diff</scheme>
<scheme>GFS_surface_loop_control_part1</scheme>
<scheme>sfc_ocean</scheme>
<scheme>lsm_noah</scheme>
<scheme>sfc_cice</scheme>
<scheme>sfc_sice</scheme>
<scheme>GFS_surface_loop_control_part2</scheme>
</subcycle>
<!-- End of surface iteration loop -->
<subcycle loop="1">
<scheme>GFS_surface_composites_post</scheme>
<scheme>sfc_diag</scheme>
<scheme>sfc_diag_post</scheme>
<scheme>GFS_surface_generic_post</scheme>
<scheme>GFS_PBL_generic_pre</scheme>
<scheme>satmedmfvdifq</scheme>
<scheme>GFS_PBL_generic_post</scheme>
<scheme>GFS_GWD_generic_pre</scheme>
<scheme>cires_ugwp</scheme>
<scheme>cires_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
<scheme>get_phi_fv3</scheme>
<scheme>GFS_suite_interstitial_3</scheme>
<scheme>GFS_DCNV_generic_pre</scheme>
<scheme>samfdeepcnv</scheme>
<scheme>GFS_DCNV_generic_post</scheme>
<scheme>GFS_SCNV_generic_pre</scheme>
<scheme>samfshalcnv</scheme>
<scheme>GFS_SCNV_generic_post</scheme>
<scheme>GFS_suite_interstitial_4</scheme>
<scheme>cnvc90</scheme>
<scheme>GFS_MP_generic_pre</scheme>
<scheme>gfdl_cloud_microphys</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
</subcycle>
</group>
<group name="stochastics">
<subcycle loop="1">
<scheme>GFS_stochastics</scheme>
<scheme>phys_tend</scheme>
</subcycle>
</group>
<!-- <finalize></finalize> -->
</suite>
1 change: 1 addition & 0 deletions ccpp/suites/suite_FV3_GSD_noah.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
<scheme>mp_thompson_post</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>cu_gf_driver_post</scheme>
<!-- <scheme>tracer_sanitizer</scheme> -->
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this a place holder? tracer_sanitizer seems not used in any suite file?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's right, the "offending" tracer_sanitizer scheme is added in ccpp-physics for testing and debugging stability issues. It's not to be used ever in applications, because it's a dumb scheme that simply resets negative tracers to zero and doesn't care about water conservation. As such, it is commented out everywhere, but the commented lines for the two GSD suites illustrate how we used it in order to stabilize the model. It's similar to the Thompson MP tendency limiter, which simply puts a lid on the heating rate coming out of the Thompson scheme without adjusting any other quantity. I guess we will delete the tracer_sanitizer and Thompson MP tendency limiter once we figured out how to run the GSL physics in a stable way at reasonable time steps (it's always stable at small timesteps, but these can't be used in operations).

<scheme>maximum_hourly_diagnostics</scheme>
</subcycle>
</group>
Expand Down
1 change: 1 addition & 0 deletions ccpp/suites/suite_FV3_GSD_v0.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
<scheme>mp_thompson_post</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>cu_gf_driver_post</scheme>
<!-- <scheme>tracer_sanitizer</scheme> -->
<scheme>maximum_hourly_diagnostics</scheme>
</subcycle>
</group>
Expand Down
93 changes: 93 additions & 0 deletions ccpp/suites/suite_FV3_GSD_v0_unified_ugwp_suite.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GSD_v0_unified_ugwp_suite" version="1">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
<scheme>GFS_rrtmg_setup</scheme>
<scheme>GFS_rad_time_vary</scheme>
<scheme>GFS_phys_time_vary</scheme>
</subcycle>
</group>
<group name="radiation">
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>sgscloud_radpre</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw_pre</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>sgscloud_radpost</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
</subcycle>
</group>
<group name="physics">
<subcycle loop="1">
<scheme>GFS_suite_interstitial_phys_reset</scheme>
<scheme>GFS_suite_stateout_reset</scheme>
<scheme>get_prs_fv3</scheme>
<scheme>GFS_suite_interstitial_1</scheme>
<scheme>GFS_surface_generic_pre</scheme>
<scheme>GFS_surface_composites_pre</scheme>
<scheme>dcyc2t3</scheme>
<scheme>GFS_surface_composites_inter</scheme>
<scheme>GFS_suite_interstitial_2</scheme>
</subcycle>
<!-- Surface iteration loop -->
<subcycle loop="2">
<scheme>sfc_diff</scheme>
<scheme>GFS_surface_loop_control_part1</scheme>
<scheme>sfc_nst_pre</scheme>
<scheme>sfc_nst</scheme>
<scheme>sfc_nst_post</scheme>
<scheme>lsm_ruc</scheme>
<scheme>lsm_ruc_sfc_sice_pre</scheme>
<scheme>sfc_sice</scheme>
<scheme>lsm_ruc_sfc_sice_post</scheme>
<scheme>GFS_surface_loop_control_part2</scheme>
</subcycle>
<!-- End of surface iteration loop -->
<subcycle loop="1">
<scheme>GFS_surface_composites_post</scheme>
<scheme>sfc_diag</scheme>
<scheme>sfc_diag_post</scheme>
<scheme>GFS_surface_generic_post</scheme>
<scheme>mynnedmf_wrapper</scheme>
<scheme>GFS_GWD_generic_pre</scheme>
<scheme>unified_ugwp</scheme>
<scheme>unified_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
<scheme>get_phi_fv3</scheme>
<scheme>GFS_suite_interstitial_3</scheme>
<scheme>GFS_DCNV_generic_pre</scheme>
<scheme>cu_gf_driver_pre</scheme>
<scheme>cu_gf_driver</scheme>
<scheme>GFS_DCNV_generic_post</scheme>
<scheme>GFS_SCNV_generic_pre</scheme>
<scheme>GFS_SCNV_generic_post</scheme>
<scheme>GFS_suite_interstitial_4</scheme>
<scheme>cnvc90</scheme>
<scheme>GFS_MP_generic_pre</scheme>
<scheme>mp_thompson_pre</scheme>
<scheme>mp_thompson</scheme>
<scheme>mp_thompson_post</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>cu_gf_driver_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
</subcycle>
</group>
<group name="stochastics">
<subcycle loop="1">
<scheme>GFS_stochastics</scheme>
</subcycle>
</group>
<!-- <finalize></finalize> -->
</suite>
91 changes: 91 additions & 0 deletions ccpp/suites/suite_FV3_GSD_v0_unified_ugwp_suite_noah.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GSD_v0_unified_ugwp_suite_noah" version="1">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
<scheme>GFS_rrtmg_setup</scheme>
<scheme>GFS_rad_time_vary</scheme>
<scheme>GFS_phys_time_vary</scheme>
</subcycle>
</group>
<group name="radiation">
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>sgscloud_radpre</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw_pre</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>sgscloud_radpost</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
</subcycle>
</group>
<group name="physics">
<subcycle loop="1">
<scheme>GFS_suite_interstitial_phys_reset</scheme>
<scheme>GFS_suite_stateout_reset</scheme>
<scheme>get_prs_fv3</scheme>
<scheme>GFS_suite_interstitial_1</scheme>
<scheme>GFS_surface_generic_pre</scheme>
<scheme>GFS_surface_composites_pre</scheme>
<scheme>dcyc2t3</scheme>
<scheme>GFS_surface_composites_inter</scheme>
<scheme>GFS_suite_interstitial_2</scheme>
</subcycle>
<!-- Surface iteration loop -->
<subcycle loop="2">
<scheme>sfc_diff</scheme>
<scheme>GFS_surface_loop_control_part1</scheme>
<scheme>sfc_nst_pre</scheme>
<scheme>sfc_nst</scheme>
<scheme>sfc_nst_post</scheme>
<scheme>lsm_noah</scheme>
<scheme>sfc_sice</scheme>
<scheme>GFS_surface_loop_control_part2</scheme>
</subcycle>
<!-- End of surface iteration loop -->
<subcycle loop="1">
<scheme>GFS_surface_composites_post</scheme>
<scheme>sfc_diag</scheme>
<scheme>sfc_diag_post</scheme>
<scheme>GFS_surface_generic_post</scheme>
<scheme>mynnedmf_wrapper</scheme>
<scheme>GFS_GWD_generic_pre</scheme>
<scheme>unified_ugwp</scheme>
<scheme>unified_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
<scheme>get_phi_fv3</scheme>
<scheme>GFS_suite_interstitial_3</scheme>
<scheme>GFS_DCNV_generic_pre</scheme>
<scheme>cu_gf_driver_pre</scheme>
<scheme>cu_gf_driver</scheme>
<scheme>GFS_DCNV_generic_post</scheme>
<scheme>GFS_SCNV_generic_pre</scheme>
<scheme>GFS_SCNV_generic_post</scheme>
<scheme>GFS_suite_interstitial_4</scheme>
<scheme>cnvc90</scheme>
<scheme>GFS_MP_generic_pre</scheme>
<scheme>mp_thompson_pre</scheme>
<scheme>mp_thompson</scheme>
<scheme>mp_thompson_post</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>cu_gf_driver_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
</subcycle>
</group>
<group name="stochastics">
<subcycle loop="1">
<scheme>GFS_stochastics</scheme>
</subcycle>
</group>
<!-- <finalize></finalize> -->
</suite>
Loading