Merge pull request #1605 from knutfrode/dev

[run-ex] Added new oil type TYRVING

Author: knutfrode

opendrift/models/openoil/adios/max_water_fraction.json

@@ -1345,6 +1345,17 @@
       0.74
     ]
   },
+  "TYRVING 2025": {
+    "temperatures": [
+      5.0,
+      15.0
+    ],
+    "max_water_fraction": [
+      0.79,
+      0.80
+    ]
+  },
+
   "ULA 1999": {
     "temperatures": [
       5.0,

opendrift/models/openoil/adios/oils.xz

@@ -15,9 +15,12 @@ def test_get_openoil_list(test_data):
 def test_get_openoil_list_norway(test_data):
     # previous oils
     previous_oils_file = Path(test_data) / 'generated' / 'oil_list_norway.txt'
+
     with open(previous_oils_file, 'r') as fd:
         previous_oils = [o.strip() for o in fd.readlines()]
 
+    assert 'TYRVING 2025' in previous_oils
+
     o = OpenOil(location = 'NORWAY')
 
     new_oils = set(o.oiltypes) - set(previous_oils)
@@ -33,7 +36,7 @@ def test_get_openoil_list_norway(test_data):
         for ot in removed_oils:
             print(ot)
 
-    if False:  # Change to True when updating list of oils
+    if True:  # Change to True when updating list of oils
         print(f'Writing present list of oiltypes to {previous_oils_file}')
         with open(previous_oils_file, 'w') as f:
             for oil in o.oiltypes:

tests/models/openoil/test_oil_list.py

@@ -159,6 +159,7 @@ TROLL, STATOIL
 TRYM KONDENSAT 2011
 TYRIHANS NORD 2004
 TYRIHANS SOR 2004
+TYRVING 2025
 ULA 1999
 ULTRA LOW SULFUR FUEL OIL 2017
 UTGARD CONDENSATE 2021