ufs-community · DeniseWorthen · Jul 20, 2021 · Mar 27, 2021 · Mar 27, 2021 · Mar 27, 2021
diff --git a/tests/fv3_conf/cpld_bmark_run.IN b/tests/fv3_conf/cpld_bmark_run.IN
@@ -8,19 +8,15 @@ fi
 
 ICERES="${OCNRES:0:1}.${OCNRES:1}"
 
-if [[ ${FRAC_GRID_INPUT} = .F. ]]; then
-  FV3_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/gfs/@[ATMRES]/INPUT
-elif [[ @[NPZ] == '127' ]]; then
-  FV3_IC=FV3_input_frac/BM_IC/${SYEAR}${SMONTH}${SDAY}${SHOUR}/gfs/@[ATMRES]_L@[NPZ]/INPUT
-else
-  FV3_IC=FV3_input_frac/BM_IC/${SYEAR}${SMONTH}${SDAY}${SHOUR}/gfs/@[ATMRES]/INPUT
-fi
+FV3_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/gfs_p6/@[ATMRES]_L@[NPZ]/INPUT
+MOM_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/mom6_da
+ICE_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/cpc
 #unused unless 35D run is active
-WW3_IC=FV3_input_frac/BM_IC/${SYEAR}${SMONTH}${SDAY}${SHOUR}/wav/gwes_30m
+WW3_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/wav_p6/gwes_30m
 
 # FV3 fixed input
+cp    @[INPUTDATA_ROOT_BMIC]/FV3_fix/INPUT/co2historicaldata_201*.txt .
 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 .
 if [ $OZ_PHYS_NEW = .T. ]; then
@@ -33,14 +29,8 @@ cp    @[INPUTDATA_ROOT]/${FV3_DIR}/*grb .
 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
-# NOTE: No L127 FV3_DIR input for non-frac grid input except for C96
-if [ ${FRAC_GRID_INPUT} = .F. ]; then
-  cp  @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/oro_data*.nc ./INPUT
-  cp  @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/gfs_ctrl.nc ./INPUT
-else
-  cp  @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES]_L@[NPZ].mx@[OCNRES]_frac/oro_data*.nc ./INPUT
-  cp  @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES]_L@[NPZ].mx@[OCNRES]_frac/gfs_ctrl.nc ./INPUT
-fi
+cp    @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES]_L@[NPZ].mx@[OCNRES]_frac/oro_data*.nc ./INPUT
+cp    @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES]_L@[NPZ].mx@[OCNRES]_frac/gfs_ctrl.nc ./INPUT
 cp    @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/grid_spec.nc ./INPUT/@[ATMRES]_mosaic.nc
 
 # MOM6 fixed input
@@ -55,18 +45,18 @@ cp    @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/mesh.mx@[OCNRES].nc .
 if [[ $CPLWAV == .T. && $CPLWAV2ATM == .T. ]]; then
   cp    @[INPUTDATA_ROOT_WW3]/mod_def.* .
   if [[ $RT35D == .T. ]]; then
-   cp   @[INPUTDATA_ROOT]/${WW3_IC}/*.000000.restart.gwes_30m ./restart.gwes_30m
+   cp   ${WW3_IC}/*.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_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/mom6_da/MOM*.nc ./INPUT
+  cp    ${FV3_IC}/sfc_data*.nc ./INPUT
+  cp    ${FV3_IC}/gfs_data*.nc ./INPUT
+  cp    ${MOM_IC}/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
+  cp    ${ICE_IC}/cice5_model_@[ICERES].*.nc ./cice_model.res.nc
 else
   # NOTE: bmark-wave model is not currently tested for restart
   # Restart files

diff --git a/tests/fv3_conf/cpld_bmark_tiled_run.IN b/tests/fv3_conf/cpld_bmark_tiled_run.IN
@@ -8,13 +8,15 @@ fi
 
 ICERES="${OCNRES:0:1}.${OCNRES:1}"
 
-FV3_IC=FV3_input_frac/BM7_IC/${SYEAR}${SMONTH}${SDAY}${SHOUR}/gfs/@[ATMRES]_L@[NPZ]/INPUT
+FV3_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/gfs_p7/@[ATMRES]_L@[NPZ]/INPUT
+MOM_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/mom6_da
+ICE_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/cpc
 #unused unless 35D run is active
-WW3_IC=FV3_input_frac/BM7_IC/${SYEAR}${SMONTH}${SDAY}${SHOUR}/wav/gwes_30m
+WW3_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/wav_p7/gwes_30m
 
 # FV3 fixed input
+cp    @[INPUTDATA_ROOT_BMIC]/FV3_fix/INPUT/co2historicaldata_201*.txt .
 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 .
@@ -56,19 +58,19 @@ cp    @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/mesh.mx@[OCNRES].nc .
 if [[ $CPLWAV == .T. && $CPLWAV2ATM == .T. ]]; then
   cp    @[INPUTDATA_ROOT_WW3]/mod_def.* .
   if [[ $RT35D == .T. ]]; then
-   cp   @[INPUTDATA_ROOT]/${WW3_IC}/*.000000.restart.gwes_30m ./restart.gwes_30m
+   cp   ${WW3_IC}/*.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
+  cp    ${FV3_IC}/sfc_data*.nc ./INPUT
+  cp    ${FV3_IC}/gfs_data*.nc ./INPUT
+  cp    ${FV3_IC}/gfs_ctrl.nc ./INPUT
+  cp    ${MOM_IC}/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
+  cp    ${ICE_IC}/cice5_model_@[ICERES].*.nc ./cice_model.res.nc
 else
   # NOTE: bmark-wave model is not currently tested for restart
   # Restart files

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -420,9 +420,12 @@ else
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}}
 fi
 
-INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20210528}
+#INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20210528}
+#INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT}/WW3_input_data_20210503
+#INPUTDATA_ROOT_BMIC=${INPUTDATA_ROOT_BMIC:-$DISKNM/NEMSfv3gfs/BM_IC-20210212}
+INPUTDATA_ROOT="/scratch1/NCEPDEV/stmp4/Denise.Worthen/input-data-20210630"
 INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT}/WW3_input_data_20210503
-INPUTDATA_ROOT_BMIC=${INPUTDATA_ROOT_BMIC:-$DISKNM/NEMSfv3gfs/BM_IC-20210212}
+INPUTDATA_ROOT_BMIC="/scratch1/NCEPDEV/stmp4/Denise.Worthen/BM_IC-20210630"
 
 shift $((OPTIND-1))
 [[ $# -gt 1 ]] && usage