Modify fix file paths for global cycle frac grid

Global_cycle is being updated to work with fractional grid. The fix files for the surface updates need to be consistently updated to point to the correct versions. Additionally, the hack to bypass global_cycle is commented out. Issue NOAA-EMC#1775
CatherineThomas-NOAA · Oct 17, 2023 · 7ed8d0e · 7ed8d0e
1 parent 3de102c
commit 7ed8d0e
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/scripts/exgdas_enkf_sfc.sh b/scripts/exgdas_enkf_sfc.sh
@@ -152,8 +152,8 @@ if [ $DOIAU = "YES" ]; then
                 "${DATA}/fnbgsi.${cmem}"
             ${NLN} "${COM_ATMOS_RESTART_MEM}/${bPDY}.${bcyc}0000.sfcanl_data.tile${n}.nc" \
                 "${DATA}/fnbgso.${cmem}"
-            ${NLN} "${FIXfv3}/${CASE}/${CASE}_grid.tile${n}.nc"     "${DATA}/fngrid.${cmem}"
-            ${NLN} "${FIXfv3}/${CASE}/${CASE}_oro_data.tile${n}.nc" "${DATA}/fnorog.${cmem}"
+            ${NLN} "${FIXfv3}/${CASE}.mx${OCNRES}_frac/${CASE}_grid.tile${n}.nc"     "${DATA}/fngrid.${cmem}"
+            ${NLN} "${FIXfv3}/${CASE}.mx${OCNRES}_frac/${CASE}.mx${OCNRES}_oro_data.tile${n}.nc" "${DATA}/fnorog.${cmem}"
 
         done
 
@@ -188,8 +188,8 @@ if [ $DOSFCANL_ENKF = "YES" ]; then
                 "${DATA}/fnbgsi.${cmem}"
             ${NLN} "${COM_ATMOS_RESTART_MEM}/${PDY}.${cyc}0000.sfcanl_data.tile${n}.nc" \
                 "${DATA}/fnbgso.${cmem}"
-            ${NLN} "${FIXfv3}/${CASE}/${CASE}_grid.tile${n}.nc"      "${DATA}/fngrid.${cmem}"
-            ${NLN} "${FIXfv3}/${CASE}/${CASE}_oro_data.tile${n}.nc" "${DATA}/fnorog.${cmem}"
+            ${NLN} "${FIXfv3}/${CASE}.mx${OCNRES}_frac/${CASE}_grid.tile${n}.nc"      "${DATA}/fngrid.${cmem}"
+            ${NLN} "${FIXfv3}/${CASE}.mx${OCNRES}_frac/${CASE}.mx${OCNRES}_oro_data.tile${n}.nc" "${DATA}/fnorog.${cmem}"
 
         done
 

diff --git a/scripts/exglobal_atmos_sfcanl.sh b/scripts/exglobal_atmos_sfcanl.sh
@@ -176,8 +176,8 @@ if [[ ${DOIAU} = "YES" ]]; then
                 "${COM_ATMOS_RESTART}/${bPDY}.${bcyc}0000.sfcanl_data.tile${n}.nc"
         ${NLN} "${COM_ATMOS_RESTART_PREV}/${bPDY}.${bcyc}0000.sfc_data.tile${n}.nc" "${DATA}/fnbgsi.00${n}"
         ${NLN} "${COM_ATMOS_RESTART}/${bPDY}.${bcyc}0000.sfcanl_data.tile${n}.nc"   "${DATA}/fnbgso.00${n}"
-        ${NLN} "${FIXfv3}/${CASE}/${CASE}_grid.tile${n}.nc"                         "${DATA}/fngrid.00${n}"
-        ${NLN} "${FIXfv3}/${CASE}/${CASE}_oro_data.tile${n}.nc"                     "${DATA}/fnorog.00${n}"
+        ${NLN} "${FIXfv3}/${CASE}.mx${OCNRES}_frac/${CASE}_grid.tile${n}.nc"                         "${DATA}/fngrid.00${n}"
+        ${NLN} "${FIXfv3}/${CASE}.mx${OCNRES}_frac/${CASE}.mx${OCNRES}_oro_data.tile${n}.nc"                     "${DATA}/fnorog.00${n}"
     done
 
     export APRUNCY=${APRUN_CYCLE}
@@ -199,8 +199,8 @@ for n in $(seq 1 ${ntiles}); do
     fi
     ${NLN} "${COM_ATMOS_RESTART_PREV}/${PDY}.${cyc}0000.sfc_data.tile${n}.nc" "${DATA}/fnbgsi.00${n}"
     ${NLN} "${COM_ATMOS_RESTART}/${PDY}.${cyc}0000.sfcanl_data.tile${n}.nc"   "${DATA}/fnbgso.00${n}"
-    ${NLN} "${FIXfv3}/${CASE}/${CASE}_grid.tile${n}.nc"                       "${DATA}/fngrid.00${n}"
-    ${NLN} "${FIXfv3}/${CASE}/${CASE}_oro_data.tile${n}.nc"                   "${DATA}/fnorog.00${n}"
+    ${NLN} "${FIXfv3}/${CASE}.mx${OCNRES}_frac/${CASE}_grid.tile${n}.nc"                       "${DATA}/fngrid.00${n}"
+    ${NLN} "${FIXfv3}/${CASE}.mx${OCNRES}_frac/${CASE}.mx${OCNRES}_oro_data.tile${n}.nc"                   "${DATA}/fnorog.00${n}"
 done
 
 export APRUNCY=${APRUN_CYCLE}

diff --git a/scripts/exglobal_forecast.sh b/scripts/exglobal_forecast.sh
@@ -38,9 +38,9 @@
 ##	Restart files:
 ##
 ##	Fix files:
-##		1. computing grid, $FIXfv3/$CASE/${CASE}_grid.tile${n}.nc
-##		2. orography data, $FIXfv3/$CASE/${CASE}_oro_data.tile${n}.nc
-##		3. mosaic data, $FIXfv3/$CASE/${CASE}_mosaic.nc
+##		1. computing grid, $FIXfv3/$CASE.mx${OCNRES}_frac/${CASE}_grid.tile${n}.nc
+##		2. orography data, $FIXfv3/$CASE.mx${OCNRES}_frac/${CASE}.mx${OCNRES}_oro_data.tile${n}.nc
+##		3. mosaic data, $FIXfv3/$CASE.mx${OCNRES}_frac/${CASE}_mosaic.nc
 ##		4. Global O3 data, $FIX_AM/${O3FORC}
 ##		5. Global H2O data, $FIX_AM/${H2OFORC}
 ##		6. Global solar constant data, $FIX_AM/global_solarconstant_noaa_an.txt

diff --git a/ush/forecast_postdet.sh b/ush/forecast_postdet.sh
@@ -33,7 +33,7 @@ FV3_postdet(){
       done
 
       # Replace sfc_data with sfcanl_data restart files from current cycle (if found)
-      if [[ "${MODE}" = "cycled" ]] && [[ "${CCPP_SUITE}" = "FV3_GFS_v16" ]]; then  # TODO: remove if statement when global_cycle can handle NOAHMP
+#      if [[ "${MODE}" = "cycled" ]] && [[ "${CCPP_SUITE}" = "FV3_GFS_v16" ]]; then  # TODO: remove if statement when global_cycle can handle NOAHMP
         for file in "${COM_ATMOS_RESTART}/${sPDY}.${scyc}0000."*.nc; do
           file2=$(basename "${file}")
           file2=$(echo "${file2}" | cut -d. -f3-) # remove the date from file
@@ -42,7 +42,7 @@ FV3_postdet(){
           rm -f "${DATA}/INPUT/${file2}"
           ${NLN} "${file}" "${DATA}/INPUT/${file2}"
         done
-      fi
+#      fi
 
       # Need a coupler.res when doing IAU
       if [[ ${DOIAU} = "YES" ]]; then
@@ -134,9 +134,9 @@ EOF
   # Grid and orography data
 
   if [[ ${cplflx} = ".false." ]] ; then
-    ${NLN} "${FIX_DIR}/orog/${CASE}/${CASE}_mosaic.nc" "${DATA}/INPUT/grid_spec.nc"
+    ${NLN} "${FIX_DIR}/orog/${CASE}.mx${OCNRES}_frac/${CASE}_mosaic.nc" "${DATA}/INPUT/grid_spec.nc"
   else
-    ${NLN} "${FIX_DIR}/orog/${CASE}/${CASE}_mosaic.nc" "${DATA}/INPUT/${CASE}_mosaic.nc"
+    ${NLN} "${FIX_DIR}/orog/${CASE}.mx${OCNRES}_frac/${CASE}_mosaic.nc" "${DATA}/INPUT/${CASE}_mosaic.nc"
   fi
 
   OROFIX=${OROFIX:-"${FIX_DIR}/orog/${CASE}.mx${OCNRES}_frac"}

diff --git a/ush/gaussian_sfcanl.sh b/ush/gaussian_sfcanl.sh
@@ -83,7 +83,7 @@
 #
 #     programs   : $GAUSFCANLEXE
 #
-#     fixed data : $FIXfv3/${CASE}/${CASE}_oro_data.tile*.nc
+#     fixed data : $FIXfv3/${CASE}.mx${OCNRES}_frac/${CASE}.mx${OCNRES}_oro_data.tile*.nc
 #                  $FIXWGTS
 #                  $FIXam/global_hyblev.l65.txt
 #
@@ -187,12 +187,12 @@ ${NLN} "${COM_ATMOS_RESTART}/${PDY}.${cyc}0000.sfcanl_data.tile5.nc" "./anal.til
 ${NLN} "${COM_ATMOS_RESTART}/${PDY}.${cyc}0000.sfcanl_data.tile6.nc" "./anal.tile6.nc"
 
 # input orography tiles
-$NLN $FIXfv3/$CASE/${CASE}_oro_data.tile1.nc   ./orog.tile1.nc
-$NLN $FIXfv3/$CASE/${CASE}_oro_data.tile2.nc   ./orog.tile2.nc
-$NLN $FIXfv3/$CASE/${CASE}_oro_data.tile3.nc   ./orog.tile3.nc
-$NLN $FIXfv3/$CASE/${CASE}_oro_data.tile4.nc   ./orog.tile4.nc
-$NLN $FIXfv3/$CASE/${CASE}_oro_data.tile5.nc   ./orog.tile5.nc
-$NLN $FIXfv3/$CASE/${CASE}_oro_data.tile6.nc   ./orog.tile6.nc
+$NLN $FIXfv3/$CASE.mx${OCNRES}_frac/${CASE}.mx${OCNRES}_oro_data.tile1.nc   ./orog.tile1.nc
+$NLN $FIXfv3/$CASE.mx${OCNRES}_frac/${CASE}.mx${OCNRES}_oro_data.tile2.nc   ./orog.tile2.nc
+$NLN $FIXfv3/$CASE.mx${OCNRES}_frac/${CASE}.mx${OCNRES}_oro_data.tile3.nc   ./orog.tile3.nc
+$NLN $FIXfv3/$CASE.mx${OCNRES}_frac/${CASE}.mx${OCNRES}_oro_data.tile4.nc   ./orog.tile4.nc
+$NLN $FIXfv3/$CASE.mx${OCNRES}_frac/${CASE}.mx${OCNRES}_oro_data.tile5.nc   ./orog.tile5.nc
+$NLN $FIXfv3/$CASE.mx${OCNRES}_frac/${CASE}.mx${OCNRES}_oro_data.tile6.nc   ./orog.tile6.nc
 
 $NLN $SIGLEVEL                                 ./vcoord.txt