ufs-community · jkbk2004 · Jul 11, 2024 · May 19, 2024 · Jun 3, 2024 · Jun 3, 2024
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/NOAA-EMC/fv3atm
-  branch = develop
+  url = https://github.com/Qingfu-Liu/fv3atm
+  branch = HR4-GWD-update
 [submodule "WW3"]
   path = WW3
   url = https://github.com/NOAA-EMC/WW3

diff --git a/FV3 b/FV3
diff --git a/tests/bl_date.conf b/tests/bl_date.conf
@@ -1 +1 @@
-export BL_DATE=20240614
+export BL_DATE=20240624
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -624,6 +624,8 @@ export DO_UGWP_V1_W_GSLDRAG=.false.
 export DO_UGWP_V0_OROG_ONLY=.false.
 export DO_GSL_DRAG_LS_BL=.false.
 export DO_GSL_DRAG_SS=.true.
+export DO_GWD_OPT_PSL=.false.
+export PSL_GWD_DX_FACTOR=6.0
 export DO_GSL_DRAG_TOFD=.false.
 export DO_UGWP_V1=.false.
 export DO_UGWP_V1_OROG_ONLY=.false.

diff --git a/tests/fv3_conf/cpld_control_run.IN b/tests/fv3_conf/cpld_control_run.IN
@@ -183,8 +183,8 @@ if [ $IAER = 1011 ]; then
 fi
 
 cp    @[INPUTDATA_ROOT]/FV3_input_data/ugwp_c384_tau.nc ./ugwp_limb_tau.nc
-cp    @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127/oro_data_ls* ./INPUT
-cp    @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127/oro_data_ss* ./INPUT
+cp    @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127_gfsv17/oro_data_ls* ./INPUT
+cp    @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127_gfsv17/oro_data_ss* ./INPUT
 
 if [ $IMP_PHYSICS = 8 ]; then
   cp    @[INPUTDATA_ROOT]/FV3_fix/CCN_ACTIVATE.BIN CCN_ACTIVATE.BIN

diff --git a/tests/logs/RegressionTests_hera.log b/tests/logs/RegressionTests_hera.log
diff --git a/tests/parm/global_control.nml.IN b/tests/parm/global_control.nml.IN
@@ -138,6 +138,8 @@
   do_ugwp_v0_nst_only  = @[DO_UGWP_V0_NST_ONLY]
   do_gsl_drag_ls_bl    = @[DO_GSL_DRAG_LS_BL]
   do_gsl_drag_ss       = @[DO_GSL_DRAG_SS]
+  do_gwd_opt_psl       = @[DO_GWD_OPT_PSL]
+  psl_gwd_dx_factor    = @[PSL_GWD_DX_FACTOR]
   do_gsl_drag_tofd     = @[DO_GSL_DRAG_TOFD]
   do_ugwp_v1_orog_only = @[DO_UGWP_V1_OROG_ONLY]
   min_lakeice  = @[MIN_LAKEICE]

diff --git a/tests/test_changes.list b/tests/test_changes.list
@@ -1,2 +1,39 @@
-control_wam intel
-control_wam_debug intel
+cpld_control_p8_mixedmode intel
+cpld_control_gfsv17 intel
+cpld_control_gfsv17_iau intel
+cpld_restart_gfsv17 intel
+cpld_mpi_gfsv17 intel
+cpld_control_sfs intel
+cpld_debug_gfsv17 intel
+cpld_control_p8 intel
+cpld_control_p8.v2.sfc intel
+cpld_restart_p8 intel
+cpld_control_qr_p8 intel
+cpld_restart_qr_p8 intel
+cpld_2threads_p8 intel
+cpld_decomp_p8 intel
+cpld_mpi_p8 intel
+cpld_control_ciceC_p8 intel
+cpld_control_c192_p8 intel
+cpld_restart_c192_p8 intel
+cpld_bmark_p8 intel
+cpld_restart_bmark_p8 intel
+cpld_s2sa_p8 intel
+cpld_control_noaero_p8 intel
+cpld_control_nowave_noaero_p8 intel
+cpld_debug_p8 intel
+cpld_debug_noaero_p8 intel
+cpld_control_noaero_p8_agrid intel
+cpld_control_c48 intel
+cpld_warmstart_c48 intel
+cpld_restart_c48 intel
+cpld_control_p8_faster intel
+cpld_control_pdlib_p8 intel
+cpld_restart_pdlib_p8 intel
+cpld_mpi_pdlib_p8 intel
+cpld_debug_pdlib_p8 intel
+atm_ds2s_docn_pcice intel
+atm_ds2s_docn_dice intel
+cpld_control_nowave_noaero_p8 gnu
+cpld_control_pdlib_p8 gnu
+cpld_debug_pdlib_p8 gnu
diff --git a/tests/tests/cpld_2threads_p8 b/tests/tests/cpld_2threads_p8
@@ -91,4 +91,12 @@ export FV3_RUN=cpld_control_run.IN
 
 if [[ $MACHINE_ID = derecho ]]; then
   TPN=96
-fi
+fi
+
+# HR4 GFSv17 GWD update
+export DO_UGWP_V0=.false.
+export DO_UGWP_V1=.true.
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GWD_OPT_PSL=.true.
+export DO_GSL_DRAG_SS=.false.
+export DO_GSL_DRAG_TOFD=.true.
diff --git a/tests/tests/cpld_bmark_p8 b/tests/tests/cpld_bmark_p8
@@ -147,3 +147,11 @@ export NSTF_NAME=2,1,0,0,0
 export CDMBWD=${CDMBWD_c384}
 
 export FV3_RUN=cpld_control_run.IN
+
+# HR4 GFSv17 GWD update
+export DO_UGWP_V0=.false.
+export DO_UGWP_V1=.true.
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GWD_OPT_PSL=.true.
+export DO_GSL_DRAG_SS=.false.
+export DO_GSL_DRAG_TOFD=.true.
diff --git a/tests/tests/cpld_bmark_p8_35d b/tests/tests/cpld_bmark_p8_35d
@@ -102,3 +102,11 @@ export NSTF_NAME=2,1,0,0,0
 export CDMBWD=${CDMBWD_c384}
 
 export FV3_RUN=cpld_control_run.IN
+
+# HR4 GFSv17 GWD update
+export DO_UGWP_V0=.false.
+export DO_UGWP_V1=.true.
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GWD_OPT_PSL=.true.
+export DO_GSL_DRAG_SS=.false.
+export DO_GSL_DRAG_TOFD=.true.
diff --git a/tests/tests/cpld_control_c192_p8 b/tests/tests/cpld_control_c192_p8
@@ -141,3 +141,11 @@ export FV3_RUN=cpld_control_run.IN
 if [[ $MACHINE_ID = derecho ]]; then
   TPN=96
 fi
+
+# HR4 GFSv17 GWD update
+export DO_UGWP_V0=.false.
+export DO_UGWP_V1=.true.
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GWD_OPT_PSL=.true.
+export DO_GSL_DRAG_SS=.false.
+export DO_GSL_DRAG_TOFD=.true.
diff --git a/tests/tests/cpld_control_c48 b/tests/tests/cpld_control_c48
@@ -138,3 +138,11 @@ export FIELD_TABLE=field_table_thompson_noaero_tke
 export UFS_CONFIGURE=ufs.configure.s2s_esmf.IN
 
 export FV3_RUN=cpld_control_run.IN
+
+# HR4 GFSv17 GWD update
+export DO_UGWP_V0=.false.
+export DO_UGWP_V1=.true.
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GWD_OPT_PSL=.true.
+export DO_GSL_DRAG_SS=.false.
+export DO_GSL_DRAG_TOFD=.true.
diff --git a/tests/tests/cpld_control_ciceC_p8 b/tests/tests/cpld_control_ciceC_p8
@@ -83,3 +83,11 @@ export eps_imesh=2.5e-1
 export CICE_GRIDICE=C
 
 export FV3_RUN=cpld_control_run.IN
+
+# HR4 GFSv17 GWD update
+export DO_UGWP_V0=.false.
+export DO_UGWP_V1=.true.
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GWD_OPT_PSL=.true.
+export DO_GSL_DRAG_SS=.false.
+export DO_GSL_DRAG_TOFD=.true.
diff --git a/tests/tests/cpld_control_gfsv17 b/tests/tests/cpld_control_gfsv17
@@ -128,3 +128,11 @@ export IOPT_DIAG=1
 if [[ $MACHINE_ID = hera ]] && [[ $RT_COMPILER = gnu ]]; then
   WLCLK=40
 fi
+
+# HR4 GFSv17 GWD update
+export DO_UGWP_V0=.false.
+export DO_UGWP_V1=.true.
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GWD_OPT_PSL=.true.
+export DO_GSL_DRAG_SS=.false.
+export DO_GSL_DRAG_TOFD=.true.
diff --git a/tests/tests/cpld_control_gfsv17_iau b/tests/tests/cpld_control_gfsv17_iau
@@ -140,3 +140,11 @@ export ODA_INCUPD_UV="True"
 if [[ $MACHINE_ID = hera ]] && [[ $RT_COMPILER = gnu ]]; then
   WLCLK=40
 fi
+
+# HR4 GFSv17 GWD update
+export DO_UGWP_V0=.false.
+export DO_UGWP_V1=.true.
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GWD_OPT_PSL=.true.
+export DO_GSL_DRAG_SS=.false.
+export DO_GSL_DRAG_TOFD=.true.
diff --git a/tests/tests/cpld_control_noaero_p8 b/tests/tests/cpld_control_noaero_p8
@@ -86,3 +86,11 @@ export FIELD_TABLE=field_table_thompson_noaero_tke
 export UFS_CONFIGURE=ufs.configure.s2sw_fast_esmf.IN
 
 export FV3_RUN=cpld_control_run.IN
+
+# HR4 GFSv17 GWD update
+export DO_UGWP_V0=.false.
+export DO_UGWP_V1=.true.
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GWD_OPT_PSL=.true.
+export DO_GSL_DRAG_SS=.false.
+export DO_GSL_DRAG_TOFD=.true.
diff --git a/tests/tests/cpld_control_noaero_p8_agrid b/tests/tests/cpld_control_noaero_p8_agrid
@@ -96,3 +96,11 @@ export DIAG_TABLE=diag_table_template
 export UFS_CONFIGURE=ufs.configure.s2s_aoflux_esmf.IN
 
 export FV3_RUN=cpld_control_run.IN
+
+# HR4 GFSv17 GWD update
+export DO_UGWP_V0=.false.
+export DO_UGWP_V1=.true.
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GWD_OPT_PSL=.true.
+export DO_GSL_DRAG_SS=.false.
+export DO_GSL_DRAG_TOFD=.true.
diff --git a/tests/tests/cpld_control_nowave_noaero_p8 b/tests/tests/cpld_control_nowave_noaero_p8
@@ -104,3 +104,11 @@ export DIAG_TABLE=diag_table_template
 export UFS_CONFIGURE=ufs.configure.s2s_esmf.IN
 
 export FV3_RUN=cpld_control_run.IN
+
+# HR4 GFSv17 GWD update
+export DO_UGWP_V0=.false.
+export DO_UGWP_V1=.true.
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GWD_OPT_PSL=.true.
+export DO_GSL_DRAG_SS=.false.
+export DO_GSL_DRAG_TOFD=.true.
diff --git a/tests/tests/cpld_control_p8 b/tests/tests/cpld_control_p8
@@ -85,3 +85,11 @@ export FV3_RUN=cpld_control_run.IN
 if [[ $MACHINE_ID = derecho ]]; then
   TPN=96
 fi
+
+# HR4 GFSv17 GWD update
+export DO_UGWP_V0=.false.
+export DO_UGWP_V1=.true.
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GWD_OPT_PSL=.true.
+export DO_GSL_DRAG_SS=.false.
+export DO_GSL_DRAG_TOFD=.true.
diff --git a/tests/tests/cpld_control_p8.v2.sfc b/tests/tests/cpld_control_p8.v2.sfc
@@ -86,3 +86,11 @@ export V2_SFC_FILE=true
 if [[ $MACHINE_ID = derecho ]]; then
   TPN=96
 fi
+
+# HR4 GFSv17 GWD update
+export DO_UGWP_V0=.false.
+export DO_UGWP_V1=.true.
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GWD_OPT_PSL=.true.
+export DO_GSL_DRAG_SS=.false.
+export DO_GSL_DRAG_TOFD=.true.
diff --git a/tests/tests/cpld_control_p8_faster b/tests/tests/cpld_control_p8_faster
@@ -81,3 +81,11 @@ export MOM6_ALLOW_LANDMASK_CHANGES=True
 export eps_imesh=2.5e-1
 
 export FV3_RUN=cpld_control_run.IN
+
+# HR4 GFSv17 GWD update
+export DO_UGWP_V0=.false.
+export DO_UGWP_V1=.true.
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GWD_OPT_PSL=.true.
+export DO_GSL_DRAG_SS=.false.
+export DO_GSL_DRAG_TOFD=.true.
diff --git a/tests/tests/cpld_control_p8_mixedmode b/tests/tests/cpld_control_p8_mixedmode
@@ -81,3 +81,11 @@ export MOM6_ALLOW_LANDMASK_CHANGES=True
 export eps_imesh=2.5e-1
 
 export FV3_RUN=cpld_control_run.IN
+
+# HR4 GFSv17 GWD update
+export DO_UGWP_V0=.false.
+export DO_UGWP_V1=.true.
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GWD_OPT_PSL=.true.
+export DO_GSL_DRAG_SS=.false.
+export DO_GSL_DRAG_TOFD=.true.
diff --git a/tests/tests/cpld_control_pdlib_p8 b/tests/tests/cpld_control_pdlib_p8
@@ -105,3 +105,11 @@ export FV3_RUN=cpld_control_run.IN
 if [[ $MACHINE_ID = hera ]] && [[ $RT_COMPILER = gnu ]]; then
   WLCLK=40
 fi
+
+# HR4 GFSv17 GWD update
+export DO_UGWP_V0=.false.
+export DO_UGWP_V1=.true.
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GWD_OPT_PSL=.true.
+export DO_GSL_DRAG_SS=.false.
+export DO_GSL_DRAG_TOFD=.true.
diff --git a/tests/tests/cpld_control_qr_p8 b/tests/tests/cpld_control_qr_p8
@@ -82,3 +82,11 @@ export MOM6_ALLOW_LANDMASK_CHANGES=True
 export eps_imesh=2.5e-1
 
 export FV3_RUN=cpld_control_run.IN
+
+# HR4 GFSv17 GWD update
+export DO_UGWP_V0=.false.
+export DO_UGWP_V1=.true.
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GWD_OPT_PSL=.true.
+export DO_GSL_DRAG_SS=.false.
+export DO_GSL_DRAG_TOFD=.true.
diff --git a/tests/tests/cpld_control_sfs b/tests/tests/cpld_control_sfs
@@ -87,3 +87,11 @@ export IOPT_DIAG=1
 if [[ $MACHINE_ID = hera ]] && [[ $RT_COMPILER = gnu ]]; then
   WLCLK=40
 fi
+
+# HR4 GFSv17 GWD update
+export DO_UGWP_V0=.false.
+export DO_UGWP_V1=.true.
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GWD_OPT_PSL=.true.
+export DO_GSL_DRAG_SS=.false.
+export DO_GSL_DRAG_TOFD=.true.
diff --git a/tests/tests/cpld_debug_gfsv17 b/tests/tests/cpld_debug_gfsv17
@@ -120,3 +120,11 @@ export FV3_RUN=cpld_control_run.IN
 if [[ $MACHINE_ID = hera ]] && [[ $RT_COMPILER = gnu ]]; then
   WLCLK=40
 fi
+
+# HR4 GFSv17 GWD update
+export DO_UGWP_V0=.false.
+export DO_UGWP_V1=.true.
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GWD_OPT_PSL=.true.
+export DO_GSL_DRAG_SS=.false.
+export DO_GSL_DRAG_TOFD=.true.
diff --git a/tests/tests/cpld_debug_noaero_p8 b/tests/tests/cpld_debug_noaero_p8
@@ -77,3 +77,11 @@ export FIELD_TABLE=field_table_thompson_noaero_tke
 export UFS_CONFIGURE=ufs.configure.s2sw_fast_esmf.IN
 
 export FV3_RUN=cpld_control_run.IN
+
+# HR4 GFSv17 GWD update
+export DO_UGWP_V0=.false.
+export DO_UGWP_V1=.true.
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GWD_OPT_PSL=.true.
+export DO_GSL_DRAG_SS=.false.
+export DO_GSL_DRAG_TOFD=.true.
diff --git a/tests/tests/cpld_debug_p8 b/tests/tests/cpld_debug_p8
@@ -76,3 +76,11 @@ export FV3_RUN=cpld_control_run.IN
 if [[ $MACHINE_ID = hera ]] && [[ $RT_COMPILER = gnu ]]; then
   WLCLK=40
 fi
+
+# HR4 GFSv17 GWD update
+export DO_UGWP_V0=.false.
+export DO_UGWP_V1=.true.
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GWD_OPT_PSL=.true.
+export DO_GSL_DRAG_SS=.false.
+export DO_GSL_DRAG_TOFD=.true.
diff --git a/tests/tests/cpld_debug_pdlib_p8 b/tests/tests/cpld_debug_pdlib_p8
@@ -98,3 +98,11 @@ export FV3_RUN=cpld_control_run.IN
 if [[ $MACHINE_ID = hera && $RT_COMPILER = gnu ]] || [[ $MACHINE_ID = jet ]]; then
   WLCLK=50
 fi
+
+# HR4 GFSv17 GWD update
+export DO_UGWP_V0=.false.
+export DO_UGWP_V1=.true.
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GWD_OPT_PSL=.true.
+export DO_GSL_DRAG_SS=.false.
+export DO_GSL_DRAG_TOFD=.true.
diff --git a/tests/tests/cpld_decomp_p8 b/tests/tests/cpld_decomp_p8
@@ -86,3 +86,11 @@ export FV3_RUN=cpld_control_run.IN
 if [[ $MACHINE_ID = derecho ]]; then
   TPN=96
 fi
+
+# HR4 GFSv17 GWD update
+export DO_UGWP_V0=.false.
+export DO_UGWP_V1=.true.
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GWD_OPT_PSL=.true.
+export DO_GSL_DRAG_SS=.false.
+export DO_GSL_DRAG_TOFD=.true.
diff --git a/tests/tests/cpld_mpi_gfsv17 b/tests/tests/cpld_mpi_gfsv17
@@ -94,8 +94,6 @@ export np2=`expr $CICE_NPROC / 2`
 export CICE_BLCKX=`expr $NX_GLB / $np2`
 export CICE_BLCKY=`expr $NY_GLB / 2`
 
-
-
 export atm_omp_num_threads=$THRD_cpl_unstr
 export med_omp_num_threads=$atm_omp_num_threads
 
@@ -133,3 +131,11 @@ export UFS_CONFIGURE=ufs.configure.s2sw.IN
 #GFSv17	settings
 export PROGSIGMA=.true.
 export IOPT_DIAG=1
+
+# HR4 GFSv17 GWD update
+export DO_UGWP_V0=.false.
+export DO_UGWP_V1=.true.
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GWD_OPT_PSL=.true.
+export DO_GSL_DRAG_SS=.false.
+export DO_GSL_DRAG_TOFD=.true.
diff --git a/tests/tests/cpld_mpi_p8 b/tests/tests/cpld_mpi_p8
@@ -86,3 +86,11 @@ export FV3_RUN=cpld_control_run.IN
 if [[ $MACHINE_ID = derecho ]]; then
   TPN=96
 fi
+
+# HR4 GFSv17 GWD update
+export DO_UGWP_V0=.false.
+export DO_UGWP_V1=.true.
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GWD_OPT_PSL=.true.
+export DO_GSL_DRAG_SS=.false.
+export DO_GSL_DRAG_TOFD=.true.
+8 −4		.gitmodules
+17 −1		ccpp/data/GFS_typedefs.F90
+20 −0		ccpp/data/GFS_typedefs.meta
+1 −1		ccpp/framework
+1 −1		ccpp/physics