Restored accidental change

gem · Nov 18, 2024 · e9760af · e9760af
1 parent 438f662
commit e9760af
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/openquake/calculators/export/risk.py b/openquake/calculators/export/risk.py
@@ -381,10 +381,10 @@ def modal_damage_array(data, dstates):
     acc = general.AccumDict(accum=[])
     for name in data.dtype.names:  # peril-ltype-dstate
         try:
-            peril, ltype, _dstate = name.split('~')
+            peril, ltype, _dstate = name.split('-')
             modal = f'modal-ds-{peril}~{ltype}'
         except ValueError:
-            ltype, _dstate = name.split('~')
+            ltype, _dstate = name.split('-')
             modal = 'modal-ds-' + ltype
         if ltype != 'no_damage':
             acc[modal].append(data[name])
@@ -437,8 +437,8 @@ def export_damages_csv(ekey, dstore):
             else:
                 damages = orig[:, i]
             fname = dstore.build_fname(name, ros, ekey[1])
-        writer.save(compose_arrays(assets, damages), fname,
-                    comment=md, renamedict=dict(id='asset_id'))
+        arr = compose_arrays(assets, damages)
+        writer.save(arr, fname, comment=md, renamedict=dict(id='asset_id'))
     return writer.getsaved()
 
 

diff --git a/openquake/calculators/extract.py b/openquake/calculators/extract.py
@@ -847,7 +847,7 @@ def _dmg_get(array, loss_type):
     out = []
     for name in array.dtype.names:
         try:
-            ltype, _dstate = name.split('~')
+            ltype, _dstate = name.split('-')
         except ValueError:
             # ignore secondary perils
             continue

diff --git a/openquake/calculators/views.py b/openquake/calculators/views.py
@@ -561,7 +561,7 @@ def view_portfolio_dmgdist(token, dstore):
     sums = sum_records(dstore['damages-rlzs'][:, 0])
     acc = AccumDict(accum=[])
     for name in sums.dtype.names:
-        ltype, dstate = name.split('~')
+        ltype, dstate = name.split('-')
         acc[dstate].append(sums[name][0])
         if dstate == 'no_damage':
             acc['loss_type'].append(ltype)

diff --git a/openquake/risklib/riskmodels.py b/openquake/risklib/riskmodels.py
@@ -797,9 +797,9 @@ def multi_damage_dt(self):
             for ltype in self.oqparam.loss_types:
                 for dc in dcs:
                     if peril == 'earthquake':
-                        field = f'{ltype}~{dc}'
+                        field = f'{ltype}-{dc}'
                     else:
-                        field = f'{peril}~{ltype}~{dc}'
+                        field = f'{peril}-{ltype}-{dc}'
                     lst.append((field, F32))
         return numpy.dtype(lst)