From 714799612e19c9cb16f6519988f4ed00d121d9eb Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 4 Sep 2013 16:23:49 +0100
Subject: [PATCH] ENH: surfaceFeatureExtract: skip non-dictionary entries.
---
.../surfaceFeatureExtract/surfaceFeatureExtract.C | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
index 407828e0389..a20e5da42bc 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
@@ -952,8 +952,20 @@ int main(int argc, char *argv[])
forAllConstIter(dictionary, dict, iter)
{
+ if (!iter().isDict())
+ {
+ continue;
+ }
+
const dictionary& surfaceDict = iter().dict();
+ if (surfaceDict.found("extractionMethod"))
+ {
+ continue;
+ }
+
+ const word extractionMethod = surfaceDict.lookup("extractionMethod");
+
const fileName surfFileName = iter().keyword();
const fileName sFeatFileName = surfFileName.lessExt().name();
@@ -971,8 +983,6 @@ int main(int argc, char *argv[])
const Switch closeness =
surfaceDict.lookupOrDefault<Switch>("closeness", "off");
- const word extractionMethod = surfaceDict.lookup("extractionMethod");
-
Info<< nl << "Feature line extraction is only valid on closed manifold "
<< "surfaces." << endl;
--
GitLab