diff --git a/jobs/JEVS_PREP_GLOBAL_ENS b/jobs/JEVS_PREP_GLOBAL_ENS index 6708c278b..6de379836 100755 --- a/jobs/JEVS_PREP_GLOBAL_ENS +++ b/jobs/JEVS_PREP_GLOBAL_ENS @@ -84,6 +84,7 @@ export COMINobsproc=${COMINobsproc:-$(compath.py $envir/com/obsproc/${obsproc_ve export DCOMINnohrsc=${DCOMINnohrsc:-$DCOMROOT} export DCOMINosi_saf=${DCOMINosi_saf:-$DCOMROOT} export DCOMINghrsst=${DCOMINghrsst:-$DCOMROOT} +export DCOMINecmwf=${DCOMINecmwf:-$DCOMROOT} export COMINgefs_bc=${COMINgefs_bc:-$COMINnaefs} export DCOMINcmce_bc=${DCOMINcmce_bc:-$DCOMIN} diff --git a/ush/global_det/global_det_atmos_prep.py b/ush/global_det/global_det_atmos_prep.py index 3dc2c2e3c..aae136c42 100644 --- a/ush/global_det/global_det_atmos_prep.py +++ b/ush/global_det/global_det_atmos_prep.py @@ -49,6 +49,7 @@ STEP = os.environ['STEP'] MODELNAME = os.environ['MODELNAME'].split(' ') OBSNAME = os.environ['OBSNAME'].split(' ') +ECMWF_FILE_EXT=os.environ.get('ECMWF_FILE_EXT', '1') # Make COMOUT directory for dates output_INITDATE = COMOUT+'.'+INITDATE @@ -329,13 +330,13 @@ 'fcst_hrs': range(24, 72+12, 12)}, 'ecmwf': {'input_fcst_file_format': os.path.join(DCOMINecmwf, 'U1D{init?fmt=%m%d%H}00' - +'{valid?fmt=%m%d%H}001'), + +'{valid?fmt=%m%d%H}00'+f'{ECMWF_FILE_EXT}'), 'input_anl_file_format': os.path.join(DCOMINecmwf, 'U1D{init?fmt=%m%d%H}00' - +'{init?fmt=%m%d%H}011'), + +'{init?fmt=%m%d%H}01'+f'{ECMWF_FILE_EXT}'), 'input_precip_file_format': os.path.join(DCOMINecmwf_precip, 'UWD{init?fmt=%Y%m%d%H%M}' - +'{valid?fmt=%m%d%H%M}1'), + +'{valid?fmt=%m%d%H%M}'+f'{ECMWF_FILE_EXT}'), 'inithours': ['00', '12'], 'fcst_hrs': range(0, 240+6, 6)}, 'fnmoc': {'input_fcst_file_format': os.path.join(DCOMINfnmoc, diff --git a/ush/global_ens/evs_process_atmos_ecme.sh b/ush/global_ens/evs_process_atmos_ecme.sh index affb5468b..f3edb6014 100755 --- a/ush/global_ens/evs_process_atmos_ecme.sh +++ b/ush/global_ens/evs_process_atmos_ecme.sh @@ -91,7 +91,7 @@ while [ ${hourix} -lt 31 ]; do vmdh=` echo ${vymdh} | cut -c5-10` vhour=`${NHOUR} ${vymdh} ${ymdh}` if [ ${hourix} = 0 ] ; then - DCD=${DCOMIN}/$yyyymmdd/wgrbbul/ecmwf/DCD${imdh}00${vmdh}001 + DCD=${DCOMINecmwf}/$yyyymmdd/wgrbbul/ecmwf/DCD${imdh}00${vmdh}00${ECMWF_FILE_EXT:-1} if [ -s $DCD ] ; then >$WORKtask/ecmanl.t${ihour}z.grid3.f000.grib1 chmod 640 $WORKtask/ecmanl.t${ihour}z.grid3.f000.grib1 @@ -122,7 +122,7 @@ while [ ${hourix} -lt 31 ]; do #************************************************************* # Retrieve required fields from ECME member files E1E in DCOM #************************************************************* - E1E=${DCOMIN}/$yyyymmdd/wgrbbul/ecmwf/E1E${imdh}00${vmdh}001 + E1E=${DCOMINecmwf}/$yyyymmdd/wgrbbul/ecmwf/E1E${imdh}00${vmdh}00${ECMWF_FILE_EXT:-1} if [ ! -s $E1E ]; then echo "WARNING: $E1E is not available" if [ $SENDMAIL = YES ]; then @@ -172,7 +172,7 @@ while [ ${hourix} -lt 31 ]; do vymdh=`${NDATE} ${hourinc} ${ymdh}` vmdh=` echo ${vymdh} | cut -c5-10` vhour=`${NHOUR} ${vymdh} ${ymdh}` - E1E=${DCOMIN}/$yyyymmdd/wgrbbul/ecmwf/E1E${imdh}00${vmdh}001 + E1E=${DCOMINecmwf}/$yyyymmdd/wgrbbul/ecmwf/E1E${imdh}00${vmdh}00${ECMWF_FILE_EXT:-1} if [ -s $E1E ]; then >E1E_apcp.${hourinc} chmod 640 E1E_apcp.${hourinc} @@ -241,7 +241,7 @@ while [ ${hourix} -lt 31 ]; do vymdh=`${NDATE} ${hourinc} ${ymdh}` vmdh=` echo ${vymdh} | cut -c5-10` vhour=`${NHOUR} ${vymdh} ${ymdh}` - E1E=${DCOMIN}/$yyyymmdd/wgrbbul/ecmwf/E1E${imdh}00${vmdh}001 + E1E=${DCOMINecmwf}/$yyyymmdd/wgrbbul/ecmwf/E1E${imdh}00${vmdh}00${ECMWF_FILE_EXT:-1} if [ -s $E1E ]; then >E1E_vertical.${hourinc} chmod 640 E1E_vertical.${hourinc} diff --git a/ush/subseasonal/subseasonal_prep_obs.py b/ush/subseasonal/subseasonal_prep_obs.py index efcd28aad..f8e785b77 100644 --- a/ush/subseasonal/subseasonal_prep_obs.py +++ b/ush/subseasonal/subseasonal_prep_obs.py @@ -36,6 +36,7 @@ COMPONENT = os.environ['COMPONENT'] STEP = os.environ['STEP'] OBSNAME = os.environ['OBSNAME'].split(' ') +ECMWF_FILE_EXT = os.environ.get('ECMWF_FILE_EXT', '1') # Make COMOUT directory for dates COMOUT_INITDATE = COMOUT+'.'+INITDATE @@ -63,7 +64,7 @@ 'wgrbbul', 'ecmwf', 'DCD{init?fmt=%m%d%H}00' - +'{init?fmt=%m%d%H}001'), + +'{init?fmt=%m%d%H}00'+f'{ECMWF_FILE_EXT}'), 'arch_file_format': os.path.join(COMOUT_INITDATE, 'ecmwf', 'ecmwf.' +'{init?fmt=%Y%m%d%H}'