From a22e4c6243e222ad67eeb002192454185091b354 Mon Sep 17 00:00:00 2001 From: wpbonelli Date: Tue, 3 Jun 2025 09:06:42 -0400 Subject: [PATCH] cleanup adapters --- flopy4/{discretization/structured_grid.py => adapters.py} | 0 flopy4/mf6/{interface/flopy3.py => adapters.py} | 0 flopy4/mf6/interface/__init__.py | 0 flopy4/mf6/utils/cbc_reader.py | 5 ++--- test/test_interface.py | 2 +- 5 files changed, 3 insertions(+), 4 deletions(-) rename flopy4/{discretization/structured_grid.py => adapters.py} (100%) rename flopy4/mf6/{interface/flopy3.py => adapters.py} (100%) delete mode 100644 flopy4/mf6/interface/__init__.py diff --git a/flopy4/discretization/structured_grid.py b/flopy4/adapters.py similarity index 100% rename from flopy4/discretization/structured_grid.py rename to flopy4/adapters.py diff --git a/flopy4/mf6/interface/flopy3.py b/flopy4/mf6/adapters.py similarity index 100% rename from flopy4/mf6/interface/flopy3.py rename to flopy4/mf6/adapters.py diff --git a/flopy4/mf6/interface/__init__.py b/flopy4/mf6/interface/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/flopy4/mf6/utils/cbc_reader.py b/flopy4/mf6/utils/cbc_reader.py index 932af903..eb4024da 100644 --- a/flopy4/mf6/utils/cbc_reader.py +++ b/flopy4/mf6/utils/cbc_reader.py @@ -12,9 +12,8 @@ from attrs import define from flopy.discretization import StructuredGrid -from flopy4.discretization.structured_grid import StructuredGridWrapper - -from .grid_utils import get_coords +from flopy4.adapters import StructuredGridWrapper +from flopy4.mf6.utils.grid_utils import get_coords @define diff --git a/test/test_interface.py b/test/test_interface.py index 519668fd..237f8518 100644 --- a/test/test_interface.py +++ b/test/test_interface.py @@ -5,9 +5,9 @@ from flopy.discretization import StructuredGrid from flopy.discretization.modeltime import ModelTime +from flopy4.mf6.adapters import Flopy3Model, Flopy3Package from flopy4.mf6.gwf import Chd, Dis, Gwf, Ic, Npf, Oc from flopy4.mf6.ims import Ims -from flopy4.mf6.interface.flopy3 import Flopy3Model, Flopy3Package from flopy4.mf6.simulation import Simulation from flopy4.mf6.tdis import Tdis