Merge pull request #1606 from OceanParcels/using_particledlon_in_cfun…

…c_header_test Fixing customed_Cfunc_header_test to use particle_dlon
OceanParcels · Jul 22, 2024 · e7ad17b · e7ad17b
2 parents 85f52df + 5cf9de1
commit e7ad17b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/tests/customed_header.h b/tests/customed_header.h
@@ -1,9 +1,9 @@
 
-static inline StatusCode func(CField *f, double *lon, double *dt)
+static inline StatusCode func(CField *f, double *particle_dlon, double *dt)
 {
   float data2D[2][2][2];
   StatusCode status = getCell2D(f, 1, 2, 0, data2D, 1); CHECKSTATUS(status);
   float u = data2D[0][0][0];
-  *lon += u * *dt;
+  *particle_dlon = +u * *dt;
   return SUCCESS;
 }
diff --git a/tests/test_kernel_language.py b/tests/test_kernel_language.py
@@ -346,29 +346,23 @@ def func(U, lon, dt):
 
     if c_inc == 'str':
         c_include = """
-                 static inline StatusCode func(CField *f, float *lon, double *dt)
+                 static inline StatusCode func(CField *f, double *particle_dlon, double *dt)
                  {
                    float data2D[2][2][2];
                    StatusCode status = getCell2D(f, 1, 2, 0, data2D, 1); CHECKSTATUS(status);
                    float u = data2D[0][0][0];
-                   *lon += u * *dt;
+                   *particle_dlon = +u * *dt;
                    return SUCCESS;
                  }
                  """
     else:
         c_include = path.join(path.dirname(__file__), 'customed_header.h')
 
     def ckernel(particle, fieldset, time):
-        func('parcels_customed_Cfunc_pointer_args', fieldset.U, particle.lon, particle.dt)
+        func('parcels_customed_Cfunc_pointer_args', fieldset.U, particle_dlon, particle.dt)  # noqa
 
-    def pykernel(particle, fieldset, time):
-        particle_dlon = func(fieldset.U, particle.lon, particle.dt)  # noqa
-
-    if mode == 'scipy':
-        kernel = pset.Kernel(pykernel)
-    else:
-        kernel = pset.Kernel(ckernel, c_include=c_include)
-    pset.execute(kernel, endtime=3., dt=3.)
+    kernel = pset.Kernel(ckernel, c_include=c_include)
+    pset.execute(kernel, endtime=4., dt=1.)
     assert np.allclose(pset.lon[0], 0.81578948)