From da8198a4876506f8cfced3c603033132fc9dd710 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 22 Sep 2009 15:26:19 +0100
Subject: [PATCH] added region option
---
.../mesh/manipulation/mergeMeshes/mergeMeshes.C | 4 ++--
.../mesh/manipulation/mergeMeshes/setRoots.H | 12 ++++++++++--
.../patch/patchIntegrate/patchIntegrate.C | 3 ++-
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C b/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
index 28955c4d6f7..b13dfb86ef0 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
(
IOobject
(
- mergePolyMesh::defaultRegion,
+ masterRegion,
runTimeMaster.timeName(),
runTimeMaster
)
@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
(
IOobject
(
- mergePolyMesh::defaultRegion,
+ addRegion,
runTimeToAdd.timeName(),
runTimeToAdd
)
diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/setRoots.H b/applications/utilities/mesh/manipulation/mergeMeshes/setRoots.H
index 7ddd408965d..cfbf59cf64a 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/setRoots.H
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/setRoots.H
@@ -2,9 +2,11 @@
argList::validArgs.append("master root");
argList::validArgs.append("master case");
+ argList::validOptions.insert("masterRegion", "name");
argList::validArgs.append("root to add");
argList::validArgs.append("case to add");
+ argList::validOptions.insert("addRegion", "name");
argList args(argc, argv);
@@ -15,9 +17,15 @@
fileName rootDirMaster(args.additionalArgs()[0]);
fileName caseDirMaster(args.additionalArgs()[1]);
+ word masterRegion = polyMesh::defaultRegion;
+ args.optionReadIfPresent("masterRegion", masterRegion);
fileName rootDirToAdd(args.additionalArgs()[2]);
fileName caseDirToAdd(args.additionalArgs()[3]);
+ word addRegion = polyMesh::defaultRegion;
+ args.optionReadIfPresent("addRegion", addRegion);
- Info<< "Master: " << rootDirMaster << " " << caseDirMaster << nl
- << "mesh to add: " << rootDirToAdd << " " << caseDirToAdd << endl;
+ Info<< "Master: " << rootDirMaster << " " << caseDirMaster
+ << " region " << masterRegion << nl
+ << "mesh to add: " << rootDirToAdd << " " << caseDirToAdd
+ << " region " << addRegion << endl;
diff --git a/applications/utilities/postProcessing/patch/patchIntegrate/patchIntegrate.C b/applications/utilities/postProcessing/patch/patchIntegrate/patchIntegrate.C
index 054c09cac5b..8d189dfe28b 100644
--- a/applications/utilities/postProcessing/patch/patchIntegrate/patchIntegrate.C
+++ b/applications/utilities/postProcessing/patch/patchIntegrate/patchIntegrate.C
@@ -38,13 +38,14 @@ Description
int main(int argc, char *argv[])
{
+# include "addRegionOption.H"
timeSelector::addOptions();
argList::validArgs.append("fieldName");
argList::validArgs.append("patchName");
# include "setRootCase.H"
# include "createTime.H"
instantList timeDirs = timeSelector::select0(runTime, args);
-# include "createMesh.H"
+# include "createNamedMesh.H"
word fieldName(args.additionalArgs()[0]);
word patchName(args.additionalArgs()[1]);
--
GitLab