diff --git a/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C b/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C index c74e340e18a0abdb79730022a9010c0534f13331..f1d7b1777bd223c150d09bc146402ead80c95f12 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 6890e83b4d7ee81c18139682cc7ab9b9657b4168..03b1e8a243c96d25a7b22adc506a8e1e785779e0 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 6ba7e679813e53848d9ec3233d0be58a0eeb6b00..14fd3e8bf1fcf5cb972f43f7e38bae954c95c550 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 362a6835af76ed068c48dcfc852b12a6c84b80d2..5c5bc0f5a57b58730327f3c99f1e65a3e3437bd8 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 b0eaf6453e16bd77634bbe54c3671ca376eda2c3..a22489d7a511cf9c67047a19de5e1b6194e21f80 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 2d60c135cf4ceedaa0f2694413d279fb34b552ef..e16be0b44486904d69d6c4ae78aff2dc7f9efa26 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 97e8e21b41561a348181af74a2de5c1d3b3061c1..256d05eef8de0d1a957f65089cd0302b2c1177e5 100644 --- a/applications/solvers/lagrangian/DPMFoam/createFields.H +++ b/applications/solvers/lagrangian/DPMFoam/createFields.H @@ -160,10 +160,11 @@ surfaceScalarField alphaPhic alphacf*phic ); -autoPtr<PhaseIncompressibleTurbulenceModel<singlePhaseTransportModel>> + +autoPtr<DPMIncompressibleTurbulenceModel<singlePhaseTransportModel>> continuousPhaseTurbulence ( - PhaseIncompressibleTurbulenceModel<singlePhaseTransportModel>::New + DPMIncompressibleTurbulenceModel<singlePhaseTransportModel>::New ( alphac, Uc,