Skip to content

FDS vv: add -z option to Common_Run_All.sh script. Now -y removes ex… #14095

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
gforney merged 1 commit into from
Jan 21, 2025
Merged

FDS vv: add -z option to Common_Run_All.sh script. Now -y removes ex… #14095

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 12 additions & 6 deletions Validation/Common_Run_All.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,13 @@ echo "-v - show script run by qfds.sh for each validation case"
echo "-V - show qfds.sh command line for each validation case"
echo "-w walltime - default: empty, PBS: hh:mm:ss, SLURM: dd-hh:mm:ss"
echo "-x - do not copy FDS input files"
echo "-y - overwrite existing files"
echo "-y - remove existing files"
echo "-z - overwrite existing files"
exit
}

DEBUG=
while getopts 'bCe:EhIj:m:o:Oq:r:suvVw:xy' OPTION
while getopts 'bCe:EhIj:m:o:Oq:r:suvVw:xyz' OPTION
do
case $OPTION in
b)
Expand Down Expand Up @@ -141,7 +142,12 @@ case $OPTION in
export DONOTCOPY=1
;;
y)
export DELETEFILES=1
export OVERWRITE=
;;
z)
export OVERWRITE=1
export DELETEFILES=
;;
esac
done
Expand Down Expand Up @@ -174,12 +180,12 @@ if [ ! $STOPFDS ] ; then
# Check for existence of $INDIR (Current_Results) directory
if [ -d "$INDIR" ]; then
# Check for files in $INDIR (Current_Results) directory
if [[ "$(ls -A $INDIR)" && ! $OVERWRITE ]]; then
echo "Directory $INDIR already exists with files."
echo "Use the -y option to REMOVE existing files."
if [[ "$(ls -A $INDIR)" && "$OVERWRITE" == "" && "$DELETEFILES" == "" ]]; then
echo "The directory $INDIR already exists with files."
echo "Use the -y option to REMOVE existing files or -z to OVERWRITE existing files"
echo "Exiting."
exit
elif [[ "$(ls -A $INDIR)" && $OVERWRITE ]]; then
elif [[ "$(ls -A $INDIR)" && "$DELETEFILES" == "1" ]]; then
rm $INDIR/*
fi
# Create $INDIR (Current_Results) directory if it doesn't exist
Expand Down
Loading