Merge pull request #2941 from bska/consistent-kw-repr

Fix Several Name Inconsistencies in JSON Keyword Representation

src/opm/input/eclipse/share/keywords/000_Eclipse100/A/APIVD

@@ -1,5 +1,5 @@
 {
-  "name": "APIVID",
+  "name": "APIVD",
   "sections": [
     "SOLUTION"
   ],

src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LICENSES

@@ -1,5 +1,5 @@
 {
-  "name": "LICENSE",
+  "name": "LICENSES",
   "sections": [
     "RUNSPEC"
   ],

src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RADFIN

@@ -1,54 +1,83 @@
 {
-  "name": "RADFIN4",
+  "name": "RADFIN",
   "sections": [
     "GRID"
   ],
   "size": 1,
   "items": [
     {
+      "item": 1,
       "name": "NAME",
       "value_type": "STRING"
     },
     {
-      "name": "I1",
+      "item": 2,
+      "name": "I",
       "value_type": "INT"
     },
     {
-      "name": "I2",
+      "item": 3,
-      "value_type": "INT"
+      "name": "J",
-    },
-    {
-      "name": "J1",
-      "value_type": "INT"
-    },
-    {
-      "name": "J2",
       "value_type": "INT"
     },
     {
+      "item": 4,
       "name": "K1",
       "value_type": "INT"
     },
     {
+      "item": 5,
       "name": "K2",
       "value_type": "INT"
     },
     {
+      "item": 6,
       "name": "NR",
       "value_type": "INT"
     },
     {
+      "item": 7,
       "name": "NTHETA",
       "value_type": "INT"
     },
     {
+      "item": 8,
       "name": "NZ",
       "value_type": "INT"
     },
     {
+      "item": 9,
       "name": "NWMAX",
       "value_type": "INT",
       "default": 1
+    },
+    {
+      "item": 10,
+      "name": "INNER_RADIUS",
+      "value_type": "DOUBLE",
+      "default": 0.1524,
+      "dimension" : "Length",
+      "comment": "Default value is 0.5 ft (= 6 in)"
+    },
+    {
+      "item": 11,
+      "name": "OUTER_RADIUS",
+      "value_type": "DOUBLE",
+      "dimension" : "Length"
+    },
+    {
+      "item": 12,
+      "name": "MINIMUM_RADIUS_REFINEMENT",
+      "value_type": "DOUBLE",
+      "default": 1.524,
+      "dimension" : "Length",
+      "comment": "Default value is 5 ft"
+    },
+    {
+      "item": 13,
+      "name": "PARENT_LGR",
+      "value_type": "STRING",
+      "default": "GLOBAL"
     }
   ]
 }

src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RSSSPEC

@@ -1,6 +0,0 @@
-{
-  "name": "RSSPEC",
-  "sections": [
-    "RUNSPEC"
-  ]
-}

src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SSWCR

@@ -1,5 +1,5 @@
 {
-  "name": "SSOWCR",
+  "name": "SSWCR",
   "sections": [
     "PROPS"
   ],

src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SWF32D

@@ -1,5 +1,5 @@
 {
-  "name": "SOF32D",
+  "name": "SWF32D",
   "sections": [
     "PROPS"
   ],

src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TIGHTENP

@@ -1,5 +1,5 @@
 {
-  "name": "TIGHTEN",
+  "name": "TIGHTENP",
   "sections": [
     "SCHEDULE"
   ],

src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TPAMEPSS

@@ -1,5 +1,5 @@
 {
-  "name": "TPAMEPS",
+  "name": "TPAMEPSS",
   "sections": [
     "PROPS"
   ],

src/opm/input/eclipse/share/keywords/000_Eclipse100/V/DFLOWR

@@ -1,16 +0,0 @@
-{
-  "name": "VDFLOWR",
-  "sections": [
-    "PROPS"
-  ],
-  "size": {
-    "keyword": "TABDIMS",
-    "item": "NTSFUN"
-  },
-  "items": [
-    {
-      "name": "BETA",
-      "value_type": "DOUBLE"
-    }
-  ]
-}

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

@@ -1,5 +1,5 @@
 {
-  "name": "WSEGTABL",
+  "name": "WSURFACT",
   "sections": [
     "SCHEDULE"
   ],