Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C

@@ -403,11 +403,6 @@ Foam::multiphaseSystem::multiphaseSystem
     calcAlphas();
     alphas_.write();
 
-    forAllIter(PtrDictionary<phaseModel>, phases_, iter)
-    {
-        phaseModelTable_.add(iter());
-    }
-
     interfaceDictTable dragModelsDict(lookup("drag"));
 
     forAllConstIter(interfaceDictTable, dragModelsDict, iter)
@@ -418,8 +413,8 @@ Foam::multiphaseSystem::multiphaseSystem
             dragModel::New
             (
                 iter(),
-                *phaseModelTable_.find(iter.key().first())(),
-                *phaseModelTable_.find(iter.key().second())()
+                *phases_.lookup(iter.key().first()),
+                *phases_.lookup(iter.key().second())
             ).ptr()
         );
     }

applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H

@@ -159,25 +159,6 @@ private:
         //- Dictionary of phases
         PtrDictionary<phaseModel> phases_;
 
-        //- phaseModelTable
-        class phaseModelTable
-        :
-            public HashTable<const phaseModel*>
-        {
-        public:
-
-            phaseModelTable()
-            {}
-
-            void add(const phaseModel& pm)
-            {
-                this->insert(pm.name(), &pm);
-            }
-        };
-
-        //- Phase model table for quick lookup
-        phaseModelTable phaseModelTable_;
-
         const fvMesh& mesh_;
         const surfaceScalarField& phi_;