From 260db42f7f8562e5135bb4f90a7007dfd535a757 Mon Sep 17 00:00:00 2001 From: sergio Date: Thu, 17 Dec 2020 09:25:40 -0800 Subject: [PATCH] BUG: Correcting DPMIncompressibleTurbulenceModel in DPM solvers --- .../solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C | 3 ++- .../lagrangian/DPMFoam/DPMDyMFoam/MPPICDyMFoam/Make/options | 2 +- .../solvers/lagrangian/DPMFoam/DPMDyMFoam/Make/options | 2 +- applications/solvers/lagrangian/DPMFoam/DPMFoam.C | 3 ++- .../solvers/lagrangian/DPMFoam/MPPICFoam/Make/options | 2 +- applications/solvers/lagrangian/DPMFoam/Make/options | 3 +-- applications/solvers/lagrangian/DPMFoam/createFields.H | 5 +++-- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C b/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C index c74e340e18..f1d7b1777b 100644 --- a/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C +++ b/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2017 OpenFOAM Foundation + Copyright (C) 2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -36,7 +37,7 @@ Description #include "fvCFD.H" #include "dynamicFvMesh.H" #include "singlePhaseTransportModel.H" -#include "PhaseIncompressibleTurbulenceModel.H" +#include "DPMIncompressibleTurbulenceModel.H" #include "pimpleControl.H" #include "CorrectPhi.H" diff --git a/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/MPPICDyMFoam/Make/options b/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/MPPICDyMFoam/Make/options index 6890e83b4d..03b1e8a243 100644 --- a/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/MPPICDyMFoam/Make/options +++ b/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/MPPICDyMFoam/Make/options @@ -1,7 +1,7 @@ EXE_INC = \ -I.. \ -I../.. \ - -I../DPMTurbulenceModels/lnInclude \ + -I../../DPMTurbulenceModels \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ diff --git a/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/Make/options b/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/Make/options index 6ba7e67981..14fd3e8bf1 100644 --- a/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/Make/options +++ b/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/Make/options @@ -1,6 +1,6 @@ EXE_INC = \ -I.. \ - -I../DPMTurbulenceModels/lnInclude \ + -I../DPMTurbulenceModels \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ diff --git a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C index 362a6835af..5c5bc0f5a5 100644 --- a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C +++ b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2013-2016 OpenFOAM Foundation + Copyright (C) 2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -38,7 +39,7 @@ Description #include "fvCFD.H" #include "singlePhaseTransportModel.H" -#include "PhaseIncompressibleTurbulenceModel.H" +#include "DPMIncompressibleTurbulenceModel.H" #include "pimpleControl.H" #ifdef MPPIC diff --git a/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options b/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options index b0eaf6453e..a22489d7a5 100644 --- a/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options +++ b/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options @@ -1,6 +1,6 @@ EXE_INC = \ -I.. \ - -I../DPMTurbulenceModels/lnInclude \ + -I.../DPMTurbulenceModels \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ diff --git a/applications/solvers/lagrangian/DPMFoam/Make/options b/applications/solvers/lagrangian/DPMFoam/Make/options index 2d60c135cf..e16be0b444 100644 --- a/applications/solvers/lagrangian/DPMFoam/Make/options +++ b/applications/solvers/lagrangian/DPMFoam/Make/options @@ -1,5 +1,5 @@ EXE_INC = \ - -I./DPMTurbulenceModels/lnInclude \ + -I./DPMTurbulenceModels \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ @@ -13,7 +13,6 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/phaseIncompressible/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude diff --git a/applications/solvers/lagrangian/DPMFoam/createFields.H b/applications/solvers/lagrangian/DPMFoam/createFields.H index 97e8e21b41..256d05eef8 100644 --- a/applications/solvers/lagrangian/DPMFoam/createFields.H +++ b/applications/solvers/lagrangian/DPMFoam/createFields.H @@ -160,10 +160,11 @@ surfaceScalarField alphaPhic alphacf*phic ); -autoPtr> + +autoPtr> continuousPhaseTurbulence ( - PhaseIncompressibleTurbulenceModel::New + DPMIncompressibleTurbulenceModel::New ( alphac, Uc,