added overwrite flag

applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C

@@ -456,6 +456,7 @@ label simplifyFaces
 int main(int argc, char *argv[])
 {
     argList::noParallel();
+    argList::validOptions.insert("overwrite", "");
     argList::validArgs.append("edge length [m]");
     argList::validArgs.append("merge angle (degrees)");
 
@@ -465,6 +466,7 @@ int main(int argc, char *argv[])
 
     scalar minLen(readScalar(IStringStream(args.additionalArgs()[0])()));
     scalar angle(readScalar(IStringStream(args.additionalArgs()[1])()));
+    bool overwrite = args.options().found("overwrite");
 
     scalar maxCos = Foam::cos(angle*180/mathematicalConstant::pi);
 
@@ -580,7 +582,10 @@ int main(int argc, char *argv[])
     if (meshChanged)
     {
         // Write resulting mesh
+        if (!overwrite)
+        {
             runTime++;
+        }
 
         Info << "Writing collapsed mesh to time " << runTime.value() << endl;
 

applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C

@@ -435,6 +435,7 @@ int main(int argc, char *argv[])
     argList::validArgs.append("feature angle [0..180]");
     argList::validOptions.insert("concaveAngle", "[0..180]");
     argList::validOptions.insert("snapMesh", "");
+    argList::validOptions.insert("overwrite", "");
 
 #   include "setRootCase.H"
 #   include "createTime.H"
@@ -457,6 +458,7 @@ int main(int argc, char *argv[])
     scalar concaveSin = Foam::sin(concaveAngle*mathematicalConstant::pi/180.0);
 
     bool snapMeshDict = args.options().found("snapMesh");
+    bool overwrite = args.options().found("overwrite");
 
     Info<< "Merging all faces of a cell" << nl
         << "    - which are on the same patch" << nl
@@ -468,7 +470,10 @@ int main(int argc, char *argv[])
         << "      (sin:" << concaveSin << ')' << nl
         << endl;
 
+    if (!overwrite)
+    {
         runTime++;
+    }
 
     // Merge faces on same patch
     label nChanged = mergePatchFaces

applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C

@@ -328,10 +328,14 @@ label findCell(const primitiveMesh& mesh, const point& nearPoint)
 
 int main(int argc, char *argv[])
 {
+    argList::validOptions.insert("overwrite", "");
+
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createPolyMesh.H"
 
+    bool overwrite = args.options().found("overwrite");
+
     Info<< "Reading modifyMeshDict\n" << endl;
 
     IOdictionary dict
@@ -541,7 +545,10 @@ int main(int argc, char *argv[])
 
         cutter.updateMesh(morphMap());
 
+        if (!overwrite)
+        {
             runTime++;
+        }
 
         // Write resulting mesh
         Info << "Writing modified mesh to time " << runTime.value() << endl;
@@ -587,7 +594,10 @@ int main(int argc, char *argv[])
         //cutter.updateMesh(morphMap());
 
 
+        if (!overwrite)
+        {
             runTime++;
+        }
 
         // Write resulting mesh
         Info << "Writing modified mesh to time " << runTime.value() << endl;
@@ -623,7 +633,10 @@ int main(int argc, char *argv[])
 
         cutter.updateMesh(morphMap());
 
+        if (!overwrite)
+        {
             runTime++;
+        }
 
         // Write resulting mesh
         Info << "Writing modified mesh to time " << runTime.value() << endl;

applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C

@@ -52,6 +52,7 @@ using namespace Foam;
 // Main program:
 int main(int argc, char *argv[])
 {
+    argList::validOptions.insert("overwrite", "");
     argList::validArgs.append("cellSet");
 #   include "setRootCase.H"
 #   include "createTime.H"
@@ -59,6 +60,7 @@ int main(int argc, char *argv[])
     pointMesh pMesh(mesh);
 
     word cellSetName(args.args()[1]);
+    bool overwrite = args.options().found("overwrite");
 
     Info<< "Reading cells to refine from cellSet " << cellSetName
         << nl << endl;
@@ -149,7 +151,10 @@ int main(int argc, char *argv[])
     // Play refinement commands into mesh changer.
     meshCutter.setRefinement(newCellsToRefine, meshMod);
 
+    if (!overwrite)
+    {
         runTime++;
+    }
 
     // Create mesh, return map from old to new mesh.
     autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh, false);

applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C

@@ -50,6 +50,7 @@ int main(int argc, char *argv[])
     Foam::argList::validArgs.append("patchName");
     Foam::argList::validArgs.append("edgeWeight");
     Foam::argList::validOptions.insert("useSet", "cellSet");
+    Foam::argList::validOptions.insert("overwrite", "");
 
 #   include "setRootCase.H"
 #   include "createTime.H"
@@ -58,6 +59,7 @@ int main(int argc, char *argv[])
     word patchName(args.additionalArgs()[0]);
 
     scalar weight(readScalar(IStringStream(args.additionalArgs()[1])()));
+    bool overwrite = args.options().found("overwrite");
 
 
     label patchID = mesh.boundaryMesh().findPatchID(patchName);
@@ -212,7 +214,10 @@ int main(int argc, char *argv[])
     // Do all changes
     Info<< "Morphing ..." << endl;
 
+    if (!overwrite)
+    {
         runTime++;
+    }
 
     autoPtr<mapPolyMesh> morphMap = meshMod.changeMesh(mesh, false);
 

applications/utilities/mesh/advanced/removeFaces/removeFaces.C

@@ -48,12 +48,15 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
+    Foam::argList::validOptions.insert("overwrite", "");
     Foam::argList::validArgs.append("faceSet");
 
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createMesh.H"
 
+    bool overwrite = args.options().found("overwrite");
+
     word setName(args.additionalArgs()[0]);
 
     // Read faces
@@ -159,7 +162,10 @@ int main(int argc, char *argv[])
     // Update numbering of cells/vertices.
     faceRemover.updateMesh(morphMap);
 
+    if (!overwrite)
+    {
         runTime++;
+    }
 
     // Take over refinement levels and write to new time directory.
     Pout<< "Writing mesh to time " << runTime.timeName() << endl;

applications/utilities/mesh/advanced/splitCells/splitCells.C

@@ -527,6 +527,7 @@ int main(int argc, char *argv[])
     argList::validOptions.insert("set", "cellSet name");
     argList::validOptions.insert("geometry", "");
     argList::validOptions.insert("tol", "edge snap tolerance");
+    argList::validOptions.insert("overwrite", "");
     argList::validArgs.append("edge angle [0..360]");
 
 #   include "setRootCase.H"
@@ -541,6 +542,7 @@ int main(int argc, char *argv[])
 
     bool readSet = args.options().found("set");
     bool geometry = args.options().found("geometry");
+    bool overwrite = args.options().found("overwrite");
 
     scalar edgeTol = 0.2;
 
@@ -669,7 +671,10 @@ int main(int argc, char *argv[])
         // Do all changes
         Info<< "Morphing ..." << endl;
 
+        if (!overwrite)
+        {
             runTime++;
+        }
 
         autoPtr<mapPolyMesh> morphMap = meshMod.changeMesh(mesh, false);
 

applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C

@@ -89,11 +89,13 @@ using namespace Foam;
 int main(int argc, char *argv[])
 {
     argList::validArgs.append("Neutral file");
+    argList::validOptions.insert("overwrite", "");
 
 #   include "setRootCase.H"
 #   include "createTime.H"
 
     fileName neuFile(args.additionalArgs()[0]);
+    bool overwrite = args.options().found("overwrite");
 
 
     IFstream str(neuFile);
@@ -298,7 +300,10 @@ int main(int argc, char *argv[])
     }
 
 
+    if (!overwrite)
+    {
         runTime++;
+    }
 
     polyMesh mesh
     (

applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C

@@ -43,12 +43,14 @@ int main(int argc, char *argv[])
 {
     argList::noParallel();
     argList::validArgs.append("feature angle[0-180]");
+    argList::validOptions.insert("overwrite", "");
 
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createPolyMesh.H"
 
     scalar featureAngle(readScalar(IStringStream(args.additionalArgs()[0])()));
+    bool overwrite = args.options().found("overwrite");
 
     scalar minCos = Foam::cos(featureAngle * mathematicalConstant::pi/180.0);
 
@@ -58,7 +60,10 @@ int main(int argc, char *argv[])
 
     polyDualMesh dualMesh(mesh, minCos);
 
+    if (!overwrite)
+    {
         runTime++;
+    }
 
     Pout<< "Writing dualMesh to " << runTime.timeName() << endl;
 

applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C

@@ -75,12 +75,14 @@ int main(int argc, char *argv[])
 {
     argList::validArgs.append("file prefix");
     argList::validOptions.insert("noFaceFile", "");
+    argList::validOptions.insert("overwrite", "");
 
 #   include "setRootCase.H"
 #   include "createTime.H"
 
 
     bool readFaceFile = !args.options().found("noFaceFile");
+    bool overwrite = args.options().found("overwrite");
 
     fileName prefix(args.additionalArgs()[0]);
 
@@ -464,7 +466,10 @@ int main(int argc, char *argv[])
         Info<< endl;
     }
 
+    if (!overwrite)
+    {
         runTime++;
+    }
 
     polyMesh mesh
     (

applications/utilities/mesh/generation/extrude2DMesh/doExtrude2DMesh.C

@@ -58,11 +58,13 @@ using namespace Foam;
 int main(int argc, char *argv[])
 {
     argList::validArgs.append("thickness");
+    argList::validOptions.insert("overwrite", "");
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createPolyMesh.H"
 
     scalar thickness(readScalar(IStringStream(args.additionalArgs()[0])()));
+    bool overwrite = args.options().found("overwrite");
 
 
     // Check that mesh is 2D
@@ -175,7 +177,10 @@ int main(int argc, char *argv[])
 
     mesh.updateMesh(morphMap);
 
+    if (!overwrite)
+    {
         runTime++;
+    }
 
     // Take over refinement levels and write to new time directory.
     Pout<< "Writing extruded mesh to time " << runTime.timeName() << nl

applications/utilities/mesh/manipulation/attachMesh/attachMesh.C

@@ -42,12 +42,18 @@ using namespace Foam;
 int main(int argc, char *argv[])
 {
     argList::noParallel();
-#   include "setRootCase.H"
+    argList::validOptions.insert("overwrite", "");
 
+#   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createPolyMesh.H"
 
+    bool overwrite = args.options().found("overwrite");
+
+    if (!overwrite)
+    {
         runTime++;
+    }
 
     Info<< "Time = " << runTime.timeName() << nl
         << "Attaching sliding interface" << endl;

applications/utilities/mesh/manipulation/autoPatch/autoPatch.C

@@ -71,6 +71,7 @@ int main(int argc, char *argv[])
 {
     argList::noParallel();
     argList::validArgs.append("feature angle[0-180]");
+    argList::validOptions.insert("overwrite", "");
 
 #   include "setRootCase.H"
 #   include "createTime.H"
@@ -88,6 +89,7 @@ int main(int argc, char *argv[])
     boundaryMesh bMesh;
 
     scalar featureAngle(readScalar(IStringStream(args.additionalArgs()[0])()));
+    bool overwrite = args.options().found("overwrite");
 
     scalar minCos = Foam::cos(featureAngle * mathematicalConstant::pi/180.0);
 
@@ -213,7 +215,10 @@ int main(int argc, char *argv[])
         newPatchI++;
     }
 
+    if (!overwrite)
+    {
         runTime++;
+    }
 
 
     // Change patches

applications/utilities/mesh/manipulation/createBaffles/createBaffles.C

@@ -54,6 +54,7 @@ int main(int argc, char *argv[])
 {
     argList::validArgs.append("set");
     argList::validArgs.append("patch");
+    argList::validOptions.insert("overwrite", "");
 
 #   include "setRootCase.H"
 #   include "createTime.H"
@@ -81,6 +82,8 @@ int main(int argc, char *argv[])
             << "Cannot find patch " << patchName << exit(FatalError);
     }
 
+    bool overwrite = args.options().found("overwrite");
+
     // Read objects in time directory
     IOobjectList objects(mesh, runTime.timeName());
 
@@ -226,7 +229,10 @@ int main(int argc, char *argv[])
     Pout<< "Converted locally " << nBaffled
         << " faces into boundary faces on patch " << patchName << nl << endl;
 
+    if (!overwrite)
+    {
         runTime++;
+    }
 
     // Change the mesh. Change points directly (no inflation).
     autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh, false);

applications/utilities/mesh/manipulation/createPatch/createPatch.C

@@ -154,11 +154,13 @@ void filterPatches(polyMesh& mesh)
 int main(int argc, char *argv[])
 {
     argList::noParallel();
+    argList::validOptions.insert("overwrite", "");
 
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createPolyMesh.H"
 
+    bool overwrite = args.options().found("overwrite");
 
     Info<< "Reading createPatchDict\n" << endl;
 
@@ -355,7 +357,10 @@ int main(int argc, char *argv[])
     // Set the precision of the points data to 10
     IOstream::defaultPrecision(10);
 
+    if (!overwrite)
+    {
         runTime++;
+    }
 
     // Write resulting mesh
     Info<< "Writing repatched mesh to " << runTime.timeName() << endl;

applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C

@@ -251,11 +251,13 @@ labelList getAllNonManifoldPoints
 int main(int argc, char *argv[])
 {
     argList::validOptions.insert("split", "");
+    argList::validOptions.insert("overwrite", "");
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createMesh.H"
 
     bool split = args.options().found("split");
+    bool overwrite = args.options().found("overwrite");
 
     // Collect all boundary faces
     labelList boundaryFaces(mesh.nFaces() - mesh.nInternalFaces());
@@ -402,7 +404,10 @@ int main(int argc, char *argv[])
         insertDuplicateMerge(mesh, duplicates, meshMod);
     }
 
+    if (!overwrite)
+    {
         runTime++;
+    }
 
     // Change the mesh. No inflation.
     autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh, false);

applications/utilities/mesh/manipulation/refineMesh/refineMesh.C

@@ -294,6 +294,7 @@ label twoDNess(const polyMesh& mesh)
 int main(int argc, char *argv[])
 {
     Foam::argList::validOptions.insert("dict", "");
+    Foam::argList::validOptions.insert("overwrite", "");
 
 #   include "setRootCase.H"
 #   include "createTime.H"
@@ -307,6 +308,7 @@ int main(int argc, char *argv[])
     //
 
     bool readDict = args.options().found("dict");
+    bool overwrite = args.options().found("overwrite");
 
     // List of cells to refine
     labelList refCells;
@@ -413,7 +415,10 @@ int main(int argc, char *argv[])
 
     string oldTimeName(runTime.timeName());
 
+    if (!overwrite)
+    {
         runTime++;
+    }
 
 
     // Multi-directional refinement (does multiple iterations)

applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C

@@ -368,6 +368,7 @@ int main(int argc, char *argv[])
     argList::validOptions.insert("blockOrder", "");
     argList::validOptions.insert("orderPoints", "");
     argList::validOptions.insert("writeMaps", "");
+    argList::validOptions.insert("overwrite", "");
 
 #   include "addTimeOptions.H"
 
@@ -411,6 +412,7 @@ int main(int argc, char *argv[])
             << endl;
     }
 
+    bool overwrite = args.options().found("overwrite");
 
     label band = getBand(mesh.faceOwner(), mesh.faceNeighbour());
 
@@ -528,7 +530,10 @@ int main(int argc, char *argv[])
             )
         );
 
+        if (!overwrite)
+        {
             runTime++;
+        }
 
         // Change the mesh.
         map = reorderMesh(mesh, cellOrder, faceOrder);
@@ -539,7 +544,10 @@ int main(int argc, char *argv[])
 
         polyTopoChange meshMod(mesh);
 
+        if (!overwrite)
+        {
             runTime++;
+        }
 
         // Change the mesh.
         map = meshMod.changeMesh

applications/utilities/mesh/manipulation/splitMesh/splitMesh.C

@@ -118,6 +118,7 @@ int main(int argc, char *argv[])
     Foam::argList::validArgs.append("faceSet");
     Foam::argList::validArgs.append("masterPatch");
     Foam::argList::validArgs.append("slavePatch");
+    Foam::argList::validOptions.insert("overwrite", "");
 
 #   include "setRootCase.H"
 #   include "createTime.H"
@@ -126,6 +127,7 @@ int main(int argc, char *argv[])
     word setName(args.additionalArgs()[0]);
     word masterPatch(args.additionalArgs()[1]);
     word slavePatch(args.additionalArgs()[2]);
+    bool overwrite = args.options().found("overwrite");
 
     // List of faces to split
     faceSet facesSet(mesh, setName);
@@ -252,7 +254,10 @@ int main(int argc, char *argv[])
     Info<< nl << "Constructed topologyModifier:" << endl;
     splitter[0].writeDict(Info);
 
+    if (!overwrite)
+    {
         runTime++;
+    }
 
     splitter.attach();
 

applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C

@@ -1118,6 +1118,7 @@ int main(int argc, char *argv[])
     argList::validOptions.insert("makeCellZones", "");
     argList::validOptions.insert("largestOnly", "");
     argList::validOptions.insert("insidePoint", "point");
+    argList::validOptions.insert("overwrite", "");
 
 #   include "setRootCase.H"
 #   include "createTime.H"
@@ -1134,6 +1135,7 @@ int main(int argc, char *argv[])
     bool largestOnly = args.options().found("largestOnly");
     bool insidePoint = args.options().found("insidePoint");
     bool useCellZones = args.options().found("cellZones");
+    bool overwrite = args.options().found("overwrite");
 
     if (insidePoint && largestOnly)
     {
@@ -1469,7 +1471,11 @@ int main(int argc, char *argv[])
             }
         }
         mesh.cellZones().writeOpt() = IOobject::AUTO_WRITE;
+
+        if (!overwrite)
+        {
             runTime++;
+        }
 
         Info<< "Writing cellZones as new mesh to time " << runTime.timeName()
             << nl << endl;
@@ -1510,7 +1516,10 @@ int main(int argc, char *argv[])
         );
 
 
+        if (!overwrite)
+        {
             runTime++;
+        }
 
 
         // Create regions

applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C

@@ -131,6 +131,8 @@ int main(int argc, char *argv[])
     Foam::argList::validOptions.insert("partial", "");
     Foam::argList::validOptions.insert("perfect", "");
 
+    Foam::argList::validOptions.insert("overwrite", "");
+
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createMesh.H"
@@ -141,6 +143,7 @@ int main(int argc, char *argv[])
 
     bool partialCover = args.options().found("partial");
     bool perfectCover = args.options().found("perfect");
+    bool overwrite = args.options().found("overwrite");
 
     if (partialCover && perfectCover)
     {
@@ -376,7 +379,10 @@ int main(int argc, char *argv[])
     //PtrList<surfaceTensorField> surfaceTensorFields;
     //readFields(mesh, objects, surfaceTensorFields);
 
+    if (!overwrite)
+    {
         runTime++;
+    }
 
     // Execute all polyMeshModifiers
     autoPtr<mapPolyMesh> morphMap = stitcher.changeMesh(true);

applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C

@@ -153,12 +153,14 @@ int main(int argc, char *argv[])
 {
     argList::validArgs.append("set");
     argList::validOptions.insert("patch", "patch name");
+    argList::validOptions.insert("overwrite", "");
 
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createMesh.H"
 
     word setName(args.additionalArgs()[0]);
+    bool overwrite = args.options().found("overwrite");
 
 
     Info<< "Reading cell set from " << setName << endl << endl;
@@ -324,7 +326,10 @@ int main(int argc, char *argv[])
     // Write mesh and fields to new time
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+    if (!overwrite)
+    {
         runTime++;
+    }
 
     Info<< "Writing subsetted mesh and fields to time " << runTime.value()
         << endl;