Merge pull request #246 from totto82/gasoil

Allow for 2p gasoil case
OPM · Sep 5, 2017 · fa3dfce · fa3dfce
2 parents aabf238 + 55d78b6
commit fa3dfce
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp b/opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp
@@ -680,11 +680,16 @@ class EclMaterialLawManager
         if (!hasGas) {
             // oil-water case
             family1 = !swofTables.empty();
-            family2 = !swfnTables.empty() && !sof3Tables.empty();
+            if (!family1)
+                throw std::runtime_error("only SWOF is supporeted for oil-water two-phase simulations");
+            //family2 = !swfnTables.empty() && !sof2Tables.empty();
         }
         else if (!hasWater) {
             // oil-gas case
-            throw std::runtime_error("oil-gas two-phase simulations are currently not supported");
+            family1 = !sgofTables.empty();
+            if (!family1)
+                throw std::runtime_error("only SGOF is supporeted for oil-gas two-phase simulations");
+            //family2 = !sgfnTables.empty() && !sof2Tables.empty();
         }
         else if (!hasOil) {
             // water-gas case