Merge pull request #1633 from knutfrode/dev

Dev

Author: knutfrode

opendrift/models/basemodel/__init__.py

@@ -1084,7 +1084,12 @@ def seed_elements(self,
                 az = np.random.rand(np.sum(number)) * 360
                 dist = np.sqrt(np.random.uniform(0, 1,
                                                  np.sum(number))) * radius
-            lon, lat, az = geod.fwd(lon, lat, az, dist, radians=False)
+            if len(lon) > 1:
+                lon, lat, az = geod.fwd(lon, lat, az, dist, radians=False)
+            else:
+                lon, lat, az = geod.fwd(lon[0], lat[0], az[0], dist[0], radians=False)
+                lon = np.atleast_1d(lon)
+                lat = np.atleast_1d(lat)
 
         # If z is 'seafloor'
         if not 'z' in kwargs or kwargs['z'] is None:
@@ -1917,7 +1922,7 @@ def run(self,
             np.radians(np.mean(self.elements_scheduled.lat)))
         # TODO: extent should ideally be a general polygon, not only lon/lat-min/max
         # TODO: Should also take into account eventual lifetime of elements
-        simulation_extent = [
+        simulation_extent = np.array([
             np.maximum(-360,
                        self.elements_scheduled.lon.min() - deltalon),
             np.maximum(-89,
@@ -1926,7 +1931,7 @@ def run(self,
                        self.elements_scheduled.lon.max() + deltalon),
             np.minimum(89,
                        self.elements_scheduled.lat.max() + deltalat)
-        ]
+        ])
         if simulation_extent[2] == 360 and simulation_extent[0] < 0:
             simulation_extent[0] = 0
 
@@ -4473,9 +4478,16 @@ def update_positions(self, x_vel, y_vel):
         velocity = velocity * self.elements.moving  # Do not move frosen elements
 
         # Calculate new positions
-        self.elements.lon, self.elements.lat, back_az = geod.fwd(
-            self.elements.lon, self.elements.lat, azimuth,
-            velocity * self.time_step.total_seconds())
+        if len(self.elements.lon) > 1:
+            self.elements.lon, self.elements.lat, back_az = geod.fwd(
+                self.elements.lon, self.elements.lat, azimuth,
+                velocity * self.time_step.total_seconds())
+        else:  # Avoiding pyproj warning for arrays with length 1
+            self.elements.lon, self.elements.lat, back_az = geod.fwd(
+                self.elements.lon[0], self.elements.lat[0], azimuth[0],
+                velocity[0] * self.time_step.total_seconds())
+            self.elements.lon = np.atleast_1d(self.elements.lon)
+            self.elements.lat = np.atleast_1d(self.elements.lat)
 
         # Check that new positions are valid
         if (self.elements.lon.min()

tests/models/test_sealice.py

@@ -13,12 +13,13 @@ def test_sealice_larc():
         tdf +
         '2Feb2016_Nordic_sigma_3d/AROME_MetCoOp_00_DEF_20160202_subset.nc')
     o.add_reader([reader_arome])
-    reader_light = reader_netCDF_CF_generic.Reader(
-        'https://opendap.larc.nasa.gov/opendap/hyrax/POWER/monthly/power_901_monthly_radiation_utc.nc',
-        standard_name_mapping={
-            'ALLSKY_SFC_SW_DWN': 'surface_net_downward_radiative_flux'
-        })
-    o.add_reader(reader_light)
+    # Disabling as opendap resource is (temprarily?) unavailable
+    #reader_light = reader_netCDF_CF_generic.Reader(
+    #    'https://opendap.larc.nasa.gov/opendap/hyrax/POWER/monthly/power_901_monthly_radiation_utc.nc',
+    #    standard_name_mapping={
+    #        'ALLSKY_SFC_SW_DWN': 'surface_net_downward_radiative_flux'
+    #    })
+    #o.add_reader(reader_light)
     lcts = timedelta(hours=1).total_seconds()  #seeding time-steps
     lat = 67.711251
     lon = 13.556971  # Lofoten