RateConvert: introduce compile unit

move global rate reductions into it

CMakeLists_files.cmake

@@ -105,6 +105,7 @@ list (APPEND MAIN_SOURCE_FILES
   opm/simulators/wells/MultisegmentWellSegments.cpp
   opm/simulators/wells/ParallelWellInfo.cpp
   opm/simulators/wells/PerfData.cpp
+  opm/simulators/wells/RateConverter.cpp
   opm/simulators/wells/SegmentState.cpp
   opm/simulators/wells/SingleWellState.cpp
   opm/simulators/wells/StandardWellAssemble.cpp

opm/simulators/wells/RateConverter.cpp

@@ -0,0 +1,65 @@
+/*
+  Copyright 2014, 2015 SINTEF ICT, Applied Mathematics.
+  Copyright 2014, 2015 Statoil ASA.
+  Copyright 2017, IRIS
+
+  This file is part of the Open Porous Media Project (OPM).
+
+  OPM is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  OPM is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include <config.h>
+#include <opm/simulators/wells/RateConverter.hpp>
+
+#include <opm/material/fluidsystems/BlackOilDefaultIndexTraits.hpp>
+#include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>
+
+namespace Opm {
+namespace RateConverter {
+
+template <class FluidSystem, class Region>
+void SurfaceToReservoirVoidage<FluidSystem,Region>::
+sumRates(std::unordered_map<RegionId,Attributes>& attributes_hpv,
+         std::unordered_map<RegionId,Attributes>& attributes_pv,
+         Parallel::Communication comm)
+{
+    for (const auto& reg : rmap_.activeRegions()) {
+        // Calculating first using the hydrocarbon pore volumes
+        auto& ra = attr_.attributes(reg);
+        const auto& attri_hpv = attributes_hpv[reg];
+        ra.data = attri_hpv.data;
+        comm.sum(ra.data.data(), ra.data.size());
+        // TODO: should we have some epsilon here instead of zero?
+        // No hydrocarbon pore volume, redo but this time using full pore volumes.
+        if (ra.pv <= 0.) {
+            // using the pore volume to do the averaging
+            const auto& attri_pv = attributes_pv[reg];
+            ra.data = attri_pv.data;
+            comm.sum(ra.data.data(), ra.data.size());
+            assert(ra.pv > 0.);
+        }
+        const double pv_sum = ra.pv;
+        for (double& d : ra.data)
+            d /= pv_sum;
+        ra.pv = pv_sum;
+    }
+}
+
+using FS = BlackOilFluidSystem<double,BlackOilDefaultIndexTraits>;
+template void SurfaceToReservoirVoidage<FS,std::vector<int>>::
+    sumRates(std::unordered_map<int,Attributes>&,
+             std::unordered_map<int,Attributes>&,
+             Parallel::Communication);
+
+} // namespace RateConverter
+} // namespace Opm

opm/simulators/wells/RateConverter.hpp

@@ -27,6 +27,8 @@
 #include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
 #include <opm/simulators/wells/RegionAttributeHelpers.hpp>
 
+#include <opm/simulators/utils/ParallelCommunication.hpp>
+
 #include <dune/grid/common/gridenums.hh>
 #include <dune/grid/common/rangegenerators.hh>
 
@@ -204,26 +206,9 @@ namespace Opm {
 
                 OPM_END_PARALLEL_TRY_CATCH("SurfaceToReservoirVoidage::defineState() failed: ", simulator.vanguard().grid().comm());
 
-                for (const auto& reg : rmap_.activeRegions()) {
+                this->sumRates(attributes_hpv,
-                      // Calculating first using the hydrocarbon pore volumes
+                               attributes_pv,
-                      auto& ra = attr_.attributes(reg);
+                               comm);
-                      const auto& attri_hpv = attributes_hpv[reg];
-                      ra.data = attri_hpv.data;
-                      comm.sum(ra.data.data(), ra.data.size());
-                      // TODO: should we have some epsilon here instead of zero?
-                      // No hydrocarbon pore volume, redo but this time using full pore volumes.
-                      if (ra.pv <= 0.) {
-                          // using the pore volume to do the averaging
-                          const auto& attri_pv = attributes_pv[reg];
-                          ra.data = attri_pv.data;
-                          comm.sum(ra.data.data(), ra.data.size());
-                          assert(ra.pv > 0.);
-                      }
-                      const double pv_sum = ra.pv;
-                      for (double& d : ra.data)
-                          d /= pv_sum;
-                      ra.pv = pv_sum;
-                }
             }
 
             /**
@@ -625,6 +610,10 @@ namespace Opm {
                 double& saltConcentration;
             };
 
+            void sumRates(std::unordered_map<RegionId,Attributes>& attributes_hpv,
+                          std::unordered_map<RegionId,Attributes>& attributes_pv,
+                          Parallel::Communication comm);
+
             RegionAttributeHelpers::RegionAttributes<RegionId, Attributes> attr_;
 
             template <typename Rates>