Merge 3c5dbecf7f into 9a0ccfd853

opm/input/eclipse/Schedule/Schedule.hpp

@@ -617,6 +617,7 @@ namespace Opm
         void handleBCProp    (HandlerContext&);
         void handleBRANPROP  (HandlerContext&);
         void handleCOMPDAT   (HandlerContext&);
+        void handleCOMPDATL   (HandlerContext&);
         void handleCOMPLUMP  (HandlerContext&);
         void handleCOMPORD   (HandlerContext&);
         void handleCOMPSEGS  (HandlerContext&);
@@ -672,7 +673,7 @@ namespace Opm
         void handleWELOPEN   (HandlerContext&);
         void handleWELPI     (HandlerContext&);
         void handleWELSEGS   (HandlerContext&);
-        void handleWELSPECS  (HandlerContext&);
+        void handleWELSPEC   (HandlerContext&);
         void handleWELTARG   (HandlerContext&);
         void handleWELTRAJ   (HandlerContext&);
         void handleWFOAM     (HandlerContext&);

src/opm/input/eclipse/Schedule/KeywordHandlers.cpp

@@ -1856,7 +1856,7 @@ File {} line {}.)", wname, location.keyword, location.filename, location.lineno)
         }
     }
 
-    void Schedule::handleWELSPECS(HandlerContext& handlerContext)
+    void Schedule::handleWELSPEC(HandlerContext& handlerContext)
     {
         using Kw = ParserKeywords::WELSPECS;
 
@@ -2925,7 +2925,8 @@ Well{0} entered with 'FIELD' parent group:
             { "WELOPEN" , &Schedule::handleWELOPEN   },
             { "WELPI"   , &Schedule::handleWELPI     },
             { "WELSEGS" , &Schedule::handleWELSEGS   },
-            { "WELSPECS", &Schedule::handleWELSPECS  },
+            { "WELSPECL", &Schedule::handleWELSPEC   },
+            { "WELSPECS", &Schedule::handleWELSPEC   },            
             { "WELTARG" , &Schedule::handleWELTARG   },
             { "WELTRAJ" , &Schedule::handleWELTRAJ   },
             { "WFOAM"   , &Schedule::handleWFOAM     },

src/opm/input/eclipse/share/keywords/000_Eclipse100/C/COMPDATL

@@ -0,0 +1,98 @@
+{
+  "name": "COMPDATL",
+  "sections": [
+    "SCHEDULE"
+  ],
+  "items": [
+    {
+      "item": 1,
+      "name": "WELL",
+      "value_type": "STRING"
+    },
+    {
+        "item": 2,
+        "name": "LGR",
+        "value_type": "STRING"
+      },
+    {
+      "item": 3,
+      "name": "I",
+      "value_type": "INT",
+      "default": 0
+    },
+    {
+      "item": 4,
+      "name": "J",
+      "value_type": "INT",
+      "default": 0
+    },
+    {
+      "item": 5,
+      "name": "K1",
+      "value_type": "INT"
+    },
+    {
+      "item": 6,
+      "name": "K2",
+      "value_type": "INT"
+    },
+    {
+      "item": 7,
+      "name": "STATE",
+      "value_type": "STRING",
+      "default": "OPEN"
+    },
+    {
+      "item": 8,
+      "name": "SAT_TABLE",
+      "value_type": "INT",
+      "default": 0
+    },
+    {
+      "item": 9,
+      "name": "CONNECTION_TRANSMISSIBILITY_FACTOR",
+      "value_type": "DOUBLE",
+      "dimension": "Viscosity*ReservoirVolume/Time*Pressure"
+    },
+    {
+      "item": 10,
+      "name": "DIAMETER",
+      "value_type": "DOUBLE",
+      "dimension": "Length"
+    },
+    {
+      "item": 11,
+      "name": "Kh",
+      "value_type": "DOUBLE",
+      "dimension": "Permeability*Length",
+      "default": -1
+    },
+    {
+      "item": 12,
+      "name": "SKIN",
+      "value_type": "DOUBLE",
+      "dimension": "1",
+      "default": 0
+    },
+    {
+      "item": 13,
+      "name": "D_FACTOR",
+      "value_type": "DOUBLE",
+      "dimension": "Time/GasSurfaceVolume",
+      "default": 0
+      
+    },
+    {
+      "item": 14,
+      "name": "DIR",
+      "value_type": "STRING",
+      "default": "Z"
+    },
+    {
+      "item": 15,
+      "name": "PR",
+      "value_type": "DOUBLE",
+      "dimension": "Length"
+    }
+  ]
+}

src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WELSPECL

@@ -5,84 +5,102 @@
   ],
   "items": [
     {
+      "item": 1,
       "name": "WELL",
       "value_type": "STRING"
     },
     {
+      "item": 2,
       "name": "GROUP",
       "value_type": "STRING"
     },
     {
+      "item": 3,
       "name": "LGR",
       "value_type": "STRING"
     },
     {
+      "item": 4,
       "name": "HEAD_I",
       "value_type": "INT"
     },
     {
+      "item": 5,
       "name": "HEAD_J",
       "value_type": "INT"
     },
     {
+      "item": 6,
       "name": "REF_DEPTH",
       "value_type": "DOUBLE",
       "dimension": "Length"
     },
     {
+      "item": 7,
       "name": "PHASE",
       "value_type": "STRING"
     },
     {
+      "item": 8,
       "name": "D_RADIUS",
       "value_type": "DOUBLE",
       "default": 0,
       "dimension": "Length"
     },
     {
+      "item": 9,
       "name": "INFLOW_EQ",
       "value_type": "STRING",
       "default": "STD"
     },
     {
+      "item": 10,
       "name": "AUTO_SHUTIN",
       "value_type": "STRING",
       "default": "SHUT"
     },
     {
+      "item": 11,
       "name": "CROSSFLOW",
       "value_type": "STRING",
       "default": "YES"
     },
     {
+      "item": 12,
       "name": "P_TABLE",
       "value_type": "INT",
       "default": 0
     },
     {
+      "item": 13,
       "name": "DENSITY_CALC",
       "value_type": "STRING",
       "default": "SEG"
     },
     {
+      "item": 14,
       "name": "FIP_REGION",
       "value_type": "INT",
       "default": 0
     },
     {
+      "item": 15,
       "name": "FRONTSIM1",
       "value_type": "STRING"
     },
     {
+      "item": 16,
       "name": "FRONTSIM2",
       "value_type": "STRING"
     },
     {
+      "item": 17,
       "name": "well_model",
       "value_type": "STRING",
       "default": "STD"
     },
     {
+      "item": 18,
       "name": "POLYMER_TABLE",
       "value_type": "INT",
       "default": 0

src/opm/input/eclipse/share/keywords/keyword_list.cmake

@@ -88,6 +88,7 @@ set( keywords
      000_Eclipse100/C/COLLAPSE
      000_Eclipse100/C/COLUMNS
      000_Eclipse100/C/COMPDAT
+     000_Eclipse100/C/COMPDATL
      000_Eclipse100/C/COMPDATX
      000_Eclipse100/C/COMPFLSH
      000_Eclipse100/C/COMPIMB