GIT: revert: revert bad commit b6c4e144c4

src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C

@@ -81,14 +81,8 @@ Foam::displacementSBRStressFvMotionSolver::displacementSBRStressFvMotionSolver
     diffusivityPtr_
     (
         motionDiffusivity::New(fvMesh_, coeffDict().lookup("diffusivity"))
-    ),
+    )
-    solveOnPoints0_(coeffDict().lookupOrDefault("solveOnPoints0", false))
+{}
-{
-    if (solveOnPoints0_)
-    {
-        Info<< type() << " : solving on points0" << endl;
-    }
-}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
@@ -129,18 +123,11 @@ void Foam::displacementSBRStressFvMotionSolver::solve()
     diffusivityPtr_->correct();
     pointDisplacement_.boundaryField().updateCoeffs();
 
-    pointField oldPoints;
-    if (solveOnPoints0_)
-    {
-        oldPoints = fvMesh_.points();
-        movePoints(points0());
-    }
-
     surfaceScalarField Df(diffusivityPtr_->operator()());
 
     volTensorField gradCd(fvc::grad(cellDisplacement_));
 
-    tmp<fvMatrix<vector> > laplacianDf
+    Foam::solve
     (
         fvm::laplacian
         (
@@ -148,16 +135,7 @@ void Foam::displacementSBRStressFvMotionSolver::solve()
             cellDisplacement_,
             "laplacian(diffusivity,cellDisplacement)"
         )
-    );
 
-//    if (solveOnPoints0_)
-//    {
-//        movePoints(oldPoints);
-//    }
-
-    Foam::solve
-    (
-        laplacianDf
       + fvc::div
         (
             Df
@@ -195,12 +173,6 @@ void Foam::displacementSBRStressFvMotionSolver::solve()
         )
         */
     );
-
-    if (solveOnPoints0_)
-    {
-        movePoints(points0());
-    }
-
 }
 
 

src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H

@@ -64,8 +64,6 @@ class displacementSBRStressFvMotionSolver
         //- Diffusivity used to control the motion
         autoPtr<motionDiffusivity> diffusivityPtr_;
 
-        //- Solve on base mesh
-        Switch solveOnPoints0_;
 
     // Private Member Functions
 

tutorials/compressible/rhoPimplecFoam/angledDuct/system/controlDict

@@ -17,7 +17,7 @@ FoamFile
 
 application     rhoPimplecFoam;
 
-startFrom       latestTime; //startTime;
+startFrom       startTime;
 
 startTime       0;
 

tutorials/compressible/rhoSimplecFoam/squareBend/system/controlDict

@@ -17,7 +17,7 @@ FoamFile
 
 application     rhoSimplecFoam;
 
-startFrom       latestTime; //startTime;
+startFrom       startTime;
 
 startTime       0;
 

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict

@@ -35,18 +35,6 @@ geometry
         radius 4;
     }
 
-//    // Define floor just so we have feature edges behave correctly
-//    floor
-//    {
-//        type searchablePlane;
-//        planeType       pointAndNormal;
-//        pointAndNormalDict
-//        {
-//            basePoint       (0 0 0);
-//            normalVector    (0 0 1);
-//        }
-//    }
-
     box1
     {
         type searchableBox;
@@ -199,11 +187,6 @@ castellatedMeshControls
             // Surface-wise min and max refinement level
             level (1 1);
         }
-//        floor
-//        {
-//            // Surface-wise min and max refinement level
-//            level (1 1);
-//        }
     }
 
     // Resolve sharp angles on fridges
@@ -252,10 +235,7 @@ snapControls
 {
     //- Number of patch smoothing iterations before finding correspondence
     //  to surface
-//    nSmoothPatch 3;
+    nSmoothPatch 3;
-//nSmoothPatch 0;     //! Only since blockMesh aligned with surfaces it is
-                    //  actually beneficial to run with 0 smoothing.
-nSmoothPatch 1;
 
     //- Relative distance for points to be attracted by surface feature point
     //  or edge. True distance is this factor times local
@@ -314,7 +294,7 @@ addLayersControls
     //  Relative to undistorted size of cell outside layer.
     //  is the thickness of the layer furthest away from the wall.
     //  See relativeSizes parameter.
-    finalLayerThickness 1;
+    finalLayerThickness 0.5;
 
     //- Minimum thickness of cell layer. If for any reason layer
     //  cannot be above minThickness do not add layer.
@@ -393,7 +373,7 @@ meshQualityControls
 // 1 : write intermediate meshes
 // 2 : write volScalarField with cellLevel for postprocessing
 // 4 : write current intersections as .obj files
-debug 7;
+debug 0;
 
 
 // Merge tolerance. Is fraction of overall bounding box of initial mesh.

tutorials/incompressible/icoFoam/cavity/constant/polyMesh/blockMeshDict

@@ -46,7 +46,6 @@ boundary
         (
             (3 7 6 2)
         );
-        inGroups (groupWall);
     }
     fixedWalls
     {
@@ -57,7 +56,6 @@ boundary
             (2 6 5 1)
             (1 5 4 0)
         );
-        inGroups (groupWall);
     }
     frontAndBack
     {

tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict

@@ -17,7 +17,7 @@ FoamFile
 
 application     porousSimpleFoam;
 
-startFrom       latestTime; //startTime;
+startFrom       startTime;
 
 startTime       0;
 

tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/controlDict

@@ -17,23 +17,23 @@ FoamFile
 
 application     moveDynamicMesh;
 
-startFrom       latestTime; //startTime;
+startFrom       startTime;
 
 startTime       0;
 
 stopAt          endTime;
 
-endTime         30;
+endTime         25;
 
 deltaT          1;
 
 writeControl    timeStep;
 
-writeInterval   1;
+writeInterval   5;
 
 purgeWrite      0;
 
-writeFormat     ascii;//binary;
+writeFormat     binary;
 
 writePrecision  6;
 

tutorials/mesh/snappyHexMesh/flange/system/controlDict

@@ -17,7 +17,7 @@ FoamFile
 
 application     icoFoam;
 
-startFrom       latestTime;
+startFrom       startTime;
 
 startTime       0;
 

tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict

@@ -16,7 +16,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // Which of the steps to run
-castellatedMesh false;
+castellatedMesh true;
 snap            true;
 addLayers       false;
 
@@ -85,10 +85,10 @@ castellatedMeshControls
     // This is a featureEdgeMesh, read from constant/triSurface for now.
     features
     (
-//        {
+        {
-//            file "flange.eMesh";
+            file "flange.eMesh";
-//            level 0;
+            level 0;
-//        }
+        }
     );
 
 
@@ -182,10 +182,10 @@ snapControls
         nFeatureSnapIter 10;
 
         //- Detect (geometric) features by sampling the surface
-        implicitFeatureSnap true;
+        implicitFeatureSnap false;
 
         //- Use castellatedMeshControls::features
-        explicitFeatureSnap false;
+        explicitFeatureSnap true;
 }