Merge branch 'development' into initial-V_e

VERSION

@@ -1 +1 @@
-3.0.0-alpha6-367-g85fa92ee1
+3.0.0-alpha6-371-g18d862cdb

python/damask/_table.py

@@ -370,9 +370,9 @@ class Table:
         label : str
             Column label.
         data : numpy.ndarray
-            Column data.
+            Column data. First dimension needs to match number of rows.
         info : str, optional
-            Human-readable information about the modified data.
+            Human-readable information about the data.
 
         Returns
         -------

python/damask/_vtk.py

@@ -404,10 +404,11 @@ class VTK:
     def set(self,
             label: str = None,
             data: Union[np.ndarray, np.ma.MaskedArray] = None,
+            info: str = None,
             *,
             table: 'Table' = None):
         """
-        Add (or replace existing) point or cell data.
+        Add new or replace existing point or cell data.
 
         Data can either be a numpy.array, which requires a corresponding label,
         or a damask.Table.
@@ -419,6 +420,8 @@ class VTK:
         data : numpy.ndarray or numpy.ma.MaskedArray, optional
             Data to add or replace. First array dimension needs to match either
             number of cells or number of points.
+        info : str, optional
+            Human-readable information about the data.
         table: damask.Table, optional
             Data to add or replace. Each table label is individually considered.
             Number of rows needs to match either number of cells or number of points.
@@ -465,14 +468,17 @@ class VTK:
                 _add_array(dup.vtk_data,
                            label,
                            np.where(data.mask,data.fill_value,data) if isinstance(data,np.ma.MaskedArray) else data)
+                if info is not None: dup.comments += f'{label}: {info}'
             else:
                 raise ValueError('no label defined for data')
         elif isinstance(table,Table):
             for l in table.labels:
                 _add_array(dup.vtk_data,l,table.get(l))
+                if info is not None: dup.comments += f'{l}: {info}'
         else:
             raise TypeError
 
+
         return dup
 
 

src/HDF5_utilities.f90

@@ -48,7 +48,7 @@ module HDF5_utilities
 !> @details for parallel IO, all dimension except for the last need to match
 !--------------------------------------------------------------------------------------------------
   interface HDF5_write
-#if defined(__GFORTRAN__) && __GNUC__<11
+#if defined(__GFORTRAN__)
     module procedure HDF5_write_real1
     module procedure HDF5_write_real2
     module procedure HDF5_write_real3
@@ -1214,7 +1214,7 @@ subroutine HDF5_read_int7(dataset,loc_id,datasetName,parallel)
 
 end subroutine HDF5_read_int7
 
-#if defined(__GFORTRAN__) && __GNUC__<11
+#if defined(__GFORTRAN__)
 
 !--------------------------------------------------------------------------------------------------
 !> @brief write dataset of type real with 1 dimension
@@ -1631,7 +1631,7 @@ subroutine HDF5_write_str(dataset,loc_id,datasetName)
 
 end subroutine HDF5_write_str
 
-#if defined(__GFORTRAN__) && __GNUC__<11
+#if defined(__GFORTRAN__)
 
 !--------------------------------------------------------------------------------------------------
 !> @brief write dataset of type integer with 1 dimension