Extract common test data generator code into header.

tests/deco2d_model.c

@@ -57,15 +57,11 @@ modelRegionCompute(double region[], int nlev, int nlat, int nlon,
     for (unsigned j = 0; j < n; ++j)
       for (unsigned i = 0; i < m; ++i)
         region[k * kstride + j * jstride + i]
-          = sign_flat(round((cos(2.0 * M_PI
-                                 * (lons[(i + is + (unsigned)tsID)
-                                         %(unsigned)nlon] - lons[0])
-                                 / (lons[nlon-1] - lons[0]))
-                             * sin(2.0 * M_PI
-                                   * (lats[(j + js + k + ks)%(unsigned)nlat]
-                                      - lats[0])
-                                   / (lats[nlat-1] - lats[0]))
-                             ) * mscale)) * mrscale;
+          = dg_wobble((lons[(i + is + (unsigned)tsID)%(unsigned)nlon] - lons[0])
+                      / (lons[nlon-1] - lons[0]),
+                      (lats[(j + js + k + ks)%(unsigned)nlat] - lats[0])
+                      / (lats[nlat-1] - lats[0]),
+                      mscale, mrscale);
 }
 
 #ifdef USE_MPI

tests/simple_model.c

@@ -51,11 +51,10 @@ modelRegionCompute(double region[], size_t offset, size_t len,
       int j = (int)(global_pos % (size_t)(nlon * nlat) / (size_t)nlon);
       int i = (int)(global_pos % (size_t)nlon);
       region[local_pos]
-        = sign_flat(round((cos(2.0 * M_PI * (lons[(i + tsID)%nlon] - lons[0])
-                               / (lons[nlon-1] - lons[0]))
-                           * sin(2.0 * M_PI * (lats[(j + k)%nlat] - lats[0])
-                                 / (lats[nlat-1] - lats[0]))
-                           ) * mscale)) * mrscale;
+        = dg_wobble((lons[(i + tsID)%nlon] - lons[0])
+                    / (lons[nlon-1] - lons[0]),
+                    (lats[(j + k)%nlat] - lats[0])
+                    / (lats[nlat-1] - lats[0]), mscale, mrscale);
     }
 }
 

tests/simple_model_helper.h

@@ -6,6 +6,7 @@
 #endif
 
 #include <inttypes.h>
+#include <math.h>
 #include <time.h>
 
 void
@@ -19,6 +20,15 @@ sign_flat(double v)
   return v;
 }
 
+/* data generator function */
+static inline double
+dg_wobble(double frac_x, double frac_y, double mscale, double mrscale)
+{
+  double r = sign_flat(round((cos(2.0 * M_PI * frac_x)
+                              * sin(2.0 * M_PI * frac_y)) * mscale)) * mrscale;
+  return r;
+}
+
 time_t
 cditime2time_t(int date, int timeofday);
 void