formatting

Author: lfarv

atintegrators/BndMPoleSymplectic4QuantPass.c

@@ -76,13 +76,13 @@ void BndMPoleSymplectic4QuantPass(double *r, double le, double irho, double *A,
 
 /*  The behaviour of random generators with OpenMP is doubtful. OpenMP disabled until
     it's understood
+*/
     #pragma omp parallel for if (num_particles > OMP_PARTICLE_THRESHOLD) default(none) \
     shared(r,num_particles,R1,T1,R2,T2,RApertures,EApertures,                          \
     irho,gap,A,B,L1,L2,K1,K2,max_order,num_int_steps,rng,E0,scaling,                   \
     FringeBendEntrance,entrance_angle,fint1,FringeBendExit,exit_angle,fint2,           \
-    FringeQuadEntrance,useLinFrEleEntrance,FringeQuadExit,useLinFrEleExit,fringeIntM0, ringeIntP0, \
+    FringeQuadEntrance,useLinFrEleEntrance,FringeQuadExit,useLinFrEleExit,fringeIntM0, fringeIntP0, \
     emass,hbar,clight,alpha0,qe,SL)
-*/
     for (int c = 0; c < num_particles; c++) { /* Loop over particles */
         double *r6 = r + 6*c;
         if (!atIsNaN(r6[0])) {

atintegrators/StrMPoleSymplectic4QuantPass.c

@@ -62,12 +62,12 @@ void StrMPoleSymplectic4QuantPass(double *r, double le, double *A, double *B,
     }
 /*  The behaviour of random generators with OpenMP is doubtful. OpenMP disabled until
     it's understood
+*/
     #pragma omp parallel for if (num_particles > OMP_PARTICLE_THRESHOLD) default(none)              \
     shared(r,num_particles,R1,T1,R2,T2,RApertures,EApertures,                                       \
     A,B,L1,L2,K1,K2,max_order,num_int_steps,rng,scaling,                                            \
     FringeQuadEntrance, useLinFrEleEntrance,FringeQuadExit,useLinFrEleExit,fringeIntM0,fringeIntP0, \
     emass,E0,hbar,clight,alpha0,qe,SL)
-*/
     for (int c = 0; c<num_particles; c++) { /* Loop over particles */
         double *r6 = r + 6*c;
         if (!atIsNaN(r6[0])) {

atintegrators/atrandom.c

@@ -22,6 +22,9 @@
  */
 #include <math.h>
 #include <stdint.h>
+#ifdef _OPENMP
+#include <omp.h>
+#endif /*_OPENMP*/
 
 /* initial RNG definitions */
 #define AT_RNG_STATE 0x853c49e6748fea9bULL
@@ -53,10 +56,14 @@ static uint32_t pcg32_random_r(pcg32_random_t* rng)
 {
     if (!rng) rng = &pcg32_global;
     uint64_t oldstate;
-    #pragma omp atomic read
-    oldstate = rng->state;
-    #pragma omp atomic write
-    rng->state = oldstate * 6364136223846793005ULL + rng->inc;
+    uint64_t inc = rng->inc;
+    uint64_t *state = &(rng->state);
+//    #pragma omp atomic capture
+    #pragma omp critical(pgc32)
+    {
+        oldstate = *state;
+        *state = oldstate * 6364136223846793005ULL + inc;
+    }
     uint32_t xorshifted = ((oldstate >> 18u) ^ oldstate) >> 27u;
     uint32_t rot = oldstate >> 59u;
     return (xorshifted >> rot) | (xorshifted << ((-rot) & 31));
@@ -101,23 +108,28 @@ static double atrandn_r(pcg32_random_t* rng, double mean, double stdDev)
 {
     /* Marsaglia polar method: https://en.wikipedia.org/wiki/Marsaglia_polar_method */
 
-	double u, v, s;
-
-	if (rng->hasSpare) {
-		rng->hasSpare = false;
-		return mean + stdDev * rng->spare;
-	}
-
-	rng->hasSpare = true;
-	do {
-		u = 2.0 * atrandd_r(rng) - 1.0;
-		v = 2.0 * atrandd_r(rng) - 1.0;
-		s = u * u + v * v;
+	double u, v, s, result;
+
+    #pragma omp critical(randn)
+    {
+        if (rng->hasSpare) {
+            rng->hasSpare = false;
+            result = mean + stdDev * rng->spare;
+        }
+        else {
+            rng->hasSpare = true;
+            do {
+                u = 2.0 * atrandd_r(rng) - 1.0;
+                v = 2.0 * atrandd_r(rng) - 1.0;
+                s = u * u + v * v;
+            }
+            while ((s >= 1.0) || (s == 0.0));
+            s = sqrt(-2.0 * log(s) / s);
+            rng->spare = v * s;
+            result = mean + stdDev * u * s;
+        }
 	}
-	while ((s >= 1.0) || (s == 0.0));
-	s = sqrt(-2.0 * log(s) / s);
-	rng->spare = v * s;
-	return mean + stdDev * u * s;
+	return result;
 }
 
 static int atrandp_r(pcg32_random_t* rng, double lamb)