From 5e6992199cc2553b22b866c66f0c1a526edcb89e Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 15 Feb 2011 11:00:11 +0000 Subject: [PATCH] ENH: wordHastSet instead of wordList ofr forces specification --- .../ParticleForceList/ParticleForceList.C | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/lagrangian/intermediate/submodels/ForceTypes/ParticleForceList/ParticleForceList.C b/src/lagrangian/intermediate/submodels/ForceTypes/ParticleForceList/ParticleForceList.C index 9d7426824c..d3f4d69524 100644 --- a/src/lagrangian/intermediate/submodels/ForceTypes/ParticleForceList/ParticleForceList.C +++ b/src/lagrangian/intermediate/submodels/ForceTypes/ParticleForceList/ParticleForceList.C @@ -57,19 +57,22 @@ Foam::ParticleForceList::ParticleForceList { if (readFields) { - const wordList models(dict.lookup("activeForces")); + const wordList activeForces(dict.lookup("activeForces")); + + wordHashSet models; + models.insert(activeForces); Info<< "Constructing particle forces" << endl; if (models.size() > 0) { this->setSize(models.size()); - forAll(models, i) + + label i = 0; + forAllConstIter(wordHashSet, models, iter) { - set - ( - i, - ParticleForce::New(owner, mesh, dict, models[i]) - ); + const word& model = iter.key(); + set(i, ParticleForce::New(owner, mesh, dict, model)); + i++; } } else