Throw invalid ref-factor or non-default trans_mult

Author: aritorto

opm/input/eclipse/EclipseState/Grid/AutoRefinement.cpp

@@ -16,6 +16,8 @@
 #include <opm/input/eclipse/EclipseState/Grid/AutoRefinement.hpp>
 
 
+#include <stdexcept>
+
 namespace Opm {
 
 
@@ -25,12 +27,20 @@ AutoRefinement::AutoRefinement()
 AutoRefinement::AutoRefinement(int nx,
                                int ny,
                                int nz,
-                               double  option_trans_mult)
-    : nx_{nx},
-      ny_{ny},
-      nz_{nz},
-      option_trans_mult_{option_trans_mult}
-{}
+                               double option_trans_mult)
+{
+    bool invalid = invalidRefinementFactor(nx) || invalidRefinementFactor(ny) || invalidRefinementFactor(nz);
+    bool notYet = (option_trans_mult>0);
+    if (invalid) {
+        throw std::invalid_argument("Refinement factors must be odd and positive.");
+    }
+    else if (notYet) {
+        throw std::invalid_argument("Only OPTION_TRANS_MULT 0 is supported for now.");
+    }
+    nx_ = nx;
+    ny_ = ny;
+    nz_ = nz;
+}
 
 int AutoRefinement::NX() const
 {

opm/input/eclipse/EclipseState/Grid/AutoRefinement.hpp

@@ -38,6 +38,12 @@ class AutoRefinement {
     int nz_;
     double option_trans_mult_{0.};
 
+    bool invalidRefinementFactor(int n)
+    {
+        return (n<=0) || (n%2 == 0);
+    }
+    
+
 };
 }
 

tests/parser/AutorefTests.cpp

@@ -32,8 +32,7 @@ using namespace Opm;
 
 
 BOOST_AUTO_TEST_CASE(ReadAutoref) {
-
-
+    
     const std::string deck_string = R"(
 RUNSPEC
 
@@ -54,32 +53,8 @@ DZ
 TOPS
 100*1 /
 
-PORO
-1000*0.15 /
-
-PERMX
-1000*1 /
-
-COPY
-  PERMX PERMZ /
-  PERMX PERMY /
-/
-
-EDIT
-
-OIL
-GAS
-
-TITLE
-The title
-
-START
-16 JUN 1988 /
-
 PROPS
 
-REGIONS
-
 SOLUTION
 
 SCHEDULE
@@ -101,3 +76,83 @@ SCHEDULE
     BOOST_CHECK_EQUAL( autoRef.NZ(), 1);
     BOOST_CHECK_EQUAL( autoRef.OPTION_TRANS_MULT(), 0.);
 }
+
+BOOST_AUTO_TEST_CASE(ThrowEvenRefinementFactor) {
+
+    const std::string deck_string = R"(
+RUNSPEC
+
+DIMENS
+1 1 1 /
+
+AUTOREF
+3 2 1 0. /
+
+GRID
+
+DX
+1*1 /
+DY
+1*1 /
+DZ
+1*1 /
+TOPS
+1*0 /
+
+PROPS
+
+SOLUTION
+
+SCHEDULE
+)";
+    
+    Opm::Parser parser;
+    Opm::Deck deck = parser.parseString(deck_string);
+    Opm::EclipseState state(deck);
+
+    const auto& autoref_keyword = deck["AUTOREF"][0];
+
+    Opm::AutoRefManager autoRefManager{};
+
+    BOOST_CHECK_THROW(Opm::readKeywordAutoRef(autoref_keyword.getRecord(0), autoRefManager), std::invalid_argument);
+}
+
+BOOST_AUTO_TEST_CASE(ThrowNonDefaultOptionTransMult) {
+
+    const std::string deck_string = R"(
+RUNSPEC
+
+DIMENS
+1 1 1 /
+
+AUTOREF
+3 5 7 1 /
+
+GRID
+
+DX
+1*1 /
+DY
+1*1 /
+DZ
+1*1 /
+TOPS
+1*0 /
+
+PROPS
+
+SOLUTION
+
+SCHEDULE
+)";
+    
+    Opm::Parser parser;
+    Opm::Deck deck = parser.parseString(deck_string);
+    Opm::EclipseState state(deck);
+
+    const auto& autoref_keyword = deck["AUTOREF"][0];
+
+    Opm::AutoRefManager autoRefManager{};
+
+    BOOST_CHECK_THROW(Opm::readKeywordAutoRef(autoref_keyword.getRecord(0), autoRefManager), std::invalid_argument);
+}