diff --git a/applications/solvers/cfdemSolverRhoPimple/EEqn.H b/applications/solvers/cfdemSolverRhoPimple/EEqn.H index 071039f6..b2a30416 100644 --- a/applications/solvers/cfdemSolverRhoPimple/EEqn.H +++ b/applications/solvers/cfdemSolverRhoPimple/EEqn.H @@ -6,8 +6,8 @@ particleCloud.energyContributions(Qsource); particleCloud.energyCoefficients(QCoeff); - //thDiff=particleCloud.thermCondM().thermDiff(); - thCond=particleCloud.thermCondM().thermCond(); + //thDiff=particleCloud.thermCondM().thermDiff(); + thCond=particleCloud.thermCondM().thermCond(); addSource = fvc::ddt(rhoeps, K) + fvc::div(phi, K) + ( diff --git a/applications/solvers/cfdemSolverRhoPimpleChem/EEqn.H b/applications/solvers/cfdemSolverRhoPimpleChem/EEqn.H index 81931135..edb4081f 100644 --- a/applications/solvers/cfdemSolverRhoPimpleChem/EEqn.H +++ b/applications/solvers/cfdemSolverRhoPimpleChem/EEqn.H @@ -6,7 +6,7 @@ volScalarField& he = thermo.he(); particleCloud.energyContributions(Qsource); particleCloud.energyCoefficients(QCoeff); -thCond=particleCloud.thermCondM().thermCond(); +thCond=particleCloud.thermCondM().thermCond(); Cpv = he.name() == "e" ? thermo.Cv() : thermo.Cp(); fvScalarMatrix EEqn diff --git a/applications/solvers/cfdemSolverRhoPimpleChem/cfdemSolverRhoPimpleChem.C b/applications/solvers/cfdemSolverRhoPimpleChem/cfdemSolverRhoPimpleChem.C index 2c4739e2..762a1cbc 100644 --- a/applications/solvers/cfdemSolverRhoPimpleChem/cfdemSolverRhoPimpleChem.C +++ b/applications/solvers/cfdemSolverRhoPimpleChem/cfdemSolverRhoPimpleChem.C @@ -64,7 +64,7 @@ int main(int argc, char *argv[]) #include "createFieldRefs.H" #include "createFvOptions.H" #include "initContinuityErrs.H" - + // create cfdemCloud #include "readGravitationalAcceleration.H" cfdemCloudEnergy particleCloud(mesh); @@ -79,7 +79,7 @@ int main(int argc, char *argv[]) scalar m(0.0); scalar m0(0.0); label counter(0); - + while (runTime.run()) { #include "readTimeControls.H" @@ -87,8 +87,8 @@ 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; @@ -100,7 +100,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(); @@ -116,13 +116,13 @@ int main(int argc, char *argv[]) particleCloud.clockM().stop("Coupling"); particleCloud.clockM().start(26,"Flow"); - + if (pimple.nCorrPIMPLE() <= 1) { #include "rhoEqn.H" } - rhoeps = rho * voidfraction; + rhoeps = rho * voidfraction; // --- Pressure-velocity PIMPLE corrector loop while (pimple.loop()) { @@ -133,10 +133,10 @@ int main(int argc, char *argv[]) // --- Pressure corrector loop while (pimple.correct()) { - #include "molConc.H" + #include "molConc.H" #include "pEqn.H" } - + if (pimple.turbCorr()) { turbulence->correct(); @@ -144,14 +144,14 @@ int main(int argc, char *argv[]) } #include "monitorMass.H" - + particleCloud.clockM().start(31,"postFlow"); particleCloud.postFlow(); particleCloud.clockM().stop("postFlow"); runTime.write(); - + Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" << " ClockTime = " << runTime.elapsedClockTime() << " s" << nl << endl; diff --git a/applications/solvers/cfdemSolverRhoPimpleChem/createFields.H b/applications/solvers/cfdemSolverRhoPimpleChem/createFields.H index 477e00d6..80f4166e 100644 --- a/applications/solvers/cfdemSolverRhoPimpleChem/createFields.H +++ b/applications/solvers/cfdemSolverRhoPimpleChem/createFields.H @@ -1,5 +1,5 @@ // thermodynamics, chemistry - + Info<< "Creating combustion model\n" << endl; autoPtr combustion @@ -73,7 +73,7 @@ ), mesh ); - + Info<< "\nReading voidfraction field voidfraction = (Vgas/Vparticle)\n" << endl; volScalarField voidfraction ( @@ -87,7 +87,7 @@ ), mesh ); - + volScalarField rhoeps ( IOobject @@ -115,7 +115,7 @@ 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 ( @@ -130,7 +130,7 @@ mesh, dimensionedScalar("zero", dimensionSet(1,-1,-3,-1,0,0,0), 0.0) ); - + Info<< "\nCreating thermal conductivity field\n" << endl; volScalarField thCond ( @@ -145,7 +145,7 @@ mesh, dimensionedScalar("zero", dimensionSet(1,1,-3,-1,0,0,0), 0.0) ); - + Info<< "\nCreating heat capacity field\n" << endl; volScalarField Cpv ( @@ -224,7 +224,7 @@ Info<< "Creating field kinetic energy K\n" << endl; volScalarField K("K", 0.5*magSqr(U)); - + volScalarField dQ ( IOobject @@ -238,7 +238,7 @@ mesh, dimensionedScalar("dQ", dimEnergy/dimTime, 0.0) ); - + Info<< "\nReading momentum exchange field Ksl\n" << endl; volScalarField Ksl ( diff --git a/applications/solvers/cfdemSolverRhoPimpleChem/molConc.H b/applications/solvers/cfdemSolverRhoPimpleChem/molConc.H index bc577c8e..dc70981e 100644 --- a/applications/solvers/cfdemSolverRhoPimpleChem/molConc.H +++ b/applications/solvers/cfdemSolverRhoPimpleChem/molConc.H @@ -3,10 +3,10 @@ forAll(Y, i) { volScalarField& Yi = Y[i]; - dimensionedScalar mi("mi",dimensionSet(1, 0, 0, 0, -1),composition.W(i)); - mi /= 1000.0; // g to kg - molarConc += rho * Yi / mi; + dimensionedScalar mi("mi",dimensionSet(1, 0, 0, 0, -1),composition.W(i)); + mi /= 1000.0; // g to kg + molarConc += rho * Yi / mi; } } -// ************************************************************************* // \ No newline at end of file +// ************************************************************************* // diff --git a/applications/solvers/cfdemSolverRhoPimpleChem/pEqn.H b/applications/solvers/cfdemSolverRhoPimpleChem/pEqn.H index 5d73d7fe..0a21300d 100644 --- a/applications/solvers/cfdemSolverRhoPimpleChem/pEqn.H +++ b/applications/solvers/cfdemSolverRhoPimpleChem/pEqn.H @@ -32,13 +32,13 @@ else // + rhorAUf*fvc::ddtCorr(rho, U, phi) ) ); - + // flux without pressure gradient contribution phi = phiHbyA + phiUs; // Update the pressure BCs to ensure flux consistency constrainPressure(p, rhoeps, U, phi, rhorAUf); - + volScalarField SmbyP(particleCloud.chemistryM(0).Sm() / p); while (pimple.correctNonOrthogonal()) diff --git a/applications/solvers/cfdemSolverRhoPimpleChem/pEqn_alternative.H b/applications/solvers/cfdemSolverRhoPimpleChem/pEqn_alternative.H index cd843446..cf8fa370 100644 --- a/applications/solvers/cfdemSolverRhoPimpleChem/pEqn_alternative.H +++ b/applications/solvers/cfdemSolverRhoPimpleChem/pEqn_alternative.H @@ -38,7 +38,7 @@ else // + rhorAUf*fvc::ddtCorr(rho, U, phi) ) ); - + // flux without pressure gradient contribution phi = phiHbyA + phiUs; diff --git a/applications/solvers/cfdemSolverRhoPimpleChem/rhoEqn.H b/applications/solvers/cfdemSolverRhoPimpleChem/rhoEqn.H index 7e2fc356..8af45614 100644 --- a/applications/solvers/cfdemSolverRhoPimpleChem/rhoEqn.H +++ b/applications/solvers/cfdemSolverRhoPimpleChem/rhoEqn.H @@ -15,4 +15,4 @@ fvOptions.correct(rho); } -// ************************************************************************* // \ No newline at end of file +// ************************************************************************* // diff --git a/src/lagrangian/cfdemParticle/derived/cfdemCloudEnergy/cfdemCloudEnergy.C b/src/lagrangian/cfdemParticle/derived/cfdemCloudEnergy/cfdemCloudEnergy.C index c2427b65..1facf46c 100644 --- a/src/lagrangian/cfdemParticle/derived/cfdemCloudEnergy/cfdemCloudEnergy.C +++ b/src/lagrangian/cfdemParticle/derived/cfdemCloudEnergy/cfdemCloudEnergy.C @@ -166,7 +166,7 @@ bool cfdemCloudEnergy::evolve if(verbose_) Info << "speciesExecute done" << endl; clockM().stop("speciesExecute"); - return true; + return true; } return false; } diff --git a/src/lagrangian/cfdemParticle/derived/cfdemCloudEnergy/cfdemCloudEnergy.H b/src/lagrangian/cfdemParticle/derived/cfdemCloudEnergy/cfdemCloudEnergy.H index 66e99ca0..e6bfdf6d 100644 --- a/src/lagrangian/cfdemParticle/derived/cfdemCloudEnergy/cfdemCloudEnergy.H +++ b/src/lagrangian/cfdemParticle/derived/cfdemCloudEnergy/cfdemCloudEnergy.H @@ -61,7 +61,7 @@ protected: autoPtr* energyModel_; autoPtr thermCondModel_; - + autoPtr* chemistryModel_; void calcEnergyContributions(); @@ -93,7 +93,7 @@ public: const energyModel& energyM(int); const thermCondModel& thermCondM(); - + const chemistryModel& chemistryM(int); label nrEnergyModels() const; @@ -107,7 +107,7 @@ public: inline const wordList& energyModels(); inline const wordList& chemistryModels(); - + void energyContributions(volScalarField&); void energyCoefficients(volScalarField&); diff --git a/src/lagrangian/cfdemParticle/subModels/averagingModel/averagingModel/averagingModel.H b/src/lagrangian/cfdemParticle/subModels/averagingModel/averagingModel/averagingModel.H index 1f46300e..93b334eb 100644 --- a/src/lagrangian/cfdemParticle/subModels/averagingModel/averagingModel/averagingModel.H +++ b/src/lagrangian/cfdemParticle/subModels/averagingModel/averagingModel/averagingModel.H @@ -175,8 +175,8 @@ public: double**const& weight, double**const& mask ) const; - - void setScalarSumCentre + + void setScalarSumCentre ( volScalarField& field, double**& value, diff --git a/src/lagrangian/cfdemParticle/subModels/chemistryModel/chemistryModel/chemistryModel.C b/src/lagrangian/cfdemParticle/subModels/chemistryModel/chemistryModel/chemistryModel.C index 25530acb..f0a24b48 100644 --- a/src/lagrangian/cfdemParticle/subModels/chemistryModel/chemistryModel/chemistryModel.C +++ b/src/lagrangian/cfdemParticle/subModels/chemistryModel/chemistryModel/chemistryModel.C @@ -46,7 +46,7 @@ tmp chemistryModel::Smi(label i) const tmp chemistryModel::Sm() const { - FatalError<<"the solver calls for Smi()\n" + FatalError<<"the solver calls for Sm()\n" <<"please activate 'speciesModel' in 'chemistryModels'" < Smi (const label i) const; + virtual void execute() = 0; - virtual tmp Sm () const; + virtual tmp Smi(const label i) const; + + virtual tmp Sm() const; }; diff --git a/src/lagrangian/cfdemParticle/subModels/chemistryModel/massTransferCoeff/massTransferCoeff.H b/src/lagrangian/cfdemParticle/subModels/chemistryModel/massTransferCoeff/massTransferCoeff.H index 53adbcbe..5021fbc8 100644 --- a/src/lagrangian/cfdemParticle/subModels/chemistryModel/massTransferCoeff/massTransferCoeff.H +++ b/src/lagrangian/cfdemParticle/subModels/chemistryModel/massTransferCoeff/massTransferCoeff.H @@ -16,7 +16,7 @@ License Copyright (C) 2015- Thomas Lichtenegger, JKU Linz, Austria M. Efe Kinaci, JKU Linz, Austria - + Description Model to communicate Sherwood number necessary coefficients diff --git a/src/lagrangian/cfdemParticle/subModels/chemistryModel/noChemistry/noChemistry.H b/src/lagrangian/cfdemParticle/subModels/chemistryModel/noChemistry/noChemistry.H index 3214e397..5f0840ab 100644 --- a/src/lagrangian/cfdemParticle/subModels/chemistryModel/noChemistry/noChemistry.H +++ b/src/lagrangian/cfdemParticle/subModels/chemistryModel/noChemistry/noChemistry.H @@ -16,7 +16,7 @@ License Copyright (C) 2015- Thomas Lichtenegger, JKU Linz, Austria M. Efe Kinaci, JKU Linz, Austria - + Description Chemistry turned off @@ -64,7 +64,7 @@ public: // Member Functions - void execute(); + void execute(); }; diff --git a/src/lagrangian/cfdemParticle/subModels/chemistryModel/reactantPerParticle/reactantPerParticle.H b/src/lagrangian/cfdemParticle/subModels/chemistryModel/reactantPerParticle/reactantPerParticle.H index 739ca5f6..0fe39037 100644 --- a/src/lagrangian/cfdemParticle/subModels/chemistryModel/reactantPerParticle/reactantPerParticle.H +++ b/src/lagrangian/cfdemParticle/subModels/chemistryModel/reactantPerParticle/reactantPerParticle.H @@ -15,7 +15,7 @@ License along with this code. If not, see . Copyright (C) 2015- Thomas Lichtenegger, JKU Linz, Austria - + Description Model to communicate available reactant per particle @@ -55,17 +55,17 @@ private: const fvMesh& mesh_; mutable double **reactantPerParticle_; - + word voidfractionFieldName_; const volScalarField& voidfraction_; - + mutable volScalarField particlesPerCell_; void allocateMyArrays() const; label loopCounter_; - + label Nevery_; public: diff --git a/src/lagrangian/cfdemParticle/subModels/chemistryModel/species/species.C b/src/lagrangian/cfdemParticle/subModels/chemistryModel/species/species.C index 6a02832d..29493b19 100644 --- a/src/lagrangian/cfdemParticle/subModels/chemistryModel/species/species.C +++ b/src/lagrangian/cfdemParticle/subModels/chemistryModel/species/species.C @@ -205,7 +205,7 @@ void species::init() mesh_, dimensionedScalar("zero",dimMass/(dimVol*dimTime), 0.0) ) - ); + ); } initialized_ = true; } @@ -216,9 +216,9 @@ void species::execute() { if(!initialized_) { - init(); + init(); } - + loopCounter_++; if (loopCounter_ % Nevery_ != 0) { diff --git a/src/lagrangian/cfdemParticle/subModels/chemistryModel/species/species.H b/src/lagrangian/cfdemParticle/subModels/chemistryModel/species/species.H index 0164a62c..2b9529a0 100644 --- a/src/lagrangian/cfdemParticle/subModels/chemistryModel/species/species.H +++ b/src/lagrangian/cfdemParticle/subModels/chemistryModel/species/species.H @@ -16,7 +16,7 @@ License Copyright (C) 2015- Thomas Lichtenegger, JKU Linz, Austria M. Efe Kinaci, JKU Linz, Austria - + Description Model to communicate species concentration and changes due to reactions @@ -56,26 +56,26 @@ private: bool interpolation_; const fvMesh& mesh_; - + bool verbose_; // Species dictionary - To be read where the species are from dictionary specDict_; wordList speciesNames_; - + wordList mod_spec_names_; UPtrList X_; mutable List molarFractions_; - + mutable List changeOfSpeciesMass_; PtrList changeOfSpeciesMassFields_; - + volScalarField changeOfGasMassField_; - + word tempFieldName_; const volScalarField& tempField_; // ref to gas temperature field @@ -89,7 +89,7 @@ private: const volScalarField& rho_; word partRhoName_; - + mutable double **partRho_; // gas density at particle positions word voidfractionFieldName_; @@ -106,17 +106,17 @@ private: word partMolarConcName_; mutable double **partMolarConc_; - + label loopCounter_; - + label Nevery_; - + scalar massSourceCurr_; - + scalar massSourceTot_; - + bool initialized_; - + void init(); public: