Merge commit 'origin/master' into olesenm

applications/utilities/parallelProcessing/decomposePar/Make/options

@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I../decompositionMethods/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/decompositionAgglomeration/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude
 

applications/utilities/parallelProcessing/decomposePar/decomposeParDict

@@ -21,6 +21,9 @@ FoamFile
 
 numberOfSubdomains   4;
 
+//preservePatches (inlet);
+//preserveFaceZones (heater solid1 solid3);
+
 method               simple;
 //method               hierarchical;
 //method               metis;
@@ -39,6 +42,17 @@ hierarchicalCoeffs
     order                xyz;
 }
 
+metisCoeffs
+{
+    //processorWeights 
+    //(
+    //    1
+    //    1
+    //    1
+    //    1
+    //);
+}
+
 manualCoeffs
 {
     dataFile             "decompositionData";