Merge branch 'add_to_scatter'

Author: giadarol

Bassetti_Erskine.py

@@ -105,7 +105,7 @@ def solve(self, rho = None, flag_verbose = False):
         if not self.allow_scatter_and_solve:
             raise ValueError('Bassetti_Erskine: nothing to solve!!!!')
 
-    def scatter(self,  x_mp, y_mp, nel_mp, charge = -qe):
+    def scatter(self,  x_mp, y_mp, nel_mp, charge = -qe, flag_add=False):
         if not self.allow_scatter_and_solve:
             raise ValueError('Bassetti_Erskine: what do you want to scatter???!!!!')
 

MultiGrid.py

@@ -42,9 +42,9 @@ def __init__(self, pic_external, x_min_internal, x_max_internal, y_min_internal,
 		self.N_nodes_discard = N_nodes_discard
 		self.D_discard = N_nodes_discard*Dh_internal	
 
-	def scatter(self, x_mp, y_mp, nel_mp, charge = -qe):
-		self.pic_external.scatter(x_mp, y_mp, nel_mp, charge)
-		self.pic_internal.scatter(x_mp, y_mp, nel_mp, charge)
+	def scatter(self, x_mp, y_mp, nel_mp, charge = -qe, flag_add=False):
+		self.pic_external.scatter(x_mp, y_mp, nel_mp, charge, flag_add)
+		self.pic_internal.scatter(x_mp, y_mp, nel_mp, charge, flag_add)
 
 
 	def gather(self, x_mp, y_mp):

PyPIC_Scatter_Gather.py

@@ -133,17 +133,20 @@ def __init__(self, x_aper=None, y_aper=None, dx=None, dy=None, xg=None, yg=None,
 
 
     #@profile
-    def scatter(self, x_mp, y_mp, nel_mp, charge = -qe):
+    def scatter(self, x_mp, y_mp, nel_mp, charge = -qe, flag_add=False):
 
         if not (len(x_mp)==len(y_mp)==len(nel_mp)):
             raise ValueError('x_mp, y_mp, nel_mp should have the same length!!!')
 
         if len(x_mp)>0:
             rho=rhocom.compute_sc_rho(x_mp,y_mp,nel_mp,self.bias_x,self.bias_y,self.dx,self.dy,self.Nxg,self.Nyg)
+        else:
+            rho=self.rho*0.
 
-            self.rho=charge*rho/(self.dx*self.dy);
+        if flag_add:
+            self.rho+=charge*rho/(self.dx*self.dy);
         else:
-            self.rho=self.rho*0.
+            self.rho=charge*rho/(self.dx*self.dy);
 
 
     def gather(self, x_mp, y_mp):
@@ -200,8 +203,8 @@ def solve(self, *args, **kwargs):
         pass
 
     #@profile
-    def scatter_and_solve(self, x_mp, y_mp, nel_mp, charge = -qe):
-        self.scatter(x_mp, y_mp, nel_mp, charge)
+    def scatter_and_solve(self, x_mp, y_mp, nel_mp, charge = -qe, flag_add=False):
+        self.scatter(x_mp, y_mp, nel_mp, charge, flag_add)
         self.solve()