zhyang-dev/CFDEMcoupling-PFM
1
0
Fork 0
mirror of https://github.com/ParticulateFlow/CFDEMcoupling-PFM.git synced 2025-12-08 06:37:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed compile errors

Browse Source
This commit is contained in:
ekinaci
2017-02-03 14:42:52 +01:00
parent 8e96e7d59a
commit c69faa5e98
5 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
applications/solvers/cfdemSolverRhoPimpleChem/Make/linux64GccDPInt32Opt/options
View File

@ -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

18
applications/solvers/cfdemSolverRhoPimpleChem/Make/options
View File

@ -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) \

12
applications/solvers/cfdemSolverRhoPimpleChem/UEqn.H
View File

@ -1,13 +1,10 @@
// Solve the Momentum equation
particleCloud.otherForces(fOther);
tmp<fvVectorMatrix> 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);
}

8
applications/solvers/cfdemSolverRhoPimpleChem/cfdemSolverRhoPimpleChem.C
View File

@ -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;

1
src/lagrangian/cfdemParticle/etc/solver-list.txt
View File

@ -3,3 +3,4 @@ cfdemSolverPiso/dir
cfdemSolverRhoPimple/dir
cfdemSolverIB/dir
cfdemSolverPisoScalar/dir
cfdemSolverRhoPimpleChem/dir