Merge remote-tracking branch 'origin/master' into develop

2025-11-28 03:28:01 +00:00 · 2017-12-06 12:52:12 +00:00
parent 6b97bf54ab 1af512ae51
commit b137005449
20 changed files with 609 additions and 33 deletions
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/UEqn.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/UEqn.H
@ -16,17 +16,20 @@

    fvOptions.constrain(UEqn);

-    solve
-    (
-        UEqn
-     ==
-        fvc::reconstruct
+    if (momentumPredictor)
+    {
+        solve
        (
+            UEqn
+        ==
+            fvc::reconstruct
            (
-              - ghf*fvc::snGrad(rho)
-              - fvc::snGrad(p_rgh)
-            )*mesh.magSf()
-        )
-    );
+                (
+                - ghf*fvc::snGrad(rho)
+                - fvc::snGrad(p_rgh)
+                )*mesh.magSf()
+            )
+        );

-    fvOptions.correct(U);
+        fvOptions.correct(U);
+    }
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/readFluidMultiRegionSIMPLEControls.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/readFluidMultiRegionSIMPLEControls.H
@ -2,3 +2,6 @@

    const int nNonOrthCorr =
        simple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
+
+    const bool momentumPredictor =
+        simple.lookupOrDefault("momentumPredictor", true);