Changed implementation on mesh module

Gmesh class only contained implementation for ocean boundaries, this was moved to Hgrid class.
Gmesh class has been removed and all meshes now inherit from mesh.base.EuclideanMesh2D

Author: jreniel

pyschism/mesh/__init__.py

@@ -2,13 +2,11 @@
 Namespace definitions for pyschism.mesh module
 """
 
-from pyschism.mesh.gmesh import Gmesh
 from pyschism.mesh.hgrid import Hgrid
 from pyschism.mesh.vgrid import Vgrid
 from pyschism.mesh.mesh import Mesh
 
 __all__ = [
-    "Gmesh",
     "Hgrid",
     "Vgrid",
     "Mesh"

pyschism/mesh/base.py

@@ -32,35 +32,38 @@ def __init__(
 
     @classmethod
     def open(cls, path, crs=None, fmt="grd"):
-        assert fmt.lower() in ['grd', 'gr3', 'adcirc', 'schism', '2dm', 'sms',
-                               'msh']
+        assert fmt.lower() in [
+            'grd', 'gr3', 'adcirc', 'schism',
+            # '2dm', 'sms',
+            # 'msh'
+            ]
 
         if fmt.lower() in ['grd', 'gr3', 'adcirc', 'schism']:
             return cls.open_grd(path, crs)
 
-        elif fmt.lower() in ['2dm', 'sms']:
-            return cls.open_2dm(path, crs)
+        # elif fmt.lower() in ['2dm', 'sms']:
+        #     return cls.open_2dm(path, crs)
 
-    @classmethod
-    def open_2dm(cls, path, crs=None):
-        raise NotImplementedError
+    # @classmethod
+    # def open_2dm(cls, path, crs=None):
+    #     raise NotImplementedError
 
     @classmethod
     def open_grd(cls, path, crs=None):
-        _grd = grd.reader(path)
-        _grd.pop('boundaries')
-        return cls.from_grd(_grd, crs)
+        grid = grd.reader(path)
+        grid.update({"crs": crs})
+        return cls.from_grd(grid)
 
     @classmethod
     def open_gr3(cls, path, crs=None):
         return cls.open_grd(path, crs)
 
     @classmethod
-    def from_grd(cls, grid, crs=None):
-        grid = grd.to_gmesh(grid)
-        if 'boundaries' in grid:
-            grid.pop('boundaries')
-        return cls(**grid, crs=crs)
+    def from_grd(cls, grid):
+        """
+        grd is a dictionary of of the form:
+        """
+        return cls(**grd.euclidean_mesh(grid))
 
     def transform_to(self, dst_crs):
         dst_crs = CRS.from_user_input(dst_crs)
@@ -71,9 +74,7 @@ def transform_to(self, dst_crs):
                 )
             xy = list(zip(*transformer.transform(self.x, self.y)))
             ids = list(self._coords.keys())
-            self._coords = {
-                ids[i]: coord for i, coord in enumerate(xy)
-            }
+            self._coords = {ids[i]: coord for i, coord in enumerate(xy)}
             self._crs = dst_crs
 
     def get_node_index(self, id):
@@ -115,8 +116,8 @@ def write(self, path, overwrite=False, fmt='gr3'):
     def ascii_string(self, fmt):
         if fmt.lower() in ['grd', 'gr3', 'adcirc', 'schism']:
             return self.grd
-        if fmt.lower() in ['sms', '2dm']:
-            return self.sms
+        # if fmt.lower() in ['sms', '2dm']:
+        #     return self.sms
 
     @_figure
     def tricontourf(self, axes=None, show=True, figsize=None, **kwargs):

pyschism/mesh/friction/fgrid.py

@@ -1,26 +1,28 @@
 from pyschism.mesh import grd
-from pyschism.mesh.gmesh import Gmesh
+from pyschism.mesh.base import EuclideanMesh2D
 
 
-class Fgrid(Gmesh):
+class Fgrid(EuclideanMesh2D):
     """
     Base class for all friction types (e.g. manning.grd, drag.grd, etc...)
     """
     def __init__(
         self,
         nodes,
         elements,
-        boundaries=None,
         crs=None,
         description=None,
     ):
-        super().__init__(**grd.to_gmesh({
+        msh = grd.euclidean_mesh({
             'nodes': nodes,
             'elements': elements,
             'description': description,
-            'boundaries': boundaries}),
-        crs=crs)
+            'crs': crs})
+        msh.update({"crs": crs})
+        super().__init__(**msh)
 
     @staticmethod
     def open(path, crs=None):
-        return Fgrid(**grd.reader(path), crs=crs)
+        msh = grd.reader(path)
+        msh.update({"crs": crs})
+        return Fgrid(**msh)