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: minor changes

Browse Source 
- do not need STRINGIFY macros in ragel code
- remove wordPairHashTable.H and use equivalent wordPairHashes.H instead

STYLE: replace addDictOption with explicit option

 - the usage text is otherwise misleading

GIT: combine Pair/Tuple2 directories
This commit is contained in:
Mark Olesen
2022-02-01 19:39:25 +01:00
parent 62ec2f2ddf
commit 2919c9b675
19 changed files with 56 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
applications/test/flatOutput1/Test-flatOuput1.C
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com \\ / A nd | www.openfoam.com
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2020 OpenCFD Ltd. Copyright (C) 2020-2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -32,13 +32,13 @@ Description
#include "ListOps.H" #include "ListOps.H"
#include "FlatOutput.H" #include "FlatOutput.H"
#include "IOstreams.H" #include "IOstreams.H"
#include "macros.H"
using namespace Foam; using namespace Foam;
// For testing various pre-defined formatting // For testing various pre-defined formatting
#define printFlatOutput(Content, Format) \ #define printFlatOutput(Content, Format) \
STRINGIFY(Format) << ": " << flatOutput(Content, FlatOutput::Format{}) Info<< nl << #Format << ": " \
<< flatOutput(Content, FlatOutput::Format{}) << nl
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -77,20 +77,20 @@ int main(int argc, char *argv[])
Info<< nl << "write: "; Info<< nl << "write: ";
flatOutput(words1).write(Info) << nl; flatOutput(words1).write(Info) << nl;
Info<< nl << printFlatOutput(words1, BareComma) << nl; printFlatOutput(words1, BareComma);
Info<< nl << printFlatOutput(words1, BareSpace) << nl; printFlatOutput(words1, BareSpace);
Info<< nl << printFlatOutput(words1, BraceComma) << nl; printFlatOutput(words1, BraceComma);
Info<< nl << printFlatOutput(words1, BraceSpace) << nl; printFlatOutput(words1, BraceSpace);
Info<< nl << printFlatOutput(words1, ParenComma) << nl; printFlatOutput(words1, ParenComma);
Info<< nl << printFlatOutput(words1, ParenSpace) << nl; printFlatOutput(words1, ParenSpace);
Info<< nl << printFlatOutput(words1, PointyComma) << nl; printFlatOutput(words1, PointyComma);
Info<< nl << printFlatOutput(words1, PointySpace) << nl; printFlatOutput(words1, PointySpace);
Info<< nl << printFlatOutput(words1, SquareComma) << nl; printFlatOutput(words1, SquareComma);
Info<< nl << printFlatOutput(words1, SquareSpace) << nl; printFlatOutput(words1, SquareSpace);
} }

8
applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
View File

@ -126,10 +126,14 @@ int main(int argc, char *argv[])
argList::noParallel(); argList::noParallel();
timeSelector::addOptions(); timeSelector::addOptions();
#include "addRegionOption.H" #include "addRegionOption.H"
#include "addDictOption.H" argList::addOption
(
"dict",
"file",
"Alternative particleTrackDict dictionary"
);
#include "setRootCase.H" #include "setRootCase.H"
#include "createTime.H" #include "createTime.H"
instantList timeDirs = timeSelector::select0(runTime, args); instantList timeDirs = timeSelector::select0(runTime, args);
#include "createNamedMesh.H" #include "createNamedMesh.H"

7
applications/utilities/preProcessing/setAlphaField/setAlphaField.C
View File

@ -145,7 +145,12 @@ int main(int argc, char *argv[])
"implicit function." "implicit function."
); );
#include "addDictOption.H" argList::addOption
(
"dict",
"file",
"Alternative setAlphaFieldDict dictionary"
);
#include "addRegionOption.H" #include "addRegionOption.H"
#include "setRootCase.H" #include "setRootCase.H"
#include "createTime.H" #include "createTime.H"

6
src/OpenFOAM/expressions/fields/fieldExprScanner.cc
View File

@ -7,7 +7,7 @@
\\ / A nd | www.openfoam.com \\ / A nd | www.openfoam.com
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2019-2021 OpenCFD Ltd. Copyright (C) 2019-2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -36,7 +36,7 @@ Description
#include "fieldExprLemonParser.h" #include "fieldExprLemonParser.h"
#include "fieldExprParser.H" #include "fieldExprParser.H"
#include "Enum.H" #include "Enum.H"
#include "macros.H" //#include "macros.H"
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" #pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
#pragma GCC diagnostic ignored "-Wunused-const-variable" #pragma GCC diagnostic ignored "-Wunused-const-variable"
@ -163,7 +163,7 @@ static int driverTokenType
#define EMIT_TOKEN(T) \ #define EMIT_TOKEN(T) \
driver_.parsePosition() = (ts-buf); \ driver_.parsePosition() = (ts-buf); \
DebugInfo<< STRINGIFY(T) << " at " << driver_.parsePosition() << nl; \ DebugInfo<< #T << " at " << driver_.parsePosition() << nl; \
parser_->parse(TOKEN_OF(T)); \ parser_->parse(TOKEN_OF(T)); \
driver_.parsePosition() = (p-buf); driver_.parsePosition() = (p-buf);

6
src/OpenFOAM/expressions/fields/fieldExprScanner.rl
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com \\ / A nd | www.openfoam.com
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2019-2021 OpenCFD Ltd. Copyright (C) 2019-2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -34,7 +34,7 @@ Description
#include "fieldExprLemonParser.h" #include "fieldExprLemonParser.h"
#include "fieldExprParser.H" #include "fieldExprParser.H"
#include "Enum.H" #include "Enum.H"
#include "macros.H" //#include "macros.H"
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" #pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
#pragma GCC diagnostic ignored "-Wunused-const-variable" #pragma GCC diagnostic ignored "-Wunused-const-variable"
@ -161,7 +161,7 @@ static int driverTokenType
#define EMIT_TOKEN(T) \ #define EMIT_TOKEN(T) \
driver_.parsePosition() = (ts-buf); \ driver_.parsePosition() = (ts-buf); \
DebugInfo<< STRINGIFY(T) << " at " << driver_.parsePosition() << nl; \ DebugInfo<< #T << " at " << driver_.parsePosition() << nl; \
parser_->parse(TOKEN_OF(T)); \ parser_->parse(TOKEN_OF(T)); \
driver_.parsePosition() = (p-buf); driver_.parsePosition() = (p-buf);

7
src/OpenFOAM/include/addFunctionObjectOptions.H
View File

@ -1,4 +1,9 @@
#include "addDictOption.H" Foam::argList::addOption
(
"dict",
"file",
"Read control dictionary from specified location"
);
Foam::argList::addOption Foam::argList::addOption
( (
"field", "field",

0
src/OpenFOAM/primitives/Pair/Pair.H → src/OpenFOAM/primitives/tuples/Pair.H
View File

0
src/OpenFOAM/primitives/Pair/PairI.H → src/OpenFOAM/primitives/tuples/PairI.H
View File

0
src/OpenFOAM/primitives/Tuple2/Tuple2.H → src/OpenFOAM/primitives/tuples/Tuple2.H
View File

0
src/OpenFOAM/primitives/Pair/labelPair.H → src/OpenFOAM/primitives/tuples/labelPair.H
View File

0
src/OpenFOAM/primitives/Pair/labelPairHashes.H → src/OpenFOAM/primitives/tuples/labelPairHashes.H
View File

0
src/OpenFOAM/primitives/Pair/wordPair.H → src/OpenFOAM/primitives/tuples/wordPair.H
View File

4
src/OpenFOAM/primitives/Pair/wordPairHashes.H → src/OpenFOAM/primitives/tuples/wordPairHashes.H
View File

@ -42,8 +42,8 @@ Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef wordPairHashes_H #ifndef Foam_wordPairHashes_H
#define wordPairHashes_H #define Foam_wordPairHashes_H
#include "wordPair.H" #include "wordPair.H"
#include "HashSet.H" #include "HashSet.H"

6
src/finiteVolume/expressions/patch/patchExprScanner.cc
View File

@ -7,7 +7,7 @@
\\ / A nd | www.openfoam.com \\ / A nd | www.openfoam.com
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2019-2021 OpenCFD Ltd. Copyright (C) 2019-2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -36,7 +36,7 @@ Description
#include "patchExprLemonParser.h" #include "patchExprLemonParser.h"
#include "patchExprParser.H" #include "patchExprParser.H"
#include "Enum.H" #include "Enum.H"
#include "macros.H" //#include "macros.H"
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" #pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
#pragma GCC diagnostic ignored "-Wunused-const-variable" #pragma GCC diagnostic ignored "-Wunused-const-variable"
@ -295,7 +295,7 @@ static int driverTokenType
#define EMIT_TOKEN(T) \ #define EMIT_TOKEN(T) \
driver_.parsePosition() = (ts-buf); \ driver_.parsePosition() = (ts-buf); \
DebugInfo<< STRINGIFY(T) << " at " << driver_.parsePosition() << nl; \ DebugInfo<< #T << " at " << driver_.parsePosition() << nl; \
parser_->parse(TOKEN_OF(T)); \ parser_->parse(TOKEN_OF(T)); \
driver_.parsePosition() = (p-buf); driver_.parsePosition() = (p-buf);

6
src/finiteVolume/expressions/patch/patchExprScanner.rl
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com \\ / A nd | www.openfoam.com
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2019-2021 OpenCFD Ltd. Copyright (C) 2019-2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -34,7 +34,7 @@ Description
#include "patchExprLemonParser.h" #include "patchExprLemonParser.h"
#include "patchExprParser.H" #include "patchExprParser.H"
#include "Enum.H" #include "Enum.H"
#include "macros.H" //#include "macros.H"
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" #pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
#pragma GCC diagnostic ignored "-Wunused-const-variable" #pragma GCC diagnostic ignored "-Wunused-const-variable"
@ -293,7 +293,7 @@ static int driverTokenType
#define EMIT_TOKEN(T) \ #define EMIT_TOKEN(T) \
driver_.parsePosition() = (ts-buf); \ driver_.parsePosition() = (ts-buf); \
DebugInfo<< STRINGIFY(T) << " at " << driver_.parsePosition() << nl; \ DebugInfo<< #T << " at " << driver_.parsePosition() << nl; \
parser_->parse(TOKEN_OF(T)); \ parser_->parse(TOKEN_OF(T)); \
driver_.parsePosition() = (p-buf); driver_.parsePosition() = (p-buf);

6
src/finiteVolume/expressions/volume/volumeExprScanner.cc
View File

@ -7,7 +7,7 @@
\\ / A nd | www.openfoam.com \\ / A nd | www.openfoam.com
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2019-2021 OpenCFD Ltd. Copyright (C) 2019-2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -35,7 +35,7 @@ Description
#include "volumeExprLemonParser.h" #include "volumeExprLemonParser.h"
#include "volumeExprParser.H" #include "volumeExprParser.H"
#include "Enum.H" #include "Enum.H"
#include "macros.H" //#include "macros.H"
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" #pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
#pragma GCC diagnostic ignored "-Wunused-const-variable" #pragma GCC diagnostic ignored "-Wunused-const-variable"
@ -314,7 +314,7 @@ static int driverTokenType
#define EMIT_TOKEN(T) \ #define EMIT_TOKEN(T) \
driver_.parsePosition() = (ts-buf); \ driver_.parsePosition() = (ts-buf); \
DebugInfo<< STRINGIFY(T) << " at " << driver_.parsePosition() << nl; \ DebugInfo<< #T << " at " << driver_.parsePosition() << nl; \
parser_->parse(TOKEN_OF(T)); \ parser_->parse(TOKEN_OF(T)); \
driver_.parsePosition() = (p-buf); driver_.parsePosition() = (p-buf);

6
src/finiteVolume/expressions/volume/volumeExprScanner.rl
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com \\ / A nd | www.openfoam.com
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2019-2021 OpenCFD Ltd. Copyright (C) 2019-2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -33,7 +33,7 @@ Description
#include "volumeExprLemonParser.h" #include "volumeExprLemonParser.h"
#include "volumeExprParser.H" #include "volumeExprParser.H"
#include "Enum.H" #include "Enum.H"
#include "macros.H" //#include "macros.H"
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" #pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
#pragma GCC diagnostic ignored "-Wunused-const-variable" #pragma GCC diagnostic ignored "-Wunused-const-variable"
@ -312,7 +312,7 @@ static int driverTokenType
#define EMIT_TOKEN(T) \ #define EMIT_TOKEN(T) \
driver_.parsePosition() = (ts-buf); \ driver_.parsePosition() = (ts-buf); \
DebugInfo<< STRINGIFY(T) << " at " << driver_.parsePosition() << nl; \ DebugInfo<< #T << " at " << driver_.parsePosition() << nl; \
parser_->parse(TOKEN_OF(T)); \ parser_->parse(TOKEN_OF(T)); \
driver_.parsePosition() = (p-buf); driver_.parsePosition() = (p-buf);

6
src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.H
View File

@ -41,7 +41,7 @@ SourceFiles
#include "dictionary.H" #include "dictionary.H"
#include "pointField.H" #include "pointField.H"
#include "Switch.H" #include "Switch.H"
#include "wordPairHashTable.H" #include "wordPairHashes.H"
#include "surfaceZonesInfo.H" #include "surfaceZonesInfo.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -49,7 +49,7 @@ SourceFiles
namespace Foam namespace Foam
{ {
// Class forward declarations // Forward Declarations
class polyMesh; class polyMesh;
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
@ -58,7 +58,7 @@ class polyMesh;
class refinementParameters class refinementParameters
{ {
// Private data // Private Data
//- Total number of cells //- Total number of cells
const label maxGlobalCells_; const label maxGlobalCells_;

15
src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/wordPairHashTable.H
View File

@ -1,14 +1 @@
/*---------------------------------------------------------------------------*\ #warning File removed - left for old dependency check only
Description
Compatibility include.
\*---------------------------------------------------------------------------*/
#ifndef wordPairHashTable_H
#define wordPairHashTable_H
#include "wordPairHashes.H"
#endif
// ************************************************************************* //