zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUG: Correcting DPMIncompressibleTurbulenceModel in DPM solvers

Browse Source
This commit is contained in:
sergio
2020-12-17 09:25:40 -08:00
parent 7f17a71f9c
commit 260db42f7f
7 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2017 OpenFOAM Foundation Copyright (C) 2017 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -36,7 +37,7 @@ Description
#include "fvCFD.H" #include "fvCFD.H"
#include "dynamicFvMesh.H" #include "dynamicFvMesh.H"
#include "singlePhaseTransportModel.H" #include "singlePhaseTransportModel.H"
#include "PhaseIncompressibleTurbulenceModel.H" #include "DPMIncompressibleTurbulenceModel.H"
#include "pimpleControl.H" #include "pimpleControl.H"
#include "CorrectPhi.H" #include "CorrectPhi.H"

2
applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/MPPICDyMFoam/Make/options
View File

@ -1,7 +1,7 @@
EXE_INC = \ EXE_INC = \
-I.. \ -I.. \
-I../.. \ -I../.. \
-I../DPMTurbulenceModels/lnInclude \ -I../../DPMTurbulenceModels \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \

2
applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/Make/options
View File

@ -1,6 +1,6 @@
EXE_INC = \ EXE_INC = \
-I.. \ -I.. \
-I../DPMTurbulenceModels/lnInclude \ -I../DPMTurbulenceModels \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \

3
applications/solvers/lagrangian/DPMFoam/DPMFoam.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2013-2016 OpenFOAM Foundation Copyright (C) 2013-2016 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -38,7 +39,7 @@ Description
#include "fvCFD.H" #include "fvCFD.H"
#include "singlePhaseTransportModel.H" #include "singlePhaseTransportModel.H"
#include "PhaseIncompressibleTurbulenceModel.H" #include "DPMIncompressibleTurbulenceModel.H"
#include "pimpleControl.H" #include "pimpleControl.H"
#ifdef MPPIC #ifdef MPPIC

2
applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options
View File

@ -1,6 +1,6 @@
EXE_INC = \ EXE_INC = \
-I.. \ -I.. \
-I../DPMTurbulenceModels/lnInclude \ -I.../DPMTurbulenceModels \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \

3
applications/solvers/lagrangian/DPMFoam/Make/options
View File

@ -1,5 +1,5 @@
EXE_INC = \ EXE_INC = \
-I./DPMTurbulenceModels/lnInclude \ -I./DPMTurbulenceModels \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \
@ -13,7 +13,6 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/phaseIncompressible/lnInclude \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude

5
applications/solvers/lagrangian/DPMFoam/createFields.H
View File

@ -160,10 +160,11 @@ surfaceScalarField alphaPhic
alphacf*phic alphacf*phic
); );
autoPtr<PhaseIncompressibleTurbulenceModel<singlePhaseTransportModel>>
autoPtr<DPMIncompressibleTurbulenceModel<singlePhaseTransportModel>>
continuousPhaseTurbulence continuousPhaseTurbulence
( (
PhaseIncompressibleTurbulenceModel<singlePhaseTransportModel>::New DPMIncompressibleTurbulenceModel<singlePhaseTransportModel>::New
( (
alphac, alphac,
Uc, Uc,