Minor improvements

pvelissariou1 · Jan 16, 2020 · 292ebf4 · 292ebf4
1 parent e9093b1
commit 292ebf4
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 5 deletions.
diff --git a/pyschism/mesh/gr3.py b/pyschism/mesh/gr3.py
@@ -2,7 +2,7 @@
 import numpy as np
 from pyschism.mesh.gmesh import Gmesh
 from functools import lru_cache
-from collections import defaultdict
+from collections import defaultdict, namedtuple
 
 
 def writer(grd, path, overwrite=False):
@@ -142,7 +142,12 @@ def to_mesh(nodes, elements):
     quads = {id: geom for id, geom in elements.items()
              if len(geom) == 4}
     values = [value for coord, value in nodes.values()]
-    return coords, triangles, quads, values
+    msh = namedtuple("msh", ["coords", "triangles", "quads", "values"])
+    return msh(
+        coords=coords,
+        triangles=triangles,
+        quads=quads,
+        values=values)
 
 
 class Gr3(Gmesh):
@@ -154,7 +159,15 @@ def __init__(
         crs=None,
         description=None,
     ):
-        super().__init__(*to_mesh(nodes, elements), crs, description)
+        msh = to_mesh(nodes, elements)
+        super().__init__(
+            msh.coords,
+            msh.triangles,
+            msh.quads,
+            msh.values,
+            crs,
+            description
+        )
 
     @classmethod
     def open(cls, gr3, crs=None):

diff --git a/tests/mesh/test_gr3.py b/tests/mesh/test_gr3.py
@@ -2,7 +2,7 @@
 import unittest
 import pathlib
 import tempfile
-from pyschism.mesh.gr3 import reader, writer
+from pyschism.mesh.gr3 import reader, writer, Gr3
 
 
 class Gr3TestCase(unittest.TestCase):
@@ -71,6 +71,14 @@ def test_overwrite(self):
             pathlib.Path(tmpdir.name) / 'hgrid.gr3'
             )
 
+    def test_Gr3_description_override(self):
+        self.grd.pop('boundaries')
+        self.grd.update({"crs": 3395})
+        self.assertEqual(
+            Gr3(**self.grd).grd['description'],
+            "gr3_unittest CRS: epsg:3395"
+        )
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/mesh/test_mesh.py b/tests/mesh/test_mesh.py
@@ -2,7 +2,8 @@
 import tempfile
 import pathlib
 from pyschism.mesh.friction import Fgrid
-from pyschism.mesh import Mesh
+from pyschism.mesh import Mesh, Vgrid
+from unittest.mock import patch
 import unittest
 
 
@@ -115,3 +116,8 @@ def test_make_plot(self):
     def test_default_fgrid(self):
         m = Mesh.open(self.hgrid)
         assert isinstance(m.fgrid, Fgrid)
+
+    @patch.object(Vgrid, 'is3D', return_value=True)
+    def test_make_plot_3D(self, mock):
+        m = Mesh.open(self.hgrid)
+        self.assertRaises(NotImplementedError, m.make_plot)