From e3a5e1682dd5fd8bbc88534143f3496c63b43a36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= <atgeirr@sintef.no>
Date: Fri, 2 Oct 2015 14:00:54 +0200
Subject: [PATCH] Adapt to refactored/renamed NonlinearSolver (was
 NewtonSolver).

---
 .../fullyimplicit/FullyImplicitCompressiblePolymerSolver.cpp | 5 ++---
 .../fullyimplicit/FullyImplicitCompressiblePolymerSolver.hpp | 2 +-
 .../fullyimplicit/SimulatorFullyImplicitBlackoilPolymer.hpp  | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/opm/polymer/fullyimplicit/FullyImplicitCompressiblePolymerSolver.cpp b/opm/polymer/fullyimplicit/FullyImplicitCompressiblePolymerSolver.cpp
index 3a149719c..84d4fdf0f 100644
--- a/opm/polymer/fullyimplicit/FullyImplicitCompressiblePolymerSolver.cpp
+++ b/opm/polymer/fullyimplicit/FullyImplicitCompressiblePolymerSolver.cpp
@@ -189,8 +189,7 @@ namespace {
         , residual_ ( { std::vector<ADB>(fluid.numPhases() + 1, ADB::null()),
                         ADB::null(),
                         ADB::null(),
-                        { 1.1169, 1.0031, 0.0031 } // Reasonable default scaling
-                       } )
+                        { 1.1169, 1.0031, 0.0031, 1.0 }} ) // default scaling
     {
     }
 
@@ -258,7 +257,7 @@ namespace {
         return it;
     }
 
-    int FullyImplicitCompressiblePolymerSolver::newtonIterations() const
+    int FullyImplicitCompressiblePolymerSolver::nonlinearIterations() const
     {
         return newtonIterations_;
     }
diff --git a/opm/polymer/fullyimplicit/FullyImplicitCompressiblePolymerSolver.hpp b/opm/polymer/fullyimplicit/FullyImplicitCompressiblePolymerSolver.hpp
index 2fb6ddfa5..d20930372 100644
--- a/opm/polymer/fullyimplicit/FullyImplicitCompressiblePolymerSolver.hpp
+++ b/opm/polymer/fullyimplicit/FullyImplicitCompressiblePolymerSolver.hpp
@@ -86,7 +86,7 @@ namespace Opm {
              PolymerBlackoilState& 		state ,
              WellStateFullyImplicitBlackoilPolymer& wstate);
 
-        int newtonIterations() const;
+        int nonlinearIterations() const;
         int linearIterations() const;
 
         /// Not used by this class except to satisfy interface requirements.
diff --git a/opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer.hpp b/opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer.hpp
index 3f10a92a2..19f60ae40 100644
--- a/opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer.hpp
+++ b/opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer.hpp
@@ -34,7 +34,7 @@
 #include <opm/autodiff/GeoProps.hpp>
 #include <opm/autodiff/BlackoilPropsAdInterface.hpp>
 #include <opm/autodiff/RateConverter.hpp>
-#include <opm/autodiff/NewtonSolver.hpp>
+#include <opm/autodiff/NonlinearSolver.hpp>
 
 #include <opm/core/grid.h>
 #include <opm/core/wells.h>
@@ -89,7 +89,7 @@ namespace Opm
         typedef BlackoilOutputWriter OutputWriter;
         typedef GridT Grid;
         typedef BlackoilPolymerModel<Grid> Model;
-        typedef NewtonSolver<Model> Solver;
+        typedef NonlinearSolver<Model> Solver;
     };
 
     /// Class collecting all necessary components for a blackoil simulation with polymer