From b2be9fa3ff4e3d83c7095b928a7b42cc8facccdf Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 26 Jul 2018 16:55:11 +0100
Subject: [PATCH] STYLE: snappyHexMesh: unused option
---
.../generation/snappyHexMesh/snappyHexMesh.C | 36 +++++++++---------
.../meshRefinement/meshRefinement.C | 38 +++++++++----------
.../meshRefinement/meshRefinement.H | 24 ++++++------
.../refinementParameters.C | 7 ++--
4 files changed, 52 insertions(+), 53 deletions(-)
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index f85acfd9e05..e4ae058a0d1 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -878,24 +878,24 @@ int main(int argc, char *argv[])
}
}
- // Set output level
- {
- wordList flags;
- if (meshDict.readIfPresent("outputFlags", flags))
- {
- meshRefinement::outputLevel
- (
- meshRefinement::outputType
- (
- meshRefinement::readFlags
- (
- meshRefinement::outputTypeNames,
- flags
- )
- )
- );
- }
- }
+ //// Set output level
+ //{
+ // wordList flags;
+ // if (meshDict.readIfPresent("outputFlags", flags))
+ // {
+ // meshRefinement::outputLevel
+ // (
+ // meshRefinement::outputType
+ // (
+ // meshRefinement::readFlags
+ // (
+ // meshRefinement::outputTypeNames,
+ // flags
+ // )
+ // )
+ // );
+ // }
+ //}
// for the impatient who want to see some output files:
profiling::writeNow();
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
index cb31a5c8788..d0da764d781 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
@@ -80,14 +80,14 @@ Foam::meshRefinement::debugTypeNames
};
-const Foam::Enum
-<
- Foam::meshRefinement::outputType
->
-Foam::meshRefinement::outputTypeNames
-{
- { outputType::OUTPUTLAYERINFO, "layerInfo" }
-};
+//const Foam::Enum
+//<
+// Foam::meshRefinement::outputType
+//>
+//Foam::meshRefinement::outputTypeNames
+//{
+// { outputType::OUTPUTLAYERINFO, "layerInfo" }
+//};
const Foam::Enum
@@ -106,7 +106,7 @@ Foam::meshRefinement::writeTypeNames
Foam::meshRefinement::writeType Foam::meshRefinement::writeLevel_;
-Foam::meshRefinement::outputType Foam::meshRefinement::outputLevel_;
+//Foam::meshRefinement::outputType Foam::meshRefinement::outputLevel_;
// Inside/outside test for polyMesh:.findCell()
// 2.4.x : default = polyMesh::FACE_DIAG_TRIS
@@ -3012,16 +3012,16 @@ void Foam::meshRefinement::writeLevel(const writeType flags)
}
-Foam::meshRefinement::outputType Foam::meshRefinement::outputLevel()
-{
- return outputLevel_;
-}
-
-
-void Foam::meshRefinement::outputLevel(const outputType flags)
-{
- outputLevel_ = flags;
-}
+//Foam::meshRefinement::outputType Foam::meshRefinement::outputLevel()
+//{
+// return outputLevel_;
+//}
+//
+//
+//void Foam::meshRefinement::outputLevel(const outputType flags)
+//{
+// outputLevel_ = flags;
+//}
// ************************************************************************* //
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
index d3c068f72e8..b1ff027f7cf 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
@@ -98,13 +98,13 @@ public:
static const Enum<debugType> debugTypeNames;
- //- Enumeration for what to output. Used as a bit-pattern.
- enum outputType
- {
- OUTPUTLAYERINFO = (1 << 0)
- };
-
- static const Enum<outputType> outputTypeNames;
+ ////- Enumeration for what to output. Used as a bit-pattern.
+ //enum outputType
+ //{
+ // OUTPUTLAYERINFO = (1 << 0)
+ //};
+ //
+ //static const Enum<outputType> outputTypeNames;
//- Enumeration for what to write. Used as a bit-pattern.
enum writeType
@@ -134,8 +134,8 @@ private:
//- Control of writing level
static writeType writeLevel_;
- //- Control of output/log level
- static outputType outputLevel_;
+ ////- Control of output/log level
+ //static outputType outputLevel_;
// Private data
@@ -1513,9 +1513,9 @@ public:
static writeType writeLevel();
static void writeLevel(const writeType);
- //- Get/set output level
- static outputType outputLevel();
- static void outputLevel(const outputType);
+ ////- Get/set output level
+ //static outputType outputLevel();
+ //static void outputLevel(const outputType);
//- Helper: convert wordList into bit pattern using provided Enum
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.C
index 836f8ef8265..df86ee5276b 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
- \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
+ \\/ M anipulation | Copyright (C) 2015-2018 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -84,10 +84,9 @@ Foam::refinementParameters::refinementParameters(const dictionary& dict)
<< exit(FatalIOError);
}
}
-
- List<Tuple2<point, word>> pointsToZone;
- if (dict.readIfPresent("locationsInMesh", pointsToZone))
+ else
{
+ List<Tuple2<point, word>> pointsToZone(dict.lookup("locationsInMesh"));
label nZones = locationsInMesh_.size();
locationsInMesh_.setSize(nZones+pointsToZone.size());
zonesInMesh_.setSize(locationsInMesh_.size());
--
GitLab