From 53e4217c27a19b51a20f397aa88d900fd5520751 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Tue, 30 Jan 2018 14:05:37 +0100 Subject: [PATCH] changed: relocate the remaining files in opm/core/utility move to opm/common/utility/numeric --- CMakeLists_files.cmake | 16 ++++++++-------- .../utility/numeric}/MonotCubicInterpolator.cpp | 2 +- .../utility/numeric}/MonotCubicInterpolator.hpp | 0 .../utility/numeric}/NonuniformTableLinear.hpp | 2 +- .../utility/numeric}/RootFinders.hpp | 0 .../utility/numeric}/SparseVector.hpp | 0 .../utility/numeric}/UniformTableLinear.hpp | 0 .../numeric}/buildUniformMonotoneTable.hpp | 0 .../utility/numeric}/linearInterpolation.hpp | 0 tests/test_cubic.cpp | 2 +- tests/test_nonuniformtablelinear.cpp | 2 +- tests/test_sparsevector.cpp | 2 +- tests/test_uniformtablelinear.cpp | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) rename opm/{core/utility => common/utility/numeric}/MonotCubicInterpolator.cpp (99%) rename opm/{core/utility => common/utility/numeric}/MonotCubicInterpolator.hpp (100%) rename opm/{core/utility => common/utility/numeric}/NonuniformTableLinear.hpp (99%) rename opm/{core/utility => common/utility/numeric}/RootFinders.hpp (100%) rename opm/{core/utility => common/utility/numeric}/SparseVector.hpp (100%) rename opm/{core/utility => common/utility/numeric}/UniformTableLinear.hpp (100%) rename opm/{core/utility => common/utility/numeric}/buildUniformMonotoneTable.hpp (100%) rename opm/{core/utility => common/utility/numeric}/linearInterpolation.hpp (100%) diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake index bbcb742e6..0c8f91950 100644 --- a/CMakeLists_files.cmake +++ b/CMakeLists_files.cmake @@ -30,7 +30,7 @@ list (APPEND MAIN_SOURCE_FILES opm/common/OpmLog/OpmLog.cpp opm/common/OpmLog/StreamLog.cpp opm/common/OpmLog/TimerLog.cpp - opm/core/utility/MonotCubicInterpolator.cpp + opm/common/utility/numeric/MonotCubicInterpolator.cpp opm/common/utility/parameters/Parameter.cpp opm/common/utility/parameters/ParameterGroup.cpp opm/common/utility/parameters/ParameterTools.cpp @@ -84,13 +84,13 @@ list( APPEND PUBLIC_HEADER_FILES opm/common/utility/platform_dependent/disable_warnings.h opm/common/utility/platform_dependent/reenable_warnings.h opm/common/utility/numeric/blas_lapack.h - opm/core/utility/buildUniformMonotoneTable.hpp - opm/core/utility/linearInterpolation.hpp - opm/core/utility/MonotCubicInterpolator.hpp - opm/core/utility/NonuniformTableLinear.hpp - opm/core/utility/RootFinders.hpp - opm/core/utility/SparseVector.hpp - opm/core/utility/UniformTableLinear.hpp + opm/common/utility/numeric/buildUniformMonotoneTable.hpp + opm/common/utility/numeric/linearInterpolation.hpp + opm/common/utility/numeric/MonotCubicInterpolator.hpp + opm/common/utility/numeric/NonuniformTableLinear.hpp + opm/common/utility/numeric/RootFinders.hpp + opm/common/utility/numeric/SparseVector.hpp + opm/common/utility/numeric/UniformTableLinear.hpp opm/common/utility/parameters/ParameterGroup.hpp opm/common/utility/parameters/ParameterGroup_impl.hpp opm/common/utility/parameters/Parameter.hpp diff --git a/opm/core/utility/MonotCubicInterpolator.cpp b/opm/common/utility/numeric/MonotCubicInterpolator.cpp similarity index 99% rename from opm/core/utility/MonotCubicInterpolator.cpp rename to opm/common/utility/numeric/MonotCubicInterpolator.cpp index fe0b97717..94c6636dc 100644 --- a/opm/core/utility/MonotCubicInterpolator.cpp +++ b/opm/common/utility/numeric/MonotCubicInterpolator.cpp @@ -31,7 +31,7 @@ #include "config.h" -#include +#include #include #include diff --git a/opm/core/utility/MonotCubicInterpolator.hpp b/opm/common/utility/numeric/MonotCubicInterpolator.hpp similarity index 100% rename from opm/core/utility/MonotCubicInterpolator.hpp rename to opm/common/utility/numeric/MonotCubicInterpolator.hpp diff --git a/opm/core/utility/NonuniformTableLinear.hpp b/opm/common/utility/numeric/NonuniformTableLinear.hpp similarity index 99% rename from opm/core/utility/NonuniformTableLinear.hpp rename to opm/common/utility/numeric/NonuniformTableLinear.hpp index 2fdd1599d..830f86190 100644 --- a/opm/core/utility/NonuniformTableLinear.hpp +++ b/opm/common/utility/numeric/NonuniformTableLinear.hpp @@ -27,7 +27,7 @@ #include #include -#include +#include namespace Opm diff --git a/opm/core/utility/RootFinders.hpp b/opm/common/utility/numeric/RootFinders.hpp similarity index 100% rename from opm/core/utility/RootFinders.hpp rename to opm/common/utility/numeric/RootFinders.hpp diff --git a/opm/core/utility/SparseVector.hpp b/opm/common/utility/numeric/SparseVector.hpp similarity index 100% rename from opm/core/utility/SparseVector.hpp rename to opm/common/utility/numeric/SparseVector.hpp diff --git a/opm/core/utility/UniformTableLinear.hpp b/opm/common/utility/numeric/UniformTableLinear.hpp similarity index 100% rename from opm/core/utility/UniformTableLinear.hpp rename to opm/common/utility/numeric/UniformTableLinear.hpp diff --git a/opm/core/utility/buildUniformMonotoneTable.hpp b/opm/common/utility/numeric/buildUniformMonotoneTable.hpp similarity index 100% rename from opm/core/utility/buildUniformMonotoneTable.hpp rename to opm/common/utility/numeric/buildUniformMonotoneTable.hpp diff --git a/opm/core/utility/linearInterpolation.hpp b/opm/common/utility/numeric/linearInterpolation.hpp similarity index 100% rename from opm/core/utility/linearInterpolation.hpp rename to opm/common/utility/numeric/linearInterpolation.hpp diff --git a/tests/test_cubic.cpp b/tests/test_cubic.cpp index ecbb3f686..5bbb7fd7a 100644 --- a/tests/test_cubic.cpp +++ b/tests/test_cubic.cpp @@ -48,7 +48,7 @@ #include /* --- our own headers --- */ -#include +#include using namespace Opm; BOOST_AUTO_TEST_SUITE () diff --git a/tests/test_nonuniformtablelinear.cpp b/tests/test_nonuniformtablelinear.cpp index ed05525a4..a6eff22ef 100644 --- a/tests/test_nonuniformtablelinear.cpp +++ b/tests/test_nonuniformtablelinear.cpp @@ -28,7 +28,7 @@ #define BOOST_TEST_MODULE NonuniformTableLinearTests #include -#include +#include BOOST_AUTO_TEST_CASE(utility_functions) diff --git a/tests/test_sparsevector.cpp b/tests/test_sparsevector.cpp index a6f89be09..993369da7 100644 --- a/tests/test_sparsevector.cpp +++ b/tests/test_sparsevector.cpp @@ -43,7 +43,7 @@ #define BOOST_TEST_MODULE SparseVectorTest #include -#include +#include using namespace Opm; diff --git a/tests/test_uniformtablelinear.cpp b/tests/test_uniformtablelinear.cpp index ed7d0ea40..1edf65b9f 100644 --- a/tests/test_uniformtablelinear.cpp +++ b/tests/test_uniformtablelinear.cpp @@ -26,7 +26,7 @@ #define BOOST_TEST_MODULE UniformTableLinearTests #include -#include +#include