mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
use timeSelector mechanism in a few more utilities
This commit is contained in:
@ -61,6 +61,7 @@ See Also
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "argList.H"
|
||||
#include "timeSelector.H"
|
||||
#include "Time.H"
|
||||
#include "polyMesh.H"
|
||||
#include "STARCDMeshWriter.H"
|
||||
@ -73,20 +74,17 @@ using namespace Foam;
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
argList::noParallel();
|
||||
timeSelector::addOptions();
|
||||
|
||||
argList::validOptions.insert("scale", "scale");
|
||||
argList::validOptions.insert("noBnd", "");
|
||||
argList::validOptions.insert("tri", "");
|
||||
argList::validOptions.insert("surface", "");
|
||||
|
||||
# include "addTimeOptions.H"
|
||||
# include "setRootCase.H"
|
||||
# include "createTime.H"
|
||||
// Get times list
|
||||
instantList Times = runTime.times();
|
||||
|
||||
// set startTime and endTime depending on -time and -latestTime options
|
||||
# include "checkTimeOptions.H"
|
||||
runTime.setTime(Times[startTime], startTime);
|
||||
instantList timeDirs = timeSelector::select0(runTime, args);
|
||||
|
||||
bool surfaceOnly = false;
|
||||
if (args.options().found("surface") or args.options().found("tri"))
|
||||
@ -118,17 +116,16 @@ int main(int argc, char *argv[])
|
||||
|
||||
# include "createPolyMesh.H"
|
||||
|
||||
// bool firstCheck = true;
|
||||
|
||||
for (label timeI = startTime; timeI < endTime; ++timeI)
|
||||
forAll(timeDirs, timeI)
|
||||
{
|
||||
runTime.setTime(Times[timeI], timeI);
|
||||
runTime.setTime(timeDirs[timeI], timeI);
|
||||
|
||||
# include "getTimeIndex.H"
|
||||
|
||||
polyMesh::readUpdateState state = mesh.readUpdate();
|
||||
|
||||
if (timeI == startTime || state != polyMesh::UNCHANGED)
|
||||
if (!timeI || state != polyMesh::UNCHANGED)
|
||||
{
|
||||
meshWriters::STARCD writer(mesh, scaleFactor);
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
meshDualiser.C
|
||||
makePolyDualMesh.C
|
||||
polyDualMeshApp.C
|
||||
|
||||
EXE = $(FOAM_APPBIN)/polyDualMesh
|
||||
|
||||
@ -348,8 +348,10 @@ int main(int argc, char *argv[])
|
||||
|
||||
# include "setRootCase.H"
|
||||
# include "createTime.H"
|
||||
|
||||
// Get times list
|
||||
instantList Times = runTime.times();
|
||||
|
||||
# include "checkTimeOptions.H"
|
||||
runTime.setTime(Times[startTime], startTime);
|
||||
|
||||
@ -509,7 +511,7 @@ int main(int argc, char *argv[])
|
||||
Info<< "Writing dual mesh to " << runTime.timeName() << endl;
|
||||
|
||||
mesh.write();
|
||||
|
||||
|
||||
Info<< "End\n" << endl;
|
||||
|
||||
return 0;
|
||||
@ -37,6 +37,7 @@ Description
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "argList.H"
|
||||
#include "timeSelector.H"
|
||||
#include "Time.H"
|
||||
#include "polyMesh.H"
|
||||
#include "OFstream.H"
|
||||
@ -336,6 +337,7 @@ void writePointCells
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
timeSelector::addOptions();
|
||||
argList::validOptions.insert("patchFaces", "");
|
||||
argList::validOptions.insert("cell", "cellI");
|
||||
argList::validOptions.insert("face", "faceI");
|
||||
@ -343,7 +345,6 @@ int main(int argc, char *argv[])
|
||||
argList::validOptions.insert("cellSet", "setName");
|
||||
argList::validOptions.insert("faceSet", "setName");
|
||||
|
||||
# include "addTimeOptions.H"
|
||||
# include "setRootCase.H"
|
||||
# include "createTime.H"
|
||||
runTime.functionObjects().off();
|
||||
@ -361,31 +362,23 @@ int main(int argc, char *argv[])
|
||||
<< "(for points, faces, cells) is consistent with"
|
||||
<< " Foam numbering (starting from 0)." << endl << endl;
|
||||
|
||||
// Get times list
|
||||
instantList Times = runTime.times();
|
||||
|
||||
# include "checkTimeOptions.H"
|
||||
|
||||
runTime.setTime(Times[startTime], startTime);
|
||||
instantList timeDirs = timeSelector::select0(runTime, args);
|
||||
|
||||
# include "createPolyMesh.H"
|
||||
|
||||
bool firstCheck = true;
|
||||
|
||||
for (label i=startTime; i<endTime; i++)
|
||||
forAll(timeDirs, timeI)
|
||||
{
|
||||
runTime.setTime(Times[i], i);
|
||||
runTime.setTime(timeDirs[timeI], timeI);
|
||||
|
||||
Info<< "Time = " << runTime.timeName() << endl;
|
||||
|
||||
polyMesh::readUpdateState state = mesh.readUpdate();
|
||||
|
||||
if (firstCheck || state != polyMesh::UNCHANGED)
|
||||
if (!timeI || state != polyMesh::UNCHANGED)
|
||||
{
|
||||
if (patchFaces)
|
||||
{
|
||||
writePatchFaces(mesh, runTime.timeName());
|
||||
|
||||
}
|
||||
else if (doCell)
|
||||
{
|
||||
@ -487,9 +480,7 @@ int main(int argc, char *argv[])
|
||||
Info << "No mesh." << endl;
|
||||
}
|
||||
|
||||
firstCheck = false;
|
||||
|
||||
Info << endl << endl;
|
||||
Info << nl << endl;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user