Fixed a bug with pre-imported risk functions [skip hazardlib][demos]

gem · Mar 11, 2018 · ee33225 · ee33225
1 parent f0e2aeb
commit ee33225
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/demos/risk/EventBasedRisk/job_risk.ini b/demos/risk/EventBasedRisk/job_risk.ini
@@ -6,10 +6,6 @@ concurrent_tasks = 16
 [boundaries]
 region_constraint = 78.0 31.5, 89.5 31.5, 89.5 25.5, 78.0 25.5
 
-[vulnerability]
-structural_vulnerability_file = structural_vulnerability_model.xml
-nonstructural_vulnerability_file = nonstructural_vulnerability_model.xml
-
 [risk_calculation]
 asset_hazard_distance = 20
 conditional_loss_poes = 0.01, 0.02

diff --git a/openquake/commonlib/oqvalidation.py b/openquake/commonlib/oqvalidation.py
@@ -332,7 +332,13 @@ def all_cost_types(self):
         Return the cost types of the computation (including `occupants`
         if it is there) in order.
         """
-        return sorted(self.risk_files)
+        costtypes = sorted(self.risk_files)
+        if not costtypes and self.hazard_calculation_id:
+            with datastore.read(self.hazard_calculation_id) as ds:
+                parent = ds['oqparam']
+            self._file_type, self._risk_files = get_risk_files(parent.inputs)
+            costtypes = sorted(self.risk_files)
+        return costtypes
 
     def set_risk_imtls(self, risk_models):
         """