resolve conflict.

Author: gabrielaznar

climada/hazard/storm_europe.py

@@ -72,14 +72,18 @@ def read_footprints(self, path, description=None,
 
         file_names = get_file_names(path)
 
-        if ref_raster is not None and centroids is None:
-            centroids = self._centroids_from_nc(ref_raster)
-        elif ref_raster is not None and centroids is not None:
+        if ref_raster is not None and centroids is not None:
             LOGGER.warning('Overriding ref_raster with centroids')
-        else:
-            centroids = self._centroids_from_nc(file_name[0])
 
-        files_omit = to_list(files_omit)
+        if centroids is not None:
+            pass
+        elif ref_raster is not None:
+            centroids = self._centroids_from_nc(ref_raster)
+        elif ref_raster is None:
+            centroids = self._centroids_from_nc(file_names[0])
+
+        if isinstance(files_omit, str):
+            files_omit = [files_omit]
 
         for fn in file_names:
             if any(fo in fn for fo in files_omit):

climada/hazard/test/test_storm_europe.py

@@ -0,0 +1,100 @@
+"""
+Test StormEurope class
+"""
+
+import os
+import unittest
+import datetime as dt
+import numpy as np
+from scipy import sparse
+
+from climada import StormEurope, Centroids, GridPoints, SYSTEM_DIR
+
+
+class TestReader(unittest.TestCase):
+    """ Test loading functions from the StormEurope class """
+
+    fn = [
+        'fp_lothar_crop-test.nc',
+        'fp_xynthia_crop-test.nc',
+    ]
+    ncdfs = [os.path.join(SYSTEM_DIR, f) for f in fn]
+
+    ct = Centroids(os.path.join(SYSTEM_DIR, 'fp_centroids-test.csv'))
+
+    def test_centroids_from_nc(self):
+        """ Test if centroids can be constructed correctly """
+        ct = StormEurope._centroids_from_nc(self.ncdfs[0])
+
+        self.assertTrue(isinstance(ct, Centroids))
+        self.assertTrue(isinstance(ct.coord, GridPoints))
+        self.assertEqual(ct.size, 10000)
+        self.assertEqual(ct.coord.shape[0], ct.id.shape[0])
+
+    def test_read_footprints(self):
+        """ Test read_footprints function, using two small test files"""
+        se = StormEurope()
+        se.read_footprints(self.ncdfs)
+
+        self.assertEqual(se.tag.haz_type, 'WS')
+        self.assertEqual(se.units, 'm/s')
+        self.assertEqual(se.event_id.size, 2)
+        self.assertEqual(se.date.size, 2)
+        self.assertEqual(dt.datetime.fromordinal(se.date[0]).year, 1999)
+        self.assertEqual(dt.datetime.fromordinal(se.date[0]).month, 12)
+        self.assertEqual(dt.datetime.fromordinal(se.date[0]).day, 26)
+        self.assertEqual(se.event_id[0], 1)
+        self.assertEqual(se.event_name[0], 'Lothar')
+        self.assertTrue(isinstance(se.intensity, sparse.csr.csr_matrix))
+        self.assertTrue(isinstance(se.fraction, sparse.csr.csr_matrix))
+        self.assertEqual(se.intensity.shape, (2, 10000))
+        self.assertEqual(se.fraction.shape, (2, 10000))
+
+    def test_read_with_ref(self):
+        """ Test read_footprints while passing in a reference raster. """
+        se = StormEurope()
+        se.read_footprints(self.ncdfs, ref_raster=self.ncdfs[1])
+
+        self.assertEqual(se.tag.haz_type, 'WS')
+        self.assertEqual(se.units, 'm/s')
+        self.assertEqual(se.event_id.size, 2)
+        self.assertEqual(se.date.size, 2)
+        self.assertEqual(dt.datetime.fromordinal(se.date[0]).year, 1999)
+        self.assertEqual(dt.datetime.fromordinal(se.date[0]).month, 12)
+        self.assertEqual(dt.datetime.fromordinal(se.date[0]).day, 26)
+        self.assertEqual(se.event_id[0], 1)
+        self.assertEqual(se.event_name[0], 'Lothar')
+        self.assertTrue(isinstance(se.intensity, sparse.csr.csr_matrix))
+        self.assertTrue(isinstance(se.fraction, sparse.csr.csr_matrix))
+        self.assertEqual(se.intensity.shape, (2, 10000))
+        self.assertEqual(se.fraction.shape, (2, 10000))
+
+    def test_read_with_cent(self):
+        """ Test read_footprints while passing in a Centroids object """
+        se = StormEurope()
+        se.read_footprints(self.ncdfs, centroids=self.ct)
+
+        self.assertEqual(se.tag.haz_type, 'WS')
+        self.assertEqual(se.units, 'm/s')
+        self.assertEqual(se.event_id.size, 2)
+        self.assertEqual(se.date.size, 2)
+        self.assertEqual(dt.datetime.fromordinal(se.date[0]).year, 1999)
+        self.assertEqual(dt.datetime.fromordinal(se.date[0]).month, 12)
+        self.assertEqual(dt.datetime.fromordinal(se.date[0]).day, 26)
+        self.assertEqual(se.event_id[0], 1)
+        self.assertEqual(se.event_name[0], 'Lothar')
+        self.assertTrue(isinstance(se.intensity, sparse.csr.csr_matrix))
+        self.assertTrue(isinstance(se.fraction, sparse.csr.csr_matrix))
+        self.assertEqual(se.intensity.shape, (2, 10000))
+        self.assertEqual(se.fraction.shape, (2, 10000))
+        self.assertEqual(
+            se.centroids.region_id[
+                np.isnan(se.centroids.region_id)
+            ].size,
+            7515
+        )
+
+
+# Execute Tests
+TESTS = unittest.TestLoader().loadTestsFromTestCase(TestReader)
+unittest.TextTestRunner(verbosity=2).run(TESTS)

climada/util/test/test_files.py

@@ -89,7 +89,7 @@ def test_globbing(self):
 
         tmp_files = os.listdir(file_name)
         tmp_files = [file_name + f for f in tmp_files]
-        tmp_files = [f for f in tmp_files if not os.path.isdir(f) 
+        tmp_files = [f for f in tmp_files if not os.path.isdir(f)
                 and not os.path.basename(os.path.normpath(f)).startswith('.')]
 
         self.assertEqual(len(tmp_files), len(out))