From 591c495f63e9fde373c6cf57281592b9f84d279b Mon Sep 17 00:00:00 2001
From: Henrik Rusche <h.rusche@wikki-gmbh.de>
Date: Wed, 25 May 2016 14:46:38 +0200
Subject: [PATCH] BUGFIX: Merge errors

---
 .../1DPODdiffusion/system/fvSolution          |  2 +-
 .../PODSolver/1DPODsin/system/fvSolution      |  2 +-
 .../mixerVessel2D/system/fvSolution           |  2 +-
 .../pitchingPlate/system/fvSolution           | 16 ++++++--------
 .../axialTurbine/system/fvSolution            |  6 +++++
 .../pimpleDyMFoam/movingCone/system/fvSchemes |  2 +-
 .../movingCone/system/fvSolution              | 10 ++++++---
 .../movingCylinders/system/fvSolution         | 22 +++++++------------
 8 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/tutorials/basic/PODSolver/1DPODdiffusion/system/fvSolution b/tutorials/basic/PODSolver/1DPODdiffusion/system/fvSolution
index 913200f86..4af6408ec 100644
--- a/tutorials/basic/PODSolver/1DPODdiffusion/system/fvSolution
+++ b/tutorials/basic/PODSolver/1DPODdiffusion/system/fvSolution
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-T
+solvers
 {
     solver          PBiCG;
     preconditioner  DILU;
diff --git a/tutorials/basic/PODSolver/1DPODsin/system/fvSolution b/tutorials/basic/PODSolver/1DPODsin/system/fvSolution
index 913200f86..4af6408ec 100644
--- a/tutorials/basic/PODSolver/1DPODsin/system/fvSolution
+++ b/tutorials/basic/PODSolver/1DPODsin/system/fvSolution
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-T
+solvers
 {
     solver          PBiCG;
     preconditioner  DILU;
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/fvSolution b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/fvSolution
index a62d3ed4d..aaf804168 100644
--- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/fvSolution
+++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/fvSolution
@@ -111,7 +111,7 @@ PIMPLE
 
 relaxationFactors
 {
-    U               1;
+    "U.*"           1;
     h               1;
     k               1;
     epsilon         1;
diff --git a/tutorials/immersedBoundary/pitchingPlate/system/fvSolution b/tutorials/immersedBoundary/pitchingPlate/system/fvSolution
index 127c5f224..4d18e8a75 100644
--- a/tutorials/immersedBoundary/pitchingPlate/system/fvSolution
+++ b/tutorials/immersedBoundary/pitchingPlate/system/fvSolution
@@ -16,7 +16,7 @@ FoamFile
 
 solvers
 {
-      p
+    p
     {
         solver           PCG;
         preconditioner   DIC;
@@ -39,14 +39,6 @@ solvers
     }
 }
 
-SIMPLE
-{
-    nNonOrthogonalCorrectors 5;
-
-    pRefPoint (0 -0.45 0.05);
-    pRefValue 0;
-}
-
 PIMPLE
 {
     nOuterCorrectors 2;
@@ -57,4 +49,10 @@ PIMPLE
     pRefValue 0;
 }
 
+relaxationFactors
+{
+    "U.*"           1;
+}
+
+
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/axialTurbine/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/axialTurbine/system/fvSolution
index 6dd251abb..c8311a742 100644
--- a/tutorials/incompressible/pimpleDyMFoam/axialTurbine/system/fvSolution
+++ b/tutorials/incompressible/pimpleDyMFoam/axialTurbine/system/fvSolution
@@ -32,6 +32,12 @@ solvers
         relTol          0.1;
     }
 
+    UFinal
+    {
+        $U;
+        relTol          0;
+    }
+
     "(k|epsilon)"
     {
         solver          PBiCG;
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes
index 406f01576..57cd676f0 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes
@@ -30,7 +30,7 @@ divSchemes
 {
     default         none;
     div(phi,U)      Gauss linear grad(U);
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution
index 67f4a6b08..bc0a3b233 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution
@@ -35,9 +35,7 @@ solvers
 
     pFinal
     {
-        solver          PCG;
-        preconditioner  DIC;
-        tolerance       1e-06;
+        $p;
         relTol          0;
     }
 
@@ -49,6 +47,12 @@ solvers
         relTol          0;
     }
 
+    UFinal
+    {
+        $U;
+        relTol          0;
+    }
+
     cellMotionUx
     {
         solver          PCG;
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCylinders/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/movingCylinders/system/fvSolution
index ec303e4fc..8d8f48ce5 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCylinders/system/fvSolution
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCylinders/system/fvSolution
@@ -28,6 +28,7 @@ solvers
     }
     p
     {
+        $p;
         solver           CG;
         preconditioner   DIC;
 
@@ -38,12 +39,7 @@ solvers
     }
     pFinal
     {
-        solver           CG;
-        preconditioner   DIC;
-
-        minIter          0;
-        maxIter          1000;
-        tolerance        1e-06;
+        $p;
         relTol           0;
     }
     U
@@ -56,6 +52,12 @@ solvers
         tolerance        1e-07;
         relTol           0;
     }
+
+    UFinal
+    {
+        $U;
+        relTol           0;
+    }
 }
 
 PIMPLE
@@ -69,14 +71,6 @@ PIMPLE
     pRefValue 0;
 }
 
-SIMPLE
-{
-    nNonOrthogonalCorrectors 4;
-
-    pRefCell 0;
-    pRefValue 0;
-}
-
 relaxationFactors
 {
     U       0.7;