Merge pull request #295 from deepmodeling/zhixchen-patch-1

Update YEqn.H, rearrange laminar bool
deepmodeling · Jun 15, 2023 · caba74f · caba74f
2 parents fd2b033 + d14baf8
commit caba74f
Showing 1 changed file with 7 additions and 21 deletions.
diff --git a/applications/solvers/dfLowMachFoam/YEqn.H b/applications/solvers/dfLowMachFoam/YEqn.H
@@ -56,30 +56,19 @@ time_monitor_corrDiff += double(end - start) / double(CLOCKS_PER_SEC);
 
             fvScalarMatrix YiEqn
                 (
-                    (turbName == "laminar")
-                    ?
-                    (
                     fvm::ddt(rho, Yi)
-                +   mvConvection->fvmDiv(phi, Yi)
-                +   mvConvection->fvmDiv(phiUc, Yi)
-                ==
+                +
                     (
-                        splitting
-                    ?   fvm::laplacian(DEff(), Yi)
-                    :  (fvm::laplacian(DEff(), Yi) + combustion->R(Yi))
+                        turbName == "laminar"
+                        ?  (mvConvection->fvmDiv(phi, Yi) + mvConvection->fvmDiv(phiUc, Yi))
+                        :   mvConvection->fvmDiv(phi, Yi)
                     )
-                    )
-                    :
-                    (
-                    fvm::ddt(rho, Yi)
-                +   mvConvection->fvmDiv(phi, Yi)
                 ==
                     (
                         splitting
-                    ?   fvm::laplacian(DEff(), Yi)
-                    :  (fvm::laplacian(DEff(), Yi) + combustion->R(Yi))
-                    )
-                    )
+                        ?   fvm::laplacian(DEff(), Yi)
+                        :  (fvm::laplacian(DEff(), Yi) + combustion->R(Yi))
+                        )
                 );
 
             YiEqn.relax();
@@ -88,9 +77,6 @@ time_monitor_corrDiff += double(end - start) / double(CLOCKS_PER_SEC);
 
             Yi.max(0.0);
             Yt += Yi;
-
-
-
         }
     }