From 56b011aa547daa43644fb0e52baa52fb641a5deb Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 18 Jun 2021 21:11:01 +0200 Subject: [PATCH] better have tests --- python/damask/_result.py | 2 +- python/tests/test_Result.py | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/python/damask/_result.py b/python/damask/_result.py index 9801c13a8..9bd16be0e 100644 --- a/python/damask/_result.py +++ b/python/damask/_result.py @@ -1517,7 +1517,7 @@ class Result: One VTK file per visible increment is created. For point data, the VTK format is poly data (.vtp). - For cell data, either a rectilinear (.vtr) or unstructured (.vtu) dataset + For cell data, either an image (.vti) or unstructured (.vtu) dataset is written for grid-based or mesh-based simulations, respectively. Parameters diff --git a/python/tests/test_Result.py b/python/tests/test_Result.py index d7f1bc3d1..b0648c67b 100644 --- a/python/tests/test_Result.py +++ b/python/tests/test_Result.py @@ -8,6 +8,7 @@ import hashlib from datetime import datetime import pytest +import vtk import numpy as np from damask import Result @@ -410,10 +411,27 @@ class TestResult: single_phase.add_calculation(f"np.ones(np.shape(#F#)[0:1]+{shape[1]},'{dtype}')",f'{shape[0]}_{dtype}') fname = os.path.splitext(os.path.basename(single_phase.fname))[0]+'.xdmf' os.chdir(tmp_path) + single_phase.save_XDMF() + single_phase.view('increments',0).save_VTK() + + reader_xdmf = vtk.vtkXdmfReader() + reader_xdmf.SetFileName(fname) + reader_xdmf.Update() + dim_xdmf = reader_xdmf.GetOutput().GetDimensions() + bounds_xdmf = reader_xdmf.GetOutput().GetBounds() + + reader_vti = vtk.vtkXMLImageDataReader() + reader_vti.SetFileName(os.path.splitext(fname)[0]+'_inc00.vti') + reader_vti.Update() + dim_vti = reader_vti.GetOutput().GetDimensions() + bounds_vti = reader_vti.GetOutput().GetBounds() + if update: shutil.copy(tmp_path/fname,ref_path/fname) - assert sorted(open(tmp_path/fname).read()) == sorted(open(ref_path/fname).read()) # XML is not ordered + + assert dim_vti == dim_xdmf and bounds_vti == bounds_xdmf and \ + sorted(open(tmp_path/fname).read()) == sorted(open(ref_path/fname).read()) # XML is not ordered def test_XDMF_invalid(self,default): with pytest.raises(TypeError):