Merge branch 'master' of https://github.com/pletzer/mint

Author: pletzer

.gitignore

@@ -21,7 +21,10 @@ pip-cache
 .coverage
 .pytest_cache
 
-# Created by editiors
+# Build
+cmake-build-debug/
+
+# Created by editors
 *~
 \#*
 \.\#*

mint/tests/test_grid.py

@@ -1,9 +1,8 @@
 from mint import Grid
 import numpy
-import sys
 from pathlib import Path
 import vtk
-
+from tempfile import NamedTemporaryFile
 
 def test_create_grid():
     # create the grid
@@ -18,7 +17,8 @@ def test_create_grid():
                           (2., 1., 0.),
                           (1., 1., 0.)]).reshape(2, 4, 3)
     gr.setPoints(points)
-    gr.dump('test_create_grid.vtk')
+    with NamedTemporaryFile() as f:
+        gr.dump(f.name)
 
 def test_attach_data():
     # create the grid
@@ -37,15 +37,16 @@ def test_attach_data():
     nDataPerCell = 3
     data = numpy.arange(0, 2*nDataPerCell, dtype=numpy.float64).reshape((2, nDataPerCell))
     gr.attach('mydata', data)
-    gr.dump('test_create_grid_with_data.vtk')
-    # read the data back to check the layout of the data
-    reader = vtk.vtkUnstructuredGridReader()
-    reader.SetFileName('test_create_grid_with_data.vtk')
-    reader.Update()
-    ugrid = reader.GetOutput()
-    arr = ugrid.GetCellData().GetArray('mydata')
-    assert(arr.GetNumberOfTuples() == gr.getNumberOfCells())
-    assert(arr.GetNumberOfComponents() == nDataPerCell)
+    with NamedTemporaryFile() as f:
+        gr.dump(f.name)
+        # read the data back to check the layout of the data
+        reader = vtk.vtkUnstructuredGridReader()
+        reader.SetFileName(f.name)
+        reader.Update()
+        ugrid = reader.GetOutput()
+        arr = ugrid.GetCellData().GetArray('mydata')
+        assert(arr.GetNumberOfTuples() == gr.getNumberOfCells())
+        assert(arr.GetNumberOfComponents() == nDataPerCell)
 
 def test_load_grid():
     data_dir = Path(__file__).absolute().parent / '../../data'

mint/tests/test_vector_interp.py

@@ -2,6 +2,8 @@
 from mint import VectorInterp
 import numpy
 import vtk
+from tempfile import TemporaryDirectory
+from os import sep
 
 
 def generateStructuredGridPoints(nx, ny, v0, v1, v2, v3):
@@ -171,27 +173,28 @@ def test_slanted():
     # all points fall within the source grid so numBad == 0
     assert(numBad == 0)
 
-    # generate edge data
-    data = numpy.zeros((numCells, 4), numpy.float64)
-    for cellId in range(numCells):
-        # iterate over the edges of the source grid cells
-        for edgeIndex in range(4):
+    with TemporaryDirectory() as d:
+        # generate edge data
+        data = numpy.zeros((numCells, 4), numpy.float64)
+        for cellId in range(numCells):
+            # iterate over the edges of the source grid cells
+            for edgeIndex in range(4):
 
-            # set one edge to 1, all other edges to zero
-            data[cellId, edgeIndex] = 1.0
+                # set one edge to 1, all other edges to zero
+                data[cellId, edgeIndex] = 1.0
 
-            # get the edge interpolated vectors
-            vectorData = vi.getEdgeVectors(data)
-            fileName = f'slanted_edgeVectors_cellId{cellId}edgeIndex{edgeIndex}.vtk'
-            saveVectorsVTKFile(targetPoints, vectorData, fileName)
+                # get the edge interpolated vectors
+                vectorData = vi.getEdgeVectors(data)
+                fileName = f'{d}{sep}slanted_edgeVectors_cellId{cellId}edgeIndex{edgeIndex}.vtk'
+                saveVectorsVTKFile(targetPoints, vectorData, fileName)
 
-            # get the lateral face interpolated vectors
-            vectorData = vi.getFaceVectors(data)
-            fileName = f'slanted_faceVectors_cellId{cellId}edgeIndex{edgeIndex}.vtk'
-            saveVectorsVTKFile(targetPoints, vectorData, fileName)
+                # get the lateral face interpolated vectors
+                vectorData = vi.getFaceVectors(data)
+                fileName = f'{d}{sep}slanted_faceVectors_cellId{cellId}edgeIndex{edgeIndex}.vtk'
+                saveVectorsVTKFile(targetPoints, vectorData, fileName)
 
-            # reset this edge's value back to its original
-            data[cellId, edgeIndex] = 0.0
+                # reset this edge's value back to its original
+                data[cellId, edgeIndex] = 0.0
 
 
 def test_degenerate():
@@ -222,26 +225,27 @@ def test_degenerate():
     # all points fall within the source grid so numBad == 0
     assert(numBad == 0)
 
-    # generate edge data
-    data = numpy.zeros((numCells, 4), numpy.float64)
-    for cellId in range(numCells):
-        # iterate over the edges of the source grid cells
-        for edgeIndex in range(4):
+    with TemporaryDirectory() as d:
+        # generate edge data
+        data = numpy.zeros((numCells, 4), numpy.float64)
+        for cellId in range(numCells):
+            # iterate over the edges of the source grid cells
+            for edgeIndex in range(4):
 
-            # set one edge to 1, all other edges to zero
-            data[cellId, edgeIndex] = 1.0
+                # set one edge to 1, all other edges to zero
+                data[cellId, edgeIndex] = 1.0
 
-            # get the edge interpolated vectors
-            vectorData = vi.getEdgeVectors(data)
+                # get the edge interpolated vectors
+                vectorData = vi.getEdgeVectors(data)
 
-            # get the face interpolated vectors
-            vectorData = vi.getFaceVectors(data)
+                # get the face interpolated vectors
+                vectorData = vi.getFaceVectors(data)
 
-            # reset this edge's value back to its original
-            data[cellId, edgeIndex] = 0.0
+                # reset this edge's value back to its original
+                data[cellId, edgeIndex] = 0.0
 
-            fileName = f'degenerate_cellId{cellId}edgeIndex{edgeIndex}.vtk'
-            saveVectorsVTKFile(targetPoints, vectorData, fileName)
+                fileName = f'{d}{sep}degenerate_cellId{cellId}edgeIndex{edgeIndex}.vtk'
+                saveVectorsVTKFile(targetPoints, vectorData, fileName)
 
 
 if __name__ == '__main__':