Merge branch 'master' into cvm

This commit is contained in:
graham
2011-06-17 10:57:23 +01:00
240 changed files with 2738 additions and 6723 deletions

View File

@ -105,7 +105,6 @@ int main(int argc, char *argv[])
runTime.functionObjects().end();
Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
<< " ClockTime = " << runTime.elapsedClockTime() << " s"
<< nl << endl;