Merge pull request #1709 from knutfrode/dev

Dev

Author: knutfrode

examples/example_oilspill_seafloor_biodegradation.py

@@ -44,7 +44,7 @@
 
 #%%
 # Running model
-o.run(duration=timedelta(days=5), time_step=3600)
+o.run(duration=timedelta(days=2), time_step=3600)
 
 #%%
 # Plot and animate results

examples/example_openberg.py

@@ -12,8 +12,7 @@
 
 #%%
 # Currents and wind forcing
-forcing = ['https://thredds.met.no/thredds/dodsC/fou-hi/barents_eps_zdepth_be',
-           'https://pae-paha.pacioos.hawaii.edu/thredds/dodsC/ncep_global/NCEP_Global_Atmospheric_Model_best.ncd']
+forcing = ['https://thredds.met.no/thredds/dodsC/fou-hi/barents_eps_zdepth_be']
 
 #%%
 # A permutation of iceberg sizes/dimensions

examples/example_river_runoff.py

@@ -22,6 +22,7 @@
 o = OceanDrift(loglevel=20)
 o.set_config('drift:horizontal_diffusivity', 300)
 o.set_config('general:coastline_action', 'previous')
+o.set_config('general:coastline_approximation_precision', None)  # Faster to go back to previous
 t1 = datetime.now()
 t2 = t1 + timedelta(hours=48)
 reader_x = reader_oscillating.Reader('x_sea_water_velocity', period=timedelta(hours=24),

opendrift/models/basemodel/__init__.py

@@ -981,6 +981,10 @@ def closest_ocean_points(self, lon, lat):
             landlats = lat[land_indices]
             longrid = np.arange(lonmin, lonmax, deltalon)
             latgrid = np.arange(latmin, latmax, deltalat)
+            if len(longrid) > 1000 or len(latgrid) > 1000:
+                logger.warning(f'Particles cover large area - using coarser resolution for closest ocean point')
+                longrid = np.linspace(lonmin, lonmax, 1000)
+                latgrid = np.linspace(latmin, latmax, 1000)
             longrid, latgrid = np.meshgrid(longrid, latgrid)
             longrid = longrid.ravel()
             latgrid = latgrid.ravel()
@@ -2865,6 +2869,8 @@ def plot_timestep(i):
 
         if color is False:
             cargs = {'c': None, 'color': markercolor, 'cmap': None}
+            vmin=None
+            vmax=None
         else:
             cargs = {'c': [], 'color': None, 'cmap': cmap}
 

tests/readers/test_interpolation.py

@@ -126,7 +126,6 @@ def test_dateline(self):
         lons = np.arange(-180, 181, 20)
         lats = np.arange(-80, 81, 20)
         lons, lats = np.meshgrid(lons, lats)
-        o.set_config('seed:ocean_only', False)
         o.seed_elements(lon=lons, lat=lats, time=start_time, wind_drift_factor=.1)
         o.run(steps=2, time_step=3600*12)
         # Check expected drift direction for each quadrant