From 9b0bebec00094b19e5a99675f4a9bf958e558044 Mon Sep 17 00:00:00 2001 From: mattijs Date: Fri, 6 Feb 2009 15:12:24 +0000 Subject: [PATCH] making overwrite work --- .../advanced/collapseEdges/collapseEdges.C | 7 ++++++- .../combinePatchFaces/combinePatchFaces.C | 6 ++++++ .../mesh/advanced/modifyMesh/modifyMesh.C | 19 +++++++++++++++--- .../advanced/refineHexMesh/refineHexMesh.C | 6 ++++++ .../refineWallLayer/refineWallLayer.C | 8 +++++++- .../mesh/advanced/removeFaces/removeFaces.C | 5 +++++ .../mesh/advanced/splitCells/splitCells.C | 9 ++++++++- .../polyDualMesh/makePolyDualMesh.C | 6 +++++- .../extrude2DMesh/doExtrude2DMesh.C | 5 +++++ .../mesh/manipulation/attachMesh/attachMesh.C | 5 +++++ .../mesh/manipulation/autoPatch/autoPatch.C | 5 +++++ .../mesh/manipulation/cellSet/cellSet.C | 14 +------------ .../createBaffles/createBaffles.C | 5 +++++ .../manipulation/createPatch/createPatch.C | 5 +++++ .../mesh/manipulation/faceSet/faceSet.C | 14 +------------ .../manipulation/mergeMeshes/mergeMeshes.C | 6 +++--- .../mergeOrSplitBaffles/mergeOrSplitBaffles.C | 6 +++++- .../mesh/manipulation/pointSet/pointSet.C | 14 +------------ .../mesh/manipulation/refineMesh/refineMesh.C | 5 +++++ .../manipulation/renumberMesh/renumberMesh.C | 8 ++++++-- .../mesh/manipulation/splitMesh/splitMesh.C | 8 +++++++- .../splitMeshRegions/splitMeshRegions.C | 20 ++++++++++++++----- .../mesh/manipulation/stitchMesh/stitchMesh.C | 5 +++++ .../mesh/manipulation/subsetMesh/subsetMesh.C | 7 ++++++- 24 files changed, 139 insertions(+), 59 deletions(-) diff --git a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C index c92418dc80..a780d8aecb 100644 --- a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C +++ b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C @@ -464,6 +464,7 @@ int main(int argc, char *argv[]) # include "createTime.H" runTime.functionObjects().off(); # include "createPolyMesh.H" + const word oldInstance = mesh.pointsInstance(); scalar minLen(readScalar(IStringStream(args.additionalArgs()[0])())); scalar angle(readScalar(IStringStream(args.additionalArgs()[1])())); @@ -587,8 +588,12 @@ int main(int argc, char *argv[]) { runTime++; } + else + { + mesh.setInstance(oldInstance); + } - Info << "Writing collapsed mesh to time " << runTime.value() << endl; + Info<< "Writing collapsed mesh to time " << runTime.timeName() << endl; mesh.write(); } diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C index c4e47890d5..17092d5a6e 100644 --- a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C +++ b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C @@ -441,6 +441,7 @@ int main(int argc, char *argv[]) # include "createTime.H" runTime.functionObjects().off(); # include "createPolyMesh.H" + const word oldInstance = mesh.pointsInstance(); scalar featureAngle(readScalar(IStringStream(args.additionalArgs()[0])())); @@ -502,6 +503,11 @@ int main(int argc, char *argv[]) if (nChanged > 0) { + if (overwrite) + { + mesh.setInstance(oldInstance); + } + Info<< "Writing morphed mesh to time " << runTime.timeName() << endl; mesh.write(); diff --git a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C index 67fdc0807e..0011d750e5 100644 --- a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C +++ b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C @@ -334,6 +334,7 @@ int main(int argc, char *argv[]) # include "createTime.H" runTime.functionObjects().off(); # include "createPolyMesh.H" + const word oldInstance = mesh.pointsInstance(); bool overwrite = args.options().found("overwrite"); @@ -553,9 +554,13 @@ int main(int argc, char *argv[]) { runTime++; } + else + { + mesh.setInstance(oldInstance); + } // Write resulting mesh - Info << "Writing modified mesh to time " << runTime.value() << endl; + Info << "Writing modified mesh to time " << runTime.timeName() << endl; mesh.write(); } else if (edgeToPos.size()) @@ -602,9 +607,13 @@ int main(int argc, char *argv[]) { runTime++; } + else + { + mesh.setInstance(oldInstance); + } // Write resulting mesh - Info << "Writing modified mesh to time " << runTime.value() << endl; + Info << "Writing modified mesh to time " << runTime.timeName() << endl; mesh.write(); } else @@ -641,9 +650,13 @@ int main(int argc, char *argv[]) { runTime++; } + else + { + mesh.setInstance(oldInstance); + } // Write resulting mesh - Info << "Writing modified mesh to time " << runTime.value() << endl; + Info << "Writing modified mesh to time " << runTime.timeName() << endl; mesh.write(); } diff --git a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C index 4a45f214f6..364aed2e16 100644 --- a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C +++ b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C @@ -58,6 +58,8 @@ int main(int argc, char *argv[]) # include "createTime.H" runTime.functionObjects().off(); # include "createMesh.H" + const word oldInstance = mesh.pointsInstance(); + pointMesh pMesh(mesh); word cellSetName(args.args()[1]); @@ -177,6 +179,10 @@ int main(int argc, char *argv[]) Pout<< "Refined from " << returnReduce(map().nOldCells(), sumOp