From c4b81d8da5ed4b8c5e5028d8b78397262e256d79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= Date: Wed, 13 Jun 2012 12:46:57 +0200 Subject: [PATCH] Removed two unnecessary arguments from TransportModelPolymer constructor. --- examples/polymer_reorder.cpp | 2 +- opm/polymer/TransportModelPolymer.cpp | 6 ++---- opm/polymer/TransportModelPolymer.hpp | 2 -- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/examples/polymer_reorder.cpp b/examples/polymer_reorder.cpp index 23c927fef..03793ccf9 100644 --- a/examples/polymer_reorder.cpp +++ b/examples/polymer_reorder.cpp @@ -557,7 +557,7 @@ main(int argc, char** argv) THROW("Unknown method: " << method_string); } - Opm::TransportModelPolymer reorder_model(*grid->c_grid(), props->porosity(), &porevol[0], *props, polyprop, + Opm::TransportModelPolymer reorder_model(*grid->c_grid(), *props, polyprop, method, nl_tolerance, nl_maxiter); if (use_gauss_seidel_gravity) { diff --git a/opm/polymer/TransportModelPolymer.cpp b/opm/polymer/TransportModelPolymer.cpp index ced8a1ee2..37da58de8 100644 --- a/opm/polymer/TransportModelPolymer.cpp +++ b/opm/polymer/TransportModelPolymer.cpp @@ -172,16 +172,14 @@ namespace namespace Opm { TransportModelPolymer::TransportModelPolymer(const UnstructuredGrid& grid, - const double* porosity, - const double* porevolume, const IncompPropertiesInterface& props, const PolymerProperties& polyprops, const SingleCellMethod method, const double tol, const int maxit) : grid_(grid), - porosity_(porosity), - porevolume_(porevolume), + porosity_(props.porosity()), + porevolume_(NULL), props_(props), polyprops_(polyprops), tol_(tol), diff --git a/opm/polymer/TransportModelPolymer.hpp b/opm/polymer/TransportModelPolymer.hpp index 4386c4413..0f1017787 100644 --- a/opm/polymer/TransportModelPolymer.hpp +++ b/opm/polymer/TransportModelPolymer.hpp @@ -44,8 +44,6 @@ namespace Opm /// \TODO document me, especially method. TransportModelPolymer(const UnstructuredGrid& grid, - const double* porosity, - const double* porevolume, const IncompPropertiesInterface& props, const PolymerProperties& polyprops, const SingleCellMethod method,