Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions jobs/JEVS_PREP_GLOBAL_ENS
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
7 changes: 4 additions & 3 deletions ush/global_det/global_det_atmos_prep.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions ush/global_ens/evs_process_atmos_ecme.sh
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of defining ${ECMWF_FILE_EXT:-1} on each line, can we define export ECMWF_FILE_EXT=${ECMWF_FILE_EXT:-1} outside the loop (maybe around line 86). And then on the lines we can just have ${ECMWF_FILE_EXT}

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's right. I should define ECMWF_FILE_EXT in the J-job script.

Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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}
Expand Down
3 changes: 2 additions & 1 deletion ush/subseasonal/subseasonal_prep_obs.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}'),
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@malloryprow I have reviewed the code changes for my ush/subseasonal/subseasonal_prep_obs.py script and the changes make sense. I approve once at least one test is conducted with the new ECMWF data.

'arch_file_format': os.path.join(COMOUT_INITDATE, 'ecmwf',
'ecmwf.'
+'{init?fmt=%Y%m%d%H}'
Expand Down