From 6dcdcaf08c3a50f17acb02524a2cbdc50e532cb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A5rd=20Skaflestad?= Date: Mon, 24 Jan 2022 15:46:15 +0100 Subject: [PATCH 1/3] Fix Keyword Names Should match the name of the generator JSON input file. --- src/opm/input/eclipse/share/keywords/000_Eclipse100/A/APIVD | 2 +- src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LICENSES | 2 +- src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RADFIN | 2 +- src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SSWCR | 2 +- src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SWF32D | 2 +- src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TIGHTENP | 2 +- src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TPAMEPSS | 2 +- src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSURFACT | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/APIVD b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/APIVD index 42077b98b..15b49fe9f 100644 --- a/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/APIVD +++ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/A/APIVD @@ -1,5 +1,5 @@ { - "name": "APIVID", + "name": "APIVD", "sections": [ "SOLUTION" ], diff --git a/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LICENSES b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LICENSES index deeec1a9b..43d8e7dc3 100644 --- a/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LICENSES +++ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/L/LICENSES @@ -1,5 +1,5 @@ { - "name": "LICENSE", + "name": "LICENSES", "sections": [ "RUNSPEC" ], diff --git a/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RADFIN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RADFIN index 73bb4abbe..43a0c16d9 100644 --- a/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RADFIN +++ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RADFIN @@ -1,5 +1,5 @@ { - "name": "RADFIN4", + "name": "RADFIN", "sections": [ "GRID" ], diff --git a/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SSWCR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SSWCR index 2bbc940b7..12a71b666 100644 --- a/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SSWCR +++ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SSWCR @@ -1,5 +1,5 @@ { - "name": "SSOWCR", + "name": "SSWCR", "sections": [ "PROPS" ], diff --git a/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SWF32D b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SWF32D index 2dcd2e432..67cfe1534 100644 --- a/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SWF32D +++ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/S/SWF32D @@ -1,5 +1,5 @@ { - "name": "SOF32D", + "name": "SWF32D", "sections": [ "PROPS" ], diff --git a/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TIGHTENP b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TIGHTENP index 9c2796e52..78ff16422 100644 --- a/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TIGHTENP +++ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TIGHTENP @@ -1,5 +1,5 @@ { - "name": "TIGHTEN", + "name": "TIGHTENP", "sections": [ "SCHEDULE" ], diff --git a/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TPAMEPSS b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TPAMEPSS index 39d7234ba..89fdc76e2 100644 --- a/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TPAMEPSS +++ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TPAMEPSS @@ -1,5 +1,5 @@ { - "name": "TPAMEPS", + "name": "TPAMEPSS", "sections": [ "PROPS" ], diff --git a/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSURFACT b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSURFACT index 4d27bb940..547a896dc 100644 --- a/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSURFACT +++ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/W/WSURFACT @@ -1,5 +1,5 @@ { - "name": "WSEGTABL", + "name": "WSURFACT", "sections": [ "SCHEDULE" ], From 1603100f0d40b5e5047dac422510dd4e2d7e518b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A5rd=20Skaflestad?= Date: Mon, 24 Jan 2022 15:47:43 +0100 Subject: [PATCH 2/3] Remove Extraneous JSON Input Files There are no such keywords as 'RSSSPEC' (three 'S'-es) or 'DFLOWR'. --- .../share/keywords/000_Eclipse100/R/RSSSPEC | 6 ------ .../share/keywords/000_Eclipse100/V/DFLOWR | 16 ---------------- 2 files changed, 22 deletions(-) delete mode 100644 src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RSSSPEC delete mode 100644 src/opm/input/eclipse/share/keywords/000_Eclipse100/V/DFLOWR diff --git a/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RSSSPEC b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RSSSPEC deleted file mode 100644 index 346c38189..000000000 --- a/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RSSSPEC +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "RSSPEC", - "sections": [ - "RUNSPEC" - ] -} diff --git a/src/opm/input/eclipse/share/keywords/000_Eclipse100/V/DFLOWR b/src/opm/input/eclipse/share/keywords/000_Eclipse100/V/DFLOWR deleted file mode 100644 index b12f2f4c3..000000000 --- a/src/opm/input/eclipse/share/keywords/000_Eclipse100/V/DFLOWR +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "VDFLOWR", - "sections": [ - "PROPS" - ], - "size": { - "keyword": "TABDIMS", - "item": "NTSFUN" - }, - "items": [ - { - "name": "BETA", - "value_type": "DOUBLE" - } - ] -} From 6bb8855afdb58d38956724a756cb437097cef08b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A5rd=20Skaflestad?= Date: Mon, 24 Jan 2022 15:49:51 +0100 Subject: [PATCH 3/3] Fix RADFIN Keyword Representation Previous version was a copy of RADFIN4 representation. --- .../share/keywords/000_Eclipse100/R/RADFIN | 49 +++++++++++++++---- 1 file changed, 39 insertions(+), 10 deletions(-) diff --git a/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RADFIN b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RADFIN index 43a0c16d9..91440f9d8 100644 --- a/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RADFIN +++ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/RADFIN @@ -6,49 +6,78 @@ "size": 1, "items": [ { + "item": 1, "name": "NAME", "value_type": "STRING" }, { - "name": "I1", + "item": 2, + "name": "I", "value_type": "INT" }, { - "name": "I2", - "value_type": "INT" - }, - { - "name": "J1", - "value_type": "INT" - }, - { - "name": "J2", + "item": 3, + "name": "J", "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" } ] }