From 39a0766b8cc0a1067dbd539ccd6c51c8f00544b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= <atgeirr@sintef.no>
Date: Thu, 1 Oct 2015 11:05:35 +0200
Subject: [PATCH] Refactor MPI version of convergenceReduction().

---
 opm/autodiff/BlackoilModelBase_impl.hpp | 38 +++++++++++--------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/opm/autodiff/BlackoilModelBase_impl.hpp b/opm/autodiff/BlackoilModelBase_impl.hpp
index c19986603..9bf85ee78 100644
--- a/opm/autodiff/BlackoilModelBase_impl.hpp
+++ b/opm/autodiff/BlackoilModelBase_impl.hpp
@@ -2330,32 +2330,28 @@ namespace detail {
             auto nc_and_pv_containers  = std::make_tuple(v, geo_.poreVolume());
             info.computeReduction(nc_and_pv_containers, nc_and_pv_operators, nc_and_pv);
 
-            for ( int idx=0; idx<MaxNumPhases; ++idx )
+            for ( int idx = 0; idx < nm; ++idx )
             {
-                if (active_[idx]) {
-                    auto values     = std::tuple<double,double,double>(0.0 ,0.0 ,0.0);
-                    auto containers = std::make_tuple(B.col(idx),
-                                                      tempV.col(idx),
-                                                      R.col(idx));
-                    auto operators  = std::make_tuple(Opm::Reduction::makeGlobalSumFunctor<double>(),
-                                                      Opm::Reduction::makeGlobalMaxFunctor<double>(),
-                                                      Opm::Reduction::makeGlobalSumFunctor<double>());
-                    info.computeReduction(containers, operators, values);
-                    B_avg[idx]       = std::get<0>(values)/std::get<0>(nc_and_pv);
-                    maxCoeff[idx]    = std::get<1>(values);
-                    R_sum[idx]       = std::get<2>(values);
+                auto values     = std::tuple<double,double,double>(0.0 ,0.0 ,0.0);
+                auto containers = std::make_tuple(B.col(idx),
+                                                  tempV.col(idx),
+                                                  R.col(idx));
+                auto operators  = std::make_tuple(Opm::Reduction::makeGlobalSumFunctor<double>(),
+                                                  Opm::Reduction::makeGlobalMaxFunctor<double>(),
+                                                  Opm::Reduction::makeGlobalSumFunctor<double>());
+                info.computeReduction(containers, operators, values);
+                B_avg[idx]       = std::get<0>(values)/std::get<0>(nc_and_pv);
+                maxCoeff[idx]    = std::get<1>(values);
+                R_sum[idx]       = std::get<2>(values);
+                assert(nm >= np);
+                if (idx < np) {
                     maxNormWell[idx] = 0.0;
-                    for ( int w=0; w<nw; ++w )
-                    {
+                    for ( int w = 0; w < nw; ++w ) {
                         maxNormWell[idx]  = std::max(maxNormWell[idx], std::abs(residual_.well_flux_eq.value()[nw*idx + w]));
                     }
                 }
-                else
-                {
-                    maxNormWell[idx] = R_sum[idx] = B_avg[idx] = maxCoeff[idx] = 0.0;
-                }
             }
-            info.communicator().max(&maxNormWell[0], MaxNumPhases);
+            info.communicator().max(maxNormWell.data(), np);
             // Compute pore volume
             return std::get<1>(nc_and_pv);
         }
@@ -2405,8 +2401,6 @@ namespace detail {
 
         const V pv = geo_.poreVolume();
 
-        const std::vector<PhasePresence> cond = phaseCondition();
-
         std::vector<double> R_sum(nm);
         std::vector<double> B_avg(nm);
         std::vector<double> maxCoeff(nm);