Merge branch 'release/v2.2.5'

Author: aoeftiger

Bassetti_Erskine.py

@@ -8,7 +8,7 @@
 #     This file is part of the code:
 #                                                                      		    
 # 
-#		           PyPIC Version 2.2.4                     
+#		           PyPIC Version 2.2.5                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

FFT_OpenBoundary.py

@@ -8,7 +8,7 @@
 #     This file is part of the code:
 #                                                                      		    
 # 
-#		           PyPIC Version 2.2.4                     
+#		           PyPIC Version 2.2.5                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

FFT_OpenBoundary_SquareGrid.py

@@ -8,7 +8,7 @@
 #     This file is part of the code:
 #                                                                      		    
 # 
-#		           PyPIC Version 2.2.4                     
+#		           PyPIC Version 2.2.5                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

FFT_PEC_Boundary_SquareGrid.py

@@ -8,7 +8,7 @@
 #     This file is part of the code:
 #                                                                      		    
 # 
-#		           PyPIC Version 2.2.4                     
+#		           PyPIC Version 2.2.5                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

FiniteDifferences_ShortleyWeller_SquareGrid.py

@@ -8,7 +8,7 @@
 #     This file is part of the code:
 #                                                                      		    
 # 
-#		           PyPIC Version 2.2.4                     
+#		           PyPIC Version 2.2.5                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

FiniteDifferences_ShortleyWeller_SquareGrid_extrapolation.py

@@ -8,7 +8,7 @@
 #     This file is part of the code:
 #                                                                      		    
 # 
-#		           PyPIC Version 2.2.4                     
+#		           PyPIC Version 2.2.5                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

FiniteDifferences_Staircase_SquareGrid.py

@@ -8,7 +8,7 @@
 #     This file is part of the code:
 #                                                                      		    
 # 
-#		           PyPIC Version 2.2.4                     
+#		           PyPIC Version 2.2.5                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

GPU/pypic.py

@@ -395,8 +395,14 @@ def particles_to_mesh(self, *mp_coords, **kwargs):
         Return the charge distribution on the mesh (which is
         mesh_charges = rho*volume).
         '''
-        charge = kwargs.get("charge", e)
         dtype = kwargs.get("dtype", np.float32)
+        charge = kwargs.get("charge", e)
+        try:
+            charge = charge.get()
+        except AttributeError:
+            pass
+        # ensure returning a dtype np.float64 in particles_to_mesh:
+        charge = float(charge)
 
         n_macroparticles = len(mp_coords[0])
         self.kernel_call_config['p2m']['grid'] = (
@@ -423,7 +429,7 @@ def particles_to_mesh(self, *mp_coords, **kwargs):
                 self._p2m_inclmeshing_32atomics_kernel.prepared_call(
                     grid, block, *args)
             elif dtype == np.float64:
-                self._p2m_inclmeshing_32atomics_kernel.prepared_call(
+                self._p2m_inclmeshing_64atomics_kernel.prepared_call(
                     grid, block, *args)
             else:
                 raise ValueError("PyPIC: particles_to_mesh() got unknown dtype "
@@ -453,7 +459,8 @@ def particles_to_mesh(self, *mp_coords, **kwargs):
                                  "argument, expected either np.float32 or "
                                  "np.float64!")
         self._context.synchronize()
-        mesh_charges = mesh_count*charge
+        mesh_charges = mesh_count * charge
+        # because charge is double precision, mesh_charges will be as well!
         return mesh_charges
 
     def sorted_particles_to_mesh(self, *mp_coords, **kwargs):

PyPIC_Scatter_Gather.py

@@ -8,7 +8,7 @@
 #     This file is part of the code:
 #                                                                      		    
 # 
-#		           PyPIC Version 2.2.4                     
+#		           PyPIC Version 2.2.5                     
 #                  
 #                                                                       
 #     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.4'
+        print 'PyPIC Version 2.2.5'
 
         if xg!=None and yg!=None:
             assert(x_aper==None and y_aper==None and dx==None and dy==None)

change_version_number.py

@@ -9,7 +9,7 @@
         with open(filename) as fid:
             content=fid.read()
         if '[email protected]' in content:
-            content=content.replace('PyPIC Version 2.2.4', 'PyPIC Version 2.2.4')
+            content=content.replace('PyPIC Version 2.2.5', 'PyPIC Version 2.2.5')
             with open(filename,'w') as fid:
                 fid.write(content)