Merge pull request #11 from Deltares-research/fix/testing-workflow

Ensure files are closed properly

.github/workflows/tests.yml

@@ -17,7 +17,7 @@ jobs:
         shell: bash -l {0}
     strategy:
       matrix:
-        python-version: ["3.10", "3.11"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
         os: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:

.typos.toml

@@ -3,3 +3,4 @@
 waring = "waring"
 fo = "fo"
 pn = "pn"
+valu = "valu"

cht_cyclones/cyclone_track_database.py

@@ -7,7 +7,7 @@
 import shapely
 import xarray as xr
 
-from .tropical_cyclone import TropicalCyclone
+from cht_cyclones.tropical_cyclone import TropicalCyclone
 
 
 class CycloneTrackDatabase:
@@ -77,7 +77,7 @@ def _read_ibtracs(self, file_name):
         """
 
         # Read in database
-        self.ds = xr.open_dataset(file_name)
+        self.ds = xr.load_dataset(file_name)
 
         # Convert to numpy arrays
         self.lon = self.ds["lon"].values[:]

cht_cyclones/spiderweb.py

@@ -25,7 +25,7 @@ def read(self, filename):
         # Get file extension
         fmt = filename.split(".")[-1]
         if fmt == "nc":
-            self.ds = xr.open_dataset(filename)
+            self.ds = xr.load_dataset(filename)
         elif fmt == "spw":
             self.read_spiderweb_ascii(filename)
 

cht_cyclones/track_dataset.py

@@ -119,7 +119,7 @@ def _read_ibtracs(self, file_name):
         """
 
         # Read in dataset
-        self.ds = xr.open_dataset(file_name)
+        self.ds = xr.load_dataset(file_name)
 
         # Convert to numpy arrays
         self.lon = self.ds["lon"].values[:]

cht_cyclones/tropical_cyclone_refactored.py

@@ -573,15 +573,14 @@ def get_wind_field_from_coamps(
                 print("File does not exist : " + coamps_file)
                 continue
 
-            ds = xr.open_dataset(coamps_file)
-            # ds = ds.sel(lon=slice(xx.min(), xx.max()), lat=slice(yy.min(), yy.max()))
-
-            lon = ds["lon"].values
-            lat = ds["lat"].values
-            uu = ds["uuwind"].values
-            vv = ds["vvwind"].values
-            pp = ds["slpres"].values * 100
-            rr = ds["precip"].values
+            with xr.open_dataset(coamps_file) as ds:
+                # ds = ds.sel(lon=slice(xx.min(), xx.max()), lat=slice(yy.min(), yy.max()))
+                lon = ds["lon"].values
+                lat = ds["lat"].values
+                uu = ds["uuwind"].values
+                vv = ds["vvwind"].values
+                pp = ds["slpres"].values * 100
+                rr = ds["precip"].values
 
             lon = lon[0, :] - 360.0
             lat = lat[:, 0]
@@ -607,14 +606,13 @@ def get_wind_field_from_coamps(
                 print("File does not exist : " + coamps_file)
                 continue
 
-            ds = xr.open_dataset(coamps_file)
-
-            lon = ds["lon"].values
-            lat = ds["lat"].values
-            uu = ds["uuwind"].values
-            vv = ds["vvwind"].values
-            pp = ds["slpres"].values * 100
-            rr = ds["precip"].values
+            with xr.open_dataset(coamps_file) as ds:
+                lon = ds["lon"].values
+                lat = ds["lat"].values
+                uu = ds["uuwind"].values
+                vv = ds["vvwind"].values
+                pp = ds["slpres"].values * 100
+                rr = ds["precip"].values
 
             lon = lon[0, :] - 360.0
             lat = lat[:, 0]