From a4177bb97722a6e90487af2b9744f3cbc960fb6b Mon Sep 17 00:00:00 2001 From: Rahul Mahajan Date: Wed, 3 May 2023 02:52:38 -0400 Subject: [PATCH] Replace `CDATE` with `PDYcyc` combo (#1561) Replaces `${CDATE}` with `${PDY}${cyc}` in all `config.*` files. Also fixes permissions on some of the config files that were turned to be executable in some of the JEDI PRs. Fixes #1560 Partially fixes #198 --- parm/config/config.anal | 30 +++++++++++++++--------------- parm/config/config.atmensanl | 0 parm/config/config.atmensanlfinal | 0 parm/config/config.atmensanlinit | 0 parm/config/config.atmensanlrun | 0 parm/config/config.base.emc.dyn | 4 ++-- parm/config/config.getic | 30 +++++++++++++++--------------- parm/config/config.init | 14 +++++++------- parm/config/config.landanl | 0 parm/config/config.landanlfinal | 0 parm/config/config.landanlinit | 0 parm/config/config.landanlrun | 0 parm/config/config.nsst | 2 +- parm/config/config.prep | 8 ++++---- 14 files changed, 44 insertions(+), 44 deletions(-) mode change 100755 => 100644 parm/config/config.atmensanl mode change 100755 => 100644 parm/config/config.atmensanlfinal mode change 100755 => 100644 parm/config/config.atmensanlinit mode change 100755 => 100644 parm/config/config.atmensanlrun mode change 100755 => 100644 parm/config/config.landanl mode change 100755 => 100644 parm/config/config.landanlfinal mode change 100755 => 100644 parm/config/config.landanlinit mode change 100755 => 100644 parm/config/config.landanlrun diff --git a/parm/config/config.anal b/parm/config/config.anal index 018bab9597..f68ec28efe 100644 --- a/parm/config/config.anal +++ b/parm/config/config.anal @@ -54,41 +54,41 @@ export OBERROR=${FIXgsi}/prepobs_errtable.global # Use experimental dumps in EMC GFS v16 parallels if [[ ${RUN_ENVIR} == "emc" ]]; then # Set info files and prepobs.errtable.global for GFS v16 retrospective parallels - if [[ "${CDATE}" -ge "2019021900" && "${CDATE}" -lt "2019110706" ]]; then + if [[ "${PDY}${cyc}" -ge "2019021900" && "${PDY}${cyc}" -lt "2019110706" ]]; then export CONVINFO=${FIXgsi}/gfsv16_historical/global_convinfo.txt.2019021900 export OBERROR=${FIXgsi}/gfsv16_historical/prepobs_errtable.global.2019021900 fi # Place GOES-15 AMVs in monitor, assimilate GOES-17 AMVs, assimilate KOMPSAT-5 gps - if [[ "${CDATE}" -ge "2019110706" && "${CDATE}" -lt "2020040718" ]]; then + if [[ "${PDY}${cyc}" -ge "2019110706" && "${PDY}${cyc}" -lt "2020040718" ]]; then export CONVINFO=${FIXgsi}/gfsv16_historical/global_convinfo.txt.2019110706 export OBERROR=${FIXgsi}/gfsv16_historical/prepobs_errtable.global.2019110706 fi # Assimilate 135 (T) & 235 (uv) Canadian AMDAR observations - if [[ "${CDATE}" -ge "2020040718" && "${CDATE}" -lt "2020052612" ]]; then + if [[ "${PDY}${cyc}" -ge "2020040718" && "${PDY}${cyc}" -lt "2020052612" ]]; then export CONVINFO=${FIXgsi}/gfsv16_historical/global_convinfo.txt.2020040718 export OBERROR=${FIXgsi}/gfsv16_historical/prepobs_errtable.global.2020040718 fi # Assimilate COSMIC-2 - if [[ "${CDATE}" -ge "2020052612" && "${CDATE}" -lt "2020082412" ]]; then + if [[ "${PDY}${cyc}" -ge "2020052612" && "${PDY}${cyc}" -lt "2020082412" ]]; then export CONVINFO=${FIXgsi}/gfsv16_historical/global_convinfo.txt.2020052612 export OBERROR=${FIXgsi}/gfsv16_historical/prepobs_errtable.global.2020040718 fi # Assimilate HDOB - if [[ "${CDATE}" -ge "2020082412" && "${CDATE}" -lt "2020091612" ]]; then + if [[ "${PDY}${cyc}" -ge "2020082412" && "${PDY}${cyc}" -lt "2020091612" ]]; then export CONVINFO=${FIXgsi}/gfsv16_historical/global_convinfo.txt.2020082412 fi # Assimilate Metop-C GNSSRO - if [[ "${CDATE}" -ge "2020091612" && "${CDATE}" -lt "2021031712" ]]; then + if [[ "${PDY}${cyc}" -ge "2020091612" && "${PDY}${cyc}" -lt "2021031712" ]]; then export CONVINFO=${FIXgsi}/gfsv16_historical/global_convinfo.txt.2020091612 fi # Assimilate DO-2 GeoOptics - if [[ "${CDATE}" -ge "2021031712" && "${CDATE}" -lt "2021091612" ]]; then + if [[ "${PDY}${cyc}" -ge "2021031712" && "${PDY}${cyc}" -lt "2021091612" ]]; then export CONVINFO=${FIXgsi}/gfsv16_historical/global_convinfo.txt.2021031712 fi @@ -97,38 +97,38 @@ if [[ ${RUN_ENVIR} == "emc" ]]; then # identical to ../global_convinfo.txt. Thus, the logic below is not # needed at this time. # Assimilate COSMIC-2 GPS - # if [[ "$CDATE" -ge "2021110312" && "$CDATE" -lt "YYYYMMDDHH" ]]; then + # if [[ "${PDY}${cyc}" -ge "2021110312" && "${PDY}${cyc}" -lt "YYYYMMDDHH" ]]; then # export CONVINFO=$FIXgsi/gfsv16_historical/global_convinfo.txt.2021110312 # fi # Turn off assmilation of OMPS during period of bad data - if [[ "${CDATE}" -ge "2020011600" && "${CDATE}" -lt "2020011806" ]]; then + if [[ "${PDY}${cyc}" -ge "2020011600" && "${PDY}${cyc}" -lt "2020011806" ]]; then export OZINFO=${FIXgsi}/gfsv16_historical/global_ozinfo.txt.2020011600 fi # Set satinfo for start of GFS v16 parallels - if [[ "${CDATE}" -ge "2019021900" && "${CDATE}" -lt "2019110706" ]]; then + if [[ "${PDY}${cyc}" -ge "2019021900" && "${PDY}${cyc}" -lt "2019110706" ]]; then export SATINFO=${FIXgsi}/gfsv16_historical/global_satinfo.txt.2019021900 fi # Turn on assimilation of Metop-C AMSUA and MHS - if [[ "${CDATE}" -ge "2019110706" && "${CDATE}" -lt "2020022012" ]]; then + if [[ "${PDY}${cyc}" -ge "2019110706" && "${PDY}${cyc}" -lt "2020022012" ]]; then export SATINFO=${FIXgsi}/gfsv16_historical/global_satinfo.txt.2019110706 fi # Turn off assimilation of Metop-A MHS - if [[ "${CDATE}" -ge "2020022012" && "${CDATE}" -lt "2021052118" ]]; then + if [[ "${PDY}${cyc}" -ge "2020022012" && "${PDY}${cyc}" -lt "2021052118" ]]; then export SATINFO=${FIXgsi}/gfsv16_historical/global_satinfo.txt.2020022012 fi # Turn off assimilation of S-NPP CrIS - if [[ "${CDATE}" -ge "2021052118" && "${CDATE}" -lt "2021092206" ]]; then + if [[ "${PDY}${cyc}" -ge "2021052118" && "${PDY}${cyc}" -lt "2021092206" ]]; then export SATINFO=${FIXgsi}/gfsv16_historical/global_satinfo.txt.2021052118 fi # Turn off assimilation of MetOp-A IASI - if [[ "${CDATE}" -ge "2021092206" && "${CDATE}" -lt "2021102612" ]]; then + if [[ "${PDY}${cyc}" -ge "2021092206" && "${PDY}${cyc}" -lt "2021102612" ]]; then export SATINFO=${FIXgsi}/gfsv16_historical/global_satinfo.txt.2021092206 fi @@ -138,7 +138,7 @@ if [[ ${RUN_ENVIR} == "emc" ]]; then # needed at this time # # Turn off assmilation of all Metop-A MHS - # if [[ "$CDATE" -ge "2021110312" && "$CDATE" -lt "YYYYMMDDHH" ]]; then + # if [[ "${PDY}${cyc}" -ge "2021110312" && "${PDY}${cyc}" -lt "YYYYMMDDHH" ]]; then # export SATINFO=$FIXgsi/gfsv16_historical/global_satinfo.txt.2021110312 # fi fi diff --git a/parm/config/config.atmensanl b/parm/config/config.atmensanl old mode 100755 new mode 100644 diff --git a/parm/config/config.atmensanlfinal b/parm/config/config.atmensanlfinal old mode 100755 new mode 100644 diff --git a/parm/config/config.atmensanlinit b/parm/config/config.atmensanlinit old mode 100755 new mode 100644 diff --git a/parm/config/config.atmensanlrun b/parm/config/config.atmensanlrun old mode 100755 new mode 100644 diff --git a/parm/config/config.base.emc.dyn b/parm/config/config.base.emc.dyn index 0af91daaed..e5e29d1440 100644 --- a/parm/config/config.base.emc.dyn +++ b/parm/config/config.base.emc.dyn @@ -104,7 +104,7 @@ export EXPDIR="@EXPDIR@/${PSLOT}" export ROTDIR="@ROTDIR@/${PSLOT}" export ROTDIR_DUMP="YES" #Note: A value of "NO" does not currently work export DUMP_SUFFIX="" -if [[ "${CDATE}" -ge "2019092100" && "${CDATE}" -le "2019110700" ]]; then +if [[ "${PDY}${cyc}" -ge "2019092100" && "${PDY}${cyc}" -le "2019110700" ]]; then export DUMP_SUFFIX="p" # Use dumps from NCO GFS v15.3 parallel fi export DATAROOT="${STMP}/RUNDIRS/${PSLOT}" # TODO: set via prod_envir in Ops @@ -335,7 +335,7 @@ if [[ ${DOHYBVAR} == "NO" && ${DOIAU} == "YES" ]]; then fi # Check if cycle is cold starting, DOIAU off, or free-forecast mode -if [[ "${MODE}" = "cycled" && "${SDATE}" = "${CDATE}" && ${EXP_WARM_START} = ".false." ]] || [[ "${DOIAU}" = "NO" ]] || [[ "${MODE}" = "forecast-only" && ${EXP_WARM_START} = ".false." ]] ; then +if [[ "${MODE}" = "cycled" && "${SDATE}" = "${PDY}${cyc}" && ${EXP_WARM_START} = ".false." ]] || [[ "${DOIAU}" = "NO" ]] || [[ "${MODE}" = "forecast-only" && ${EXP_WARM_START} = ".false." ]] ; then export IAU_OFFSET=0 export IAU_FHROT=0 fi diff --git a/parm/config/config.getic b/parm/config/config.getic index fce3f9ecf6..2771c14058 100644 --- a/parm/config/config.getic +++ b/parm/config/config.getic @@ -6,7 +6,7 @@ echo "BEGIN: config.getic" # Get task specific resources -. $EXPDIR/config.resources getic +. ${EXPDIR}/config.resources getic export RETRO="NO" # YES = Pull v16 inputs from retrospective parallels; NO = use operational inputs export gfs_ver="v16" # Default = v16 @@ -18,41 +18,41 @@ export GDASINIT_DIR=${UFS_DIR}/util/gdas_init export PRODHPSSDIR=/NCEPPROD/hpssprod/runhistory export GETICSH=${GDASINIT_DIR}/get_v16.data.sh -if [ ${RETRO:-"NO"} = "YES" ]; then # Retrospective parallel input +if [[ ${RETRO:-"NO"} = "YES" ]]; then # Retrospective parallel input export GETICSH=${GDASINIT_DIR}/get_v16retro.data.sh - if [[ "$CDATE" -lt "2019060106" ]]; then + if [[ "${PDY}${cyc}" -lt "2019060106" ]]; then HPSSDIR=/NCEPDEV/emc-global/5year/emc.glopara/WCOSS_D/gfsv16/v16retro0e - elif [[ "$CDATE" -lt "2019090100" ]]; then + elif [[ "${PDY}${cyc}" -lt "2019090100" ]]; then HPSSDIR=/NCEPDEV/emc-global/5year/emc.glopara/WCOSS_D/gfsv16/v16retro1e - elif [[ "$CDATE" -lt "2019101706" ]]; then + elif [[ "${PDY}${cyc}" -lt "2019101706" ]]; then HPSSDIR=/NCEPDEV/emc-global/5year/emc.glopara/WCOSS_D/gfsv16/v16retro2e - elif [[ "$CDATE" -lt "2020122200" ]]; then + elif [[ "${PDY}${cyc}" -lt "2020122200" ]]; then HPSSDIR=/NCEPDEV/emc-global/5year/emc.glopara/WCOSS_D/gfsv16/v16rt2 - elif [[ "$CDATE" -le "2021032506" ]]; then + elif [[ "${PDY}${cyc}" -le "2021032506" ]]; then HPSSDIR=/NCEPDEV/emc-global/5year/emc.glopara/WCOSS_D/gfsv16/v16rt2n else set +x - echo NO DATA FOR $CDATE + echo NO DATA FOR "${PDY}${cyc}" exit 3 fi -elif [ ${RETRO:-"NO"} = "NO" ]; then # Operational input +elif [[ ${RETRO:-"NO"} = "NO" ]]; then # Operational input # No ENKF data prior to 2012/05/21/00z - if [[ "$CDATE" -lt "2012052100" ]]; then + if [[ "${PDY}${cyc}" -lt "2012052100" ]]; then set +x echo FATAL ERROR: SCRIPTS DO NOT SUPPORT OLD GFS DATA - elif [[ "$CDATE" -lt "2016051000" ]]; then + elif [[ "${PDY}${cyc}" -lt "2016051000" ]]; then export gfs_ver=v12 export GETICSH=${GDASINIT_DIR}/get_pre-v14.data.sh - elif [[ "$CDATE" -lt "2017072000" ]]; then + elif [[ "${PDY}${cyc}" -lt "2017072000" ]]; then export gfs_ver=v13 export GETICSH=${GDASINIT_DIR}/get_pre-v14.data.sh - elif [[ "$CDATE" -lt "2019061200" ]]; then + elif [[ "${PDY}${cyc}" -lt "2019061200" ]]; then export gfs_ver=v14 export GETICSH=${GDASINIT_DIR}/get_${gfs_ver}.data.sh - elif [[ "$CDATE" -lt "2021032100" ]]; then + elif [[ "${PDY}${cyc}" -lt "2021032100" ]]; then export gfs_ver=v15 export GETICSH=${GDASINIT_DIR}/get_${gfs_ver}.data.sh - elif [[ "$CDATE" -lt "2021032106" ]]; then + elif [[ "${PDY}${cyc}" -lt "2021032106" ]]; then # The way the v16 switch over was done, there is no complete # set of v16 or v15 data for 2021032100. And although # v16 was officially implemented 2021032212, the v16 prod diff --git a/parm/config/config.init b/parm/config/config.init index 3e016fb248..83f65c48d0 100644 --- a/parm/config/config.init +++ b/parm/config/config.init @@ -23,24 +23,24 @@ if [ "${RETRO:-"NO"}" = "YES" ] || [ "$CDUMP" = "gdas" ]; then export RUNICSH=${GDASINIT_DIR}/run_v16retro.chgres.sh fi -if [ ${RETRO:-"NO"} = "NO" ]; then # Operational input +if [[ ${RETRO:-"NO"} = "NO" ]]; then # Operational input # No ENKF data prior to 2012/05/21/00z - if [[ "$CDATE" -lt "2012052100" ]]; then + if [[ "${PDY}${cyc}" -lt "2012052100" ]]; then set +x echo FATAL ERROR: SCRIPTS DO NOT SUPPORT OLD GFS DATA - elif [[ "$CDATE" -lt "2016051000" ]]; then + elif [[ "${PDY}${cyc}" -lt "2016051000" ]]; then export gfs_ver=v12 export RUNICSH=${GDASINIT_DIR}/run_pre-v14.chgres.sh - elif [[ "$CDATE" -lt "2017072000" ]]; then + elif [[ "${PDY}${cyc}" -lt "2017072000" ]]; then export gfs_ver=v13 export RUNICSH=${GDASINIT_DIR}/run_pre-v14.chgres.sh - elif [[ "$CDATE" -lt "2019061200" ]]; then + elif [[ "${PDY}${cyc}" -lt "2019061200" ]]; then export gfs_ver=v14 export RUNICSH=${GDASINIT_DIR}/run_${gfs_ver}.chgres.sh - elif [[ "$CDATE" -lt "2021032100" ]]; then + elif [[ "${PDY}${cyc}" -lt "2021032100" ]]; then export gfs_ver=v15 export RUNICSH=${GDASINIT_DIR}/run_${gfs_ver}.chgres.gfs.sh - elif [[ "$CDATE" -lt "2021032106" ]]; then + elif [[ "${PDY}${cyc}" -lt "2021032106" ]]; then # The way the v16 switch over was done, there is no complete # set of v16 or v15 data for 2021032100. And although # v16 was officially implemented 2021032212, the v16 prod diff --git a/parm/config/config.landanl b/parm/config/config.landanl old mode 100755 new mode 100644 diff --git a/parm/config/config.landanlfinal b/parm/config/config.landanlfinal old mode 100755 new mode 100644 diff --git a/parm/config/config.landanlinit b/parm/config/config.landanlinit old mode 100755 new mode 100644 diff --git a/parm/config/config.landanlrun b/parm/config/config.landanlrun old mode 100755 new mode 100644 diff --git a/parm/config/config.nsst b/parm/config/config.nsst index b4c58eedb3..235c91f08b 100644 --- a/parm/config/config.nsst +++ b/parm/config/config.nsst @@ -12,7 +12,7 @@ export NST_MODEL=2 # nstf_name(2) : NST_SPINUP : 0 = OFF, 1 = ON, export NST_SPINUP=0 -if [[ "$CDATE" -lt "2017072000" ]]; then +if [[ "${PDY}${cyc}" -lt "2017072000" ]]; then export NST_SPINUP=1 fi diff --git a/parm/config/config.prep b/parm/config/config.prep index 3e1cf8c32f..b05b82a43e 100644 --- a/parm/config/config.prep +++ b/parm/config/config.prep @@ -36,12 +36,12 @@ export PRVT=$FIXgsi/prepobs_errtable.global # Set prepobs.errtable.global for GFS v16 retrospective parallels if [[ $RUN_ENVIR == "emc" ]]; then - if [[ "$CDATE" -ge "2019021900" && "$CDATE" -lt "2019110706" ]]; then + if [[ "${PDY}${cyc}" -ge "2019021900" && "${PDY}${cyc}" -lt "2019110706" ]]; then export PRVT=$FIXgsi/gfsv16_historical/prepobs_errtable.global.2019021900 fi # Place GOES-15 AMVs in monitor, assimilate GOES-17 AMVs, assimilate KOMPSAT-5 gps - if [[ "$CDATE" -ge "2019110706" && "$CDATE" -lt "2020040718" ]]; then + if [[ "${PDY}${cyc}" -ge "2019110706" && "${PDY}${cyc}" -lt "2020040718" ]]; then export PRVT=$FIXgsi/gfsv16_historical/prepobs_errtable.global.2019110706 fi @@ -51,7 +51,7 @@ if [[ $RUN_ENVIR == "emc" ]]; then # needed at this time # Set observation errors for type 135 (T) & 235 (uv) Canadian AMDAR observations -# if [[ "$CDATE" -ge "2020040718" && "$CDATE" -lt "YYYMMDDHH" ]]; then +# if [[ "${PDY}${cyc}" -ge "2020040718" && "${PDY}${cyc}" -lt "YYYMMDDHH" ]]; then # export PRVT=$EXPDIR/prepobs_errtable.global # fi @@ -60,7 +60,7 @@ fi # NSST bufr was created with a different set of files prior to 2020102200 # See comments at the end of # https://github.com/NOAA-EMC/global-workflow/issues/313 -if [[ "$CDATE" -ge "2020102200" ]]; then +if [[ "${PDY}${cyc}" -ge "2020102200" ]]; then export DTYPS_nsst='sfcshp tesac bathy trkob' else export DTYPS_nsst='sfcshp dbuoyb mbuoyb tesac bathy trkob'