diff --git a/src/lagrangian/cfdemParticle/subModels/chemistryModel/species/species.C b/src/lagrangian/cfdemParticle/subModels/chemistryModel/species/species.C index 1afce577..abf743bc 100644 --- a/src/lagrangian/cfdemParticle/subModels/chemistryModel/species/species.C +++ b/src/lagrangian/cfdemParticle/subModels/chemistryModel/species/species.C @@ -67,6 +67,7 @@ species::species ), // create a list from the Species table in the specified species dictionary speciesNames_(specDict_.lookup("species")), + //speciesNames_(propsDict_.lookup("speciesNames")), mod_spec_names_(speciesNames_.size()), Y_(speciesNames_.size()), //volumeScalarFields created in the ts folders concentrations_(speciesNames_.size(),NULL), //the value of species concentration for every species @@ -85,47 +86,29 @@ species::species mesh_, dimensionedScalar("zero",dimMass/(dimVol*dimTime),0.0) ), - tempFieldName_(propsDict_.lookupOrDefault("tempFieldName","T")), + tempFieldName_(propsDict_.lookup("tempFieldName")), tempField_(sm.mesh().lookupObject (tempFieldName_)), - partTempName_(propsDict_.lookupOrDefault("partTempName","partTemp")), + partTempName_(propsDict_.lookup("partTempName")), partTemp_(NULL), - densityFieldName_(propsDict_.lookupOrDefault("densityFieldName","rho")), + densityFieldName_(propsDict_.lookup("densityFieldName")), rho_(sm.mesh().lookupObject (densityFieldName_)), - partRhoName_(propsDict_.lookupOrDefault("partRhoName","partRho")), + partRhoName_(propsDict_.lookup("partRhoName")), partRho_(NULL), - voidfractionFieldName_(propsDict_.lookupOrDefault("voidfractionFieldName","voidfraction")), + voidfractionFieldName_(propsDict_.lookup("voidfractionFieldName")), voidfraction_(sm.mesh().lookupObject(voidfractionFieldName_)) { -// Info << " Read species list from: " << specDict_.name() << endl; -// Info << " Reading species list: " << speciesNames_ << endl; + Info << " Read species list from: " << specDict_.name() << endl; + Info << " Reading species list: " << speciesNames_ << endl; for (int i=0; i + volScalarField& Y = const_cast (sm.mesh().lookupObject(speciesNames_[i])); - Y_.set(i, &Y); */ + Y_.set(i, &Y); - Y_.set - ( - i, - new volScalarField - ( - IOobject - ( - speciesNames_[i], - mesh_.time().timeName(), - mesh_, - IOobject::READ_IF_PRESENT, - IOobject::AUTO_WRITE - ), - mesh_, - dimensionedScalar("0", dimless, 0) - ) - ); - - Info << "The concentrations (Y_i): \n" << Y_[i].name() << endl; + Info << "The concentration fields (Y_i): \n" << Y_[i].name() << endl; // define the modified species names mod_spec_names_[i] = "Modified_" + speciesNames_[i]; @@ -150,6 +133,8 @@ species::species dimensionedScalar("0",dimMass/(dimVol*dimTime), 0) ) ); + + particleCloud_.checkCG(false); } allocateMyArrays(); @@ -169,6 +154,14 @@ species::~species() particleCloud_.dataExchangeM().destroy(concentrations_[i],nP_); particleCloud_.dataExchangeM().destroy(changeOfSpeciesMass_[i],nP_); } + /*delete partTemp_; + delete partRho_; + + for (int i = 0; i < speciesNames_.size();i++) + { + delete concentrations_[i]; + delete changeOfSpeciesMass_[i]; + }*/ } // * * * * * * * * * * * * * * * private Member Functions * * * * * * * * * * * * * // @@ -249,20 +242,25 @@ void species::execute() Tfluid = tempField_[cellI]; rhofluid = rho_[cellI]; voidfraction = voidfraction_[cellI]; + for (int i = 0; i=0 && index < 2) - { + // if(particleCloud_.verbose() && index >=0 && index < 2) + // { for(int i =0; i species::Smi (const label i) const diff --git a/src/lagrangian/cfdemParticle/subModels/chemistryModel/species/species.H b/src/lagrangian/cfdemParticle/subModels/chemistryModel/species/species.H index f50751ee..5401089e 100644 --- a/src/lagrangian/cfdemParticle/subModels/chemistryModel/species/species.H +++ b/src/lagrangian/cfdemParticle/subModels/chemistryModel/species/species.H @@ -62,7 +62,7 @@ private: wordList mod_spec_names_; - PtrList Y_; + UPtrList Y_; mutable List concentrations_;