Skip to content

Introduce start_suffix_at, with a default value of 1 #372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rubencalje merged 1 commit into from
Sep 25, 2024
Merged

Introduce start_suffix_at, with a default value of 1 #372

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions nlmod/dims/layers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,13 @@ def calculate_resistance(ds, kv="kv", thickness="thickness", top="top", botm="bo


def split_layers_ds(
ds, split_dict, layer="layer", top="top", bot="botm", return_reindexer=False
ds,
split_dict,
layer="layer",
top="top",
bot="botm",
return_reindexer=False,
start_suffix_at=1,
):
"""Split layers based in Dataset.

Expand All @@ -215,6 +221,9 @@ def split_layers_ds(
return_reindexer : bool, optional
Return a OrderedDict that can be used to reindex variables from the original
layer-dimension to the new layer-dimension when True. The default is False.
start_suffix_at : int, optional
The suffix that the first splitted layer will receive, for layers that were
splitted into multiple sub-layers. The default is 1.

Returns
-------
Expand Down Expand Up @@ -263,7 +272,7 @@ def split_layers_ds(
for lay0 in split_dict:
for i, _ in enumerate(split_dict[lay0]):
index = layers.index(lay0)
layers.insert(index, lay0 + "_" + str(i))
layers.insert(index, lay0 + "_" + str(i + start_suffix_at))
layers_org.insert(index, lay0)
ds = ds.reindex({"layer": layers})

Expand All @@ -280,7 +289,9 @@ def split_layers_ds(
f"Fill values for variable '{var}' in split"
" layers with the values from the original layer."
)
ds = _split_var(ds, var, lay0, th0, split_dict[lay0], top, bot)
ds = _split_var(
ds, var, lay0, th0, split_dict[lay0], top, bot, start_suffix_at
)

# drop the original layers
ds = ds.drop_sel(layer=list(split_dict))
Expand All @@ -297,10 +308,10 @@ def split_layers_ds(
return ds


def _split_var(ds, var, layer, thickness, fctrs, top, bot):
def _split_var(ds, var, layer, thickness, fctrs, top, bot, start_suffix_at):
"""Internal method to split a variable of one layer in multiple layers."""
for i in range(len(fctrs)):
name = layer + "_" + str(i)
name = layer + "_" + str(i + start_suffix_at)
if var == top:
# take orignal top and subtract thickness of higher splitted layers
ds[var].loc[name] = ds[var].loc[layer] - np.sum(fctrs[:i]) * thickness
Expand Down