diff --git a/applications/solvers/cfdemSolverRhoPimpleChem/Make/linux64GccDPInt32Opt/options b/applications/solvers/cfdemSolverRhoPimpleChem/Make/linux64GccDPInt32Opt/options index 16484913..b6bd286f 100644 --- a/applications/solvers/cfdemSolverRhoPimpleChem/Make/linux64GccDPInt32Opt/options +++ b/applications/solvers/cfdemSolverRhoPimpleChem/Make/linux64GccDPInt32Opt/options @@ -53,9 +53,9 @@ include $(CFDEM_ADD_LIBS_DIR)/additionalLibs PFLAGS+= -Dcompre -EXE_INC = $(PFLAGS) -I../. -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel -I$(LIB_SRC)/finiteVolume/cfdTools -I$(LIB_SRC)/finiteVolume/lnInclude -I$(LIB_SRC)/meshTools/lnInclude -I$(LIB_SRC)/sampling/lnInclude -I$(LIB_SRC)/fvOptions/lnInclude -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/lnInclude -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/cfdTools -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude -I$(LIB_SRC)/regionModels/regionModel/lnInclude -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude -I$(LIB_SRC)/ODE/lnInclude -I$(LIB_SRC)/combustionModels/lnInclude -I$(FOAM_SOLVERS)/combustion/reactingFoam -# 31 "Make/options" +EXE_INC = $(PFLAGS) -I../. -I$(LIB_SRC)/finiteVolume/cfdTools -I$(LIB_SRC)/finiteVolume/lnInclude -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude -I$(LIB_SRC)/meshTools/lnInclude -I$(LIB_SRC)/sampling/lnInclude -I$(LIB_SRC)/fvOptions/lnInclude -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/lnInclude -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/cfdTools -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude -I$(LIB_SRC)/transportModels/compressible/lnInclude -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude -I$(LIB_SRC)/regionModels/regionModel/lnInclude -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude -I$(LIB_SRC)/ODE/lnInclude -I$(LIB_SRC)/combustionModels/lnInclude -I$(FOAM_SOLVERS)/combustion/reactingFoam +# 33 "Make/options" -EXE_LIBS = -L$(CFDEM_LIB_DIR) -lfluidThermophysicalModels -lspecie -lcompressibleTurbulenceModel -lcompressibleRASModels -lcompressibleLESModels -lfiniteVolume -lmeshTools -lsampling -lfvOptions -l$(CFDEM_LIB_COMP_NAME) $(CFDEM_ADD_LIB_PATHS) $(CFDEM_ADD_LIBS) -lliquidProperties -lliquidMixtureProperties -lthermophysicalFunctions -lreactionThermophysicalModels -lchemistryModel -lradiationModels -lregionModels -lsurfaceFilmModels -lODE -lcombustionModels +EXE_LIBS = -L$(CFDEM_LIB_DIR) -lfiniteVolume -lmeshTools -lturbulenceModels -lcompressibleTurbulenceModels -lcompressibleTransportModels -lfluidThermophysicalModels -lspecie -lsampling -lfvOptions -l$(CFDEM_LIB_COMP_NAME) $(CFDEM_ADD_LIB_PATHS) $(CFDEM_ADD_LIBS) -lliquidProperties -lliquidMixtureProperties -lthermophysicalFunctions -lreactionThermophysicalModels -lchemistryModel -lradiationModels -lregionModels -lsurfaceFilmModels -lODE -lcombustionModels diff --git a/applications/solvers/cfdemSolverRhoPimpleChem/Make/options b/applications/solvers/cfdemSolverRhoPimpleChem/Make/options index 1d7faccc..e38857f6 100644 --- a/applications/solvers/cfdemSolverRhoPimpleChem/Make/options +++ b/applications/solvers/cfdemSolverRhoPimpleChem/Make/options @@ -5,16 +5,18 @@ PFLAGS+= -Dcompre EXE_INC = \ $(PFLAGS) \ -I../. \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ -I$(LIB_SRC)/finiteVolume/cfdTools \ -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/fvOptions/lnInclude \ -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/lnInclude \ -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/cfdTools \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ @@ -27,21 +29,19 @@ EXE_INC = \ -I$(LIB_SRC)/ODE/lnInclude \ -I$(LIB_SRC)/combustionModels/lnInclude \ -I$(FOAM_SOLVERS)/combustion/reactingFoam \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ EXE_LIBS = \ -L$(CFDEM_LIB_DIR) \ - -lfluidThermophysicalModels \ - -lspecie \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ -lfiniteVolume \ -lmeshTools \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ + -lcompressibleTransportModels \ + -lfluidThermophysicalModels \ + -lspecie \ -lsampling \ -lfvOptions \ -l$(CFDEM_LIB_COMP_NAME) \ diff --git a/applications/solvers/cfdemSolverRhoPimpleChem/UEqn.H b/applications/solvers/cfdemSolverRhoPimpleChem/UEqn.H index 94c6730b..3bec01dd 100644 --- a/applications/solvers/cfdemSolverRhoPimpleChem/UEqn.H +++ b/applications/solvers/cfdemSolverRhoPimpleChem/UEqn.H @@ -1,13 +1,10 @@ // Solve the Momentum equation -particleCloud.otherForces(fOther); - tmp tUEqn + ( - fvm::ddt(rhoeps, U) - + fvm::div(phi, U) - + particleCloud.divVoidfractionTau(U, voidfraction) - + fvm::Sp(Ksl,U) - - fOther + fvm::ddt(rhoeps,U) + fvm::div(phi, U) + + particleCloud.divVoidfractionTau(U, voidfraction) + + fvm::Sp(Ksl,U) == fvOptions(rho, U) ); @@ -31,3 +28,4 @@ else if (pimple.momentumPredictor()) fvOptions.correct(U); K = 0.5*magSqr(U); } + diff --git a/applications/solvers/cfdemSolverRhoPimpleChem/cfdemSolverRhoPimpleChem.C b/applications/solvers/cfdemSolverRhoPimpleChem/cfdemSolverRhoPimpleChem.C index c2978965..1ae2610a 100644 --- a/applications/solvers/cfdemSolverRhoPimpleChem/cfdemSolverRhoPimpleChem.C +++ b/applications/solvers/cfdemSolverRhoPimpleChem/cfdemSolverRhoPimpleChem.C @@ -31,11 +31,11 @@ Description #include "fvCFD.H" #include "psiThermo.H" #include "turbulentFluidThermoModel.H" -#include "localEulerDdtScheme.H" #include "psiCombustionModel.H" #include "bound.H" #include "pimpleControl.H" #include "fvOptions.H" +#include "localEulerDdtScheme.H" #include "fvcSmooth.H" @@ -53,14 +53,14 @@ Description int main(int argc, char *argv[]) { + #include "postProcess.H" #include "setRootCase.H" #include "createTime.H" #include "createMesh.H" + #include "createControl.H" #include "createTimeControls.H" #include "createRDeltaT.H" - pimpleControl pimple(mesh); - #include "createFields.H" #include "createFieldRefs.H" #include "createFvOptions.H" @@ -71,6 +71,8 @@ int main(int argc, char *argv[]) cfdemCloudEnergy particleCloud(mesh); #include "checkModelType.H" + turbulence->validate(); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< "\nStarting time loop\n" << endl; diff --git a/src/lagrangian/cfdemParticle/etc/solver-list.txt b/src/lagrangian/cfdemParticle/etc/solver-list.txt index 9d9911fa..052e0173 100644 --- a/src/lagrangian/cfdemParticle/etc/solver-list.txt +++ b/src/lagrangian/cfdemParticle/etc/solver-list.txt @@ -3,3 +3,4 @@ cfdemSolverPiso/dir cfdemSolverRhoPimple/dir cfdemSolverIB/dir cfdemSolverPisoScalar/dir +cfdemSolverRhoPimpleChem/dir