ufs-community · zach1221 · Dec 11, 2023 · Nov 14, 2023 · Nov 20, 2023 · Nov 26, 2023
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
diff --git a/tests/fv3_conf/control_run.IN b/tests/fv3_conf/control_run.IN
@@ -103,12 +103,12 @@ else
 fi
 
 if [ $CPLWAV = .true. ]; then
-  if [ $MULTIGRID = 'true' ]; then
+  if [ $WW3_MULTIGRID = 'true' ]; then
     cp    @[INPUTDATA_ROOT_WW3]/mod_def.pointsatmw mod_def.points
-    cp    @[INPUTDATA_ROOT_WW3]/@[MODDEF_WAV] .
+    cp    @[INPUTDATA_ROOT_WW3]/@[WW3_MODDEF] .
     cp    @[INPUTDATA_ROOT_WW3]/rmp_src* .
   else
-    cp    @[INPUTDATA_ROOT_WW3]/@[MODDEF_WAV] mod_def.ww3
+    cp    @[INPUTDATA_ROOT_WW3]/@[WW3_MODDEF] mod_def.ww3
     cp    @[INPUTDATA_ROOT_WW3]/@[MESH_WAV] .
   fi
 fi

diff --git a/tests/fv3_conf/cpld_control_run.IN b/tests/fv3_conf/cpld_control_run.IN
@@ -1,4 +1,11 @@
-mkdir INPUT RESTART history MOM6_OUTPUT
+mkdir INPUT RESTART
+
+mkdir -p $CICE_RESTART_DIR
+mkdir -p $MOM6_RESTART_DIR
+mkdir -p $CMEPS_RESTART_DIR
+
+mkdir -p $CICE_HISTORY_DIR
+mkdir -p $MOM6_OUTPUT_DIR
 
 if [[ $ATMRES == C96 ]]; then
   FV3_DIR=FV3_input_data
@@ -50,8 +57,8 @@ cp    @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/mesh.mx@[OCNRES].nc .
 
 # WW3 fix/input
 if [[ $CPLWAV == .true. ]]; then
-  cp @[INPUTDATA_ROOT_WW3]/@[MODDEF_WAV] mod_def.ww3
-  if [[ ${WAVDOMAIN:0:2} != mx ]]; then
+  cp @[INPUTDATA_ROOT_WW3]/@[WW3_MODDEF] mod_def.ww3
+  if [[ ${WW3_DOMAIN:0:2} != mx ]]; then
      cp  @[INPUTDATA_ROOT_WW3]/@[MESH_WAV] .
   fi
 fi
@@ -102,20 +109,20 @@ else
 
      #if not mx025, then mom6 restart is a single file
      if [[ $OCNRES == 025 ]]; then
-      cp ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.MOM.res.nc ./INPUT/MOM.res.nc
-      cp ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.MOM.res_1.nc ./INPUT/MOM.res_1.nc
-      cp ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.MOM.res_2.nc ./INPUT/MOM.res_2.nc
-      cp ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.MOM.res_3.nc ./INPUT/MOM.res_3.nc
+      cp ../${DEP_RUN}${SUFFIX}/${MOM6_RESTART_DIR}/${RESTART_FILE_PREFIX}.MOM.res.nc ./INPUT/MOM.res.nc
+      cp ../${DEP_RUN}${SUFFIX}/${MOM6_RESTART_DIR}/${RESTART_FILE_PREFIX}.MOM.res_1.nc ./INPUT/MOM.res_1.nc
+      cp ../${DEP_RUN}${SUFFIX}/${MOM6_RESTART_DIR}/${RESTART_FILE_PREFIX}.MOM.res_2.nc ./INPUT/MOM.res_2.nc
+      cp ../${DEP_RUN}${SUFFIX}/${MOM6_RESTART_DIR}/${RESTART_FILE_PREFIX}.MOM.res_3.nc ./INPUT/MOM.res_3.nc
      else
-      cp ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.MOM.res.nc ./INPUT/MOM.res.nc
+      cp ../${DEP_RUN}${SUFFIX}/${MOM6_RESTART_DIR}/${RESTART_FILE_PREFIX}.MOM.res.nc ./INPUT/MOM.res.nc
       if [[ $ODA_INCUPD == 'True' ]] && [[ $FHROT -le 6 ]]; then
         cp @[INPUTDATA_ROOT]/MOM6_IC/mom6_increment.nc ./INPUT/mom6_increment.nc
       fi
      fi
 
      # CMEPS restart and pointer files
      RFILE=ufs.cpld.cpl.r.${RESTART_FILE_SUFFIX_SECS}.nc
-     cp  ../${DEP_RUN}${SUFFIX}/RESTART/${RFILE} .
+     cp  ../${DEP_RUN}${SUFFIX}/${CMEPS_RESTART_DIR}/${RFILE} .
      ls -1 ${RFILE}>rpointer.cpl
 
      # CMEPS/CCPP restart file
@@ -126,7 +133,7 @@ else
 
      # CICE restart and pointer files
      RFILE=iced.${RESTART_FILE_SUFFIX_SECS}.nc
-     cp  ../${DEP_RUN}${SUFFIX}/RESTART/${RFILE} ./INPUT
+     cp  ../${DEP_RUN}${SUFFIX}/${CICE_RESTART_DIR}/${RFILE} ./INPUT
      ls -1 ./INPUT/${RFILE}>ice.restart_file
 
      # WAVE restart file

diff --git a/tests/fv3_conf/cpld_datm_cdeps.IN b/tests/fv3_conf/cpld_datm_cdeps.IN
@@ -1,8 +1,15 @@
-mkdir INPUT DATM_INPUT RESTART history MOM6_OUTPUT
+mkdir INPUT RESTART
+
+mkdir -p $CICE_RESTART_DIR
+mkdir -p $MOM6_RESTART_DIR
+mkdir -p $CMEPS_RESTART_DIR
+
+mkdir -p $CICE_HISTORY_DIR
+mkdir -p $MOM6_OUTPUT_DIR
 
 # DATM fixed input
-ln -s  @[INPUTDATA_ROOT]/DATM_CDEPS/@[DATM_SRC]/@[mesh_file] DATM_INPUT
-ln -s  @[INPUTDATA_ROOT]/DATM_CDEPS/@[DATM_SRC]/201110/*201110*nc DATM_INPUT
+ln -s  @[INPUTDATA_ROOT]/DATM_CDEPS/@[DATM_SRC]/@[MESH_ATM] INPUT
+ln -s  @[INPUTDATA_ROOT]/DATM_CDEPS/@[DATM_SRC]/201110/*201110*nc INPUT
 
 # MOM6 fixed input
 ICERES="${OCNRES:0:1}.${OCNRES:1}"
@@ -28,15 +35,15 @@ if [ $WARM_START = .false. ]; then
  fi
 else
 # warm start
- cp ../${DEP_RUN}${RT_SUFFIX}/RESTART/20111001.120000.MOM.res.nc ./INPUT/MOM.res.nc
+ cp ../${DEP_RUN}${RT_SUFFIX}/${MOM6_RESTART_DIR}/20111001.120000.MOM.res.nc ./INPUT/MOM.res.nc
 
 # CMEPS restart and pointer files
  RFILE="DATM_${DATM_SRC}.cpl.r.2011-10-01-43200.nc"
- cp ../${DEP_RUN}${RT_SUFFIX}/RESTART/${RFILE} .
+ cp ../${DEP_RUN}${RT_SUFFIX}/${CMEPS_RESTART_DIR}/${RFILE} .
  ls -1 ${RFILE}>rpointer.cpl
 
 # CICE restart and pointer files
- cp ../${DEP_RUN}${RT_SUFFIX}/RESTART/iced.2011-10-01-43200.nc ./INPUT
+ cp ../${DEP_RUN}${RT_SUFFIX}/${CICE_RESTART_DIR}/iced.2011-10-01-43200.nc ./INPUT
  RFILE="iced.2011-10-01-43200.nc"
  ls -1 "./INPUT/"${RFILE}>ice.restart_file
 fi
diff --git a/tests/fv3_conf/cpld_datm_cdeps_gfs.IN b/tests/fv3_conf/cpld_datm_cdeps_gfs.IN
@@ -1,8 +1,15 @@
-mkdir INPUT DATM_INPUT RESTART history MOM6_OUTPUT
+mkdir INPUT RESTART
+
+mkdir -p $CICE_RESTART_DIR
+mkdir -p $MOM6_RESTART_DIR
+mkdir -p $CMEPS_RESTART_DIR
+
+mkdir -p $CICE_HISTORY_DIR
+mkdir -p $MOM6_OUTPUT_DIR
 
 # DATM fixed input
-ln -s  @[INPUTDATA_ROOT]/DATM_CDEPS/@[DATM_SRC]/@[mesh_file] DATM_INPUT
-ln -s  @[INPUTDATA_ROOT]/DATM_CDEPS/@[DATM_SRC]/202103/gfs.202103.nc DATM_INPUT/gfs.202103.nc
+ln -s  @[INPUTDATA_ROOT]/DATM_CDEPS/@[DATM_SRC]/@[MESH_ATM] INPUT
+ln -s  @[INPUTDATA_ROOT]/DATM_CDEPS/@[DATM_SRC]/202103/gfs.202103.nc INPUT/gfs.202103.nc
 
 # MOM6 fixed input
 ICERES="${OCNRES:0:1}.${OCNRES:1}"
@@ -25,15 +32,15 @@ if [ $WARM_START = .false. ]; then
  fi
 else
 # warm start
- cp ../${DEP_RUN}${RT_SUFFIX}/RESTART/MOM.res.2021-03-22-18*.nc ./INPUT/MOM.res.nc
+ cp ../${DEP_RUN}${RT_SUFFIX}/${MOM6_RESTART_DIR}/MOM.res.2021-03-22-18*.nc ./INPUT/MOM.res.nc
 
 # CMEPS restart and pointer files
  RFILE="DATM_${DATM_SRC}.cpl.r.2021-03-22-64800.nc.nc"
- cp ../${DEP_RUN}${RT_SUFFIX}/RESTART/${RFILE} .
+ cp ../${DEP_RUN}${RT_SUFFIX}/${CMEPS_RESTART_DIR}/${RFILE} .
  ls -1 ${RFILE}>rpointer.cpl
 
 # CICE restart and pointer files
- cp ../${DEP_RUN}${RT_SUFFIX}/RESTART/iced.2021-03-22-64800.nc ./INPUT
+ cp ../${DEP_RUN}${RT_SUFFIX}/${CICE_RESTART_DIR}/iced.2021-03-22-64800.nc ./INPUT
  RFILE="iced.2021-03-22-64800.nc"
  ls -1 "./INPUT/"${RFILE}>ice.restart_file
 fi
diff --git a/tests/fv3_conf/hafs_datm_cdeps_era5.IN b/tests/fv3_conf/hafs_datm_cdeps_era5.IN
@@ -1,5 +1,5 @@
-mkdir -p INPUT_DATM
+mkdir -p INPUT
 
-cd INPUT_DATM
+cd INPUT
 rsync -arv @[INPUTDATA_ROOT]/DATM_ERA5_input_data/. .
 cd -
diff --git a/tests/fv3_conf/hafs_docn_cdeps_mom6.IN b/tests/fv3_conf/hafs_docn_cdeps_mom6.IN
@@ -1,5 +1,5 @@
-mkdir -p INPUT_DOCN
+mkdir -p INPUT
 
-cd INPUT_DOCN
+cd INPUT
 rsync -arv @[INPUTDATA_ROOT]/DOCN_MOM6_input_data/. .
 cd -
diff --git a/tests/fv3_conf/hafs_docn_cdeps_oisst.IN b/tests/fv3_conf/hafs_docn_cdeps_oisst.IN
@@ -1,5 +1,5 @@
-mkdir -p INPUT_DOCN
+mkdir -p INPUT
 
-cd INPUT_DOCN
+cd INPUT
 rsync -arv @[INPUTDATA_ROOT]/DOCN_OISST_input_data/. .
 cd -
diff --git a/tests/fv3_conf/hafs_ww3_run.IN b/tests/fv3_conf/hafs_ww3_run.IN
@@ -2,7 +2,7 @@
 if [ ${CNTL_DIR} = "hafs_regional_atm_wav" ] || \
    [ ${CNTL_DIR} = "hafs_regional_atm_ocn_wav" ] || \
    [ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm_ocn_wav" ]; then
-  cp @[INPUTDATA_ROOT_WW3]/@[MODDEF_WAV] ./mod_def.ww3
+  cp @[INPUTDATA_ROOT_WW3]/@[WW3_MODDEF] ./mod_def.ww3
   cp @[INPUTDATA_ROOT_WW3]/@[MESH_WAV] ./mesh.hafs.nc
   if [ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm_ocn_wav" ]; then
     cp @[INPUTDATA_ROOT]/FV3_hafs_input_data/WW3_hafs_regional_input_data/wind.natl_6m_2020082512 ./wind.ww3

diff --git a/tests/fv3_conf/lnd_datm_cdeps_gswp.IN b/tests/fv3_conf/lnd_datm_cdeps_gswp.IN
@@ -1,6 +1,8 @@
-mkdir -p RESTART INPUT_DATM
+mkdir -p RESTART INPUT
 
-cd INPUT_DATM
+mkdir -p $CMEPS_RESTART_DIR
+
+cd INPUT
 rsync -arv @[INPUTDATA_ROOT]/DATM_GSWP3_input_data/. .
 cd -
 
@@ -12,7 +14,7 @@ if [ $WARM_START = .true. ]; then
 
   # CMEPS restart and pointer files
   RFILE1=ufs.cpld.cpl.r.${RESTART_FILE_SUFFIX_SECS}.nc
-  cp ../${DEP_RUN}${SUFFIX}/RESTART/${RFILE1} RESTART/.
+  cp ../${DEP_RUN}${SUFFIX}/${CMEPS_RESTART_DIR}/${RFILE1} RESTART/.
   ls -1 "RESTART/${RFILE1}">rpointer.cpl
 
   # CDEPS restart and pointer files

diff --git a/tests/opnReqTests/dbg.sh b/tests/opnReqTests/dbg.sh
@@ -38,8 +38,8 @@ elif [[ $application == 'cpld' ]]; then
                                    | sed -e "s/^ *//" -e "s/ *$//")
 elif [[ $application == 'atmw' ]]; then
   FHMAX=3
-  WW3RSTDTHR=3
-  DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
+  WW3_RSTDTHR=3
+  WW3_DT_2_RST="$(printf "%02d" $(( ${WW3_RSTDTHR}*3600 )))"
   DAYS=0.125
   NFHOUT_HF=1
   RESTART_INTERVAL=${FHMAX}
@@ -59,5 +59,5 @@ source $PATHRT/opnReqTests/wrt_env.sh
 
 cat <<EOF >>${RUNDIR_ROOT}/opnreq_test${RT_SUFFIX}.env
 export WLCLK=${WLCLK}
-export DT_2_RST=${DT_2_RST:-}
+export WW3_DT_2_RST=${WW3_DT_2_RST:-}
 EOF
diff --git a/tests/opnReqTests/dcp.sh b/tests/opnReqTests/dcp.sh
@@ -30,7 +30,7 @@ elif [[ $application == 'cpld' ]]; then
     JNPES=1
     OCN_tasks=10
     ICE_tasks=6
-    NPROC_ICE=$ICE_tasks
+    CICE_NPROC=$ICE_tasks
     TASKS=$((INPES*JNPES*NTILES + WRITE_GROUP*WRTTASK_PER_GROUP + OCN_tasks + ICE_tasks))
   else
     temp=$INPES

diff --git a/tests/opnReqTests/rst.sh b/tests/opnReqTests/rst.sh
@@ -25,20 +25,20 @@ elif [[ $application == 'regional' ]]; then
 elif [[ $application == 'cpld' ]]; then
   FHROT=$(( FHMAX/2 ))
 
-  CICERUNTYPE='continue'
+  CICE_RUNTYPE='continue'
   RUNTYPE='continue'
-  USE_RESTART_TIME='.true.'
+  CICE_USE_RESTART_TIME='.true.'
   MOM6_RESTART_SETTING="r"
   RESTART_N=$(( FHMAX - FHROT ))
   RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( SHOUR + FHROT  )))0000"
   RESTART_FILE_SUFFIX_SECS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%05d" $(( (SHOUR + FHROT)* 3600 )))"
   RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${FHROT}+${SHOUR} )))0000"
 elif [[ $application == 'atmw' ]]; then
   FHROT=$(( FHMAX/2 ))
-  WW3RSTDTHR=6
-  DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
+  WW3_RSTDTHR=6
+  WW3_DT_2_RST="$(printf "%02d" $(( ${WW3_RSTDTHR}*3600 )))"
   RUNTYPE='continue'
-  USE_RESTART_TIME='.true.'
+  CICE_USE_RESTART_TIME='.true.'
   RESTART_N=$(( FHMAX - FHROT ))
   RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( SHOUR + FHROT  )))0000"
   RESTART_FILE_SUFFIX_SECS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%05d" $(( (SHOUR + FHROT)* 3600 )))"
@@ -69,12 +69,12 @@ source $PATHRT/opnReqTests/wrt_env.sh
 
 cat <<EOF >>${RUNDIR_ROOT}/opnreq_test${RT_SUFFIX}.env
 export FHROT=${FHROT}
-export DT_2_RST=${DT_2_RST:-}
+export WW3_DT_2_RST=${WW3_DT_2_RST:-}
 export RESTART_FILE_PREFIX=${RESTART_FILE_PREFIX}
 export NSTF_NAME=${NSTF_NAME}
-export CICERUNTYPE=${CICERUNTYPE:-}
+export CICE_RUNTYPE=${CICE_RUNTYPE:-}
 export RUNTYPE=${RUNTYPE:-}
-export USE_RESTART_TIME=${USE_RESTART_TIME:-}
+export CICE_USE_RESTART_TIME=${CICE_USE_RESTART_TIME:-}
 export MOM6_RESTART_SETTING=${MOM6_RESTART_SETTING:-}
 export RESTART_N=${RESTART_N:-}
 export RESTART_FILE_SUFFIX_SECS=${RESTART_FILE_SUFFIX_SECS:-}

diff --git a/tests/opnReqTests/std.sh b/tests/opnReqTests/std.sh
@@ -26,7 +26,7 @@ elif [[ $application == 'cpld' ]]; then
     JNPES=2
     OCN_tasks=10
     ICE_tasks=6
-    NPROC_ICE=$ICE_tasks
+    CICE_NPROC=$ICE_tasks
     TASKS=$((INPES*JNPES*NTILES + WRITE_GROUP*WRTTASK_PER_GROUP + OCN_tasks + ICE_tasks))
     NODES=$(((TASKS+TPN-1)/TPN))
   fi

diff --git a/tests/opnReqTests/thr.sh b/tests/opnReqTests/thr.sh
@@ -23,15 +23,15 @@ elif [[ $application == 'cpld' ]]; then
       JNPES=4
       OCN_tasks=30
       ICE_tasks=12
-      NPROC_ICE=$ICE_tasks
+      CICE_NPROC=$ICE_tasks
       TASKS=$((INPES*JNPES*NTILES + WRITE_GROUP*WRTTASK_PER_GROUP + OCN_tasks + ICE_tasks))
       NODES=$(((TASKS+TPN-1)/TPN))
     elif [[ $TEST_NAME =~ 'cpld_control_c96_noaero_p8' ]]; then
       INPES=3
       JNPES=4
       OCN_tasks=30
       ICE_tasks=12
-      NPROC_ICE=$ICE_tasks
+      CICE_NPROC=$ICE_tasks
       TASKS=$((INPES*JNPES*NTILES + WRITE_GROUP*WRTTASK_PER_GROUP + OCN_tasks + ICE_tasks))
       NODES=$(((TASKS+TPN-1)/TPN))
     elif [[ $TEST_NAME =~ 'cpld_control_p8' ]] || [[ $TEST_NAME =~ 'cpld_control_ciceC_p8' ]] || [[ $TEST_NAME =~ 'cpld_control_gfsv17' ]]; then
@@ -40,7 +40,7 @@ elif [[ $application == 'cpld' ]]; then
       OCN_tasks=20
       ICE_tasks=10
       WAV_tasks=12
-      NPROC_ICE=$ICE_tasks
+      CICE_NPROC=$ICE_tasks
       TASKS=$((INPES*JNPES*NTILES + WRITE_GROUP*WRTTASK_PER_GROUP + OCN_tasks + ICE_tasks + WAV_tasks))
       NODES=$(((TASKS+TPN-1)/TPN))
     elif [[ $TEST_NAME == 'cpld_bmark_p8' ]]; then

diff --git a/tests/opnReqTests/wrt_env.sh b/tests/opnReqTests/wrt_env.sh
@@ -13,7 +13,7 @@ export ICE_tasks=${ICE_tasks:-}
 export WAV_tasks=${WAV_tasks:-}
 export WRITE_GROUP=${WRITE_GROUP:-}
 export WRTTASK_PER_GROUP=${WRTTASK_PER_GROUP:-}
-export NPROC_ICE=${NPROC_ICE:-}
+export CICE_NPROC=${CICE_NPROC:-}
 export THRD=${THRD:-}
 export TASKS=${TASKS:-}
 export TPN=${TPN:-}

diff --git a/tests/parm/MOM6_data_table.IN b/tests/parm/MOM6_data_table.IN
@@ -0,0 +1 @@
+"OCN", "runoff", "runoff", "./INPUT/@[MOM6_FRUNOFF]", "none" ,  1.0
diff --git a/tests/parm/MOM_input_template_025 → tests/parm/MOM_input_025.IN b/tests/parm/MOM_input_template_025 → tests/parm/MOM_input_025.IN
@@ -701,7 +701,7 @@ PRESSURE_DEPENDENT_FRAZIL = False !   [Boolean] default = False
 VAR_PEN_SW = True               !   [Boolean] default = False
                                 ! If true, use one of the CHL_A schemes specified by OPACITY_SCHEME to determine
                                 ! the e-folding depth of incoming short wave radiation.
-CHL_FILE = @[CHLCLIM]           !
+CHL_FILE = @[MOM6_CHLCLIM]           !
                                 ! CHL_FILE is the file containing chl_a concentrations in the variable CHL_A. It
                                 ! is used when VAR_PEN_SW and CHL_FROM_FILE are true.
 CHL_VARNAME = "chlor_a"         ! default = "CHL_A"

diff --git a/tests/parm/MOM_input_template_050 → tests/parm/MOM_input_050.IN b/tests/parm/MOM_input_template_050 → tests/parm/MOM_input_050.IN
@@ -731,7 +731,7 @@ PRESSURE_DEPENDENT_FRAZIL = False !   [Boolean] default = False
 VAR_PEN_SW = True               !   [Boolean] default = False
                                 ! If true, use one of the CHL_A schemes specified by OPACITY_SCHEME to determine
                                 ! the e-folding depth of incoming short wave radiation.
-CHL_FILE = @[CHLCLIM]           !
+CHL_FILE = @[MOM6_CHLCLIM]           !
                                 ! CHL_FILE is the file containing chl_a concentrations in the variable CHL_A. It
                                 ! is used when VAR_PEN_SW and CHL_FROM_FILE are true.
 CHL_VARNAME = "chlor_a"         ! default = "CHL_A"

diff --git a/tests/parm/MOM_input_template_100 → tests/parm/MOM_input_100.IN b/tests/parm/MOM_input_template_100 → tests/parm/MOM_input_100.IN
@@ -137,7 +137,7 @@ TOPO_CONFIG = "file"            !
                                 !     Phillips - ACC-like idealized topography used in the Phillips config.
                                 !     dense - Denmark Strait-like dense water formation and overflow.
                                 !     USER - call a user modified routine.
-TOPO_EDITS_FILE = "@[TOPOEDITS]" ! default = ""
+TOPO_EDITS_FILE = "@[MOM6_TOPOEDITS]" ! default = ""
                                 ! The file from which to read a list of i,j,z topography overrides.
 ALLOW_LANDMASK_CHANGES = @[MOM6_ALLOW_LANDMASK_CHANGES]   ! default = "False"
                                 ! If true, allow topography overrides to change ocean points to land
@@ -674,7 +674,7 @@ PRESSURE_DEPENDENT_FRAZIL = False !   [Boolean] default = False
 VAR_PEN_SW = True               !   [Boolean] default = False
                                 ! If true, use one of the CHL_A schemes specified by OPACITY_SCHEME to determine
                                 ! the e-folding depth of incoming short wave radiation.
-CHL_FILE = @[CHLCLIM]           !
+CHL_FILE = @[MOM6_CHLCLIM]           !
                                 ! CHL_FILE is the file containing chl_a concentrations in the variable CHL_A. It
                                 ! is used when VAR_PEN_SW and CHL_FROM_FILE are true.
 

diff --git a/tests/parm/MOM_input_template_500 → tests/parm/MOM_input_500.IN b/tests/parm/MOM_input_template_500 → tests/parm/MOM_input_500.IN
diff --git a/tests/parm/cpld_control.nml.IN b/tests/parm/cpld_control.nml.IN
@@ -392,9 +392,9 @@
 /
 
 &MOM_input_nml
-  output_directory = 'MOM6_OUTPUT/',
+  output_directory = '@[MOM6_OUTPUT_DIR]',
   input_filename = '@[MOM6_RESTART_SETTING]'
   restart_input_dir = 'INPUT/',
-  restart_output_dir = 'RESTART/',
+  restart_output_dir = '@[MOM6_RESTART_DIR]',
   parameter_filename = 'INPUT/MOM_input',
                        'INPUT/MOM_override'/
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		"OCN", "runoff", "runoff", "./INPUT/@[MOM6_FRUNOFF]", "none" , 1.0