Merge branch 'mypy1.1' into development

Author: MarDiehl

python/damask/_geomgrid.py

@@ -169,9 +169,9 @@ def origin(self,
     @property
     def initial_conditions(self) -> Dict[str,np.ndarray]:
         """Fields of initial conditions."""
-        self._ic = dict(zip(self._ic.keys(),                                    # type: ignore
+        self._ic = dict(zip(self._ic.keys(),                                                        # type: ignore
                         [v if isinstance(v,np.ndarray) else
-                         np.broadcast_to(v,self.cells) for v in self._ic.values()])) # type: ignore
+                         np.broadcast_to(v,self.cells) for v in self._ic.values()]))                # type: ignore
         return self._ic
 
     @initial_conditions.setter
@@ -214,7 +214,7 @@ def _load(fname: Union[str, Path], label: str) -> 'GeomGrid':
 
         """
         v = VTK.load(fname if str(fname).endswith('.vti') else str(fname)+'.vti')
-        cells = np.array(v.vtk_data.GetDimensions())-1
+        cells = np.array(v.vtk_data.GetDimensions())-1                                              # type: ignore
         bbox  = np.array(v.vtk_data.GetBounds()).reshape(3,2).T
         ic = {l:v.get(l).reshape(cells,order='F') for l in set(v.labels['Cell Data']) - {label}}
 
@@ -307,7 +307,7 @@ def load_Neper(fname: Union[str, Path]) -> 'GeomGrid':
 
         """
         v = VTK.load(fname,'ImageData')
-        cells = np.array(v.vtk_data.GetDimensions())-1
+        cells = np.array(v.vtk_data.GetDimensions())-1                                              # type: ignore
         bbox  = np.array(v.vtk_data.GetBounds()).reshape(3,2).T
 
         return GeomGrid(material = v.get('MaterialId').reshape(cells,order='F').astype('int32',casting='unsafe'),

python/damask/_vtk.py

@@ -4,6 +4,9 @@
 from typing import Optional, Union, Literal, List, Sequence
 
 import numpy as np
+
+from vtkmodules.vtkIOXML import vtkXMLReader, vtkXMLWriter
+
 from vtkmodules.vtkCommonCore import (
     vtkPoints,
     vtkStringArray,
@@ -79,7 +82,7 @@ def __init__(self,
             vtkPolyData, and vtkRectilinearGrid.
 
         """
-        self.vtk_data = vtk_data
+        self.vtk_data: vtkDataSet = vtk_data
 
 
     def __repr__(self) -> str:
@@ -89,7 +92,7 @@ def __repr__(self) -> str:
         Give short, human-readable summary.
 
         """
-        info = [self.vtk_data.__vtkname__]
+        info = [self.vtk_data.__vtkname__]                                                          # type: ignore
 
         for data in ['Cell Data', 'Point Data']:
             if data == 'Cell Data':  info.append(f'\n# cells: {self.N_cells}')
@@ -351,39 +354,34 @@ def load(fname: Union[str, Path],
         if not Path(fname).expanduser().is_file():                                                  # vtk has a strange error handling
             raise FileNotFoundError(f'file "{fname}" not found')
         if (ext := Path(fname).suffix) == '.vtk' or dataset_type is not None:
-            reader = vtkGenericDataObjectReader()
-            reader.SetFileName(str(Path(fname).expanduser()))
+            vtk_reader = vtkGenericDataObjectReader()
+            vtk_reader.SetFileName(str(Path(fname).expanduser()))
             if dataset_type is None:
                 raise TypeError('dataset type for *.vtk file not given')
-            elif dataset_type.lower().endswith(('imagedata','image_data')):
-                reader.Update()
-                vtk_data = reader.GetStructuredPointsOutput()
-            elif dataset_type.lower().endswith(('unstructuredgrid','unstructured_grid')):
-                reader.Update()
-                vtk_data = reader.GetUnstructuredGridOutput()
-            elif dataset_type.lower().endswith(('polydata','poly_data')):
-                reader.Update()
-                vtk_data = reader.GetPolyDataOutput()
-            elif dataset_type.lower().endswith(('rectilineargrid','rectilinear_grid')):
-                reader.Update()
-                vtk_data = reader.GetRectilinearGridOutput()
+            vtk_reader.Update()
+            if dataset_type.lower().endswith(('imagedata', 'image_data')):
+                vtk_data = vtk_reader.GetStructuredPointsOutput()
+            elif dataset_type.lower().endswith(('unstructuredgrid', 'unstructured_grid')):
+                vtk_data = vtk_reader.GetUnstructuredGridOutput()
+            elif dataset_type.lower().endswith(('polydata', 'poly_data')):
+                vtk_data = vtk_reader.GetPolyDataOutput()
+            elif dataset_type.lower().endswith(('rectilineargrid', 'rectilinear_grid')):
+                vtk_data = vtk_reader.GetRectilinearGridOutput()
             else:
                 raise TypeError(f'unknown dataset type "{dataset_type}" for vtk file')
         else:
-            if   ext == '.vti':
-                reader = vtkXMLImageDataReader()
-            elif ext == '.vtu':
-                reader = vtkXMLUnstructuredGridReader()
-            elif ext == '.vtp':
-                reader = vtkXMLPolyDataReader()
-            elif ext == '.vtr':
-                reader = vtkXMLRectilinearGridReader()
-            else:
+            xml_reader: Optional[vtkXMLReader] = (
+                vtkXMLImageDataReader() if ext == '.vti' else
+                vtkXMLUnstructuredGridReader() if ext == '.vtu' else
+                vtkXMLPolyDataReader() if ext == '.vtp' else
+                vtkXMLRectilinearGridReader() if ext == '.vtr' else
+                None
+            )
+            if xml_reader is None:
                 raise TypeError(f'unknown file extension "{ext}"')
-
-            reader.SetFileName(str(Path(fname).expanduser()))
-            reader.Update()
-            vtk_data = reader.GetOutput()
+            xml_reader.SetFileName(str(Path(fname).expanduser()))
+            xml_reader.Update()
+            vtk_data = xml_reader.GetOutputAsDataSet()
 
         return VTK(vtk_data)
 
@@ -421,14 +419,15 @@ def save(self,
             Compress with zlib algorithm. Defaults to True.
 
         """
-        if   isinstance(self.vtk_data,vtkImageData):
-            writer = vtkXMLImageDataWriter()
-        elif isinstance(self.vtk_data,vtkUnstructuredGrid):
-            writer = vtkXMLUnstructuredGridWriter()
-        elif isinstance(self.vtk_data,vtkPolyData):
-            writer = vtkXMLPolyDataWriter()
-        elif isinstance(self.vtk_data,vtkRectilinearGrid):
-            writer = vtkXMLRectilinearGridWriter()
+        writer: Optional[vtkXMLWriter] = (
+            vtkXMLImageDataWriter() if isinstance(self.vtk_data, vtkImageData) else
+            vtkXMLUnstructuredGridWriter() if isinstance(self.vtk_data, vtkUnstructuredGrid) else
+            vtkXMLPolyDataWriter() if isinstance(self.vtk_data, vtkPolyData) else
+            vtkXMLRectilinearGridWriter() if isinstance(self.vtk_data, vtkRectilinearGrid) else
+            None
+        )
+        if writer is None:
+            raise TypeError(f'unknown vtk_data type "{type(self.vtk_data)}"')
 
         default_ext = '.'+writer.GetDefaultFileExtension()
         ext = Path(fname).suffix
@@ -656,8 +655,8 @@ def show(self,
         for i,c in enumerate(colormap_.colors):
             lut.SetTableValue(i,c if len(c)==4 else np.append(c,1.0))
         lut.Build()
-
-        self.vtk_data.GetCellData().SetActiveScalars(label)
+        if label is not None:
+            self.vtk_data.GetCellData().SetActiveScalars(label)
         mapper = vtkDataSetMapper()
         mapper.SetInputData(self.vtk_data)
         mapper.SetLookupTable(lut)