songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE: Added fvOptions support

Browse Source 
Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1402
This commit is contained in:
Henry 2015-01-22 10:59:45 +00:00
parent 994a61992e
commit 5252c800eb
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/Make/options
View File

@ -1,13 +1,16 @@
EXE_INC = \ EXE_INC = \
-I../twoPhaseSystem \ -I../twoPhaseSystem \
-I../interfacialModels/lnInclude \ -I../interfacialModels/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/fvOptions/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude
LIB_LIBS = \ LIB_LIBS = \
-lincompressibleTransportModels \ -lincompressibleTransportModels \

14
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATE.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -32,6 +32,7 @@ License
#include "fvcDdt.H" #include "fvcDdt.H"
#include "fvcDiv.H" #include "fvcDiv.H"
#include "fvcAverage.H" #include "fvcAverage.H"
#include "fvOptionList.H"
#include "mathematicalConstants.H" #include "mathematicalConstants.H"
#include "fundamentalConstants.H" #include "fundamentalConstants.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
@ -155,6 +156,13 @@ void Foam::diameterModels::IATE::correct()
R -= sources_[j].R(); R -= sources_[j].R();
} }
// const_cast needed because the operators and functions of fvOptions
// are currently non-const.
fv::optionList& fvOptions = const_cast<fv::optionList&>
(
phase_.U().mesh().lookupObject<fv::optionList>("fvOptions")
);
// Construct the interfacial curvature equation // Construct the interfacial curvature equation
fvScalarMatrix kappaiEqn fvScalarMatrix kappaiEqn
( (
@ -163,9 +171,13 @@ void Foam::diameterModels::IATE::correct()
== ==
- fvm::SuSp(R, kappai_) - fvm::SuSp(R, kappai_)
//+ Rph() // Omit the nucleation/condensation term //+ Rph() // Omit the nucleation/condensation term
+ fvOptions(kappai_)
); );
kappaiEqn.relax(); kappaiEqn.relax();
fvOptions.constrain(kappaiEqn);
kappaiEqn.solve(); kappaiEqn.solve();
// Update the Sauter-mean diameter // Update the Sauter-mean diameter