Skip to content

Commit

Permalink
Merge branch 'master' into generic_ecltable
Browse files Browse the repository at this point in the history
  • Loading branch information
berland authored Jun 1, 2022
2 parents 831ab81 + 81a24ac commit f7158c5
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
language = None
language = "en"

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
Expand Down
12 changes: 8 additions & 4 deletions ecl2df/opmkeywords/COMPLUMP
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,23 @@
},
{
"name": "I",
"value_type": "INT"
"value_type": "INT",
"default": 0
},
{
"name": "J",
"value_type": "INT"
"value_type": "INT",
"default": 0
},
{
"name": "K1",
"value_type": "INT"
"value_type": "INT",
"default": 0
},
{
"name": "K2",
"value_type": "INT"
"value_type": "INT",
"default": 0
},
{
"name": "N",
Expand Down
1 change: 1 addition & 0 deletions ecl2df/opmkeywords/runmetoupdate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
keywords="
BRANPROP
COMPDAT
COMPLUMP
COMPSEGS
DENSITY
EQLDIMS
Expand Down

0 comments on commit f7158c5

Please sign in to comment.