Move UFS parm directories into parm/ufs/

parm/config/gefs/config.fcst

@@ -188,17 +188,17 @@ export random_clds=".true."
 case ${imp_physics} in
     99) # ZhaoCarr
         export ncld=1
-        export FIELD_TABLE="${HOMEgfs}/parm/parm_fv3diag/field_table_zhaocarr${tbf}${tbp}"
+        export FIELD_TABLE="${HOMEgfs}/parm/ufs/fv3/field_table_zhaocarr${tbf}${tbp}"
         export nwat=2
         ;;
     6)  # WSM6
         export ncld=2
-        export FIELD_TABLE="${HOMEgfs}/parm/parm_fv3diag/field_table_wsm6${tbf}${tbp}"
+        export FIELD_TABLE="${HOMEgfs}/parm/ufs/fv3/field_table_wsm6${tbf}${tbp}"
         export nwat=6
         ;;
     8)  # Thompson
         export ncld=2
-        export FIELD_TABLE="${HOMEgfs}/parm/parm_fv3diag/field_table_thompson_noaero_tke${tbp}"
+        export FIELD_TABLE="${HOMEgfs}/parm/ufs/fv3/field_table_thompson_noaero_tke${tbp}"
         export nwat=6
 
         export cal_pre=".false."
@@ -221,7 +221,7 @@ case ${imp_physics} in
         ;;
     11) # GFDL
         export ncld=5
-        export FIELD_TABLE="${HOMEgfs}/parm/parm_fv3diag/field_table_gfdl${tbf}${tbp}"
+        export FIELD_TABLE="${HOMEgfs}/parm/ufs/fv3/field_table_gfdl${tbf}${tbp}"
         export nwat=6
         export dnats=1
         export cal_pre=".false."
@@ -278,7 +278,7 @@ export deflate_level=1
 export USE_COUPLER_RES="NO"
 
 # Write more variables to output
-export DIAG_TABLE="${HOMEgfs}/parm/parm_fv3diag/diag_table"
+export DIAG_TABLE="${HOMEgfs}/parm/ufs/fv3/diag_table"
 
 # Write gfs restart files to rerun fcst from any break point
 export restart_interval=${restart_interval_gfs:-12}
@@ -299,11 +299,11 @@ else
 fi
 
 if [[ "${DO_AERO}" = "YES" ]]; then # temporary settings for aerosol coupling
-    export AERO_DIAG_TABLE="${AERO_DIAG_TABLE:-${HOMEgfs}/parm/parm_fv3diag/diag_table.aero}"
-    export AERO_FIELD_TABLE="${AERO_FIELD_TABLE:-${HOMEgfs}/parm/parm_fv3diag/field_table.aero}"
+    export AERO_DIAG_TABLE="${AERO_DIAG_TABLE:-${HOMEgfs}/parm/ufs/fv3/diag_table.aero}"
+    export AERO_FIELD_TABLE="${AERO_FIELD_TABLE:-${HOMEgfs}/parm/ufs/fv3/field_table.aero}"
     AERO_EMIS_FIRE="${AERO_EMIS_FIRE:-none}"
     export AERO_EMIS_FIRE=${AERO_EMIS_FIRE,,}
-    export AERO_CONFIG_DIR="${AERO_CONFIG_DIR:-${HOMEgfs}/parm/chem}"
+    export AERO_CONFIG_DIR="${AERO_CONFIG_DIR:-${HOMEgfs}/parm/ufs/chem}"
     export AERO_INPUTS_DIR="${AERO_INPUTS_DIR:-}"
     export fscav_aero="${aero_conv_scav_factors:-${fscav_aero}}"
     export dnats_aero="${aero_diag_tracers:-0}"

parm/config/gfs/config.aero

@@ -5,8 +5,8 @@
 # Turn off warnings about unused variables
 # shellcheck disable=SC2034
 
-# Directory containing GOCART configuration files. Defaults to parm/chem if unset.
-AERO_CONFIG_DIR=${HOMEgfs}/parm/chem
+# Directory containing GOCART configuration files. Defaults to parm/ufs/chem if unset.
+AERO_CONFIG_DIR=${HOMEgfs}/parm/ufs/chem
 
 # Path to the input data tree
 case ${machine} in

parm/config/gfs/config.efcs

@@ -72,9 +72,9 @@ export SPPT_LOGIT=".true."
 export SPPT_SFCLIMIT=".true."
 
 if [[ "${QUILTING}" = ".true." ]] && [[ "${OUTPUT_GRID}" = "gaussian_grid" ]]; then
-    export DIAG_TABLE="${HOMEgfs}/parm/parm_fv3diag/diag_table_da"
+    export DIAG_TABLE="${HOMEgfs}/parm/ufs/fv3/diag_table_da"
 else
-    export DIAG_TABLE="${HOMEgfs}/parm/parm_fv3diag/diag_table_da_orig"
+    export DIAG_TABLE="${HOMEgfs}/parm/ufs/fv3/diag_table_da_orig"
 fi
 
 # For IAU, write restarts at beginning of window also

parm/config/gfs/config.fcst

@@ -188,17 +188,17 @@ export random_clds=".true."
 case ${imp_physics} in
     99) # ZhaoCarr
         export ncld=1
-        export FIELD_TABLE="${HOMEgfs}/parm/parm_fv3diag/field_table_zhaocarr${tbf}${tbp}"
+        export FIELD_TABLE="${HOMEgfs}/parm/ufs/fv3/field_table_zhaocarr${tbf}${tbp}"
         export nwat=2
         ;;
     6)  # WSM6
         export ncld=2
-        export FIELD_TABLE="${HOMEgfs}/parm/parm_fv3diag/field_table_wsm6${tbf}${tbp}"
+        export FIELD_TABLE="${HOMEgfs}/parm/ufs/fv3/field_table_wsm6${tbf}${tbp}"
         export nwat=6
         ;;
     8)  # Thompson
         export ncld=2
-        export FIELD_TABLE="${HOMEgfs}/parm/parm_fv3diag/field_table_thompson_noaero_tke${tbp}"
+        export FIELD_TABLE="${HOMEgfs}/parm/ufs/fv3/field_table_thompson_noaero_tke${tbp}"
         export nwat=6
 
         export cal_pre=".false."
@@ -221,7 +221,7 @@ case ${imp_physics} in
         ;;
     11) # GFDL
         export ncld=5
-        export FIELD_TABLE="${HOMEgfs}/parm/parm_fv3diag/field_table_gfdl${tbf}${tbp}"
+        export FIELD_TABLE="${HOMEgfs}/parm/ufs/fv3/field_table_gfdl${tbf}${tbp}"
         export nwat=6
         export dnats=1
         export cal_pre=".false."
@@ -280,7 +280,7 @@ export USE_COUPLER_RES="NO"
 if [[ "${CDUMP}" =~ "gdas" ]] ; then # GDAS cycle specific parameters
 
     # Variables used in DA cycling
-    export DIAG_TABLE="${HOMEgfs}/parm/parm_fv3diag/diag_table_da"
+    export DIAG_TABLE="${HOMEgfs}/parm/ufs/fv3/diag_table_da"
 
 
     if [[ "${DOIAU}" == "YES" ]]; then
@@ -298,7 +298,7 @@ if [[ "${CDUMP}" =~ "gdas" ]] ; then # GDAS cycle specific parameters
 elif [[ "${CDUMP}" =~ "gfs" ]] ; then # GFS cycle specific parameters
 
     # Write more variables to output
-    export DIAG_TABLE="${HOMEgfs}/parm/parm_fv3diag/diag_table"
+    export DIAG_TABLE="${HOMEgfs}/parm/ufs/fv3/diag_table"
 
     # Write gfs restart files to rerun fcst from any break point
     export restart_interval=${restart_interval_gfs:-12}
@@ -321,11 +321,11 @@ elif [[ "${CDUMP}" =~ "gfs" ]] ; then # GFS cycle specific parameters
 fi
 
 if [[ "${DO_AERO}" = "YES" ]]; then # temporary settings for aerosol coupling
-    export AERO_DIAG_TABLE="${AERO_DIAG_TABLE:-${HOMEgfs}/parm/parm_fv3diag/diag_table.aero}"
-    export AERO_FIELD_TABLE="${AERO_FIELD_TABLE:-${HOMEgfs}/parm/parm_fv3diag/field_table.aero}"
+    export AERO_DIAG_TABLE="${AERO_DIAG_TABLE:-${HOMEgfs}/parm/ufs/fv3/diag_table.aero}"
+    export AERO_FIELD_TABLE="${AERO_FIELD_TABLE:-${HOMEgfs}/parm/ufs/fv3/field_table.aero}"
     AERO_EMIS_FIRE="${AERO_EMIS_FIRE:-none}"
     export AERO_EMIS_FIRE=${AERO_EMIS_FIRE,,}
-    export AERO_CONFIG_DIR="${AERO_CONFIG_DIR:-${HOMEgfs}/parm/chem}"
+    export AERO_CONFIG_DIR="${AERO_CONFIG_DIR:-${HOMEgfs}/parm/ufs/chem}"
     export AERO_INPUTS_DIR="${AERO_INPUTS_DIR:-}"
     export fscav_aero="${aero_conv_scav_factors:-${fscav_aero}}"
     export dnats_aero="${aero_diag_tracers:-0}"

ush/forecast_predet.sh

@@ -61,7 +61,6 @@ common_predet(){
   FIX_DIR=${FIX_DIR:-${HOMEgfs}/fix}
 
   # Model specific stuff
-  PARM_FV3DIAG=${PARM_FV3DIAG:-${HOMEgfs}/parm/parm_fv3diag}
   PARM_POST=${PARM_POST:-${HOMEgfs}/parm/post}
 
   # Define significant cycles

ush/parsing_namelists_FV3.sh

@@ -12,10 +12,10 @@
 FV3_namelists(){
 
 # setup the tables
-DIAG_TABLE=${DIAG_TABLE:-${PARM_FV3DIAG}/diag_table}
-DIAG_TABLE_APPEND=${DIAG_TABLE_APPEND:-${PARM_FV3DIAG}/diag_table_aod}
-DATA_TABLE=${DATA_TABLE:-${PARM_FV3DIAG}/data_table}
-FIELD_TABLE=${FIELD_TABLE:-${PARM_FV3DIAG}/field_table}
+DIAG_TABLE=${DIAG_TABLE:-${HOMEgfs}/parm/ufs/fv3/diag_table}
+DIAG_TABLE_APPEND=${DIAG_TABLE_APPEND:-${HOMEgfs}/parm/ufs/fv3/diag_table_aod}
+DATA_TABLE=${DATA_TABLE:-${HOMEgfs}/parm/ufs/fv3/data_table}
+FIELD_TABLE=${FIELD_TABLE:-${HOMEgfs}/parm/ufs/fv3/field_table}
 
 # ensure non-prognostic tracers are set
 dnats=${dnats:-0}

ush/parsing_namelists_MOM6.sh

@@ -62,7 +62,7 @@ echo "$(cat input.nml)"
 
 
 #Copy MOM_input and edit:
-${NCP} -pf "${HOMEgfs}/parm/mom6/MOM_input_template_${OCNRES}" "${DATA}/INPUT/"
+${NCP} -pf "${HOMEgfs}/parm/ufs/mom6/MOM_input_template_${OCNRES}" "${DATA}/INPUT/"
 sed -e "s/@\[DT_THERM_MOM6\]/${DT_THERM_MOM6}/g" \
     -e "s/@\[DT_DYNAM_MOM6\]/${DT_DYNAM_MOM6}/g" \
     -e "s/@\[MOM6_RIVER_RUNOFF\]/${MOM6_RIVER_RUNOFF}/g" \
@@ -80,7 +80,7 @@ sed -e "s/@\[DT_THERM_MOM6\]/${DT_THERM_MOM6}/g" \
 rm "${DATA}/INPUT/MOM_input_template_${OCNRES}"
 
 #data table for runoff:
-DATA_TABLE=${DATA_TABLE:-${PARM_FV3DIAG}/data_table}
+DATA_TABLE=${DATA_TABLE:-${HOMEgfs}/parm/ufs/fv3/data_table}
 ${NCP} "${DATA_TABLE}" "${DATA}/data_table_template"
 sed -e "s/@\[FRUNOFF\]/${FRUNOFF}/g" "${DATA}/data_table_template" > "${DATA}/data_table"
 rm "${DATA}/data_table_template"