-- Adding benchmark tests for the fractional grid. The earlier crash …

…was fixed by Moorthi's modifications in ccpp/physics;

-- Restart in the coupled mode with the default physics is reproducible, when
   (1) bad water temperature is only filtered at the initial time;
   (2) stop initializing fice to zero everywhere in the FV3 cap in order to keep lake ice untouched;

    These address Issues ufs-community#268, ufs-community#285 & ufs-community#286.

    Co-authored-by: Shrinivas Moorthi <shrinivas.moorthi@noaa.gov>
    Co-authored-by: Denise Worthen <Denise.Worthen@noaa.gov>

.gitmodules

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

tests/fv3_conf/cpld_bmark_run.IN

@@ -29,7 +29,11 @@ cp    @[RTPWD]/${FV3_DIR}/*grb .
 cp    @[RTPWD]/${FV3_DIR}/@[FIELD_TABLE] ./field_table
 cp    @[RTPWD]/CPL_FIX/a@[ATMRES]o@[OCNRES]/grid_spec.nc ./INPUT
 cp    @[RTPWD]/${FV3_DIR}/INPUT/@[ATMRES]_grid*.nc ./INPUT
-cp    @[RTPWD]/${FV3_DIR}/INPUT/oro_data*.nc ./INPUT
+if [ ${FRAC_GRID_INPUT} = .F. ]; then
+  cp  @[RTPWD]/${FV3_DIR}/INPUT/oro_data*.nc ./INPUT
+else
+  cp  @[RTPWD]/FV3_input_frac/@[ATMRES].mx@[OCNRES]_frac/oro_data*.nc ./INPUT
+fi
 cp    @[RTPWD]/${FV3_DIR}/INPUT/grid_spec.nc ./INPUT/@[ATMRES]_mosaic.nc
 cp    @[RTPWD]/${FV3_DIR}/INPUT/gfs_ctrl.nc ./INPUT
 
@@ -53,8 +57,15 @@ if [[ $CPLWAV == .T. && $CPLWAV2ATM == .T. ]]; then
 fi
 
 # ICs
-cp    @[RTPWD]/${FV3_IC}/sfc_data*.nc ./INPUT
-cp    @[RTPWD]/${FV3_IC}/gfs_data*.nc ./INPUT
+
+if [ ${FRAC_GRID_INPUT} = .F. ]; then
+  cp  @[RTPWD]/${FV3_IC}/sfc_data*.nc ./INPUT
+  cp  @[RTPWD]/${FV3_IC}/gfs_data*.nc ./INPUT
+else
+  cp  @[RTPWD]/FV3_input_frac/${FV3_IC}/sfc_data*.nc ./INPUT
+  cp  @[RTPWD]/FV3_input_frac/${FV3_IC}/gfs_data*.nc ./INPUT
+fi
+
 cp    @[RTPWD]/${MOM6_IC}/MOM*.nc ./INPUT
 # the BM ICs are still named cice5 and need to remain so until P5.0 is completed
 cp    @[RTPWD]/${CICE_IC}/cice5_model_@[ICERES].*.nc ./cice_model.res.nc

tests/rt.conf

@@ -199,6 +199,7 @@ RUN     | cpld_bmark
 
 COMPILE | CCPP=Y SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled S2S=Y WW3=Y                  | standard | hera.intel orion.intel wcoss_dell_p3 | fv3 |
 RUN     | cpld_bmark_wave                                                                                                     | standard | hera.intel orion.intel wcoss_dell_p3 | fv3 |
+RUN     | cpld_bmark_wave_frac                                                                                                | standard | hera.intel orion.intel wcoss_dell_p3 | fv3 |
 
 COMPILE | CCPP=Y DEBUG=Y SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled S2S=Y                | standard | hera.intel orion.intel wcoss_dell_p3 | fv3 |
 RUN     | cpld_debug                                                                                                          | standard | hera.intel orion.intel wcoss_dell_p3 | fv3 |