From ee7f4242b54d79618f7d9243b9dd3b23a852b6c1 Mon Sep 17 00:00:00 2001
From: Roland Kaufmann <roland.kaufmann@uni.no>
Date: Tue, 10 Dec 2013 21:01:22 +0100
Subject: [PATCH 1/4] Only add linker option if it is not really there

This code is run unconditionally each time we do a reconfigure; if the
option is added at each time, they will accumulate (needlessly) on the
command-line, making it harder to inspect the log.
---
 cmake/Modules/UseOnlyNeeded.cmake | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/cmake/Modules/UseOnlyNeeded.cmake b/cmake/Modules/UseOnlyNeeded.cmake
index fe8246bf..16f3d078 100644
--- a/cmake/Modules/UseOnlyNeeded.cmake
+++ b/cmake/Modules/UseOnlyNeeded.cmake
@@ -4,11 +4,23 @@
 # in order to get only the minimal set of dependencies.
 
 function (prepend var_name value)
-  if (${var_name})
-	set (${var_name} "${value} ${${var_name}}" PARENT_SCOPE)
-  else (${var_name})
-	set (${var_name} "${value}")
-  endif (${var_name})
+  # only add the prefix if it is not already at the beginning. this
+  # prevents the same string to be added at the same place every time
+  # we check for reconfiguration (e.g. "--as-needed" below)
+  string (LENGTH "${value}" _val_len)
+  string (LENGTH "${${var_name}}" _var_len)
+  if (NOT (${_var_len} LESS ${_val_len}))
+	string (SUBSTRING "${${var_name}}" 0 ${_val_len} _var_pre)
+  else (NOT (${_var_len} LESS ${_val_len}))
+	set (_var_pre)
+  endif (NOT (${_var_len} LESS ${_val_len}))
+  if (NOT ("${_var_pre}" STREQUAL "${value}"))
+	if (${var_name})
+	  set (${var_name} "${value} ${${var_name}}" PARENT_SCOPE)
+	else (${var_name})
+	  set (${var_name} "${value}")
+	endif (${var_name})
+  endif (NOT ("${_var_pre}" STREQUAL "${value}"))
 endfunction (prepend var_name value)
 
 # only ELF shared objects can be underlinked, and only GNU will accept

From 34e26ae5bcfd41419cd4be2b6bbad4ef4a8def4d Mon Sep 17 00:00:00 2001
From: Andreas Lauser <and@poware.org>
Date: Wed, 11 Dec 2013 17:26:24 +0100
Subject: [PATCH 2/4] Property system: some simplifications and bugfixes

this simplifies the template meta programming a bit. (Which does not
mean that it suddenly gets easy.) The main motivation for this work is
to make the splices feature work properly which allows eWoms to
properly select the spatial discretization at any point.

Further, the number of type tags a node can inherit from now is truely
unlimited thanks the the generic tuple reversal class provided by
https://sydius.me/2011/07/reverse-tuple-in-c/ . (before, the maximum
number of nodes from which a type tag could inherit was 11, so this
limitation did not really matter in practice.)
---
 opm/core/utility/PropertySystem.hpp | 269 +++++++++++-----------------
 1 file changed, 102 insertions(+), 167 deletions(-)

diff --git a/opm/core/utility/PropertySystem.hpp b/opm/core/utility/PropertySystem.hpp
index dc624400..bd81ff44 100644
--- a/opm/core/utility/PropertySystem.hpp
+++ b/opm/core/utility/PropertySystem.hpp
@@ -790,61 +790,33 @@ struct propertyDefinedOnSelf
                                    PropertyTag> >::value;
 };
 
-
 // template class to revert the order or a std::tuple's
 // arguments. This is required to make the properties of children
 // defined on the right overwrite the properties of the previous
-// children. this is not a very nice solution, but it works...
-template <class ... Args>
-struct RevertedTuple;
+// children. See https://sydius.me/2011/07/reverse-tuple-in-c/
+template<typename... Args>
+class RevertedTuple
+{
+private:
+    template<uint N, typename... All>
+    struct RevertedTupleOuter
+    {
+        template<typename Head, typename... Tail>
+        struct RevertedTupleInner: RevertedTupleOuter<N-1, Head, All...>::template RevertedTupleInner<Tail...> { };
+    };
 
-template <>
-struct RevertedTuple<>
-{ typedef std::tuple<> type; };
+    template<typename... All>
+    struct RevertedTupleOuter<0, All...>
+    {
+        template<typename... Tail>
+        struct RevertedTupleInner {
+            typedef std::tuple<All...> type;
+        };
+    };
 
-template <class Arg1>
-struct RevertedTuple<Arg1>
-{ typedef std::tuple<Arg1> type; };
-
-template <class Arg1, class Arg2>
-struct RevertedTuple<Arg1, Arg2>
-{ typedef std::tuple<Arg2, Arg1> type; };
-
-template <class Arg1, class Arg2, class Arg3>
-struct RevertedTuple<Arg1, Arg2, Arg3>
-{ typedef std::tuple<Arg3, Arg2, Arg1> type; };
-
-template <class Arg1, class Arg2, class Arg3, class Arg4>
-struct RevertedTuple<Arg1, Arg2, Arg3, Arg4>
-{ typedef std::tuple<Arg4, Arg3,  Arg2, Arg1> type; };
-
-template <class Arg1, class Arg2, class Arg3, class Arg4, class Arg5>
-struct RevertedTuple<Arg1, Arg2, Arg3, Arg4, Arg5>
-{ typedef std::tuple<Arg5, Arg4,  Arg3,  Arg2, Arg1> type; };
-
-template <class Arg1, class Arg2, class Arg3, class Arg4, class Arg5, class Arg6>
-struct RevertedTuple<Arg1, Arg2, Arg3, Arg4, Arg5, Arg6>
-{ typedef std::tuple<Arg6, Arg5,  Arg4,  Arg3,  Arg2, Arg1> type; };
-
-template <class Arg1, class Arg2, class Arg3, class Arg4, class Arg5, class Arg6, class Arg7>
-struct RevertedTuple<Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7>
-{ typedef std::tuple<Arg7, Arg6,  Arg5,  Arg4,  Arg3,  Arg2, Arg1> type; };
-
-template <class Arg1, class Arg2, class Arg3, class Arg4, class Arg5, class Arg6, class Arg7, class Arg8>
-struct RevertedTuple<Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8>
-{ typedef std::tuple<Arg8, Arg7,  Arg6,  Arg5,  Arg4,  Arg3,  Arg2, Arg1> type; };
-
-template <class Arg1, class Arg2, class Arg3, class Arg4, class Arg5, class Arg6, class Arg7, class Arg8, class Arg9>
-struct RevertedTuple<Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9>
-{ typedef std::tuple<Arg9, Arg8,  Arg7,  Arg6,  Arg5,  Arg4,  Arg3,  Arg2, Arg1> type; };
-
-template <class Arg1, class Arg2, class Arg3, class Arg4, class Arg5, class Arg6, class Arg7, class Arg8, class Arg9, class Arg10>
-struct RevertedTuple<Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10>
-{ typedef std::tuple<Arg10, Arg9, Arg8,  Arg7,  Arg6,  Arg5,  Arg4,  Arg3,  Arg2, Arg1> type; };
-
-template <class Arg1, class Arg2, class Arg3, class Arg4, class Arg5, class Arg6, class Arg7, class Arg8, class Arg9, class Arg10, class Arg11>
-struct RevertedTuple<Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11>
-{ typedef std::tuple<Arg11, Arg10, Arg9, Arg8,  Arg7,  Arg6,  Arg5,  Arg4,  Arg3,  Arg2, Arg1> type; };
+public:
+    typedef typename RevertedTupleOuter<sizeof...(Args)>::template RevertedTupleInner<Args...>::type type;
+};
 
 template <class SelfT,
           typename ... Children>
@@ -867,146 +839,109 @@ struct Splices
 };
 } // namespace PTag
 
-// retrieve a property which is not defined on a splice
-template <class TypeTag, class PropertyTag>
-struct GetDirectProperty_
-{
-    // set the ::type attribute to the type tag for which the
-    // requested property was defined. First check whether the
-    // property is directly defined for the type tag, and if not,
-    // check all splices, then check all children
-    template <class CurTree, bool definedOnSelf = propertyDefinedOnSelf<TypeTag, CurTree, PropertyTag>::value >
-    struct GetEffectiveTypeTag_;
-
-    // set the ::type attribute to the child type tag for which the
-    // requested property was defined. The first child is ignored.
-    template <class Dummy, class ChildrenTuple>
-    struct TraverseRemainingChildren_;
-
-    // if the first argument != void this is the value of the ::type member, ...
-    template <class EffTypeTag, class ... RemainingChildren>
-    struct StopAtFirstChildElseTraverseRemaining_
-    { typedef EffTypeTag type; };
-
-    // ... or else the type tag is defined by the remaining children
-    template <class ... RemainingChildren>
-    struct StopAtFirstChildElseTraverseRemaining_<void, RemainingChildren...>
-    { typedef typename TraverseRemainingChildren_</*dummy=*/void, std::tuple<RemainingChildren...> >::type type; };
-
-    // set the ::type attribute to the type tag to the child for which
-    // the requested property was defined, or ...
-    template <class Dummy, class CurChild, class ... RemainingChildren>
-    struct TraverseRemainingChildren_<Dummy, std::tuple<CurChild, RemainingChildren...> >
-    { typedef typename StopAtFirstChildElseTraverseRemaining_<typename GetEffectiveTypeTag_<CurChild>::type, RemainingChildren...>::type type; };
-
-    // ... if there there are no children which we did not check
-    // anymore, the ::type attribute is void (i.e. the property was
-    // not defined for a given subtree)
-    template <class Dummy>
-    struct TraverseRemainingChildren_<Dummy, std::tuple<> >
-    { typedef void type; };
-
-    template <class CurTree>
-    struct GetEffectiveTypeTag_<CurTree, /*definedOnSelf=*/true>
-    { typedef CurTree type; };
-
-    template <class CurTree>
-    struct GetEffectiveTypeTag_<CurTree, /*definedOnSelf=*/false>
-    { typedef typename TraverseRemainingChildren_<CurTree, typename CurTree::ChildrenTuple >::type type; };
-
-public:
-    typedef Property<TypeTag, typename GetEffectiveTypeTag_<TypeTag>::type, PropertyTag> p;
-};
-
 template <class TypeTag, class PropertyTag>
 struct GetProperty
 {
-    // set the ::type attribute to the type tag for which the
-    // requested property was defined. First check whether the
-    // property is directly defined for the type tag, and if not,
-    // check all splices, then check all children
-    template <class CurTree, bool definedOnSelf = propertyDefinedOnSelf<TypeTag, CurTree, PropertyTag>::value >
+    template <class CurTree,
+              bool directlyDefined =
+                  propertyDefinedOnSelf<TypeTag,
+                                        CurTree,
+                                        PropertyTag>::value>
     struct GetEffectiveTypeTag_;
 
-    // set the ::type attribute to the child type tag for which the
-    // requested property was defined. The first child is ignored.
-    template <class Dummy, class ChildrenTuple>
-    struct TraverseRemainingChildren_;
+    template <class ...Elements>
+    struct SearchTypeTagList_;
 
-    // set the ::type attribute to the type tag for which the
-    // requested property was defined. First check all splices of the
-    // type tag, then check all children. The first splice is ignored.
-    template <class CurTree, class SpliceTuple>
-    struct TraverseRemainingSplicesAndChildren_;
+    template <class EffectiveTypeTag, class ...Elements>
+    struct SearchTypeTagList_FirstThenRemaining_;
 
-    // if the first argument != void this is the value of the ::type member, ...
-    template <class EffTypeTag, class ... RemainingChildren>
-    struct StopAtFirstChildElseTraverseRemaining_
-    { typedef EffTypeTag type; };
+    template <class ...SpliceList>
+    struct SearchSpliceList_;
 
-    // ... or else the type tag is defined by the remaining children
-    template <class ... RemainingChildren>
-    struct StopAtFirstChildElseTraverseRemaining_<void, RemainingChildren...>
-    { typedef typename TraverseRemainingChildren_</*dummy=*/void, std::tuple<RemainingChildren...> >::type type; };
+    template <class EffectiveTypeTag, class ...Splices>
+    struct SearchSpliceList_FirstThenRemaining_;
 
-    // set the ::type attribute to the type tag to the child for which
-    // the requested property was defined, or ...
-    template <class Dummy, class CurChild, class ... RemainingChildren>
-    struct TraverseRemainingChildren_<Dummy, std::tuple<CurChild, RemainingChildren...> >
-    { typedef typename StopAtFirstChildElseTraverseRemaining_<typename GetEffectiveTypeTag_<CurChild>::type, RemainingChildren...>::type type; };
-
-    // ... if there there are no children which we did not check
-    // anymore, the ::type attribute is void (i.e. the property was
-    // not defined for a given subtree)
-    template <class Dummy>
-    struct TraverseRemainingChildren_<Dummy, std::tuple<> >
+    // find the first type tag in a tuple for which the property is
+    // defined
+    template <class TypeTagTuple>
+    struct SearchTypeTagTuple_
     { typedef void type; };
 
-    template <class CurTree, class FirstSpliceTypeTag, class EffTypeTag, class ... RemainingSplices>
-    struct StopAtSpliceIfPropDefinedElseTraverseRemaining_
-    { typedef EffTypeTag type; };
+    template <class ...TypeTagList>
+    struct SearchTypeTagTuple_<std::tuple<TypeTagList...> >
+    { typedef typename SearchTypeTagList_<TypeTagList...>::type type; };
 
-    template <class CurTree, class FirstSpliceTypeTag, class ... RemainingSplices>
-    struct StopAtSpliceIfPropDefinedElseTraverseRemaining_<CurTree, FirstSpliceTypeTag, /*EffTypeTag=*/void, RemainingSplices...>
-    { typedef typename TraverseRemainingSplicesAndChildren_<CurTree, std::tuple<RemainingSplices...> >::type type; };
+    template <class ...Elements>
+    struct SearchTypeTagList_
+    { typedef void type; };
 
-    // if the property was defined for the current splice, stop
-    // here. If not...
-    template <class CurTree, class FirstSpliceProperty, class ... RemainingSplices>
-    struct StopAtFirstSpliceElseTraverseRemaining_
-    { typedef typename StopAtSpliceIfPropDefinedElseTraverseRemaining_<CurTree,
-                                                                       typename FirstSpliceProperty::p::type,
-                                                                       typename GetEffectiveTypeTag_<typename FirstSpliceProperty::p::type>::type,
-                                                                       RemainingSplices...>::type type; };
+    template <class FirstElement, class ...RemainingElements>
+    struct SearchTypeTagList_<FirstElement, RemainingElements...>
+    {
+        typedef typename SearchTypeTagList_FirstThenRemaining_<
+            typename GetEffectiveTypeTag_<FirstElement>::type,
+            RemainingElements...>::type type;
+    };
 
-    // ... check the remaining splices.
-    template <class CurTree, class ... RemainingSplices>
-    struct StopAtFirstSpliceElseTraverseRemaining_<CurTree, /*FirstSpliceProperty=*/void, RemainingSplices...>
-    { typedef typename TraverseRemainingSplicesAndChildren_<CurTree, std::tuple<RemainingSplices...> >::type type; };
+    template <class EffectiveTypeTag, class ...Elements>
+    struct SearchTypeTagList_FirstThenRemaining_
+    { typedef EffectiveTypeTag type; };
 
-    // check whether the property is defined on the remaining splices
-    // of a list (i.e. discard its first member) ...
-    template <class CurTree, class CurSplice, class ... RemainingSplices>
-    struct TraverseRemainingSplicesAndChildren_<CurTree, std::tuple<CurSplice, RemainingSplices...> >
-    { typedef typename StopAtFirstSpliceElseTraverseRemaining_<CurTree, GetDirectProperty_<TypeTag, CurSplice>, RemainingSplices...>::type type; };
+    template <class ...RemainingElements>
+    struct SearchTypeTagList_FirstThenRemaining_<void, RemainingElements...>
+    { typedef typename SearchTypeTagList_<RemainingElements...>::type type; };
 
-    // ... or if there are no splices left to check, proceed with the
-    // children of the type tag.
-    template <class CurTree>
-    struct TraverseRemainingSplicesAndChildren_<CurTree, std::tuple<> >
-    { typedef typename TraverseRemainingChildren_</*dummy=*/void, typename CurTree::ChildrenTuple>::type type; };
+    // find the first type tag in a tuple of splices for which the
+    // property is defined
+    template <class SpliceTuple>
+    struct SearchSpliceTuple_
+    { typedef void type; };
+
+    template <class ...SpliceList>
+    struct SearchSpliceTuple_<std::tuple<SpliceList...> >
+    { typedef typename SearchSpliceList_<SpliceList...>::type type; };
+
+    template <class ...SpliceList>
+    struct SearchSpliceList_
+    { typedef void type; };
+
+    template <class FirstSplice, class ...RemainingSplices>
+    struct SearchSpliceList_<FirstSplice, RemainingSplices...>
+    {
+        typedef typename SearchSpliceList_FirstThenRemaining_<
+            typename GetEffectiveTypeTag_<typename GetProperty<TypeTag, FirstSplice>::p::type>::type,
+            RemainingSplices...>::type type;
+    };
+
+    template <class EffectiveTypeTag, class ...Splices>
+    struct SearchSpliceList_FirstThenRemaining_
+    { typedef EffectiveTypeTag type; };
+
+    template <class ...RemainingSplices>
+    struct SearchSpliceList_FirstThenRemaining_<void, RemainingSplices...>
+    { typedef typename SearchSpliceList_<RemainingSplices...>::type type; };
+
+    // find the splice or the child type tag for which the property is defined
+    template <class CurTree,
+              class SpliceTypeTag = typename SearchSpliceTuple_< typename PTag::Splices<CurTree>::tuple >::type >
+    struct SearchSplicesThenChildren_
+    { typedef SpliceTypeTag type; };
 
     template <class CurTree>
-    struct GetEffectiveTypeTag_<CurTree, /*definedOnSelf=*/true>
-    { typedef CurTree type; };
+    struct SearchSplicesThenChildren_<CurTree, void>
+    { typedef typename SearchTypeTagTuple_<typename CurTree::ChildrenTuple>::type type; };
+
+    // find the type tag for which the property is defined
+    template <class CurTree, bool directlyDefined>
+    struct GetEffectiveTypeTag_
+    { typedef typename CurTree::SelfType type; };
 
     template <class CurTree>
-    struct GetEffectiveTypeTag_<CurTree, /*definedOnSelf=*/false>
-    { typedef typename TraverseRemainingSplicesAndChildren_<CurTree, typename PTag::Splices<CurTree>::tuple >::type type; };
+    struct GetEffectiveTypeTag_<CurTree, /*directlyDefined = */false>
+    { typedef typename SearchSplicesThenChildren_<CurTree>::type type; };
 
 public:
     typedef Property<TypeTag, typename GetEffectiveTypeTag_<TypeTag>::type, PropertyTag> p;
-    typedef typename GetEffectiveTypeTag_<TypeTag>::type q;
 };
 
 #if !defined NO_PROPERTY_INTROSPECTION

From f1ba3d4b70807bc8444cadd013bcf4e65df627cb Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Thu, 12 Dec 2013 12:43:30 +0100
Subject: [PATCH 3/4] added: nonstandard 'RHO' field in eclipse grid parser

note that as this is a nonstandard field, there is no unit conversion
handling. use with caution
---
 opm/core/io/eclipse/EclipseGridParser.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/opm/core/io/eclipse/EclipseGridParser.cpp b/opm/core/io/eclipse/EclipseGridParser.cpp
index 78693232..c33d6fd7 100644
--- a/opm/core/io/eclipse/EclipseGridParser.cpp
+++ b/opm/core/io/eclipse/EclipseGridParser.cpp
@@ -101,7 +101,8 @@ namespace EclipseKeywords
           string("DEPTHZ"),   string("TOPS"),       string("MAPAXES"),
           string("SWCR"),     string("SWL"),        string("SWU"),
           string("SOWCR"),    string("KRW"),        string("KRWR"),
-          string("KRO"),      string("KRORW"),      string("NTG")
+          string("KRO"),      string("KRORW"),      string("NTG"),
+          string("RHO")
         };
     const int num_floating_fields = sizeof(floating_fields) / sizeof(floating_fields[0]);
 
@@ -561,7 +562,8 @@ void EclipseGridParser::convertToSI()
                    key == "SGAS"     || key == "SWAT"     || key == "SOIL"     ||
                    key == "NTG"      || key == "SWCR"     || key == "SWL"      ||
                    key == "SWU"      || key == "SOWCR"    || key == "KRW"      ||
-                   key == "KRWR"     || key == "KRORW"    || key == "KRO") {
+                   key == "KRWR"     || key == "KRORW"    || key == "KRO"      ||
+                   key == "RHO") /* nonstandard field with no unit logic. use with caution */ {
             unit = 1.0;
             do_convert = false; // Dimensionless keywords...
         } else if (key == "PRESSURE") {

From b66041999270a1dd18eb55fbb821d3ec6c65a3c9 Mon Sep 17 00:00:00 2001
From: Andreas Lauser <and@poware.org>
Date: Sun, 15 Dec 2013 18:10:27 +0100
Subject: [PATCH 4/4] fix typo in guard macro of fsh.h

on CLang 3.4 svn this produced

```
/home/erne/src/opm-core/opm/core/pressure/fsh.h:20:9: warning: 'OPM_FSH_HEADER_INCLUDED' is used as a
      header guard here, followed by #define of a different macro [-Wheader-guard]
```

which is correct...
---
 opm/core/pressure/fsh.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opm/core/pressure/fsh.h b/opm/core/pressure/fsh.h
index 8e71e9c4..08cfebc5 100644
--- a/opm/core/pressure/fsh.h
+++ b/opm/core/pressure/fsh.h
@@ -18,7 +18,7 @@
 */
 
 #ifndef OPM_FSH_HEADER_INCLUDED
-#define OPM_FHS_HEADER_INCLUDED
+#define OPM_FSH_HEADER_INCLUDED
 
 /**
  * \file