From cbdba6b471dc03a219e0566b871c81f3de62f1c5 Mon Sep 17 00:00:00 2001 From: mattijs Date: Thu, 20 Sep 2012 15:19:25 +0100 Subject: [PATCH] GIT: revert: revert bad commit b6c4e144c43f3db1ad949932ed157034f6fb55f8 --- .../displacementSBRStressFvMotionSolver.C | 34 ++----------------- .../displacementSBRStressFvMotionSolver.H | 2 -- .../angledDuct/system/controlDict | 2 +- .../squareBend/system/controlDict | 2 +- .../iglooWithFridges/system/snappyHexMeshDict | 26 ++------------ .../cavity/constant/polyMesh/blockMeshDict | 2 -- .../angledDuctImplicit/system/controlDict | 2 +- .../SnakeRiverCanyon/system/controlDict | 8 ++--- .../snappyHexMesh/flange/system/controlDict | 2 +- .../flange/system/snappyHexMeshDict | 14 ++++---- 10 files changed, 21 insertions(+), 73 deletions(-) diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C index 2b5e23e9a9..04edda45ee 100644 --- a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C +++ b/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 > 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()); - } - } diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H index 4d68cfc421..6d31eec067 100644 --- a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H +++ b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H @@ -64,8 +64,6 @@ class displacementSBRStressFvMotionSolver //- Diffusivity used to control the motion autoPtr diffusivityPtr_; - //- Solve on base mesh - Switch solveOnPoints0_; // Private Member Functions diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/system/controlDict b/tutorials/compressible/rhoPimplecFoam/angledDuct/system/controlDict index 1b3d162cd4..bbcbeb2543 100644 --- a/tutorials/compressible/rhoPimplecFoam/angledDuct/system/controlDict +++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/system/controlDict @@ -17,7 +17,7 @@ FoamFile application rhoPimplecFoam; -startFrom latestTime; //startTime; +startFrom startTime; startTime 0; diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/system/controlDict b/tutorials/compressible/rhoSimplecFoam/squareBend/system/controlDict index 05897adb0f..b8a661c3d6 100644 --- a/tutorials/compressible/rhoSimplecFoam/squareBend/system/controlDict +++ b/tutorials/compressible/rhoSimplecFoam/squareBend/system/controlDict @@ -17,7 +17,7 @@ FoamFile application rhoSimplecFoam; -startFrom latestTime; //startTime; +startFrom startTime; startTime 0; diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict index 003d8a6db6..8297dae5af 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict +++ b/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 0; //! Only since blockMesh aligned with surfaces it is - // actually beneficial to run with 0 smoothing. -nSmoothPatch 1; + nSmoothPatch 3; //- 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. diff --git a/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/blockMeshDict b/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/blockMeshDict index 5d093d39cf..165a600c7b 100644 --- a/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/blockMeshDict +++ b/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 { diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict index 95917db136..4fb10f0a09 100644 --- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict +++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict @@ -17,7 +17,7 @@ FoamFile application porousSimpleFoam; -startFrom latestTime; //startTime; +startFrom startTime; startTime 0; diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/controlDict b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/controlDict index 0b45565823..e551ed0c7f 100644 --- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/controlDict +++ b/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; diff --git a/tutorials/mesh/snappyHexMesh/flange/system/controlDict b/tutorials/mesh/snappyHexMesh/flange/system/controlDict index 928fd07ac4..e20d3954ed 100644 --- a/tutorials/mesh/snappyHexMesh/flange/system/controlDict +++ b/tutorials/mesh/snappyHexMesh/flange/system/controlDict @@ -17,7 +17,7 @@ FoamFile application icoFoam; -startFrom latestTime; +startFrom startTime; startTime 0; diff --git a/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict b/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict index 0111006ee3..520d52950f 100644 --- a/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict +++ b/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"; -// level 0; -// } + { + file "flange.eMesh"; + 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; }