Address issues from review.

opm/parser/eclipse/EclipseState/InitConfig/FoamConfig.hpp

@@ -39,15 +39,14 @@ public:
     double exponent() const;
     double minimumSurfactantConcentration() const;
 
-    enum class FoamAllowDesorption { Yes = 1, No = 2 };
-    FoamAllowDesorption allowDesorption() const;
+    bool allowDesorption() const;
     double rockDensity() const;
 
 private:
     double reference_surfactant_concentration_;
     double exponent_;
     double minimum_surfactant_concentration_;
-    FoamAllowDesorption allow_desorption_;
+    bool allow_desorption_;
     double rock_density_;
 };
 

src/opm/parser/eclipse/EclipseState/InitConfig/FoamConfig.cpp

@@ -33,14 +33,15 @@ FoamData::FoamData(const DeckRecord& FOAMFSC_record, const DeckRecord& FOAMROCK_
     : reference_surfactant_concentration_(FOAMFSC_record.getItem(0).getSIDouble(0))
     , exponent_(FOAMFSC_record.getItem(1).getSIDouble(0))
     , minimum_surfactant_concentration_(FOAMFSC_record.getItem(2).getSIDouble(0))
-    , allow_desorption_(static_cast<FoamAllowDesorption>(FOAMROCK_record.getItem(0).get<int>(0)))
+    , allow_desorption_(true) // will be overwritten below
     , rock_density_(FOAMROCK_record.getItem(1).getSIDouble(0))
 {
-    // Check validity of adsorption index.
+    // Check validity of adsorption index and set allow_desorption_ member.
     const int ads_ind = FOAMROCK_record.getItem(0).get<int>(0);
     if (ads_ind < 1 || ads_ind > 2) {
         throw std::runtime_error("Illegal adsorption index in FOAMROCK, must be 1 or 2.");
     }
+    allow_desorption_ = (ads_ind == 1);
 }
 
 double
@@ -61,7 +62,7 @@ FoamData::minimumSurfactantConcentration() const
     return this->minimum_surfactant_concentration_;
 }
 
-FoamData::FoamAllowDesorption
+bool
 FoamData::allowDesorption() const
 {
     return this->allow_desorption_;
@@ -87,9 +88,8 @@ FoamConfig::FoamConfig(const Deck& deck)
             throw std::runtime_error("FOAMFSC and FOAMROCK keywords have different number of records.");
         }
         const int num_records = kw_foamfsc.size();
-        this->data_.reserve(num_records);
-        for (int record = 0; record < num_records; ++record) {
-            this->data_.emplace_back(kw_foamfsc.getRecord(record), kw_foamrock.getRecord(record));
+        for (int record_index = 0; record_index < num_records; ++record_index) {
+            this->data_.emplace_back(kw_foamfsc.getRecord(record_index), kw_foamrock.getRecord(record_index));
         }
     }
 }

tests/parser/FoamTests.cpp

@@ -95,6 +95,70 @@ SATNUM
     return parser.parseString( deckData );
 }
 
+static Deck createFailingDeck() {
+    // Using a raw string literal with xxx as delimiter.
+    const char *deckData = R"xxx(
+RUNSPEC
+
+DIMENS
+ 10 10 10 /
+TABDIMS
+3 /
+GRID
+DX
+1000*0.25 /
+DY
+1000*0.25 /
+DZ
+1000*0.25 /
+TOPS
+100*0.25 /
+FAULTS
+  'F1'  1  1  1  4   1  4  'X' /
+  'F2'  5  5  1  4   1  4  'X-' /
+/
+MULTFLT
+  'F1' 0.50 /
+  'F2' 0.50 /
+/
+EDIT
+MULTFLT /
+  'F2' 0.25 /
+/
+WATER
+
+OIL
+
+GAS
+
+FOAM
+
+TITLE
+The title
+
+START
+8 MAR 1998 /
+
+PROPS
+FOAMFSC
+1 2 0.3 /
+4 5 /
+6 /
+
+-- This will fail, as FOAMROCK is missing
+
+REGIONS
+SWAT
+1000*1 /
+SATNUM
+1000*2 /
+)xxx"; // End of raw string literal with xxx as delimiter.
+    Parser parser;
+    return parser.parseString( deckData );
+}
+
+
+
 
 BOOST_AUTO_TEST_CASE(FoamConfigTest) {
     auto deck = createDeck();
@@ -104,19 +168,24 @@ BOOST_AUTO_TEST_CASE(FoamConfigTest) {
     BOOST_CHECK_EQUAL(fc.getRecord(0).referenceSurfactantConcentration(), 1.0);
     BOOST_CHECK_EQUAL(fc.getRecord(0).exponent(), 2.0);
     BOOST_CHECK_EQUAL(fc.getRecord(0).minimumSurfactantConcentration(), 0.3);
-    BOOST_CHECK(fc.getRecord(0).allowDesorption() == FoamData::FoamAllowDesorption::Yes);
+    BOOST_CHECK(fc.getRecord(0).allowDesorption());
     BOOST_CHECK_EQUAL(fc.getRecord(0).rockDensity(), 2000.0);
 
     BOOST_CHECK_EQUAL(fc.getRecord(1).referenceSurfactantConcentration(), 4.0);
     BOOST_CHECK_EQUAL(fc.getRecord(1).exponent(), 5.0);
     BOOST_CHECK_EQUAL(fc.getRecord(1).minimumSurfactantConcentration(), 1e-20); // Defaulted.
-    BOOST_CHECK(fc.getRecord(1).allowDesorption() == FoamData::FoamAllowDesorption::No);
+    BOOST_CHECK(!fc.getRecord(1).allowDesorption());
     BOOST_CHECK_EQUAL(fc.getRecord(1).rockDensity(), 1800.0);
 
     BOOST_CHECK_EQUAL(fc.getRecord(2).referenceSurfactantConcentration(), 6.0);
     BOOST_CHECK_EQUAL(fc.getRecord(2).exponent(), 1.0); // Defaulted.
     BOOST_CHECK_EQUAL(fc.getRecord(2).minimumSurfactantConcentration(), 1e-20); // Defaulted.
-    BOOST_CHECK(fc.getRecord(2).allowDesorption() == FoamData::FoamAllowDesorption::No);
+    BOOST_CHECK(!fc.getRecord(2).allowDesorption());
     BOOST_CHECK_EQUAL(fc.getRecord(2).rockDensity(), 2400.0);
 }
 
+BOOST_AUTO_TEST_CASE(FoamConfigFailureTest) {
+    auto deck = createFailingDeck();
+    BOOST_CHECK_THROW(EclipseState state(deck), std::runtime_error);
+}
+