* Update CDEPS; Add coupled C48-5deg ocean+ice warm-start and restart test (was #1336)

tests/default_vars.sh

@@ -15,6 +15,11 @@
   INPES_cpl_atmw=3; JNPES_cpl_atmw=8; WPG_cpl_atmw=6
   WAV_tasks_atmw=30
 
+  TASKS_cpl_c48=20; THRD_cpl_c48=1 
+  INPES_cpl_c48=1; JNPES_cpl_c48=1; WPG_cpl_c48=6
+  OCN_tasks_cpl_c48=4
+  ICE_tasks_cpl_c48=4
+
   TASKS_cpl_dflt=200; THRD_cpl_dflt=1
   INPES_cpl_dflt=3; JNPES_cpl_dflt=8; WPG_cpl_dflt=6
   OCN_tasks_cpl_dflt=20

tests/fv3_conf/cpld_control_run.IN

@@ -13,9 +13,15 @@ if [[ $BMIC == .true. ]]; then
   MOM_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/mom6_da
   ICE_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/cpc
 else
-  FV3_IC=@[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127_mx${OCNRES}
-  MOM_IC=@[INPUTDATA_ROOT]/MOM6_IC
-  ICE_IC=@[INPUTDATA_ROOT]/CICE_IC/${OCNRES}
+  if [[ $ATMRES == C48 ]]; then
+     FV3_IC=@[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127_mx${OCNRES}/${SYEAR}${SMONTH}${SDAY}${SHOUR}
+     MOM_IC=@[INPUTDATA_ROOT]/MOM6_IC/${OCNRES}/${SYEAR}${SMONTH}${SDAY}${SHOUR}
+     ICE_IC=@[INPUTDATA_ROOT]/CICE_IC/${OCNRES}/${SYEAR}${SMONTH}${SDAY}${SHOUR}
+  else
+     FV3_IC=@[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127_mx${OCNRES}
+     MOM_IC=@[INPUTDATA_ROOT]/MOM6_IC
+     ICE_IC=@[INPUTDATA_ROOT]/CICE_IC/${OCNRES}
+  fi
 fi
 
 # FV3 fixed input
@@ -72,53 +78,67 @@ if [ $WARM_START = .false. ]; then
    cp    ${MOM_IC}/MOM*.nc ./INPUT
    cp    ${ICE_IC}/cice5_model_@[ICERES].res_${SYEAR}${SMONTH}${SDAY}00.nc ./cice_model.res.nc
   else
-   cp    ${MOM_IC}/MOM6_IC_TS_${SYEAR}${SMONTH}${SDAY}${SHOUR}.nc ./INPUT/MOM6_IC_TS.nc
-   cp    ${ICE_IC}/cice_model_@[ICERES].cpc.res_${SYEAR}${SMONTH}${SDAY}.nc ./cice_model.res.nc
+    if [[ $ATMRES == C48 ]]; then
+      cp    ${MOM_IC}/MOM.res.nc ./INPUT
+      cp    ${ICE_IC}/cice_model_@[ICERES].cpc.res_* ./cice_model.res.nc
+    else
+      cp    ${MOM_IC}/MOM6_IC_TS_${SYEAR}${SMONTH}${SDAY}${SHOUR}.nc ./INPUT/MOM6_IC_TS.nc
+      cp    ${ICE_IC}/cice_model_@[ICERES].cpc.res_${SYEAR}${SMONTH}${SDAY}.nc ./cice_model.res.nc
+    fi
   fi
-#Restart
 else
-  if [[ ${OPNREQ_TEST} == true ]]; then
-    SUFFIX=${BL_SUFFIX}
-  fi
+#Restart from checkpoint restart
+  if [[ "Q${DEP_RUN:-}" != Q ]] ; then
+     if [[ ${OPNREQ_TEST} == true ]]; then
+       SUFFIX=${BL_SUFFIX}
+     fi
+
+     # Restart files
+     cp -r ../${DEP_RUN}${SUFFIX}/INPUT/* ./INPUT
+     cp -r ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.* ./INPUT
+     for RFILE in INPUT/${RESTART_FILE_PREFIX}.*; do
+       [ -e $RFILE ] || exit 1
+       RFILE_OLD=$(basename $RFILE)
+          mv -f $RFILE INPUT/"${RFILE_OLD//${RESTART_FILE_PREFIX}./}"
+     done
+
+     #if not mx025, then mom6 restart is a single file
+     if [[ $OCNRES == 025 ]]; then
+      cp ../${DEP_RUN}${SUFFIX}/RESTART/MOM.res.${RESTART_FILE_SUFFIX_HRS}-00-00.nc ./INPUT/MOM.res.nc
+      cp ../${DEP_RUN}${SUFFIX}/RESTART/MOM.res.${RESTART_FILE_SUFFIX_HRS}-00-00_1.nc ./INPUT/MOM.res_1.nc
+      cp ../${DEP_RUN}${SUFFIX}/RESTART/MOM.res.${RESTART_FILE_SUFFIX_HRS}-00-00_2.nc ./INPUT/MOM.res_2.nc
+      cp ../${DEP_RUN}${SUFFIX}/RESTART/MOM.res.${RESTART_FILE_SUFFIX_HRS}-00-00_3.nc ./INPUT/MOM.res_3.nc
+     else
+      cp ../${DEP_RUN}${SUFFIX}/RESTART/MOM.res.${RESTART_FILE_SUFFIX_HRS}-00-00.nc ./INPUT/MOM.res.nc
+     fi
+
+     # CMEPS restart and pointer files
+     RFILE=ufs.cpld.cpl.r.${RESTART_FILE_SUFFIX_SECS}.nc
+     cp  ../${DEP_RUN}${SUFFIX}/RESTART/${RFILE} .
+     ls -1 ${RFILE}>rpointer.cpl
+
+     # CMEPS/CCPP restart file
+     if [[ $CPLMODE =~ 'nems_frac_aoflux' ]]; then
+       RFILE_CCPP=ufs.cpld.cpl.ccpp.${RESTART_FILE_SUFFIX_SECS}.nc
+       cp ../${DEP_RUN}${SUFFIX}/${RFILE_CCPP} .
+     fi
+
+     # CICE restart and pointer files
+     RFILE=iced.${RESTART_FILE_SUFFIX_SECS}.nc
+     cp  ../${DEP_RUN}${SUFFIX}/RESTART/${RFILE} ./INPUT
+     ls -1 ./INPUT/${RFILE}>ice.restart_file
+
+     # WAVE restart file
+     if [[ $CPLWAV == .true. ]]; then
+       cp ../${DEP_RUN}${SUFFIX}/${RESTART_FILE_PREFIX}.restart.ww3 ./restart.ww3
+     fi
 
-  # Restart files
-  cp -r ../${DEP_RUN}${SUFFIX}/INPUT/* ./INPUT
-  cp -r ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.* ./INPUT
-  for RFILE in INPUT/${RESTART_FILE_PREFIX}.*; do
-    [ -e $RFILE ] || exit 1
-    RFILE_OLD=$(basename $RFILE)
-    mv -f $RFILE INPUT/"${RFILE_OLD//${RESTART_FILE_PREFIX}./}"
-  done
-
-  #if not mx025, then mom6 restart is a single file
-  if [[ $OCNRES == 025 ]]; then
-   cp ../${DEP_RUN}${SUFFIX}/RESTART/MOM.res.${RESTART_FILE_SUFFIX_HRS}-00-00.nc ./INPUT/MOM.res.nc
-   cp ../${DEP_RUN}${SUFFIX}/RESTART/MOM.res.${RESTART_FILE_SUFFIX_HRS}-00-00_1.nc ./INPUT/MOM.res_1.nc
-   cp ../${DEP_RUN}${SUFFIX}/RESTART/MOM.res.${RESTART_FILE_SUFFIX_HRS}-00-00_2.nc ./INPUT/MOM.res_2.nc
-   cp ../${DEP_RUN}${SUFFIX}/RESTART/MOM.res.${RESTART_FILE_SUFFIX_HRS}-00-00_3.nc ./INPUT/MOM.res_3.nc
   else
-   cp ../${DEP_RUN}${SUFFIX}/RESTART/MOM.res.${RESTART_FILE_SUFFIX_HRS}-00-00.nc ./INPUT/MOM.res.nc
-  fi
-
-  # CMEPS restart and pointer files
-  RFILE=ufs.cpld.cpl.r.${RESTART_FILE_SUFFIX_SECS}.nc
-  cp  ../${DEP_RUN}${SUFFIX}/RESTART/${RFILE} .
-  ls -1 ${RFILE}>rpointer.cpl
-
-  # CMEPS/CCPP restart file
-  if [[ $CPLMODE =~ 'nems_frac_aoflux' ]]; then
-    RFILE_CCPP=ufs.cpld.cpl.ccpp.${RESTART_FILE_SUFFIX_SECS}.nc
-    cp ../${DEP_RUN}${SUFFIX}/${RFILE_CCPP} .
-  fi
-
-  # CICE restart and pointer files
-  RFILE=iced.${RESTART_FILE_SUFFIX_SECS}.nc
-  cp  ../${DEP_RUN}${SUFFIX}/RESTART/${RFILE} ./INPUT
-  ls -1 ./INPUT/${RFILE}>ice.restart_file
-
-  # WAVE restart file
-  if [[ $CPLWAV == .true. ]]; then
-    cp ../${DEP_RUN}${SUFFIX}/${RESTART_FILE_PREFIX}.restart.ww3 ./restart.ww3
+     # C48mx500 warm start from ICs
+     cp    ${FV3_IC}/*.nc ./INPUT
+     cp    ${MOM_IC}/MOM.res.nc ./INPUT
+     cp    ${ICE_IC}/* .
+     cp    @[INPUTDATA_ROOT]/CMEPS_IC/${ATMRES}mx${OCNRES}/${SYEAR}${SMONTH}${SDAY}${SHOUR}/* .
   fi
 fi