From 9b0bebec00094b19e5a99675f4a9bf958e558044 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
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 c92418dc803..a780d8aecb0 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 c4e47890d5e..17092d5a6ec 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 67fdc0807e5..0011d750e56 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 4a45f214f6e..364aed2e16c 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<label>())
<< " to " << mesh.globalData().nTotalCells() << " cells." << nl << endl;
+ if (overwrite)
+ {
+ mesh.setInstance(oldInstance);
+ }
Info<< "Writing mesh to " << runTime.timeName() << endl;
mesh.write();
diff --git a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
index 672cf3f6baf..9c608366aae 100644
--- a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
+++ b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
@@ -56,6 +56,7 @@ int main(int argc, char *argv[])
# include "createTime.H"
runTime.functionObjects().off();
# include "createPolyMesh.H"
+ const word oldInstance = mesh.pointsInstance();
word patchName(args.additionalArgs()[0]);
@@ -226,8 +227,13 @@ int main(int argc, char *argv[])
// Update stored labels on meshCutter.
cutter.updateMesh(morphMap());
+ if (overwrite)
+ {
+ mesh.setInstance(oldInstance);
+ }
+
// Write resulting mesh
- Info << "Writing refined morphMesh to time " << runTime.value() << endl;
+ Info << "Writing refined morphMesh to time " << runTime.timeName() << endl;
mesh.write();
diff --git a/applications/utilities/mesh/advanced/removeFaces/removeFaces.C b/applications/utilities/mesh/advanced/removeFaces/removeFaces.C
index b5af23a5162..26ee404fe8d 100644
--- a/applications/utilities/mesh/advanced/removeFaces/removeFaces.C
+++ b/applications/utilities/mesh/advanced/removeFaces/removeFaces.C
@@ -55,6 +55,7 @@ int main(int argc, char *argv[])
# include "createTime.H"
runTime.functionObjects().off();
# include "createMesh.H"
+ const word oldInstance = mesh.pointsInstance();
bool overwrite = args.options().found("overwrite");
@@ -167,6 +168,10 @@ int main(int argc, char *argv[])
{
runTime++;
}
+ else
+ {
+ mesh.setInstance(oldInstance);
+ }
// Take over refinement levels and write to new time directory.
Pout<< "Writing mesh to time " << runTime.timeName() << endl;
diff --git a/applications/utilities/mesh/advanced/splitCells/splitCells.C b/applications/utilities/mesh/advanced/splitCells/splitCells.C
index 4e5b501b852..6424745e9ad 100644
--- a/applications/utilities/mesh/advanced/splitCells/splitCells.C
+++ b/applications/utilities/mesh/advanced/splitCells/splitCells.C
@@ -534,6 +534,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])()));
@@ -693,7 +694,13 @@ int main(int argc, char *argv[])
Info<< "Remaining:" << cellsToCut.size() << endl;
// Write resulting mesh
- Info << "Writing refined morphMesh to time " << runTime.value() << endl;
+ if (overwrite)
+ {
+ mesh.setInstance(oldInstance);
+ }
+
+ Info<< "Writing refined morphMesh to time " << runTime.timeName()
+ << endl;
mesh.write();
}
diff --git a/applications/utilities/mesh/conversion/polyDualMesh/makePolyDualMesh.C b/applications/utilities/mesh/conversion/polyDualMesh/makePolyDualMesh.C
index b647ec8d13b..ab553054021 100644
--- a/applications/utilities/mesh/conversion/polyDualMesh/makePolyDualMesh.C
+++ b/applications/utilities/mesh/conversion/polyDualMesh/makePolyDualMesh.C
@@ -354,6 +354,7 @@ int main(int argc, char *argv[])
runTime.setTime(Times[startTime], startTime);
# include "createMesh.H"
+ const word oldInstance = mesh.pointsInstance();
// Mark boundary edges and points.
// (Note: in 1.4.2 we can use the built-in mesh point ordering
@@ -499,7 +500,10 @@ int main(int argc, char *argv[])
if (!overwrite)
{
runTime++;
- mesh.setInstance(runTime.timeName());
+ }
+ else
+ {
+ mesh.setInstance(oldInstance);
}
Info<< "Writing dual mesh to " << runTime.timeName() << endl;
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/doExtrude2DMesh.C b/applications/utilities/mesh/generation/extrude2DMesh/doExtrude2DMesh.C
index 4d38c24269b..2e0c16a5116 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/doExtrude2DMesh.C
+++ b/applications/utilities/mesh/generation/extrude2DMesh/doExtrude2DMesh.C
@@ -63,6 +63,7 @@ int main(int argc, char *argv[])
# include "createTime.H"
runTime.functionObjects().off();
# include "createPolyMesh.H"
+ const word oldInstance = mesh.pointsInstance();
scalar thickness(readScalar(IStringStream(args.additionalArgs()[0])()));
bool overwrite = args.options().found("overwrite");
@@ -182,6 +183,10 @@ int main(int argc, char *argv[])
{
runTime++;
}
+ else
+ {
+ mesh.setInstance(oldInstance);
+ }
// Take over refinement levels and write to new time directory.
Pout<< "Writing extruded mesh to time " << runTime.timeName() << nl
diff --git a/applications/utilities/mesh/manipulation/attachMesh/attachMesh.C b/applications/utilities/mesh/manipulation/attachMesh/attachMesh.C
index bf8665afbd3..1f9a898d431 100644
--- a/applications/utilities/mesh/manipulation/attachMesh/attachMesh.C
+++ b/applications/utilities/mesh/manipulation/attachMesh/attachMesh.C
@@ -48,6 +48,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");
@@ -61,6 +62,10 @@ int main(int argc, char *argv[])
attachPolyTopoChanger(mesh).attach();
+ if (overwrite)
+ {
+ mesh.setInstance(oldInstance);
+ }
mesh.write();
Info<< "End\n" << endl;
diff --git a/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C b/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C
index abf5a5654ee..96a7ee51973 100644
--- a/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C
+++ b/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C
@@ -77,6 +77,7 @@ int main(int argc, char *argv[])
# include "createTime.H"
runTime.functionObjects().off();
# include "createPolyMesh.H"
+ const word oldInstance = mesh.pointsInstance();
Info<< "Mesh read in = "
<< runTime.cpuTimeIncrement()
@@ -243,6 +244,10 @@ int main(int argc, char *argv[])
polyMeshRepatcher.repatch();
// Write resulting mesh
+ if (overwrite)
+ {
+ mesh.setInstance(oldInstance);
+ }
mesh.write();
diff --git a/applications/utilities/mesh/manipulation/cellSet/cellSet.C b/applications/utilities/mesh/manipulation/cellSet/cellSet.C
index addac968b89..ca8225d3f2d 100644
--- a/applications/utilities/mesh/manipulation/cellSet/cellSet.C
+++ b/applications/utilities/mesh/manipulation/cellSet/cellSet.C
@@ -74,19 +74,7 @@ int main(int argc, char *argv[])
{
# include "setRootCase.H"
# include "createTime.H"
-
- Info<< "Reading mesh for time = " << runTime.value() << endl;
-
- Info<< "Create mesh\n" << endl;
- polyMesh mesh
- (
- IOobject
- (
- polyMesh::defaultRegion,
- runTime.timeName(),
- runTime
- )
- );
+# include "createPolyMesh.H"
Info<< "Reading cellSetDict\n" << endl;
diff --git a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
index 2d457773971..4970d0bcce3 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
+++ b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
@@ -60,6 +60,7 @@ int main(int argc, char *argv[])
# include "createTime.H"
runTime.functionObjects().off();
# include "createMesh.H"
+ const word oldInstance = mesh.pointsInstance();
const polyBoundaryMesh& patches = mesh.boundaryMesh();
const faceZoneMesh& faceZones = mesh.faceZones();
@@ -247,6 +248,10 @@ int main(int argc, char *argv[])
mesh.movePoints(map().preMotionPoints());
}
+ if (overwrite)
+ {
+ mesh.setInstance(oldInstance);
+ }
Pout<< "Writing mesh to " << runTime.timeName() << endl;
mesh.write();
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatch.C b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
index d6d58dd5420..7e0443a6146 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatch.C
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
@@ -569,6 +569,7 @@ int main(int argc, char *argv[])
# include "createPolyMesh.H"
+ const word oldInstance = mesh.pointsInstance();
const polyBoundaryMesh& patches = mesh.boundaryMesh();
@@ -909,6 +910,10 @@ int main(int argc, char *argv[])
{
runTime++;
}
+ else
+ {
+ mesh.setInstance(oldInstance);
+ }
// Write resulting mesh
Info<< "Writing repatched mesh to " << runTime.timeName() << nl << endl;
diff --git a/applications/utilities/mesh/manipulation/faceSet/faceSet.C b/applications/utilities/mesh/manipulation/faceSet/faceSet.C
index de41b2c4644..d1700cc2f96 100644
--- a/applications/utilities/mesh/manipulation/faceSet/faceSet.C
+++ b/applications/utilities/mesh/manipulation/faceSet/faceSet.C
@@ -74,19 +74,7 @@ int main(int argc, char *argv[])
{
# include "setRootCase.H"
# include "createTime.H"
-
- Info<< "Reading mesh for time = " << runTime.value() << endl;
-
- Info<< "Create mesh\n" << endl;
- polyMesh mesh
- (
- IOobject
- (
- polyMesh::defaultRegion,
- runTime.timeName(),
- runTime
- )
- );
+# include "createPolyMesh.H"
Info<< "Reading faceSetDict\n" << endl;
diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C b/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
index aa55e24df17..28955c4d6f7 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
@@ -42,7 +42,7 @@ int main(int argc, char *argv[])
# include "setRoots.H"
# include "createTimes.H"
- Info<< "Reading master mesh for time = " << runTimeMaster.value() << endl;
+ Info<< "Reading master mesh for time = " << runTimeMaster.timeName() << endl;
Info<< "Create mesh\n" << endl;
mergePolyMesh masterMesh
@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
);
- Info<< "Reading mesh to add for time = " << runTimeToAdd.value() << endl;
+ Info<< "Reading mesh to add for time = " << runTimeToAdd.timeName() << endl;
Info<< "Create mesh\n" << endl;
polyMesh meshToAdd
@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
runTimeMaster++;
- Info<< "Writing combined mesh to " << runTimeMaster.value() << endl;
+ Info<< "Writing combined mesh to " << runTimeMaster.timeName() << endl;
masterMesh.addMesh(meshToAdd);
masterMesh.merge();
diff --git a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
index ccc91a903ba..7f694438e97 100644
--- a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
+++ b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
@@ -229,6 +229,7 @@ int main(int argc, char *argv[])
# include "createTime.H"
runTime.functionObjects().off();
# include "createMesh.H"
+ const word oldInstance = mesh.pointsInstance();
bool split = args.options().found("split");
bool overwrite = args.options().found("overwrite");
@@ -338,7 +339,10 @@ int main(int argc, char *argv[])
mesh.movePoints(map().preMotionPoints());
}
-
+ if (overwrite)
+ {
+ mesh.setInstance(oldInstance);
+ }
Pout<< "Writing mesh to time " << runTime.timeName() << endl;
mesh.write();
diff --git a/applications/utilities/mesh/manipulation/pointSet/pointSet.C b/applications/utilities/mesh/manipulation/pointSet/pointSet.C
index 79414fcde7b..ef57d08d077 100644
--- a/applications/utilities/mesh/manipulation/pointSet/pointSet.C
+++ b/applications/utilities/mesh/manipulation/pointSet/pointSet.C
@@ -74,19 +74,7 @@ int main(int argc, char *argv[])
{
# include "setRootCase.H"
# include "createTime.H"
-
- Info<< "Reading mesh for time = " << runTime.value() << endl;
-
- Info<< "Create mesh\n" << endl;
- polyMesh mesh
- (
- IOobject
- (
- polyMesh::defaultRegion,
- runTime.timeName(),
- runTime
- )
- );
+# include "createPolyMesh.H"
Info<< "Reading pointSetDict\n" << endl;
diff --git a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
index 95c7973d2c4..7636801b51e 100644
--- a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
+++ b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
@@ -300,6 +300,7 @@ int main(int argc, char *argv[])
# include "createTime.H"
runTime.functionObjects().off();
# include "createPolyMesh.H"
+ const word oldInstance = mesh.pointsInstance();
printEdgeStats(mesh);
@@ -427,6 +428,10 @@ int main(int argc, char *argv[])
// Write resulting mesh
+ if (overwrite)
+ {
+ mesh.setInstance(oldInstance);
+ }
mesh.write();
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index d93663b7899..b066936f83a 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -383,9 +383,8 @@ int main(int argc, char *argv[])
runTime.setTime(Times[startTime], startTime);
-
# include "createMesh.H"
-
+ const word oldInstance = mesh.pointsInstance();
const bool blockOrder = args.options().found("blockOrder");
@@ -631,6 +630,11 @@ int main(int argc, char *argv[])
<< endl;
}
+
+ if (overwrite)
+ {
+ mesh.setInstance(oldInstance);
+ }
Info<< "Writing mesh to " << runTime.timeName() << endl;
mesh.write();
diff --git a/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C b/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
index aef00fe7e9b..4fb1c875bbd 100644
--- a/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
+++ b/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
@@ -124,6 +124,7 @@ int main(int argc, char *argv[])
# include "createTime.H"
runTime.functionObjects().off();
# include "createPolyMesh.H"
+ const word oldInstance = mesh.pointsInstance();
word setName(args.additionalArgs()[0]);
word masterPatch(args.additionalArgs()[1]);
@@ -262,7 +263,12 @@ int main(int argc, char *argv[])
splitter.attach();
- Info << nl << "Writing polyMesh" << endl;
+ if (overwrite)
+ {
+ mesh.setInstance(oldInstance);
+ }
+
+ Info<< "Writing mesh to " << runTime.timeName() << endl;
if (!mesh.write())
{
FatalErrorIn(args.executable())
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index 02accb32a8d..aa83952b88f 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -763,7 +763,8 @@ void createAndWriteRegion
const regionSplit& cellRegion,
const wordList& regionNames,
const EdgeMap<label>& interfaceToPatch,
- const label regionI
+ const label regionI,
+ const word& newMeshInstance
)
{
Info<< "Creating mesh for region " << regionI
@@ -907,6 +908,7 @@ void createAndWriteRegion
Info<< "Writing new mesh" << endl;
+ newMesh().setInstance(newMeshInstance);
newMesh().write();
// Write addressing files like decomposePar
@@ -1235,6 +1237,7 @@ int main(int argc, char *argv[])
# include "createTime.H"
runTime.functionObjects().off();
# include "createMesh.H"
+ const word oldInstance = mesh.pointsInstance();
word blockedFacesName;
if (args.options().found("blockedFaces"))
@@ -1712,12 +1715,16 @@ int main(int argc, char *argv[])
if (!overwrite)
{
runTime++;
+ mesh.setInstance(runTime.timeName());
+ }
+ else
+ {
+ mesh.setInstance(oldInstance);
}
Info<< "Writing cellZones as new mesh to time " << runTime.timeName()
<< nl << endl;
- mesh.setInstance(runTime.timeName());
mesh.write();
@@ -1800,7 +1807,8 @@ int main(int argc, char *argv[])
cellRegion,
regionNames,
interfaceToPatch,
- regionI
+ regionI,
+ (overwrite ? oldInstance : runTime.timeName())
);
}
else if (largestOnly)
@@ -1817,7 +1825,8 @@ int main(int argc, char *argv[])
cellRegion,
regionNames,
interfaceToPatch,
- regionI
+ regionI,
+ (overwrite ? oldInstance : runTime.timeName())
);
}
else
@@ -1835,7 +1844,8 @@ int main(int argc, char *argv[])
cellRegion,
regionNames,
interfaceToPatch,
- regionI
+ regionI,
+ (overwrite ? oldInstance : runTime.timeName())
);
}
}
diff --git a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
index 4773654752d..1131c591c7d 100644
--- a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
+++ b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
@@ -137,6 +137,7 @@ int main(int argc, char *argv[])
# include "createTime.H"
runTime.functionObjects().off();
# include "createMesh.H"
+ const word oldInstance = mesh.pointsInstance();
word masterPatchName(args.additionalArgs()[0]);
@@ -391,6 +392,10 @@ int main(int argc, char *argv[])
mesh.movePoints(morphMap->preMotionPoints());
// Write mesh
+ if (overwrite)
+ {
+ mesh.setInstance(oldInstance);
+ }
Info << nl << "Writing polyMesh to time " << runTime.timeName() << endl;
IOstream::defaultPrecision(10);
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
index 13aa25c06df..56b48a2dd2a 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
+++ b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
@@ -159,6 +159,7 @@ int main(int argc, char *argv[])
# include "createTime.H"
runTime.functionObjects().off();
# include "createMesh.H"
+ const word oldInstance = mesh.pointsInstance();
word setName(args.additionalArgs()[0]);
bool overwrite = args.options().found("overwrite");
@@ -331,8 +332,12 @@ int main(int argc, char *argv[])
{
runTime++;
}
+ else
+ {
+ mesh.setInstance(oldInstance);
+ }
- Info<< "Writing subsetted mesh and fields to time " << runTime.value()
+ Info<< "Writing subsetted mesh and fields to time " << runTime.timeName()
<< endl;
subsetter.subMesh().write();
--
GitLab