diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModel.C index e1a3888a4..1c0d5ea05 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModel.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModel.C @@ -54,7 +54,7 @@ Foam::TDACChemistryModel::TDACChemistryModel ( IOobject ( - "TabulationResults", + IOobject::groupName("TabulationResults", phaseName), this->time().timeName(), this->mesh(), IOobject::NO_READ, @@ -75,7 +75,7 @@ Foam::TDACChemistryModel::TDACChemistryModel forAll(specieComp_, i) { - specieComp_[i] = specComp[this->Y()[i].name()]; + specieComp_[i] = specComp[this->Y()[i].member()]; } mechRed_ = chemistryReductionMethod::New diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModelI.H b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModelI.H index 011e47aa2..1815e31c7 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModelI.H +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModelI.H @@ -45,12 +45,12 @@ template inline Foam::autoPtr Foam::TDACChemistryModel::logFile(const word& name) const { - mkDir(this->mesh().time().path()/"TDAC"); + mkDir(this->mesh().time().path()/"TDAC"/this->group()); return autoPtr ( new OFstream ( - this->mesh().time().path()/"TDAC"/name + this->mesh().time().path()/"TDAC"/this->group()/name ) ); } diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.C index f09294485..9f7a51b15 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -91,7 +91,7 @@ Foam::chemistryReductionMethods::DAC::DAC dictionary initSet = this->coeffsDict_.subDict("initialSet"); for (label i=0; i::DAC Info<< "element not considered"<chemistry_.Y()[i].name() == CO2Name_) + if (this->chemistry_.Y()[i].member() == CO2Name_) { CO2Id_ = i; } - else if (this->chemistry_.Y()[i].name() == COName_) + else if (this->chemistry_.Y()[i].member() == COName_) { COId_ = i; } - else if (this->chemistry_.Y()[i].name() == HO2Name_) + else if (this->chemistry_.Y()[i].member() == HO2Name_) { HO2Id_ = i; } - else if (this->chemistry_.Y()[i].name() == H2OName_) + else if (this->chemistry_.Y()[i].member() == H2OName_) { H2OId_ = i; } - else if (this->chemistry_.Y()[i].name() == NOName_) + else if (this->chemistry_.Y()[i].member() == NOName_) { NOId_ = i; } @@ -230,7 +230,7 @@ Foam::chemistryReductionMethods::DAC::DAC fuelSpeciesProp_[i] = readScalar(fuelDict.lookup(fuelSpecies_[i])); for (label j=0; jnSpecie_; j++) { - if (this->chemistry_.Y()[j].name() == fuelSpecies_[i]) + if (this->chemistry_.Y()[j].member() == fuelSpecies_[i]) { fuelSpeciesID_[i] = j; break; @@ -496,8 +496,8 @@ void Foam::chemistryReductionMethods::DAC::reduceMechanism // Complete combustion products are not considered if ( - this->chemistry_.Y()[i].name() == "CO2" - || this->chemistry_.Y()[i].name() == "H2O" + this->chemistry_.Y()[i].member() == "CO2" + || this->chemistry_.Y()[i].member() == "H2O" ) { continue; @@ -505,7 +505,7 @@ void Foam::chemistryReductionMethods::DAC::reduceMechanism Na[0] += sC_[i]*c[i]; Na[1] += sH_[i]*c[i]; Na[2] += sO_[i]*c[i]; - if (sC_[i]>nbCLarge_ || this->chemistry_.Y()[i].name() == "O2") + if (sC_[i]>nbCLarge_ || this->chemistry_.Y()[i].member() == "O2") { Nal[0] += sC_[i]*c[i]; Nal[1] += sH_[i]*c[i]; diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DRG/DRG.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DRG/DRG.C index 6e335aa25..de8c02f54 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DRG/DRG.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DRG/DRG.C @@ -41,7 +41,7 @@ Foam::chemistryReductionMethods::DRG::DRG dictionary initSet = this->coeffsDict_.subDict("initialSet"); for (label i=0; i::DRGEP dictionary initSet = this->coeffsDict_.subDict("initialSet"); for (label i=0; ichemistry_.Y()[u].name() << "," - << this->chemistry_.Y()[otherSpec].name() + <chemistry_.Y()[u].member() << "," + << this->chemistry_.Y()[otherSpec].member() << endl; rAB=1.0; } diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/PFA/PFA.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/PFA/PFA.C index 1bd9dd6c2..58c8e4340 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/PFA/PFA.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/PFA/PFA.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,7 +43,7 @@ Foam::chemistryReductionMethods::PFA::PFA for (label i=0; i::New ( IOobject ( - "thermophysicalProperties", + IOobject::groupName("thermophysicalProperties",dict.group()), dict.db().time().constant(), dict.db(), IOobject::MUST_READ_IF_MODIFIED, diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/ISAT.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/ISAT.C index 555365b7b..f4eaa709a 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/ISAT.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/ISAT.C @@ -84,7 +84,7 @@ Foam::chemistryTabulationMethods::ISAT::ISAT scalar otherScaleFactor = readScalar(scaleDict.lookup("otherSpecies")); for (label i=0; ichemistry_.Y()[i].name())) + if (!scaleDict.found(this->chemistry_.Y()[i].member())) { scaleFactor_[i] = otherScaleFactor; } @@ -93,7 +93,7 @@ Foam::chemistryTabulationMethods::ISAT::ISAT scaleFactor_[i] = readScalar ( - scaleDict.lookup(this->chemistry_.Y()[i].name()) + scaleDict.lookup(this->chemistry_.Y()[i].member()) ); } } diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/chemPointISAT/chemPointISAT.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/chemPointISAT/chemPointISAT.C index 33bf76881..1499b07a9 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/chemPointISAT/chemPointISAT.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/chemPointISAT/chemPointISAT.C @@ -512,7 +512,7 @@ bool Foam::chemPointISAT::inEOA(const scalarField& phiq) } else { - propName = chemistry_.Y()[maxIndex].name(); + propName = chemistry_.Y()[maxIndex].member(); } Info<< "Direction maximum impact to error in ellipsoid: " << propName << endl; diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/chemistryTabulationMethod/chemistryTabulationMethodNew.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/chemistryTabulationMethod/chemistryTabulationMethodNew.C index 269613d1d..2e1a7eeee 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/chemistryTabulationMethod/chemistryTabulationMethodNew.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/chemistryTabulationMethod/chemistryTabulationMethodNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -40,7 +40,7 @@ Foam::chemistryTabulationMethod::New ( IOobject ( - "thermophysicalProperties", + IOobject::groupName("thermophysicalProperties",dict.group()), dict.db().time().constant(), dict.db(), IOobject::MUST_READ_IF_MODIFIED,