Merge branch 'master' of github.com:OpenFOAM/OpenFOAM-dev

etc/templates/axisymmetricJet/system/fvSolution

@@ -20,10 +20,6 @@ solvers
     {
         solver          GAMG;
         smoother        GaussSeidel;
-        cacheAgglomeration on;          // Need to make this default?
-        agglomerator    faceAreaPair;   // Need to make this default?
-        nCellsInCoarsestLevel 10;       // Need to make this default?
-        mergeLevels     1;              // Need to make this default
         tolerance       1e-6;
         relTol          0.1;
     }

etc/templates/closedVolume/system/fvSolution

@@ -20,10 +20,6 @@ solvers
     {
         solver          GAMG;
         smoother        GaussSeidel;
-        cacheAgglomeration on;          // Need to make this default?
-        agglomerator    faceAreaPair;   // Need to make this default?
-        nCellsInCoarsestLevel 10;       // Need to make this default?
-        mergeLevels     1;              // Need to make this default
         tolerance       1e-6;
         relTol          0.1;
     }

etc/templates/closedVolume/system/snappyHexMeshDict

@@ -94,7 +94,7 @@ meshQualityControls
 
 writeFlags
 (
-    scalarLevels
+//    scalarLevels
     layerSets
     layerFields
 );

etc/templates/closedVolumeRotating/system/fvSolution

@@ -20,10 +20,6 @@ solvers
     {
         solver          GAMG;
         smoother        GaussSeidel;
-        cacheAgglomeration on;          // Need to make this default?
-        agglomerator    faceAreaPair;   // Need to make this default?
-        nCellsInCoarsestLevel 10;       // Need to make this default?
-        mergeLevels     1;              // Need to make this default
         tolerance       1e-6;
         relTol          0.1;
     }

etc/templates/closedVolumeRotating/system/snappyHexMeshDict

@@ -116,7 +116,7 @@ meshQualityControls
 
 writeFlags
 (
-    scalarLevels
+//    scalarLevels
     layerSets
     layerFields
 );

etc/templates/compressibleInflowOutflow/system/fvSolution

@@ -20,10 +20,6 @@ solvers
     {
         solver          GAMG;
         smoother        GaussSeidel;
-        cacheAgglomeration on;          // Need to make this default?
-        agglomerator    faceAreaPair;   // Need to make this default?
-        nCellsInCoarsestLevel 10;       // Need to make this default?
-        mergeLevels     1;              // Need to make this default
         tolerance       1e-6;
         relTol          0.1;
     }

etc/templates/compressibleInflowOutflow/system/snappyHexMeshDict

@@ -118,7 +118,7 @@ meshQualityControls
 
 writeFlags
 (
-    scalarLevels
+//    scalarLevels
     layerSets
     layerFields
 );

etc/templates/inflowOutflow/system/fvSolution

@@ -20,10 +20,6 @@ solvers
     {
         solver          GAMG;
         smoother        GaussSeidel;
-        cacheAgglomeration on;          // Need to make this default?
-        agglomerator    faceAreaPair;   // Need to make this default?
-        nCellsInCoarsestLevel 10;       // Need to make this default?
-        mergeLevels     1;              // Need to make this default
         tolerance       1e-6;
         relTol          0.1;
     }

etc/templates/inflowOutflow/system/snappyHexMeshDict

@@ -118,7 +118,7 @@ meshQualityControls
 
 writeFlags
 (
-    scalarLevels
+//    scalarLevels
     layerSets
     layerFields
 );

etc/templates/inflowOutflowRotating/system/fvSolution

@@ -20,10 +20,6 @@ solvers
     {
         solver          GAMG;
         smoother        GaussSeidel;
-        cacheAgglomeration on;          // Need to make this default?
-        agglomerator    faceAreaPair;   // Need to make this default?
-        nCellsInCoarsestLevel 10;       // Need to make this default?
-        mergeLevels     1;              // Need to make this default
         tolerance       1e-6;
         relTol          0.1;
     }

etc/templates/inflowOutflowRotating/system/snappyHexMeshDict

@@ -145,7 +145,7 @@ meshQualityControls
 
 writeFlags
 (
-    scalarLevels
+//    scalarLevels
     layerSets
     layerFields
 );