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.

Sign up for GitHub

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 master branch to use master branches of ccpp-physics and ccpp-framework #185

Merged
merged 42 commits into from
Jul 13, 2020
Merged

Update master branch to use master branches of ccpp-physics and ccpp-framework #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
5faeca8
add hurricane-specific variables for moninedmf to GFS_typedefs and ad…
grantfirl Dec 10, 2019
8e38fc1
apply non-default value of moninq_fac (0.7) in namelist for HWRF PBL
grantfirl Dec 12, 2019
75492b9
change value of moninq_fac for HWRF_PBL namelist to -1.0 after consul…
grantfirl Dec 13, 2019
03432b7
Merge branch 'dtc/develop' into biswas-hafs_gjf
grantfirl Mar 24, 2020
3d2c920
rename physics namelist that uses hurricane flag in hybrid EDMF schem…
grantfirl Mar 24, 2020
4e390e7
add new PBL diagnostic for satmedmfvdifq
grantfirl Apr 8, 2020
2c0ff62
add variables, SDFs, namelist, and data files for HWRF version of NOA…
grantfirl Apr 8, 2020
fda4986
update GFS_typedefs.F90 to be in sync with FV3's version
grantfirl Apr 8, 2020
95bdd90
change name of physical constant and rearrange a few lines in GFS_typ…
grantfirl Apr 9, 2020
fe3010a
edit GFS_typedefs.F90/meta for HWRF RRTMG
grantfirl Apr 9, 2020
680691c
add HWRF RRTMG to ccpp_prebuild_config
grantfirl Apr 9, 2020
ca2df0a
Merge branch 'hwrf_rrtmg' into noah_hafs2
grantfirl Apr 9, 2020
8102c0d
change extension on module_sf_noahlsm.F[90] in ccpp_prebuild_config
grantfirl Apr 10, 2020
2b3a978
add snotime as a sfcprop variable
grantfirl Apr 13, 2020
facdcee
update GFS_typedefs for sflx_glacial and add HWRF SDF/namelist
grantfirl Apr 16, 2020
472f8a2
move sthick
grantfirl Apr 16, 2020
95a6986
change away from hafs name
grantfirl Apr 17, 2020
b8ed24f
add variables to GFS_typedefs for HWRF SAS
grantfirl Apr 20, 2020
fb8ee19
Merge branch 'dtc/hwrf-physics' into noah_hafs2
grantfirl Apr 20, 2020
5dc86bf
initial changes for GFDL surface layer scheme
grantfirl Apr 23, 2020
18c433d
add roughness length to non-prescribed surface flux cases (needs to b…
grantfirl Apr 27, 2020
e614bc0
add namelist options for GFDL surface layer; add suites that combines…
grantfirl Apr 28, 2020
afc899e
Merge branch 'gfdl_sfc_layer' into hwrf_sfc
grantfirl May 5, 2020
ac57ca3
Merge branch 'master' into hwrf_sfc
grantfirl May 28, 2020
e5bc573
update GFS_typedefs to work with latest dtc/hwrf-physics
grantfirl May 28, 2020
de084cb
revert changes to CMakeLists.txt to use older version of ccpp-framewo…
grantfirl May 28, 2020
43c4570
Revert "revert changes to CMakeLists.txt to use older version of ccpp…
grantfirl Jun 8, 2020
227ac70
update GFS_typedefs.[F90/meta] and ccpp_prebuild_config.py to work wi…
grantfirl Jun 8, 2020
2d6bf80
remove hurricane specific files
grantfirl Jun 8, 2020
bacbc93
remove whitespace
grantfirl Jun 9, 2020
cb1dd17
Merge pull request #183 from grantfirl/update_dtc_develop_20200608
grantfirl Jun 9, 2020
adf6169
edit ccpp_prebuild_config.py to use new GSD files; edit GSD SDFs to u…
grantfirl Jun 11, 2020
fcf0d95
add phys_tend scheme to end of SDFs
grantfirl Jun 11, 2020
7a72116
update optional arguments in ccpp_prebuild_config.py; update gmtb_scm…
grantfirl Jun 11, 2020
8559fb1
update ccpp_prebuild_config.py to remove pset to match FV3 and to wor…
grantfirl Jul 6, 2020
49f37ad
Merge branch 'gsd/develop' into update_master_20200706
grantfirl Jul 6, 2020
27798da
update GFS_typedefs.[F90/meta] to match FV3 changes to master
grantfirl Jul 6, 2020
fcfce46
attempt to change gmtb_scm_type_defs.meta to match changes to CCPP fr…
grantfirl Jul 6, 2020
848f578
update submodule pointers
grantfirl Jul 7, 2020
75f3475
remove possibility to run SCM columns with independent physics; chang…
grantfirl Jul 10, 2020
dba6881
update ccpp-physics submodule pointer
grantfirl Jul 10, 2020
30fe019
change order of GFS_DCNV_generic_pre in many SDFs
grantfirl Jul 10, 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
301 changes: 145 additions & 156 deletions ccpp/config/ccpp_prebuild_config.py
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ccpp/framework
Open in desktop
Submodule framework updated 75 files
+0 −100 .travis.yml
+4 −24 CMakeLists.txt
+1 −1 CODEOWNERS
+4 −0 doc/CMakeLists.txt
+ − doc/DevelopersGuide/CCPP_VARIABLES_FV3.pdf
+ − doc/DevelopersGuide/CCPP_VARIABLES_SCM.pdf
+0 −15 doc/DevelopersGuide/Makefile
+12 −0 doc/DevelopersGuide/README.md
+0 −23 doc/DevelopersGuide/acknow.tex
+0 −2 doc/DevelopersGuide/chap_appendix.tex
+0 −328 doc/DevelopersGuide/chap_hostmodel.tex
+0 −12 doc/DevelopersGuide/chap_intro.tex
+0 −158 doc/DevelopersGuide/chap_schemes.tex
+0 −0 doc/DevelopersGuide/gmtb.sty
+0 −69 doc/DevelopersGuide/host_cap_template.F90
+ − doc/DevelopersGuide/images/ccpp_design_with_ccpp_prebuild.pdf
+ − doc/DevelopersGuide/images/dtc_logo.png
+0 −39 doc/DevelopersGuide/main.tex
+0 −28 doc/DevelopersGuide/preface.tex
+0 −129 doc/DevelopersGuide/scheme_template.F90
+0 −81 doc/DevelopersGuide/scheme_template.meta
+0 −28 doc/DevelopersGuide/title.tex
+0 −30 schemes/CMakeLists.txt
+0 −99 schemes/check/CMakeLists.txt
+0 −92 schemes/check/ccpp_prebuild_config.py
+0 −72 schemes/check/check_noop.f90
+0 −65 schemes/check/check_test.f90
+0 −61 schemes/check/nan.f90
+0 −35 schemes/check/scheme.xml
+115 −236 scripts/ccpp_prebuild.py
+21 −23 scripts/common.py
+4 −0 scripts/conversion_tools/__init__.py
+24 −0 scripts/conversion_tools/unit_conversion.py
+0 −718 scripts/convert_metadata.py
+0 −394 scripts/convert_metadata_schemes_using_typedef_dims.py
+76 −173 scripts/metadata_parser.py
+7 −1 scripts/metavar.py
+35 −375 scripts/mkcap.py
+2 −9 scripts/mkdoc.py
+318 −42 scripts/mkstatic.py
+6 −92 src/CMakeLists.txt
+0 −180 src/ccpp.F90
+2 −27 src/ccpp_api.F90
+0 −53 src/ccpp_dl.F90
+0 −181 src/ccpp_dl.c
+0 −34 src/ccpp_dl.h
+0 −128 src/ccpp_errors.F90
+0 −472 src/ccpp_fcall.F90
+0 −2,151 src/ccpp_fields.F90
+0 −285 src/ccpp_fields_idx.c
+0 −80 src/ccpp_fields_idx.h
+0 −159 src/ccpp_scheme.F90
+0 −101 src/ccpp_strings.F90
+0 −438 src/ccpp_suite.F90
+20 −147 src/ccpp_types.F90
+0 −89 src/ccpp_utils.c
+0 −41 src/ccpp_utils.h
+0 −396 src/ccpp_xml.F90
+0 −246 src/ccpp_xml.c
+0 −60 src/ccpp_xml.h
+0 −53 src/tests/CMakeLists.txt
+0 −49 src/tests/suite.xsd
+0 −10 src/tests/suite_EXAMPLE.xml
+0 −10 src/tests/suite_check_1.xml
+0 −10 src/tests/suite_check_2.xml
+0 −10 src/tests/suite_check_3.xml
+0 −10 src/tests/suite_noop_1.xml
+0 −10 src/tests/suite_noop_2.xml
+0 −10 src/tests/suite_noop_3.xml
+0 −22 src/tests/suite_noop_4.xml
+0 −13 src/tests/suite_noop_5.xml
+0 −10 src/tests/suite_noop_6.xml
+0 −168 src/tests/test_check.f90
+0 −50 src/tests/test_fields.c
+0 −58 src/tests/test_init_finalize.f90
2 changes: 1 addition & 1 deletion ccpp/physics
Open in desktop
Submodule physics updated 168 files
3 changes: 2 additions & 1 deletion ccpp/suites/suite_SCM_GFS_v15p2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
<scheme>GFS_DCNV_generic_pre</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>
Expand All @@ -76,6 +76,7 @@
<scheme>gfdl_cloud_microphys</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
<scheme>phys_tend</scheme>
</subcycle>
</group>
</suite>
3 changes: 2 additions & 1 deletion ccpp/suites/suite_SCM_GFS_v15p2_FA.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
<scheme>GFS_DCNV_generic_pre</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>
Expand All @@ -76,6 +76,7 @@
<scheme>mp_fer_hires</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
<scheme>phys_tend</scheme>
</subcycle>
</group>
</suite>
3 changes: 2 additions & 1 deletion ccpp/suites/suite_SCM_GFS_v15p2_MYJ.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
<scheme>GFS_DCNV_generic_pre</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>
Expand All @@ -76,6 +76,7 @@
<scheme>gfdl_cloud_microphys</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
<scheme>phys_tend</scheme>
</subcycle>
</group>
</suite>
3 changes: 2 additions & 1 deletion ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
<scheme>GFS_DCNV_generic_pre</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>
Expand All @@ -83,6 +83,7 @@
<scheme>gfdl_cloud_microphys</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
<scheme>phys_tend</scheme>
</subcycle>
</group>
</suite>
3 changes: 2 additions & 1 deletion ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP_ps.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
<scheme>GFS_DCNV_generic_pre</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>
Expand All @@ -64,6 +64,7 @@
<scheme>gfdl_cloud_microphys</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
<scheme>phys_tend</scheme>
</subcycle>
</group>
</suite>
1 change: 1 addition & 0 deletions ccpp/suites/suite_SCM_GFS_v15p2_no_nsst.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
<scheme>gfdl_cloud_microphys</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
<scheme>phys_tend</scheme>
</subcycle>
</group>
</suite>
3 changes: 2 additions & 1 deletion ccpp/suites/suite_SCM_GFS_v15p2_no_nsst_ps.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
<scheme>GFS_DCNV_generic_pre</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>
Expand All @@ -57,6 +57,7 @@
<scheme>gfdl_cloud_microphys</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
<scheme>phys_tend</scheme>
</subcycle>
</group>
</suite>
3 changes: 2 additions & 1 deletion ccpp/suites/suite_SCM_GFS_v15p2_noahmp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
<scheme>GFS_DCNV_generic_pre</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>
Expand All @@ -76,6 +76,7 @@
<scheme>gfdl_cloud_microphys</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
<scheme>phys_tend</scheme>
</subcycle>
</group>
</suite>
3 changes: 2 additions & 1 deletion ccpp/suites/suite_SCM_GFS_v15p2_ps.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
<scheme>GFS_DCNV_generic_pre</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>
Expand All @@ -57,6 +57,7 @@
<scheme>gfdl_cloud_microphys</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
<scheme>phys_tend</scheme>
</subcycle>
</group>
</suite>
3 changes: 2 additions & 1 deletion ccpp/suites/suite_SCM_GFS_v16beta.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
<scheme>GFS_DCNV_generic_pre</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>
Expand All @@ -76,6 +76,7 @@
<scheme>gfdl_cloud_microphys</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
<scheme>phys_tend</scheme>
</subcycle>
</group>
</suite>
1 change: 1 addition & 0 deletions ccpp/suites/suite_SCM_GFS_v16beta_no_nsst.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
<scheme>gfdl_cloud_microphys</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
<scheme>phys_tend</scheme>
</subcycle>
</group>
</suite>
3 changes: 2 additions & 1 deletion ccpp/suites/suite_SCM_GFS_v16beta_no_nsst_ps.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
<scheme>GFS_DCNV_generic_pre</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>
Expand All @@ -57,6 +57,7 @@
<scheme>gfdl_cloud_microphys</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
<scheme>phys_tend</scheme>
</subcycle>
</group>
</suite>
3 changes: 2 additions & 1 deletion ccpp/suites/suite_SCM_GFS_v16beta_ps.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
<scheme>GFS_DCNV_generic_pre</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>
Expand All @@ -57,6 +57,7 @@
<scheme>gfdl_cloud_microphys</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
<scheme>phys_tend</scheme>
</subcycle>
</group>
</suite>
7 changes: 4 additions & 3 deletions ccpp/suites/suite_SCM_GSD_v1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
<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>mynnrad_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw_pre</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>mynnrad_post</scheme>
<scheme>sgscloud_radpost</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
</subcycle>
Expand Down Expand Up @@ -65,9 +65,9 @@
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
<scheme>GFS_DCNV_generic_pre</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>
Expand All @@ -82,6 +82,7 @@
<scheme>GFS_MP_generic_post</scheme>
<scheme>cu_gf_driver_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
<scheme>phys_tend</scheme>
</subcycle>
</group>
<!-- <finalize></finalize> -->
Expand Down
7 changes: 4 additions & 3 deletions ccpp/suites/suite_SCM_GSD_v1_ps.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
<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>mynnrad_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw_pre</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>mynnrad_post</scheme>
<scheme>sgscloud_radpost</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
</subcycle>
Expand All @@ -44,9 +44,9 @@
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
<scheme>GFS_DCNV_generic_pre</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>
Expand All @@ -61,6 +61,7 @@
<scheme>GFS_MP_generic_post</scheme>
<scheme>cu_gf_driver_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
<scheme>phys_tend</scheme>
</subcycle>
</group>
<!-- <finalize></finalize> -->
Expand Down
3 changes: 2 additions & 1 deletion ccpp/suites/suite_SCM_csawmg.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
<scheme>GFS_DCNV_generic_pre</scheme>
<scheme>get_phi_fv3</scheme>
<scheme>GFS_suite_interstitial_3</scheme>
<scheme>GFS_DCNV_generic_pre</scheme>
<scheme>cs_conv_pre</scheme>
<scheme>cs_conv</scheme>
<scheme>cs_conv_post</scheme>
Expand All @@ -82,6 +82,7 @@
<scheme>cs_conv_aw_adj</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
<scheme>phys_tend</scheme>
</subcycle>
</group>
<!-- <finalize></finalize> -->
Expand Down
3 changes: 2 additions & 1 deletion ccpp/suites/suite_SCM_csawmg_ps.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
<scheme>GFS_DCNV_generic_pre</scheme>
<scheme>get_phi_fv3</scheme>
<scheme>GFS_suite_interstitial_3</scheme>
<scheme>GFS_DCNV_generic_pre</scheme>
<scheme>cs_conv_pre</scheme>
<scheme>cs_conv</scheme>
<scheme>cs_conv_post</scheme>
Expand All @@ -63,6 +63,7 @@
<scheme>cs_conv_aw_adj</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
<scheme>phys_tend</scheme>
</subcycle>
</group>
<!-- <finalize></finalize> -->
Expand Down
1 change: 1 addition & 0 deletions scm/etc/case_config/astex.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ mom_forcing_type = 2,
relax_time = 7200.0,
sfc_flux_spec = .false.,
sfc_type = 0,
sfc_roughness_length_cm = 0.02,
reference_profile_choice = 1,
year = 1992,
month = 6,
Expand Down
1 change: 0 additions & 1 deletion scm/etc/case_config/fv3_model_point_noah.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,5 @@ year = 2016,
month = 10,
day = 3,
hour = 0,
output_dir = 'output_fv3_model_point_noah'
$end

1 change: 0 additions & 1 deletion scm/etc/case_config/fv3_model_point_noahmp.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,5 @@ year = 2016,
month = 10,
day = 3,
hour = 0,
output_dir = 'output_fv3_model_point_noahmp'
$end

1 change: 1 addition & 0 deletions scm/etc/case_config/twpice.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ mom_forcing_type = 3,
relax_time = 7200.0,
sfc_flux_spec = .false.,
sfc_type = 0,
sfc_roughness_length_cm = 0.02,
reference_profile_choice = 1,
year = 2006,
month = 1,
Expand Down
Loading