corrected unit conversion bug for risk

Deltares · Sep 27, 2023 · 86b79c5 · 86b79c5
1 parent 177adb8
commit 86b79c5
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/hydromt_fiat/fiat.py b/hydromt_fiat/fiat.py
@@ -393,9 +393,6 @@ def setup_hazard(
                     # da = da.squeeze('timemax').drop('timemax')
                     da = da.isel(timemax=0).drop("timemax")
 
-                    # Convert to units of the exposure data if required
-                    if self.exposure.unit != da.units:
-                        da = da * unit_conversion_factor
 
                 else:
                     if not self.region.empty:
@@ -405,6 +402,7 @@ def setup_hazard(
                         da = self.data_catalog.get_rasterdataset(da_map_fn)
                     else:
                         da = self.data_catalog.get_rasterdataset(da_map_fn)
+                                    # Convert to units of the exposure data if required
             # reading from the datacatalog
             else:
                 if not self.region.empty:
@@ -414,7 +412,8 @@ def setup_hazard(
                     da = self.data_catalog.get_rasterdataset(map_fn, variables=da_name)
                 else:
                     da = self.data_catalog.get_rasterdataset(map_fn, variables=da_name)
-
+            if self.exposure.unit != da.units:
+                da = da * unit_conversion_factor
             da.encoding["_FillValue"] = None
             da = da.raster.gdal_compliant()