Merge pull request #1654 from knutfrode/dev

[run-ex] Added two new oils: RINGHORNE 2025 and BALDER BLEND 2025

Author: knutfrode

opendrift/models/openoil/adios/get_max_water_fraction_for_oils.py

@@ -207,6 +207,8 @@ def get_water_fractions():
         'LANGJELLET 2023': {'temperatures': [5.0, 15.0], 'max_water_fraction': [0.78, 0.8]},
         'BLANE 2009': {'temperatures': [5.0, 15.0], 'max_water_fraction': [0.8, 0.8]},
         'CARISA 2025': {'temperatures': [5.0, 15.0], 'max_water_fraction': [0.42, 0.58]},
+        'RINGHORNE 2025': {'temperatures': [5.0, 15.0], 'max_water_fraction': [.6, .62]},
+        'BALDER BLEND 2025': {'temperatures': [5.0, 15.0], 'max_water_fraction': [.8, .8]},
         }
 
     oilmax = oilmax | additional

opendrift/models/openoil/adios/max_water_fraction.json

@@ -99,6 +99,16 @@
       0.7
     ]
   },
+  "BALDER BLEND 2025": {
+    "temperatures": [
+      5.0,
+      15.0
+    ],
+    "max_water_fraction": [
+      0.8,
+      0.8
+    ]
+  },
   "BLANE 2009": {
     "temperatures": [
       5.0,
@@ -1041,6 +1051,16 @@
       0.8
     ]
   },
+  "RINGHORNE 2025": {
+    "temperatures": [
+      5.0,
+      15.0
+    ],
+    "max_water_fraction": [
+      0.6,
+      0.62
+    ]
+  },
   "SF NORD BRENT 2021": {
     "temperatures": [
       5.0,
@@ -1352,10 +1372,9 @@
     ],
     "max_water_fraction": [
       0.79,
-      0.80
+      0.8
     ]
   },
-
   "ULA 1999": {
     "temperatures": [
       5.0,

opendrift/models/openoil/adios/oils.xz

@@ -24,6 +24,7 @@ ATLA KONDENSAT 2013
 AVALDSNES 2012
 BALDER 2002
 BALDER BLEND 2010
+BALDER BLEND 2025
 BLANE 2009
 BOYLA CRUDE 2016
 BRAGE 2013
@@ -126,6 +127,7 @@ OSEBERG SOR 2013
 OSEBERG, EXXON
 OSELVAR 2012
 RINGHORNE 2002
+RINGHORNE 2025
 ROTTERDAM DIESEL 2017
 SF NORD BRENT 2021
 SIGYN CONDENSATE 2017