Skip to content
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

Jump to bottom

Update file location utility scripts for current global-workflow monitor data location #142

Merged
merged 2 commits into from
Aug 19, 2024
Merged

Update file location utility scripts for current global-workflow monitor data location #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17b23d8
Ref #141
EdwardSafford-NOAA Aug 16, 2024
94588d6
Ref #141
EdwardSafford-NOAA Aug 16, 2024
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
16 changes: 2 additions & 14 deletions ush/find_last_cycle.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#
# The supported directory structures are:
# Operations: $tankdir/$net/version/$run.$pdy/$hh/atmos/$monitor
# Workflow : $tankdir/$monitor/stats/$net/$run.$pdy/$hh
# Workflow : $tankdir/$net/$run.$pdy/$hh/products/atmos/$monitor
# Monitors* : $tankdir/stats/$net/$run.$pdy/$hh/$monitor
#
# The get_stats_path.sh script will be used to find a valid path from
Expand Down Expand Up @@ -68,7 +68,6 @@ done
#
path=`${MON_USH}/get_stats_path.sh --net ${net} --run ${run} --tank ${tankdir} --mon ${monitor} --rpath base`


#--------------------------------------------------
# Set search string per monitor
#
Expand Down Expand Up @@ -109,18 +108,7 @@ if [[ ${#path} -gt 0 ]]; then

for hr in $hrs; do

#----------------------------------------------------------------
# The workflow (wkfl) directory structure is a special case
# in that $monitor is the first subdirectory in the $tankdir.
# To take that into account this check is added.
#
wkfl_check=`echo ${path} | grep ${monitor}`
if [[ ${#wkfl_check} -gt 0 ]]; then
wkfl_test=`find -L "${path}/${file}/${hr}/" -maxdepth 2 -mindepth 1 -name "${search}" -printf "%f\n" 2>/dev/null`
else
wkfl_test=""
fi

wkfl_test=`find -L "${path}/${file}/${hr}/products/atmos/${monitor}" -maxdepth 2 -mindepth 1 -name "${search}" -printf "%f\n" 2>/dev/null`
mon_test=`find -L "${path}/${file}/${hr}/${monitor}" -maxdepth 2 -mindepth 1 -name "${search}" -printf "%f\n" 2>/dev/null`
ops_test=`find -L "${path}/${file}/${hr}/atmos/${monitor}" -maxdepth 2 -mindepth 1 -name "${search}" -printf "%f\n" 2>/dev/null`

Expand Down
4 changes: 2 additions & 2 deletions ush/get_stats_path.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ ops_base=${tankdir}/${net}/${version}
ops_xtn=${run}.${pdy}/${hh}/atmos/${monitor}
ops=${ops_base}/${ops_xtn}

wkf_base=${tankdir}/${monitor}/stats/${net}
wkf_xtn=${run}.${pdy}/${hh}
wkf_base=${tankdir}/${net}
wkf_xtn=${run}.${pdy}/${hh}/products/atmos/${monitor}
wkf=${wkf_base}/${wkf_xtn}

mon_base=${tankdir}/stats/${net}
Expand Down
Loading