Merge pull request #158 from atgeirr/fix-compile-failures

Fix compile failures from recent updates in core and autodiff

opm/polymer/fullyimplicit/FullyImplicitCompressiblePolymerSolver.cpp

@@ -188,7 +188,9 @@ namespace {
         , rq_    (fluid.numPhases() + 1)
         , residual_ ( { std::vector<ADB>(fluid.numPhases() + 1, ADB::null()),
                         ADB::null(),
-                        ADB::null() } )
+                        ADB::null(),
+                        { 1.1169, 1.0031, 0.0031 } // Reasonable default scaling
+                       } )
     {
     }
 
@@ -949,9 +951,9 @@ namespace {
                                                          const std::vector<PhasePresence>& cond,
                                               		     const std::vector<int>&           cells) const
     {
-        const double* rhos = fluid_.surfaceDensity();
-        ADB b = fluidReciprocFVF(phase, p, T, cond, cells);
-        ADB rho = V::Constant(p.size(), 1, rhos[phase]) * b;
+        const V rhos = fluid_.surfaceDensity(phase, cells);
+        const ADB b = fluidReciprocFVF(phase, p, T, cond, cells);
+        const ADB rho = rhos * b;
         return rho;
     }
 
@@ -1037,4 +1039,69 @@ namespace {
         }
     }
 
+
+
+
+
+    const FullyImplicitCompressiblePolymerSolver&
+    FullyImplicitCompressiblePolymerSolver::model() const
+    {
+        return *this;
+    }
+
+
+
+
+
+    namespace detail {
+        template <class RAIter>
+        double euclidianNormSquared(RAIter it, const RAIter end)
+        {
+            double product = 0.0 ;
+            for( ; it != end; ++it ) {
+                product += ( *it * *it );
+            }
+            return product;
+        }
+    } // namespace detail
+
+
+
+
+
+    double
+    FullyImplicitCompressiblePolymerSolver::
+    relativeChange(const PolymerBlackoilState& previous,
+                   const PolymerBlackoilState& current ) const
+    {
+        std::vector< double > p0  ( previous.pressure() );
+        std::vector< double > sat0( previous.saturation() );
+
+        const std::size_t pSize = p0.size();
+        const std::size_t satSize = sat0.size();
+
+        // compute u^n - u^n+1
+        for( std::size_t i=0; i<pSize; ++i ) {
+            p0[ i ] -= current.pressure()[ i ];
+        }
+
+        for( std::size_t i=0; i<satSize; ++i ) {
+            sat0[ i ] -= current.saturation()[ i ];
+        }
+
+        // compute || u^n - u^n+1 ||
+        const double normDiff  = detail::euclidianNormSquared( p0.begin(),   p0.end())
+                               + detail::euclidianNormSquared( sat0.begin(), sat0.end());
+
+        // compute || u^n+1 ||
+        const double normNewState  = detail::euclidianNormSquared( current.pressure().begin(),   current.pressure().end())
+                                   + detail::euclidianNormSquared( current.saturation().begin(), current.saturation().end());
+
+        if ( normNewState > 0.0 ) {
+            return normDiff / normNewState;
+        } else {
+            return 0.0;
+        }
+    }
+
 } //namespace Opm

opm/polymer/fullyimplicit/FullyImplicitCompressiblePolymerSolver.hpp

@@ -92,6 +92,13 @@ namespace Opm {
         /// Not used by this class except to satisfy interface requirements.
         typedef parameter::ParameterGroup SolverParameters;
 
+        /// There is no separate model class for this solver, return itself.
+        const FullyImplicitCompressiblePolymerSolver& model() const;
+
+        /// Evaluate the relative changes in the physical variables.
+        double relativeChange(const PolymerBlackoilState& previous,
+                              const PolymerBlackoilState& current ) const;
+
     private:
         typedef AutoDiffBlock<double> ADB;
         typedef ADB::V V;