Merge pull request #1518 from joakim-hove/remove-wtype-unknown

Remove opm specific well type WTUnk

opm/output/eclipse/VectorItems/well.hpp

@@ -63,7 +63,6 @@ namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems
 
         namespace Value {
             enum WellType : int {
-                WTUnk    = 0,  // Unknown well type (OPM only)
                 Producer = 1,  // Well is producer
                 OilInj   = 2,  // Well is oil injector
                 WatInj   = 3,  // Well is water injector

src/opm/output/eclipse/AggregateWellData.cpp

@@ -152,7 +152,11 @@ namespace {
             case IType::OIL:   return WTypeVal::OilInj;
             case IType::WATER: return WTypeVal::WatInj;
             case IType::GAS:   return WTypeVal::GasInj;
-            default:           return WTypeVal::WTUnk;
+            case IType::MULTI:
+                throw std::invalid_argument("Do not know how to serialize injectortype MULTI - fatal error for well " + well.name());
+                break;
+            default:
+                throw std::invalid_argument("SHould not be here - unhandled enum value in wellType");
             }
         }