From fc2f2e74d2d4d7f4553f8eedcbe93e5e5fc8ef94 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 5 Dec 2018 22:03:28 +0100
Subject: [PATCH] BUG: checkMesh, moveDynamicMesh checks not in postProcessing/
(fixes #1104)
- now placed under postProcessing/checkMesh and postProcessing/checkAMI,
respectively.
Output files are now also tagged with the id of the patch, in case
there are multiple AMI patches in use.
---
.../manipulation/checkMesh/checkGeometry.C | 35 ++++++++++++++-----
.../mesh/manipulation/checkMesh/checkTools.C | 9 ++---
.../moveDynamicMesh/moveDynamicMesh.C | 15 +++++---
.../meshRefinement/meshRefinement.C | 3 +-
.../sampledSet/shortestPath/shortestPathSet.C | 3 +-
5 files changed, 42 insertions(+), 23 deletions(-)
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
index c9fee2364d2..7ec94c7e6f7 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
@@ -964,6 +964,13 @@ Foam::label Foam::checkGeometry
: patchWriter()
);
+ // Currently only do AMI checks
+
+ const fileName outputDir
+ (
+ mesh.time().globalPath()/functionObject::outputPrefix/"checkMesh"
+ );
+
forAll(pbm, patchi)
{
if (isA<cyclicAMIPolyPatch>(pbm[patchi]))
@@ -1021,8 +1028,11 @@ Foam::label Foam::checkGeometry
{
wr.write
(
- functionObject::outputPrefix,
- "src_" + tmName,
+ outputDir,
+ (
+ "patch" + Foam::name(cpp.index())
+ + "-src_" + tmName
+ ),
meshedSurfRef
(
mergedPoints,
@@ -1054,8 +1064,11 @@ Foam::label Foam::checkGeometry
{
wr.write
(
- functionObject::outputPrefix,
- "src_" + tmName,
+ outputDir,
+ (
+ "patch" + Foam::name(cpp.index())
+ + "-src_" + tmName
+ ),
meshedSurfRef
(
mergedPoints,
@@ -1109,8 +1122,11 @@ Foam::label Foam::checkGeometry
{
wr.write
(
- functionObject::outputPrefix,
- "tgt_" + tmName,
+ outputDir,
+ (
+ "patch" + Foam::name(cpp.index())
+ + "-tgt_" + tmName
+ ),
meshedSurfRef
(
mergedPoints,
@@ -1142,8 +1158,11 @@ Foam::label Foam::checkGeometry
{
wr.write
(
- functionObject::outputPrefix,
- "tgt_" + tmName,
+ outputDir,
+ (
+ "patch" + Foam::name(cpp.index())
+ + "-tgt_" + tmName
+ ),
meshedSurfRef
(
mergedPoints,
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTools.C b/applications/utilities/mesh/manipulation/checkMesh/checkTools.C
index 76e4fc5b18c..29d24377673 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTools.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTools.C
@@ -284,8 +284,7 @@ void Foam::mergeAndWrite
fileName outputDir
(
- set.time().path()
- / (Pstream::parRun() ? ".." : "")
+ set.time().globalPath()
/ functionObject::outputPrefix
/ mesh.pointsInstance()
/ set.name()
@@ -378,8 +377,7 @@ void Foam::mergeAndWrite
fileName outputDir
(
- set.time().path()
- / (Pstream::parRun() ? ".." : "")
+ set.time().globalPath()
/ functionObject::outputPrefix
/ mesh.pointsInstance()
/ set.name()
@@ -478,8 +476,7 @@ void Foam::mergeAndWrite
// postProcessing/<time>/p0.vtk
fileName outputDir
(
- set.time().path()
- / (Pstream::parRun() ? ".." : "")
+ set.time().globalPath()
/ functionObject::outputPrefix
/ mesh.pointsInstance()
// set.name()
diff --git a/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C b/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
index 531721b32de..a56d685d0f3 100644
--- a/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
+++ b/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
@@ -116,6 +116,11 @@ void writeWeights
void writeWeights(const polyMesh& mesh)
{
+ const fileName outputDir
+ (
+ mesh.time().globalPath()/functionObject::outputPrefix/"checkAMI"
+ );
+
for (const polyPatch& pp : mesh.boundaryMesh())
{
if (isA<cyclicAMIPolyPatch>(pp))
@@ -137,8 +142,8 @@ void writeWeights(const polyMesh& mesh)
mesh,
ami.tgtWeightsSum(),
cpp.neighbPatch(),
- functionObject::outputPrefix,
- "tgt",
+ outputDir,
+ "patch" + Foam::name(pp.index()) + "-tgt",
mesh.time()
);
writeWeights
@@ -146,8 +151,8 @@ void writeWeights(const polyMesh& mesh)
mesh,
ami.srcWeightsSum(),
cpp,
- functionObject::outputPrefix,
- "src",
+ outputDir,
+ "patch" + Foam::name(pp.index()) + "-src",
mesh.time()
);
}
@@ -170,7 +175,7 @@ int main(int argc, char *argv[])
#include "createTime.H"
#include "createNamedDynamicFvMesh.H"
- const bool checkAMI = args.found("checkAMI");
+ const bool checkAMI = args.found("checkAMI");
if (checkAMI)
{
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
index 3a538119b5a..117bcdb955a 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
@@ -2285,8 +2285,7 @@ Foam::label Foam::meshRefinement::findRegions
if (Pstream::master())
{
outputDir =
- mesh.time().path()
- / (Pstream::parRun() ? ".." : "")
+ mesh.time().globalPath()
/ functionObject::outputPrefix
/ mesh.pointsInstance();
outputDir.clean();
diff --git a/src/sampling/sampledSet/shortestPath/shortestPathSet.C b/src/sampling/sampledSet/shortestPath/shortestPathSet.C
index bc8cd1a467e..4bc1df916a1 100644
--- a/src/sampling/sampledSet/shortestPath/shortestPathSet.C
+++ b/src/sampling/sampledSet/shortestPath/shortestPathSet.C
@@ -844,8 +844,7 @@ Foam::shortestPathSet::shortestPathSet
if (Pstream::master())
{
outputDir =
- mesh.time().path()
- / (Pstream::parRun() ? ".." : "")
+ mesh.time().globalPath()
/ functionObject::outputPrefix
/ mesh.pointsInstance();
outputDir.clean();
--
GitLab