Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 5 additions & 6 deletions imod/mf6/hfb.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
import typing
from copy import deepcopy
from enum import Enum
from typing import TYPE_CHECKING, Optional, Tuple
from typing import TYPE_CHECKING, List, Optional, Tuple

import cftime
import numpy as np
import pandas as pd
import xarray as xr
import xugrid as xu
from fastcore.dispatch import typedispatch
Expand Down Expand Up @@ -1089,7 +1090,7 @@ def from_imod5_dataset(cls, imod5_data: dict[str, dict[str, GridDataArray]]):
if len(hfb_keys) == 0:
raise ValueError("no hfb keys present.")

compound_dataframe = None
dataframe_ls: List[gpd.GeoDataFrame] = []
for hfb_key in hfb_keys:
hfb_dict = imod5_data[hfb_key]
if not list(hfb_dict.keys()) == ["geodataframe", "layer"]:
Expand All @@ -1101,9 +1102,7 @@ def from_imod5_dataset(cls, imod5_data: dict[str, dict[str, GridDataArray]]):
)
geometry_layer = hfb_dict["geodataframe"]
geometry_layer["layer"] = layer
if compound_dataframe is None:
compound_dataframe = geometry_layer
else:
compound_dataframe = compound_dataframe._append(geometry_layer)
dataframe_ls.append(geometry_layer)
compound_dataframe = pd.concat(dataframe_ls, ignore_index=True)

return LayeredHorizontalFlowBarrierResistance(compound_dataframe)
2 changes: 1 addition & 1 deletion imod/mf6/wel.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

import imod
from imod.logging import init_log_decorator, logger
from imod.logging.loglevel import LogLevel
from imod.logging.logging_decorators import standard_log_decorator
from imod.logging.loglevel import LogLevel
from imod.mf6.boundary_condition import (
BoundaryCondition,
DisStructuredBoundaryCondition,
Expand Down