From 8b63b8cdfecba42762ece9421a81852400e864fe Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 1 Jun 2022 11:35:09 +0200
Subject: [PATCH] ENH: add hashedWordList find, appendUniq methods

- aligns calling signatures with wordList, for possible future
  replacement

- drop construct from const char** (can use initializer_list instead)

ENH: replace hashedWordList with plain wordList in triSurfaceLoader

- additional hashing optimisation (and overhead) is not worth it for
  the comparatively small lists of surfaces used.
---
 .../combustion/fireFoam/createFieldRefs.H     |  2 +-
 .../combustion/reactingFoam/createFieldRefs.H |  2 +-
 .../rhoReactingBuoyantFoam/createFieldRefs.H  |  2 +-
 .../rhoReactingFoam/createFieldRefs.H         |  2 +-
 .../fluid/setRegionFluidFields.H              |  6 +-
 .../coalChemistryFoam/createFieldRefs.H       |  2 +-
 .../reactingParcelFoam/createFieldRefs.H      |  2 +-
 .../createFieldRefs.H                         |  2 +-
 .../simpleCoalParcelFoam/createFieldRefs.H    |  2 +-
 .../lagrangian/sprayFoam/createFieldRefs.H    |  2 +-
 .../primitives/strings/lists/hashedWordList.C | 44 ++++----------
 .../primitives/strings/lists/hashedWordList.H | 57 +++++++++---------
 .../strings/lists/hashedWordListI.H           | 59 ++++++++++---------
 .../diffusionMulticomponent.C                 | 12 ++--
 src/combustionModels/laminar/laminar.C        |  2 +-
 .../singleStepCombustion.C                    |  2 +-
 .../triSurfaceLoader/triSurfaceLoader.C       | 47 +++++++--------
 .../triSurfaceLoader/triSurfaceLoader.H       | 23 ++++----
 .../InterfaceCompositionModel.C               |  5 +-
 .../MultiComponentPhaseModel.C                |  2 +-
 .../interfaceCompositionModels/Henry/Henry.C  |  6 +-
 .../InterfaceCompositionModel.C               |  7 +--
 .../NonRandomTwoLiquid/NonRandomTwoLiquid.C   |  4 +-
 .../Saturated/Saturated.C                     |  6 +-
 .../MultiComponentPhaseModel.C                | 12 ++--
 .../greyMeanAbsorptionEmission.C              |  2 +-
 .../greyMeanSolidAbsorptionEmission.C         |  4 +-
 .../wideBandAbsorptionEmission.C              |  2 +-
 .../mixtureFractionSoot/mixtureFractionSoot.C |  2 +-
 .../basicMultiComponentMixtureI.H             |  4 +-
 .../singleStepReactingMixture.C               |  8 +--
 .../Reactions/solidReaction/solidReaction.C   |  2 +-
 .../reaction/Reactions/Reaction/Reaction.C    |  2 +-
 .../LangmuirHinshelwoodReactionRateI.H        |  8 +--
 .../thirdBodyEfficienciesI.H                  | 20 +++++--
 .../specie/speciesTable/speciesTable.H        |  1 +
 36 files changed, 173 insertions(+), 194 deletions(-)

diff --git a/applications/solvers/combustion/fireFoam/createFieldRefs.H b/applications/solvers/combustion/fireFoam/createFieldRefs.H
index a911c586d9..d5b7f4a483 100644
--- a/applications/solvers/combustion/fireFoam/createFieldRefs.H
+++ b/applications/solvers/combustion/fireFoam/createFieldRefs.H
@@ -1,4 +1,4 @@
 const volScalarField& psi = thermo.psi();
 const volScalarField& T = thermo.T();
 regionModels::surfaceFilmModel& surfaceFilm = tsurfaceFilm();
-const label inertIndex(composition.species()[inertSpecie]);
+const label inertIndex(composition.species().find(inertSpecie));
diff --git a/applications/solvers/combustion/reactingFoam/createFieldRefs.H b/applications/solvers/combustion/reactingFoam/createFieldRefs.H
index fdc479bc23..da9419e207 100644
--- a/applications/solvers/combustion/reactingFoam/createFieldRefs.H
+++ b/applications/solvers/combustion/reactingFoam/createFieldRefs.H
@@ -1,3 +1,3 @@
 const volScalarField& psi = thermo.psi();
 const volScalarField& T = thermo.T();
-const label inertIndex(composition.species()[inertSpecie]);
+const label inertIndex(composition.species().find(inertSpecie));
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFieldRefs.H b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFieldRefs.H
index fdc479bc23..da9419e207 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFieldRefs.H
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFieldRefs.H
@@ -1,3 +1,3 @@
 const volScalarField& psi = thermo.psi();
 const volScalarField& T = thermo.T();
-const label inertIndex(composition.species()[inertSpecie]);
+const label inertIndex(composition.species().find(inertSpecie));
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFieldRefs.H b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFieldRefs.H
index fdc479bc23..da9419e207 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFieldRefs.H
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFieldRefs.H
@@ -1,3 +1,3 @@
 const volScalarField& psi = thermo.psi();
 const volScalarField& T = thermo.T();
-const label inertIndex(composition.species()[inertSpecie]);
+const label inertIndex(composition.species().find(inertSpecie));
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
index 4b1ade67e8..a35a63d52b 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
@@ -12,15 +12,15 @@
     if (Y.size())
     {
         const word inertSpecie(thermo.get<word>("inertSpecie"));
-        if (!composition.species().found(inertSpecie))
+        inertIndex = composition.species().find(inertSpecie);
+        if (inertIndex < 0)
         {
             FatalIOErrorIn(args.executable().c_str(), thermo)
                 << "Inert specie " << inertSpecie
                 << " not found in available species "
-                << composition.species()
+                << flatOutput(composition.species())
                 << exit(FatalIOError);
         }
-        inertIndex = composition.species()[inertSpecie];
     }
 
     volScalarField& rho = rhoFluid[i];
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/createFieldRefs.H b/applications/solvers/lagrangian/coalChemistryFoam/createFieldRefs.H
index 453ae090bb..02ec6a1801 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/createFieldRefs.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/createFieldRefs.H
@@ -1,4 +1,4 @@
 const volScalarField& T = thermo.T();
 const volScalarField& psi = thermo.psi();
 
-const label inertIndex(composition.species()[inertSpecie]);
+const label inertIndex(composition.species().find(inertSpecie));
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/createFieldRefs.H b/applications/solvers/lagrangian/reactingParcelFoam/createFieldRefs.H
index bbbc50c122..0179150443 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/createFieldRefs.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/createFieldRefs.H
@@ -1,4 +1,4 @@
-const label inertIndex(composition.species()[inertSpecie]);
+const label inertIndex(composition.species().find(inertSpecie));
 
 const volScalarField& T = thermo.T();
 const volScalarField& psi = thermo.psi();
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFieldRefs.H b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFieldRefs.H
index fdc479bc23..da9419e207 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFieldRefs.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFieldRefs.H
@@ -1,3 +1,3 @@
 const volScalarField& psi = thermo.psi();
 const volScalarField& T = thermo.T();
-const label inertIndex(composition.species()[inertSpecie]);
+const label inertIndex(composition.species().find(inertSpecie));
diff --git a/applications/solvers/lagrangian/simpleCoalParcelFoam/createFieldRefs.H b/applications/solvers/lagrangian/simpleCoalParcelFoam/createFieldRefs.H
index fdc479bc23..da9419e207 100644
--- a/applications/solvers/lagrangian/simpleCoalParcelFoam/createFieldRefs.H
+++ b/applications/solvers/lagrangian/simpleCoalParcelFoam/createFieldRefs.H
@@ -1,3 +1,3 @@
 const volScalarField& psi = thermo.psi();
 const volScalarField& T = thermo.T();
-const label inertIndex(composition.species()[inertSpecie]);
+const label inertIndex(composition.species().find(inertSpecie));
diff --git a/applications/solvers/lagrangian/sprayFoam/createFieldRefs.H b/applications/solvers/lagrangian/sprayFoam/createFieldRefs.H
index e7f76d8456..73cb3d28b7 100644
--- a/applications/solvers/lagrangian/sprayFoam/createFieldRefs.H
+++ b/applications/solvers/lagrangian/sprayFoam/createFieldRefs.H
@@ -1,3 +1,3 @@
 const volScalarField& T = thermo.T();
 const volScalarField& psi = thermo.psi();
-const label inertIndex(composition.species()[inertSpecie]);
+const label inertIndex(composition.species().find(inertSpecie));
diff --git a/src/OpenFOAM/primitives/strings/lists/hashedWordList.C b/src/OpenFOAM/primitives/strings/lists/hashedWordList.C
index ae611720d3..f8737e5857 100644
--- a/src/OpenFOAM/primitives/strings/lists/hashedWordList.C
+++ b/src/OpenFOAM/primitives/strings/lists/hashedWordList.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016-2018 OpenCFD Ltd.
+    Copyright (C) 2016-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,44 +26,18 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "hashedWordList.H"
-#include "CStringList.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::hashedWordList::hashedWordList
-(
-    const label len,
-    const char** array,
-    bool unique
-)
-:
-    wordList(len)
-{
-    for (label i=0; i < len; ++i)
-    {
-        wordList::operator[](i) = array[i];
-    }
-
-    rehash(unique);
-}
-
-
-Foam::hashedWordList::hashedWordList(const char** array, bool unique)
-:
-    hashedWordList(CStringList::count(array), array, unique)
-{}
-
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::hashedWordList::rehash() const
 {
-    lookup_.clear();
-
     const wordUList& list = *this;
     const label len = list.size();
 
-    for (label i=0; i < len; ++i)
+    lookup_.clear();
+    lookup_.resize(2*len);
+
+    for (label i = 0; i < len; ++i)
     {
         lookup_.insert(list[i], i);
     }
@@ -72,13 +46,15 @@ void Foam::hashedWordList::rehash() const
 
 void Foam::hashedWordList::uniq()
 {
-    lookup_.clear();
-
     wordList& list = *this;
     const label len = list.size();
 
+    lookup_.clear();
+    lookup_.resize(2*len);
+
     label count = 0;
-    for (label i=0; i < len; ++i)
+
+    for (label i = 0; i < len; ++i)
     {
         word& item = list[i];
 
diff --git a/src/OpenFOAM/primitives/strings/lists/hashedWordList.H b/src/OpenFOAM/primitives/strings/lists/hashedWordList.H
index 933966c47f..bf0553a9a3 100644
--- a/src/OpenFOAM/primitives/strings/lists/hashedWordList.H
+++ b/src/OpenFOAM/primitives/strings/lists/hashedWordList.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2020 OpenCFD Ltd.
+    Copyright (C) 2016-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,8 +37,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef hashedWordList_H
-#define hashedWordList_H
+#ifndef Foam_hashedWordList_H
+#define Foam_hashedWordList_H
 
 #include "wordList.H"
 #include "HashTable.H"
@@ -68,10 +68,10 @@ public:
         //- Default construct an empty list
         hashedWordList() = default;
 
-        //- Copy construct.
+        //- Copy construct
         inline hashedWordList(const hashedWordList& list);
 
-        //- Move construct.
+        //- Move construct
         inline hashedWordList(hashedWordList&& list);
 
         //- Copy construct from list of words
@@ -95,16 +95,8 @@ public:
             const HashTable<AnyType, word, AnyHash>& tbl
         );
 
-        //- Construct from number and list of words,
-        //  optionally eliminating duplicates
-        hashedWordList(const label len, const char** array, bool unique=false);
-
-        //- Construct from a nullptr-terminated list of words,
-        //- optionally eliminating duplicates
-        hashedWordList(const char** array, bool unique=false);
-
         //- Construct from Istream
-        inline hashedWordList(Istream& is);
+        inline explicit hashedWordList(Istream& is);
 
 
     // Member Functions
@@ -112,12 +104,13 @@ public:
         //- Clear the list, i.e. set size to zero.
         inline void clear();
 
-        //- Append an element at the end of the list,
-        //- optionally avoid append if it would be a duplicate entry
-        inline void append(const word& name, bool unique=false);
+        //- Append an element if not already in the list.
+        FOAM_DEPRECATED_FOR(2022-05, "appendUniq method")
+        inline void append(const word& val);
 
-        //- Search hashed values for the specified name
-        inline bool found(const word& name) const;
+        //- Append an element if not already in the list.
+        //  \return the change in list length
+        inline label appendUniq(const word& val);
 
         //- Return the hash of words/indices for inspection
         inline const HashTable<label>& lookup() const;
@@ -143,22 +136,33 @@ public:
         //- and rehash the indices
         void uniq();
 
-        //- Sort the list and rehash the indices
+        //- Inplace sort list and rehash the indices
         inline void sort();
 
 
+    // Search
+
+        //- Find index of the value (searches the hash).
+        //  \return position in list or -1 if not found.
+        inline label find(const word& val) const;
+
+        //- True if the value if found in the list (searches the hash).
+        inline bool found(const word& val) const;
+
+
     // Member Operators
 
         //- Return name corresponding to specified index.
         //  Fatal for out of range values.
         inline const word& operator[](const label index) const;
 
-        //- Return index corresponding to specified name, or -1 on failure
-        inline label operator[](const word& name) const;
+        //- Find index of the value (searches the hash) - same as find().
+        //  \return position in list or -1 if not found.
+        inline label operator[](const word& val) const;
 
-        //- Check hashed values for the specified name - same as found.
+        //- Check hashed values for the specified name - same as found().
         //  Can be used as a unary predicate.
-        inline bool operator()(const word& name) const;
+        inline bool operator()(const word& val) const;
 
 
     // Assignment
@@ -184,10 +188,7 @@ public:
         //- Deprecated(2019-01) Is the specified name found in the list?
         //  \deprecated(2019-01) - use found() method
         FOAM_DEPRECATED_FOR(2019-01, "found() method")
-        bool contains(const word& name) const
-        {
-            return this->found(name);
-        }
+        bool contains(const word& val) const { return this->found(val); }
 };
 
 
diff --git a/src/OpenFOAM/primitives/strings/lists/hashedWordListI.H b/src/OpenFOAM/primitives/strings/lists/hashedWordListI.H
index 17ab7f3238..4b1089c610 100644
--- a/src/OpenFOAM/primitives/strings/lists/hashedWordListI.H
+++ b/src/OpenFOAM/primitives/strings/lists/hashedWordListI.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016-2019 OpenCFD Ltd.
+    Copyright (C) 2016-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -76,17 +76,9 @@ inline Foam::hashedWordList::hashedWordList
     const HashTable<AnyType, word, AnyHash>& tbl
 )
 :
-    wordList(tbl.size())
+    wordList(tbl.sortedToc())
 {
-    wordList& list = *this;
-
-    label count = 0;
-    for (auto iter = tbl.cbegin(); iter != tbl.cend(); ++iter)
-    {
-        list[count++] = iter.key();
-    }
-
-    this->sort();
+    rehash();
 }
 
 
@@ -105,16 +97,27 @@ inline void Foam::hashedWordList::clear()
 }
 
 
-inline void Foam::hashedWordList::append(const word& name, bool unique)
+inline void Foam::hashedWordList::append(const word& val)
 {
-    // name is either unique or we don't care about duplicates
-    if (lookup_.insert(name, size()) || !unique)
+    if (lookup_.insert(val, size()))
     {
-        wordList::append(name);
+        wordList::append(val);
     }
 }
 
 
+inline Foam::label Foam::hashedWordList::appendUniq(const word& val)
+{
+    if (lookup_.insert(val, size()))
+    {
+        wordList::append(val);
+        return 1;  // Increased list length by one
+    }
+
+    return 0;  // No change
+}
+
+
 inline const Foam::HashTable<Foam::label>&
 Foam::hashedWordList::lookup() const
 {
@@ -130,17 +133,15 @@ Foam::hashedWordList::lookup() const
 }
 
 
-// TBD (2019-01-07) - overload find() for consistency?
-//
-// inline Foam::label Foam::hashedWordList::find(const word& name) const
-// {
-//     return lookup().lookup(name, -1);  // -1 = not found or not hashed
-// }
-
-
-inline bool Foam::hashedWordList::found(const word& name) const
+inline Foam::label Foam::hashedWordList::find(const word& val) const
 {
-    return lookup().found(name);
+    return lookup().lookup(val, -1);  // -1 = not found or not hashed
+}
+
+
+inline bool Foam::hashedWordList::found(const word& val) const
+{
+    return lookup().found(val);
 }
 
 
@@ -201,15 +202,15 @@ inline const Foam::word& Foam::hashedWordList::operator[]
 }
 
 
-inline Foam::label Foam::hashedWordList::operator[](const word& name) const
+inline Foam::label Foam::hashedWordList::operator[](const word& val) const
 {
-    return lookup_.lookup(name, -1);  // -1 = not found or not hashed
+    return lookup_.lookup(val, -1);  // -1 = not found or not hashed
 }
 
 
-inline bool Foam::hashedWordList::operator()(const word& name) const
+inline bool Foam::hashedWordList::operator()(const word& val) const
 {
-    return lookup_.found(name);
+    return lookup_.found(val);
 }
 
 
diff --git a/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.C b/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.C
index 2ace096911..0ef1a6861e 100644
--- a/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.C
+++ b/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.C
@@ -80,8 +80,8 @@ diffusionMulticomponent<ReactionThermo, ThermoType>::init()
         const List<specieCoeffs>& lhs = reactions_[k].lhs();
         const List<specieCoeffs>& rhs = reactions_[k].rhs();
 
-        const label fuelIndex = species[fuelNames_[k]];
-        const label oxidantIndex = species[oxidantNames_[k]];
+        const label fuelIndex = species.find(fuelNames_[k]);
+        const label oxidantIndex = species.find(oxidantNames_[k]);
 
         const scalar Wu = specieThermo_[fuelIndex].W();
         const scalar Wox = specieThermo_[oxidantIndex].W();
@@ -216,7 +216,7 @@ diffusionMulticomponent<ReactionThermo, ThermoType>::correct()
             volScalarField& Rijl = RijlPtr[k];
 
             // Obtain individual reaction rates for each reaction
-            const label fuelIndex = species[fuelNames_[k]];
+            const label fuelIndex = species.find(fuelNames_[k]);
 
             if (laminarIgn_)
             {
@@ -247,8 +247,8 @@ diffusionMulticomponent<ReactionThermo, ThermoType>::correct()
 
         for (label k=0; k < nReactions; k++)
         {
-            const label fuelIndex = species[fuelNames_[k]];
-            const label oxidantIndex = species[oxidantNames_[k]];
+            const label fuelIndex = species.find(fuelNames_[k]);
+            const label oxidantIndex = species.find(oxidantNames_[k]);
 
             const volScalarField& Yfuel =
                 this->thermo().composition().Y(fuelIndex);
@@ -381,7 +381,7 @@ Foam::combustionModels::diffusionMulticomponent<ReactionThermo, ThermoType>::R
     if (this->active())
     {
         const label specieI =
-            this->thermo().composition().species()[Y.member()];
+            this->thermo().composition().species().find(Y.member());
 
         Su += this->chemistryPtr_->RR(specieI);
     }
diff --git a/src/combustionModels/laminar/laminar.C b/src/combustionModels/laminar/laminar.C
index 102e417976..50d724fdd2 100644
--- a/src/combustionModels/laminar/laminar.C
+++ b/src/combustionModels/laminar/laminar.C
@@ -130,7 +130,7 @@ Foam::combustionModels::laminar<ReactionThermo>::R(volScalarField& Y) const
     if (this->active())
     {
         const label specieI =
-            this->thermo().composition().species()[Y.member()];
+            this->thermo().composition().species().find(Y.member());
 
         Su += this->chemistryPtr_->RR(specieI);
     }
diff --git a/src/combustionModels/singleStepCombustion/singleStepCombustion.C b/src/combustionModels/singleStepCombustion/singleStepCombustion.C
index b5ee8a4427..877e6bf809 100644
--- a/src/combustionModels/singleStepCombustion/singleStepCombustion.C
+++ b/src/combustionModels/singleStepCombustion/singleStepCombustion.C
@@ -106,7 +106,7 @@ tmp<fvScalarMatrix> singleStepCombustion<ReactionThermo, ThermoType>::R
 ) const
 {
     const label specieI =
-        this->thermo().composition().species()[Y.member()];
+        this->thermo().composition().species().find(Y.member());
 
     volScalarField wSpecie
     (
diff --git a/src/meshTools/triSurface/triSurfaceLoader/triSurfaceLoader.C b/src/meshTools/triSurface/triSurfaceLoader/triSurfaceLoader.C
index b8c3473821..41fd1f783e 100644
--- a/src/meshTools/triSurface/triSurfaceLoader/triSurfaceLoader.C
+++ b/src/meshTools/triSurface/triSurfaceLoader/triSurfaceLoader.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2018 OpenCFD Ltd.
+    Copyright (C) 2017-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -88,7 +88,7 @@ Foam::label Foam::triSurfaceLoader::readDir()
             names.insert(f.name());
         }
     }
-    available_ = names.sortedToc();     // Also hashes the names
+    available_ = names.sortedToc();
 
     return available_.size();
 }
@@ -105,7 +105,8 @@ Foam::label Foam::triSurfaceLoader::select(const word& name)
 {
     if (available_.found(name))
     {
-        selected_ = wordList{name};  // hashedWordList::operator[] is hidden!
+        selected_.resize(1);
+        selected_.first() = name;
     }
     else
     {
@@ -118,30 +119,25 @@ Foam::label Foam::triSurfaceLoader::select(const word& name)
 
 Foam::label Foam::triSurfaceLoader::select(const wordRe& mat)
 {
-    DynamicList<label> foundIds(available_.size());
-
     if (mat.isPattern())
     {
-        foundIds = findStrings(mat, available_);
-        sort(foundIds);
+        labelList foundIds = findStrings(mat, available_);
+        Foam::sort(foundIds);
+        selected_ = wordList(available_, foundIds);
+    }
+    else if (available_.found(static_cast<const word&>(mat)))
+    {
+        selected_.resize(1);
+        selected_.first() = mat;
     }
     else
     {
-        const word& plain = mat;
-        if (available_.found(plain))
-        {
-            foundIds.append(available_[plain]);
-        }
-        else
-        {
-            FatalErrorInFunction
-                << "Specified the surfaces " << mat << nl
-                << "  - but could not find it"
-                << exit(FatalError);
-        }
+        FatalErrorInFunction
+            << "Specified the surfaces " << mat << nl
+            << "  - but could not find it"
+            << exit(FatalError);
     }
 
-    selected_ = wordList(available_, foundIds);
     return selected_.size();
 }
 
@@ -158,7 +154,7 @@ Foam::label Foam::triSurfaceLoader::select(const UList<wordRe>& matcher)
     DynamicList<label> foundIds(available_.size());
     labelHashSet hashedFound(2*available_.size());
 
-    DynamicList<word>  missing(matcher.size());
+    DynamicList<word> missing(matcher.size());
     wordHashSet hashedMissing(2*matcher.size());
 
     // Exact matches must exist
@@ -167,7 +163,7 @@ Foam::label Foam::triSurfaceLoader::select(const UList<wordRe>& matcher)
         if (mat.isPattern())
         {
             labelList indices = findStrings(mat, available_);
-            sort(indices);
+            Foam::sort(indices);
 
             for (const label idx : indices)
             {
@@ -180,9 +176,10 @@ Foam::label Foam::triSurfaceLoader::select(const UList<wordRe>& matcher)
         else
         {
             const word& plain = mat;
-            if (available_.found(plain))
+            const label idx = available_.find(plain);
+
+            if (idx >= 0)
             {
-                const label idx = available_[plain];
                 if (hashedFound.insert(idx))
                 {
                     foundIds.append(idx);
@@ -240,7 +237,7 @@ Foam::autoPtr<Foam::triSurface> Foam::triSurfaceLoader::load
 
             if (surf.patches().size())
             {
-                surf.patches().setSize(1);
+                surf.patches().resize(1);
             }
             else
             {
diff --git a/src/meshTools/triSurface/triSurfaceLoader/triSurfaceLoader.H b/src/meshTools/triSurface/triSurfaceLoader/triSurfaceLoader.H
index 8e34436fd9..79dd10486f 100644
--- a/src/meshTools/triSurface/triSurfaceLoader/triSurfaceLoader.H
+++ b/src/meshTools/triSurface/triSurfaceLoader/triSurfaceLoader.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2020 OpenCFD Ltd.
+    Copyright (C) 2017-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,20 +39,20 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef triSurfaceLoader_H
-#define triSurfaceLoader_H
+#ifndef Foam_triSurfaceLoader_H
+#define Foam_triSurfaceLoader_H
 
 #include "triSurface.H"
 #include "wordRes.H"
 #include "Enum.H"
-#include "hashedWordList.H"
+#include "wordList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward Declarations
 class triSurfaceLoader;
 class Time;
 
@@ -79,16 +79,16 @@ public:
 
 private:
 
-    // Private data
+    // Private Data
 
         //- The directory to load from (eg, case/constant/triSurface)
         fileName directory_;
 
         //- All available files
-        hashedWordList available_;
+        wordList available_;
 
         //- Selected files
-        hashedWordList selected_;
+        wordList selected_;
 
 
     // Private Member Functions
@@ -119,19 +119,19 @@ public:
       // Access
 
         //- The directory being used
-        inline const fileName& directory() const
+        const fileName& directory() const noexcept
         {
             return directory_;
         }
 
         //- The list of available files
-        inline const hashedWordList& available() const
+        const wordList& available() const noexcept
         {
             return available_;
         }
 
         //- The list of selected files
-        inline const hashedWordList& selected() const
+        const wordList& selected() const noexcept
         {
             return selected_;
         }
@@ -163,7 +163,6 @@ public:
             const enum loadingOption opt = loadingOption::OFFSET_REGION,
             const scalar scaleFactor = -1
         ) const;
-
 };
 
 
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModel.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModel.C
index a388597b46..6fef82db2b 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModel.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModel.C
@@ -47,10 +47,7 @@ Foam::InterfaceCompositionModel<Thermo, OtherThermo>::getLocalThermo
     return
         globalThermo.getLocalThermo
         (
-            globalThermo.species()
-            [
-                speciesName
-            ]
+            globalThermo.species().find(speciesName)
         );
 }
 
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C
index 6af212c2fa..ec1e5b8441 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C
@@ -74,7 +74,7 @@ MultiComponentPhaseModel
 
     species_ = thermoPtr_->composition().species();
 
-    inertIndex_ = species_[thermoPtr_().template get<word>("inertSpecie")];
+    inertIndex_ = species_.find(thermoPtr_().template get<word>("inertSpecie"));
 
     X_.setSize(thermoPtr_->composition().species().size());
 
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C
index 89b7d5bdab..49f9d90916 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C
@@ -84,10 +84,10 @@ Foam::interfaceCompositionModels::Henry<Thermo, OtherThermo>::Yf
     const volScalarField& Tf
 ) const
 {
-    if (this->speciesNames_.found(speciesName))
-    {
-        const label index = this->speciesNames_[speciesName];
+    const label index = this->speciesNames_.find(speciesName);
 
+    if (index >= 0)
+    {
         return
             k_[index]
            *this->otherThermo_.composition().Y(speciesName)
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.C
index 7b270d3038..3a2b803b11 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.C
@@ -46,10 +46,7 @@ Foam::InterfaceCompositionModel<Thermo, OtherThermo>::getLocalThermo
     return
         globalThermo.getLocalThermo
         (
-            globalThermo.species()
-            [
-                speciesName
-            ]
+            globalThermo.species().find(speciesName)
         );
 }
 
@@ -109,7 +106,7 @@ Foam::InterfaceCompositionModel<Thermo, OtherThermo>::dY
         Yf(speciesName, Tf)
       - thermo_.composition().Y()
         [
-            thermo_.composition().species()[speciesName]
+            thermo_.composition().species().find(speciesName)
         ];
 }
 
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C
index d2e04e7f6e..b9a0e2f388 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C
@@ -75,8 +75,8 @@ NonRandomTwoLiquid
     species1Name_ = this->speciesNames_[0];
     species2Name_ = this->speciesNames_[1];
 
-    species1Index_ = this->thermo_.composition().species()[species1Name_];
-    species2Index_ = this->thermo_.composition().species()[species2Name_];
+    species1Index_ = this->thermo_.composition().species().find(species1Name_);
+    species2Index_ = this->thermo_.composition().species().find(species2Name_);
 
     alpha12_.read("alpha", dict.subDict(species1Name_));
     alpha21_.read("alpha", dict.subDict(species2Name_));
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.C
index 9d62d239a3..e66dabb7dc 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.C
@@ -58,7 +58,7 @@ Foam::interfaceCompositionModels::Saturated<Thermo, OtherThermo>::Saturated
     saturatedName_(this->speciesNames_[0]),
     saturatedIndex_
     (
-        this->thermo_.composition().species()[saturatedName_]
+        this->thermo_.composition().species().find(saturatedName_)
     ),
     saturationModel_
     (
@@ -112,7 +112,7 @@ Foam::interfaceCompositionModels::Saturated<Thermo, OtherThermo>::Yf
     {
         const label speciesIndex
         (
-            this->thermo_.composition().species()[speciesName]
+            this->thermo_.composition().species().find(speciesName)
         );
 
         return
@@ -139,7 +139,7 @@ Foam::interfaceCompositionModels::Saturated<Thermo, OtherThermo>::YfPrime
     {
         const label speciesIndex
         (
-            this->thermo_.composition().species()[speciesName]
+            this->thermo_.composition().species().find(speciesName)
         );
 
         return
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C
index 0aa500755c..0f36a58829 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C
@@ -63,14 +63,14 @@ Foam::MultiComponentPhaseModel<BasePhaseModel>::MultiComponentPhaseModel
     ),
     inertIndex_(-1)
 {
-    const word inertSpecie
+    word inertSpecie;
+    if
     (
-        this->thermo_->getOrDefault("inertSpecie", word::null)
-    );
-
-    if (inertSpecie != word::null)
+        this->thermo_->readIfPresent("inertSpecie", inertSpecie)
+     && !inertSpecie.empty()
+    )
     {
-        inertIndex_ = this->thermo_->composition().species()[inertSpecie];
+        inertIndex_ = this->thermo_->composition().species().find(inertSpecie);
     }
 
     PtrList<volScalarField>& Y = this->thermo_->composition().Y();
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
index 3e929ae677..c8072b8154 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
@@ -238,7 +238,7 @@ Foam::radiation::greyMeanAbsorptionEmission::aCont(const label bandI) const
                     invWt += mixture.Y(s)[celli]/mixture.W(s);
                 }
 
-                label index = mixture.species()[iter.key()];
+                const label index = mixture.species().find(iter.key());
                 scalar Xk = mixture.Y(index)[celli]/(mixture.W(index)*invWt);
 
                 Xipi = Xk*paToAtm(p[celli]);
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
index f75270aa28..031e67d69a 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
@@ -73,7 +73,7 @@ greyMeanSolidAbsorptionEmission::X(const word specie) const
         }
     }
     const scalarField& Yj = mixture_.Y(specie);
-    const label mySpecieI = mixture_.species()[specie];
+    const label mySpecieI = mixture_.species().find(specie);
     forAll(Xj, iCell)
     {
         Xj[iCell] = Yj[iCell]/mixture_.rho(mySpecieI, p[iCell], T[iCell]);
@@ -166,7 +166,7 @@ calc(const label propertyId) const
     {
         if (mixture_.contains(iter.key()))
         {
-            a += solidData_[iter()][propertyId]*X(iter.key());
+            a += solidData_[iter.val()][propertyId]*X(iter.key());
         }
     }
 
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
index cfbafa2fcd..084cd0284f 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
@@ -249,7 +249,7 @@ Foam::radiation::wideBandAbsorptionEmission::aCont(const label bandi) const
                     invWt += mixture.Y(s)[celli]/mixture.W(s);
                 }
 
-                const label index = mixture.species()[iter.key()];
+                const label index = mixture.species().find(iter.key());
 
                 const scalar Xk =
                     mixture.Y(index)[celli]/(mixture.W(index)*invWt);
diff --git a/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C b/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C
index 7f348a2b0c..78d8c26165 100644
--- a/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C
+++ b/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C
@@ -133,7 +133,7 @@ Foam::radiation::mixtureFractionSoot<ThermoType>::mixtureFractionSoot
         mappingFieldName_ = mixture_.Y(index).name();
     }
 
-    const label mapFieldIndex = mixture_.species()[mappingFieldName_];
+    const label mapFieldIndex = mixture_.species().find(mappingFieldName_);
 
     mapFieldMax_ = mixture_.Yprod0()[mapFieldIndex];
 
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixtureI.H b/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixtureI.H
index 9b11643652..80635bc65e 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixtureI.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixtureI.H
@@ -99,7 +99,7 @@ inline Foam::volScalarField& Foam::basicMultiComponentMixture::Y
     const word& specieName
 )
 {
-    return Y_[species_[specieName]];
+    return Y_[species_.find(specieName)];
 }
 
 
@@ -108,7 +108,7 @@ inline const Foam::volScalarField& Foam::basicMultiComponentMixture::Y
     const word& specieName
 ) const
 {
-    return Y_[species_[specieName]];
+    return Y_[species_.find(specieName)];
 }
 
 
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.C
index 484e965395..28e4d5a333 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.C
@@ -60,7 +60,7 @@ void Foam::singleStepReactingMixture<ThermoType>::calculateqFuel()
 template<class ThermoType>
 void Foam::singleStepReactingMixture<ThermoType>::massAndAirStoichRatios()
 {
-    const label O2Index = this->species()["O2"];
+    const label O2Index = this->species().find("O2");
     const scalar Wu = this->speciesData()[fuelIndex_].W();
 
     stoicRatio_ =
@@ -136,7 +136,7 @@ void Foam::singleStepReactingMixture<ThermoType>::fresCorrect()
 {
     const Reaction<ThermoType>& reaction = this->operator[](0);
 
-    const label O2Index = this->species()["O2"];
+    const label O2Index = this->species().find("O2");
     const volScalarField& YFuel = this->Y()[fuelIndex_];
     const volScalarField& YO2 = this->Y()[O2Index];
 
@@ -204,8 +204,8 @@ Foam::singleStepReactingMixture<ThermoType>::singleStepReactingMixture
     specieStoichCoeffs_(this->species_.size(), Zero),
     Yprod0_(this->species_.size(), Zero),
     fres_(Yprod0_.size()),
-    inertIndex_(this->species()[thermoDict.get<word>("inertSpecie")]),
-    fuelIndex_(this->species()[thermoDict.get<word>("fuel")]),
+    inertIndex_(this->species().find(thermoDict.get<word>("inertSpecie"))),
+    fuelIndex_(this->species().find(thermoDict.get<word>("fuel"))),
     specieProd_(Yprod0_.size(), 1)
 {
     if (this->size() == 1)
diff --git a/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.C b/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.C
index 8603f8677a..232c50eccf 100644
--- a/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.C
+++ b/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.C
@@ -93,7 +93,7 @@ Foam::solidReaction<ReactionThermo>::solidReaction
     speciesTable allSpecies(species);
     for (const word& gasName : pyrolisisGases_)
     {
-        allSpecies.append(gasName);
+        allSpecies.appendUniq(gasName);
     }
     List<specieCoeffs> dummyLhs;
     List<specieCoeffs> dummyRhs;
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
index 9cfc74f481..c75b8202bb 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
@@ -224,7 +224,7 @@ Foam::Reaction<ReactionThermo>::specieCoeffs::specieCoeffs
         }
 
         // Lookup specie name: -1 if not found
-        index = species[specieName];
+        index = species.find(specieName);
 
         if (failUnknownSpecie && index < 0)
         {
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H
index 064d2bf4db..8d7ec6e102 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H
@@ -53,13 +53,13 @@ inline Foam::LangmuirHinshelwoodReactionRate::LangmuirHinshelwoodReactionRate
 
 inline Foam::LangmuirHinshelwoodReactionRate::LangmuirHinshelwoodReactionRate
 (
-    const speciesTable& st,
+    const speciesTable& species,
     const dictionary& dict
 )
 :
-    co_(st["CO"]),
-    c3h6_(st["C3H6"]),
-    no_(st["NO"])
+    co_(species.find("CO")),
+    c3h6_(species.find("C3H6")),
+    no_(species.find("NO"))
 {
     // read (A, Ta) pairs
     FixedList<Tuple2<scalar, scalar>, n_> coeffs(dict.lookup("coeffs"));
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
index 1d493cde32..61373fb6e3 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
@@ -41,7 +41,7 @@ inline Foam::thirdBodyEfficiencies::thirdBodyEfficiencies
     if (size() != species_.size())
     {
         FatalErrorInFunction
-            << "number of efficiencies = " << size()
+            << "Number of efficiencies = " << size()
             << " is not equal to the number of species " << species_.size()
             << exit(FatalError);
     }
@@ -63,14 +63,24 @@ inline Foam::thirdBodyEfficiencies::thirdBodyEfficiencies
         if (coeffs.size() != species_.size())
         {
             FatalIOErrorInFunction(dict)
-                << "number of efficiencies = " << coeffs.size()
-                << " is not equat to the number of species " << species_.size()
+                << "Number of efficiencies = " << coeffs.size()
+                << " is not equal to the number of species " << species_.size()
                 << exit(FatalIOError);
         }
 
-        forAll(coeffs, i)
+        for (const auto& coeff : coeffs)
         {
-            operator[](species[coeffs[i].first()]) = coeffs[i].second();
+            const label idx = species.find(coeff.first());
+
+            if (idx < 0)
+            {
+                FatalIOErrorInFunction(dict)
+                    << "No such species: " << coeffs.first()
+                    << ", available: " << flatOutput(species) << endl
+                    << exit(FatalIOError);
+            }
+
+            operator[](idx) = coeff.second();
         }
     }
     else
diff --git a/src/thermophysicalModels/specie/speciesTable/speciesTable.H b/src/thermophysicalModels/specie/speciesTable/speciesTable.H
index c33f936e05..154122c41b 100644
--- a/src/thermophysicalModels/specie/speciesTable/speciesTable.H
+++ b/src/thermophysicalModels/specie/speciesTable/speciesTable.H
@@ -34,6 +34,7 @@ Description
 #ifndef speciesTable_H
 #define speciesTable_H
 
+#include "wordList.H"
 #include "hashedWordList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //