Using ParcelsRandom in scipy kernel_language unit tests too

Author: erikvansebille

tests/test_kernel_language.py

@@ -4,7 +4,6 @@
 from parcels import ParcelsRandom
 import numpy as np
 import pytest
-import random as py_random
 from os import path
 import sys
 
@@ -265,11 +264,10 @@ def kernel(particle, fieldset, time):
 
 
 def random_series(npart, rngfunc, rngargs, mode):
-    random = ParcelsRandom if mode == 'jit' else py_random
-    random.seed(1234)
-    func = getattr(random, rngfunc)
+    ParcelsRandom.seed(1234)
+    func = getattr(ParcelsRandom, rngfunc)
     series = [func(*rngargs) for _ in range(npart)]
-    random.seed(1234)  # Reset the RNG seed
+    ParcelsRandom.seed(1234)  # Reset the RNG seed
     return series
 
 
@@ -287,9 +285,8 @@ class TestParticle(ptype[mode]):
                        lon=np.linspace(0., 1., npart),
                        lat=np.zeros(npart) + 0.5)
     series = random_series(npart, rngfunc, rngargs, mode)
-    rnglib = 'ParcelsRandom' if mode == 'jit' else 'random'
     kernel = expr_kernel('TestRandom_%s' % rngfunc, pset,
-                         '%s.%s(%s)' % (rnglib, rngfunc, ', '.join([str(a) for a in rngargs])))
+                         'ParcelsRandom.%s(%s)' % (rngfunc, ', '.join([str(a) for a in rngargs])))
     pset.execute(kernel, endtime=1., dt=1.)
     assert np.allclose(pset.p, series, atol=1e-9)