Skip to content

update dis from_grid #327

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

Open
mjreno wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

update dis from_grid #327

Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions flopy4/mf6/gwe/dis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ def to_grid(self) -> StructuredGrid:

@classmethod
def from_grid(cls, grid: StructuredGrid) -> "Dis":
_lenunits = {1: "FEET", 2: "METERS", 3: "CENTIMETERS"}
kwargs = {
"xorigin": grid.xoffset,
"yorigin": grid.yoffset,
Expand All @@ -138,6 +139,10 @@ def from_grid(cls, grid: StructuredGrid) -> "Dis":
"botm": grid.botm,
"idomain": grid.idomain,
}
if grid.lenuni in _lenunits:
kwargs["length_units"] = _lenunits[grid.lenuni]
if grid.angrot:
kwargs["angrot"] = grid.angrot
if grid.crs is not None:
kwargs["crs"] = f"EPSG:{grid.crs.to_epsg()}"
return Dis(**kwargs)
5 changes: 5 additions & 0 deletions flopy4/mf6/gwf/dis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ def from_grid(cls, grid: StructuredGrid) -> "Dis":
Dis
A discretization with the same dimensions and data as the grid.
"""
_lenunits = {1: "FEET", 2: "METERS", 3: "CENTIMETERS"}
kwargs = {
"xorigin": grid.xoffset,
"yorigin": grid.yoffset,
Expand All @@ -201,6 +202,10 @@ def from_grid(cls, grid: StructuredGrid) -> "Dis":
"botm": grid.botm,
"idomain": grid.idomain,
}
if grid.lenuni in _lenunits:
kwargs["length_units"] = _lenunits[grid.lenuni]
if grid.angrot:
kwargs["angrot"] = grid.angrot
if grid.crs is not None:
kwargs["crs"] = f"EPSG:{grid.crs.to_epsg()}"
return Dis(**kwargs)
36 changes: 22 additions & 14 deletions flopy4/mf6/gwf/disv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,22 +204,30 @@ def from_grid(cls, grid: VertexGrid) -> "Disv":
Disv
A discretization with the same dimensions and data as the grid.
"""
return Disv(
xorigin=grid.xoffset,
yorigin=grid.yoffset,
nlay=grid.nlay,
ncpl=grid.ncpl,
nvert=grid.nvert,
top=grid.top,
botm=grid.botm,
idomain=np.asarray(grid.idomain).reshape(grid.nlay, grid.ncpl)
_lenunits = {1: "FEET", 2: "METERS", 3: "CENTIMETERS"}
kwargs = {
"xorigin": grid.xoffset,
"yorigin": grid.yoffset,
"nlay": grid.nlay,
"ncpl": grid.ncpl,
"nvert": grid.nvert,
"top": grid.top,
"botm": grid.botm,
"idomain": np.asarray(grid.idomain).reshape(grid.nlay, grid.ncpl)
if grid.idomain is not None
else None,
iv=np.array([v[0] for v in grid._vertices], dtype=int),
xv=grid.verts[:, 0].ravel(),
yv=grid.verts[:, 1].ravel(),
cell2ddata=Disv.grid_to_disv_cell2d(grid.cell2d),
)
"iv": np.array([v[0] for v in grid._vertices], dtype=int),
"xv": grid.verts[:, 0].ravel(),
"yv": grid.verts[:, 1].ravel(),
"cell2ddata": Disv.grid_to_disv_cell2d(grid.cell2d),
}
if grid.lenuni in _lenunits:
kwargs["length_units"] = _lenunits[grid.lenuni]
if grid.angrot:
kwargs["angrot"] = grid.angrot
if grid.crs is not None:
kwargs["crs"] = f"EPSG:{grid.crs.to_epsg()}"
return Disv(**kwargs)

@staticmethod
def disv_to_grid_cell2d(cell2ddata) -> list:
Expand Down
5 changes: 5 additions & 0 deletions flopy4/mf6/gwt/dis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ def to_grid(self) -> StructuredGrid:

@classmethod
def from_grid(cls, grid: StructuredGrid) -> "Dis":
_lenunits = {1: "FEET", 2: "METERS", 3: "CENTIMETERS"}
kwargs = {
"xorigin": grid.xoffset,
"yorigin": grid.yoffset,
Expand All @@ -138,6 +139,10 @@ def from_grid(cls, grid: StructuredGrid) -> "Dis":
"botm": grid.botm,
"idomain": grid.idomain,
}
if grid.lenuni in _lenunits:
kwargs["length_units"] = _lenunits[grid.lenuni]
if grid.angrot:
kwargs["angrot"] = grid.angrot
if grid.crs is not None:
kwargs["crs"] = f"EPSG:{grid.crs.to_epsg()}"
return Dis(**kwargs)
5 changes: 5 additions & 0 deletions flopy4/mf6/prt/dis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ def to_grid(self) -> StructuredGrid:

@classmethod
def from_grid(cls, grid: StructuredGrid) -> "Dis":
_lenunits = {1: "FEET", 2: "METERS", 3: "CENTIMETERS"}
kwargs = {
"xorigin": grid.xoffset,
"yorigin": grid.yoffset,
Expand All @@ -126,6 +127,10 @@ def from_grid(cls, grid: StructuredGrid) -> "Dis":
"botm": grid.botm,
"idomain": grid.idomain,
}
if grid.lenuni in _lenunits:
kwargs["length_units"] = _lenunits[grid.lenuni]
if grid.angrot:
kwargs["angrot"] = grid.angrot
if grid.crs is not None:
kwargs["crs"] = f"EPSG:{grid.crs.to_epsg()}"
return Dis(**kwargs)
Loading