Skip to content

Move mrms_pull_topofhour.py from scripts/ to ush/ [develop] #571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jwolff-ncar merged 3 commits into from
Aug 26, 2021
Merged

Move mrms_pull_topofhour.py from scripts/ to ush/ [develop] #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b88513e
Moved mrms_pull_topofhour.py to ush/ rather than scripts/
jwolff-ncar Aug 10, 2021
01e4f22
Updates to get the mrms_pull_topofhour.py script to run with the prop…
jwolff-ncar Aug 16, 2021
f4a3aba
Move "set +u" to the place it is absolutely needed, add a "set -u" at…
mkavulich Aug 25, 2021
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
4 changes: 3 additions & 1 deletion scripts/exregional_get_mrms_files.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/bin/sh

. ${GLOBAL_VAR_DEFNS_FP}

# This script pulls MRMS data from the NOAA HPSS
# Top-level MRMS directory
set -x
Expand Down Expand Up @@ -122,7 +124,7 @@ while [[ ${cur_ut} -le ${end_valid_ut} ]]; do
hour=0
while [[ ${hour} -le 23 ]]; do
echo "hour=${hour}"
python ${SCRIPTSDIR}/mrms_pull_topofhour.py ${vyyyy}${vmm}${vdd}${hour} ${mrms_proc} ${mrms_raw} ${field_base_name} ${level}
python ${USHDIR}/mrms_pull_topofhour.py ${vyyyy}${vmm}${vdd}${hour} ${mrms_proc} ${mrms_raw} ${field_base_name} ${level}
hour=$((${hour} + 1)) # hourly increment
done
fi
Expand Down
2 changes: 1 addition & 1 deletion ush/config_defaults.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ WRITE_DOPOST="FALSE"
# HPSS has an example of the expected file naming structure:
# regional_workflow/scripts/exregional_get_mrms_files.sh. This script
# calls the script used to identify the MRMS file closest to the valid
# time: regional_workflow/scripts/mrms_pull_topofhour.py.
# time: regional_workflow/ush/mrms_pull_topofhour.py.
#
# NDAS_OBS_DIR:
# User-specified location of top-level directory where NDAS prepbufr
Expand Down
3 changes: 2 additions & 1 deletion ush/load_modules_run_task.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,10 +328,11 @@ ules_dir) for the specified task (task_name) failed:
# now.

if [ -n "${SRW_ENV:-}" ] ; then
set +u
conda activate ${SRW_ENV}
set -u
fi

Copy link
Copy Markdown
Collaborator

@mkavulich mkavulich Aug 18, 2021

Choose a reason for hiding this comment

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

If we want to be entirely consistent with previous behavior, we should include a "set -u" line here. But I do not think it's necessary

Copy link
Copy Markdown
Contributor Author

@jwolff-ncar jwolff-ncar Aug 18, 2021

Choose a reason for hiding this comment

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

I am pretty sure I tested with that and it didn't work so I would say let's not add that if it isn't deemed necessary.


#
#-----------------------------------------------------------------------
#
Expand Down
2 changes: 1 addition & 1 deletion scripts/mrms_pull_topofhour.py → ush/mrms_pull_topofhour.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
print('cp '+MRMS_PROD_DIR+'/'+valid.strftime('%Y%m%d')+'/dcom/us007003/ldmdata/obs/upperair/mrms/conus/'+MRMS_PRODUCT+'/'+filename1+' '+VALID_DIR+'/'+filename2)

os.system('cp '+MRMS_PROD_DIR+'/'+valid.strftime('%Y%m%d')+'/dcom/us007003/ldmdata/obs/upperair/mrms/conus/'+MRMS_PRODUCT+'/'+filename1+' '+VALID_DIR+'/'+filename2)
os.system('gunzip '+VALID_DIR+'/'+filename2)
os.system('gunzip '+VALID_DIR+'/'+filename2)
elif valid.strftime('%Y%m%d') >= '20200304':
print('cp '+MRMS_PROD_DIR+'/'+valid.strftime('%Y%m%d')+'/upperair/mrms/conus/'+MRMS_PRODUCT+'/'+filename1+' '+VALID_DIR+'/'+filename2)

Expand Down