Enable wave-sea ice coupling in unstructured WW3 tests

NickSzapiro-NOAA · Apr 24, 2024 · 1116b81 · 1116b81
1 parent f568777
commit 1116b81
Show file tree

Hide file tree

Showing 8 changed files with 1,006 additions and 953 deletions.
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
diff --git a/tests/opnReqTests/rst.sh b/tests/opnReqTests/rst.sh
@@ -28,7 +28,7 @@ elif [[ $application == 'cpld' ]]; then
  CICE_RUNTYPE='continue'
  RUNTYPE='continue'
  CICE_USE_RESTART_TIME='.true.'
- if [[ $TEST_NAME =~ wavice ]]; then
+ if [[ ${CICE_tr_fsd} ]]; then
  CICE_restart_fsd='.true.'
  fi
  MOM6_RESTART_SETTING="r"

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -74,19 +74,15 @@ RUN | cpld_control_c48 |
 COMPILE | s2swa_faster | intel | -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DFASTER=ON | - noaacloud | fv3 |
 RUN | cpld_control_p8_faster | - noaacloud | baseline |
 
-# Unstructured WW3 mesh
-COMPILE | s2sw_pdlib | intel | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON | - noaacloud | fv3 |
+# Unstructured WW3 mesh with wave-ice coupling
+COMPILE | s2sw_pdlib | intel | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON -DWAVICE=ON | - noaacloud | fv3 |
 RUN | cpld_control_pdlib_p8 | - noaacloud | baseline |
 RUN | cpld_restart_pdlib_p8 | - noaacloud | | cpld_control_pdlib_p8
 RUN | cpld_mpi_pdlib_p8 | - noaacloud | | cpld_control_pdlib_p8
 
-COMPILE | s2sw_pdlib_debug | intel | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON -DDEBUG=ON | - noaacloud | fv3 |
+COMPILE | s2sw_pdlib_debug | intel | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON -DDEBUG=ON -DWAVICE=ON | - noaacloud | fv3 |
 RUN | cpld_debug_pdlib_p8 | - noaacloud | baseline |
 
-#Wave-ice coupling with unstructured WW3 mesh
-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 |

diff --git a/tests/tests/cpld_control_pdlib_p8 b/tests/tests/cpld_control_pdlib_p8
@@ -94,7 +94,15 @@ 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 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 DIAG_TABLE=diag_table_template
 export FIELD_TABLE=field_table_thompson_noaero_tke

diff --git a/tests/tests/cpld_debug_pdlib_p8 b/tests/tests/cpld_debug_pdlib_p8
@@ -87,7 +87,15 @@ export CICE_DIAGFREQ=`expr $((FHMAX-$FHROT)) \* 3600 / $DT_CICE`
 
 export WW3_DOMAIN=global_270k
 export MESH_WAV=mesh.${WW3_DOMAIN}.nc
-export WW3_MODDEF=mod_def.exp.${WW3_DOMAIN}
+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 DIAG_TABLE=diag_table_template
 export FIELD_TABLE=field_table_thompson_noaero_tke

diff --git a/tests/tests/cpld_mpi_pdlib_p8 b/tests/tests/cpld_mpi_pdlib_p8
@@ -97,7 +97,15 @@ 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 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 DIAG_TABLE=diag_table_template
 export FIELD_TABLE=field_table_thompson_noaero_tke

diff --git a/tests/tests/cpld_restart_pdlib_p8 b/tests/tests/cpld_restart_pdlib_p8
@@ -101,7 +101,15 @@ export CICE_DIAGFREQ=`expr $((FHMAX-$FHROT)) \* 3600 / $DT_CICE`
 
 export WW3_DOMAIN=global_270k
 export MESH_WAV=mesh.${WW3_DOMAIN}.nc
-export WW3_MODDEF=mod_def.exp.${WW3_DOMAIN}
+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 DIAG_TABLE=diag_table_template
 export FIELD_TABLE=field_table_thompson_noaero_tke

diff --git a/tests/tests/cpld_s2sw_wavice_p8 b/tests/tests/cpld_s2sw_wavice_p8