From 834d607d5788d90296a40d138923487543d69a21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= Date: Fri, 10 Jul 2015 12:57:30 +0200 Subject: [PATCH] Update to match changes in opm-autodiff. BlackoilModelBase now requires an EclipseState constructor argument. Also silenced two minor warnings. --- opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp | 1 + opm/polymer/fullyimplicit/BlackoilPolymerModel_impl.hpp | 7 ++++--- .../SimulatorFullyImplicitBlackoilPolymer_impl.hpp | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp b/opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp index da17671db..c1bb62430 100644 --- a/opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp +++ b/opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp @@ -80,6 +80,7 @@ namespace Opm { const PolymerPropsAd& polymer_props_ad, const Wells* wells, const NewtonIterationBlackoilInterface& linsolver, + EclipseStateConstPtr eclipse_state, const bool has_disgas, const bool has_vapoil, const bool has_polymer, diff --git a/opm/polymer/fullyimplicit/BlackoilPolymerModel_impl.hpp b/opm/polymer/fullyimplicit/BlackoilPolymerModel_impl.hpp index 6e208fa88..20397721c 100644 --- a/opm/polymer/fullyimplicit/BlackoilPolymerModel_impl.hpp +++ b/opm/polymer/fullyimplicit/BlackoilPolymerModel_impl.hpp @@ -82,6 +82,7 @@ namespace Opm { const PolymerPropsAd& polymer_props_ad, const Wells* wells, const NewtonIterationBlackoilInterface& linsolver, + EclipseStateConstPtr eclipse_state, const bool has_disgas, const bool has_vapoil, const bool has_polymer, @@ -91,7 +92,7 @@ namespace Opm { const std::vector& wells_perf_length, const std::vector& wells_bore_diameter, const bool terminal_output) - : Base(param, grid, fluid, geo, rock_comp_props, wells, linsolver, + : Base(param, grid, fluid, geo, rock_comp_props, wells, linsolver, eclipse_state, has_disgas, has_vapoil, terminal_output), polymer_props_ad_(polymer_props_ad), has_polymer_(has_polymer), @@ -806,7 +807,7 @@ namespace Opm { std::vector internal_face_areas; internal_face_areas.resize(internal_faces.size()); - for (size_t i = 0; i < internal_faces.size(); ++i) { + for (int i = 0; i < internal_faces.size(); ++i) { internal_face_areas[i] = grid_.face_areas[internal_faces[i]]; } @@ -835,7 +836,7 @@ namespace Opm { std::vector perm; perm.resize(transi.size()); - for (size_t i = 0; i < transi.size(); ++i) { + for (int i = 0; i < transi.size(); ++i) { perm[i] = transi[i] / internal_faces[i]; } diff --git a/opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer_impl.hpp b/opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer_impl.hpp index d3e01b984..cc44f1be6 100644 --- a/opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer_impl.hpp +++ b/opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer_impl.hpp @@ -76,6 +76,7 @@ namespace Opm polymer_props_, wells, BaseType::solver_, + BaseType::eclipse_state_, BaseType::has_disgas_, BaseType::has_vapoil_, has_polymer_,