diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C index 69032a1169..bc1af21c14 100644 --- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C +++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C @@ -35,12 +35,11 @@ Foam::chemistryReader::New speciesTable& species ) { - // Let the chemistry reader type default to CHEMKIN - // for backward compatibility - word readerName("chemkinReader"); - - // otherwise use the specified reader - thermoDict.readIfPresent("chemistryReader", readerName); + // Use specified reader or default to CHEMKIN for backward compatibility + const word readerName + ( + thermoDict.lookupOrDefault("chemistryReader", "chemkinReader") + ); Info<< "Selecting chemistryReader " << readerName << endl; diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.H b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.H index c9a2e1fc6a..859256fca8 100644 --- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.H +++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.H @@ -59,15 +59,6 @@ typedef HashTable> speciesCompositionTable; template class chemistryReader { - // Private Member Functions - - //- No copy construct - chemistryReader(const chemistryReader&) = delete; - - //- No copy assignment - void operator=(const chemistryReader&) = delete; - - public: //- Runtime type information @@ -110,8 +101,7 @@ public: //- Destructor - virtual ~chemistryReader() - {} + virtual ~chemistryReader() = default; // Member Functions diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/foamChemistryReader/foamChemistryReader.C b/src/thermophysicalModels/reactionThermo/chemistryReaders/foamChemistryReader/foamChemistryReader.C index 8d4df10956..a2f618052a 100644 --- a/src/thermophysicalModels/reactionThermo/chemistryReaders/foamChemistryReader/foamChemistryReader.C +++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/foamChemistryReader/foamChemistryReader.C @@ -36,7 +36,7 @@ Foam::speciesTable& Foam::foamChemistryReader::setSpecies speciesTable& species ) { - wordList s(dict.lookup("species")); + wordList s(dict.get("species")); species.transfer(s); return species; } @@ -51,23 +51,23 @@ void Foam::foamChemistryReader::readSpeciesComposition() return; } - wordList e(chemDict_.lookup("elements")); + wordList e(chemDict_.get("elements")); label currentElementIndex(0); DynamicList elementNames_; HashTable