zhyang-dev/CFDEMcoupling-PFM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

define and initialize variables

Browse Source
This commit is contained in:
ekinaci
2017-05-08 17:24:11 +02:00
parent 1b6dcc0183
commit fa6b0ecf77
2 changed files with 39 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/lagrangian/cfdemParticle/subModels/chemistryModel/diffusionCoefficients/diffusionCoefficients.C
View File

@ -20,14 +20,12 @@ License
\*---------------------------------------------------------------------------*/
#include "error.H"
#include "diffusionCoefficient.H"
#include "diffusionCoefficients.H"
#include "addToRunTimeSelectionTable.H"
#include "dataExchangeModel.H"
#include "IFstream.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
@ -57,7 +55,7 @@ diffusionCoefficient::diffusionCoefficient
propsDict_(dict.subDict(typeName + "Props")),
interpolation_(propsDict_.lookupOrDefault<bool>("interpolation",false)),
mesh_(sm.mesh()),
// define a file name in the coupling properties that contains the diffusionCoefficient
// define a file name in the coupling properties that contains the species
specDict_
(
IFstream
@ -67,28 +65,27 @@ diffusionCoefficient::diffusionCoefficient
),
// create a list from the Species table in the specified diffusionCoefficient dictionary
speciesNames_(specDict_.lookup("species")),
diffusionCoefficientNames_(propsDict_.lookup("diffusionCoefficientNames")),
Y_(speciesNames_.size()), //volumeScalarFields created in the ts folders
diffusionCoefficients_(diffusionCoefficientNames_.size(),NULL), //the value of diffusionCoefficient concentration for every diffusionCoefficient
tempFieldName_(propsDict_.lookup("tempFieldName")),
tempField_(sm.mesh().lookupObject<volScalarField> (tempFieldName_)),
pressureFieldName_(propsDict_.lookup("pressureFieldName")),
P_(sm.mesh().lookupObject<volScalarField>(pressureFieldName_))
P_(sm.mesh().lookupObject<volScalarField>(pressureFieldName_)),
totalMoleFieldName_(propsDict_.lookup("totalMoleFieldName")),
N_(sm.mesh().lookupObject<volScalarField>(totalMoleFieldName_)),
Y_(speciesNames_.size()),
diffusantGasNames_(propsDict_.lookup("diffusantGasNames")),
diffusionCoefficients_(diffusantGasNames_.size(),NULL)
/* diffusionCoefficientNames_(propsDict_.lookup("diffusionCoefficientNames")),
//volumeScalarFields created in the ts folders
diffusionCoefficients_(diffusionCoefficientNames_.size(),NULL), //the value of diffusionCoefficient concentration for every diffusionCoefficient
*/
{
Info << " Read species list from: " << specDict_.name() << endl;
Info << " Reading diffusionCoefficient list: " << diffusionCoefficientNames_ << endl;
Info << " Reading diffusionCoefficient list: " << diffusantGasNames_ << endl;
for (int i=0; i<speciesNames_.size(); i++)
{
// Defining the Species volume scalar fields
Info << " Looking up diffusionCoefficient fields \n " << speciesNames_[i] << endl;
volScalarField& Y = const_cast<volScalarField&>
(sm.mesh().lookupObject<volScalarField>(speciesNames_[i]));
Y_.set(i, &Y);
Info << "The concentration fields (Y_i): \n" << Y_[i].name() << endl;
// define the modified diffusionCoefficient names
particleCloud_.checkCG(false);
}
@ -100,18 +97,18 @@ diffusionCoefficient::diffusionCoefficient
diffusionCoefficient::~diffusionCoefficient()
{
coeffs.clearStorage();
/* coeffs.clearStorage();
int nP_ = particleCloud_.numberOfParticles();
for (int i=0; i<diffusionCoefficientNames_.size(); i++)
{
particleCloud_.dataExchangeM().destroy(diffusionCoefficients_[i],nP_);
}
}*/
}
// * * * * * * * * * * * * * * * private Member Functions * * * * * * * * * * * * * //
void diffusionCoefficient::allocateMyArrays() const
void diffusionCoefficient::allocateMyArrays() const
{
double initVal=0.0;
/*double initVal=0.0;
if (particleCloud_.dataExchangeM().maxNumberOfParticles() > 0)
{
for (int i=0; i<diffusionCoefficientNames_.size(); i++)
@ -119,13 +116,12 @@ void diffusionCoefficient::allocateMyArrays() const
particleCloud_.dataExchangeM().allocateArray(diffusionCoefficients_[i],initVal,1,"nparticles");
}
}
} */
}
void diffusionCoefficient::reAllocMyArrays() const
{
if (particleCloud_.numberOfParticlesChanged())
/* if (particleCloud_.numberOfParticlesChanged())
{
double initVal=0.0;
@ -133,14 +129,14 @@ void diffusionCoefficient::reAllocMyArrays() const
{
particleCloud_.dataExchangeM().allocateArray(diffusionCoefficients_[i],initVal,1);
}
}
}*/
}
// * * * * * * * * * * * * * * * * Member Fct * * * * * * * * * * * * * * * //
void diffusionCoefficient::execute()
{
// realloc the arrays
/* // realloc the arrays
reAllocMyArrays();
@ -216,7 +212,7 @@ void diffusionCoefficient::execute()
Info << "give data done" << endl;
*/
}
void diffusionCoefficient::createCoeffs()

34
src/lagrangian/cfdemParticle/subModels/chemistryModel/diffusionCoefficients/diffusionCoefficients.H
View File

@ -21,12 +21,13 @@ License
\*---------------------------------------------------------------------------*/
#ifndef diffusionCoefficient_H
#define diffusionCoefficient_H
#ifndef diffusionCoefficients_H
#define diffusionCoefficients_H
#include "fvCFD.H"
#include "cfdemCloudEnergy.H"
#include "chemistryModel.H"
#include "species.H"
#include "HashPtrTable.H"
#include "HashTable.H"
@ -59,13 +60,7 @@ private:
dictionary specDict_;
wordList speciesNames_;
wordList diffusionCoefficientNames_;
UPtrList<volScalarField> Y_;
mutable List<double**> diffusionCoefficients_;
word tempFieldName_;
const volScalarField& tempField_; // ref to gas temperature field
@ -73,7 +68,18 @@ private:
// gas pressure at particle location
word pressureFieldName_;
const volScalarField& P_;
const volScalarField& P_;
// total mole field
word totalMoleFieldName_;
const volScalarField& N_;
UPtrList<volScalarField> Y_;
wordList diffusantGasNames_;
mutable List<double**> diffusionCoefficients_;
HashTable<scalar, word> coeffs;
@ -81,16 +87,10 @@ private:
void allocateMyArrays() const;
public:
public:
//- Runtime type information
TypeName("diffusionCoefficient");
TypeName("diffusionCoefficients");
// Constructors