From afe55da77e21119cd67ea8a10956b1c2af4d8e39 Mon Sep 17 00:00:00 2001 From: danielque Date: Mon, 23 Jan 2017 16:29:13 +0100 Subject: [PATCH 1/7] remove cfdemSolverRhoPimpleChem from solver list --- src/lagrangian/cfdemParticle/etc/solver-list.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lagrangian/cfdemParticle/etc/solver-list.txt b/src/lagrangian/cfdemParticle/etc/solver-list.txt index 3ebcf8c5..9d9911fa 100644 --- a/src/lagrangian/cfdemParticle/etc/solver-list.txt +++ b/src/lagrangian/cfdemParticle/etc/solver-list.txt @@ -1,6 +1,5 @@ cfdemSolverPisoMS/dir cfdemSolverPiso/dir cfdemSolverRhoPimple/dir -cfdemSolverRhoPimpleChem/dir cfdemSolverIB/dir -cfdemSolverPisoScalar/dir \ No newline at end of file +cfdemSolverPisoScalar/dir From adcb9031adaeecfa84ba1782f5f83075e45f24b4 Mon Sep 17 00:00:00 2001 From: danielque Date: Mon, 23 Jan 2017 16:32:24 +0100 Subject: [PATCH 2/7] fix OpenFOAM 4 issue in reactionHeat.C --- .../subModels/energyModel/reactionHeat/reactionHeat.C | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lagrangian/cfdemParticle/subModels/energyModel/reactionHeat/reactionHeat.C b/src/lagrangian/cfdemParticle/subModels/energyModel/reactionHeat/reactionHeat.C index 8890bf8b..a3cf1635 100644 --- a/src/lagrangian/cfdemParticle/subModels/energyModel/reactionHeat/reactionHeat.C +++ b/src/lagrangian/cfdemParticle/subModels/energyModel/reactionHeat/reactionHeat.C @@ -97,8 +97,8 @@ void reactionHeat::calcEnergyContribution() particleCloud_.dataExchangeM().getData(reactionHeatName_,"scalar-atom",reactionHeat_); - reactionHeatField_.internalField() = 0.0; - reactionHeatField_.boundaryField() = 0.0; + reactionHeatField_.primitiveFieldRef() = 0.0; + reactionHeatField_.boundaryFieldRef() = 0.0; particleCloud_.averagingM().setScalarSum ( @@ -108,7 +108,7 @@ void reactionHeat::calcEnergyContribution() NULL ); - reactionHeatField_.internalField() /= (reactionHeatField_.mesh().V()); + reactionHeatField_.primitiveFieldRef() /= (reactionHeatField_.mesh().V()); forAll(reactionHeatField_,cellI) { From c40c4ad6fbcc420c8dc48718d7bbb351233c5687 Mon Sep 17 00:00:00 2001 From: danielque Date: Mon, 23 Jan 2017 17:22:43 +0100 Subject: [PATCH 3/7] fix Wignored-qualifiers warnings --- .../cfdemParticle/subModels/forceModel/Fines/ErgunStatFines.C | 2 +- .../cfdemParticle/subModels/forceModel/Fines/ErgunStatFines.H | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/Fines/ErgunStatFines.C b/src/lagrangian/cfdemParticle/subModels/forceModel/Fines/ErgunStatFines.C index c36fafbb..17fffd4e 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/Fines/ErgunStatFines.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/Fines/ErgunStatFines.C @@ -107,7 +107,7 @@ ErgunStatFines::~ErgunStatFines() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -const scalar ErgunStatFines::dSauter(label cellI) const +scalar ErgunStatFines::dSauter(label cellI) const { // Sauter mean diameter without influence of medium-scale fines scalar dS = dSauter_[cellI] / scaleDist_; diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/Fines/ErgunStatFines.H b/src/lagrangian/cfdemParticle/subModels/forceModel/Fines/ErgunStatFines.H index 108e0841..1b33e30e 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/Fines/ErgunStatFines.H +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/Fines/ErgunStatFines.H @@ -73,7 +73,7 @@ private: mutable scalar switchingVoidfraction_; //voidfraction above which dilute formulation will be used - inline const scalar dSauter(label) const; + inline scalar dSauter(label) const; public: From 849cede6fadb1588ac135efff7fef45beeeaf0ed Mon Sep 17 00:00:00 2001 From: danielque Date: Mon, 23 Jan 2017 17:45:57 +0100 Subject: [PATCH 4/7] fix Wreorder warning --- .../forceModel/granKineticEnergy/granKineticEnergy.H | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/granKineticEnergy/granKineticEnergy.H b/src/lagrangian/cfdemParticle/subModels/forceModel/granKineticEnergy/granKineticEnergy.H index 8cc189b6..46a8a7ff 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/granKineticEnergy/granKineticEnergy.H +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/granKineticEnergy/granKineticEnergy.H @@ -44,12 +44,12 @@ private: dictionary propsDict_; mutable double **vfluc_; - - mutable volScalarField granKineticEnergy_; - - word UsFieldName_; - const volVectorField& UsField_; + word UsFieldName_; + + const volVectorField& UsField_; + + mutable volScalarField granKineticEnergy_; void allocateMyArrays() const; From a285248abd7c0b663c8f05a60dfb32f25fabe85d Mon Sep 17 00:00:00 2001 From: danielque Date: Tue, 24 Jan 2017 11:54:05 +0100 Subject: [PATCH 5/7] clean up whitespaces --- .../solvers/cfdemSolverRhoPimple/createFields.H | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/applications/solvers/cfdemSolverRhoPimple/createFields.H b/applications/solvers/cfdemSolverRhoPimple/createFields.H index eac9a5a7..bae048b3 100644 --- a/applications/solvers/cfdemSolverRhoPimple/createFields.H +++ b/applications/solvers/cfdemSolverRhoPimple/createFields.H @@ -25,7 +25,7 @@ Info<< "Reading thermophysical properties\n" << endl; ); - + Info<< "Reading field U\n" << endl; volVectorField U ( @@ -39,7 +39,7 @@ Info<< "Reading thermophysical properties\n" << endl; ), mesh ); - + Info<< "\nReading voidfraction field voidfraction = (Vgas/Vparticle)\n" << endl; volScalarField voidfraction ( @@ -81,7 +81,7 @@ Info<< "Reading thermophysical properties\n" << endl; mesh, dimensionedScalar("zero", dimensionSet(1,-1,-3,0,0,0,0), 0.0) ); - + Info<< "\nCreating fluid-particle heat flux coefficient field\n" << endl; volScalarField QCoeff ( @@ -96,7 +96,7 @@ Info<< "Reading thermophysical properties\n" << endl; mesh, dimensionedScalar("zero", dimensionSet(1,-1,-3,-1,0,0,0), 0.0) ); - + /* Info<< "\nCreating thermal diffusivity field\n" << endl; volScalarField thDiff ( @@ -141,7 +141,7 @@ Info<< "Reading thermophysical properties\n" << endl; mesh, dimensionedScalar("zero", dimensionSet(0,2,-2,-1,0,0,0), 0.0) ); - + Info<< "\nCreating body force field\n" << endl; volVectorField fOther ( @@ -204,7 +204,7 @@ Info<< "Reading thermophysical properties\n" << endl; thermo ) ); - + mesh.setFluxRequired(p.name()); Info<< "Creating field dpdt\n" << endl; @@ -222,7 +222,7 @@ Info<< "Reading thermophysical properties\n" << endl; Info<< "Creating field kinetic energy K\n" << endl; volScalarField K("K", 0.5*magSqr(U)); - + Info<< "\nReading momentum exchange field Ksl\n" << endl; volScalarField Ksl ( From 4f17c33b4d2211c5577be2db1507a907717e51c4 Mon Sep 17 00:00:00 2001 From: danielque Date: Tue, 24 Jan 2017 13:30:57 +0100 Subject: [PATCH 6/7] avoid warnings about unused variables from postProcess.H move volScalarField& T = thermo.T(); const volScalarField& psi = thermo.psi(); to createFieldRefs.H (and make T const) --- .../cfdemSolverRhoPimple.C | 23 ++++++++++--------- .../cfdemSolverRhoPimple/createFieldRefs.H | 2 ++ .../cfdemSolverRhoPimple/createFields.H | 3 --- 3 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 applications/solvers/cfdemSolverRhoPimple/createFieldRefs.H diff --git a/applications/solvers/cfdemSolverRhoPimple/cfdemSolverRhoPimple.C b/applications/solvers/cfdemSolverRhoPimple/cfdemSolverRhoPimple.C index b04cd4f6..b9cf2fcb 100644 --- a/applications/solvers/cfdemSolverRhoPimple/cfdemSolverRhoPimple.C +++ b/applications/solvers/cfdemSolverRhoPimple/cfdemSolverRhoPimple.C @@ -51,7 +51,7 @@ Description int main(int argc, char *argv[]) { #include "postProcess.H" - + #include "setRootCase.H" #include "createTime.H" #include "createMesh.H" @@ -60,13 +60,14 @@ int main(int argc, char *argv[]) #include "createRDeltaT.H" #include "initContinuityErrs.H" #include "createFields.H" + #include "createFieldRefs.H" #include "createFvOptions.H" // create cfdemCloud #include "readGravitationalAcceleration.H" cfdemCloudEnergy particleCloud(mesh); #include "checkModelType.H" - + turbulence->validate(); // #include "compressibleCourantNo.H" // #include "setInitialDeltaT.H" @@ -82,12 +83,12 @@ int main(int argc, char *argv[]) #include "setDeltaT.H" runTime++; - - particleCloud.clockM().start(1,"Global"); + + particleCloud.clockM().start(1,"Global"); Info<< "Time = " << runTime.timeName() << nl << endl; - // do particle stuff + // do particle stuff particleCloud.clockM().start(2,"Coupling"); bool hasEvolved = particleCloud.evolve(voidfraction,Us,U); @@ -95,7 +96,7 @@ int main(int argc, char *argv[]) { particleCloud.smoothingM().smoothen(particleCloud.forceM(0).impParticleForces()); } - + Info << "update Ksl.internalField()" << endl; Ksl = particleCloud.momCoupleM(0).impMomSource(); Ksl.correctBoundaryConditions(); @@ -111,12 +112,12 @@ int main(int argc, char *argv[]) particleCloud.clockM().stop("Coupling"); particleCloud.clockM().start(26,"Flow"); - + if (pimple.nCorrPIMPLE() <= 1) { #include "rhoEqn.H" } - + volScalarField rhoeps("rhoeps",rho*voidfraction); // --- Pressure-velocity PIMPLE corrector loop while (pimple.loop()) @@ -127,9 +128,9 @@ int main(int argc, char *argv[]) // --- Pressure corrector loop while (pimple.correct()) { - // besides this pEqn, OF offers a "pimple consistent"-option + // besides this pEqn, OF offers a "pimple consistent"-option #include "pEqn.H" - rhoeps=rho*voidfraction; + rhoeps=rho*voidfraction; } if (pimple.turbCorr()) @@ -140,7 +141,7 @@ int main(int argc, char *argv[]) runTime.write(); - + Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" << " ClockTime = " << runTime.elapsedClockTime() << " s" << nl << endl; diff --git a/applications/solvers/cfdemSolverRhoPimple/createFieldRefs.H b/applications/solvers/cfdemSolverRhoPimple/createFieldRefs.H new file mode 100644 index 00000000..5842906a --- /dev/null +++ b/applications/solvers/cfdemSolverRhoPimple/createFieldRefs.H @@ -0,0 +1,2 @@ +const volScalarField& T = thermo.T(); +const volScalarField& psi = thermo.psi(); diff --git a/applications/solvers/cfdemSolverRhoPimple/createFields.H b/applications/solvers/cfdemSolverRhoPimple/createFields.H index bae048b3..366cc1d0 100644 --- a/applications/solvers/cfdemSolverRhoPimple/createFields.H +++ b/applications/solvers/cfdemSolverRhoPimple/createFields.H @@ -7,8 +7,6 @@ Info<< "Reading thermophysical properties\n" << endl; psiThermo& thermo = pThermo(); thermo.validate(args.executable(), "h", "e"); volScalarField& p = thermo.p(); - volScalarField& T = thermo.T(); - const volScalarField& psi = thermo.psi(); Info<< "Reading field rho\n" << endl; volScalarField rho @@ -25,7 +23,6 @@ Info<< "Reading thermophysical properties\n" << endl; ); - Info<< "Reading field U\n" << endl; volVectorField U ( From 72dda786525d91e3ee39ae888c0ef4500d3f736b Mon Sep 17 00:00:00 2001 From: danielque Date: Tue, 24 Jan 2017 19:33:08 +0100 Subject: [PATCH 7/7] make dependency builder happy The compiler seems to have no problem with the space in the include option, however the dependency builder doesn't find the files. --- src/lagrangian/cfdemParticleComp/Make/options | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lagrangian/cfdemParticleComp/Make/options b/src/lagrangian/cfdemParticleComp/Make/options index e92ad1aa..1bbb8cc5 100644 --- a/src/lagrangian/cfdemParticleComp/Make/options +++ b/src/lagrangian/cfdemParticleComp/Make/options @@ -12,7 +12,7 @@ PFLAGS+= -Dcompre EXE_INC = \ $(PFLAGS) \ $(PINC) \ - -I ../cfdemParticle/lnInclude \ + -I../cfdemParticle/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \