Add a RT for SFS with hydrostatic options

.gitmodules

@@ -1,7 +1,7 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/NOAA-EMC/fv3atm
-  branch = develop
+  url = https://github.com/XiaqiongZhou-NOAA/fv3atm
+  branch = hydro
 [submodule "WW3"]
   path = WW3
   url = https://github.com/NOAA-EMC/WW3

CMakeLists.txt

@@ -73,6 +73,7 @@ set(JEDI_DRIVER     OFF CACHE BOOL "Enable JEDI as top level driver")
 set(CMEPS_AOFLUX    OFF CACHE BOOL "Enable atmosphere-ocean flux calculation in mediator")
 set(PDLIB           OFF CACHE BOOL "Enable Domain Decomposition in WW3 via PDLIB")
 set(CDEPS_INLINE    OFF CACHE BOOL "Enable CDEPS inline capability")
+set(HYDRO           OFF CACHE BOOL "Enable hydrostatic set")
 
 set(CMAKE_Platform $ENV{CMAKE_Platform})
 if(CMAKE_Platform)
@@ -122,6 +123,7 @@ message("PARALLEL_NETCDF .. ${PARALLEL_NETCDF}")
 message("JEDI_DRIVER ...... ${JEDI_DRIVER}")
 message("CMEPS_AOFLUX ..... ${CMEPS_AOFLUX}")
 message("CDEPS_INLINE ..... ${CDEPS_INLINE}")
+message("HYDRO  ........... ${HYDRO}")
 
 message("")
 

NOAHMP-interface/CMakeLists.txt

@@ -56,8 +56,10 @@ endif()
 
 #------------------------------------------------------------------------------
 # Add model-specific flags for C/C++/Fortran preprocessor
-add_definitions(-DMOIST_CAPPA -DUSE_COND -DNEMS_GSM)
-add_definitions(-DINTERNAL_FILE_NML)
+if (NOT HYDRO)
+add_definitions(-DMOIST_CAPPA -DUSE_COND)
+endif()
+add_definitions(-DINTERNAL_FILE_NML -DNEMS_GSM)
 
 #------------------------------------------------------------------------------
 # NOAHMP

tests/default_vars.sh

@@ -556,6 +556,14 @@ export EXTERNAL_IC=.true.
 export MAKE_NH=.true.
 export MOUNTAIN=.false.
 export NA_INIT=1
+export DO_VORT_DAMP=.true.
+export HYDROSTATIC=.false.
+export KORD_XX=9
+export KORD_TM=-9
+export D_CON=1.
+export HORD_XX=5
+export HORD_DP=-5
+export HORD_TR=8
 
 # Radiation
 export DO_RRTMGP=.false.

tests/parm/global_control.nml.IN

@@ -42,11 +42,11 @@
   rf_cutoff = 10.
   d2_bg_k1 = @[D2_BG_K1]
   d2_bg_k2 = @[D2_BG_K2]
-  kord_tm = -9
-  kord_mt = 9
-  kord_wz = 9
-  kord_tr = 9
-  hydrostatic = .false.
+  kord_tm = @[KORD_TM]
+  kord_mt = @[KORD_XX]
+  kord_wz = @[KORD_XX]
+  kord_tr = @[KORD_XX]
+  hydrostatic = @[HYDROSTATIC]
   phys_hydrostatic = .false.
   use_hydro_pressure = .false.
   beta = 0.
@@ -66,19 +66,19 @@
   vtdm4 = 0.02
   delt_max = 0.002
   ke_bg = 0.
-  do_vort_damp = .true.
+  do_vort_damp = @[DO_VORT_DAMP]
   external_ic = @[EXTERNAL_IC]
   external_eta = .true.
   gfs_phil = .false.
   nggps_ic = @[NGGPS_IC]
   mountain = @[MOUNTAIN]
   ncep_ic = .false.
-  d_con = 1.
-  hord_mt = 5
-  hord_vt = 5
-  hord_tm = 5
-  hord_dp = -5
-  hord_tr = 8
+  d_con = @[D_CON]
+  hord_mt = @[HORD_XX]
+  hord_vt = @[HORD_XX]
+  hord_tm = @[HORD_XX]
+  hord_dp = @[HORD_DP]
+  hord_tr = @[HORD_TR]
   adjust_dry_mass = .false.
   dry_mass = 98320.0
   consv_te = 1.

tests/rt.conf

@@ -31,6 +31,10 @@ RUN | cpld_control_gfsv17_iau                           | - noaacloud
 RUN | cpld_restart_gfsv17                               | - noaacloud                           |          | cpld_control_gfsv17
 RUN | cpld_mpi_gfsv17                                   | - noaacloud                           |          |
 
+#SFS
+COMPILE | s2swa_32bit_pdlib_sfs  | intel | -DAPP=S2SWA -D32BIT=ON -DHYDRO=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 -DPDLIB=ON | - noaacloud | fv3 |
+RUN | cpld_gfsv17_sfs                                   | - noaacloud                           | baseline |
+
 COMPILE | s2swa_32bit_pdlib_debug | intel | -DAPP=S2SWA -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 -DPDLIB=ON -DDEBUG=ON | - noaacloud jet | fv3 |
 RUN | cpld_debug_gfsv17                                 | - noaacloud jet                       | baseline |
 

tests/test_changes.list

@@ -0,0 +1 @@
+cpld_gfsv17_sfs intel

tests/tests/cpld_gfsv17_sfs

@@ -0,0 +1,89 @@
+#
+#  cpld_control GFSv17 with UGWPv1 test, i.e., GSL orographic drag +
+#  version 1 non-stationary GWD
+#
+
+export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C96MX100 - unst WW3"
+
+export CNTL_DIR=cpld_gfsv17_sfs
+
+export LIST_FILES="sfcf021.nc \
+                   sfcf024.nc \
+                   atmf021.nc \
+                   atmf024.nc \
+                   GFSFLX.GrbF21 \
+                   GFSFLX.GrbF24 \
+                   GFSPRS.GrbF21 \
+                   GFSPRS.GrbF24"
+
+export_fv3
+export_cpl
+
+export CPLCHM=.false.
+export DNATS=0
+export MAKE_NH=.false.
+export DDDMP=0
+export DO_VORT_DAMP=.false.
+export HYDROSTATIC=.true.
+export HORD_XX=10
+export HORD_DP=10
+export KORD_XX=12
+export KORD_TM=-12
+export D_CON=0
+
+export RESTART_N=3
+export RESTART_INTERVAL="${RESTART_N} -1"
+export OUTPUT_FH='0 21 24'
+export OUTPUT_GRID="'gaussian_grid'"
+export WRITE_DOPOST=.true.
+
+export INPES=$INPES_cpl_unstr
+export JNPES=$JNPES_cpl_unstr
+export WRTTASK_PER_GROUP=$(( WPG_cpl_unstr * THRD_cpl_unstr ))
+
+OCN_tasks=$OCN_tasks_cpl_unstr
+ICE_tasks=$ICE_tasks_cpl_unstr
+WAV_tasks=$WAV_tasks_cpl_unstr
+
+export atm_omp_num_threads=$THRD_cpl_unstr
+export med_omp_num_threads=$atm_omp_num_threads
+
+# UGWP1
+export GWD_OPT=2
+export CDMBWD=20.0,2.5,1.0,1.0
+export DO_UGWP_V1=.true.
+export KNOB_UGWP_VERSION=1
+export KNOB_UGWP_NSLOPE=1
+export DO_UGWP_V0=.false.
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GSL_DRAG_SS=.true.
+export DO_GSL_DRAG_TOFD=.true.
+export DO_UGWP_V1_OROG_ONLY=.false.
+export DO_UGWP_V0_NST_ONLY=.false.
+export LDIAG_UGWP=.false.
+export KNOB_UGWP_DOKDIS=2
+export KNOB_UGWP_NDX4LH=4
+
+export MOM6_TOPOEDITS=ufs.topo_edits_011818.nc
+export MOM6_ALLOW_LANDMASK_CHANGES=True
+export eps_imesh=2.5e-1
+
+export WW3_DOMAIN=global_270k
+export MESH_WAV=mesh.${WW3_DOMAIN}.nc
+export WW3_MODDEF=mod_def.exp.${WW3_DOMAIN}
+
+export FV3_RUN=cpld_control_run.IN
+export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
+export FIELD_TABLE=field_table_thompson_noaero_tke_progsigma
+export DIAG_TABLE=diag_table_cpld_sfs.IN
+export INPUT_NML=global_control.nml.IN
+
+export UFS_CONFIGURE=ufs.configure.s2sw.IN
+
+#GFSv17	settings
+export PROGSIGMA=.true.
+export IOPT_DIAG=1
+
+if [[ $MACHINE_ID = hera ]] && [[ $RT_COMPILER = gnu ]]; then
+  WLCLK=40
+fi