[skip ci] Updates

Author: ci-build

_downloads/029881e221949484b26146d507a804ad/example_depth.zip

@@ -4,7 +4,7 @@
       "cell_type": "markdown",
       "metadata": {},
       "source": [
-        "\n# Retieving wind drift factor from trajectory\n"
+        "\n# Retrieving wind drift factor from trajectory\n"
       ]
     },
     {
@@ -238,7 +238,7 @@
       "cell_type": "markdown",
       "metadata": {},
       "source": [
-        "We see that using skillscore from the full trajectories gives a better estimate\nthan calculating the average of the wind_drift_factor from \none position to the next (i.e. polar histogram above).\nThis is even more clear if increasing the diffusivity (i.e. noise) above from 10 m2/s to 200 m2/s:\nThe histogram method then gives 0.071, which is much to high (true is 0.033), and the histogram is noisy.\nThe skillscore method is still robust, and gives a `wind_drift_factor` of 0.036, only slightly too high.\n\n"
+        "We see that using skillscore from the full trajectories gives a better estimate\nthan calculating the average of the wind_drift_factor from \none position to the next (i.e. polar histogram above).\nThis is even more clear if increasing the diffusivity (i.e. noise) above from 10 m2/s to 200 m2/s:\nThe histogram method then gives 0.071, which is much to high (true is 0.033), and the histogram is noisy.\nThe skillscore method is still robust, and gives a `wind_drift_factor` of 0.034, only slightly too high.\n\n"
       ]
     }
   ],

_downloads/033af0d93f9b09e836d807ac3b9561f7/example_relative.zip

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """
-Retieving wind drift factor from trajectory
-===========================================
+Retrieving wind drift factor from trajectory
+============================================
 """
 
 import trajan as _
@@ -139,4 +139,4 @@
 # one position to the next (i.e. polar histogram above).
 # This is even more clear if increasing the diffusivity (i.e. noise) above from 10 m2/s to 200 m2/s:
 # The histogram method then gives 0.071, which is much to high (true is 0.033), and the histogram is noisy.
-# The skillscore method is still robust, and gives a `wind_drift_factor` of 0.036, only slightly too high.
+# The skillscore method is still robust, and gives a `wind_drift_factor` of 0.034, only slightly too high.

_downloads/053b8b00e60c7fece7f7aff0a68521f8/example_oil_verticalmixing.zip

@@ -175,6 +175,7 @@ <h1>Source code for opendrift.models.openoil.openoil</h1><div class="highlight">
 <span class="sd">After each wave breaking event, a new droplet diameter will be chosen based on the config setting for droplet size distribution.</span>
 <span class="sd">&quot;&quot;&quot;</span>
 
+<span class="kn">import</span><span class="w"> </span><span class="nn">os</span>
 <span class="kn">from</span><span class="w"> </span><span class="nn">io</span><span class="w"> </span><span class="kn">import</span> <span class="nb">open</span>
 <span class="kn">from</span><span class="w"> </span><span class="nn">importlib.resources</span><span class="w"> </span><span class="kn">import</span> <span class="n">files</span>
 <span class="kn">import</span><span class="w"> </span><span class="nn">numpy</span><span class="w"> </span><span class="k">as</span><span class="w"> </span><span class="nn">np</span>
@@ -1741,6 +1742,8 @@ <h1>Source code for opendrift.models.openoil.openoil</h1><div class="highlight">
 
             <span class="bp">self</span><span class="o">.</span><span class="n">oiltype</span> <span class="o">=</span> <span class="n">adios</span><span class="o">.</span><span class="n">oil</span><span class="o">.</span><span class="n">OpendriftOil</span><span class="p">(</span><span class="n">json</span><span class="p">)</span>
             <span class="bp">self</span><span class="o">.</span><span class="n">oil_name</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">oiltype</span><span class="o">.</span><span class="n">name</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">_config</span><span class="p">[</span><span class="s1">&#39;seed:oil_type&#39;</span><span class="p">][</span><span class="s1">&#39;enum&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">oil_name</span><span class="p">)</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">__set_seed_config__</span><span class="p">(</span><span class="s1">&#39;seed:oil_type&#39;</span><span class="p">,</span> <span class="bp">self</span><span class="o">.</span><span class="n">oil_name</span><span class="p">)</span>
             <span class="k">if</span> <span class="ow">not</span> <span class="bp">self</span><span class="o">.</span><span class="n">oiltype</span><span class="o">.</span><span class="n">valid</span><span class="p">():</span>
                 <span class="n">logger</span><span class="o">.</span><span class="n">error</span><span class="p">(</span>
                     <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">oiltype</span><span class="si">}</span><span class="s2"> is not a valid oil for Opendrift simulations&quot;</span>
@@ -1881,20 +1884,25 @@ <h1>Source code for opendrift.models.openoil.openoil</h1><div class="highlight">
                 <span class="k">raise</span> <span class="ne">Exception</span><span class="p">(</span><span class="s2">&quot;no valid initial subsea droplet size distribution specified&quot;</span><span class="p">)</span>
 
         <span class="k">if</span> <span class="s1">&#39;oiltype&#39;</span> <span class="ow">in</span> <span class="n">kwargs</span><span class="p">:</span>
-            <span class="n">logger</span><span class="o">.</span><span class="n">warning</span><span class="p">(</span>
-                <span class="s1">&#39;Seed argument *oiltype* is deprecated, use *oil_type* instead&#39;</span>
-            <span class="p">)</span>
-            <span class="n">kwargs</span><span class="p">[</span><span class="s1">&#39;oil_type&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="n">kwargs</span><span class="p">[</span><span class="s1">&#39;oiltype&#39;</span><span class="p">]</span>
-            <span class="k">del</span> <span class="n">kwargs</span><span class="p">[</span><span class="s1">&#39;oiltype&#39;</span><span class="p">]</span>
-
+            <span class="k">raise</span> <span class="ne">ValueError</span><span class="p">(</span><span class="s1">&#39;Seed argument *oiltype* is deprecated, use *oil_type* instead&#39;</span><span class="p">)</span>
+        
         <span class="k">if</span> <span class="s1">&#39;oil_type&#39;</span> <span class="ow">in</span> <span class="n">kwargs</span><span class="p">:</span>
-            <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">get_config</span><span class="p">(</span><span class="s1">&#39;seed:oil_type&#39;</span><span class="p">)</span> <span class="o">!=</span> <span class="n">kwargs</span><span class="p">[</span><span class="s1">&#39;oil_type&#39;</span><span class="p">]:</span>
-                <span class="bp">self</span><span class="o">.</span><span class="n">__set_seed_config__</span><span class="p">(</span><span class="s1">&#39;seed:oil_type&#39;</span><span class="p">,</span> <span class="n">kwargs</span><span class="p">[</span><span class="s1">&#39;oil_type&#39;</span><span class="p">])</span>
-            <span class="k">del</span> <span class="n">kwargs</span><span class="p">[</span><span class="s1">&#39;oil_type&#39;</span><span class="p">]</span>
+            <span class="k">if</span> <span class="n">kwargs</span><span class="p">[</span><span class="s1">&#39;oil_type&#39;</span><span class="p">]</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">oiltypes</span><span class="p">:</span>  <span class="c1"># oil type exists in ADIOS library</span>
+                <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">get_config</span><span class="p">(</span><span class="s1">&#39;seed:oil_type&#39;</span><span class="p">)</span> <span class="o">!=</span> <span class="n">kwargs</span><span class="p">[</span><span class="s1">&#39;oil_type&#39;</span><span class="p">]:</span>
+                    <span class="bp">self</span><span class="o">.</span><span class="n">__set_seed_config__</span><span class="p">(</span><span class="s1">&#39;seed:oil_type&#39;</span><span class="p">,</span> <span class="n">kwargs</span><span class="p">[</span><span class="s1">&#39;oil_type&#39;</span><span class="p">])</span>
+                <span class="k">del</span> <span class="n">kwargs</span><span class="p">[</span><span class="s1">&#39;oil_type&#39;</span><span class="p">]</span>
+                <span class="bp">self</span><span class="o">.</span><span class="n">set_oiltype</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">get_config</span><span class="p">(</span><span class="s1">&#39;seed:oil_type&#39;</span><span class="p">))</span>
+            <span class="k">else</span><span class="p">:</span>
+                <span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">kwargs</span><span class="p">[</span><span class="s1">&#39;oil_type&#39;</span><span class="p">],</span> <span class="nb">dict</span><span class="p">):</span>  <span class="c1"># From json dictionary</span>
+                    <span class="bp">self</span><span class="o">.</span><span class="n">set_oiltype_by_json</span><span class="p">(</span><span class="n">kwargs</span><span class="p">[</span><span class="s1">&#39;oil_type&#39;</span><span class="p">])</span>
+                    <span class="k">del</span> <span class="n">kwargs</span><span class="p">[</span><span class="s1">&#39;oil_type&#39;</span><span class="p">]</span>
+                <span class="k">elif</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">isfile</span><span class="p">(</span><span class="n">kwargs</span><span class="p">[</span><span class="s1">&#39;oil_type&#39;</span><span class="p">]):</span>  <span class="c1"># From file</span>
+                    <span class="bp">self</span><span class="o">.</span><span class="n">set_oiltype_from_file</span><span class="p">(</span><span class="n">kwargs</span><span class="p">[</span><span class="s1">&#39;oil_type&#39;</span><span class="p">])</span>
+                    <span class="k">del</span> <span class="n">kwargs</span><span class="p">[</span><span class="s1">&#39;oil_type&#39;</span><span class="p">]</span>
         <span class="k">else</span><span class="p">:</span>
             <span class="n">logger</span><span class="o">.</span><span class="n">info</span><span class="p">(</span><span class="s1">&#39;Oil type not specified, using default: &#39;</span> <span class="o">+</span>
                         <span class="bp">self</span><span class="o">.</span><span class="n">get_config</span><span class="p">(</span><span class="s1">&#39;seed:oil_type&#39;</span><span class="p">))</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">set_oiltype</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">get_config</span><span class="p">(</span><span class="s1">&#39;seed:oil_type&#39;</span><span class="p">))</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">set_oiltype</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">get_config</span><span class="p">(</span><span class="s1">&#39;seed:oil_type&#39;</span><span class="p">))</span>
 
         <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">oil_weathering_model</span> <span class="o">==</span> <span class="s1">&#39;noaa&#39;</span><span class="p">:</span>
             <span class="bp">self</span><span class="o">.</span><span class="n">Density</span> <span class="o">=</span> <span class="n">Density</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">oiltype</span><span class="o">.</span><span class="n">oil</span><span class="p">)</span>