changed: opm/[core -> common]/utility/parameters

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
 )

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_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>