finally drop references to ~/.OpenFOAM-<ver> (use ~/.OpenFOAM/<ver>)

bin/foamExec

@@ -53,6 +53,7 @@ USAGE
     exit 1
 }
 
+
 # This script should exist in <foamInstall>/OpenFOAM-<VERSION>/bin/
 # extract the <foamInstall> and <version> elements
 # using a function preserves the command args
@@ -89,47 +90,35 @@ do
     esac
 done
 
-if [ "$#" -lt 1 ]; then
+if [ "$#" -lt 1 ]
+then
     usage "no application specified"
 fi
 
 unset foamDotFile
 
 # Check user-specific OpenFOAM bashrc file
-for subDir in \
+foamDotFile="$HOME/.OpenFOAM/$version/bashrc"
-   $HOME/.OpenFOAM-$version \
+if [ -f $foamDotFile ]
-   $HOME/.OpenFOAM/$version \
+then
-;
+    . $foamDotFile
+    foamDotFile=okay
+else
+    # Use the FOAM_INST_DIR variable for locating the installed version
+    for FOAM_INST_DIR in $foamInstall $WM_PROJECT_INST_DIR
     do
-   foamDotFile="$subDir/bashrc"
+        foamDotFile="$FOAM_INST_DIR/OpenFOAM-$version/etc/bashrc"
-   if [ -f $foamDotFile ]; then
+        if [ -f $foamDotFile ]
+        then
             . $foamDotFile
             foamDotFile=okay
             break
         fi
     done
+fi
+
 
-# Use the FOAM_INST_DIR variable for locating the installed version
 if [ "$foamDotFile" != okay ]
-then
-   for FOAM_INST_DIR in $foamInstall $WM_PROJECT_INST_DIR
-   do
-      for subDir in \
-         OpenFOAM-$version/etc \
-         OpenFOAM-$version/.OpenFOAM-$version \
-      ;
-      do
-        foamDotFile="$FOAM_INST_DIR/$subDir/bashrc"
-        if [ -f $foamDotFile ]; then
-           . $foamDotFile
-           foamDotFile=okay
-           break 2
-        fi
-     done
-   done
-fi
-
-if [ "$foamDotFile" != okay ];
 then
     echo "Error : bashrc file could not be found for OpenFOAM-$version" 1>&2
     exit 1

tutorials/Allclean

@@ -36,7 +36,7 @@ echo "--------"
 echo "Cleaning tutorials ..."
 echo "Removing backup files"
 find . -type f \( -name "*~" -o -name "*.bak" \) -exec rm {} \;
-find . \( -name 'core' -o -name 'core.[1-9]*' \) -exec rm {} \;
+find . \( -name core -o -name 'core.[1-9]*' \) -exec rm {} \;
 find . \( -name '*.pvs' -o -name '*.OpenFOAM' \) -exec rm {} \;
 rm logs testLoopReport > /dev/null 2>&1
 

tutorials/Allrun

@@ -48,15 +48,19 @@ logReport () {
     UzSS=`grep -E "Uz[:| ]*solution singularity" $1`
     completed=`grep -E "^[\t ]*[eE]nd" $1`
 
-    if [ "$fatalError" ] ; then
+    if [ "$fatalError" ]
+    then
         echo "$appAndCase: ** FOAM FATAL ERROR **"
         return
-    elif [ "$UxSS" -a "$UySS" -a "$UzSS" ] ; then
+    elif [ "$UxSS" -a "$UySS" -a "$UzSS" ]
+    then
         echo "$appAndCase: ** Solution singularity **"
         return
-    elif [ "$completed" ] ; then
+    elif [ "$completed" ]
+    then
         completionTime=`tail -10 $log | grep Execution | cut -d= -f2 | sed 's/^[ \t]*//'`
-        if [ "$completionTime" ] ; then
+        if [ "$completionTime" ]
+        then
             completionTime="in $completionTime"
         fi
         echo "$appAndCase: completed $completionTime"
@@ -90,5 +94,4 @@ done
 
 find . -name "log.*" -exec cat {} \; >> logs
 
-
 # ----------------------------------------------------------------- end-of-file

tutorials/Alltest

@@ -27,24 +27,29 @@
 #     Alltest
 #
 # Description
+#     quickly tests the tutorials and writes out the scheme/solver information
 #
 #------------------------------------------------------------------------------
 
 cd ${0%/*} || exit 1    # run from this directory
 
-# FUNCTIONS
+usage() {
-#
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
-printUsage () {
+    cat<<USAGE
-cat <<EOF
-Usage: $0
-Quickly tests the tutorials and writes out the scheme/solver information
 
-Options are:
+usage: $0 [OPTION]
+
+options:
   -d            sets up a default scheme on all schemes
--h         help
+  -h            this usage
-EOF
+
+* quickly tests the tutorials and writes out the scheme/solver information
+
+USAGE
+    exit 1
 }
 
+
 setDefaultFvSchemes() {
 cat<<EOF
 gradSchemes { default Gauss linear; }
@@ -72,23 +77,27 @@ snGradSchemes { default corrected; }
 fluxRequired { default yes; }
 EOF
 }
+
 #
 # VARIABLE
 #
-MAIN_CONTROL_DICT=
+unset MAIN_CONTROL_DICT
 
 for i in \
-  $HOME/.$WM_PROJECT-$WM_PROJECT_VERSION \
     $HOME/.$WM_PROJECT/$WM_PROJECT_VERSION \
     $HOME/.$WM_PROJECT \
     $WM_PROJECT_DIR/etc \
     ;
 do
-  if [ -f "$i/controlDict" ]; then
+    if [ -f "$i/controlDict" ]
+    then
         MAIN_CONTROL_DICT="$i/controlDict"
         break
     fi
 done
+
+[ -f "$MAIN_CONTROL_DICT" ] || usage "main controlDict not found"
+
 TUTORIALS_DIR=.
 TEST_RUN_DIR=../tutorialsTest
 FV_SCHEMES=\
@@ -110,16 +119,16 @@ DEFAULT_SCHEMES=0
 # OPTIONS
 #
 OPTS=`getopt hd $*`
-if [ $? -ne 0 ] ; then
+if [ $? -ne 0 ]
-    echo "Aborting due to invalid option"
+then
-    printUsage
+    usage "Aborting due to invalid option"
-    exit 1
 fi
 eval set -- "$OPTS"
-while [ $1 != -- ]; do
+while [ $1 != -- ]
+do
     case $1 in
         -d) DEFAULT_SCHEMES=1;;
-        -h) printUsage; exit 1;;
+        -h) usage;;
     esac
     shift
 done
@@ -129,14 +138,15 @@ shift
 # MAIN
 #
 
-if [ -d "$TEST_RUN_DIR" ] ; then
+if [ -d "$TEST_RUN_DIR" ]
+then
     rm -rf $TEST_RUN_DIR
 fi
 
 echo "Modifying ${MAIN_CONTROL_DICT}"
 if [ -e ${MAIN_CONTROL_DICT}.org ]
 then
-    echo "File " ${MAIN_CONTROL_DICT}.org " already exists"
+    echo "File ${MAIN_CONTROL_DICT}.org already exists"
     echo "Did Alltest fail in some way and then run again?"
     exit 1
 fi
@@ -155,7 +165,7 @@ echo "Copying the tutorials"
 cp -a ${TUTORIALS_DIR} ${TEST_RUN_DIR}
 
 echo "Modifying the controlDicts to run only one time step"
-cd ${TEST_RUN_DIR}
+cd ${TEST_RUN_DIR} || exit 1
 
 for CD in `find . -name "controlDict*"`
 do
@@ -168,7 +178,8 @@ do
     ${CD}.org > ${CD}
 done
 
-if [ $DEFAULT_SCHEMES = 1 ] ; then
+if [ $DEFAULT_SCHEMES = 1 ]
+then
     echo "Modifying the fvSchemes to contain only default schemes"
     for FV_SC in `find . -name fvSchemes`
     do
@@ -205,7 +216,8 @@ do
             done
         echo `grep solver ${LOG} | cut -d" " -f4` >> $SOLVERS_TEMP
         done
-        if [ -f $SCHEMES_TEMP ] ; then
+        if [ -f $SCHEMES_TEMP ]
+        then
             cat $SCHEMES_TEMP | sort -u >> $SCHEMES_FILE
         fi
     done