Skip to content

Commit 098bedd

Browse files
authored
ENH: Utilize grid property codes when using grid.subgrids_from_zoneprop method (#1328)
1 parent 19b87a3 commit 098bedd

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

src/xtgeo/grid3d/grid.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1293,7 +1293,10 @@ def subgrids_from_zoneprop(self, zoneprop: GridProperty) -> dict[str, int] | Non
12931293
for izone in range(minzone, maxzone + 1):
12941294
mininzn = int(kval[zprval == izone].min()) # 1 base
12951295
maxinzn = int(kval[zprval == izone].max()) # 1 base
1296-
newd["zone" + str(izone)] = range(mininzn, maxinzn + 1)
1296+
1297+
newd[zoneprop.codes.get(izone, "zone" + str(izone))] = range(
1298+
mininzn, maxinzn + 1
1299+
)
12971300

12981301
self.subgrids = newd # type: ignore
12991302

tests/test_grid3d/test_grid.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,10 @@ def test_subgrids():
178178
zprop = k_index.copy()
179179
zprop.values[k_index.values > 4] = 2
180180
zprop.values[k_index.values <= 4] = 1
181+
zprop.codes = {1: "Upper", 2: "Lower"}
181182

182-
grd.subgrids_from_zoneprop(zprop)
183+
subgrids = grd.subgrids_from_zoneprop(zprop)
184+
assert "Upper" in subgrids
183185

184186
# rename
185187
grd.rename_subgrids(["AAAA", "BBBB"])

tests/test_grid3d/test_grid_operations.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def test_refine_vertically_per_zone(testdata_path):
132132
refinement = {1: 4, 2: 2}
133133
grd.refine_vertically(refinement, zoneprop=emerald2_zone)
134134

135-
assert grd.get_subgrids() == {"zone1": 64, "zone2": 60}
135+
assert grd.get_subgrids() == {"Zone1": 64, "Zone2": 60}
136136

137137
grd = emerald2_grid.copy()
138138
grd.refine_vertically(refinement) # no zoneprop

0 commit comments

Comments
 (0)