Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-plus into develop

etc/config.csh/mpi

@@ -49,7 +49,7 @@ case SYSTEMOPENMPI:
     breaksw
 
 case OPENMPI:
-    setenv FOAM_MPI openmpi-2.1.1
+    setenv FOAM_MPI openmpi-1.10.4
     _foamEtc config.csh/openmpi                 # <- Adjustments (optional)
 
     setenv MPI_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI

etc/config.sh/mpi

@@ -55,7 +55,7 @@ SYSTEMOPENMPI)
     ;;
 
 OPENMPI)
-    export FOAM_MPI=openmpi-2.1.1
+    export FOAM_MPI=openmpi-1.10.4
     _foamEtc config.sh/openmpi                  # <- Adjustments (optional)
 
     export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI

tutorials/incompressible/lumpedPointMotion/building/Allrun.move

@@ -27,13 +27,18 @@ linkParallelCase()
 
     echo "Linking $dst parallel case from $src"
     mkdir $dst
-    for i in constant system
+
+    # Copy system - may wish to change things
+    for i in system 0
     do
-        cp -r $src/$i $dst
+        echo "    copy $i/"
+        ( cd $dst && cp -r ../$src/$i . )
     done
 
-    echo "    link processor directories with $# times: $@"
+    echo "    link constant/"
+    ( cd $dst && ln -sf ../$src/constant . )
 
+    echo "    link processor*/ with $# times: $@"
     for proc in $(cd $src && \ls -d processor*)
     do
         ( cd $dst && ln -sf ../$src/$proc . )

tutorials/incompressible/lumpedPointMotion/building/files/Allrun.movement

@@ -3,7 +3,8 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # The 0/ field only
-runApplication reconstructPar -withZero -time 0
+# runApplication reconstructPar -withZero -time 0
+runApplication reconstructParMesh -constant -withZero -time 0
 
 # Check the location of the pressure zones
 # runParallel lumpedPointZones    <<- Parallel file writing not yet done

tutorials/incompressible/lumpedPointMotion/building/files/Allrun.transient

@@ -2,6 +2,9 @@
 cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
+# Cleanup old junk that may prevent things from starting
+\rm -f comms/OpenFOAM.lock
+
 # If OpenFOAM stops prematurely, trigger the external solver to stop
 trap '[ -e comms/OpenFOAM.lock ] && echo "status=done" > comms/OpenFOAM.lock' EXIT TERM INT
 

tutorials/incompressible/lumpedPointMotion/building/steady/Allrun.pre

@@ -15,7 +15,7 @@ unset parallel
 parallel=true
 
 # Dummy 0 directory
-mkdir 0
+mkdir -p 0
 
 if [ "${parallel:-false}" = false ]
 then
@@ -39,6 +39,11 @@ else
 
     runParallel renumberMesh  -overwrite
 
+    # In case serial calculations are needed later
+
+    restore0Dir # Overwrite dummy 0 directory
+    # runApplication reconstructParMesh -constant
+
 fi