Merge pull request #326 from akva2/relocate_files

Relocate files

CMakeLists_files.cmake

@@ -30,10 +30,10 @@ 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/core/utility/parameters/Parameter.cpp
-      opm/core/utility/parameters/ParameterGroup.cpp
-      opm/core/utility/parameters/ParameterTools.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
 )
 
 list (APPEND TEST_SOURCE_FILES
@@ -63,10 +63,10 @@ list (APPEND PROGRAM_SOURCE_FILES
 
 
 list( APPEND PUBLIC_HEADER_FILES
-      opm/common/ConditionalStorage.hpp
+      opm/common/utility/ConditionalStorage.hpp
       opm/common/ErrorMacros.hpp
       opm/common/Exceptions.hpp
-      opm/common/ResetLocale.hpp
+      opm/common/utility/ResetLocale.hpp
       opm/common/Unused.hpp
       opm/common/Valgrind.hpp
       opm/common/data/SimulationDataContainer.hpp
@@ -80,22 +80,22 @@ list( APPEND PUBLIC_HEADER_FILES
       opm/common/OpmLog/OpmLog.hpp
       opm/common/OpmLog/StreamLog.hpp
       opm/common/OpmLog/TimerLog.hpp
-      opm/common/util/numeric/cmp.hpp
+      opm/common/utility/numeric/cmp.hpp
       opm/common/utility/platform_dependent/disable_warnings.h
       opm/common/utility/platform_dependent/reenable_warnings.h
-      opm/core/linalg/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/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/numeric/blas_lapack.h
+      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
+      opm/common/utility/parameters/ParameterMapItem.hpp
+      opm/common/utility/parameters/ParameterRequirement.hpp
+      opm/common/utility/parameters/ParameterStrings.hpp
+      opm/common/utility/parameters/ParameterTools.hpp
 )

opm/common/data/SimulationDataContainer.cpp

@@ -18,7 +18,7 @@
  */
 
 #include <opm/common/ErrorMacros.hpp>
-#include <opm/common/util/numeric/cmp.hpp>
+#include <opm/common/utility/numeric/cmp.hpp>
 #include <opm/common/data/SimulationDataContainer.hpp>
 
 namespace Opm {

opm/common/utility/numeric/MonotCubicInterpolator.cpp

@@ -31,7 +31,7 @@
 
 
 #include "config.h"
-#include <opm/core/utility/MonotCubicInterpolator.hpp>
+#include <opm/common/utility/numeric/MonotCubicInterpolator.hpp>
 
 #include <iostream>
 #include <iomanip>

opm/common/utility/numeric/NonuniformTableLinear.hpp

@@ -27,7 +27,7 @@
 #include <utility>
 
 #include <opm/common/ErrorMacros.hpp>
-#include <opm/core/utility/linearInterpolation.hpp>
+#include <opm/common/utility/numeric/linearInterpolation.hpp>
 
 
 namespace Opm

opm/common/utility/parameters/Parameter.cpp

@@ -37,7 +37,7 @@
 #include "config.h"
 #endif
 #include <string>
-#include <opm/core/utility/parameters/Parameter.hpp>
+#include <opm/common/utility/parameters/Parameter.hpp>
 
 namespace Opm {
 	std::string

opm/common/utility/parameters/Parameter.hpp

@@ -39,8 +39,8 @@
 #include <string>
 #include <sstream>
 
-#include <opm/core/utility/parameters/ParameterMapItem.hpp>
-#include <opm/core/utility/parameters/ParameterStrings.hpp>
+#include <opm/common/utility/parameters/ParameterMapItem.hpp>
+#include <opm/common/utility/parameters/ParameterStrings.hpp>
 
 namespace Opm {
 	/// @brief

opm/common/utility/parameters/ParameterGroup.cpp

@@ -36,7 +36,7 @@
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>
 
 #include <cassert>
 #include <cstdlib>
@@ -44,9 +44,9 @@
 #include <iostream>
 #include <memory>
 
-#include <opm/core/utility/parameters/Parameter.hpp>
-#include <opm/core/utility/parameters/ParameterStrings.hpp>
-#include <opm/core/utility/parameters/ParameterTools.hpp>
+#include <opm/common/utility/parameters/Parameter.hpp>
+#include <opm/common/utility/parameters/ParameterStrings.hpp>
+#include <opm/common/utility/parameters/ParameterTools.hpp>
 
 namespace Opm {
 	ParameterGroup::ParameterGroup()

opm/common/utility/parameters/ParameterGroup.hpp

@@ -41,8 +41,8 @@
 #include <string>
 #include <vector>
 #include <memory>
-#include <opm/core/utility/parameters/ParameterMapItem.hpp>
-#include <opm/core/utility/parameters/ParameterRequirement.hpp>
+#include <opm/common/utility/parameters/ParameterMapItem.hpp>
+#include <opm/common/utility/parameters/ParameterRequirement.hpp>
 
 namespace Opm {
 	/// ParameterGroup is a class that is used to provide run-time parameters.
@@ -267,6 +267,6 @@ namespace Opm {
 	};
 } // namespace Opm
 
-#include <opm/core/utility/parameters/ParameterGroup_impl.hpp>
+#include <opm/common/utility/parameters/ParameterGroup_impl.hpp>
 
 #endif // OPM_PARAMETERGROUP_HEADER

opm/common/utility/parameters/ParameterGroup_impl.hpp

@@ -40,10 +40,10 @@
 #include <string>
 #include <stdexcept>
 
-#include <opm/core/utility/parameters/ParameterGroup.hpp>
-#include <opm/core/utility/parameters/ParameterStrings.hpp>
-#include <opm/core/utility/parameters/ParameterTools.hpp>
-#include <opm/core/utility/parameters/Parameter.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterStrings.hpp>
+#include <opm/common/utility/parameters/ParameterTools.hpp>
+#include <opm/common/utility/parameters/Parameter.hpp>
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/common/OpmLog/OpmLog.hpp>
 

opm/common/utility/parameters/ParameterTools.cpp

@@ -36,8 +36,8 @@
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include <opm/core/utility/parameters/ParameterTools.hpp>
-#include <opm/core/utility/parameters/ParameterStrings.hpp>
+#include <opm/common/utility/parameters/ParameterTools.hpp>
+#include <opm/common/utility/parameters/ParameterStrings.hpp>
 
 namespace Opm {
 	std::pair<std::string, std::string> splitParam(const std::string& name)

tests/test_ConditionalStorage.cpp

@@ -29,7 +29,7 @@
 #include "config.h"
 
 #include <opm/common/Unused.hpp>
-#include <opm/common/ConditionalStorage.hpp>
+#include <opm/common/utility/ConditionalStorage.hpp>
 
 #include <string>
 #include <cstdlib>

tests/test_cmp.cpp

@@ -24,7 +24,7 @@
 
 #include <stdexcept>
 
-#include <opm/common/util/numeric/cmp.hpp>
+#include <opm/common/utility/numeric/cmp.hpp>
 
 using namespace Opm;
 

tests/test_cubic.cpp

@@ -48,7 +48,7 @@
 #include <boost/test/floating_point_comparison.hpp>
 
 /* --- our own headers --- */
-#include <opm/core/utility/MonotCubicInterpolator.hpp>
+#include <opm/common/utility/numeric/MonotCubicInterpolator.hpp>
 using namespace Opm;
 
 BOOST_AUTO_TEST_SUITE ()

tests/test_nonuniformtablelinear.cpp

@@ -28,7 +28,7 @@
 #define BOOST_TEST_MODULE NonuniformTableLinearTests
 #include <boost/test/unit_test.hpp>
 
-#include <opm/core/utility/NonuniformTableLinear.hpp>
+#include <opm/common/utility/numeric/NonuniformTableLinear.hpp>
 
 
 BOOST_AUTO_TEST_CASE(utility_functions)

tests/test_param.cpp

@@ -44,7 +44,7 @@
 #define BOOST_TEST_MODULE ParameterTest
 #include <boost/test/unit_test.hpp>
 
-#include <opm/core/utility/parameters/ParameterGroup.hpp>
+#include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <cstddef>
 #include <sstream>
 #include <vector>

tests/test_sparsevector.cpp

@@ -43,7 +43,7 @@
 #define BOOST_TEST_MODULE SparseVectorTest
 #include <boost/test/unit_test.hpp>
 
-#include <opm/core/utility/SparseVector.hpp>
+#include <opm/common/utility/numeric/SparseVector.hpp>
 
 using namespace Opm;
 

tests/test_uniformtablelinear.cpp

@@ -26,7 +26,7 @@
 
 #define BOOST_TEST_MODULE UniformTableLinearTests
 #include <boost/test/unit_test.hpp>
-#include <opm/core/utility/UniformTableLinear.hpp>
+#include <opm/common/utility/numeric/UniformTableLinear.hpp>