From 2413d4d89801ced46b550c70c2151efb2b9db1ed Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 31 May 2019 10:44:23 +0200 Subject: [PATCH] STYLE: consistent brackets for Enum construction --- .../timeControl/timeControlFunctionObject.C | 4 ++-- src/OpenFOAM/fields/cloud/cloud.C | 4 ++-- src/OpenFOAM/meshes/meshShapes/cellModel/cellModels.C | 4 ++-- src/OpenFOAM/primitives/ranges/tableBounds/tableBounds.C | 8 ++++---- src/OpenFOAM/primitives/strings/parsing/parsing.C | 4 ++-- src/fileFormats/vtk/core/foamVtkCore.C | 8 ++++---- src/fileFormats/vtk/file/foamVtkFileWriter.C | 4 ++-- .../runTimeCondition/averageCondition/averageCondition.C | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C index 1ec6bf8f4e..dd076e3b60 100644 --- a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C +++ b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C @@ -42,12 +42,12 @@ namespace functionObjects const Foam::Enum Foam::functionObjects::timeControl::controlModeNames_ -{ +({ { controlMode::TIME, "time" }, { controlMode::TRIGGER, "trigger" }, { controlMode::TIME_OR_TRIGGER, "timeOrTrigger" }, { controlMode::TIME_AND_TRIGGER, "timeAndTrigger" } -}; +}); // * * * * * * * * * * * * * * * Private Members * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/cloud/cloud.C b/src/OpenFOAM/fields/cloud/cloud.C index 91cdfbfd26..1f9cfdc37a 100644 --- a/src/OpenFOAM/fields/cloud/cloud.C +++ b/src/OpenFOAM/fields/cloud/cloud.C @@ -40,10 +40,10 @@ Foam::word Foam::cloud::defaultName("defaultCloud"); const Foam::Enum Foam::cloud::geometryTypeNames -{ +({ { geometryType::COORDINATES, "coordinates" }, { geometryType::POSITIONS, "positions" } -}; +}); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModels.C b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModels.C index 4178d814f1..9880404151 100644 --- a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModels.C +++ b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModels.C @@ -35,7 +35,7 @@ Foam::PtrList Foam::cellModel::models_; Foam::List Foam::cellModel::modelPtrs_; const Foam::Enum Foam::cellModel::modelNames -{ +({ { modelType::UNKNOWN, "unknown" }, { modelType::HEX, "hex" }, { modelType::WEDGE, "wedge" }, @@ -44,7 +44,7 @@ const Foam::Enum Foam::cellModel::modelNames { modelType::TET, "tet" }, { modelType::TETWEDGE, "tetWedge" }, { modelType::SPLITHEX, "splitHex" }, -}; +}); // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * // diff --git a/src/OpenFOAM/primitives/ranges/tableBounds/tableBounds.C b/src/OpenFOAM/primitives/ranges/tableBounds/tableBounds.C index 38c8115343..151946eb28 100644 --- a/src/OpenFOAM/primitives/ranges/tableBounds/tableBounds.C +++ b/src/OpenFOAM/primitives/ranges/tableBounds/tableBounds.C @@ -29,21 +29,21 @@ License const Foam::Enum Foam::bounds::normalBoundingNames -{ +({ { normalBounding::ERROR, "error" }, { normalBounding::WARN, "warn" }, { normalBounding::CLAMP, "clamp" }, -}; +}); const Foam::Enum Foam::bounds::repeatableBoundingNames -{ +({ { repeatableBounding::ERROR, "error" }, { repeatableBounding::WARN, "warn" }, { repeatableBounding::CLAMP, "clamp" }, { repeatableBounding::REPEAT, "repeat" }, -}; +}); // ************************************************************************* // diff --git a/src/OpenFOAM/primitives/strings/parsing/parsing.C b/src/OpenFOAM/primitives/strings/parsing/parsing.C index bb3a38564b..fa9c3aaa4f 100644 --- a/src/OpenFOAM/primitives/strings/parsing/parsing.C +++ b/src/OpenFOAM/primitives/strings/parsing/parsing.C @@ -29,11 +29,11 @@ License const Foam::Enum Foam::parsing::errorNames -{ +({ { errorType::GENERAL, "General error parsing" }, { errorType::RANGE, "Range error while parsing" }, { errorType::TRAILING, "Trailing content found parsing" }, -}; +}); // ************************************************************************* // diff --git a/src/fileFormats/vtk/core/foamVtkCore.C b/src/fileFormats/vtk/core/foamVtkCore.C index c8b41b924c..48c0e81153 100644 --- a/src/fileFormats/vtk/core/foamVtkCore.C +++ b/src/fileFormats/vtk/core/foamVtkCore.C @@ -32,12 +32,12 @@ const Foam::Enum Foam::vtk::fileTag > Foam::vtk::fileExtension -{ +({ { fileTag::POLY_DATA, "vtp" }, { fileTag::UNSTRUCTURED_GRID, "vtu" }, { fileTag::MULTI_BLOCK, "vtm" }, // { fileTag::COLLECTION, "pvd" }, -}; +}); const Foam::Enum @@ -45,12 +45,12 @@ const Foam::Enum Foam::vtk::fileTag > Foam::vtk::fileContentVersions -{ +({ { fileTag::POLY_DATA, "0.1" }, { fileTag::UNSTRUCTURED_GRID, "0.1" }, { fileTag::MULTI_BLOCK, "1.0" }, // { fileTag::COLLECTION, "0.1" }, -}; +}); const Foam::Enum diff --git a/src/fileFormats/vtk/file/foamVtkFileWriter.C b/src/fileFormats/vtk/file/foamVtkFileWriter.C index 524446cffe..82dc600ecb 100644 --- a/src/fileFormats/vtk/file/foamVtkFileWriter.C +++ b/src/fileFormats/vtk/file/foamVtkFileWriter.C @@ -33,7 +33,7 @@ const Foam::Enum Foam::vtk::fileWriter::outputState > Foam::vtk::fileWriter::stateNames -{ +({ { outputState::CLOSED, "closed" }, { outputState::OPENED, "opened" }, { outputState::DECLARED, "declared" }, @@ -41,7 +41,7 @@ Foam::vtk::fileWriter::stateNames { outputState::PIECE, "Piece" }, { outputState::CELL_DATA, "CellData" }, { outputState::POINT_DATA, "PointData" }, -}; +}); // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // diff --git a/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C b/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C index f5fe7d556e..1f2d4d6264 100644 --- a/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C +++ b/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C @@ -48,11 +48,11 @@ const Foam::Enum Foam::functionObjects::runTimeControls::averageCondition::windowType > Foam::functionObjects::runTimeControls::averageCondition::windowTypeNames -{ +({ { windowType::NONE, "none" }, { windowType::APPROXIMATE, "approximate" }, { windowType::EXACT, "exact" } -}; +}); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //