From 5566c77f928c3cb601fa72b430a22acab51c730e Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Thu, 3 Mar 2022 12:09:12 -0700 Subject: [PATCH 1/2] update SDFs to put scm_sfc_flux_spec before dcyc2 --- ccpp/suites/suite_HAFS_v0_hwrf_ps.xml | 2 +- ccpp/suites/suite_HAFS_v0_hwrf_thompson_ps.xml | 2 +- ccpp/suites/suite_SCM_GFS_v15p2_ACM_ps.xml | 2 +- ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP_ps.xml | 2 +- ccpp/suites/suite_SCM_GFS_v15p2_YSU_ps.xml | 2 +- ccpp/suites/suite_SCM_GFS_v15p2_no_nsst_ps.xml | 2 +- ccpp/suites/suite_SCM_GFS_v15p2_ps.xml | 2 +- ccpp/suites/suite_SCM_GFS_v15p2_saYSU_ps.xml | 2 +- ccpp/suites/suite_SCM_GFS_v16_RRTMGP_ps.xml | 2 +- ccpp/suites/suite_SCM_GFS_v16_no_nsst_ps.xml | 2 +- ccpp/suites/suite_SCM_GFS_v16_ps.xml | 2 +- ccpp/suites/suite_SCM_GSD_v1_ps.xml | 2 +- ccpp/suites/suite_SCM_RRFS_v1alpha_ps.xml | 2 +- ccpp/suites/suite_SCM_csawmg_ps.xml | 2 +- scm/src/scm_type_defs.F90 | 1 + 15 files changed, 15 insertions(+), 14 deletions(-) diff --git a/ccpp/suites/suite_HAFS_v0_hwrf_ps.xml b/ccpp/suites/suite_HAFS_v0_hwrf_ps.xml index 681ec2628..2194b7723 100644 --- a/ccpp/suites/suite_HAFS_v0_hwrf_ps.xml +++ b/ccpp/suites/suite_HAFS_v0_hwrf_ps.xml @@ -31,9 +31,9 @@ get_prs_fv3 GFS_suite_interstitial_1 GFS_surface_generic_pre + scm_sfc_flux_spec dcyc2t3 GFS_suite_interstitial_2 - scm_sfc_flux_spec GFS_PBL_generic_pre hedmf GFS_PBL_generic_post diff --git a/ccpp/suites/suite_HAFS_v0_hwrf_thompson_ps.xml b/ccpp/suites/suite_HAFS_v0_hwrf_thompson_ps.xml index 568e40f1b..15421f0bd 100644 --- a/ccpp/suites/suite_HAFS_v0_hwrf_thompson_ps.xml +++ b/ccpp/suites/suite_HAFS_v0_hwrf_thompson_ps.xml @@ -33,9 +33,9 @@ get_prs_fv3 GFS_suite_interstitial_1 GFS_surface_generic_pre + scm_sfc_flux_spec dcyc2t3 GFS_suite_interstitial_2 - scm_sfc_flux_spec GFS_PBL_generic_pre hedmf GFS_PBL_generic_post diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_ACM_ps.xml b/ccpp/suites/suite_SCM_GFS_v15p2_ACM_ps.xml index 6a5b312c1..2b1735919 100644 --- a/ccpp/suites/suite_SCM_GFS_v15p2_ACM_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v15p2_ACM_ps.xml @@ -30,9 +30,9 @@ get_prs_fv3 GFS_suite_interstitial_1 GFS_surface_generic_pre + scm_sfc_flux_spec dcyc2t3 GFS_suite_interstitial_2 - scm_sfc_flux_spec GFS_PBL_generic_pre GFS_PBL_generic_post diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP_ps.xml b/ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP_ps.xml index a969bb23c..2695618f9 100644 --- a/ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP_ps.xml @@ -39,9 +39,9 @@ get_prs_fv3 GFS_suite_interstitial_1 GFS_surface_generic_pre + scm_sfc_flux_spec dcyc2t3 GFS_suite_interstitial_2 - scm_sfc_flux_spec GFS_PBL_generic_pre hedmf GFS_PBL_generic_post diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_YSU_ps.xml b/ccpp/suites/suite_SCM_GFS_v15p2_YSU_ps.xml index 6bb55b170..cee88aae4 100644 --- a/ccpp/suites/suite_SCM_GFS_v15p2_YSU_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v15p2_YSU_ps.xml @@ -30,9 +30,9 @@ get_prs_fv3 GFS_suite_interstitial_1 GFS_surface_generic_pre + scm_sfc_flux_spec dcyc2t3 GFS_suite_interstitial_2 - scm_sfc_flux_spec GFS_PBL_generic_pre ysuvdif GFS_PBL_generic_post diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_no_nsst_ps.xml b/ccpp/suites/suite_SCM_GFS_v15p2_no_nsst_ps.xml index f9fdd9fdb..875e0a23e 100644 --- a/ccpp/suites/suite_SCM_GFS_v15p2_no_nsst_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v15p2_no_nsst_ps.xml @@ -30,9 +30,9 @@ get_prs_fv3 GFS_suite_interstitial_1 GFS_surface_generic_pre + scm_sfc_flux_spec dcyc2t3 GFS_suite_interstitial_2 - scm_sfc_flux_spec GFS_PBL_generic_pre hedmf GFS_PBL_generic_post diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_ps.xml b/ccpp/suites/suite_SCM_GFS_v15p2_ps.xml index 1d7b280df..62bf31c70 100644 --- a/ccpp/suites/suite_SCM_GFS_v15p2_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v15p2_ps.xml @@ -30,9 +30,9 @@ get_prs_fv3 GFS_suite_interstitial_1 GFS_surface_generic_pre + scm_sfc_flux_spec dcyc2t3 GFS_suite_interstitial_2 - scm_sfc_flux_spec GFS_PBL_generic_pre hedmf GFS_PBL_generic_post diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_saYSU_ps.xml b/ccpp/suites/suite_SCM_GFS_v15p2_saYSU_ps.xml index e66eacf1e..d623252e3 100644 --- a/ccpp/suites/suite_SCM_GFS_v15p2_saYSU_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v15p2_saYSU_ps.xml @@ -30,9 +30,9 @@ get_prs_fv3 GFS_suite_interstitial_1 GFS_surface_generic_pre + scm_sfc_flux_spec dcyc2t3 GFS_suite_interstitial_2 - scm_sfc_flux_spec GFS_PBL_generic_pre shinhongvdif GFS_PBL_generic_post diff --git a/ccpp/suites/suite_SCM_GFS_v16_RRTMGP_ps.xml b/ccpp/suites/suite_SCM_GFS_v16_RRTMGP_ps.xml index 17ac3af73..7f20e1cde 100644 --- a/ccpp/suites/suite_SCM_GFS_v16_RRTMGP_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v16_RRTMGP_ps.xml @@ -39,9 +39,9 @@ get_prs_fv3 GFS_suite_interstitial_1 GFS_surface_generic_pre + scm_sfc_flux_spec dcyc2t3 GFS_suite_interstitial_2 - scm_sfc_flux_spec GFS_PBL_generic_pre satmedmfvdifq GFS_PBL_generic_post diff --git a/ccpp/suites/suite_SCM_GFS_v16_no_nsst_ps.xml b/ccpp/suites/suite_SCM_GFS_v16_no_nsst_ps.xml index ddad781e8..29922b188 100644 --- a/ccpp/suites/suite_SCM_GFS_v16_no_nsst_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v16_no_nsst_ps.xml @@ -30,9 +30,9 @@ get_prs_fv3 GFS_suite_interstitial_1 GFS_surface_generic_pre + scm_sfc_flux_spec dcyc2t3 GFS_suite_interstitial_2 - scm_sfc_flux_spec GFS_PBL_generic_pre satmedmfvdifq GFS_PBL_generic_post diff --git a/ccpp/suites/suite_SCM_GFS_v16_ps.xml b/ccpp/suites/suite_SCM_GFS_v16_ps.xml index 172d58826..e68650407 100644 --- a/ccpp/suites/suite_SCM_GFS_v16_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v16_ps.xml @@ -30,9 +30,9 @@ get_prs_fv3 GFS_suite_interstitial_1 GFS_surface_generic_pre + scm_sfc_flux_spec dcyc2t3 GFS_suite_interstitial_2 - scm_sfc_flux_spec GFS_PBL_generic_pre satmedmfvdifq GFS_PBL_generic_post diff --git a/ccpp/suites/suite_SCM_GSD_v1_ps.xml b/ccpp/suites/suite_SCM_GSD_v1_ps.xml index 640dcd231..e2116354c 100644 --- a/ccpp/suites/suite_SCM_GSD_v1_ps.xml +++ b/ccpp/suites/suite_SCM_GSD_v1_ps.xml @@ -33,9 +33,9 @@ get_prs_fv3 GFS_suite_interstitial_1 GFS_surface_generic_pre + scm_sfc_flux_spec dcyc2t3 GFS_suite_interstitial_2 - scm_sfc_flux_spec mynnedmf_wrapper GFS_GWD_generic_pre cires_ugwp diff --git a/ccpp/suites/suite_SCM_RRFS_v1alpha_ps.xml b/ccpp/suites/suite_SCM_RRFS_v1alpha_ps.xml index 7dc947b0f..0d67882ab 100644 --- a/ccpp/suites/suite_SCM_RRFS_v1alpha_ps.xml +++ b/ccpp/suites/suite_SCM_RRFS_v1alpha_ps.xml @@ -33,9 +33,9 @@ get_prs_fv3 GFS_suite_interstitial_1 GFS_surface_generic_pre + scm_sfc_flux_spec dcyc2t3 GFS_suite_interstitial_2 - scm_sfc_flux_spec mynnedmf_wrapper GFS_GWD_generic_pre cires_ugwp diff --git a/ccpp/suites/suite_SCM_csawmg_ps.xml b/ccpp/suites/suite_SCM_csawmg_ps.xml index 2b66bb28f..e0e010dfc 100644 --- a/ccpp/suites/suite_SCM_csawmg_ps.xml +++ b/ccpp/suites/suite_SCM_csawmg_ps.xml @@ -31,9 +31,9 @@ get_prs_fv3 GFS_suite_interstitial_1 GFS_surface_generic_pre + scm_sfc_flux_spec dcyc2t3 GFS_suite_interstitial_2 - scm_sfc_flux_spec GFS_PBL_generic_pre hedmf GFS_PBL_generic_post diff --git a/scm/src/scm_type_defs.F90 b/scm/src/scm_type_defs.F90 index dd333ac45..72ae25eaf 100644 --- a/scm/src/scm_type_defs.F90 +++ b/scm/src/scm_type_defs.F90 @@ -1180,6 +1180,7 @@ subroutine physics_set(physics, scm_input, scm_state) ! tsfcl is already pointing to T_surf forcing in physics_associate ! physics%Sfcprop%tsfcl(i) => scm_state%T_surf if (physics%Sfcprop%slmsk(i) > 1.9_dp) physics%Sfcprop%fice(i) = 1.0 !needed to calculate tsfc and zorl below when model_ics == .false. + if (physics%Sfcprop%slmsk(i) < 0.1_dp) physics%Sfcprop%oceanfrac(i) = 1.0 end if !this overwrites what is in the suite namelist file -- is that desirable? From e0cf109d7310cc779dc7b23a7893684254194264 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Thu, 17 Mar 2022 09:19:55 -0600 Subject: [PATCH 2/2] update ccpp/physics submodule pointer --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 979324a89..eede491d9 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 979324a89894133473c4663fc490d04cdce57ac0 +Subproject commit eede491d91b58c68fce15572704e4898d2fa2e38