From 5b56ed5da78e4310056dc7fca4405d4267b4e41e Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Tue, 30 Jan 2018 12:50:52 +0100 Subject: [PATCH] changed: opm/[core -> common]/utility/parameters --- CMakeLists_files.cmake | 20 +++++++++---------- .../utility/parameters/Parameter.cpp | 2 +- .../utility/parameters/Parameter.hpp | 4 ++-- .../utility/parameters/ParameterGroup.cpp | 8 ++++---- .../utility/parameters/ParameterGroup.hpp | 6 +++--- .../parameters/ParameterGroup_impl.hpp | 8 ++++---- .../utility/parameters/ParameterMapItem.hpp | 0 .../parameters/ParameterRequirement.hpp | 0 .../utility/parameters/ParameterStrings.hpp | 0 .../utility/parameters/ParameterTools.cpp | 4 ++-- .../utility/parameters/ParameterTools.hpp | 0 tests/test_param.cpp | 2 +- 12 files changed, 27 insertions(+), 27 deletions(-) rename opm/{core => common}/utility/parameters/Parameter.cpp (97%) rename opm/{core => common}/utility/parameters/Parameter.hpp (98%) rename opm/{core => common}/utility/parameters/ParameterGroup.cpp (97%) rename opm/{core => common}/utility/parameters/ParameterGroup.hpp (98%) rename opm/{core => common}/utility/parameters/ParameterGroup_impl.hpp (97%) rename opm/{core => common}/utility/parameters/ParameterMapItem.hpp (100%) rename opm/{core => common}/utility/parameters/ParameterRequirement.hpp (100%) rename opm/{core => common}/utility/parameters/ParameterStrings.hpp (100%) rename opm/{core => common}/utility/parameters/ParameterTools.cpp (92%) rename opm/{core => common}/utility/parameters/ParameterTools.hpp (100%) diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake index 91bc8ac45..bbcb742e6 100644 --- a/CMakeLists_files.cmake +++ b/CMakeLists_files.cmake @@ -31,9 +31,9 @@ list (APPEND MAIN_SOURCE_FILES opm/common/OpmLog/StreamLog.cpp opm/common/OpmLog/TimerLog.cpp opm/core/utility/MonotCubicInterpolator.cpp - opm/core/utility/parameters/Parameter.cpp - opm/core/utility/parameters/ParameterGroup.cpp - opm/core/utility/parameters/ParameterTools.cpp + opm/common/utility/parameters/Parameter.cpp + opm/common/utility/parameters/ParameterGroup.cpp + opm/common/utility/parameters/ParameterTools.cpp ) list (APPEND TEST_SOURCE_FILES @@ -91,11 +91,11 @@ list( APPEND PUBLIC_HEADER_FILES opm/core/utility/RootFinders.hpp opm/core/utility/SparseVector.hpp opm/core/utility/UniformTableLinear.hpp - opm/core/utility/parameters/ParameterGroup.hpp - opm/core/utility/parameters/ParameterGroup_impl.hpp - opm/core/utility/parameters/Parameter.hpp - opm/core/utility/parameters/ParameterMapItem.hpp - opm/core/utility/parameters/ParameterRequirement.hpp - opm/core/utility/parameters/ParameterStrings.hpp - opm/core/utility/parameters/ParameterTools.hpp + opm/common/utility/parameters/ParameterGroup.hpp + opm/common/utility/parameters/ParameterGroup_impl.hpp + opm/common/utility/parameters/Parameter.hpp + opm/common/utility/parameters/ParameterMapItem.hpp + opm/common/utility/parameters/ParameterRequirement.hpp + opm/common/utility/parameters/ParameterStrings.hpp + opm/common/utility/parameters/ParameterTools.hpp ) diff --git a/opm/core/utility/parameters/Parameter.cpp b/opm/common/utility/parameters/Parameter.cpp similarity index 97% rename from opm/core/utility/parameters/Parameter.cpp rename to opm/common/utility/parameters/Parameter.cpp index 3b92fb56a..abb26ab71 100644 --- a/opm/core/utility/parameters/Parameter.cpp +++ b/opm/common/utility/parameters/Parameter.cpp @@ -37,7 +37,7 @@ #include "config.h" #endif #include -#include +#include namespace Opm { std::string diff --git a/opm/core/utility/parameters/Parameter.hpp b/opm/common/utility/parameters/Parameter.hpp similarity index 98% rename from opm/core/utility/parameters/Parameter.hpp rename to opm/common/utility/parameters/Parameter.hpp index b65028484..1bec0cd58 100644 --- a/opm/core/utility/parameters/Parameter.hpp +++ b/opm/common/utility/parameters/Parameter.hpp @@ -39,8 +39,8 @@ #include #include -#include -#include +#include +#include namespace Opm { /// @brief diff --git a/opm/core/utility/parameters/ParameterGroup.cpp b/opm/common/utility/parameters/ParameterGroup.cpp similarity index 97% rename from opm/core/utility/parameters/ParameterGroup.cpp rename to opm/common/utility/parameters/ParameterGroup.cpp index 935689aaa..1668cacc4 100644 --- a/opm/core/utility/parameters/ParameterGroup.cpp +++ b/opm/common/utility/parameters/ParameterGroup.cpp @@ -36,7 +36,7 @@ #if HAVE_CONFIG_H #include "config.h" #endif -#include +#include #include #include @@ -44,9 +44,9 @@ #include #include -#include -#include -#include +#include +#include +#include namespace Opm { ParameterGroup::ParameterGroup() diff --git a/opm/core/utility/parameters/ParameterGroup.hpp b/opm/common/utility/parameters/ParameterGroup.hpp similarity index 98% rename from opm/core/utility/parameters/ParameterGroup.hpp rename to opm/common/utility/parameters/ParameterGroup.hpp index e550bbf8b..65b17c7d7 100644 --- a/opm/core/utility/parameters/ParameterGroup.hpp +++ b/opm/common/utility/parameters/ParameterGroup.hpp @@ -41,8 +41,8 @@ #include #include #include -#include -#include +#include +#include namespace Opm { /// ParameterGroup is a class that is used to provide run-time parameters. @@ -267,6 +267,6 @@ namespace Opm { }; } // namespace Opm -#include +#include #endif // OPM_PARAMETERGROUP_HEADER diff --git a/opm/core/utility/parameters/ParameterGroup_impl.hpp b/opm/common/utility/parameters/ParameterGroup_impl.hpp similarity index 97% rename from opm/core/utility/parameters/ParameterGroup_impl.hpp rename to opm/common/utility/parameters/ParameterGroup_impl.hpp index bcb5e42cc..d3f1cba1f 100644 --- a/opm/core/utility/parameters/ParameterGroup_impl.hpp +++ b/opm/common/utility/parameters/ParameterGroup_impl.hpp @@ -40,10 +40,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/opm/core/utility/parameters/ParameterMapItem.hpp b/opm/common/utility/parameters/ParameterMapItem.hpp similarity index 100% rename from opm/core/utility/parameters/ParameterMapItem.hpp rename to opm/common/utility/parameters/ParameterMapItem.hpp diff --git a/opm/core/utility/parameters/ParameterRequirement.hpp b/opm/common/utility/parameters/ParameterRequirement.hpp similarity index 100% rename from opm/core/utility/parameters/ParameterRequirement.hpp rename to opm/common/utility/parameters/ParameterRequirement.hpp diff --git a/opm/core/utility/parameters/ParameterStrings.hpp b/opm/common/utility/parameters/ParameterStrings.hpp similarity index 100% rename from opm/core/utility/parameters/ParameterStrings.hpp rename to opm/common/utility/parameters/ParameterStrings.hpp diff --git a/opm/core/utility/parameters/ParameterTools.cpp b/opm/common/utility/parameters/ParameterTools.cpp similarity index 92% rename from opm/core/utility/parameters/ParameterTools.cpp rename to opm/common/utility/parameters/ParameterTools.cpp index d88d64ab9..0fc748cdc 100644 --- a/opm/core/utility/parameters/ParameterTools.cpp +++ b/opm/common/utility/parameters/ParameterTools.cpp @@ -36,8 +36,8 @@ #if HAVE_CONFIG_H #include "config.h" #endif -#include -#include +#include +#include namespace Opm { std::pair splitParam(const std::string& name) diff --git a/opm/core/utility/parameters/ParameterTools.hpp b/opm/common/utility/parameters/ParameterTools.hpp similarity index 100% rename from opm/core/utility/parameters/ParameterTools.hpp rename to opm/common/utility/parameters/ParameterTools.hpp diff --git a/tests/test_param.cpp b/tests/test_param.cpp index 9f83a7863..29deed0fc 100644 --- a/tests/test_param.cpp +++ b/tests/test_param.cpp @@ -44,7 +44,7 @@ #define BOOST_TEST_MODULE ParameterTest #include -#include +#include #include #include #include