Merge pull request #91 from akva2/import_porsol

changed: drop opm-porsol

cmake/Modules/Findopm-polymer.cmake

@@ -1,42 +0,0 @@
-# - Find OPM polymer library
-#
-# Defines the following variables:
-#   opm-polymer_INCLUDE_DIRS    Directory of header files
-#   opm-polymer_LIBRARIES       Directory of shared object files
-#   opm-polymer_DEFINITIONS     Defines that must be set to compile
-#   opm-polymer_CONFIG_VARS     List of defines that should be in config.h
-#   HAVE_OPM_POLYMER            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-polymer-prereqs)
-include (OpmPackage)
-find_opm_package (
-  # module name
-  "opm-polymer"
-
-  # dependencies
-  "${opm-polymer_DEPS}"
-
-  # header to search for
-  "opm/polymer/PolymerState.hpp"
-
-  # library to search for
-  "opmpolymer"
-
-  # defines to be added to compilations
-  ""
-
-  # test program
-"#include <opm/polymer/PolymerState.hpp>
-int main (void) {
-  Opm::PolymerState s;
-  return 0;
-}
-"
-  # config variables
-  "${opm-polymer_CONFIG_VAR}"
-  )
-
-#debug_find_vars ("opm-polymer")

cmake/Modules/Findopm-porsol.cmake

@@ -1,41 +0,0 @@
-# - Find OPM porous media solver library
-#
-# Defines the following variables:
-#   opm-porsol_INCLUDE_DIRS    Directory of header files
-#   opm-porsol_LIBRARIES       Directory of shared object files
-#   opm-porsol_DEFINITIONS     Defines that must be set to compile
-#   opm-porsol_CONFIG_VARS     List of defines that should be in config.h
-#   HAVE_OPM_PORSOL            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-porsol-prereqs)
-include (OpmPackage)
-find_opm_package (
-  # module name
-  "opm-porsol"
-
-  # dependencies
-  "${opm-porsol_DEPS}"
-
-  # header to search for
-  "opm/porsol/mimetic/IncompFlowSolverHybrid.hpp"
-
-  # library to search for
-  "opmporsol"
-
-  # defines to be added to compilations
-  ""
-
-  # test program
-"#include <opm/porsol/mimetic/IncompFlowSolverHybrid.hpp>
-int main (void) {
-  return 0;
-}
-"
-  # config variables
-  "${opm-porsol_CONFIG_VAR}"
-  )
-
-#debug_find_vars ("opm-porsol")

cmake/Modules/OpmStaticTargets.cmake

@@ -93,12 +93,11 @@ opm_static_add_dependencies(dune-grid dune-geometry)
 
 # OPM
 foreach(opm_repo opm-common opm-parser opm-core dune-cornerpoint opm-material
-                 opm-porsol opm-upscaling)
+                 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-material opm-core)
-opm_static_add_dependencies(opm-porsol dune-cornerpoint opm-material)
-opm_static_add_dependencies(opm-upscaling opm-porsol)
+opm_static_add_dependencies(opm-upscaling dune-cornerpoint opm-material)

cmake/Modules/opm-porsol-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-porsol_CONFIG_VAR
-	)
-
-# dependencies
-set (opm-porsol_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"
-	# DUNE dependency
-	"dune-common REQUIRED;
-	dune-istl REQUIRED;
-	dune-grid REQUIRED;
-	opm-common;
-	opm-core REQUIRED;
-	opm-material REQUIRED;
-	dune-cornerpoint REQUIRED"
-	)

cmake/Modules/opm-upscaling-prereqs.cmake

@@ -25,8 +25,7 @@ set (opm-upscaling_DEPS
 	dune-istl REQUIRED;
 	dune-geometry REQUIRED;
 	dune-grid REQUIRED;
-	opm-common;
+	opm-common REQUIRED;
 	opm-core REQUIRED;
-	dune-cornerpoint REQUIRED;
-	opm-porsol REQUIRED"
+	dune-cornerpoint REQUIRED"
 	)