paraFoam - check for region-specific fvSchemes, fvSolution

bin/paraFoam

@@ -38,7 +38,7 @@ usage: ${0##*/} [OPTION]
 options:
   -case   dir    specify alternative case directory
   -region name   specify mesh region name
-  -touch         create the .OpenFOAM file only and exit
+  -touch         only create the .OpenFOAM file
 
 * start paraview $ParaView_VERSION with the OpenFOAM libraries
 
@@ -56,18 +56,17 @@ do
         usage
         ;;
     -case)
-      [ "$#" -ge 2 ] || usage "'-case' option requires an argument"
+        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
-      caseDir=$2
+        cd "$2" 2>/dev/null || usage "directory does not exist:  '$2'"
         shift 2
-      cd "$caseDir" 2>/dev/null || usage "directory does not exist:  '$caseDir'"
         ;;
     -region)
-      [ "$#" -ge 2 ] || usage "'-region' option requires an argument"
+        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
         regionName=$2
         shift 2
         ;;
     -touch)
-      touchOnly=1
+        touchOnly=true
         shift
         ;;
     *)
@@ -79,12 +78,15 @@ done
 # get a sensible caseName
 caseName=${PWD##*/}
 caseFile="$caseName.OpenFOAM"
+fvControls="system"
+
 if [ -n "$regionName" ]
 then
     caseFile="$caseName{$regionName}.OpenFOAM"
+    fvControls="$fvControls/$regionName"
 fi
 
-if [ -n "$touchOnly" ];
+if [ -n "$touchOnly" ]
 then
     touch "$caseFile"
     echo "created '$caseFile'"
@@ -98,7 +100,7 @@ case "$caseName" in
 esac
 
 # check existence of essential files
-for check in system/controlDict system/fvSchemes system/fvSolution
+for check in system/controlDict $fvControls/fvSchemes $fvControls/fvSolution
 do
     [ -s "$parentDir/$check" ] || usage "file does not exist:  '$parentDir/$check'"
 done
@@ -107,17 +109,17 @@ done
 case "$ParaView_VERSION" in
 2*)
     trap "rm -f paraFoam.pvs $caseFile 2>/dev/null; exit 0" EXIT TERM INT
-   touch $caseFile
+    touch "$caseFile"
 
     # since we are now in the cwd, %CASE% is '$PWD/$caseFile'
     sed -e s@%CASE%@$PWD/$caseFile@g \
-       $WM_PROJECT_DIR/bin/paraFoam.pvs > paraFoam.pvs
+        $WM_PROJECT_DIR/bin/tools/paraFoam.pvs > paraFoam.pvs
 
     paraview paraFoam.pvs
     ;;
 
 *)
-   # only create/remove caseFile if it doesn't exist
+    # only create/remove caseFile if it didn't already exist
     [ -e $caseFile ] || {
         trap "rm -f $caseFile 2>/dev/null; exit 0" EXIT TERM INT
         touch "$caseFile"

bin/tools/README

@@ -1,2 +1,2 @@
-Misc. tools for building applications, etc that are useful to have
+Misc. tools, scripts, templates that are useful (eg, for building applications)
-but which don't really need to be in the PATH.
+but don't need to be in the PATH.