From 5eb19e35ff307ef40430f165824b36845b686b55 Mon Sep 17 00:00:00 2001
From: "Kate.Zhang" <Kate.Zhang@noaa.gov>
Date: Tue, 7 May 2024 04:50:40 +0000
Subject: [PATCH] Fix some scripts of JGLOBAL_FORECAST, link_workflow.sh and
 forecast_predet.sh

---
 jobs/JGLOBAL_FORECAST  | 2 +-
 sorc/link_workflow.sh  | 2 +-
 ush/forecast_predet.sh | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/jobs/JGLOBAL_FORECAST b/jobs/JGLOBAL_FORECAST
index 6c4200dd6e..e42d1f32cc 100755
--- a/jobs/JGLOBAL_FORECAST
+++ b/jobs/JGLOBAL_FORECAST
@@ -99,6 +99,6 @@ fi
 # Remove the Temporary working directory
 ##########################################
 cd "${DATAROOT}" || true
-[[ "${KEEPDATA}" == "NO" ]] && rm -rf "${DATA} ${DATArestart}"  # do not remove DATAjob. It contains DATAoutput
+[[ "${KEEPDATA}" == "NO" ]] && rm -rf ${DATA} ${DATArestart}  # do not remove DATAjob. It contains DATAoutput
 
 exit 0
diff --git a/sorc/link_workflow.sh b/sorc/link_workflow.sh
index cd11f8cd60..f5553e36d8 100755
--- a/sorc/link_workflow.sh
+++ b/sorc/link_workflow.sh
@@ -149,7 +149,7 @@ for file in postxconfig-NT-GEFS-F00.txt postxconfig-NT-GEFS.txt postxconfig-NT-G
     postxconfig-NT-GFS.txt postxconfig-NT-GFS-FLUX.txt postxconfig-NT-GFS-GOES.txt \
     postxconfig-NT-GFS-F00-TWO.txt postxconfig-NT-GFS-TWO.txt \
     params_grib2_tbl_new post_tag_gfs128 post_tag_gfs65 post_tag_gfs128_catchem \
-    post_tag_gfs65 nam_micro_lookup.dat
+    post_tag_gfs65_catchem nam_micro_lookup.dat
 do
   ${LINK_OR_COPY} "${HOMEgfs}/sorc/upp.fd/parm/${file}" .
 done
diff --git a/ush/forecast_predet.sh b/ush/forecast_predet.sh
index 071bf600e3..7c9c76bcd7 100755
--- a/ush/forecast_predet.sh
+++ b/ush/forecast_predet.sh
@@ -463,10 +463,13 @@ FV3_predet(){
   # Inline UPP fix files
   if [[ "${WRITE_DOPOST:-}" == ".true." ]]; then
     ${NCP} "${PARMgfs}/post/post_tag_gfs${LEVS}"                              "${DATA}/itag"
-    # ${NLN} "${FLTFILEGFS:-${PARMgfs}/post/postxconfig-NT-GFS-TWO.txt}"           "${DATA}/postxconfig-NT.txt"
+    ${NLN} "${FLTFILEGFS:-${PARMgfs}/post/postxconfig-NT-GFS-TWO.txt}"           "${DATA}/postxconfig-NT.txt"
+    ${NLN} "${FLTFILEGFSF00:-${PARMgfs}/post/postxconfig-NT-GFS-F00-TWO.txt}"    "${DATA}/postxconfig-NT_FH00.txt"
+    if [[ $cplchp = .true. ]]; then
+    ${NLN} "${PARMgfs}/post/post_tag_gfs${LEVS}_catchem"             "${DATA}/itag"
     ${NLN} "${FLTFILEGFS:-${PARMgfs}/post/postxconfig-NT-CCPP-CHEM.txt}"         "${DATA}/postxconfig-NT.txt"
-    # ${NLN} "${FLTFILEGFSF00:-${PARMgfs}/post/postxconfig-NT-GFS-F00-TWO.txt}"    "${DATA}/postxconfig-NT_FH00.txt"
     ${NLN} "${FLTFILEGFSF00:-${PARMgfs}/post/postxconfig-NT-CCPP-CHEM.txt}"      "${DATA}/postxconfig-NT_FH00.txt"
+    fi
     ${NCP} "${POSTGRB2TBL:-${PARMgfs}/post/params_grib2_tbl_new}"             "${DATA}/params_grib2_tbl_new"
     ${NCP} ${PARMgfs}/post/optics_luts_*.dat ${DATA}/
   fi