Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-plus into develop

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H

@@ -50,7 +50,7 @@
         {
             fvScalarMatrix p_rghEqn
             (
-                p_rghDDtEqn
+                p_rghDDtEqn()
               + fvc::div(phiHbyA)
               - fvm::laplacian(rhorAUf, p_rgh)
             );

tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/controlDict

@@ -29,7 +29,7 @@ deltaT          10;
 
 writeControl    adjustableRunTime;
 
-writeInterval   800;
+writeInterval   1000;
 
 purgeWrite      0;
 

tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/cabin/U

@@ -28,8 +28,8 @@ boundaryField
     }
     outlet
     {
-//        type            pressureInletOutletVelocity;
+        type            pressureInletOutletVelocity;
-        type            inletOutlet;
+        //type            inletOutlet;
         inletValue      uniform (0 0 0);
         value           uniform (0 0 0);
     }

tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/cabin/p_rgh

@@ -29,7 +29,11 @@ boundaryField
     }
     outlet
     {
-        type            fixedValue;
+        type            totalPressure;
+        rho             rho;
+        psi             none;
+        gamma           1;
+        p0              uniform 100000;
         value           uniform 100000;
     }
     symmetry

tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/exterior/alphat

@@ -32,7 +32,8 @@ boundaryField
     }
     exterior_to_ice
     {
-        type            calculated;
+        type            compressible::alphatWallFunction;
+        Prt             0.85;
         value           uniform 0;
     }
 }

tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/cabin/fvSchemes

@@ -23,15 +23,15 @@ ddtSchemes
 gradSchemes
 {
     default         Gauss linear;
-    grad(p_rgh)         Gauss linear;
+    grad(U)         cellLimited Gauss linear 1;
 }
 
 divSchemes
 {
     default         none;
-    div(phi,U)      Gauss linearUpwind grad(U);
+    div(phi,U)      Gauss upwind;
     div(phi,K)      Gauss linear;
-    div(phi,h)      Gauss limitedLinear 1;
+    div(phi,h)      Gauss upwind;
     div(phi,k)      Gauss limitedLinear 1;
     div(phi,omega)  Gauss limitedLinear 1;
     div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;

tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/cabin/fvSolution

@@ -63,9 +63,8 @@ solvers
 
 PIMPLE
 {
-    momentumPredictor yes;
+    momentumPredictor no;
-    nOuterCorrectors 1;
+    nCorrectors     1;
-    nCorrectors     2;
     nNonOrthogonalCorrectors 0;
 }
 

tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/controlDict

@@ -47,7 +47,7 @@ runTimeModifiable true;
 
 adjustTimeStep  yes;
 
-maxCo           1;
+maxCo           5;
 
 maxDeltaT       1;
 

tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/exterior/fvSchemes

@@ -23,17 +23,17 @@ ddtSchemes
 gradSchemes
 {
     default         Gauss linear;
-    grad(p_rgh)         Gauss linear;
+    grad(U)         cellLimited Gauss linear 1;
 }
 
 divSchemes
 {
     default         none;
-    div(phi,U)      Gauss linearUpwind grad(U);
+    div(phi,U)      Gauss upwind;//linearUpwind grad(U);
     div(phi,K)      Gauss linear;
-    div(phi,h)      Gauss limitedLinear 1;
+    div(phi,h)      Gauss upwind;
-    div(phi,k)      Gauss limitedLinear 1;
+    div(phi,k)      Gauss upwind;
-    div(phi,omega)  Gauss limitedLinear 1;
+    div(phi,omega)  Gauss upwind;
     div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 

tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/exterior/fvSolution

@@ -63,8 +63,7 @@ solvers
 
 PIMPLE
 {
-    momentumPredictor yes;
+    momentumPredictor no;
-    nOuterCorrectors 1;
     nCorrectors     2;
     nNonOrthogonalCorrectors 0;
 }

tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/fvSchemes

@@ -17,50 +17,26 @@ FoamFile
 
 ddtSchemes
 {
-    default         Euler;
 }
 
 gradSchemes
 {
-    default         Gauss linear;
-    grad(p_rgh)         Gauss linear;
 }
 
 divSchemes
 {
-    default         none;
-    div(phi,U)      Gauss linearUpwind grad(U);
-    div(phi,K)      Gauss linear;
-    div(phi,h)      Gauss limitedLinear 1;
-    div(phi,k)      Gauss limitedLinear 1;
-    div(phi,omega)  Gauss limitedLinear 1;
-    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
 {
-    default         none;
-    laplacian((rho*nuEff),U) Gauss linear corrected;
-    laplacian(DkEff,k) Gauss linear corrected;
-    laplacian(DomegaEff,omega) Gauss linear corrected;
-    laplacian(rAUf,p_rgh) Gauss linear corrected;
-    laplacian(alphaEff,h) Gauss linear corrected;
 }
 
 interpolationSchemes
 {
-    default         linear;
 }
 
 snGradSchemes
 {
-    default         corrected;
-}
-
-fluxRequired
-{
-    default         no;
-    p_rgh               ;
 }
 
 

tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/fvSolution

@@ -15,69 +15,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-solvers
-{
-    p_rgh
-    {
-        solver          GAMG;
-        tolerance       1e-06;
-        relTol          0.1;
-        smoother        GaussSeidel;
-        nPreSweeps      0;
-        nPostSweeps     2;
-        nFinestSweeps   2;
-        cacheAgglomeration true;
-        nCellsInCoarsestLevel 10;
-        agglomerator    faceAreaPair;
-        mergeLevels     1;
-    }
-
-    p_rghFinal
-    {
-        $p_rgh;
-        smoother        DICGaussSeidel;
-        relTol          0;
-    }
-
-    "rho.*"
-    {
-        $p_rgh;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    "(U|h|R|k|epsilon|omega)"
-    {
-        solver          smoothSolver;
-        smoother        symGaussSeidel;
-        tolerance       1e-05;
-        relTol          0.1;
-    }
-
-    "(U|h|R|k|epsilon|omega)Final"
-    {
-        $U;
-        relTol          0;
-    }
-}
-
 PIMPLE
 {
-    momentumPredictor yes;
+    nOuterCorrectors 2;
-    nOuterCorrectors 1;
-    nCorrectors     2;
-    nNonOrthogonalCorrectors 0;
-}
-
-relaxationFactors
-{
-    fields
-    {
-    }
-    equations
-    {
-        ".*"        1;
-    }
 }
 
 // ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/ice/fvSchemes

@@ -38,9 +38,9 @@ divSchemes
 laplacianSchemes
 {
     default         none;
-    laplacian((rho*nuEff),U) Gauss linear corrected;
+    laplacian((rho*nuEff),U) Gauss linear limited corrected 0.333;
-    laplacian(rhorAUf,p_rgh) Gauss linear corrected;
+    laplacian(rhorAUf,p_rgh) Gauss linear limited corrected 0.333;
-    laplacian(thermo:alpha,h) Gauss linear corrected;
+    laplacian(thermo:alpha,h) Gauss linear limited corrected 0.333;
 }
 
 interpolationSchemes
@@ -50,7 +50,7 @@ interpolationSchemes
 
 snGradSchemes
 {
-    default         corrected;
+    default         limited corrected 0.333;
 }
 
 fluxRequired

tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/ice/fvSolution

@@ -46,7 +46,7 @@ solvers
         solver          PCG;
         preconditioner  DIC;
         tolerance       1e-07;
-        relTol          0.05;
+        relTol          0.01;
     }
 
     p_rghFinal
@@ -80,8 +80,7 @@ solvers
 PIMPLE
 {
     momentumPredictor no;
-    nOuterCorrectors 1;
+    nCorrectors     1;
-    nCorrectors     2;
     nNonOrthogonalCorrectors 0;
 }