diff --git a/applications/solvers/basic/laplacianFoam/laplacianFoam.C b/applications/solvers/basic/laplacianFoam/laplacianFoam.C index 08c398152..d025f6bb4 100644 --- a/applications/solvers/basic/laplacianFoam/laplacianFoam.C +++ b/applications/solvers/basic/laplacianFoam/laplacianFoam.C @@ -30,7 +30,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" - +#include "simpleControl.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -41,6 +41,9 @@ int main(int argc, char *argv[]) # include "createTime.H" # include "createMesh.H" + + simpleControl simple(mesh); + # include "createFields.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,9 +54,7 @@ int main(int argc, char *argv[]) { Info<< "Time = " << runTime.timeName() << nl << endl; -# include "readSIMPLEControls.H" - - for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) + while (simple.correctNonOrthogonal()) { solve ( diff --git a/tutorials/basic/laplacianFoam/Case1.1_mixingPlane_sector_AB_60deg/system/fvSchemes b/tutorials/basic/laplacianFoam/Case1.1_mixingPlane_sector_AB_60deg/system/fvSchemes index 3768f090e..150202974 100644 --- a/tutorials/basic/laplacianFoam/Case1.1_mixingPlane_sector_AB_60deg/system/fvSchemes +++ b/tutorials/basic/laplacianFoam/Case1.1_mixingPlane_sector_AB_60deg/system/fvSchemes @@ -35,7 +35,6 @@ divSchemes div(phi,R) Gauss upwind; div(R) Gauss linear; div(phi,nuTilda) Gauss upwind; - div((nuEff*dev(grad(U).T()))) Gauss linear; } laplacianSchemes @@ -62,12 +61,6 @@ snGradSchemes default corrected; } -fluxRequired -{ - default no; - p; -} - mixingPlane { default areaAveraging; diff --git a/tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary b/tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary index 78afd7dcf..3928133c7 100644 --- a/tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary +++ b/tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | foam-extend: Open Source CFD | -| \\ / O peration | Version: 3.2 | +| \\ / O peration | Version: 4.0 | | \\ / A nd | Web: http://www.foam-extend.org | | \\/ M anipulation | For copyright notice see file Copyright | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/basic/laplacianFoam/flange/system/fvSchemes b/tutorials/basic/laplacianFoam/flange/system/fvSchemes index f209524d4..3c4e61eae 100644 --- a/tutorials/basic/laplacianFoam/flange/system/fvSchemes +++ b/tutorials/basic/laplacianFoam/flange/system/fvSchemes @@ -47,10 +47,4 @@ snGradSchemes default corrected; } -fluxRequired -{ - default no; - T ; -} - // ************************************************************************* // diff --git a/tutorials/basic/laplacianFoam/twoBlocksMixingPlane/system/fvSchemes b/tutorials/basic/laplacianFoam/twoBlocksMixingPlane/system/fvSchemes index 25da1966b..038e70296 100644 --- a/tutorials/basic/laplacianFoam/twoBlocksMixingPlane/system/fvSchemes +++ b/tutorials/basic/laplacianFoam/twoBlocksMixingPlane/system/fvSchemes @@ -46,12 +46,6 @@ snGradSchemes default corrected; } -fluxRequired -{ - default no; - T; -} - mixingPlane { default zeroGradient; diff --git a/tutorials/basic/laplacianFoam/twoBlocksMixingPlaneMismatch/system/fvSchemes b/tutorials/basic/laplacianFoam/twoBlocksMixingPlaneMismatch/system/fvSchemes index b8890eb27..8c1ada5e5 100644 --- a/tutorials/basic/laplacianFoam/twoBlocksMixingPlaneMismatch/system/fvSchemes +++ b/tutorials/basic/laplacianFoam/twoBlocksMixingPlaneMismatch/system/fvSchemes @@ -46,12 +46,6 @@ snGradSchemes default corrected; } -fluxRequired -{ - default no; - T; -} - mixingPlane { default zeroGradient;