Merge pull request #1782 from knutfrode/dev

Fixed problem with oiltype set by id being overridden by new seeding

Author: knutfrode

opendrift/models/openoil/openoil.py

@@ -340,6 +340,7 @@ def __init__(self, weathering_model='noaa', *args, **kwargs):
             other_oiltypes = [o for o in self.oiltypes if o[0:7] != 'GENERIC']
             self.oiltypes = sorted([o for o in generic_oiltypes]) + sorted([o for o in other_oiltypes])
             self.oiltypes = [ot for ot in self.oiltypes if ot not in self.duplicate_oils]
+            self.oiltype = None
 
             # For Norwegian oils, max water fraction from Sintef is overriding NOAA value
             self.max_water_fraction = None
@@ -1544,6 +1545,8 @@ def set_oiltype_by_id(self, oiltypeid):
                     f"{self.oiltype} is not a valid oil for Opendrift simulations"
                 )
                 raise ValueError()
+            self.__set_seed_config__('seed:oil_type', self.oil_name)
+            logger.info(f'setting oil_type to: {self.oil_name} (ID: {oiltypeid})')
         else:
             raise ValueError("unsupported oil weathering model")
 
@@ -1708,9 +1711,12 @@ def seed_elements(self, *args, **kwargs):
             else:  # Oil do not exist -> setting config to raise error and provide suggestions
                 self.set_config('seed:oil_type', kwargs['oil_type'])
         else:
-            logger.info('Oil type not specified, using default: ' +
-                        self.get_config('seed:oil_type'))
-            self.set_oiltype(self.get_config('seed:oil_type'))
+            if self.oiltype is None:
+                logger.info('Oil type not specified, using default: ' +
+                            self.get_config('seed:oil_type'))
+                self.set_oiltype(self.get_config('seed:oil_type'))
+            else:
+                logger.info(f'Oil type already set as {self.oiltype.name}')
 
         if self.oil_weathering_model == 'noaa':
             self.Density = Density(self.oiltype.oil)

tests/models/openoil/test_openoil.py

@@ -96,7 +96,11 @@ def test_set_oil_type_by_id():
     o = OpenOil(loglevel=50)
     o.set_oiltype_by_id('NO00108')
     assert o.oiltype.name == 'AASGARD A 2003'
-    print(o.oiltype)
+    # Check that oiltype is also used after actual seeding
+    o.set_config('environment:constant', {
+        'x_wind': 0, 'y_wind': 0, 'x_sea_water_velocity': 0, 'y_sea_water_velocity': 0})
+    o.seed_elements(lon=0, lat=0, time=datetime.now())
+    assert o.oiltype.name == 'AASGARD A 2003'
 
 def test_oil_type_alias():
     o = OpenOil(loglevel=50)