Merge develop into master

GeoscienceAustralia · Mar 17, 2021 · eb2ce2e · eb2ce2e
1 parent c46c091
commit eb2ce2e
Show file tree

Hide file tree

Showing 3 changed files with 1,316 additions and 6 deletions.
diff --git a/examples/wind/olwyn.yaml b/examples/wind/olwyn.yaml
@@ -1,7 +1,7 @@
 #  python ../hazimp/hazimp/main.py -c olwyn_hazimp.yaml 
 - template: wind_nc
-- vulnerability_filename: synthetic_domestic_wind_vul_curves.xml
-- vulnerability_set: domestic_wind_2012
+- vulnerability_filename: domestic_wind_vul_curves_2021.xml
+- vulnerability_set: domestic_wind_2021
 - load_exposure:
    file_name: WA_Wind_Exposure_2013_Test_only.csv
    exposure_latitude: LATITUDE

diff --git a/hazimp_preprocessing/curve_data/create_vuln_xml.py b/hazimp_preprocessing/curve_data/create_vuln_xml.py
@@ -150,7 +150,7 @@ def csv_curve2nrml(csv_filename, xml_filename):
             for iml in imls:
                 if numpy.isnan(iml):
                     continue
-                loss_ratio += str(row[str(iml)]) + ' '
+                loss_ratio += str(row[str(int(iml))]) + ' '
                 coef_var += '0 '
             write_nrml_curve(xml_h, row['vulnerabilityFunctionID'], imls, csv_dict['IMT'][0],
                              loss_ratio, coef_var)
@@ -349,9 +349,9 @@ def excel_curve2nrml(contents_filename, fabric_filename, xls_filename):
 
 # -----------------------------------------------------------
 if __name__ == "__main__":
-    if False:
-        csv_curve2nrml('domestic_wind_vul_curves.csv',
-                       'domestic_wind_vul_curves.xml')
+    if True:
+        csv_curve2nrml('domestic_wind_vul_curves_2021.csv',
+                       'domestic_wind_vul_curves_2021.xml')
     if False:
         csv_curve2nrml('synthetic_domestic_wind_vul_curves.csv',
                        'synthetic_domestic_wind_vul_curves.xml')