Merge pull request #1451 from knutfrode/dev

Dev

opendrift/models/openoil/adios/dirjs.py

@@ -14,7 +14,8 @@
 #
 # Copyright 2021, Gaute Hope, MET Norway
 
-from importlib import resources
+#from importlib import resources
+from importlib_resources import files
 from pathlib import Path
 import logging
 import json
@@ -23,7 +24,6 @@
 from adios_db.models.oil.oil import Oil as AdiosOil
 from adios_db.computation import gnome_oil
 
-
 from .oil import OpendriftOil
 
 logger = logging.getLogger(__name__)
@@ -35,10 +35,9 @@ def __get_archive__():
 
     oils = []
 
-    with resources.open_binary('opendrift.models.openoil.adios',
-                               'oils.xz') as archive:
-        with lzma.open(archive, 'rt') as c:
-            oils = json.load(c)
+    oil_file = files('opendrift.models.openoil.adios').joinpath('oils.xz')
+    with lzma.open(oil_file, 'rt') as archive:
+        oils = json.load(archive)
 
     # Add additional oils
     #for f in resources.contents('opendrift.models.openoil.adios.extra_oils'):

opendrift/models/openoil/adios/harvest_oils.py

@@ -3,6 +3,7 @@
 import json
 import tarfile
 import lzma
+from importlib_resources import files
 from adios_db.models.oil.oil import Oil
 from adios_db.computation import gnome_oil
 
@@ -67,12 +68,10 @@ def download():
         json.dump(oils, c)
 
 def list_oils():
-    from importlib import resources
-    import lzma
-    with resources.open_binary('opendrift.models.openoil.adios',
-        'oils.xz') as archive:
-        with lzma.open(archive, 'rt') as c:
-            oils = json.load(c)
+    oil_file = files('opendrift.models.openoil.adios').joinpath('oils.xz')
+    with lzma.open(oil_file, 'rt') as archive:
+        oils = json.load(archive)
+
     print(oils)
     print(len(oils))
     for o in oils:

opendrift/models/openoil/openoil.py

@@ -79,13 +79,13 @@
 """
 
 from io import open
+from importlib_resources import files
 import numpy as np
 from datetime import datetime
 import pyproj
 import matplotlib.pyplot as plt
 import logging
 import json
-from importlib import resources
 
 logger = logging.getLogger(__name__)
 
@@ -684,8 +684,8 @@ def prepare_run(self):
             logger.info('Oil-water surface tension is %f Nm' %
                         self.oil_water_interfacial_tension)
         try:
-            max_water_fractions = json.loads(
-                    resources.read_text('opendrift.models.openoil.adios', 'max_water_fraction.json'))
+            with open(files('opendrift.models.openoil.adios').joinpath('max_water_fraction.json')) as f:
+                max_water_fractions = json.loads(f.read())
             if self.oil_name in max_water_fractions:
                 self.max_water_fraction = max_water_fractions[self.oil_name]
                 T = self.max_water_fraction['temperatures']

opendrift/readers/operators/ops.py

@@ -4,6 +4,8 @@
 import pyproj
 import xarray as xr
 import numpy as np
+
+
 class Combine:
     """Combining two readers into a third one. You can use usual operators,
     but also more complex ones such as gaussian combining.
@@ -21,13 +23,19 @@ def __add__(self, other):
         else:
             return NotImplemented
 
+    def __radd__(self, other):
+        return self.__add__(other)
+
     def __mul__(self, other):
         from .numops import Combined as NumCombined
         if isinstance(other, Number):
             return NumCombined.mul(other, self)
         else:
             return NotImplemented
 
+    def __rmul__(self, other):
+        return self.__mul__(other)
+
     def __truediv__(self, other):
         from .numops import Combined as NumCombined
 

opendrift/scripts/opendrift_gui.py

@@ -13,7 +13,7 @@
 from PIL import ImageTk, Image
 import tkinter as tk
 from tkinter import ttk
-from importlib import resources
+from importlib_resources import files
 import opendrift
 from opendrift.models.oceandrift import OceanDrift
 from opendrift.models.openoil import OpenOil
@@ -364,7 +364,7 @@ def __init__(self):
         ##############
         self.set_model(list(self.opendrift_models)[0])
 
-        with resources.open_text('opendrift.scripts', 'data_sources.txt') as fd:
+        with open(files('opendrift.scripts').joinpath('data_sources.txt')) as fd:
             forcingfiles = fd.readlines()
 
         print(forcingfiles)
@@ -794,7 +794,7 @@ def run_opendrift(self):
                     nothing
             self.o.set_config(se, val)
 
-        with resources.path('opendrift.scripts', 'data_sources.txt') as f:
+        with files('opendrift.scripts').joinpath('data_sources.txt') as f:
             self.o.add_readers_from_file(f)
 
         self.o.seed_cone(lon=lon, lat=lat, radius=radius,

tests/models/openoil/test_openoil_custom_type.py

@@ -1,11 +1,15 @@
 import json
-from importlib import resources
+from importlib_resources import files
+
 from opendrift.models.openoil import OpenOil
 
+oiljson = files('opendrift.models.openoil.adios.extra_oils').joinpath('AD04011.json')
+
 def test_set_oil_type_json():
     o = OpenOil(loglevel=50)
 
-    d = json.loads(resources.read_text('opendrift.models.openoil.adios.extra_oils', 'AD04011.json'))
+    with open(oiljson) as f:
+        d = json.loads(f.read())
 
     o.set_oiltype_by_json(d)
     assert o.oiltype.name == 'GENERIC FUEL OIL No. 6'
@@ -14,8 +18,7 @@ def test_set_oil_type_json():
 def test_set_oil_type_file():
     o = OpenOil(loglevel=50)
 
-    with resources.path('opendrift.models.openoil.adios.extra_oils', 'AD04011.json') as f:
-        o.set_oiltype_from_file(f)
+    o.set_oiltype_from_file(oiljson)
 
     assert o.oiltype.name == 'GENERIC FUEL OIL No. 6'
     print(o.oiltype)

tests/readers/test_grib2.py

@@ -26,3 +26,7 @@ def test_get_variables(benchmark, test_data):
 
     assert u.shape == (2 * r.buffer , 2 * r.buffer)
 
+def test_clean_up(test_data):
+    import glob
+    for f in glob.glob(os.path.join(test_data, caps1) + '*idx'):
+        os.remove(f)