From dbaf883ef474fb1c75ce25328d9e7f84cd30c35a Mon Sep 17 00:00:00 2001 From: "Chunxi.Zhang-NOAA" Date: Tue, 13 Dec 2022 15:55:31 -0600 Subject: [PATCH 1/6] Issue#863 use fracoro data for all new UFS applications and for both frac_grid = .T. and .F. --- parm/config/config.init | 2 +- ush/forecast_postdet.sh | 24 ++++++------------------ 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/parm/config/config.init b/parm/config/config.init index 2301b1cdc1f..d83bb5ecfe3 100755 --- a/parm/config/config.init +++ b/parm/config/config.init @@ -17,7 +17,7 @@ export GDASINIT_DIR=${UFS_DIR}/util/gdas_init export CRES_HIRES=$CASE export CRES_ENKF=$CASE_ENKF -export RUNICSH=${GDASINIT_DIR}/run_v16.chgres.sh +export RUNICSH=${GDASINIT_DIR}/run_v17.chgres.sh if [ "${RETRO:-"NO"}" = "YES" ] || [ "$CDUMP" = "gdas" ]; then export RUNICSH=${GDASINIT_DIR}/run_v16retro.chgres.sh fi diff --git a/ush/forecast_postdet.sh b/ush/forecast_postdet.sh index e74fcac105e..a3c40309170 100755 --- a/ush/forecast_postdet.sh +++ b/ush/forecast_postdet.sh @@ -164,10 +164,6 @@ EOF #-------------------------------------------------------------------------- # Grid and orography data - for n in $(seq 1 $ntiles); do - $NLN $FIXfv3/$CASE/${CASE}_grid.tile${n}.nc $DATA/INPUT/${CASE}_grid.tile${n}.nc - $NLN $FIXfv3/$CASE/${CASE}_oro_data.tile${n}.nc $DATA/INPUT/oro_data.tile${n}.nc - done if [ $cplflx = ".false." ] ; then $NLN $FIXfv3/$CASE/${CASE}_mosaic.nc $DATA/INPUT/grid_spec.nc @@ -175,20 +171,12 @@ EOF $NLN $FIXfv3/$CASE/${CASE}_mosaic.nc $DATA/INPUT/${CASE}_mosaic.nc fi - # Fractional grid related - if [ $FRAC_GRID = ".true." ]; then - OROFIX=${OROFIX:-"${FIX_DIR}/orog/${CASE}.mx${OCNRES}_frac"} - FIX_SFC=${FIX_SFC:-"${OROFIX}/fix_sfc"} - for n in $(seq 1 $ntiles); do - $NLN ${OROFIX}/oro_${CASE}.mx${OCNRES}.tile${n}.nc $DATA/INPUT/oro_data.tile${n}.nc - done - else - OROFIX=${OROFIX:-"${FIXfv3}/${CASE}"} - FIX_SFC=${FIX_SFC:-"${OROFIX}/fix_sfc"} - for n in $(seq 1 $ntiles); do - $NLN ${OROFIX}/${CASE}_oro_data.tile${n}.nc $DATA/INPUT/oro_data.tile${n}.nc - done - fi + OROFIX=${OROFIX:-"${FIX_DIR}/orog/${CASE}.mx${OCNRES}_frac"} + FIX_SFC=${FIX_SFC:-"${OROFIX}/fix_sfc"} + for n in $(seq 1 $ntiles); do + $NLN ${OROFIX}/oro_${CASE}.mx${OCNRES}.tile${n}.nc $DATA/INPUT/oro_data.tile${n}.nc + $NLN ${OROFIX}/${CASE}_grid.tile${n}.nc $DATA/INPUT/${CASE}_grid.tile${n}.nc + done export CCPP_SUITE=${CCPP_SUITE:-"FV3_GFS_v16"} _suite_file=$HOMEgfs/sorc/ufs_model.fd/FV3/ccpp/suites/suite_${CCPP_SUITE}.xml From 4d1e4d33abf39ea913229c5727056e9af66302ed Mon Sep 17 00:00:00 2001 From: "Chunxi.Zhang-NOAA" Date: Fri, 6 Jan 2023 16:23:51 -0600 Subject: [PATCH 2/6] Modify exgdas_atmos_gldas.sh to make FIXgldas to use the new fracoro data --- scripts/exgdas_atmos_gldas.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/scripts/exgdas_atmos_gldas.sh b/scripts/exgdas_atmos_gldas.sh index c06989b9470..13dbc4af983 100755 --- a/scripts/exgdas_atmos_gldas.sh +++ b/scripts/exgdas_atmos_gldas.sh @@ -86,12 +86,8 @@ mkdir -p "${RUNDIR}/input" ln -fs "${GDAS}" "${RUNDIR}/input/GDAS" ln -fs "${EXECgldas:?}/gldas_model" "${RUNDIR}/LIS" -# Set FIXgldas subfolder based on FRAC_GRID value -if [[ "${FRAC_GRID:-".true."}" = ".true." ]] ; then - ln -fs "${FIXgldas}/frac_grid/FIX_T${JCAP}" "${RUNDIR}/FIX" -else - ln -fs "${FIXgldas}/nonfrac_grid/FIX_T${JCAP}" "${RUNDIR}/FIX" -fi +# Set FIXgldas subfolder +ln -fs "${FIXgldas}/frac_grid/FIX_T${JCAP}" "${RUNDIR}/FIX" #--------------------------------------------------------------- ### 1) Get gdas 6-tile netcdf restart file and gdas forcing data From 2364c0b2a539111be594ca7986b254aa256a8fda Mon Sep 17 00:00:00 2001 From: "Chunxi.Zhang-NOAA" Date: Tue, 31 Jan 2023 15:18:05 -0600 Subject: [PATCH 3/6] Modify parm/config/config.init to add a switch to use fracoro data in run_v16.chgres.sh --- parm/config/config.init | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/parm/config/config.init b/parm/config/config.init index d83bb5ecfe3..109cc34fa51 100755 --- a/parm/config/config.init +++ b/parm/config/config.init @@ -16,8 +16,9 @@ export GDASINIT_DIR=${UFS_DIR}/util/gdas_init export CRES_HIRES=$CASE export CRES_ENKF=$CASE_ENKF +export FRAC_ORO="YES" -export RUNICSH=${GDASINIT_DIR}/run_v17.chgres.sh +export RUNICSH=${GDASINIT_DIR}/run_v16.chgres.sh if [ "${RETRO:-"NO"}" = "YES" ] || [ "$CDUMP" = "gdas" ]; then export RUNICSH=${GDASINIT_DIR}/run_v16retro.chgres.sh fi From 5c5c193ffc7cc37641935cb1aaa4f69cff4787c9 Mon Sep 17 00:00:00 2001 From: "Chunxi.Zhang-NOAA" Date: Wed, 15 Feb 2023 11:07:25 -0600 Subject: [PATCH 4/6] Modify config.init to work with UFS_UTILS --- parm/config/config.init | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/parm/config/config.init b/parm/config/config.init index 109cc34fa51..9d29d5e6f53 100755 --- a/parm/config/config.init +++ b/parm/config/config.init @@ -18,6 +18,36 @@ export CRES_HIRES=$CASE export CRES_ENKF=$CASE_ENKF export FRAC_ORO="YES" +if [[ ${CDUMP} == 'gdas' || ${CDUMP} == 'gfs' || ${CDUMP} == 'hires' ]] ; then + CTAR=${CRES_HIRES} +else + CTAR=${CRES_ENKF} +fi + +if [ "${FRAC_ORO:-"NO"}" = "YES" ]; then + if [ "${CTAR}" = "C48" ]; then + OCNRES='400' + elif [ "${CTAR}" = "C96" ]; then + OCNRES='100' + elif [ "${CTAR}" = "C192" ]; then + OCNRES='050' + elif [ "${CTAR}" = "C384" ]; then + OCNRES='025' + elif [ "${CTAR}" = "C768" ]; then + OCNRES='025' + elif [ "${CTAR}" = "C1152" ]; then + OCNRES='025' + fi + OROD="${CTAR}.mx${OCNRES}_frac" + ORON="oro_${CTAR}.mx${OCNRES}" +else + OROD="${CTAR}" + ORON="${CTAR}_oro_data" +fi + +export ORO_DIR=${OROD} +export ORO_NAME=${ORON} +export CTAR=${CTAR} export RUNICSH=${GDASINIT_DIR}/run_v16.chgres.sh if [ "${RETRO:-"NO"}" = "YES" ] || [ "$CDUMP" = "gdas" ]; then export RUNICSH=${GDASINIT_DIR}/run_v16retro.chgres.sh From 177c7608cd8a1df597238846154f396e644a2ecf Mon Sep 17 00:00:00 2001 From: "Chunxi.Zhang-NOAA" Date: Fri, 10 Mar 2023 18:24:39 +0000 Subject: [PATCH 5/6] Update config.init and checkout.sh (ufs_utils uses newer hash) --- parm/config/config.init | 33 ++------------------------------- sorc/checkout.sh | 2 +- 2 files changed, 3 insertions(+), 32 deletions(-) diff --git a/parm/config/config.init b/parm/config/config.init index 9d29d5e6f53..9a88ad53b0b 100644 --- a/parm/config/config.init +++ b/parm/config/config.init @@ -13,41 +13,12 @@ echo "BEGIN: config.init" export UFS_DIR=${HOMEgfs}/sorc/ufs_utils.fd export GDASINIT_DIR=${UFS_DIR}/util/gdas_init +export GDAS_INIT_DIR=${UFS_DIR}/util/gdas_init export CRES_HIRES=$CASE export CRES_ENKF=$CASE_ENKF -export FRAC_ORO="YES" +export FRAC_ORO="yes" -if [[ ${CDUMP} == 'gdas' || ${CDUMP} == 'gfs' || ${CDUMP} == 'hires' ]] ; then - CTAR=${CRES_HIRES} -else - CTAR=${CRES_ENKF} -fi - -if [ "${FRAC_ORO:-"NO"}" = "YES" ]; then - if [ "${CTAR}" = "C48" ]; then - OCNRES='400' - elif [ "${CTAR}" = "C96" ]; then - OCNRES='100' - elif [ "${CTAR}" = "C192" ]; then - OCNRES='050' - elif [ "${CTAR}" = "C384" ]; then - OCNRES='025' - elif [ "${CTAR}" = "C768" ]; then - OCNRES='025' - elif [ "${CTAR}" = "C1152" ]; then - OCNRES='025' - fi - OROD="${CTAR}.mx${OCNRES}_frac" - ORON="oro_${CTAR}.mx${OCNRES}" -else - OROD="${CTAR}" - ORON="${CTAR}_oro_data" -fi - -export ORO_DIR=${OROD} -export ORO_NAME=${ORON} -export CTAR=${CTAR} export RUNICSH=${GDASINIT_DIR}/run_v16.chgres.sh if [ "${RETRO:-"NO"}" = "YES" ] || [ "$CDUMP" = "gdas" ]; then export RUNICSH=${GDASINIT_DIR}/run_v16retro.chgres.sh diff --git a/sorc/checkout.sh b/sorc/checkout.sh index 514e772c988..ab8012ef617 100755 --- a/sorc/checkout.sh +++ b/sorc/checkout.sh @@ -157,7 +157,7 @@ mkdir -p "${logdir}" errs=0 checkout "gfs_utils.fd" "https://github.com/NOAA-EMC/gfs-utils" "0b8ff56" ; errs=$((errs + $?)) checkout "ufs_model.fd" "https://github.com/ufs-community/ufs-weather-model" "${ufs_model_hash:-7a1ce44}" ; errs=$((errs + $?)) -checkout "ufs_utils.fd" "https://github.com/ufs-community/UFS_UTILS.git" "8b990c0" ; errs=$((errs + $?)) +checkout "ufs_utils.fd" "https://github.com/ufs-community/UFS_UTILS.git" "4e673bf" ; errs=$((errs + $?)) checkout "verif-global.fd" "https://github.com/NOAA-EMC/EMC_verif-global.git" "c267780" ; errs=$((errs + $?)) if [[ ${checkout_gsi} == "YES" ]]; then From 0780b5e4e15c40bd22caa250da08d51c84e166ed Mon Sep 17 00:00:00 2001 From: Rahul Mahajan Date: Mon, 20 Mar 2023 15:18:36 -0400 Subject: [PATCH 6/6] Remove duplicate definition of GDAS_INIT_DIR --- parm/config/config.init | 1 - 1 file changed, 1 deletion(-) diff --git a/parm/config/config.init b/parm/config/config.init index 9a88ad53b0b..3e016fb2483 100644 --- a/parm/config/config.init +++ b/parm/config/config.init @@ -13,7 +13,6 @@ echo "BEGIN: config.init" export UFS_DIR=${HOMEgfs}/sorc/ufs_utils.fd export GDASINIT_DIR=${UFS_DIR}/util/gdas_init -export GDAS_INIT_DIR=${UFS_DIR}/util/gdas_init export CRES_HIRES=$CASE export CRES_ENKF=$CASE_ENKF