changed: make conversion factor a private member in helper class

and remove it from applications

benchmarks/upscale_relperm_benchmark.cpp

@@ -246,12 +246,6 @@ try
         {"doEclipseCheck",            "true"}, // Check if minimum relpermvalues in input are zero (specify critical saturations)
         {"critRelpermThresh",         "1e-6"}};// Threshold for setting minimum relperm to 0 (thus specify critical saturations)
 
-    // Conversion factor, multiply mD numbers with this to get m² numbers
-    const double milliDarcyToSqMetre =
-        Opm::unit::convert::to(1.0*Opm::prefix::milli*Opm::unit::darcy,
-                               Opm::unit::square(Opm::unit::meter));
-    // Reference: http://www.spe.org/spe-site/spe/spe/papers/authors/Metric_Standard.pdf
-
     RelPermUpscaleHelper helper(mpi_rank, options);
     helper.setupBoundaryConditions(options);
 

examples/upscale_relperm.cpp

@@ -314,12 +314,6 @@ try
         {"doEclipseCheck",             "true"}, // Check if minimum relpermvalues in input are zero (specify critical saturations)
         {"critRelpermThresh",          "1e-6"}};// Threshold for setting minimum relperm to 0 (thus specify critical saturations)
 
-   // Conversion factor, multiply mD numbers with this to get m² numbers
-   const double milliDarcyToSqMetre =
-       Opm::unit::convert::to(1.0*Opm::prefix::milli*Opm::unit::darcy,
-                              Opm::unit::square(Opm::unit::meter));
-   // Reference: http://www.spe.org/spe-site/spe/spe/papers/authors/Metric_Standard.pdf
-
    /* Check first if there is anything on the command line to look for */
    if (varnum == 1) {
       if (mpi_rank == 0)

opm/upscaling/RelPermUtils.cpp

@@ -68,7 +68,9 @@ RelPermUpscaleHelper::RelPermUpscaleHelper(int mpi_rank,
     anisotropic_input(false),
     permTensor(3,3,nullptr),
     permTensorInv(3,3,nullptr),
-    tesselatedCells(0)
+    tesselatedCells(0),
+    milliDarcyToSqMetre(Opm::unit::convert::to(1.0*Opm::prefix::milli*Opm::unit::darcy,
+                                               Opm::unit::square(Opm::unit::meter)))
 {
     if (options["fluids"] == "ow" || options["fluids"] == "wo")
         saturationstring = "Sw";
@@ -512,9 +514,7 @@ void RelPermUpscaleHelper::calculateMinMaxCapillaryPressure(double dPmin, double
     const double gravity         = atof(options["gravity"].c_str());
     double linsolver_tolerance   = atof(options["linsolver_tolerance"].c_str());
     const bool includeGravity    = (fabs(gravity) > DBL_MIN); // true for non-zero gravity
-    const double milliDarcyToSqMetre =
-                        Opm::unit::convert::to(1.0*Opm::prefix::milli*Opm::unit::darcy,
-                                               Opm::unit::square(Opm::unit::meter));
+
     if (maxPermContrast == 0)
         throw std::runtime_error("Illegal contrast value");
 
@@ -631,9 +631,6 @@ void RelPermUpscaleHelper::upscaleCapillaryPressure(std::map<std::string,std::st
     double Ptestvalue = Pcmax;
     std::stringstream errstr;
     const std::vector<int>& ecl_idx = upscaler.grid().globalCell();
-    const double milliDarcyToSqMetre =
-                        Opm::unit::convert::to(1.0*Opm::prefix::milli*Opm::unit::darcy,
-                                               Opm::unit::square(Opm::unit::meter));
 
     while (largestSaturationInterval > (Swor-Swir)/500.0) {
         if (Pcmax == Pcmin) {
@@ -720,9 +717,6 @@ std::tuple<double, double>
 {
     const double minPerm = atof(options["minPerm"].c_str());
     const double maxPermContrast = atof(options["maxPermContrast"].c_str());
-    const double milliDarcyToSqMetre =
-                        Opm::unit::convert::to(1.0*Opm::prefix::milli*Opm::unit::darcy,
-                                               Opm::unit::square(Opm::unit::meter));
 
      // Put correct number of zeros in, just to be able to access RelPerm[index] later
     WaterSaturation.resize(points);

opm/upscaling/RelPermUtils.hpp

@@ -167,6 +167,9 @@ namespace Opm {
       //!          If not func is set to a constant value of 0.
       //! \return True if test passed, false otherwise.
       bool checkCurve(MonotCubicInterpolator& func);
+
+      // Reference: http://www.spe.org/spe-site/spe/spe/papers/authors/Metric_Standard.pdf
+      const double milliDarcyToSqMetre; //!< Conversion factor, multiply mD numbers with this to get m² numbers.
   };
 }