Rename opm-autodiff -> opm-simulators.

cmake/Modules/Findopm-simulators.cmake

@@ -1,30 +1,30 @@
 # - Find OPM automatic differentiation library
 #
 # Defines the following variables:
-#   opm-autodiff_INCLUDE_DIRS    Directory of header files
-#   opm-autodiff_LIBRARIES       Directory of shared object files
-#   opm-autodiff_DEFINITIONS     Defines that must be set to compile
-#   opm-autodiff_CONFIG_VARS     List of defines that should be in config.h
-#   HAVE_OPM_AUTODIFF            Binary value to use in config.h
+#   opm-simulators_INCLUDE_DIRS    Directory of header files
+#   opm-simulators_LIBRARIES       Directory of shared object files
+#   opm-simulators_DEFINITIONS     Defines that must be set to compile
+#   opm-simulators_CONFIG_VARS     List of defines that should be in config.h
+#   HAVE_OPM_SIMULATORS            Binary value to use in config.h
 
 # Copyright (C) 2012 Uni Research AS
 # This code is licensed under The GNU General Public License v3.0
 
 # use the generic find routine
-include (opm-autodiff-prereqs)
+include (opm-simulators-prereqs)
 include (OpmPackage)
 find_opm_package (
   # module name
-  "opm-autodiff"
+  "opm-simulators"
 
   # dependencies
-  "${opm-autodiff_DEPS}"
+  "${opm-simulators_DEPS}"
   
   # header to search for
   "opm/autodiff/AutoDiff.hpp"
 
   # library to search for
-  "opmautodiff"
+  "opmsimulators"
 
   # defines to be added to compilations
   ""
@@ -38,7 +38,7 @@ int main (void) {
 }
 "
   # config variables
-  "${opm-autodiff_CONFIG_VAR}"
+  "${opm-simulators_CONFIG_VAR}"
   )
 include (UseDynamicBoost)
-#debug_find_vars ("opm-autodiff")
+#debug_find_vars ("opm-simulators")

cmake/Modules/OpmKnown.cmake

@@ -25,14 +25,13 @@ set (KNOWN_VARS
 	)
 
 set (KNOWN_opm_PKGS
-	autodiff
         common
+	parser
+	material
 	core
         grid
-	material
-	parser
-	polymer
-	porsol
+        output
+	simulators
 	upscaling
 	verteq
 	)

cmake/Modules/opm-polymer-prereqs.cmake

@@ -1,25 +0,0 @@
-# -*- mode: cmake; tab-width: 2; indent-tabs-mode: t; truncate-lines: t; compile-command: "cmake -Wdev" -*-
-# 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 (opm-polymer_CONFIG_VAR
-	)
-
-# dependencies
-set (opm-polymer_DEPS
-	# compile with C99 support if available
-	"C99"
-	# compile with C++0x/11 support if available
-	"CXX11Features"
-	# various runtime library enhancements
-	"Boost 1.44.0
-		COMPONENTS date_time filesystem system unit_test_framework REQUIRED"
-	# Ensembles-based Reservoir Tools
-	"ERT"
-	# OPM dependency
-	"opm-autodiff REQUIRED;
-	opm-common;
-	opm-core REQUIRED"
-	# Eigen
-	"Eigen3 3.1 REQUIRED"
-	)

cmake/Modules/opm-simulators-prereqs.cmake

@@ -2,12 +2,12 @@
 # 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 (opm-autodiff_CONFIG_VAR
+set (opm-simulators_CONFIG_VAR
   HAVE_OPM_GRID
 	)
 
 # dependencies
-set (opm-autodiff_DEPS
+set (opm-simulators_DEPS
 	# Compile with C99 support if available
 	"C99"
 	# Compile with C++0x/11 support if available