From 2cd6a589305a9ac9d3a9a0d2136e66e42f09d3bf Mon Sep 17 00:00:00 2001
From: "Henry R. Winterbottom"
 <49202169+HenryWinterbottom-NOAA@users.noreply.github.com>
Date: Tue, 14 Nov 2023 12:05:20 -0700
Subject: [PATCH] Moves UFS WM configuration files to `COM_CONF` (#2054)

The UFS weather-model (WM) files are place in the COM_CONF path rather than the respective component model COM history paths.
Resolves #2015
---
 jobs/JGLOBAL_FORECAST       | 2 +-
 scripts/exgdas_enkf_fcst.sh | 2 +-
 ush/forecast_postdet.sh     | 9 ++++++---
 ush/forecast_predet.sh      | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/jobs/JGLOBAL_FORECAST b/jobs/JGLOBAL_FORECAST
index e42c81eaa4..b2825af54f 100755
--- a/jobs/JGLOBAL_FORECAST
+++ b/jobs/JGLOBAL_FORECAST
@@ -46,7 +46,7 @@ declare -rx gcyc="${GDATE:8:2}"
 
 # Construct COM variables from templates (see config.com)
 YMD=${PDY} HH=${cyc} generate_com -rx COM_ATMOS_RESTART COM_ATMOS_INPUT COM_ATMOS_ANALYSIS \
-  COM_ATMOS_HISTORY COM_ATMOS_MASTER COM_TOP
+  COM_ATMOS_HISTORY COM_ATMOS_MASTER COM_TOP COM_CONF
 
 RUN=${rCDUMP} YMD="${gPDY}" HH="${gcyc}" generate_com -rx \
   COM_ATMOS_RESTART_PREV:COM_ATMOS_RESTART_TMPL
diff --git a/scripts/exgdas_enkf_fcst.sh b/scripts/exgdas_enkf_fcst.sh
index 7eb2a3a711..fd6136ddd2 100755
--- a/scripts/exgdas_enkf_fcst.sh
+++ b/scripts/exgdas_enkf_fcst.sh
@@ -131,7 +131,7 @@ for imem in $(seq "${ENSBEG}" "${ENSEND}"); do
    # Construct COM variables from templates (see config.com)
    # Can't make these read-only because we are looping over members
    MEMDIR="${memchar}" YMD=${PDY} HH=${cyc} generate_com -x COM_ATMOS_RESTART COM_ATMOS_INPUT COM_ATMOS_ANALYSIS \
-     COM_ATMOS_HISTORY COM_ATMOS_MASTER
+     COM_ATMOS_HISTORY COM_ATMOS_MASTER COM_CONF
 
    MEMDIR="${memchar}" YMD="${gPDY}" HH="${gcyc}" generate_com -x COM_ATMOS_RESTART_PREV:COM_ATMOS_RESTART_TMPL
 
diff --git a/ush/forecast_postdet.sh b/ush/forecast_postdet.sh
index bafa61dd0e..ac59fcacac 100755
--- a/ush/forecast_postdet.sh
+++ b/ush/forecast_postdet.sh
@@ -514,7 +514,10 @@ FV3_out() {
     done
   else
     # No need to copy FV3 restart files when RUN=gfs or gefs
-    ${NCP} "${DATA}/input.nml" "${COM_ATMOS_HISTORY}/input.nml"
+    ${NCP} "${DATA}/input.nml" "${COM_CONF}/ufs.input.nml"
+    ${NCP} "${DATA}/model_configure" "${COM_CONF}/ufs.model_configure"
+    ${NCP} "${DATA}/nems.configure" "${COM_CONF}/ufs.nems.configure"
+    ${NCP} "${DATA}/diag_table" "${COM_CONF}/ufs.diag_table"  
   fi
   echo "SUB ${FUNCNAME[0]}: Output data for FV3 copied"
 }
@@ -853,7 +856,7 @@ MOM6_out() {
 
   # Copy MOM_input from DATA to COM_OCEAN_INPUT after the forecast is run (and successfull)
   if [[ ! -d ${COM_OCEAN_INPUT} ]]; then mkdir -p "${COM_OCEAN_INPUT}"; fi
-  ${NCP} "${DATA}/INPUT/MOM_input" "${COM_OCEAN_INPUT}/"
+  ${NCP} "${DATA}/INPUT/MOM_input" "${COM_CONF}/ufs.MOM_input"
 
   # TODO: mediator should have its own CMEPS_out() function
   # Copy mediator restarts from DATA to COM
@@ -991,7 +994,7 @@ CICE_out() {
 
   # Copy ice_in namelist from DATA to COMOUTice after the forecast is run (and successfull)
   if [[ ! -d "${COM_ICE_INPUT}" ]]; then mkdir -p "${COM_ICE_INPUT}"; fi
-  ${NCP} "${DATA}/ice_in" "${COM_ICE_INPUT}/ice_in"
+  ${NCP} "${DATA}/ice_in" "${COM_CONF}/ufs.ice_in"
 }
 
 GOCART_rc() {
diff --git a/ush/forecast_predet.sh b/ush/forecast_predet.sh
index ce0b50f818..84d377019a 100755
--- a/ush/forecast_predet.sh
+++ b/ush/forecast_predet.sh
@@ -88,7 +88,7 @@ common_predet(){
     tcyc=${scyc}
   fi
 
-
+  mkdir -p "${COM_CONF}"
   cd "${DATA}" || ( echo "FATAL ERROR: Unable to 'cd ${DATA}', ABORT!"; exit 8 )
 }