Merge branch 'cvm' of /home/noisy3/OpenFOAM/OpenFOAM-dev into cvm

This commit is contained in:
mattijs
2011-06-23 12:24:10 +01:00
12 changed files with 101 additions and 39 deletions

View File

@ -26,7 +26,6 @@ Description
\*---------------------------------------------------------------------------*/
#include "timeSelector.H"
#include "argList.H"
#include "Time.H"
#include "polyMesh.H"
@ -35,6 +34,7 @@ Description
#include "faceSet.H"
#include "pointSet.H"
#include "globalMeshData.H"
#include "timeSelector.H"
using namespace Foam;
@ -114,13 +114,8 @@ int main(int argc, char *argv[])
# include "setRootCase.H"
# include "createTime.H"
instantList timeDirs = timeSelector::select0
(
runTime,
args,
false // not override runTime if no time options
);
instantList timeDirs = timeSelector::selectIfPresent(runTime, args);
# include "createNamedPolyMesh.H"
@ -159,14 +154,13 @@ int main(int argc, char *argv[])
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
)
)
);
// Read set construct info from dictionary
PtrList<dictionary> actions(topoSetDict.lookup("actions"));
forAll(timeDirs, timeI)
{
runTime.setTime(timeDirs[timeI], timeI);