zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
mattijs
2012-08-30 18:15:51 +01:00
parent 4504746b8c dfd24f5e98
commit 0cc8026313
2 changed files with 2 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
View File

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

19
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
View File

@ -159,25 +159,6 @@ private:
//- Dictionary of phases //- Dictionary of phases
PtrDictionary<phaseModel> 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 fvMesh& mesh_;
const surfaceScalarField& phi_; const surfaceScalarField& phi_;