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

COMP: Multiple changes - first clean build after latest merge - UNTESTED

Browse Source
This commit is contained in:
Andrew Heather
2016-09-23 15:36:53 +01:00
parent 9fbd612672
commit b9940cbbb1
311 changed files with 4119 additions and 6540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
View File

@ -520,11 +520,6 @@ bool Foam::functionObjectList::execute()
if (execution_)
{
if (forceWrite)
{
resetState();
}
if (!updated_)
{
read();
@ -532,21 +527,18 @@ bool Foam::functionObjectList::execute()
forAll(*this, objectI)
{
addProfiling
(
fo,
"functionObject::" + operator[](objectI).name() + "::execute"
);
const word& objName = operator[](objectI).name();
{
addProfiling(fo, "functionObject::" + objName + "::execute");
ok = operator[](objectI).execute() && ok;
ok = operator[](objectI).execute() && ok;
}
addProfiling
(
fo,
"functionObject::" + operator[](objectI).name() + "::write"
);
{
addProfiling(fo, "functionObject::" + objName + "::write");
ok = operator[](objectI).write() && ok;
ok = operator[](objectI).write() && ok;
}
}
}
@ -583,11 +575,9 @@ bool Foam::functionObjectList::end()
forAll(*this, objectI)
{
addProfiling
(
fo,
"functionObject::" + operator[](objectI).name() + "::end"
);
const word& objName = operator[](objectI).name();
addProfiling(fo, "functionObject::" + objName + "::end");
ok = operator[](objectI).end() && ok;
}
@ -610,12 +600,9 @@ bool Foam::functionObjectList::adjustTimeStep()
forAll(*this, objectI)
{
addProfiling
(
fo,
"functionObject::" + operator[](objectI).name()
+ "::adjustTimeStep"
);
const word& objName = operator[](objectI).name();
addProfiling(fo, "functionObject::" + objName + "::adjustTimeStep");
ok = operator[](objectI).adjustTimeStep() && ok;
}