Merge remote branch 'OpenCFD/master' into olesenm

This commit is contained in:
Mark Olesen
2010-05-03 09:34:31 +02:00
579 changed files with 8601 additions and 5768 deletions

View File

@ -521,7 +521,9 @@ int main(int argc, char *argv[])
# include "setRootCase.H"
# include "createTime.H"
runTime.functionObjects().off();
# include "createNamedPolyMesh.H"
Foam::word meshRegionName = polyMesh::defaultRegion;
args.optionReadIfPresent("region", meshRegionName);
const bool overwrite = args.optionFound("overwrite");
@ -534,8 +536,8 @@ int main(int argc, char *argv[])
"createPatchDict",
runTime.system(),
(
regionName != polyMesh::defaultRegion
? regionName
meshRegionName != polyMesh::defaultRegion
? meshRegionName
: word::null
),
runTime,
@ -556,6 +558,7 @@ int main(int argc, char *argv[])
<< " to match up faces and points" << nl << endl;
coupledPolyPatch::matchTol = tol;
# include "createNamedPolyMesh.H"
const word oldInstance = mesh.pointsInstance();