Merge pull request #1731 from knutfrode/dev

[run-ex] Leeway: Avoid reading stokes drift variables if stokes drift…

Author: knutfrode

environment.yml

@@ -10,7 +10,7 @@ dependencies:
   - pyproj>=2.3
   - libgdal>=3.1
   - gdal>=3.1
-  - xarray
+  - xarray<=2025.9.0
   - dask
   - geopandas
   - cfgrib

opendrift/models/basemodel/__init__.py

@@ -1940,7 +1940,8 @@ def run(self,
 
         # Store expected simulation extent, to check if new readers have coverage
         self.simulation_extent = simulation_extent
-        self.env.finalize(self.simulation_extent)
+        self.env.finalize(simulation_extent=self.simulation_extent,
+                          start=self.start_time, end=self.expected_end_time)
 
         ####################################################################
         # Preparing history array for storage in memory and eventually file

opendrift/models/leeway.py

@@ -156,10 +156,12 @@ class Leeway(OpenDriftSimulation):
         },
         'sea_surface_wave_stokes_drift_x_velocity': {
             'fallback': 0,
+            'skip_if': ['drift:stokes_drift', 'is', False],
             'important': False
         },
         'sea_surface_wave_stokes_drift_y_velocity': {
             'fallback': 0,
+            'skip_if': ['drift:stokes_drift', 'is', False],
             'important': False
         },