Merge remote-tracking branch 'origin/nr/HenrikRusche' into nextRelease

applications/utilities/preProcessing/mdInitialise/Make/options

@@ -1,6 +1,5 @@
 EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/lagrangian/molecularDynamics/molecule/lnInclude \
     -I$(LIB_SRC)/lagrangian/molecularDynamics/potential/lnInclude \
     -I$(LIB_SRC)/lagrangian/molecularDynamics/molecularMeasurements/lnInclude \
@@ -9,7 +8,6 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lmeshTools \
-    -ldynamicMesh \
     -lfiniteVolume \
     -llagrangian \
     -lmolecule \

src/decompositionMethods/decompositionMethods/Make/options

@@ -3,4 +3,6 @@ EXE_INC =
 LIB_LIBS = \
     -L$(FOAM_LIBBIN)/dummy \
     -L$(FOAM_MPI_LIBBIN) \
-    -lscotchDecomp
+    -lscotchDecomp \
+    -lmetisDecomp \
+    -lparMetisDecomp

testHarness/OpenFOAM/1.6-ext/runDir/Allrun_Experimental

@@ -71,6 +71,13 @@ then
     exit -1
 fi
 
+# Install Hydro-Quebec Tools if necessary
+command -v pyFoamChangeMixingPlaneBoundary.py >/dev/null
+if [ $? -ne 0 ];
+then
+    ${WM_THIRD_PARTY_DIR}/AllMake.stage6
+fi
+
 # Make sure the CMake and tutorials runtime files are updated
 # We need cmake version 2.8.0 at least
 cmake $WM_PROJECT_DIR

testHarness/OpenFOAM/1.6-ext/runDir/Allrun_Nightly

@@ -71,6 +71,13 @@ then
     exit -1
 fi
 
+# Install Hydro-Quebec Tools if necessary
+command -v pyFoamChangeMixingPlaneBoundary.py >/dev/null
+if [ $? -ne 0 ];
+then
+    ${WM_THIRD_PARTY_DIR}/AllMake.stage6
+fi
+
 # Make sure the CMake and tutorials runtime files are updated
 # We need cmake version 2.8.0 at least
 cmake $WM_PROJECT_DIR