Rename dune-cornerpoint -> opm-grid.

cmake/Modules/Finddune-cornerpoint.cmake

@@ -1,42 +0,0 @@
-# - Find OPM corner-point grid library
-#
-# Defines the following variables:
-#   dune-cornerpoint_INCLUDE_DIRS    Directory of header files
-#   dune-cornerpoint_LIBRARIES       Directory of shared object files
-#   dune-cornerpoint_DEFINITIONS     Defines that must be set to compile
-#   dune-cornerpoint_CONFIG_VARS     List of defines that should be in config.h
-#   HAVE_DUNE_CORNERPOINT            Binary value to use in config.h
-
-# Copyright (C) 2013 Uni Research AS
-# This code is licensed under The GNU General Public License v3.0
-
-include (dune-cornerpoint-prereqs)
-include (OpmPackage)
-find_opm_package (
-  # module name
-  "dune-cornerpoint"
-
-  # dependencies
-  "${dune-cornerpoint_DEPS}"
-  
-  # header to search for
-  "dune/grid/CpGrid.hpp"
-
-  # library to search for
-  "dunecornerpoint"
-
-  # defines to be added to compilations
-  "HAVE_DUNE_CORNERPOINT"
-
-  # test program
-"#include <dune/grid/CpGrid.hpp>
-int main (void) {
-  Dune::CpGrid g;
-  return 0;
-}
-"
-  # config variables
-  "${dune-cornerpoint_CONFIG_VAR}"
-  )
-
-#debug_find_vars ("dune-cornerpoint")

cmake/Modules/Findopm-grid.cmake

@@ -0,0 +1,42 @@
+# - Find OPM corner-point grid library
+#
+# Defines the following variables:
+#   opm-core_INCLUDE_DIRS    Directory of header files
+#   opm-core_LIBRARIES       Directory of shared object files
+#   opm-core_DEFINITIONS     Defines that must be set to compile
+#   opm-core_CONFIG_VARS     List of defines that should be in config.h
+#   HAVE_OPM_GRID            Binary value to use in config.h
+
+# Copyright (C) 2013 Uni Research AS
+# This code is licensed under The GNU General Public License v3.0
+
+include (opm-core-prereqs)
+include (OpmPackage)
+find_opm_package (
+  # module name
+  "opm-core"
+
+  # dependencies
+  "${opm-core_DEPS}"
+  
+  # header to search for
+  "dune/grid/CpGrid.hpp"
+
+  # library to search for
+  "opmgrid"
+
+  # defines to be added to compilations
+  "HAVE_OPM_GRID"
+
+  # test program
+"#include <dune/grid/CpGrid.hpp>
+int main (void) {
+  Dune::CpGrid g;
+  return 0;
+}
+"
+  # config variables
+  "${opm-core_CONFIG_VAR}"
+  )
+
+#debug_find_vars ("opm-core")

cmake/Modules/OpmFind.cmake

@@ -63,7 +63,7 @@ set (_opm_proj_exemptions
   )
 
 # although a DUNE module, it is delivered in the OPM suite
-set (dune-cornerpoint_SUITE "opm")
+set (opm-core_SUITE "opm")
 set (ewoms_SUITE "opm")
 
 # insert this boilerplate whenever we are going to find a new package
@@ -87,7 +87,7 @@ macro (find_and_append_package_to prefix name)
 	# module is part of a suite if it has name with the pattern xxx-yyy
 	if (("${name}" MATCHES "[^-]+-.+") OR ${name}_SUITE)
 	  # allow to override if the module doesn't quite fit the convention
-	  # e.g. dune-cornerpoint
+	  # e.g. dune-cornerpoint (since renamed to opm-grid)
 	  if (NOT DEFINED ${name}_SUITE)
 		# extract suite name from module
 		string (REGEX REPLACE "([^-]+)-.+" "\\1" ${name}_SUITE "${name}")

cmake/Modules/OpmKnown.cmake

@@ -26,7 +26,9 @@ set (KNOWN_VARS
 
 set (KNOWN_opm_PKGS
 	autodiff
+        common
 	core
+        grid
 	material
 	parser
 	polymer
@@ -37,7 +39,6 @@ set (KNOWN_opm_PKGS
 
 set (KNOWN_dune_PKGS
 	common
-	cornerpoint
 	geometry
 	grid
 	istl

cmake/Modules/OpmStaticTargets.cmake

@@ -92,12 +92,12 @@ opm_static_add_dependencies(dune-geometry dune-common)
 opm_static_add_dependencies(dune-grid dune-geometry)
 
 # OPM
-foreach(opm_repo opm-common opm-parser opm-core dune-cornerpoint opm-material
+foreach(opm_repo opm-common opm-parser opm-core opm-output opm-grid opm-material
                  opm-upscaling)
   opm_from_git(https://github.com/OPM/${opm_repo} ${opm_repo} ${OPM_BENCHMARK_VERSION})
 endforeach()
 opm_static_add_dependencies(opm-parser opm-common ert)
 opm_static_add_dependencies(opm-core opm-parser dune-istl)
-opm_static_add_dependencies(dune-cornerpoint opm-core dune-grid)
+opm_static_add_dependencies(opm-grid opm-core dune-grid)
 opm_static_add_dependencies(opm-material opm-core)
-opm_static_add_dependencies(opm-upscaling dune-cornerpoint opm-material)
+opm_static_add_dependencies(opm-upscaling opm-grid opm-material)

cmake/Modules/ewoms-prereqs.cmake

@@ -33,7 +33,7 @@ set (ewoms_DEPS
 	"opm-material REQUIRED"
 	"dune-alugrid"
 	"dune-fem"
-	"dune-cornerpoint"
+	"opm-grid"
 	# librt (on some systems necessary for clock_gettime())
 	"librt REQUIRED"
 	# valgrind client requests

cmake/Modules/opm-autodiff-prereqs.cmake

@@ -3,7 +3,7 @@
 
 # defines that must be present in config.h for our headers
 set (opm-autodiff_CONFIG_VAR
-  HAVE_DUNE_CORNERPOINT
+  HAVE_OPM_GRID
 	)
 
 # dependencies
@@ -23,7 +23,7 @@ set (opm-autodiff_DEPS
         opm-parser REQUIRED;
 	opm-core REQUIRED;
 	opm-output REQUIRED;
-	dune-cornerpoint"
+	opm-grid"
 	# Eigen
 	"Eigen3 3.2.0"
 	)

cmake/Modules/opm-grid-prereqs.cmake

@@ -2,7 +2,7 @@
 # vim: set filetype=cmake autoindent tabstop=2 shiftwidth=2 noexpandtab softtabstop=2 nowrap:
 
 # defines that must be present in config.h for our headers
-set (dune-cornerpoint_CONFIG_VAR
+set (opm-grid_CONFIG_VAR
 	DUNE_GRID_VERSION_MAJOR
 	DUNE_GRID_VERSION_MINOR
 	DUNE_GRID_VERSION_REVISION
@@ -13,7 +13,7 @@ set (dune-cornerpoint_CONFIG_VAR
 	)
 
 # dependencies
-set (dune-cornerpoint_DEPS
+set (opm-grid_DEPS
 	# compile with C99 support if available
 	"C99"
 	# compile with C++0x/11 support if available

cmake/Modules/opm-upscaling-prereqs.cmake

@@ -27,6 +27,6 @@ set (opm-upscaling_DEPS
 	dune-grid REQUIRED;
 	opm-common REQUIRED;
 	opm-core REQUIRED;
-        dune-cornerpoint REQUIRED;
+        opm-grid REQUIRED;
 	opm-output REQUIRED"
 	)