Add regression testing for wave-sea ice coupling

.gitmodules

@@ -4,8 +4,8 @@
  branch = develop
 [submodule "WW3"]
  path = WW3
- url = https://github.com/NOAA-EMC/WW3
- branch = dev/ufs-weather-model
+ url = https://github.com/NickSzapiro-NOAA/WW3
+ branch = wavice_sync
 [submodule "stochastic_physics"]
  path = stochastic_physics
  url = https://github.com/NOAA-PSL/stochastic_physics

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(WAVICE OFF CACHE BOOL "Enable wave-sea ice coupling")
 
 set(CMAKE_Platform $ENV{CMAKE_Platform})
 if(CMAKE_Platform)
@@ -212,7 +213,11 @@ if(WW3)
  list(APPEND _ufs_defs_private FRONT_WW3=WMESMFMD)
  else()
  if(PDLIB)
- set(SWITCH "meshcap_pdlib" CACHE STRING "NUOPC mesh cap")
+ if(WAVICE)
+ set(SWITCH "meshcap_pdlib_IC4" CACHE STRING "NUOPC mesh cap")
+ else()
+ set(SWITCH "meshcap_pdlib" CACHE STRING "NUOPC mesh cap")
+ endif()
  else()
  set(SWITCH "meshcap" CACHE STRING "NUOPC mesh cap")
  endif()

tests/default_vars.sh

@@ -623,6 +623,8 @@ export WW3_CUR='F'
 export WW3_ICE='F'
 export WW3_IC1='F'
 export WW3_IC5='F'
+export wav_coupling_to_cice=false
+export check_for_nans=false
 # ATMW
 export WW3_MULTIGRID=true
 export WW3_MODDEF=mod_def.glo_1deg
@@ -671,6 +673,11 @@ export CICE_RESTART_POND_LVL=.false.
 export CICE_FRAZIL_FWSALT=.true.
 export CICE_KTHERM=2
 export CICE_TFREEZE_OPTION=mushy
+#Wave-ice coupling variables
+export CICE_nfsd=1
+export CICE_tr_fsd=.false.
+export CICE_restart_fsd=.false.
+export CICE_wave_spec_type=none
 # SlenderX2
 export CICE_NPROC=$ICE_tasks
 export np2=`expr $CICE_NPROC / 2`

tests/opnReqTests/rst.sh

@@ -28,6 +28,9 @@ elif [[ $application == 'cpld' ]]; then
  CICE_RUNTYPE='continue'
  RUNTYPE='continue'
  CICE_USE_RESTART_TIME='.true.'
+ if [[ $TEST_NAME =~ wavice ]]; then
+ CICE_restart_fsd='.true.'
+ fi
  MOM6_RESTART_SETTING="r"
  RESTART_N=$(( FHMAX - FHROT ))
  RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( SHOUR + FHROT )))0000"
@@ -75,6 +78,7 @@ export NSTF_NAME=${NSTF_NAME}
 export CICE_RUNTYPE=${CICE_RUNTYPE:-}
 export RUNTYPE=${RUNTYPE:-}
 export CICE_USE_RESTART_TIME=${CICE_USE_RESTART_TIME:-}
+export CICE_restart_fsd=${CICE_restart_fsd:-}
 export MOM6_RESTART_SETTING=${MOM6_RESTART_SETTING:-}
 export RESTART_N=${RESTART_N:-}
 export RESTART_FILE_SUFFIX_SECS=${RESTART_FILE_SUFFIX_SECS:-}

tests/parm/ice_in.IN

@@ -52,11 +52,10 @@
  kmt_file = '@[CICE_MASK]'
  kcatbound = 0
  ncat = 5
- nfsd = 1
+ nfsd = @[CICE_nfsd]
  nilyr = 7
  nslyr = 1
  nblyr = 1
- nfsd = 1
  grid_atm = '@[CICE_GRIDATM]'
  grid_ocn = '@[CICE_GRIDOCN]'
  grid_ice = '@[CICE_GRIDICE]'
@@ -75,8 +74,8 @@
  restart_pond_lvl = @[CICE_RESTART_POND_LVL]
  tr_aero = .false.
  restart_aero = .false.
- tr_fsd = .false.
- restart_fsd = .false.
+ tr_fsd = @[CICE_tr_fsd]
+ restart_fsd = @[CICE_restart_fsd]
 /
 
 &thermo_nml
@@ -159,6 +158,7 @@
  l_mpond_fresh = .false.
  tfrz_option = '@[CICE_TFREEZE_OPTION]'
  restart_coszen = .true.
+ wave_spec_type = '@[CICE_wave_spec_type]'
 /
 
 &domain_nml
@@ -362,5 +362,21 @@
  f_Cdn_ocn = 'x'
 /
 
+&icefields_fsd_nml
+ f_fsdrad = 'mdhxx'
+ f_fsdperim = 'mdhxx'
+ f_afsd = 'mdhxx'
+ f_afsdn = 'mdhxx'
+ f_dafsd_newi = 'x'
+ f_dafsd_latg = 'x'
+ f_dafsd_latm = 'x'
+ f_dafsd_wave = 'x'
+ f_dafsd_weld = 'x'
+ f_wave_sig_ht = 'x'
+ f_aice_ww = 'x'
+ f_diam_ww = 'x'
+ f_hice_ww = 'x'
+/
+
 &icefields_bgc_nml
 /

tests/parm/ufs.configure.s2sw.IN

@@ -134,4 +134,5 @@ ALLCOMP_attributes::
  orb_mode = fixed_year
  orb_mvelp = 1.e36
  orb_obliq = 1.e36
+ wav_coupling_to_cice = @[wav_coupling_to_cice]
 ::

tests/rt.conf

@@ -83,6 +83,11 @@ RUN | cpld_mpi_pdlib_p8 | - noaacloud
 COMPILE | s2sw_pdlib_debug | intel | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON -DDEBUG=ON | - noaacloud | fv3 |
 RUN | cpld_debug_pdlib_p8 | - noaacloud | baseline |
 
+#Wave-ice coupling
+#Unstructured
+COMPILE | s2sw_wavice | intel | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON -DWAVICE=ON | - noaacloud | fv3 |
+RUN | cpld_s2sw_wavice_p8 | - noaacloud | baseline |
+
 ### ATM tests ###
 COMPILE | atm_dyn32 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0,FV3_GFS_v17_p8_mynn,FV3_GFS_v17_p8_ugwpv1 -D32BIT=ON | | fv3 |
 RUN | control_flake | | baseline |

tests/tests/cpld_s2sw_wavice_p8

@@ -0,0 +1,95 @@
+#
+# S2SW unstr PDLIB wave-ice P8 test
+#
+
+export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system with wave-ice coupling - C96MX100 unstr WW3 PDLIB IC4"
+
+export CNTL_DIR=cpld_s2sw_wavice_p8
+
+export LIST_FILES="sfcf024.tile1.nc \
+ sfcf024.tile2.nc \
+ sfcf024.tile3.nc \
+ sfcf024.tile4.nc \
+ sfcf024.tile5.nc \
+ sfcf024.tile6.nc \
+ atmf024.tile1.nc \
+ atmf024.tile2.nc \
+ atmf024.tile3.nc \
+ atmf024.tile4.nc \
+ atmf024.tile5.nc \
+ atmf024.tile6.nc \
+ RESTART/20210323.060000.coupler.res \
+ RESTART/20210323.060000.fv_core.res.nc \
+ RESTART/20210323.060000.fv_core.res.tile1.nc \
+ RESTART/20210323.060000.fv_core.res.tile2.nc \
+ RESTART/20210323.060000.fv_core.res.tile3.nc \
+ RESTART/20210323.060000.fv_core.res.tile4.nc \
+ RESTART/20210323.060000.fv_core.res.tile5.nc \
+ RESTART/20210323.060000.fv_core.res.tile6.nc \
+ RESTART/20210323.060000.fv_srf_wnd.res.tile1.nc \
+ RESTART/20210323.060000.fv_srf_wnd.res.tile2.nc \
+ RESTART/20210323.060000.fv_srf_wnd.res.tile3.nc \
+ RESTART/20210323.060000.fv_srf_wnd.res.tile4.nc \
+ RESTART/20210323.060000.fv_srf_wnd.res.tile5.nc \
+ RESTART/20210323.060000.fv_srf_wnd.res.tile6.nc \
+ RESTART/20210323.060000.fv_tracer.res.tile1.nc \
+ RESTART/20210323.060000.fv_tracer.res.tile2.nc \
+ RESTART/20210323.060000.fv_tracer.res.tile3.nc \
+ RESTART/20210323.060000.fv_tracer.res.tile4.nc \
+ RESTART/20210323.060000.fv_tracer.res.tile5.nc \
+ RESTART/20210323.060000.fv_tracer.res.tile6.nc \
+ RESTART/20210323.060000.phy_data.tile1.nc \
+ RESTART/20210323.060000.phy_data.tile2.nc \
+ RESTART/20210323.060000.phy_data.tile3.nc \
+ RESTART/20210323.060000.phy_data.tile4.nc \
+ RESTART/20210323.060000.phy_data.tile5.nc \
+ RESTART/20210323.060000.phy_data.tile6.nc \
+ RESTART/20210323.060000.sfc_data.tile1.nc \
+ RESTART/20210323.060000.sfc_data.tile2.nc \
+ RESTART/20210323.060000.sfc_data.tile3.nc \
+ RESTART/20210323.060000.sfc_data.tile4.nc \
+ RESTART/20210323.060000.sfc_data.tile5.nc \
+ RESTART/20210323.060000.sfc_data.tile6.nc \
+ RESTART/20210323.060000.MOM.res.nc \
+ RESTART/iced.2021-03-23-21600.nc \
+ RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
+ 20210323.060000.out_pnt.ww3 \
+ 20210323.060000.out_grd.ww3 "
+
+export_fv3
+export_cpl
+
+export RESTART_N=12
+export RESTART_INTERVAL="${RESTART_N} -1"
+export OUTPUT_FH='0 24'
+
+export CPLCHM=.false.
+export DNATS=0
+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.ic4.exp.${WW3_DOMAIN}
+export WW3_ICE='C'
+export WW3_IC1='C'
+export WW3_IC5='C'
+
+export CICE_nfsd=12
+export CICE_tr_fsd=.true.
+export CICE_restart_fsd=.false.
+export CICE_wave_spec_type=constant
+
+export wav_coupling_to_cice=true
+export check_for_nans=true
+#export WW3_DTFLD=3600
+
+export DIAG_TABLE=diag_table_template
+export FIELD_TABLE=field_table_thompson_noaero_tke
+export UFS_CONFIGURE=ufs.configure.s2sw.IN
+
+export FV3_RUN=cpld_control_run.IN
+#WLCLK=60
+WAV_tasks=$WAV_tasks_cpl_unstr
+