BUGFIX: Merge errors

tutorials/basic/PODSolver/1DPODdiffusion/system/fvSolution

@@ -15,12 +15,15 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 solvers
+{
+    T
     {
         solver          PBiCG;
         preconditioner  DILU;
         tolerance       1e-06;
         relTol          0;
     }
+}
 
 SIMPLE
 {

tutorials/basic/PODSolver/1DPODsin/system/fvSolution

@@ -15,12 +15,15 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 solvers
+{
+    T
     {
         solver          PBiCG;
         preconditioner  DILU;
         tolerance       1e-06;
         relTol          0;
     }
+}
 
 SIMPLE
 {

tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict

@@ -15,39 +15,300 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // General macros to create 2D/extruded-2D meshes
 
+
+
+
+
+
+
+
+
+
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 convertToMeters 0.1;
 
 // Hub radius
 
+
 // Impeller-tip radius
 
+
 // Baffle-tip radius
 
+
 // Tank radius
 
+
 // MRF region radius
 
+
 // Thickness of 2D slab
 
+
 // Base z
 
+
 // Top z
 
+
 // Number of cells radially between hub and impeller tip
 
+
 // Number of cells radially in each of the two regions between
 // impeller and baffle tips
 
+
 // Number of cells radially between baffle tip and tank
 
+
 // Number of cells azimuthally in each of the 8 blocks
 
+
 // Number of cells in the thickness of the slab
 
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 vertices

tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/fvSolution

@@ -112,7 +112,7 @@ PIMPLE
 relaxationFactors
 {
     "U.*"           1;
-    h               1;
+    "h.*"           1;
     k               1;
     epsilon         1;
 }

tutorials/immersedBoundary/pitchingPlate/system/fvSolution

@@ -39,6 +39,15 @@ solvers
     }
 }
 
+// for laplacianFoam
+SIMPLE
+{
+    nNonOrthogonalCorrectors 5;
+
+    pRefPoint (0 -0.45 0.05);
+    pRefValue 0;
+}
+
 PIMPLE
 {
     nOuterCorrectors 2;