mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
GIT: Resolved conflict
This commit is contained in:
@ -504,6 +504,11 @@ int main(int argc, char *argv[])
|
||||
#include "addOverwriteOption.H"
|
||||
#include "addRegionOption.H"
|
||||
#include "addDictOption.H"
|
||||
Foam::argList::addBoolOption
|
||||
(
|
||||
"writeObj",
|
||||
"write obj files showing the cyclic matching process"
|
||||
);
|
||||
#include "setRootCase.H"
|
||||
#include "createTime.H"
|
||||
runTime.functionObjects().off();
|
||||
@ -515,12 +520,13 @@ int main(int argc, char *argv[])
|
||||
|
||||
#include "createNamedPolyMesh.H"
|
||||
|
||||
const bool writeObj = args.optionFound("writeObj");
|
||||
|
||||
const word oldInstance = mesh.pointsInstance();
|
||||
|
||||
const word dictName("createPatchDict");
|
||||
#include "setSystemMeshDictionaryIO.H"
|
||||
|
||||
Info<< "Reading " << dictName << nl << endl;
|
||||
Info<< "Reading " << dictIO.instance()/dictIO.name() << nl << endl;
|
||||
|
||||
IOdictionary dict(dictIO);
|
||||
|
||||
@ -534,7 +540,10 @@ int main(int argc, char *argv[])
|
||||
patches.checkParallelSync(true);
|
||||
|
||||
|
||||
dumpCyclicMatch("initial_", mesh);
|
||||
if (writeObj)
|
||||
{
|
||||
dumpCyclicMatch("initial_", mesh);
|
||||
}
|
||||
|
||||
// Read patch construct info from dictionary
|
||||
PtrList<dictionary> patchSources(dict.lookup("patches"));
|
||||
@ -753,7 +762,10 @@ int main(int argc, char *argv[])
|
||||
autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh, true);
|
||||
mesh.movePoints(map().preMotionPoints());
|
||||
|
||||
dumpCyclicMatch("coupled_", mesh);
|
||||
if (writeObj)
|
||||
{
|
||||
dumpCyclicMatch("coupled_", mesh);
|
||||
}
|
||||
|
||||
// Synchronise points.
|
||||
if (!pointSync)
|
||||
@ -864,7 +876,10 @@ int main(int argc, char *argv[])
|
||||
filterPatches(mesh, addedPatchNames);
|
||||
|
||||
|
||||
dumpCyclicMatch("final_", mesh);
|
||||
if (writeObj)
|
||||
{
|
||||
dumpCyclicMatch("final_", mesh);
|
||||
}
|
||||
|
||||
|
||||
// Set the precision of the points data to 10
|
||||
|
||||
Reference in New Issue
Block a user