Merge branch 'release/v2.2.4'

aoeftiger · aoeftiger · commit 8c3e91586b2d · 2017-08-09T13:51:34.000+02:00
diff --git a/Bassetti_Erskine.py b/Bassetti_Erskine.py
@@ -8,7 +8,7 @@
 #     This file is part of the code:
 #                                                                      		    
 # 
-#		           PyPIC Version 2.2.3                     
+#		           PyPIC Version 2.2.4                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 
diff --git a/FFT_OpenBoundary.py b/FFT_OpenBoundary.py
@@ -8,7 +8,7 @@
 #     This file is part of the code:
 #                                                                      		    
 # 
-#		           PyPIC Version 2.2.3                     
+#		           PyPIC Version 2.2.4                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 
diff --git a/FFT_OpenBoundary_SquareGrid.py b/FFT_OpenBoundary_SquareGrid.py
@@ -8,7 +8,7 @@
 #     This file is part of the code:
 #                                                                      		    
 # 
-#		           PyPIC Version 2.2.3                     
+#		           PyPIC Version 2.2.4                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 
diff --git a/FFT_PEC_Boundary_SquareGrid.py b/FFT_PEC_Boundary_SquareGrid.py
@@ -8,7 +8,7 @@
 #     This file is part of the code:
 #                                                                      		    
 # 
-#		           PyPIC Version 2.2.3                     
+#		           PyPIC Version 2.2.4                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 
diff --git a/FiniteDifferences_ShortleyWeller_SquareGrid.py b/FiniteDifferences_ShortleyWeller_SquareGrid.py
@@ -8,7 +8,7 @@
 #     This file is part of the code:
 #                                                                      		    
 # 
-#		           PyPIC Version 2.2.3                     
+#		           PyPIC Version 2.2.4                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 
diff --git a/FiniteDifferences_ShortleyWeller_SquareGrid_extrapolation.py b/FiniteDifferences_ShortleyWeller_SquareGrid_extrapolation.py
@@ -8,7 +8,7 @@
 #     This file is part of the code:
 #                                                                      		    
 # 
-#		           PyPIC Version 2.2.3                     
+#		           PyPIC Version 2.2.4                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 
diff --git a/FiniteDifferences_Staircase_SquareGrid.py b/FiniteDifferences_Staircase_SquareGrid.py
@@ -8,7 +8,7 @@
 #     This file is part of the code:
 #                                                                      		    
 # 
-#		           PyPIC Version 2.2.3                     
+#		           PyPIC Version 2.2.4                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 
diff --git a/GPU/p2m/p2m_kernels.cu b/GPU/p2m/p2m_kernels.cu
@@ -10,6 +10,7 @@
 // 2017-05-22 edit based on:
 // http://stackoverflow.com/questions/39274472/error-function-atomicadddouble-double-has-already-been-defined
 
+/*
 #if defined(__CUDA_ARCH__) && __CUDA_ARCH__ >= 600
 
 #else
@@ -33,6 +34,31 @@ static __inline__ __device__ double atomicAdd(double* address, double val)
     return __longlong_as_double(old);
 }
 #endif
+*/
+
+#ifdef __CUDA_ARCH__
+#if __CUDA_ARCH__ < 600
+static __inline__ __device__ double atomicAdd(double* address, double val)
+{
+    unsigned long long int* address_as_ull =
+                              (unsigned long long int*)address;
+    unsigned long long int old = *address_as_ull, assumed;
+
+    if (val==0.0)
+        return __longlong_as_double(old);
+    do {
+        assumed = old;
+        old = atomicCAS(address_as_ull, assumed,
+                        __double_as_longlong(val +
+                               __longlong_as_double(assumed)));
+
+    // Note: uses integer comparison to avoid hang in case of NaN (since NaN != NaN)
+    } while (assumed != old);
+
+    return __longlong_as_double(old);
+}
+#endif
+#endif
 
 
 extern "C" {
diff --git a/GPU/p2m/p2m_kernels_inclmeshing.cu b/GPU/p2m/p2m_kernels_inclmeshing.cu
@@ -10,6 +10,7 @@
 // 2017-05-22 edit based on:
 // http://stackoverflow.com/questions/39274472/error-function-atomicadddouble-double-has-already-been-defined
 
+/*
 #if defined(__CUDA_ARCH__) && __CUDA_ARCH__ >= 600
 
 #else
@@ -33,6 +34,31 @@ static __inline__ __device__ double atomicAdd(double* address, double val)
     return __longlong_as_double(old);
 }
 #endif
+*/
+
+#ifdef __CUDA_ARCH__
+#if __CUDA_ARCH__ < 600
+static __inline__ __device__ double atomicAdd(double* address, double val)
+{
+    unsigned long long int* address_as_ull =
+                              (unsigned long long int*)address;
+    unsigned long long int old = *address_as_ull, assumed;
+
+    if (val==0.0)
+        return __longlong_as_double(old);
+    do {
+        assumed = old;
+        old = atomicCAS(address_as_ull, assumed,
+                        __double_as_longlong(val +
+                               __longlong_as_double(assumed)));
+
+    // Note: uses integer comparison to avoid hang in case of NaN (since NaN != NaN)
+    } while (assumed != old);
+
+    return __longlong_as_double(old);
+}
+#endif
+#endif
 
 
 extern "C" {
diff --git a/PyPIC_Scatter_Gather.py b/PyPIC_Scatter_Gather.py
@@ -8,7 +8,7 @@
 #     This file is part of the code:
 #                                                                      		    
 # 
-#		           PyPIC Version 2.2.3                     
+#		           PyPIC Version 2.2.4                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 
@@ -66,7 +66,7 @@ class PyPIC_Scatter_Gather(object):
     def __init__(self, x_aper=None, y_aper=None, dx=None, dy=None, xg=None, yg=None, 
                 x_min=None, x_max=None, y_min=None, y_max=None, *args, **kwargs):
 
-        print 'PyPIC Version 2.2.3'
+        print 'PyPIC Version 2.2.4'
         
         if xg!=None and yg!=None:
             assert(x_aper==None and y_aper==None and dx==None and dy==None)
diff --git a/change_version_number.py b/change_version_number.py
@@ -9,7 +9,7 @@
         with open(filename) as fid:
             content=fid.read()
         if 'giovanni.iadarola@cern.ch' in content:
-            content=content.replace('PyPIC Version 2.2.3', 'PyPIC Version 2.2.3')
+            content=content.replace('PyPIC Version 2.2.4', 'PyPIC Version 2.2.4')
             with open(filename,'w') as fid:
                 fid.write(content)
 
diff --git a/geom_impact_poly.py b/geom_impact_poly.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                                          
-#                   PyPIC Version 2.2.3                   
+#                   PyPIC Version 2.2.4                   
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`# This file is part of the code:`
`9`	`9`	`#`
`10`	`10`	`#`
`11`		`-# PyPIC Version 2.2.3`
	`11`	`+# PyPIC Version 2.2.4`
`12`	`12`	`#`
`13`	`13`	`#`
`14`	`14`	`# Author and contact: Giovanni IADAROLA`