songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG: checkMesh, moveDynamicMesh checks not in postProcessing/ (fixes #1104)

Browse Source 
- 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.
This commit is contained in:
Mark Olesen 2018-12-05 22:03:28 +01:00
parent e3e0e0557f
commit fc2f2e74d2
5 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
View File

@ -964,6 +964,13 @@ Foam::label Foam::checkGeometry
: patchWriter() : patchWriter()
); );
// Currently only do AMI checks
const fileName outputDir
(
mesh.time().globalPath()/functionObject::outputPrefix/"checkMesh"
);
forAll(pbm, patchi) forAll(pbm, patchi)
{ {
if (isA<cyclicAMIPolyPatch>(pbm[patchi])) if (isA<cyclicAMIPolyPatch>(pbm[patchi]))
@ -1021,8 +1028,11 @@ Foam::label Foam::checkGeometry
{ {
wr.write wr.write
( (
functionObject::outputPrefix, outputDir,
"src_" + tmName, (
"patch" + Foam::name(cpp.index())
+ "-src_" + tmName
),
meshedSurfRef meshedSurfRef
( (
mergedPoints, mergedPoints,
@ -1054,8 +1064,11 @@ Foam::label Foam::checkGeometry
{ {
wr.write wr.write
( (
functionObject::outputPrefix, outputDir,
"src_" + tmName, (
"patch" + Foam::name(cpp.index())
+ "-src_" + tmName
),
meshedSurfRef meshedSurfRef
( (
mergedPoints, mergedPoints,
@ -1109,8 +1122,11 @@ Foam::label Foam::checkGeometry
{ {
wr.write wr.write
( (
functionObject::outputPrefix, outputDir,
"tgt_" + tmName, (
"patch" + Foam::name(cpp.index())
+ "-tgt_" + tmName
),
meshedSurfRef meshedSurfRef
( (
mergedPoints, mergedPoints,
@ -1142,8 +1158,11 @@ Foam::label Foam::checkGeometry
{ {
wr.write wr.write
( (
functionObject::outputPrefix, outputDir,
"tgt_" + tmName, (
"patch" + Foam::name(cpp.index())
+ "-tgt_" + tmName
),
meshedSurfRef meshedSurfRef
( (
mergedPoints, mergedPoints,

9
applications/utilities/mesh/manipulation/checkMesh/checkTools.C
View File

@ -284,8 +284,7 @@ void Foam::mergeAndWrite
fileName outputDir fileName outputDir
( (
set.time().path() set.time().globalPath()
/ (Pstream::parRun() ? ".." : "")
/ functionObject::outputPrefix / functionObject::outputPrefix
/ mesh.pointsInstance() / mesh.pointsInstance()
/ set.name() / set.name()
@ -378,8 +377,7 @@ void Foam::mergeAndWrite
fileName outputDir fileName outputDir
( (
set.time().path() set.time().globalPath()
/ (Pstream::parRun() ? ".." : "")
/ functionObject::outputPrefix / functionObject::outputPrefix
/ mesh.pointsInstance() / mesh.pointsInstance()
/ set.name() / set.name()
@ -478,8 +476,7 @@ void Foam::mergeAndWrite
// postProcessing/<time>/p0.vtk // postProcessing/<time>/p0.vtk
fileName outputDir fileName outputDir
( (
set.time().path() set.time().globalPath()
/ (Pstream::parRun() ? ".." : "")
/ functionObject::outputPrefix / functionObject::outputPrefix
/ mesh.pointsInstance() / mesh.pointsInstance()
// set.name() // set.name()

15
applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
View File

@ -116,6 +116,11 @@ void writeWeights
void writeWeights(const polyMesh& mesh) void writeWeights(const polyMesh& mesh)
{ {
const fileName outputDir
(
mesh.time().globalPath()/functionObject::outputPrefix/"checkAMI"
);
for (const polyPatch& pp : mesh.boundaryMesh()) for (const polyPatch& pp : mesh.boundaryMesh())
{ {
if (isA<cyclicAMIPolyPatch>(pp)) if (isA<cyclicAMIPolyPatch>(pp))
@ -137,8 +142,8 @@ void writeWeights(const polyMesh& mesh)
mesh, mesh,
ami.tgtWeightsSum(), ami.tgtWeightsSum(),
cpp.neighbPatch(), cpp.neighbPatch(),
functionObject::outputPrefix, outputDir,
"tgt", "patch" + Foam::name(pp.index()) + "-tgt",
mesh.time() mesh.time()
); );
writeWeights writeWeights
@ -146,8 +151,8 @@ void writeWeights(const polyMesh& mesh)
mesh, mesh,
ami.srcWeightsSum(), ami.srcWeightsSum(),
cpp, cpp,
functionObject::outputPrefix, outputDir,
"src", "patch" + Foam::name(pp.index()) + "-src",
mesh.time() mesh.time()
); );
} }
@ -170,7 +175,7 @@ int main(int argc, char *argv[])
#include "createTime.H" #include "createTime.H"
#include "createNamedDynamicFvMesh.H" #include "createNamedDynamicFvMesh.H"
const bool checkAMI = args.found("checkAMI"); const bool checkAMI = args.found("checkAMI");
if (checkAMI) if (checkAMI)
{ {

3
src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
View File

@ -2285,8 +2285,7 @@ Foam::label Foam::meshRefinement::findRegions
if (Pstream::master()) if (Pstream::master())
{ {
outputDir = outputDir =
mesh.time().path() mesh.time().globalPath()
/ (Pstream::parRun() ? ".." : "")
/ functionObject::outputPrefix / functionObject::outputPrefix
/ mesh.pointsInstance(); / mesh.pointsInstance();
outputDir.clean(); outputDir.clean();

3
src/sampling/sampledSet/shortestPath/shortestPathSet.C
View File

@ -844,8 +844,7 @@ Foam::shortestPathSet::shortestPathSet
if (Pstream::master()) if (Pstream::master())
{ {
outputDir = outputDir =
mesh.time().path() mesh.time().globalPath()
/ (Pstream::parRun() ? ".." : "")
/ functionObject::outputPrefix / functionObject::outputPrefix
/ mesh.pointsInstance(); / mesh.pointsInstance();
outputDir.clean(); outputDir.clean();