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

clean up whitespaces

Browse Source 
remove extra spaces, convert tabs to spaces
This commit is contained in:
danielque
2018-07-05 16:25:40 +02:00
parent b5b04c0fb0
commit 1a8b4aa5c2
18 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/solvers/cfdemSolverRhoPimple/EEqn.H
View File

@ -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)
+ (

2
applications/solvers/cfdemSolverRhoPimpleChem/EEqn.H
View File

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

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

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

16
applications/solvers/cfdemSolverRhoPimpleChem/createFields.H
View File

@ -1,5 +1,5 @@
// thermodynamics, chemistry
Info<< "Creating combustion model\n" << endl;
autoPtr<combustionModels::rhoCombustionModel> 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
(

8
applications/solvers/cfdemSolverRhoPimpleChem/molConc.H
View File

@ -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;
}
}
// ************************************************************************* //
// ************************************************************************* //

4
applications/solvers/cfdemSolverRhoPimpleChem/pEqn.H
View File

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

2
applications/solvers/cfdemSolverRhoPimpleChem/pEqn_alternative.H
View File

@ -38,7 +38,7 @@ else
// + rhorAUf*fvc::ddtCorr(rho, U, phi)
)
);
// flux without pressure gradient contribution
phi = phiHbyA + phiUs;

2
applications/solvers/cfdemSolverRhoPimpleChem/rhoEqn.H
View File

@ -15,4 +15,4 @@
fvOptions.correct(rho);
}
// ************************************************************************* //
// ************************************************************************* //

2
src/lagrangian/cfdemParticle/derived/cfdemCloudEnergy/cfdemCloudEnergy.C
View File

@ -166,7 +166,7 @@ bool cfdemCloudEnergy::evolve
if(verbose_) Info << "speciesExecute done" << endl;
clockM().stop("speciesExecute");
return true;
return true;
}
return false;
}

6
src/lagrangian/cfdemParticle/derived/cfdemCloudEnergy/cfdemCloudEnergy.H
View File

@ -61,7 +61,7 @@ protected:
autoPtr<energyModel>* energyModel_;
autoPtr<thermCondModel> thermCondModel_;
autoPtr<chemistryModel>* 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&);

4
src/lagrangian/cfdemParticle/subModels/averagingModel/averagingModel/averagingModel.H
View File

@ -175,8 +175,8 @@ public:
double**const& weight,
double**const& mask
) const;
void setScalarSumCentre
void setScalarSumCentre
(
volScalarField& field,
double**& value,

2
src/lagrangian/cfdemParticle/subModels/chemistryModel/chemistryModel/chemistryModel.C
View File

@ -46,7 +46,7 @@ tmp<volScalarField> chemistryModel::Smi(label i) const
tmp<volScalarField> chemistryModel::Sm() const
{
FatalError<<"the solver calls for Smi()\n"
FatalError<<"the solver calls for Sm()\n"
<<"please activate 'speciesModel' in 'chemistryModels'"
<<abort(FatalError);

14
src/lagrangian/cfdemParticle/subModels/chemistryModel/chemistryModel/chemistryModel.H
View File

@ -44,9 +44,9 @@ protected:
const dictionary& dict_;
cfdemCloudEnergy& particleCloud_;
public:
//- Runtime type information
@ -73,7 +73,7 @@ public:
chemistryModel
(
const dictionary& dict,
cfdemCloudEnergy& sm
cfdemCloudEnergy& sm
);
@ -94,11 +94,11 @@ public:
// Member Functions
virtual void execute() = 0;
virtual tmp<volScalarField> Smi (const label i) const;
virtual void execute() = 0;
virtual tmp<volScalarField> Sm () const;
virtual tmp<volScalarField> Smi(const label i) const;
virtual tmp<volScalarField> Sm() const;
};

2
src/lagrangian/cfdemParticle/subModels/chemistryModel/massTransferCoeff/massTransferCoeff.H
View File

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

4
src/lagrangian/cfdemParticle/subModels/chemistryModel/noChemistry/noChemistry.H
View File

@ -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();
};

8
src/lagrangian/cfdemParticle/subModels/chemistryModel/reactantPerParticle/reactantPerParticle.H
View File

@ -15,7 +15,7 @@ License
along with this code. If not, see <http://www.gnu.org/licenses/>.
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:

6
src/lagrangian/cfdemParticle/subModels/chemistryModel/species/species.C
View File

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

26
src/lagrangian/cfdemParticle/subModels/chemistryModel/species/species.H
View File

@ -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<volScalarField> X_;
mutable List<double**> molarFractions_;
mutable List<double**> changeOfSpeciesMass_;
PtrList<volScalarField> 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: