diff --git a/src/lagrangian/cfdemParticle/subModels/chemistryModel/diffusionCoefficients/diffusionCoefficients.C b/src/lagrangian/cfdemParticle/subModels/chemistryModel/diffusionCoefficients/diffusionCoefficients.C index ce5cf4cb..d9dc0374 100644 --- a/src/lagrangian/cfdemParticle/subModels/chemistryModel/diffusionCoefficients/diffusionCoefficients.C +++ b/src/lagrangian/cfdemParticle/subModels/chemistryModel/diffusionCoefficients/diffusionCoefficients.C @@ -67,28 +67,26 @@ diffusionCoefficient::diffusionCoefficient ), // create a list from the Species table in the specified diffusionCoefficient dictionary speciesNames_(specDict_.lookup("species")), - tempFieldName_(propsDict_.lookup("tempFieldName")), + tempFieldName_(propsDict_.lookupOrDefault("tempFieldName","T")), tempField_(sm.mesh().lookupObject (tempFieldName_)), - pressureFieldName_(propsDict_.lookup("pressureFieldName")), + pressureFieldName_(propsDict_.lookupOrDefault("pressureFieldName","p")), P_(sm.mesh().lookupObject(pressureFieldName_)), - densityFieldName_(propsDict_.lookup("densityFieldName")), + densityFieldName_(propsDict_.lookupOrDefault("densityFieldName","rho")), rho_(sm.mesh().lookupObject (densityFieldName_)), - totalMoleFieldName_(propsDict_.lookup("totalMoleFieldName")), + totalMoleFieldName_(propsDict_.lookupOrDefault("totalMoleFieldName","N")), // needed to calculate the mixture diffusion coefficient // dcoeff is dependent on molar fraction not mass fraction N_(sm.mesh().lookupObject(totalMoleFieldName_)), Y_(speciesNames_.size()), - // X_(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 - */ + diffusionCoefficients_(diffusantGasNames_.size(),NULL), + X_(diffusantGasNames_.size(), NULL) { Info << " Reading diffusionCoefficient list: " << diffusantGasNames_ << endl; for (int i = 0; i < diffusantGasNames_.size(); i++) - Info << " Diffusant names: " << diffusantGasNames_[i] << endl; + { + Info << "Diffusant names: " << diffusantGasNames_[i] << endl; + } for (int i=0; i Y_; - // PtrList X_; - wordList diffusantGasNames_; mutable List diffusionCoefficients_; + mutable List X_; + HashTable coeffs; HashTable molWeight; diff --git a/src/lagrangian/cfdemParticle/subModels/chemistryModel/massTransferCoeff/massTransferCoeff.C b/src/lagrangian/cfdemParticle/subModels/chemistryModel/massTransferCoeff/massTransferCoeff.C index 1341cf33..f1623605 100644 --- a/src/lagrangian/cfdemParticle/subModels/chemistryModel/massTransferCoeff/massTransferCoeff.C +++ b/src/lagrangian/cfdemParticle/subModels/chemistryModel/massTransferCoeff/massTransferCoeff.C @@ -56,15 +56,15 @@ massTransferCoeff::massTransferCoeff verbose_(propsDict_.lookupOrDefault("verbose",false)), interpolation_(propsDict_.lookupOrDefault("interpolation",false)), mesh_(sm.mesh()), - velFieldName_(propsDict_.lookup("velFieldName")), + velFieldName_(propsDict_.lookupOrDefault("velFieldName","U")), U_(mesh_.lookupObject(velFieldName_)), - voidfractionFieldName_(propsDict_.lookup("voidfractionFieldName")), + voidfractionFieldName_(propsDict_.lookupOrDefault("voidfractionFieldName","voidfraction")), voidfraction_(sm.mesh().lookupObject (voidfractionFieldName_)), densityFieldName_(propsDict_.lookupOrDefault("densityFieldName","rho")), rho_(sm.mesh().lookupObject (densityFieldName_)), - partNuName_(propsDict_.lookup("partNu")), + partNuName_(propsDict_.lookupOrDefault("partViscos","partNu")), partNu_(NULL), - partReynolds_(propsDict_.lookup("partReynolds")), + partReynolds_(propsDict_.lookupOrDefault("partReynolds","partRe")), partRe_(NULL) {} diff --git a/src/lagrangian/cfdemParticle/subModels/chemistryModel/species/species.C b/src/lagrangian/cfdemParticle/subModels/chemistryModel/species/species.C index e1cea815..551b5994 100644 --- a/src/lagrangian/cfdemParticle/subModels/chemistryModel/species/species.C +++ b/src/lagrangian/cfdemParticle/subModels/chemistryModel/species/species.C @@ -86,20 +86,20 @@ species::species mesh_, dimensionedScalar("zero",dimMass/(dimVol*dimTime),0.0) ), - tempFieldName_(propsDict_.lookup("tempFieldName")), + tempFieldName_(propsDict_.lookupOrDefault("tempFieldName","T")), tempField_(sm.mesh().lookupObject (tempFieldName_)), - partTempName_(propsDict_.lookup("partTempName")), + partTempName_(propsDict_.lookupOrDefault("partTempName","partTemp")), partTemp_(NULL), - densityFieldName_(propsDict_.lookup("densityFieldName")), + densityFieldName_(propsDict_.lookupOrDefault("densityFieldName","rho")), rho_(sm.mesh().lookupObject (densityFieldName_)), - partRhoName_(propsDict_.lookup("partRhoName")), + partRhoName_(propsDict_.lookupOrDefault("partRhoName","partRho")), partRho_(NULL), - voidfractionFieldName_(propsDict_.lookup("voidfractionFieldName")), + voidfractionFieldName_(propsDict_.lookupOrDefault("voidfractionFieldName","voidfraction")), voidfraction_(sm.mesh().lookupObject(voidfractionFieldName_)), // total mole field - totalMoleFieldName_(propsDict_.lookup("totalMoleFieldName")), + totalMoleFieldName_(propsDict_.lookupOrDefault("totalMoleFieldName","N")), N_(sm.mesh().lookupObject(totalMoleFieldName_)), - partMoleName_(propsDict_.lookup("partMoleName")), + partMoleName_(propsDict_.lookupOrDefault("partMoleName","partN")), partN_(NULL), loopCounter_(-1), Nevery_(propsDict_.lookupOrDefault