diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake index 2823eb61b..6587dd26b 100644 --- a/CMakeLists_files.cmake +++ b/CMakeLists_files.cmake @@ -509,6 +509,7 @@ list( APPEND PUBLIC_HEADER_FILES opm/common/utility/parameters/ParameterStrings.hpp opm/common/utility/parameters/ParameterTools.hpp opm/common/utility/numeric/calculateCellVol.hpp + opm/common/utility/String.hpp opm/common/utility/TimeService.hpp ) if(ENABLE_ECL_INPUT) @@ -518,7 +519,6 @@ if(ENABLE_ECL_INPUT) opm/parser/eclipse/Utility/Stringview.hpp opm/parser/eclipse/Utility/Functional.hpp opm/parser/eclipse/Utility/Typetools.hpp - opm/parser/eclipse/Utility/String.hpp opm/parser/eclipse/Generator/KeywordGenerator.hpp opm/parser/eclipse/Generator/KeywordLoader.hpp opm/parser/eclipse/Units/UnitSystem.hpp diff --git a/opm/parser/eclipse/Utility/String.hpp b/opm/common/utility/String.hpp similarity index 100% rename from opm/parser/eclipse/Utility/String.hpp rename to opm/common/utility/String.hpp diff --git a/src/opm/io/eclipse/rst/group.cpp b/src/opm/io/eclipse/rst/group.cpp index c2c1ab76c..0289e13c0 100644 --- a/src/opm/io/eclipse/rst/group.cpp +++ b/src/opm/io/eclipse/rst/group.cpp @@ -16,7 +16,7 @@ along with OPM. If not, see . */ -#include +#include #include #include diff --git a/src/opm/io/eclipse/rst/well.cpp b/src/opm/io/eclipse/rst/well.cpp index 0814dd44d..0dda3c9e2 100644 --- a/src/opm/io/eclipse/rst/well.cpp +++ b/src/opm/io/eclipse/rst/well.cpp @@ -16,7 +16,7 @@ along with OPM. If not, see . */ -#include +#include #include #include diff --git a/src/opm/parser/eclipse/Deck/DeckItem.cpp b/src/opm/parser/eclipse/Deck/DeckItem.cpp index 84d3826cb..e96d606f7 100644 --- a/src/opm/parser/eclipse/Deck/DeckItem.cpp +++ b/src/opm/parser/eclipse/Deck/DeckItem.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/opm/parser/eclipse/EclipseState/EndpointScaling.cpp b/src/opm/parser/eclipse/EclipseState/EndpointScaling.cpp index 56c8150fe..dac7dc744 100644 --- a/src/opm/parser/eclipse/EclipseState/EndpointScaling.cpp +++ b/src/opm/parser/eclipse/EclipseState/EndpointScaling.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Grid/PinchMode.cpp b/src/opm/parser/eclipse/EclipseState/Grid/PinchMode.cpp index 3bd4c14f7..e3d87d855 100644 --- a/src/opm/parser/eclipse/EclipseState/Grid/PinchMode.cpp +++ b/src/opm/parser/eclipse/EclipseState/Grid/PinchMode.cpp @@ -18,14 +18,14 @@ */ #include -#include +#include #include namespace Opm { namespace PinchMode { - + const std::string PinchMode2String(const ModeEnum enumValue) { std::string stringValue; switch (enumValue) { @@ -56,7 +56,7 @@ namespace Opm { std::string msg = "Unsupported pinchout mode " + s; throw std::invalid_argument(msg); } - + return mode; } } diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Action/PyAction.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/Action/PyAction.cpp index 3d72e762b..538176b2b 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Action/PyAction.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/Action/PyAction.cpp @@ -25,7 +25,7 @@ namespace py = pybind11; #endif -#include +#include #include #include diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp index 6aabd0a6e..27389f282 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp @@ -26,9 +26,9 @@ #include #include +#include #include -#include #include #include #include diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp index 46294576e..046080b3b 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include constexpr const std::time_t invalid_time = -1; diff --git a/src/opm/parser/eclipse/EclipseState/checkDeck.cpp b/src/opm/parser/eclipse/EclipseState/checkDeck.cpp index 9662a12ed..56740616b 100644 --- a/src/opm/parser/eclipse/EclipseState/checkDeck.cpp +++ b/src/opm/parser/eclipse/EclipseState/checkDeck.cpp @@ -21,13 +21,12 @@ #include #include -#include #include #include #include #include #include -#include +#include namespace Opm { bool checkDeck( const Deck& deck, const Parser& parser, const ParseContext& parseContext, ErrorGuard& errorGuard, size_t enabledChecks) { diff --git a/src/opm/parser/eclipse/Parser/ParseContext.cpp b/src/opm/parser/eclipse/Parser/ParseContext.cpp index 118d57e41..73d39bc4b 100644 --- a/src/opm/parser/eclipse/Parser/ParseContext.cpp +++ b/src/opm/parser/eclipse/Parser/ParseContext.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include namespace Opm { diff --git a/src/opm/parser/eclipse/Parser/Parser.cpp b/src/opm/parser/eclipse/Parser/Parser.cpp index 096c8ca1f..b2e0dc1ca 100644 --- a/src/opm/parser/eclipse/Parser/Parser.cpp +++ b/src/opm/parser/eclipse/Parser/Parser.cpp @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include "raw/RawConsts.hpp" #include "raw/RawEnums.hpp" diff --git a/src/opm/parser/eclipse/Parser/raw/RawKeyword.cpp b/src/opm/parser/eclipse/Parser/raw/RawKeyword.cpp index 7bc4e86b5..c969e82e1 100644 --- a/src/opm/parser/eclipse/Parser/raw/RawKeyword.cpp +++ b/src/opm/parser/eclipse/Parser/raw/RawKeyword.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include "RawConsts.hpp" #include "RawKeyword.hpp" diff --git a/src/opm/parser/eclipse/Units/UnitSystem.cpp b/src/opm/parser/eclipse/Units/UnitSystem.cpp index 68814e682..1b5401905 100644 --- a/src/opm/parser/eclipse/Units/UnitSystem.cpp +++ b/src/opm/parser/eclipse/Units/UnitSystem.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/tests/parser/StringTests.cpp b/tests/parser/StringTests.cpp index de7af7b5b..a79caf787 100644 --- a/tests/parser/StringTests.cpp +++ b/tests/parser/StringTests.cpp @@ -2,7 +2,7 @@ #include -#include +#include #include using namespace Opm; diff --git a/tests/test_PaddedOutputString.cpp b/tests/test_PaddedOutputString.cpp index 5f089f354..aa10175f5 100644 --- a/tests/test_PaddedOutputString.cpp +++ b/tests/test_PaddedOutputString.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include // Convenience alias. template