Add p7a test using tiled FV3 Fix files, P7a ICs and NoahMP; add open-water normalization in CMEPS (#549)

.gitmodules

@@ -20,8 +20,10 @@
   branch = develop
 [submodule "CMEPS"]
   path = CMEPS-interface/CMEPS
-  url = https://github.com/NOAA-EMC/CMEPS.git
-  branch = emc/develop
+  #url = https://github.com/NOAA-EMC/CMEPS.git
+  #branch = emc/develop
+  url = https://github.com/DeniseWorthen/CMEPS.git
+  branch = feature/aofrac_normalization
 [submodule "MOM6"]
   path = MOM6-interface/MOM6
   url = https://github.com/NOAA-EMC/MOM6

tests/fv3_conf/cpld_bmark_tiled_run.IN

@@ -0,0 +1,101 @@
+mkdir INPUT RESTART history MOM6_OUTPUT
+
+if [[ $ATMRES == 'C96' ]]; then
+  FV3_DIR=FV3_input_data
+else
+  FV3_DIR=FV3_input_data${ATMRES#C}
+fi
+
+ICERES="${OCNRES:0:1}.${OCNRES:1}"
+
+FV3_IC=FV3_input_frac/BM7_IC/${SYEAR}${SMONTH}${SDAY}${SHOUR}/gfs/@[ATMRES]_L@[NPZ]/INPUT
+
+# FV3 fixed input
+cp    @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/aerosol.dat .
+cp    @[INPUTDATA_ROOT]/FV3_input_bm2/INPUT/co2historicaldata_201*.txt .
+cp    @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/sfc_emissivity_idx.txt .
+cp    @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/solarconstant_noaa_an.txt .
+cp    @[INPUTDATA_ROOT]/${FV3_DIR}/global_glacier.2x2.grb .
+cp    @[INPUTDATA_ROOT]/${FV3_DIR}/global_maxice.2x2.grb .
+cp    @[INPUTDATA_ROOT]/${FV3_DIR}/RTGSST.1982.2012.monthly.clim.grb .
+cp    @[INPUTDATA_ROOT]/${FV3_DIR}/global_snoclim.1.875.grb .
+cp    @[INPUTDATA_ROOT]/${FV3_DIR}/CFSR.SEAICE.1982.2012.monthly.clim.grb .
+cp    @[INPUTDATA_ROOT]/${FV3_DIR}/global_soilmgldas.statsgo.t766.1536.768.grb .
+cp    @[INPUTDATA_ROOT]/${FV3_DIR}/global_slmask.t1534.3072.1536.grb .
+#TODO: check the ozone---any need to keep "old"
+if [ $OZ_PHYS_NEW = .T. ]; then
+  cp  @[INPUTDATA_ROOT]/${FV3_DIR}/ozprdlos_2015_new_sbuvO3_tclm15_nuchem.f77 ./global_o3prdlos.f77
+elif [ $OZ_PHYS_OLD = .T. ]; then
+  cp  @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/global_o3prdlos.f77 .
+fi
+cp    @[INPUTDATA_ROOT]/${FV3_DIR}/global_h2o_pltc.f77 ./global_h2oprdlos.f77
+cp    @[INPUTDATA_ROOT]/FV3_fix_tiled/@[ATMRES]/oro_@[ATMRES].mx@[OCNRES].tile1.nc INPUT/oro_data.tile1.nc
+cp    @[INPUTDATA_ROOT]/FV3_fix_tiled/@[ATMRES]/oro_@[ATMRES].mx@[OCNRES].tile2.nc INPUT/oro_data.tile2.nc
+cp    @[INPUTDATA_ROOT]/FV3_fix_tiled/@[ATMRES]/oro_@[ATMRES].mx@[OCNRES].tile3.nc INPUT/oro_data.tile3.nc
+cp    @[INPUTDATA_ROOT]/FV3_fix_tiled/@[ATMRES]/oro_@[ATMRES].mx@[OCNRES].tile4.nc INPUT/oro_data.tile4.nc
+cp    @[INPUTDATA_ROOT]/FV3_fix_tiled/@[ATMRES]/oro_@[ATMRES].mx@[OCNRES].tile5.nc INPUT/oro_data.tile5.nc
+cp    @[INPUTDATA_ROOT]/FV3_fix_tiled/@[ATMRES]/oro_@[ATMRES].mx@[OCNRES].tile6.nc INPUT/oro_data.tile6.nc
+cp    @[INPUTDATA_ROOT]/FV3_fix_tiled/@[ATMRES]/@[ATMRES]*.nc .
+
+cp    @[INPUTDATA_ROOT]/${FV3_DIR}/@[FIELD_TABLE] ./field_table
+cp    @[INPUTDATA_ROOT]/CPL_FIX/a@[ATMRES]o@[OCNRES]/grid_spec.nc ./INPUT
+cp    @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/@[ATMRES]_grid*.nc ./INPUT
+cp    @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/grid_spec.nc ./INPUT/@[ATMRES]_mosaic.nc
+
+# MOM6 fixed input
+cp    @[INPUTDATA_ROOT]/MOM6_FIX/@[OCNRES]/* ./INPUT
+
+# CICE fixed input
+cp    @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/grid_cice_NEMS_mx@[OCNRES].nc .
+cp    @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/kmtu_cice_NEMS_mx@[OCNRES].nc .
+cp    @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/mesh.mx@[OCNRES].nc .
+
+# WW3 fix/input
+if [[ $CPLWAV == .T. && $CPLWAV2ATM == .T. ]]; then
+  cp    @[INPUTDATA_ROOT_WW3]/mod_def.* .
+  if [[ $RT35D == .T. ]]; then
+   cp    @[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/ww3/*.000000.restart.gwes_30m ./restart.gwes_30m
+  fi
+fi
+
+# No restart
+if [ $WARM_START = .F. ]; then
+  # ICs
+  cp    @[INPUTDATA_ROOT]/${FV3_IC}/sfc_data*.nc ./INPUT
+  cp    @[INPUTDATA_ROOT]/${FV3_IC}/gfs_data*.nc ./INPUT
+  cp    @[INPUTDATA_ROOT]/${FV3_IC}/gfs_ctrl.nc ./INPUT
+  cp    @[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/mom6_da/MOM*.nc ./INPUT
+  # the BM ICs are still named cice5 and need to remain so until P5.0 is completed
+  cp    @[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/cpc/cice5_model_@[ICERES].*.nc ./cice_model.res.nc
+else
+  # NOTE: bmark-wave model is not currently tested for restart
+  # Restart files
+  cp -r ../${DEP_RUN}${RT_SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.* ./INPUT
+  rm -f INPUT/fv_core.res.*
+  rm -f INPUT/fv_srf_wnd.res.*
+  rm -f INPUT/fv_tracer.res.*
+  rm -f INPUT/phy_data.*
+  rm -f INPUT/sfc_data.*
+  for RFILE in ../${DEP_RUN}${RT_SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.*; do
+    [ -e $RFILE ] || exit 1
+    RFILE_OLD=$(basename $RFILE)
+    RFILE_NEW="${RFILE_OLD//${RESTART_FILE_PREFIX}./}"
+    cp $RFILE INPUT/${RFILE_NEW}
+  done
+
+  # Restart files MOM6 mx025
+  cp ../${DEP_RUN}${RT_SUFFIX}/RESTART/MOM.res.${RESTART_FILE_SUFFIX_HRS}-00-00.nc ./INPUT/MOM.res.nc
+  cp ../${DEP_RUN}${RT_SUFFIX}/RESTART/MOM.res.${RESTART_FILE_SUFFIX_HRS}-00-00_1.nc ./INPUT/MOM.res_1.nc
+  cp ../${DEP_RUN}${RT_SUFFIX}/RESTART/MOM.res.${RESTART_FILE_SUFFIX_HRS}-00-00_2.nc ./INPUT/MOM.res_2.nc
+  cp ../${DEP_RUN}${RT_SUFFIX}/RESTART/MOM.res.${RESTART_FILE_SUFFIX_HRS}-00-00_3.nc ./INPUT/MOM.res_3.nc
+
+  # CMEPS restart and pointer files
+  RFILE="ufs.cpld.cpl.r.${RESTART_FILE_SUFFIX_SECS}.nc"
+  cp  ../${DEP_RUN}${RT_SUFFIX}/RESTART/${RFILE} .
+  ls -1 ${RFILE}>rpointer.cpl
+
+  # CICE restart and pointer files
+  RFILE="iced.${RESTART_FILE_SUFFIX_SECS}.nc"
+  cp  ../${DEP_RUN}${RT_SUFFIX}/RESTART/${RFILE} ./INPUT
+  ls -1 "./INPUT/"${RFILE}>ice.restart_file
+fi

tests/parm/input.benchmark_v16.nml.IN

@@ -137,8 +137,8 @@
   pdfcld       = .false.
   fhswr        = 3600.
   fhlwr        = 3600.
-  ialb         = 1
-  iems         = 1
+  ialb         = @[IALB]
+  iems         = @[IEMS]
   iaer         = 5111
   icliq_sw     = 2
   iovr         = 3
@@ -167,19 +167,19 @@
   ivegsrc      = 1
   isot         = 1
   lsoil        = 4
-  lsm          = 1
-  iopt_dveg    = 1
-  iopt_crs     = 1
+  lsm          = @[LSM]
+  iopt_dveg    = @[IOPT_DVEG]
+  iopt_crs     = @[IOPT_CRS]
   iopt_btr     = 1
   iopt_run     = 1
   iopt_sfc     = 1
   iopt_frz     = 1
   iopt_inf     = 1
-  iopt_rad     = 1
-  iopt_alb     = 2
+  iopt_rad     = @[IOPT_RAD]
+  iopt_alb     = @[IOPT_ALB]
   iopt_snf     = 4
   iopt_tbot    = 2
-  iopt_stc     = 1
+  iopt_stc     = @[IOPT_STC]
   debug        = .false.
   frac_grid    = @[FRAC_GRID]
   nstf_name    = @[NSTF_NAME]
@@ -261,26 +261,26 @@
        FNSNOC   = "global_snoclim.1.875.grb",
        FNZORC   = "igbp",
        FNALBC   = @[FNALBC]
-       FNALBC2  = "global_albedo4.1x1.grb",
+       FNALBC2  = @[FNALBC2]
        FNAISC   = "CFSR.SEAICE.1982.2012.monthly.clim.grb",
-       FNTG3C   = "global_tg3clim.2.6x1.5.grb",
-       FNVEGC   = "global_vegfrac.0.144.decpercent.grb",
+       FNTG3C   = @[FNTG3C]
+       FNVEGC   = @[FNVEGC]
        FNVETC   = @[FNVETC]
        FNSOTC   = @[FNSOTC]
        FNSMCC   = @[FNSMCC]
        FNMSKH   = "global_slmask.t1534.3072.1536.grb",
        FNTSFA   = "",
        FNACNA   = "",
        FNSNOA   = "",
-       FNVMNC   = "global_shdmin.0.144x0.144.grb",
-       FNVMXC   = "global_shdmax.0.144x0.144.grb",
-       FNSLPC   = "global_slope.1x1.grb",
+       FNVMNC   = @[FNVMNC]
+       FNVMXC   = @[FNVMXC]
+       FNSLPC   = @[FNSLPC]
        FNABSC   = @[FNABSC]
        LDEBUG   =.false.,
   FSMCL(2) = 99999
   FSMCL(3) = 99999
   FSMCL(4) = 99999
-  LANDICE = .true.
+  LANDICE = @[LANDICE]
   FTSFS = 90
   FAISL = 99999
   FAISS = 99999

tests/rt.conf

@@ -35,10 +35,11 @@ RUN     | cpld_bmarkfrac_v16
 RUN     | cpld_bmarkfrac_v16_nsst                                                                                                 | - wcoss_cray                            | fv3 |
 RUN     | cpld_restart_bmarkfrac_v16                                                                                              | - wcoss_cray                            |     | cpld_bmarkfrac_v16
 
-COMPILE | APP=S2SW SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled            | - wcoss_cray                            | fv3 |
+COMPILE | APP=S2SW SUITES=FV3_GFS_2017_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled,FV3_GFS_v16_coupled_noahmp               | - wcoss_cray                  | fv3 |
 RUN     | cpld_bmark_wave                                                                                                         | - wcoss_cray                            | fv3 |
 RUN     | cpld_bmarkfrac_wave                                                                                                     | - wcoss_cray                            | fv3 |
 RUN     | cpld_bmarkfrac_wave_v16                                                                                                 | - wcoss_cray                            | fv3 |
+RUN     | cpld_bmarkfrac_wave_v16_noahmp                                                                                          | - wcoss_cray                            | fv3 |
 RUN     | cpld_control_wave                                                                                                       | - wcoss_cray                            | fv3 |
 
 COMPILE | APP=S2S DEBUG=Y SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled     | - wcoss_cray                            | fv3 |

tests/rt.sh

@@ -413,7 +413,7 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20210521
+BL_DATE=20210524
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]]; then
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 else