From 73d86e8610b69f6c7f2967a29ba22087515da162 Mon Sep 17 00:00:00 2001 From: MelReyCG <122801580+MelReyCG@users.noreply.github.com> Date: Wed, 13 Nov 2024 04:24:13 +0100 Subject: [PATCH] refactor: EnumStrings.hpp from codingUtilities to common/format (#3267) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * todos * DataTypes.hpp now only manage static types - no runtime types nor Mpi constants - DataTypes.cpp is not useful anymore. * removing common -> fileIO * last common->fileIO ref * removing common->codingUtilities * logger has now a dedicated folder for upcoming files (future PRs) * 📝 missed docs (where not previously catched by the CI) * Moving EnumStrings.hpp from codingUtilities to common/format * moving the regex in codingUtilities as it is related to rtTypes / regexes * removing dependency with TypeName --- .../codingUtilities/CMakeLists.txt | 1 - .../codingUtilities/RTTypes.hpp | 26 ++++++++++- src/coreComponents/common/CMakeLists.txt | 1 + .../format}/EnumStrings.hpp | 43 +++++++++---------- .../constitutive/ExponentialRelation.hpp | 2 +- .../JFunctionCapillaryPressure.hpp | 2 +- .../multifluid/CO2Brine/CO2BrineFluid.hpp | 2 +- .../compositional/models/EquationOfState.hpp | 2 +- .../models/LohrenzBrayClarkViscosity.hpp | 2 +- .../reactive/ReactiveBrineFluid.hpp | 2 +- .../reactive/ReactiveMultiFluid.hpp | 2 +- .../fluid/singlefluid/ParticleFluid.hpp | 2 +- .../RelativePermeabilityBase.hpp | 2 +- .../dataRepository/ExecutableGroup.hpp | 2 +- .../unitTests/testXmlWrapper.cpp | 2 +- .../fileIO/vtk/VTKPolyDataWriterInterface.hpp | 2 +- .../finiteElement/PDEUtilities.hpp | 2 +- .../functions/MultivariableTableFunction.hpp | 2 +- .../functions/TableFunction.hpp | 2 +- .../utilities/LinearSolverParameters.hpp | 2 +- src/coreComponents/mesh/ElementType.hpp | 2 +- src/coreComponents/mesh/MeshObjectPath.hpp | 2 +- src/coreComponents/mesh/ParticleType.hpp | 2 +- .../mesh/SurfaceElementRegion.hpp | 2 +- .../mesh/generators/InternalMeshGenerator.hpp | 2 +- .../generators/InternalWellboreGenerator.hpp | 2 +- .../mesh/generators/ParticleMeshGenerator.hpp | 2 +- .../NonlinearSolverParameters.hpp | 2 +- .../PhysicsSolverBaseKernels.hpp | 2 +- .../physicsSolvers/contact/ContactFields.hpp | 2 +- .../fluidFlow/wells/WellControls.hpp | 2 +- .../simplePDE/LaplaceBaseH1.hpp | 2 +- .../SolidMechanicsLagrangianFEM.hpp | 2 +- .../solidMechanics/SolidMechanicsMPM.hpp | 2 +- src/coreComponents/schema/schema.xsd.other | 2 +- 35 files changed, 77 insertions(+), 56 deletions(-) rename src/coreComponents/{codingUtilities => common/format}/EnumStrings.hpp (88%) diff --git a/src/coreComponents/codingUtilities/CMakeLists.txt b/src/coreComponents/codingUtilities/CMakeLists.txt index fdccb254f5e..424a0abc3a9 100644 --- a/src/coreComponents/codingUtilities/CMakeLists.txt +++ b/src/coreComponents/codingUtilities/CMakeLists.txt @@ -2,7 +2,6 @@ # Specify all headers # set( codingUtilities_headers - EnumStrings.hpp RTTypes.hpp Parsing.hpp SFINAE_Macros.hpp diff --git a/src/coreComponents/codingUtilities/RTTypes.hpp b/src/coreComponents/codingUtilities/RTTypes.hpp index ea1bed2bdc6..93f6d89aed8 100644 --- a/src/coreComponents/codingUtilities/RTTypes.hpp +++ b/src/coreComponents/codingUtilities/RTTypes.hpp @@ -24,6 +24,7 @@ #define GEOS_CODINGUTILITIES_RTTYPES_HPP #include "common/DataTypes.hpp" +#include "common/format/EnumStrings.hpp" #include "common/format/Format.hpp" #include "common/logger/Logger.hpp" @@ -232,7 +233,30 @@ struct TypeName } }; -} +/** + * @brief Base types TypeRegex specializations + */ +///@{ + +/** + * @brief Specialization of TypeRegex for enumeration types with strings attached (pun intended). + * @tparam ENUM the type of enumeration + */ +template< typename ENUM > +struct TypeRegex< ENUM, std::enable_if_t< internal::HasEnumStrings< ENUM > > > +{ + /** + * @brief @return Regex for validating enumeration inputs for @p ENUM type. + */ + static Regex get() + { + return Regex( EnumStrings< ENUM >::concat( "|" ), + "Input value must be one of { " + EnumStrings< ENUM >::concat( ", " ) + " }." ); + } +}; + +///@} +} #endif /* GEOS_CODINGUTILITIES_RTTYPES_HPP */ diff --git a/src/coreComponents/common/CMakeLists.txt b/src/coreComponents/common/CMakeLists.txt index 32e5a412824..13d55c0cf18 100644 --- a/src/coreComponents/common/CMakeLists.txt +++ b/src/coreComponents/common/CMakeLists.txt @@ -6,6 +6,7 @@ set( common_headers format/table/TableLayout.hpp format/table/TableFormatter.hpp format/table/TableData.hpp + format/EnumStrings.hpp format/Format.hpp format/StringUtilities.hpp logger/Logger.hpp diff --git a/src/coreComponents/codingUtilities/EnumStrings.hpp b/src/coreComponents/common/format/EnumStrings.hpp similarity index 88% rename from src/coreComponents/codingUtilities/EnumStrings.hpp rename to src/coreComponents/common/format/EnumStrings.hpp index 0c6bc40065d..4d4c2eaa6ce 100644 --- a/src/coreComponents/codingUtilities/EnumStrings.hpp +++ b/src/coreComponents/common/format/EnumStrings.hpp @@ -22,11 +22,11 @@ * of these strings, like stream insertion/extraction operators. */ -#ifndef GEOS_CODINGUTILITIES_ENUMSTRINGS_HPP -#define GEOS_CODINGUTILITIES_ENUMSTRINGS_HPP +#ifndef GEOS_COMMON_FORMAT_ENUMSTRINGS_HPP +#define GEOS_COMMON_FORMAT_ENUMSTRINGS_HPP #include "common/format/StringUtilities.hpp" -#include "codingUtilities/RTTypes.hpp" +// #include "codingUtilities/RTTypes.hpp" #include "common/DataTypes.hpp" #include "common/logger/Logger.hpp" #include "common/format/Format.hpp" @@ -66,6 +66,15 @@ constexpr int countArgs( ARGS ... ) * may be used to get access to strings at runtime. While not strictly necessary, * it is recommended that macro call immediately follows the enum definition * (or the class definition, if enum is defined inside a class). + * + * enum struct VTKOutputMode + * { + * BINARY, + * ASCII + * }; + * ENUM_STRINGS( VTKOutputMode, + * "binary", + * "ascii" ); */ #define ENUM_STRINGS( ENUM, ... ) \ inline auto const & getEnumStrings( ENUM const ) \ @@ -74,6 +83,11 @@ constexpr int countArgs( ARGS ... ) return ss; \ } \ \ + inline auto const & getEnumTypeNameString( ENUM const ) \ + { \ + return #ENUM; \ + } \ + \ inline std::ostream & operator<<( std::ostream & os, ENUM const e ) \ { \ os << EnumStrings< ENUM >::toString( e ); \ @@ -139,7 +153,7 @@ struct EnumStrings std::size_t size = std::distance( std::begin( strings ), std::end( strings ) ); base_type const index = static_cast< base_type >( e ); GEOS_THROW_IF( index >= LvArray::integerConversion< base_type >( size ), - "Invalid value " << index << " of type " << TypeName< ENUM >::brief() << ". Valid range is 0.." << size - 1, + "Invalid value " << index << " of type " << getEnumTypeNameString( enum_type{} ) << ". Valid range is 0.." << size - 1, InputError ); return strings[ index ]; } @@ -154,7 +168,7 @@ struct EnumStrings auto const & strings = get(); auto const it = std::find( std::begin( strings ), std::end( strings ), s ); GEOS_THROW_IF( it == std::end( strings ), - "Invalid value '" << s << "' of type " << TypeName< enum_type >::brief() << ". Valid options are: " << concat( ", " ), + "Invalid value '" << s << "' of type " << getEnumTypeNameString( enum_type{} ) << ". Valid options are: " << concat( ", " ), InputError ); enum_type const e = static_cast< enum_type >( LvArray::integerConversion< base_type >( std::distance( std::begin( strings ), it ) ) ); return e; @@ -166,23 +180,6 @@ namespace internal IS_VALID_EXPRESSION( HasEnumStrings, ENUM, getEnumStrings( std::declval< ENUM >() ) ); } -/** - * @brief Specialization of TypeRegex for enumeration types with strings attached (pun intended). - * @tparam ENUM the type of enumeration - */ -template< typename ENUM > -struct TypeRegex< ENUM, std::enable_if_t< internal::HasEnumStrings< ENUM > > > -{ - /** - * @brief @return Regex for validating enumeration inputs for @p ENUM type. - */ - static Regex get() - { - return Regex( EnumStrings< ENUM >::concat( "|" ), - "Input value must be one of { " + EnumStrings< ENUM >::concat( ", " ) + " }." ); - } -}; - } // namespace geos // Formatter specialization for enums @@ -209,4 +206,4 @@ struct GEOS_FMT_NS::formatter< Enum, std::enable_if_t< std::is_enum< Enum >::val } }; -#endif //GEOS_CODINGUTILITIES_ENUMSTRINGS_HPP +#endif //GEOS_COMMON_FORMAT_ENUMSTRINGS_HPP diff --git a/src/coreComponents/constitutive/ExponentialRelation.hpp b/src/coreComponents/constitutive/ExponentialRelation.hpp index 64866627cbd..e2215b23f1b 100644 --- a/src/coreComponents/constitutive/ExponentialRelation.hpp +++ b/src/coreComponents/constitutive/ExponentialRelation.hpp @@ -21,7 +21,7 @@ #define GEOS_CONSITUTIVE_EXPONENTIALRELATION_HPP_ #include "common/DataTypes.hpp" -#include "codingUtilities/EnumStrings.hpp" +#include "common/format/EnumStrings.hpp" #include diff --git a/src/coreComponents/constitutive/capillaryPressure/JFunctionCapillaryPressure.hpp b/src/coreComponents/constitutive/capillaryPressure/JFunctionCapillaryPressure.hpp index 270adb15902..58ceb90ab73 100644 --- a/src/coreComponents/constitutive/capillaryPressure/JFunctionCapillaryPressure.hpp +++ b/src/coreComponents/constitutive/capillaryPressure/JFunctionCapillaryPressure.hpp @@ -22,7 +22,7 @@ #include "constitutive/capillaryPressure/CapillaryPressureBase.hpp" -#include "codingUtilities/EnumStrings.hpp" +#include "common/format/EnumStrings.hpp" #include "functions/TableFunction.hpp" namespace geos diff --git a/src/coreComponents/constitutive/fluid/multifluid/CO2Brine/CO2BrineFluid.hpp b/src/coreComponents/constitutive/fluid/multifluid/CO2Brine/CO2BrineFluid.hpp index eb31780f4d4..3675ff4ac81 100644 --- a/src/coreComponents/constitutive/fluid/multifluid/CO2Brine/CO2BrineFluid.hpp +++ b/src/coreComponents/constitutive/fluid/multifluid/CO2Brine/CO2BrineFluid.hpp @@ -20,7 +20,7 @@ #ifndef GEOS_CONSTITUTIVE_FLUID_MULTIFLUID_CO2BRINE_CO2BRINEFLUID_HPP_ #define GEOS_CONSTITUTIVE_FLUID_MULTIFLUID_CO2BRINE_CO2BRINEFLUID_HPP_ -#include "codingUtilities/EnumStrings.hpp" +#include "common/format/EnumStrings.hpp" #include "constitutive/fluid/multifluid/MultiFluidBase.hpp" #include "constitutive/fluid/multifluid/MultiFluidUtils.hpp" #include "constitutive/fluid/multifluid/CO2Brine/PhaseModel.hpp" diff --git a/src/coreComponents/constitutive/fluid/multifluid/compositional/models/EquationOfState.hpp b/src/coreComponents/constitutive/fluid/multifluid/compositional/models/EquationOfState.hpp index dd6b3d294c7..f88b8608b39 100644 --- a/src/coreComponents/constitutive/fluid/multifluid/compositional/models/EquationOfState.hpp +++ b/src/coreComponents/constitutive/fluid/multifluid/compositional/models/EquationOfState.hpp @@ -23,7 +23,7 @@ #include "ModelParameters.hpp" #include "constitutive/fluid/multifluid/MultiFluidBase.hpp" #include "dataRepository/InputFlags.hpp" -#include "codingUtilities/EnumStrings.hpp" +#include "common/format/EnumStrings.hpp" namespace geos { diff --git a/src/coreComponents/constitutive/fluid/multifluid/compositional/models/LohrenzBrayClarkViscosity.hpp b/src/coreComponents/constitutive/fluid/multifluid/compositional/models/LohrenzBrayClarkViscosity.hpp index e87373c09a6..95cb6644d9f 100644 --- a/src/coreComponents/constitutive/fluid/multifluid/compositional/models/LohrenzBrayClarkViscosity.hpp +++ b/src/coreComponents/constitutive/fluid/multifluid/compositional/models/LohrenzBrayClarkViscosity.hpp @@ -22,7 +22,7 @@ #include "FunctionBase.hpp" -#include "codingUtilities/EnumStrings.hpp" +#include "common/format/EnumStrings.hpp" namespace geos { diff --git a/src/coreComponents/constitutive/fluid/multifluid/reactive/ReactiveBrineFluid.hpp b/src/coreComponents/constitutive/fluid/multifluid/reactive/ReactiveBrineFluid.hpp index 9ba08387cf6..2ee7cf86687 100644 --- a/src/coreComponents/constitutive/fluid/multifluid/reactive/ReactiveBrineFluid.hpp +++ b/src/coreComponents/constitutive/fluid/multifluid/reactive/ReactiveBrineFluid.hpp @@ -20,7 +20,7 @@ #ifndef GEOS_CONSTITUTIVE_FLUID_REACTIVEBRINEFLUID_HPP_ #define GEOS_CONSTITUTIVE_FLUID_REACTIVEBRINEFLUID_HPP_ -#include "codingUtilities/EnumStrings.hpp" +#include "common/format/EnumStrings.hpp" #include "constitutive/fluid/multifluid/reactive/ReactiveMultiFluid.hpp" #include "constitutive/fluid/multifluid/MultiFluidUtils.hpp" #include "constitutive/fluid/multifluid/CO2Brine/PhaseModel.hpp" diff --git a/src/coreComponents/constitutive/fluid/multifluid/reactive/ReactiveMultiFluid.hpp b/src/coreComponents/constitutive/fluid/multifluid/reactive/ReactiveMultiFluid.hpp index 460f45c2c35..3a9cd32f95c 100644 --- a/src/coreComponents/constitutive/fluid/multifluid/reactive/ReactiveMultiFluid.hpp +++ b/src/coreComponents/constitutive/fluid/multifluid/reactive/ReactiveMultiFluid.hpp @@ -21,7 +21,7 @@ #define GEOS_CONSTITUTIVE_FLUID_MULTIFLUID_REACTIVE_REACTIVEMULTIFLUID_HPP_ -#include "codingUtilities/EnumStrings.hpp" +#include "common/format/EnumStrings.hpp" #include "constitutive/fluid/multifluid/MultiFluidBase.hpp" #include "constitutive/fluid/multifluid/reactive/chemicalReactions/EquilibriumReactions.hpp" #include "constitutive/fluid/multifluid/reactive/chemicalReactions/KineticReactions.hpp" diff --git a/src/coreComponents/constitutive/fluid/singlefluid/ParticleFluid.hpp b/src/coreComponents/constitutive/fluid/singlefluid/ParticleFluid.hpp index 3d621f888d0..c218ffbbad4 100644 --- a/src/coreComponents/constitutive/fluid/singlefluid/ParticleFluid.hpp +++ b/src/coreComponents/constitutive/fluid/singlefluid/ParticleFluid.hpp @@ -20,7 +20,7 @@ #ifndef GEOS_CONSTITUTIVE_FLUID_SINGLEFLUID_PARTICLEFLUID_HPP_ #define GEOS_CONSTITUTIVE_FLUID_SINGLEFLUID_PARTICLEFLUID_HPP_ -#include "codingUtilities/EnumStrings.hpp" +#include "common/format/EnumStrings.hpp" #include "constitutive/fluid/singlefluid/ParticleFluidBase.hpp" namespace geos diff --git a/src/coreComponents/constitutive/relativePermeability/RelativePermeabilityBase.hpp b/src/coreComponents/constitutive/relativePermeability/RelativePermeabilityBase.hpp index da634a6ac48..16100d449d2 100644 --- a/src/coreComponents/constitutive/relativePermeability/RelativePermeabilityBase.hpp +++ b/src/coreComponents/constitutive/relativePermeability/RelativePermeabilityBase.hpp @@ -24,7 +24,7 @@ #include "constitutive/ConstitutiveBase.hpp" #include "constitutive/relativePermeability/layouts.hpp" #include "common/GEOS_RAJA_Interface.hpp" -#include "codingUtilities/EnumStrings.hpp" +#include "common/format/EnumStrings.hpp" namespace geos { diff --git a/src/coreComponents/dataRepository/ExecutableGroup.hpp b/src/coreComponents/dataRepository/ExecutableGroup.hpp index dd3da89af5b..201b6642227 100644 --- a/src/coreComponents/dataRepository/ExecutableGroup.hpp +++ b/src/coreComponents/dataRepository/ExecutableGroup.hpp @@ -20,7 +20,7 @@ #ifndef GEOS_DATAREPOSITORY_EXECUTABLEGROUP_HPP_ #define GEOS_DATAREPOSITORY_EXECUTABLEGROUP_HPP_ -#include "codingUtilities/EnumStrings.hpp" +#include "common/format/EnumStrings.hpp" #include "common/DataTypes.hpp" #include "Group.hpp" diff --git a/src/coreComponents/dataRepository/unitTests/testXmlWrapper.cpp b/src/coreComponents/dataRepository/unitTests/testXmlWrapper.cpp index 32141eb0e28..ce1dbaf3e7e 100644 --- a/src/coreComponents/dataRepository/unitTests/testXmlWrapper.cpp +++ b/src/coreComponents/dataRepository/unitTests/testXmlWrapper.cpp @@ -16,7 +16,7 @@ #include #include "dataRepository/xmlWrapper.hpp" -#include "codingUtilities/EnumStrings.hpp" +#include "common/format/EnumStrings.hpp" using namespace geos; diff --git a/src/coreComponents/fileIO/vtk/VTKPolyDataWriterInterface.hpp b/src/coreComponents/fileIO/vtk/VTKPolyDataWriterInterface.hpp index 526c8e3fb77..77c6b90e8aa 100644 --- a/src/coreComponents/fileIO/vtk/VTKPolyDataWriterInterface.hpp +++ b/src/coreComponents/fileIO/vtk/VTKPolyDataWriterInterface.hpp @@ -21,7 +21,7 @@ #include "dataRepository/Wrapper.hpp" #include "fileIO/vtk/VTKPVDWriter.hpp" #include "fileIO/vtk/VTKVTMWriter.hpp" -#include "codingUtilities/EnumStrings.hpp" +#include "common/format/EnumStrings.hpp" class vtkUnstructuredGrid; class vtkPointData; diff --git a/src/coreComponents/finiteElement/PDEUtilities.hpp b/src/coreComponents/finiteElement/PDEUtilities.hpp index 015a68f92f1..e060d4d339d 100644 --- a/src/coreComponents/finiteElement/PDEUtilities.hpp +++ b/src/coreComponents/finiteElement/PDEUtilities.hpp @@ -20,7 +20,7 @@ #ifndef GEOS_FINITEELEMENT_PDEUTILITIES_HPP_ #define GEOS_FINITEELEMENT_PDEUTILITIES_HPP_ -#include "codingUtilities/EnumStrings.hpp" +#include "common/format/EnumStrings.hpp" namespace geos { diff --git a/src/coreComponents/functions/MultivariableTableFunction.hpp b/src/coreComponents/functions/MultivariableTableFunction.hpp index fd6e99c891d..cc924974f49 100644 --- a/src/coreComponents/functions/MultivariableTableFunction.hpp +++ b/src/coreComponents/functions/MultivariableTableFunction.hpp @@ -22,7 +22,7 @@ #include "FunctionBase.hpp" -#include "codingUtilities/EnumStrings.hpp" +#include "common/format/EnumStrings.hpp" #include "LvArray/src/tensorOps.hpp" namespace geos diff --git a/src/coreComponents/functions/TableFunction.hpp b/src/coreComponents/functions/TableFunction.hpp index 676807847a7..bd1fe75903a 100644 --- a/src/coreComponents/functions/TableFunction.hpp +++ b/src/coreComponents/functions/TableFunction.hpp @@ -22,7 +22,7 @@ #include "FunctionBase.hpp" -#include "codingUtilities/EnumStrings.hpp" +#include "common/format/EnumStrings.hpp" #include "LvArray/src/tensorOps.hpp" #include "common/format/table/TableFormatter.hpp" #include "common/Units.hpp" diff --git a/src/coreComponents/linearAlgebra/utilities/LinearSolverParameters.hpp b/src/coreComponents/linearAlgebra/utilities/LinearSolverParameters.hpp index 7483a1721a9..3c47e40e370 100644 --- a/src/coreComponents/linearAlgebra/utilities/LinearSolverParameters.hpp +++ b/src/coreComponents/linearAlgebra/utilities/LinearSolverParameters.hpp @@ -20,7 +20,7 @@ #ifndef GEOS_LINEARALGEBRA_UTILITIES_LINEARSOLVERPARAMETERS_HPP_ #define GEOS_LINEARALGEBRA_UTILITIES_LINEARSOLVERPARAMETERS_HPP_ -#include "codingUtilities/EnumStrings.hpp" +#include "common/format/EnumStrings.hpp" namespace geos { diff --git a/src/coreComponents/mesh/ElementType.hpp b/src/coreComponents/mesh/ElementType.hpp index 67208235e3b..0dd913402cd 100644 --- a/src/coreComponents/mesh/ElementType.hpp +++ b/src/coreComponents/mesh/ElementType.hpp @@ -20,7 +20,7 @@ #ifndef GEOS_MESH_ELEMENTTYPE_HPP #define GEOS_MESH_ELEMENTTYPE_HPP -#include "codingUtilities/EnumStrings.hpp" +#include "common/format/EnumStrings.hpp" namespace geos { diff --git a/src/coreComponents/mesh/MeshObjectPath.hpp b/src/coreComponents/mesh/MeshObjectPath.hpp index b6cb34adb75..832ef9a5548 100644 --- a/src/coreComponents/mesh/MeshObjectPath.hpp +++ b/src/coreComponents/mesh/MeshObjectPath.hpp @@ -21,7 +21,7 @@ #define GEOS_MESH_MESHOBJECTPATH_HPP_ -#include "codingUtilities/EnumStrings.hpp" +#include "common/format/EnumStrings.hpp" #include "MeshLevel.hpp" namespace geos diff --git a/src/coreComponents/mesh/ParticleType.hpp b/src/coreComponents/mesh/ParticleType.hpp index 000546a381d..b221f538084 100644 --- a/src/coreComponents/mesh/ParticleType.hpp +++ b/src/coreComponents/mesh/ParticleType.hpp @@ -20,7 +20,7 @@ #ifndef GEOS_MESH_PARTICLETYPE_HPP #define GEOS_MESH_PARTICLETYPE_HPP -#include "codingUtilities/EnumStrings.hpp" +#include "common/format/EnumStrings.hpp" namespace geos { diff --git a/src/coreComponents/mesh/SurfaceElementRegion.hpp b/src/coreComponents/mesh/SurfaceElementRegion.hpp index 182d4f730b0..9abd8a6ed06 100644 --- a/src/coreComponents/mesh/SurfaceElementRegion.hpp +++ b/src/coreComponents/mesh/SurfaceElementRegion.hpp @@ -22,7 +22,7 @@ #define GEOS_MESH_SURFACEELEMENTREGION_HPP_ #include "ElementRegionBase.hpp" -#include "codingUtilities/EnumStrings.hpp" +#include "common/format/EnumStrings.hpp" namespace geos { diff --git a/src/coreComponents/mesh/generators/InternalMeshGenerator.hpp b/src/coreComponents/mesh/generators/InternalMeshGenerator.hpp index e358b6c2aff..40b0b01ee90 100644 --- a/src/coreComponents/mesh/generators/InternalMeshGenerator.hpp +++ b/src/coreComponents/mesh/generators/InternalMeshGenerator.hpp @@ -20,7 +20,7 @@ #ifndef GEOS_MESH_GENERATORS_INTERNALMESHGENERATOR_HPP #define GEOS_MESH_GENERATORS_INTERNALMESHGENERATOR_HPP -#include "codingUtilities/EnumStrings.hpp" +#include "common/format/EnumStrings.hpp" #include "mesh/generators/MeshGeneratorBase.hpp" #include "mesh/generators/CellBlockManager.hpp" #include "mesh/mpiCommunications/SpatialPartition.hpp" diff --git a/src/coreComponents/mesh/generators/InternalWellboreGenerator.hpp b/src/coreComponents/mesh/generators/InternalWellboreGenerator.hpp index e9d86c930e6..c4b63aec5ac 100644 --- a/src/coreComponents/mesh/generators/InternalWellboreGenerator.hpp +++ b/src/coreComponents/mesh/generators/InternalWellboreGenerator.hpp @@ -20,7 +20,7 @@ #ifndef GEOS_MESHUTILITIES_INTERNALWELLBOREGENERATOR_HPP #define GEOS_MESHUTILITIES_INTERNALWELLBOREGENERATOR_HPP -#include "codingUtilities/EnumStrings.hpp" +#include "common/format/EnumStrings.hpp" #include "dataRepository/Group.hpp" #include "InternalMeshGenerator.hpp" diff --git a/src/coreComponents/mesh/generators/ParticleMeshGenerator.hpp b/src/coreComponents/mesh/generators/ParticleMeshGenerator.hpp index 0306f1931bd..e6060f0b854 100644 --- a/src/coreComponents/mesh/generators/ParticleMeshGenerator.hpp +++ b/src/coreComponents/mesh/generators/ParticleMeshGenerator.hpp @@ -22,7 +22,7 @@ #include "mesh/generators/MeshGeneratorBase.hpp" -#include "codingUtilities/EnumStrings.hpp" +#include "common/format/EnumStrings.hpp" namespace geos { diff --git a/src/coreComponents/physicsSolvers/NonlinearSolverParameters.hpp b/src/coreComponents/physicsSolvers/NonlinearSolverParameters.hpp index 0d68e7e6787..a084b693774 100644 --- a/src/coreComponents/physicsSolvers/NonlinearSolverParameters.hpp +++ b/src/coreComponents/physicsSolvers/NonlinearSolverParameters.hpp @@ -16,7 +16,7 @@ #ifndef GEOS_PHYSICSSOLVERS_NONLINEARSOLVERPARAMETERS_HPP_ #define GEOS_PHYSICSSOLVERS_NONLINEARSOLVERPARAMETERS_HPP_ -#include "codingUtilities/EnumStrings.hpp" +#include "common/format/EnumStrings.hpp" #include "dataRepository/Group.hpp" #include "physicsSolvers/PhysicsSolverBaseKernels.hpp" diff --git a/src/coreComponents/physicsSolvers/PhysicsSolverBaseKernels.hpp b/src/coreComponents/physicsSolvers/PhysicsSolverBaseKernels.hpp index d8583904996..e085177bae8 100644 --- a/src/coreComponents/physicsSolvers/PhysicsSolverBaseKernels.hpp +++ b/src/coreComponents/physicsSolvers/PhysicsSolverBaseKernels.hpp @@ -20,7 +20,7 @@ #ifndef GEOS_PHYSICSSOLVERS_SOLVERBASEKERNELS_HPP #define GEOS_PHYSICSSOLVERS_SOLVERBASEKERNELS_HPP -#include "codingUtilities/EnumStrings.hpp" +#include "common/format/EnumStrings.hpp" #include "common/DataTypes.hpp" #include "common/MpiWrapper.hpp" diff --git a/src/coreComponents/physicsSolvers/contact/ContactFields.hpp b/src/coreComponents/physicsSolvers/contact/ContactFields.hpp index 4792ca2d019..f86521ffd75 100644 --- a/src/coreComponents/physicsSolvers/contact/ContactFields.hpp +++ b/src/coreComponents/physicsSolvers/contact/ContactFields.hpp @@ -21,7 +21,7 @@ #define GEOS_PHYSICSSOLVERS_CONTACT_CONTACTFIELDS_HPP_ #include "mesh/MeshFields.hpp" -#include "codingUtilities/EnumStrings.hpp" +#include "common/format/EnumStrings.hpp" namespace geos { diff --git a/src/coreComponents/physicsSolvers/fluidFlow/wells/WellControls.hpp b/src/coreComponents/physicsSolvers/fluidFlow/wells/WellControls.hpp index 107c013cfd3..fefa7e4435b 100644 --- a/src/coreComponents/physicsSolvers/fluidFlow/wells/WellControls.hpp +++ b/src/coreComponents/physicsSolvers/fluidFlow/wells/WellControls.hpp @@ -21,7 +21,7 @@ #ifndef GEOS_PHYSICSSOLVERS_FLUIDFLOW_WELLS_WELLCONTROLS_HPP #define GEOS_PHYSICSSOLVERS_FLUIDFLOW_WELLS_WELLCONTROLS_HPP -#include "codingUtilities/EnumStrings.hpp" +#include "common/format/EnumStrings.hpp" #include "dataRepository/Group.hpp" #include "functions/TableFunction.hpp" diff --git a/src/coreComponents/physicsSolvers/simplePDE/LaplaceBaseH1.hpp b/src/coreComponents/physicsSolvers/simplePDE/LaplaceBaseH1.hpp index e3f10b22eea..70a3165b0f1 100644 --- a/src/coreComponents/physicsSolvers/simplePDE/LaplaceBaseH1.hpp +++ b/src/coreComponents/physicsSolvers/simplePDE/LaplaceBaseH1.hpp @@ -16,7 +16,7 @@ #ifndef GEOS_PHYSICSSOLVERS_SIMPLEPDE_LAPLACE_BASE_HPP #define GEOS_PHYSICSSOLVERS_SIMPLEPDE_LAPLACE_BASE_HPP -#include "codingUtilities/EnumStrings.hpp" // facilities for enum-string conversion (for reading enum values from XML input) +#include "common/format/EnumStrings.hpp" // facilities for enum-string conversion (for reading enum values from XML input) #include "physicsSolvers/PhysicsSolverBase.hpp" // an abstraction class shared by all physics solvers #include "fieldSpecification/FieldSpecificationManager.hpp" // a manager that can access and set values on the discretized domain diff --git a/src/coreComponents/physicsSolvers/solidMechanics/SolidMechanicsLagrangianFEM.hpp b/src/coreComponents/physicsSolvers/solidMechanics/SolidMechanicsLagrangianFEM.hpp index fb5fd9def7a..6d331793e7b 100644 --- a/src/coreComponents/physicsSolvers/solidMechanics/SolidMechanicsLagrangianFEM.hpp +++ b/src/coreComponents/physicsSolvers/solidMechanics/SolidMechanicsLagrangianFEM.hpp @@ -20,7 +20,7 @@ #ifndef GEOS_PHYSICSSOLVERS_SOLIDMECHANICS_SOLIDMECHANICSLAGRANGIANFEM_HPP_ #define GEOS_PHYSICSSOLVERS_SOLIDMECHANICS_SOLIDMECHANICSLAGRANGIANFEM_HPP_ -#include "codingUtilities/EnumStrings.hpp" +#include "common/format/EnumStrings.hpp" #include "common/TimingMacros.hpp" #include "kernels/SolidMechanicsLagrangianFEMKernels.hpp" #include "kernels/StrainHelper.hpp" diff --git a/src/coreComponents/physicsSolvers/solidMechanics/SolidMechanicsMPM.hpp b/src/coreComponents/physicsSolvers/solidMechanics/SolidMechanicsMPM.hpp index 71200129938..b528b6d9e7f 100644 --- a/src/coreComponents/physicsSolvers/solidMechanics/SolidMechanicsMPM.hpp +++ b/src/coreComponents/physicsSolvers/solidMechanics/SolidMechanicsMPM.hpp @@ -20,7 +20,7 @@ #ifndef GEOS_PHYSICSSOLVERS_SOLIDMECHANICS_MPM_HPP_ #define GEOS_PHYSICSSOLVERS_SOLIDMECHANICS_MPM_HPP_ -#include "codingUtilities/EnumStrings.hpp" +#include "common/format/EnumStrings.hpp" #include "common/TimingMacros.hpp" #include "kernels/SolidMechanicsLagrangianFEMKernels.hpp" #include "kernels/ExplicitMPM.hpp" diff --git a/src/coreComponents/schema/schema.xsd.other b/src/coreComponents/schema/schema.xsd.other index 13a5b5ed3b9..c2a891421d3 100644 --- a/src/coreComponents/schema/schema.xsd.other +++ b/src/coreComponents/schema/schema.xsd.other @@ -1011,7 +1011,7 @@ - +