bump packaging versions for 2016.10 release

debian/changelog

@@ -1,3 +1,9 @@
+opm-core (2016.10-rfinal-1~xenial) xenial; urgency=medium
+
+  * New release
+
+ -- Arne Morten Kvarving <arne.morten.kvarving@sintef.no>  Wed, 26 Oct 2016 11:29:46 +0200
+
 opm-core (2013.10-2~precise) precise; urgency=low
 
   * New release

dune.module

@@ -5,8 +5,8 @@
 
 Module: opm-core
 Description: Open Porous Media Initiative Core Library
-Version: 2016.10-pre
+Version: 2016.10
-Label: 2016.10-pre
+Label: 2016.10
 Maintainer: atgeirr@sintef.no
 MaintainerName: Atgeirr F. Rasmussen
 Url: http://opm-project.org

opm/core/props/satfunc/RelpermDiagnostics.cpp

@@ -18,6 +18,7 @@
 */
 
 #include <opm/core/props/satfunc/RelpermDiagnostics.hpp>
+#include <opm/core/props/phaseUsageFromDeck.hpp>
 #include <opm/material/fluidmatrixinteractions/EclEpsScalingPoints.hpp>
 #include <opm/parser/eclipse/EclipseState/Tables/Sof2Table.hpp>
 #include <opm/parser/eclipse/EclipseState/Tables/SgwfnTable.hpp>
@@ -64,6 +65,8 @@ namespace Opm{
 
     void RelpermDiagnostics::satFamilyCheck_(const Opm::EclipseState& eclState)
     {
+        const PhaseUsage pu = phaseUsageFromDeck(eclState);
+
         const auto& tableManager = eclState.getTableManager();
         const TableContainer& swofTables = tableManager.getSwofTables();
         const TableContainer& slgofTables= tableManager.getSlgofTables();
@@ -74,9 +77,26 @@ namespace Opm{
         const TableContainer& sof2Tables = tableManager.getSof2Tables();
         const TableContainer& sgwfnTables= tableManager.getSgwfnTables();
 
-        
+        // Family I test.
-        bool family1 = (!sgofTables.empty() || !slgofTables.empty()) && !swofTables.empty();
+        bool family1 = pu.phase_used[BlackoilPhases::Liquid];
-        bool family2 = ((!swfnTables.empty() && !sgfnTables.empty()) || !sgwfnTables.empty()) && (!sof3Tables.empty() || !sof2Tables.empty());
+        if (pu.phase_used[BlackoilPhases::Aqua]) {
+            family1 = family1 && !swofTables.empty();
+        }
+        if (pu.phase_used[BlackoilPhases::Vapour]) {
+            family1 = family1 && (!sgofTables.empty() || !slgofTables.empty());
+        }
+
+        // Family II test.
+        bool family2 = true;
+        if (pu.phase_used[BlackoilPhases::Aqua]) {
+            family2 = family2 && (!swfnTables.empty() || !sgwfnTables.empty());
+        }
+        if (pu.phase_used[BlackoilPhases::Liquid]) {
+            family2 = family2 && (!sof3Tables.empty() || !sof2Tables.empty());
+        }
+        if (pu.phase_used[BlackoilPhases::Vapour]) {
+            family2 = family2 && (!sgfnTables.empty() || !sgwfnTables.empty());
+        }
 
         if (family1 && family2) {
             const std::string msg = "Saturation families should not be mixed.\n Use either SGOF and SWOF or SGFN, SWFN and SOF3.";

redhat/opm-core.spec

@@ -2,10 +2,10 @@
 # spec file for package opm-core
 #
 
-%define tag rc3
+%define tag final
 
 Name:           opm-core
-Version:        2013.10
+Version:        2016.10
 Release:        0
 Summary:        Open Porous Media - core library
 License:        GPL-3.0