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
40 changes: 22 additions & 18 deletions autotest/t007_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ def test_freyberg_export():
wkt = flopy.export.shapefile_utils.CRS.get_spatialreference(
m.modelgrid.epsg
)

# if wkt text was fetched from spatialreference.org
if wkt is not None:
# test default package export
Expand Down Expand Up @@ -795,31 +796,34 @@ def test_epsgs():
import flopy.export.shapefile_utils as shp

# test setting a geographic (lat/lon) coordinate reference
# (also tests sr.crs parsing of geographic crs info)
# (also tests shapefile_utils.CRS parsing of geographic crs info)
delr = np.ones(10)
delc = np.ones(10)
sr = flopy.discretization.StructuredGrid(delr=delr, delc=delc)
mg = flopy.discretization.StructuredGrid(delr=delr, delc=delc)

sr.epsg = 102733
msg = "sr.epsg is not 102733 ({})".format(sr.epsg)
assert sr.epsg == 102733, msg
mg.epsg = 102733
assert mg.epsg == 102733, "mg.epsg is not 102733 ({})".format(mg.epsg)

t_value = sr.__repr__()
msg = "proj4_str:epsg:102733 not in sr.__repr__(): ({})".format(t_value)
t_value = mg.__repr__()
if not "proj4_str:epsg:102733" in t_value:
raise AssertionError(msg)
raise AssertionError(
"proj4_str:epsg:102733 not in mg.__repr__(): ({})".format(t_value)
)

sr.epsg = 4326 # WGS 84
mg.epsg = 4326 # WGS 84
crs = shp.CRS(epsg=4326)
assert crs.crs["proj"] == "longlat"
t_value = crs.grid_mapping_attribs["grid_mapping_name"]
msg = "grid_mapping_name is not latitude_longitude: {}".format(t_value)
assert t_value == "latitude_longitude", msg

t_value = sr.__repr__()
msg = "proj4_str:epsg:4326 not in sr.__repr__(): ({})".format(t_value)
if crs.grid_mapping_attribs is not None:
assert crs.crs["proj"] == "longlat"
t_value = crs.grid_mapping_attribs["grid_mapping_name"]
assert (
t_value == "latitude_longitude"
), "grid_mapping_name is not latitude_longitude: {}".format(t_value)

t_value = mg.__repr__()
if not "proj4_str:epsg:4326" in t_value:
raise AssertionError(msg)
raise AssertionError(
"proj4_str:epsg:4326 not in sr.__repr__(): ({})".format(t_value)
)


def test_dynamic_xll_yll():
Expand Down Expand Up @@ -1672,7 +1676,7 @@ def main():
# test_vertex_model_dot_plot()
# test_sr_with_Map()
# test_modelgrid_with_PlotMapView()
# test_epsgs()
test_epsgs()
# test_sr_scaling()
# test_read_usgs_model_reference()
# test_dynamic_xll_yll()
Expand Down
20 changes: 14 additions & 6 deletions autotest/t076_modelgrid_thick.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,18 @@ def test_ncb_thick():
laycbd = np.array([1, 2, 0], dtype=int)
ncb = np.count_nonzero(laycbd)
dx = dy = 150
delc = np.array([dy,] * nrow)
delr = np.array([dx, ] * ncol)
delc = np.array(
[
dy,
]
* nrow
)
delr = np.array(
[
dx,
]
* ncol
)
top = np.ones((15, 15))
botm = np.ones((nlay + ncb, nrow, ncol))
elevations = np.array([-10, -20, -40, -50, -70])[:, np.newaxis]
Expand All @@ -220,7 +230,7 @@ def test_ncb_thick():
nlay=nlay,
nrow=nrow,
ncol=ncol,
laycbd=laycbd
laycbd=laycbd,
)

thick = modelgrid.thick
Expand All @@ -234,9 +244,7 @@ def test_ncb_thick():

sat_thick = modelgrid.saturated_thick(modelgrid.thick)
if not sat_thick.shape == modelgrid.shape:
raise AssertionError(
"saturated_thickness confining beds not removed"
)
raise AssertionError("saturated_thickness confining beds not removed")

if sat_thick[1, 0, 0] != 20:
raise AssertionError(
Expand Down
2 changes: 1 addition & 1 deletion flopy/export/netcdf.py
Original file line number Diff line number Diff line change
Expand Up @@ -953,7 +953,7 @@ def initialize_file(self, time_values=None):
y[:] = self.model_grid.xyzcellcenters[1]

# grid mapping variable
crs = flopy.utils.reference.crs(
crs = flopy.export.shapefile_utils.CRS(
prj=self.model_grid.prj, epsg=self.model_grid.epsg
)
attribs = crs.grid_mapping_attribs
Expand Down
Loading