cloudInfo: Updated for changes to functionObjectFile

This commit is contained in:
Henry Weller
2015-08-05 18:01:50 +01:00
parent 8234c04bc2
commit 4372529e46

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -31,7 +31,7 @@ License
namespace Foam namespace Foam
{ {
defineTypeNameAndDebug(cloudInfo, 0); defineTypeNameAndDebug(cloudInfo, 0);
} }
@ -84,9 +84,9 @@ void Foam::cloudInfo::read(const dictionary& dict)
if (names().size()) if (names().size())
{ {
Info<< "applying to clouds:" << nl; Info<< "applying to clouds:" << nl;
forAllConstIter(wordHashSet, names(), iter) forAll(names(), i)
{ {
Info<< " " << iter.key() << nl; Info<< " " << names()[i] << nl;
} }
Info<< endl; Info<< endl;
} }
@ -99,21 +99,15 @@ void Foam::cloudInfo::read(const dictionary& dict)
void Foam::cloudInfo::execute() void Foam::cloudInfo::execute()
{ {}
// Do nothing
}
void Foam::cloudInfo::end() void Foam::cloudInfo::end()
{ {}
// Do nothing
}
void Foam::cloudInfo::timeSet() void Foam::cloudInfo::timeSet()
{ {}
// Do nothing
}
void Foam::cloudInfo::write() void Foam::cloudInfo::write()
@ -122,10 +116,9 @@ void Foam::cloudInfo::write()
{ {
functionObjectFile::write(); functionObjectFile::write();
label i = 0; forAll(names(), i)
forAllConstIter(wordHashSet, names(), iter)
{ {
const word& cloudName = iter.key(); const word& cloudName = names()[i];
const kinematicCloud& cloud = const kinematicCloud& cloud =
obr_.lookupObject<kinematicCloud>(cloudName); obr_.lookupObject<kinematicCloud>(cloudName);
@ -141,8 +134,6 @@ void Foam::cloudInfo::write()
<< nParcels << token::TAB << nParcels << token::TAB
<< massInSystem << endl; << massInSystem << endl;
} }
i++;
} }
} }
} }