Pr/fix for two phase

debian/changelog

@@ -1,17 +1,5 @@
-opm-core (2013.10-2~precise) precise; urgency=low
+opm-core (2017.04-rfinal-1~xenial) xenial; urgency=low
 
   * New release
 
  -- Arne Morten Kvarving <arne.morten.kvarving@sintef.no>  Tue, 22 Oct 2013 12:22:29 +0200
-
-opm-core (2013.03-2) precise; urgency=low
-
-  * Now compatible with precise + launchpad
-
- -- Arne Morten Kvarving <arne.morten.kvarving@sintef.no>  Wed, 03 Apr 2013 12:27:52 +0200
-
-opm-core (2013.03-1) precise; urgency=low
-
-  * Initial release
-
- -- Arne Morten Kvarving <arne.morten.kvarving@sintef.no>  Mon, 14 Jan 2013 15:33:54 +0100

debian/control

@@ -9,7 +9,8 @@ Build-Depends: build-essential, debhelper (>= 9), libboost-filesystem-dev,
                libopm-material-dev, texlive-latex-extra, texlive-latex-recommended,
                ghostscript, libboost-iostreams-dev, libopm-common-dev,
                libopm-material-dev, libopenmpi-dev, mpi-default-bin,
-               libtrilinos-zoltan-dev, libopm-output-dev
+               libtrilinos-zoltan-dev, libopm-output-dev,
+               libopm-grid-dev, libdune-geometry-dev, libdune-grid-dev
 Standards-Version: 3.9.2
 Section: libs
 Homepage: http://opm-project.org
@@ -54,25 +55,6 @@ Description: OPM core library
  * Utilities (input and output processing, unit conversion)
  * Wells (basic well handling)
 
-Package: libopm-core1-bin
-Section: science
-Pre-Depends: ${misc:Pre-Depends}, multiarch-support
-Architecture: any
-Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Provides: libopm-core-bin
-Description: OPM core library -- applications
- The OPM core library is the core library within OPM and contains
- * Eclipse deck input and preprosessing
- * Fluid properties (basic PVT models and rock properties)
- * Grid handling (cornerpoint grids, unstructured grid interface)
- * Linear Algebra (interface to different linear solvers)
- * Pressure solvers (various discretization schemes, flow models)
- * Simulators (some basic examples of simulators based on sequential splitting schemes)
- * Transport solvers (various discretization schemes, flow models)
- * Utilities (input and output processing, unit conversion)
- * Wells (basic well handling)
-
 Package: libopm-core1-doc
 Section: doc
 Architecture: all

debian/rules

@@ -21,7 +21,7 @@ override_dh_auto_build:
 
 # consider using -DUSE_VERSIONED_DIR=ON if backporting
 override_dh_auto_configure:
-	dh_auto_configure --buildsystem=cmake -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUSE_MPI=1 -DSTRIP_DEBUGGING_SYMBOLS=ON -DBUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_DOCDIR=share/doc/libopm-core1 -DWHOLE_PROG_OPTIM=ON -DUSE_RUNPATH=OFF
+	dh_auto_configure --buildsystem=cmake -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUSE_MPI=1 -DSTRIP_DEBUGGING_SYMBOLS=ON -DBUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_DOCDIR=share/doc/libopm-core1 -DWHOLE_PROG_OPTIM=ON -DUSE_RUNPATH=OFF -DWITH_NATIVE=OFF
 
 override_dh_auto_install:
 	dh_auto_install -- install-html

dune.module

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

opm/core/linalg/ParallelIstlInformation.hpp

@@ -27,6 +27,12 @@
 #include <boost/any.hpp>
 #include <exception>
 
+#include <algorithm>
+#include <functional>
+#include <limits>
+#include <numeric>
+#include <type_traits>
+
 #if HAVE_MPI && HAVE_DUNE_ISTL
 
 #include <opm/common/utility/platform_dependent/disable_warnings.h>
@@ -37,12 +43,6 @@
 #include <dune/common/enumset.hh>
 #include <opm/common/utility/platform_dependent/reenable_warnings.h>
 
-#include <algorithm>
-#include <functional>
-#include <limits>
-#include <numeric>
-#include <type_traits>
-
 namespace Opm
 {
 namespace

opm/core/props/satfunc/SaturationPropsFromDeck.hpp

@@ -29,6 +29,8 @@
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 
+#include <opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp>
+
 #include <vector>
 
 struct UnstructuredGrid;
@@ -39,6 +41,8 @@ namespace Opm
     // Forward declaring the EclMaterialLawManager template.
     template <class ScalarT, int wettingPhaseIdxV, int nonWettingasPhaseIdxV, int gasPhaseIdxV>
     class ThreePhaseMaterialTraits;
+    template <class ScalarT, int wettingPhaseIdxV, int nonWettingasPhaseIdxV>
+    class TwoPhaseMaterialTraits;
     template <class Traits>
     class EclMaterialLawManager;
 
@@ -47,11 +51,15 @@ namespace Opm
     class SaturationPropsFromDeck : public SaturationPropsInterface
     {
     public:
-        typedef Opm::ThreePhaseMaterialTraits<double,
-                                              /*wettingPhaseIdx=*/BlackoilPhases::Aqua,
-                                              /*nonWettingPhaseIdx=*/BlackoilPhases::Liquid,
-                                              /*gasPhaseIdx=*/BlackoilPhases::Vapour> MaterialTraits;
+        //typedef Opm::ThreePhaseMaterialTraits<double,
+        //                                      /*wettingPhaseIdx=*/BlackoilPhases::Aqua,
+        //                                      /*nonWettingPhaseIdx=*/BlackoilPhases::Liquid,
+        //                                      /*gasPhaseIdx=*/BlackoilPhases::Vapour> MaterialTraits;
+        typedef Opm::TwoPhaseMaterialTraits<double,
+                                            /*wettingPhaseIdx=*/BlackoilPhases::Aqua,
+                                            /*nonWettingPhaseIdx=*/BlackoilPhases::Liquid> MaterialTraits;
         typedef Opm::EclMaterialLawManager<MaterialTraits> MaterialLawManager;
+        typedef typename MaterialLawManager :: MaterialLaw  MaterialLaw;
 
         /// Default constructor.
         SaturationPropsFromDeck();
@@ -114,9 +122,9 @@ namespace Opm
                       double* smin,
                       double* smax) const;
 
-        /// Update saturation state for the hysteresis tracking 
-        /// \param[in]  n      Number of data points. 
-        /// \param[in]  s      Array of nP saturation values.             
+        /// Update saturation state for the hysteresis tracking
+        /// \param[in]  n      Number of data points.
+        /// \param[in]  s      Array of nP saturation values.
         void updateSatHyst(const int n,
                            const int* cells,
                            const double* s);
@@ -158,11 +166,11 @@ namespace Opm
                                    double* krnswdc) const;
 
         /// Update capillary pressure scaling according to pressure diff. and initial water saturation.
-        /// \param[in]     cell  Cell index. 
+        /// \param[in]     cell  Cell index.
         /// \param[in]     pcow  P_oil - P_water.
-        /// \param[in/out] swat  Water saturation. / Possibly modified Water saturation.        
-        void swatInitScaling(const int cell, 
-                             const double pcow, 
+        /// \param[in/out] swat  Water saturation. / Possibly modified Water saturation.
+        void swatInitScaling(const int cell,
+                             const double pcow,
                              double & swat);
 
         /// Returns a reference to the MaterialLawManager
@@ -174,8 +182,6 @@ namespace Opm
         PhaseUsage phaseUsage_;
     };
 
-
-
 } // namespace Opm
 
 #endif // OPM_SATURATIONPROPSFROMDECK_HEADER_INCLUDED

opm/core/wells/well_controls.c

@@ -127,6 +127,8 @@ well_controls_destroy(struct WellControls *ctrl)
         free             (ctrl->distr);
         free             (ctrl->target);
         free             (ctrl->type);
+        free             (ctrl->alq);
+        free             (ctrl->vfp);
     }
 
     free(ctrl);

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:        2017.04
 Release:        0
 Summary:        Open Porous Media - core library
 License:        GPL-3.0
@@ -51,15 +51,6 @@ BuildArch:	noarch
 %description doc
 This package contains the documentation files for opm-core
 
-%package bin
-Summary:        Applications in opm-core
-Group:          Scientific
-Requires:       %{name} = %{version}
-Requires:       libopm-core1 = %{version}
-
-%description bin
-This package contains the applications for opm-core
-
 %prep
 %setup -q -n %{name}-release-%{version}-%{tag}
 
@@ -97,6 +88,3 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
 %{_datadir}/cmake/*
-
-%files bin
-%{_bindir}/*