zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

STYLE: snappyHexMesh: unused option

Browse Source
This commit is contained in:
mattijs
2018-07-26 16:55:11 +01:00
parent d7d4a6e834
commit b2be9fa3ff
4 changed files with 52 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
View File

@ -878,24 +878,24 @@ int main(int argc, char *argv[])
} }
} }
// Set output level //// Set output level
{ //{
wordList flags; // wordList flags;
if (meshDict.readIfPresent("outputFlags", flags)) // if (meshDict.readIfPresent("outputFlags", flags))
{ // {
meshRefinement::outputLevel // meshRefinement::outputLevel
( // (
meshRefinement::outputType // meshRefinement::outputType
( // (
meshRefinement::readFlags // meshRefinement::readFlags
( // (
meshRefinement::outputTypeNames, // meshRefinement::outputTypeNames,
flags // flags
) // )
) // )
); // );
} // }
} //}
// for the impatient who want to see some output files: // for the impatient who want to see some output files:
profiling::writeNow(); profiling::writeNow();

38
src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
View File

@ -80,14 +80,14 @@ Foam::meshRefinement::debugTypeNames
}; };
const Foam::Enum //const Foam::Enum
< //<
Foam::meshRefinement::outputType // Foam::meshRefinement::outputType
> //>
Foam::meshRefinement::outputTypeNames //Foam::meshRefinement::outputTypeNames
{ //{
{ outputType::OUTPUTLAYERINFO, "layerInfo" } // { outputType::OUTPUTLAYERINFO, "layerInfo" }
}; //};
const Foam::Enum const Foam::Enum
@ -106,7 +106,7 @@ Foam::meshRefinement::writeTypeNames
Foam::meshRefinement::writeType Foam::meshRefinement::writeLevel_; Foam::meshRefinement::writeType Foam::meshRefinement::writeLevel_;
Foam::meshRefinement::outputType Foam::meshRefinement::outputLevel_; //Foam::meshRefinement::outputType Foam::meshRefinement::outputLevel_;
// Inside/outside test for polyMesh:.findCell() // Inside/outside test for polyMesh:.findCell()
// 2.4.x : default = polyMesh::FACE_DIAG_TRIS // 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() //Foam::meshRefinement::outputType Foam::meshRefinement::outputLevel()
{ //{
return outputLevel_; // return outputLevel_;
} //}
//
//
void Foam::meshRefinement::outputLevel(const outputType flags) //void Foam::meshRefinement::outputLevel(const outputType flags)
{ //{
outputLevel_ = flags; // outputLevel_ = flags;
} //}
// ************************************************************************* // // ************************************************************************* //

24
src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
View File

@ -98,13 +98,13 @@ public:
static const Enum<debugType> debugTypeNames; static const Enum<debugType> debugTypeNames;
//- Enumeration for what to output. Used as a bit-pattern. ////- Enumeration for what to output. Used as a bit-pattern.
enum outputType //enum outputType
{ //{
OUTPUTLAYERINFO = (1 << 0) // OUTPUTLAYERINFO = (1 << 0)
}; //};
//
static const Enum<outputType> outputTypeNames; //static const Enum<outputType> outputTypeNames;
//- Enumeration for what to write. Used as a bit-pattern. //- Enumeration for what to write. Used as a bit-pattern.
enum writeType enum writeType
@ -134,8 +134,8 @@ private:
//- Control of writing level //- Control of writing level
static writeType writeLevel_; static writeType writeLevel_;
//- Control of output/log level ////- Control of output/log level
static outputType outputLevel_; //static outputType outputLevel_;
// Private data // Private data
@ -1513,9 +1513,9 @@ public:
static writeType writeLevel(); static writeType writeLevel();
static void writeLevel(const writeType); static void writeLevel(const writeType);
//- Get/set output level ////- Get/set output level
static outputType outputLevel(); //static outputType outputLevel();
static void outputLevel(const outputType); //static void outputLevel(const outputType);
//- Helper: convert wordList into bit pattern using provided Enum //- Helper: convert wordList into bit pattern using provided Enum

7
src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd. \\/ M anipulation | Copyright (C) 2015-2018 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -84,10 +84,9 @@ Foam::refinementParameters::refinementParameters(const dictionary& dict)
<< exit(FatalIOError); << exit(FatalIOError);
} }
} }
else
List<Tuple2<point, word>> pointsToZone;
if (dict.readIfPresent("locationsInMesh", pointsToZone))
{ {
List<Tuple2<point, word>> pointsToZone(dict.lookup("locationsInMesh"));
label nZones = locationsInMesh_.size(); label nZones = locationsInMesh_.size();
locationsInMesh_.setSize(nZones+pointsToZone.size()); locationsInMesh_.setSize(nZones+pointsToZone.size());
zonesInMesh_.setSize(locationsInMesh_.size()); zonesInMesh_.setSize(locationsInMesh_.size());