Merge pull request #442 from atgeirr/make-volume-check-optional

Add more flexibility to compareECL.

examples/test_util/compareECL.cpp

@@ -114,11 +114,12 @@ int main(int argc, char** argv) {
     bool specificKeyword         = false;
     bool specificFileType        = false;
     bool throwOnError            = true;
+    bool volumecheck             = true;
     char* keyword                = nullptr;
     char* fileTypeCstr           = nullptr;
     int c                        = 0;
 
-    while ((c = getopt(argc, argv, "hiIk:lnpPt:")) != -1) {
+    while ((c = getopt(argc, argv, "hiIk:lnpPt:V")) != -1) {
         switch (c) {
             case 'h':
                 printHelp();
@@ -150,6 +151,9 @@ int main(int argc, char** argv) {
                 specificFileType = true;
                 fileTypeCstr = optarg;
                 break;
+            case 'V':
+                volumecheck = false;
+                break;
             case '?':
                 if (optopt == 'k') {
                     std::cerr << "Option k requires a keyword as argument, see manual (-h) for more information." << std::endl;
@@ -254,11 +258,11 @@ int main(int argc, char** argv) {
                 comparator.setOnlyLastOccurrence(true);
             }
             if (specificKeyword) {
-                comparator.gridCompare();
+                comparator.gridCompare(volumecheck);
                 comparator.resultsForKeyword(keyword);
             }
             else {
-                comparator.gridCompare();
+                comparator.gridCompare(volumecheck);
                 comparator.results();
             }
             if (comparator.getNoErrors() > 0)

opm/test_util/EclFilesComparator.hpp

@@ -175,8 +175,8 @@ class RegressionTest: public ECLFilesComparator {
         void setOnlyLastOccurrence(bool onlyLastOccurrenceArg) {this->onlyLastOccurrence = onlyLastOccurrenceArg;}
 
         //! \brief Compares grid properties of the two cases.
-        // gridCompare() checks if both the number of active and global cells in the two cases are the same. If they are, all cells are looped over to calculate the cell volume deviation for the two cases. If the both the relative and absolute deviation exceeds the tolerances, an exception is thrown.
-        void gridCompare() const;
+        // gridCompare() checks if both the number of active and global cells in the two cases are the same. If they are, and volumecheck is true, all cells are looped over to calculate the cell volume deviation for the two cases. If the both the relative and absolute deviation exceeds the tolerances, an exception is thrown.
+        void gridCompare(const bool volumecheck) const;
         //! \brief Calculates deviations for all keywords.
         // This function checks if the number of keywords of the two cases are equal, and if it is, resultsForKeyword() is called for every keyword. If not, an exception is thrown.
         void results();

src/opm/test_util/EclFilesComparator.cpp

@@ -405,7 +405,7 @@ void RegressionTest::deviationsForCell(double val1, double val2, const std::stri
 
 
 
-void RegressionTest::gridCompare() const {
+void RegressionTest::gridCompare(const bool volumecheck) const {
     double absTolerance = getAbsTolerance();
     double relTolerance = getRelTolerance();
     const unsigned int globalGridCount1 = ecl_grid_get_global_size(ecl_grid1);
@@ -416,15 +416,32 @@ void RegressionTest::gridCompare() const {
         OPM_THROW(std::runtime_error, "In grid file:"
                 << "\nCells in first file: "  << globalGridCount1
                 << "\nCells in second file: " << globalGridCount2
-                << "\nThe number of cells differ.");
+                << "\nThe number of global cells differ.");
     }
     if (activeGridCount1 != activeGridCount2) {
         OPM_THROW(std::runtime_error, "In grid file:"
                 << "\nCells in first file: "  << activeGridCount1
                 << "\nCells in second file: " << activeGridCount2
-                << "\nThe number of cells differ.");
+                << "\nThe number of active cells differ.");
     }
+
+    if (!volumecheck) {
+        return;
+    }
+
     for (unsigned int cell = 0; cell < globalGridCount1; ++cell) {
+        const bool active1 = ecl_grid_cell_active1(ecl_grid1, cell);
+        const bool active2 = ecl_grid_cell_active1(ecl_grid2, cell);
+        if (active1 != active2) {
+            int i, j, k;
+            ecl_grid_get_ijk1(ecl_grid1, cell, &i, &j, &k);
+            // Coordinates from this function are zero-based, hence incrementing
+            i++, j++, k++;
+            HANDLE_ERROR(std::runtime_error, "Grid cell with one-based indices ( "
+                         << i << ", " << j << ", " << k << " ) is "
+                         << (active1 ? "active" : "inactive") << " in first grid, but "
+                         << (active2 ? "active" : "inactive") << " in second grid.");
+        }
         const double cellVolume1 = ecl_grid_get_cell_volume1(ecl_grid1, cell);
         const double cellVolume2 = ecl_grid_get_cell_volume1(ecl_grid2, cell);
         Deviation dev = calculateDeviations(cellVolume1, cellVolume2);
@@ -434,11 +451,13 @@ void RegressionTest::gridCompare() const {
             // Coordinates from this function are zero-based, hence incrementing
             i++, j++, k++;
             HANDLE_ERROR(std::runtime_error, "In grid file: Deviations of cell volume exceed tolerances. "
-                    << "\nFor cell with coordinate (" << i << ", " << j << ", " << k << "):"
+                    << "\nFor cell with one-based indices (" << i << ", " << j << ", " << k << "):"
                     << "\nCell volume in first file: "  << cellVolume1
                     << "\nCell volume in second file: " << cellVolume2
                     << "\nThe absolute deviation is " << dev.abs << ", and the tolerance limit is " << absTolerance << "."
-                    << "\nThe relative deviation is " << dev.rel << ", and the tolerance limit is " << relTolerance << ".");
+                    << "\nThe relative deviation is " << dev.rel << ", and the tolerance limit is " << relTolerance << "."
+                    << "\nCell 1 active: " << active1
+                    << "\nCell 2 active: " << active2);
         }
     }
 }