From 6da33eb08a80f4af6a1cda5088cf4f6ea2e59653 Mon Sep 17 00:00:00 2001 From: Zhi Chen Date: Tue, 13 Jun 2023 15:32:44 +0800 Subject: [PATCH 1/3] Update EEqn.H, change alphaEff to alpha for laminar --- applications/solvers/dfLowMachFoam/EEqn.H | 30 ++++++++++------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/applications/solvers/dfLowMachFoam/EEqn.H b/applications/solvers/dfLowMachFoam/EEqn.H index d72cc335a..a7ec9c742 100644 --- a/applications/solvers/dfLowMachFoam/EEqn.H +++ b/applications/solvers/dfLowMachFoam/EEqn.H @@ -3,29 +3,25 @@ fvScalarMatrix EEqn ( - turbName == "laminar" - ? - ( - fvm::ddt(rho, he) + mvConvection->fvmDiv(phi, he) - + fvc::ddt(rho, K) + fvc::div(phi, K) - - dpdt - - fvm::laplacian(turbulence->alphaEff(), he) - + diffAlphaD - == - fvc::div(hDiffCorrFlux) - ) - : - ( + fvm::ddt(rho, he) + mvConvection->fvmDiv(phi, he) + fvc::ddt(rho, K) + fvc::div(phi, K) - dpdt - - fvm::laplacian(turbulence->alphaEff(), he) - ) + turbName == "laminar" + ? + ( + - fvm::laplacian(turbulence->alpha(), he) + + diffAlphaD + == + fvc::div(hDiffCorrFlux) + ) + : + ( + - fvm::laplacian(turbulence->alphaEff(), he) + ) ); EEqn.relax(); EEqn.solve("ha"); - - } From 9dc84d7a39a0bbd29a3ef17f29d94a3ae02a8053 Mon Sep 17 00:00:00 2001 From: Zhi Chen Date: Wed, 14 Jun 2023 00:29:21 +0800 Subject: [PATCH 2/3] Update EEqn.H --- applications/solvers/dfLowMachFoam/EEqn.H | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/applications/solvers/dfLowMachFoam/EEqn.H b/applications/solvers/dfLowMachFoam/EEqn.H index a7ec9c742..23da67be3 100644 --- a/applications/solvers/dfLowMachFoam/EEqn.H +++ b/applications/solvers/dfLowMachFoam/EEqn.H @@ -7,17 +7,17 @@ fvm::ddt(rho, he) + mvConvection->fvmDiv(phi, he) + fvc::ddt(rho, K) + fvc::div(phi, K) - dpdt + == turbName == "laminar" ? ( - - fvm::laplacian(turbulence->alpha(), he) - + diffAlphaD - == - fvc::div(hDiffCorrFlux) + fvm::laplacian(turbulence->alpha(), he) + - diffAlphaD + + fvc::div(hDiffCorrFlux) ) : ( - - fvm::laplacian(turbulence->alphaEff(), he) + fvm::laplacian(turbulence->alphaEff(), he) ) ); From 30633ea83df54c951bf097b7ac1fac7aef68c715 Mon Sep 17 00:00:00 2001 From: Zhi Chen Date: Wed, 14 Jun 2023 09:21:28 +0800 Subject: [PATCH 3/3] Update EEqn.H --- applications/solvers/dfLowMachFoam/EEqn.H | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/applications/solvers/dfLowMachFoam/EEqn.H b/applications/solvers/dfLowMachFoam/EEqn.H index 23da67be3..73b972cc3 100644 --- a/applications/solvers/dfLowMachFoam/EEqn.H +++ b/applications/solvers/dfLowMachFoam/EEqn.H @@ -8,16 +8,18 @@ + fvc::ddt(rho, K) + fvc::div(phi, K) - dpdt == - turbName == "laminar" - ? ( - fvm::laplacian(turbulence->alpha(), he) - - diffAlphaD - + fvc::div(hDiffCorrFlux) - ) - : - ( - fvm::laplacian(turbulence->alphaEff(), he) + turbName == "laminar" + ? + ( + fvm::laplacian(turbulence->alpha(), he) + - diffAlphaD + + fvc::div(hDiffCorrFlux) + ) + : + ( + fvm::laplacian(turbulence->alphaEff(), he) + ) ) );