Some cleanup in tests

giadarol · giadarol · commit 536fc784cc62 · 2020-01-27T17:59:43.000+01:00
diff --git a/tests/000_test_round_chamber.py b/tests/000_test_round_chamber.py
@@ -1,6 +1,3 @@
-import sys
-sys.path.append('..')
-
 import PyPIC.FiniteDifferences_ShortleyWeller_SquareGrid as PIC_FDSW
 import PyPIC.FiniteDifferences_Staircase_SquareGrid as PIC_FD
 import PyPIC.FFT_OpenBoundary as PIC_FFT
@@ -45,7 +42,7 @@
 if PIC_FPPS: picFPPS = PIC_FPPS(200,200,a=R_cham,solverType='Uniform')
 # build dual grid
 pic_main = PIC_FDSW.FiniteDifferences_ShortleyWeller_SquareGrid(chamb = chamber, Dh = Dh_main)
-pic_dualgrid = AddInternalGrid(pic_main, x_min_internal, x_max_internal, y_min_internal, 
+pic_dualgrid = AddInternalGrid(pic_main, x_min_internal, x_max_internal, y_min_internal,
                                 y_max_internal, Dh_internal, N_nodes_discard)
 
 # generate particles
diff --git a/tests/002_test_rect_chamber.py b/tests/002_test_rect_chamber.py
@@ -1,7 +1,3 @@
-import sys, os
-BIN=os.path.expanduser('../')
-sys.path.append(BIN)
-
 import PyPIC.FiniteDifferences_ShortleyWeller_SquareGrid as PIC_FDSW
 import PyPIC.FiniteDifferences_Staircase_SquareGrid as PIC_FD
 import PyPIC.FFT_PEC_Boundary_SquareGrid as PIC_PEC_FFT
diff --git a/tests/003_Xmas_tree.py b/tests/003_Xmas_tree.py
@@ -1,6 +1,3 @@
-import sys
-sys.path.append('..')
-
 import pylab as pl
 import numpy as np
 from scipy import rand
@@ -29,7 +26,7 @@
         [1,9],
         [2,9],
         [0,11]]
-        
+
 tree=np.array(tree)
 x_tree = tree[:,0]
 y_tree = tree[:,1]
@@ -43,9 +40,6 @@
 y_tree = np.array([-y_aper]+ list(y_tree)+[y_aper])
 
 
-        
-
-
 x_part = x_aper*(2.*rand(N_part_gen)-1.)
 y_part = y_aper*(2.*rand(N_part_gen)-1.)
 
@@ -58,14 +52,11 @@
 nel_part = 0*x_part+1.
 
 
-        
-
-
 chamber = poly.polyg_cham_geom_object({'Vx':na([x_aper, -x_aper, -x_aper, x_aper]),
                                        'Vy':na([y_aper, y_aper, -y_aper, -y_aper]),
                                        'x_sem_ellip_insc':0.99*x_aper,
                                        'y_sem_ellip_insc':0.99*y_aper})
-                                       
+
 picFDSW = PIC_FDSW.FiniteDifferences_ShortleyWeller_SquareGrid(chamb = chamber, Dh = Dh)
 picFFTPEC = PIC_PEC_FFT.FFT_PEC_Boundary_SquareGrid(x_aper = chamber.x_aper, y_aper = chamber.y_aper, Dh = Dh)
 picFFT = PIC_FFT.FFT_OpenBoundary_SquareGrid(x_aper = chamber.x_aper, y_aper = chamber.y_aper, Dh = Dh)
@@ -135,7 +126,7 @@
 pl.colorbar()
 pl.savefig('Xmas_efield_open_boudary.png', dpi=200)
 
-if PIC_FPPS: 
+if PIC_FPPS:
     x = np.arange(-chamber.x_aper,chamber.x_aper,2*chamber.x_aper/300)
     y = np.arange(-chamber.y_aper,chamber.y_aper,2*chamber.y_aper/300)
     X,Y = np.meshgrid(x,y)
diff --git a/tests/004_test_gaussian.py b/tests/004_test_gaussian.py
@@ -1,6 +1,3 @@
-import sys
-sys.path.append('..')
-
 import PyPIC.FiniteDifferences_ShortleyWeller_SquareGrid as PIC_FDSW
 import PyPIC.FiniteDifferences_Staircase_SquareGrid as PIC_FD
 import PyPIC.FFT_OpenBoundary_SquareGrid as PIC_FFT
diff --git a/tests/005_testfftw.py b/tests/005_testfftw.py
@@ -1,6 +1,3 @@
-import sys
-sys.path.append('..')
-
 import pylab as pl
 import numpy as np
 from scipy import rand
@@ -26,7 +23,7 @@
         [1,9],
         [2,9],
         [0,11]]
-        
+
 tree=np.array(tree)
 x_tree = tree[:,0]
 y_tree = tree[:,1]
@@ -40,9 +37,6 @@
 y_tree = np.array([-y_aper]+ list(y_tree)+[y_aper])
 
 
-        
-
-
 x_part = x_aper*(2.*rand(N_part_gen)-1.)
 y_part = y_aper*(2.*rand(N_part_gen)-1.)
 
@@ -55,15 +49,10 @@
 nel_part = 0*x_part+1.
 
 
-        
-
-
 chamber = poly.polyg_cham_geom_object({'Vx':na([x_aper, -x_aper, -x_aper, x_aper]),
                                        'Vy':na([y_aper, y_aper, -y_aper, -y_aper]),
                                        'x_sem_ellip_insc':0.99*x_aper,
                                        'y_sem_ellip_insc':0.99*y_aper})
-                                       
-
 
 picFFT = PIC_FFT.FFT_OpenBoundary_SquareGrid(x_aper = chamber.x_aper, y_aper = chamber.y_aper, Dh = Dh)
 
@@ -79,7 +68,7 @@
 for _ in range(N_rep):
     transf = np.fft.fft2(data)
     itransf = np.real(np.fft.ifft2(transf*data))
-    
+
 t_stop_npfft = time.mktime(time.localtime())
 t_npfft = t_stop_npfft-t_start_npfft
 print('t_npfft', t_npfft)
diff --git a/tests/006_time_solve.py b/tests/006_time_solve.py
@@ -1,6 +1,3 @@
-import sys
-sys.path.append('..')
-
 import pylab as pl
 import numpy as np
 from scipy import rand
@@ -25,7 +22,7 @@
         [1,9],
         [2,9],
         [0,11]]
-        
+
 tree=np.array(tree)
 x_tree = tree[:,0]
 y_tree = tree[:,1]
@@ -39,9 +36,6 @@
 y_tree = np.array([-y_aper]+ list(y_tree)+[y_aper])
 
 
-        
-
-
 x_part = x_aper*(2.*rand(N_part_gen)-1.)
 y_part = y_aper*(2.*rand(N_part_gen)-1.)
 
@@ -54,14 +48,11 @@
 nel_part = 0*x_part+1.
 
 
-        
-
-
 chamber = poly.polyg_cham_geom_object({'Vx':na([x_aper, -x_aper, -x_aper, x_aper]),
                                        'Vy':na([y_aper, y_aper, -y_aper, -y_aper]),
                                        'x_sem_ellip_insc':0.99*x_aper,
                                        'y_sem_ellip_insc':0.99*y_aper})
-                                       
+
 picFDSW = PIC_FDSW.FiniteDifferences_ShortleyWeller_SquareGrid(chamb = chamber, Dh = Dh)
 picFFTPEC = PIC_PEC_FFT.FFT_PEC_Boundary_SquareGrid(x_aper = chamber.x_aper, y_aper = chamber.y_aper, Dh = Dh, fftlib='pyfftw')
 picFFT = PIC_FFT.FFT_OpenBoundary_SquareGrid(x_aper = chamber.x_aper, y_aper = chamber.y_aper, Dh = Dh, fftlib='pyfftw')
diff --git a/tests/007_test_separately.py b/tests/007_test_separately.py
@@ -1,6 +1,3 @@
-import sys
-sys.path.append('..')
-
 import PyPIC.FiniteDifferences_ShortleyWeller_SquareGrid as PIC_FDSW
 import PyPIC.FiniteDifferences_Staircase_SquareGrid as PIC_FD
 import PyPIC.FFT_OpenBoundary_SquareGrid as PIC_FFT
diff --git a/tests/008a_check_interpolation_near_borders.py b/tests/008a_check_interpolation_near_borders.py
@@ -1,6 +1,3 @@
-import sys
-sys.path.append('..')
-
 import numpy as np
 from PyPIC.geom_impact_ellip import ellip_cham_geom_object
 
@@ -50,12 +47,11 @@
     pic.solve(rho = rho_mat)
 except ValueError as err:
     print('Got ValueError:', err)
-    
-    
+
 Ex_list = []
 Ey_list = []
-for xmax_test in xmax_test_list: 
-    
+for xmax_test in xmax_test_list:
+
     sc_test = xmax_test/x_aper
     x_test = sc_test*x_aper*np.cos(thp)
     y_test = sc_test*y_aper*np.sin(thp)
@@ -64,7 +60,7 @@
 
     Ex_list.append(Ex)
     Ey_list.append(Ey)
-    
+
 Ex_list = np.array(Ex_list)
 Ey_list = np.array(Ey_list)
 
diff --git a/tests/008b_check_interpolation_near_borders_plots.py b/tests/008b_check_interpolation_near_borders_plots.py
@@ -1,6 +1,3 @@
-import sys
-sys.path.append('..')
-
 import numpy as np
 import pylab as pl
 
@@ -28,37 +25,37 @@
 erry_rel_list_old = []
 erry_rel_list = []
 
-for ii in range(N_points): 
+for ii in range(N_points):
 
     Ex_ref = ob_ref.Ex[ii,:]
     Ey_ref = ob_ref.Ey[ii,:]
-    
+
     Ex_new = ob_new.Ex[ii,:]
     Ey_new = ob_new.Ey[ii,:]
-    
+
     Ex_old= ob_old.Ex[ii,:]
     Ey_old= ob_old.Ey[ii,:]
 
     err_abs =  np.sqrt(np.sum((Ex_ref-Ex_new)**2+(Ey_ref-Ey_new)**2))
     err_rel = err_abs/np.sqrt(np.sum((Ex_ref)**2+(Ey_ref)**2))
-    
+
     err_abs_old =  np.sqrt(np.sum((Ex_ref-Ex_old)**2+(Ey_ref-Ey_old)**2))
     err_rel_old = err_abs_old/np.sqrt(np.sum((Ex_ref)**2+(Ey_ref)**2))
-    
+
     erry_rel =  np.sqrt(np.sum((Ey_ref-Ey_new)**2))/np.sqrt(np.sum((Ey_ref)**2))
     erry_rel_old =  np.sqrt(np.sum((Ey_ref-Ey_old)**2))/np.sqrt(np.sum((Ey_ref)**2))
-    
+
     err_abs_list.append(err_abs)
     err_rel_list.append(err_rel)
-    
+
     err_abs_list_old.append(err_abs_old)
     err_rel_list_old.append(err_rel_old)
-    
+
     erry_rel_list_old.append(erry_rel_old)
     erry_rel_list.append(erry_rel)
-    
+
 na = np.array
-pl.close('all')	
+pl.close('all')
 ms.mystyle_arial(fontsz=16, dist_tick_lab=10)
 pl.figure(1)
 pl.plot(1000*ob_ref.xmax_test_list, err_abs_list)
@@ -181,4 +178,4 @@
     pl.savefig(fname+'.png', dpi=200)
 
 pl.show()
-    
+
diff --git a/tests/009_test_round_chamber_for_new_interp_devel.py b/tests/009_test_round_chamber_for_new_interp_devel.py
@@ -1,6 +1,3 @@
-import sys
-sys.path.append('..')
-
 import PyPIC.FiniteDifferences_ShortleyWeller_SquareGrid as PIC_FDSW
 import PyPIC.FFT_OpenBoundary_SquareGrid as PIC_FFT
 import PyPIC.geom_impact_ellip as ell
diff --git a/tests/010_effect_of_tolerances_in_SW.py b/tests/010_effect_of_tolerances_in_SW.py
@@ -1,9 +1,3 @@
-import sys, os
-BIN=os.path.expanduser('../')
-sys.path.append(BIN)
-BIN=os.path.expanduser('../PyHEADTAIL/testing/script-tests/')
-sys.path.append(BIN)
-
 import PyPIC.FiniteDifferences_ShortleyWeller_SquareGrid as PIC_FDSW
 import PyPIC.FiniteDifferences_Staircase_SquareGrid as PIC_FD
 import PyPIC.geom_impact_ellip as ell
@@ -16,14 +10,14 @@
 def analytic_solution(x_probes, y_probes, x_part, y_part, nel_part, charge):
     Ex_probes = []
     Ey_probes = []
-    
+
     for x_probe, y_probe in zip(x_probes, y_probes):
         r_probe = np.sqrt(x_probe**2 + y_probe**2)
         q_inside = np.sum(nel_part[x_part**2+ y_part**2 < r_probe**2])*charge
         Er_probe = q_inside/(epsilon_0*2*np.pi*r_probe)
         Ex_probes.append(Er_probe  * x_probe/r_probe)
         Ey_probes.append(Er_probe  * y_probe/r_probe)
-    
+
     return Ex_probes, Ey_probes
 
 qe = e
@@ -46,7 +40,7 @@ def analytic_solution(x_probes, y_probes, x_part, y_part, nel_part, charge):
 chamber = ell.ellip_cham_geom_object(x_aper = x_aper, y_aper = y_aper)
 
 # build main pic
-pic_SW = PIC_FDSW.FiniteDifferences_ShortleyWeller_SquareGrid(chamb = chamber, 
+pic_SW = PIC_FDSW.FiniteDifferences_ShortleyWeller_SquareGrid(chamb = chamber,
         Dh = Dh_main, tol_stem = tol_stem, tol_der = tol_der)
 
 
@@ -100,5 +94,3 @@ def analytic_solution(x_probes, y_probes, x_part, y_part, nel_part, charge):
 
 pl.show()
 
-
-    
diff --git a/tests/011_LHC_multigrid_test.py b/tests/011_LHC_multigrid_test.py
diff --git a/tests/012_test_states.py b/tests/012_test_states.py
