Skip to content

Commit cdcf054

Browse files
eivindjahreneivindjahren
committed
Use resfo5
1 parent 185b9b5 commit cdcf054

File tree

3 files changed

+87
-85
lines changed

3 files changed

+87
-85
lines changed

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ dependencies = [
4444
"numpy",
4545
"pandas>=1.1",
4646
"pyarrow",
47-
"resfo>=4.0.0",
47+
"resfo>=5",
4848
"roffio>=0.0.2",
4949
"scipy>=1.5",
5050
"segyio>1.8.0",

‎src/xtgeo/grid3d/_gridprop_import_grdecl.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ def import_bgrdecl_prop(pfile: FileWrapper, name: str, grid: Grid) -> dict[str,
4646
for entry in resfo.lazy_read(pfile.file):
4747
if match_keyword(entry.read_keyword(), name):
4848
values = entry.read_array()
49+
if isinstance(values, resfo.MessType):
50+
raise ValueError(f"Unexpected MESS value in {pfile.file}")
4951
result["discrete"] = np.issubdtype(values.dtype, np.integer)
5052
if result["discrete"]:
5153
uniq = np.unique(values).tolist()

‎tests/test_grid3d/test_grid_egrid.py‎

Lines changed: 84 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -22,121 +22,121 @@
2222
@pytest.mark.parametrize(
2323
"file_contents, bad_keyword",
2424
[
25-
({"FILEHEAD": []}, "FILEHEAD"),
25+
([("FILEHEAD", [])], "FILEHEAD"),
2626
(
27-
{
28-
"FILEHEAD": np.zeros((100,), dtype=np.int32),
29-
"MAPUNITS": [],
30-
},
27+
[
28+
("FILEHEAD", np.zeros((100,), dtype=np.int32)),
29+
("MAPUNITS", []),
30+
],
3131
"MAPUNITS",
3232
),
3333
(
34-
{
35-
"FILEHEAD": np.zeros((100,), dtype=np.int32),
36-
"MAPAXES ": [],
37-
},
34+
[
35+
("FILEHEAD", np.zeros((100,), dtype=np.int32)),
36+
("MAPAXES ", []),
37+
],
3838
"MAPAXES",
3939
),
4040
(
41-
{
42-
"FILEHEAD": np.zeros((100,), dtype=np.int32),
43-
"GRIDUNIT": ["METRES "],
44-
"GRIDHEAD": [],
45-
},
41+
[
42+
("FILEHEAD", np.zeros((100,), dtype=np.int32)),
43+
("GRIDUNIT", ["METRES "]),
44+
("GRIDHEAD", []),
45+
],
4646
"GRIDHEAD",
4747
),
4848
(
49-
{
50-
"FILEHEAD": np.zeros((100,), dtype=np.int32),
51-
"GRIDUNIT": ["METRES "],
52-
"GRIDHEAD": np.ones((100,), dtype=np.int32),
53-
},
49+
[
50+
("FILEHEAD", np.zeros((100,), dtype=np.int32)),
51+
("GRIDUNIT", ["METRES "]),
52+
("GRIDHEAD", np.ones((100,), dtype=np.int32)),
53+
],
5454
"COORD",
5555
),
5656
(
57-
{
58-
"FILEHEAD": np.zeros((100,), dtype=np.int32),
59-
"GRIDUNIT": ["METRES "],
60-
"GRIDHEAD": np.ones((100,), dtype=np.int32),
61-
"COORD ": [],
62-
},
57+
[
58+
("FILEHEAD", np.zeros((100,), dtype=np.int32)),
59+
("GRIDUNIT", ["METRES "]),
60+
("GRIDHEAD", np.ones((100,), dtype=np.int32)),
61+
("COORD ", []),
62+
],
6363
"ZCORN",
6464
),
6565
(
66-
{
67-
"FILEHEAD": np.zeros((100,), dtype=np.int32),
68-
"GRIDUNIT": ["METRES "],
69-
"GRIDHEAD": np.ones((100,), dtype=np.int32),
70-
"COORD ": [],
71-
"ZCORN ": [],
72-
"ACTNUM ": [],
73-
},
66+
[
67+
("FILEHEAD", np.zeros((100,), dtype=np.int32)),
68+
("GRIDUNIT", ["METRES "]),
69+
("GRIDHEAD", np.ones((100,), dtype=np.int32)),
70+
("COORD ", []),
71+
("ZCORN ", []),
72+
("ACTNUM ", []),
73+
],
7474
"ENDGRID",
7575
),
7676
(
77-
{
78-
"FILEHEAD": np.zeros((100,), dtype=np.int32),
79-
"GRIDUNIT": ["METRES "],
80-
"GRIDHEAD": np.ones((100,), dtype=np.int32),
81-
"COORD ": [],
82-
"ZCORN ": [],
83-
"ACTNUM ": [],
84-
"ENDGRID ": [],
85-
"NNCHEAD ": [],
86-
},
77+
[
78+
("FILEHEAD", np.zeros((100,), dtype=np.int32)),
79+
("GRIDUNIT", ["METRES "]),
80+
("GRIDHEAD", np.ones((100,), dtype=np.int32)),
81+
("COORD ", []),
82+
("ZCORN ", []),
83+
("ACTNUM ", []),
84+
("ENDGRID ", []),
85+
("NNCHEAD ", []),
86+
],
8787
"NNCHEAD",
8888
),
8989
(
90-
{
91-
"FILEHEAD": np.zeros((100,), dtype=np.int32),
92-
"GRIDUNIT": ["METRES "],
93-
"GRIDHEAD": np.ones((100,), dtype=np.int32),
94-
"COORD ": [],
95-
"ZCORN ": [],
96-
"ACTNUM ": [],
97-
"ENDGRID ": [],
98-
"NNCHEAD ": np.array([1, 0], dtype=np.int32),
99-
},
90+
[
91+
("FILEHEAD", np.zeros((100,), dtype=np.int32)),
92+
("GRIDUNIT", ["METRES "]),
93+
("GRIDHEAD", np.ones((100,), dtype=np.int32)),
94+
("COORD ", []),
95+
("ZCORN ", []),
96+
("ACTNUM ", []),
97+
("ENDGRID ", []),
98+
("NNCHEAD ", np.array([1, 0], dtype=np.int32)),
99+
],
100100
"NNC1",
101101
),
102102
(
103-
{
104-
"FILEHEAD": np.zeros((100,), dtype=np.int32),
105-
"GRIDUNIT": ["METRES "],
106-
"GRIDHEAD": np.ones((100,), dtype=np.int32),
107-
"COORD ": [],
108-
"ZCORN ": [],
109-
"ACTNUM ": [],
110-
"ENDGRID ": [],
111-
"NNCHEAD ": np.array([1, 0], dtype=np.int32),
112-
"NNC1 ": [],
113-
},
103+
[
104+
("FILEHEAD", np.zeros((100,), dtype=np.int32)),
105+
("GRIDUNIT", ["METRES "]),
106+
("GRIDHEAD", np.ones((100,), dtype=np.int32)),
107+
("COORD ", []),
108+
("ZCORN ", []),
109+
("ACTNUM ", []),
110+
("ENDGRID ", []),
111+
("NNCHEAD ", np.array([1, 0], dtype=np.int32)),
112+
("NNC1 ", []),
113+
],
114114
"NNC2",
115115
),
116116
(
117-
{
118-
"FILEHEAD": np.zeros((100,), dtype=np.int32),
119-
"GRIDUNIT": ["METRES "],
120-
"GRIDHEAD": np.ones((100,), dtype=np.int32),
121-
"COORD ": [],
122-
"ZCORN ": [],
123-
"ACTNUM ": [],
124-
"ENDGRID ": [],
125-
"LGR ": [],
126-
},
117+
[
118+
("FILEHEAD", np.zeros((100,), dtype=np.int32)),
119+
("GRIDUNIT", ["METRES "]),
120+
("GRIDHEAD", np.ones((100,), dtype=np.int32)),
121+
("COORD ", []),
122+
("ZCORN ", []),
123+
("ACTNUM ", []),
124+
("ENDGRID ", []),
125+
("LGR ", []),
126+
],
127127
"LGR",
128128
),
129129
(
130-
{
131-
"FILEHEAD": np.zeros((100,), dtype=np.int32),
132-
"GRIDUNIT": ["METRES "],
133-
"GRIDHEAD": np.ones((100,), dtype=np.int32),
134-
"COORD ": [],
135-
"ZCORN ": [],
136-
"ACTNUM ": [],
137-
"ENDGRID ": [],
138-
"LGR ": ["name"],
139-
},
130+
[
131+
("FILEHEAD", np.zeros((100), dtype=np.int32)),
132+
("GRIDUNIT", ["METRES "]),
133+
("GRIDHEAD", np.ones((100), dtype=np.int32)),
134+
("COORD ", []),
135+
("ZCORN ", []),
136+
("ACTNUM ", []),
137+
("ENDGRID ", []),
138+
("LGR ", ["name"]),
139+
],
140140
"GRIDHEAD",
141141
),
142142
(

0 commit comments

Comments
 (0)