Skip to content
Snippets Groups Projects
Commit 752c8eae authored by Mark Olesen's avatar Mark Olesen
Browse files

paraFoam improvements

  - only create (and remove) case.OpenFOAM file if it doesn't already exist
  - new -touch option just generates case.OpenFOAM file and exits
  - new -region option to create case=regionName.OpenFOAM file
    (the delimiter may change in the future)
parent 3bc28f6c
Branches
Tags
No related merge requests found
...@@ -34,7 +34,11 @@ usage() { ...@@ -34,7 +34,11 @@ usage() {
while [ "$#" -ge 1 ]; do echo "$1"; shift; done while [ "$#" -ge 1 ]; do echo "$1"; shift; done
cat<<USAGE cat<<USAGE
usage: ${0##*/} [-case dir] usage: ${0##*/} [OPTION]
options:
-case dir specify alternative case directory
-region name specify mesh region name
-touch create the .OpenFOAM file only and exit
* start paraview $ParaView_VERSION with the OpenFOAM libraries * start paraview $ParaView_VERSION with the OpenFOAM libraries
...@@ -42,6 +46,8 @@ USAGE ...@@ -42,6 +46,8 @@ USAGE
exit 1 exit 1
} }
unset regionName touchOnly
# parse options # parse options
while [ "$#" -gt 0 ] while [ "$#" -gt 0 ]
do do
...@@ -55,6 +61,15 @@ do ...@@ -55,6 +61,15 @@ do
shift 2 shift 2
cd "$caseDir" 2>/dev/null || usage "directory does not exist: '$caseDir'" cd "$caseDir" 2>/dev/null || usage "directory does not exist: '$caseDir'"
;; ;;
-region)
[ "$#" -ge 2 ] || usage "'-region' option requires an argument"
regionName=$2
shift 2
;;
-touch)
touchOnly=1
shift
;;
*) *)
usage "unknown option/argument: '$*'" usage "unknown option/argument: '$*'"
;; ;;
...@@ -64,6 +79,17 @@ done ...@@ -64,6 +79,17 @@ done
# get a sensible caseName # get a sensible caseName
caseName=${PWD##*/} caseName=${PWD##*/}
caseFile="$caseName.OpenFOAM" caseFile="$caseName.OpenFOAM"
if [ -n "$regionName" ]
then
caseFile="$caseName=$regionName.OpenFOAM"
fi
if [ -n "$touchOnly" ];
then
touch $caseFile
echo "created '$caseFile'"
exit 0
fi
# parent directory for normal or parallel results # parent directory for normal or parallel results
case "$caseName" in case "$caseName" in
...@@ -80,7 +106,6 @@ done ...@@ -80,7 +106,6 @@ done
case "$ParaView_VERSION" in case "$ParaView_VERSION" in
2*) 2*)
# Clean up on termination and on Ctrl-C
trap "rm -f paraFoam.pvs $caseFile 2>/dev/null; exit 0" EXIT TERM INT trap "rm -f paraFoam.pvs $caseFile 2>/dev/null; exit 0" EXIT TERM INT
touch $caseFile touch $caseFile
...@@ -92,9 +117,12 @@ case "$ParaView_VERSION" in ...@@ -92,9 +117,12 @@ case "$ParaView_VERSION" in
;; ;;
*) *)
# Clean up on termination and on Ctrl-C # only create/remove caseFile if it doesn't exist
trap "rm -f $caseFile 2>/dev/null; exit 0" EXIT TERM INT [ -e $caseFile ] || {
touch $caseFile trap "rm -f $caseFile 2>/dev/null; exit 0" EXIT TERM INT
touch $caseFile
}
paraview --data=$caseFile paraview --data=$caseFile
;; ;;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment