Merge branch '469-damask-result-protected-false-not-working-for-add_curl-etc' into 'development'

Resolve "damask.Result: protected=False not working for add_curl etc."

Closes #469

See merge request damask/DAMASK!1023

Author: MarDiehl

python/damask/_result.py

@@ -1447,8 +1447,7 @@ def gradient(f: DADF5Dataset, size: np.ndarray) -> DADF5Dataset:
     def _add_generic_grid(self,
                           func: Callable[..., DADF5Dataset],
                           datasets: Dict[str, str],
-                          args: Dict[str, str] = {},
-                          constituents = None):
+                          args: Dict[str,Any]):
         """
         General function to add data on a regular grid.
 
@@ -1460,7 +1459,7 @@ def _add_generic_grid(self,
         datasets : dictionary
             Details of the datasets to be used:
             {arg (name to which the data is passed in func): label (in DADF5 file)}.
-        args : dictionary, optional
+        args : dictionary
             Arguments parsed to func.
 
         """
@@ -1484,13 +1483,17 @@ def _add_generic_grid(self,
                         r = func(**dataset,**args)
                         result = grid_filters.ravel(r['data'])
                         for x in self._visible[ty[0]+'s']:
+                            path = '/'.join(['/',increment[0],ty[0],x,field[0]])
                             if ty[0] == 'phase':
                                 result1 = result[at_cell_ph[0][x]]
                             if ty[0] == 'homogenization':
                                 result1 = result[at_cell_ho[x]]
-
-                            path = '/'.join(['/',increment[0],ty[0],x,field[0]])
-                            h5_dataset = f[path].create_dataset(r['label'],data=result1)
+                            if not self._protected and '/'.join([path,r['label']]) in f:
+                                h5_dataset = f['/'.join([path,r['label']])]
+                                h5_dataset[...] = result1
+                                h5_dataset.attrs['overwritten'] = True
+                            else:
+                                h5_dataset = f[path].create_dataset(r['label'],data=result1)
 
                             h5_dataset.attrs['created'] = util.time_stamp()
 
@@ -1503,7 +1506,7 @@ def _add_generic_grid(self,
     def _add_generic_pointwise(self,
                                func: Callable[..., DADF5Dataset],
                                datasets: Dict[str, str],
-                               args: Dict[str, Any] = {}):
+                               args: Optional[Dict[str, Any]] = None):
         """
         General function to add pointwise data.
 
@@ -1519,6 +1522,7 @@ def _add_generic_pointwise(self,
             Arguments parsed to func.
 
         """
+        args = args if args else {}
 
         def job_pointwise(group: str,
                           callback: Callable[..., DADF5Dataset],

python/tests/test_Result.py

@@ -145,6 +145,29 @@ def test_getters(self,default):
                     fields.append(homogenization[f])
             assert len(fields) > 0
 
+    @pytest.mark.parametrize('protected', [True, False])
+    @pytest.mark.parametrize('func', [lambda default: default._add_generic_grid,
+                                      lambda default: default._add_generic_pointwise])
+    def test_add_generic_dataset_overwrite(self, default, protected, func):
+        def add_test_dataset(f,dummy):
+            return {
+                'data':  f['data'],
+                'label': f'|{f["label"]}|',
+                'meta':  {
+                    'unit':        0,
+                    'description': 'test data',
+                    'creator':     'add_test_dataset'
+                }
+            }
+
+        default._protected = protected
+        func(default)(add_test_dataset, {'f': 'F_e'},{'dummy':'test'})
+        if protected:
+            with pytest.raises(ValueError):
+                func(default)(add_test_dataset, {'f': 'F_e'},{'dummy':'test'})
+        else:
+            func(default)(add_test_dataset, {'f': 'F_e'},{'dummy':'test'})
+
     def test_add_invalid(self,default):
         default.add_absolute('xxxx')
 
@@ -162,7 +185,7 @@ def test_add_calculation(self,default,tmp_path,mode):
             default.add_calculation('2.0*np.abs(#F#)-1.0','x','-','my notes')
         else:
             with open(tmp_path/'f.py','w') as f:
-                f.write("import numpy as np\ndef my_func(field):\n  return 2.0*np.abs(field)-1.0\n")
+                f.write('import numpy as np\ndef my_func(field):\n  return 2.0*np.abs(field)-1.0\n')
             sys.path.insert(0,str(tmp_path))
             import f
             default.enable_user_function(f.my_func)