From 62d633a8fff5fe277ccd90b72326334c3b3640c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= <atgeirr@sintef.no>
Date: Mon, 14 Sep 2015 10:32:07 +0200
Subject: [PATCH 1/2] Update for removed constructor args.

---
 examples/flow.cpp         | 3 +--
 examples/flow_solvent.cpp | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/examples/flow.cpp b/examples/flow.cpp
index 2815caffc..f53a53d01 100644
--- a/examples/flow.cpp
+++ b/examples/flow.cpp
@@ -264,8 +264,7 @@ try
                                       Opm::UgGridHelpers::numCells(grid),
                                       Opm::UgGridHelpers::globalCell(grid),
                                       Opm::UgGridHelpers::cartDims(grid),
-                                      Opm::UgGridHelpers::beginCellCentroids(grid),
-                                      Opm::UgGridHelpers::dimensions(grid), param);
+                                      param);
 
     BlackoilPropsAdFromDeck new_props( deck, eclipseState, materialLawManager, grid );
     // check_well_controls = param.getDefault("check_well_controls", false);
diff --git a/examples/flow_solvent.cpp b/examples/flow_solvent.cpp
index bc13ee062..7f600a2b9 100644
--- a/examples/flow_solvent.cpp
+++ b/examples/flow_solvent.cpp
@@ -260,8 +260,7 @@ try
                                       Opm::UgGridHelpers::numCells(grid),
                                       Opm::UgGridHelpers::globalCell(grid),
                                       Opm::UgGridHelpers::cartDims(grid),
-                                      Opm::UgGridHelpers::beginCellCentroids(grid),
-                                      Opm::UgGridHelpers::dimensions(grid), param);
+                                      param);
 
     BlackoilPropsAdFromDeck new_props( deck, eclipseState, materialLawManager, grid );
 

From 23c28201a545257974e43d2137e14bfffc0b3e46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= <atgeirr@sintef.no>
Date: Mon, 14 Sep 2015 15:05:32 +0200
Subject: [PATCH 2/2] Update for changes in SaturationPropsFromDeck.

---
 examples/flow.cpp                        | 1 +
 examples/flow_solvent.cpp                | 1 +
 opm/autodiff/BlackoilPropsAdFromDeck.cpp | 5 ++++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/examples/flow.cpp b/examples/flow.cpp
index f53a53d01..896659d33 100644
--- a/examples/flow.cpp
+++ b/examples/flow.cpp
@@ -64,6 +64,7 @@
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 #include <opm/core/utility/thresholdPressures.hpp> // Note: the GridHelpers must be included before this (to make overloads available). \TODO: Fix.
 
+#include <opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp>
 #include <opm/core/props/BlackoilPropertiesBasic.hpp>
 #include <opm/core/props/BlackoilPropertiesFromDeck.hpp>
 #include <opm/core/props/rock/RockCompressibility.hpp>
diff --git a/examples/flow_solvent.cpp b/examples/flow_solvent.cpp
index 7f600a2b9..a36f90b89 100644
--- a/examples/flow_solvent.cpp
+++ b/examples/flow_solvent.cpp
@@ -64,6 +64,7 @@
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 #include <opm/core/utility/thresholdPressures.hpp> // Note: the GridHelpers must be included before this (to make overloads available). \TODO: Fix.
 
+#include <opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp>
 #include <opm/core/props/BlackoilPropertiesBasic.hpp>
 #include <opm/core/props/BlackoilPropertiesFromDeck.hpp>
 #include <opm/core/props/rock/RockCompressibility.hpp>
diff --git a/opm/autodiff/BlackoilPropsAdFromDeck.cpp b/opm/autodiff/BlackoilPropsAdFromDeck.cpp
index 625af7db7..61b211213 100644
--- a/opm/autodiff/BlackoilPropsAdFromDeck.cpp
+++ b/opm/autodiff/BlackoilPropsAdFromDeck.cpp
@@ -22,6 +22,9 @@
 #include <config.h>
 
 #include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
+
+#include <opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp>
+
 #include <opm/autodiff/AutoDiffHelpers.hpp>
 #include <opm/core/props/BlackoilPropertiesInterface.hpp>
 #include <opm/core/props/BlackoilPhases.hpp>
@@ -288,7 +291,7 @@ BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck&
         SaturationPropsFromDeck* ptr
             = new SaturationPropsFromDeck();
         satprops_.reset(ptr);
-        ptr->init(deck, eclState, materialLawManager_, number_of_cells, global_cell, begin_cell_centroids, dimension);
+        ptr->init(deck, materialLawManager_);
 
         if (phase_usage_.num_phases != satprops_->numPhases()) {
             OPM_THROW(std::runtime_error, "BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck() - "