Skip to content

Commit db4b28c

Browse files
authored
flopy3 adapters (#127)
1 parent 2f3879c commit db4b28c

File tree

9 files changed

+1006
-59
lines changed

9 files changed

+1006
-59
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
strategy:
6464
fail-fast: false
6565
matrix:
66-
os: [ ubuntu-22.04, macos-13, windows-2022 ]
66+
os: [ ubuntu-latest, macos-latest, windows-latest ]
6767
python: [ "311", "312", "313" ]
6868
env:
6969
GCC_V: 11

flopy4/mf6/gwf/dis.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,19 +53,19 @@ class Dis(Package):
5353
top: NDArray[np.floating] = array(
5454
block="griddata",
5555
default=1.0,
56-
dims=("ncol", "nrow"),
56+
dims=("nrow", "ncol"),
5757
converter=Converter(convert_array, takes_self=True, takes_field=True),
5858
)
5959
botm: NDArray[np.floating] = array(
6060
block="griddata",
6161
default=0.0,
62-
dims=("ncol", "nrow", "nlay"),
62+
dims=("nlay", "nrow", "ncol"),
6363
converter=Converter(convert_array, takes_self=True, takes_field=True),
6464
)
6565
idomain: NDArray[np.integer] = array(
6666
block="griddata",
6767
default=1,
68-
dims=("ncol", "nrow", "nlay"),
68+
dims=("nlay", "nrow", "ncol"),
6969
converter=Converter(convert_array, takes_self=True, takes_field=True),
7070
)
7171
nnodes: int = dim(

flopy4/mf6/ims.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ class Ims(Solution):
2929
inner_maximum: Optional[int] = field(block="linear", default=None)
3030
inner_dvclose: Optional[float] = field(block="linear", default=None)
3131
inner_rclose: Optional[float] = field(block="linear", default=None)
32+
inner_hclose: Optional[float] = field(block="linear", default=None)
3233
rclose_option: Optional[str] = field(block="linear", default=None)
3334
linear_acceleration: Optional[str] = field(block="linear", default=None)
3435
relaxation_factor: Optional[float] = field(block="linear", default=None)

flopy4/mf6/interface/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)