compatability

Author: pancetta

pySDC/implementations/problem_classes/AllenCahn_MPIFFT.py

@@ -55,7 +55,7 @@ def __init__(self, problem_params, dtype_u=mesh, dtype_f=imex_mesh):
         # Creating FFT structure
         ndim = len(problem_params['nvars'])
         axes = tuple(range(ndim))
-        self.fft = PFFT(problem_params['comm'], list(problem_params['nvars']), axes=axes, dtype=np.float, collapse=True)
+        self.fft = PFFT(problem_params['comm'], list(problem_params['nvars']), axes=axes, dtype=np.float64, collapse=True)
 
         # get test data to figure out type and dimensions
         tmp_u = newDistArray(self.fft, problem_params['spectral'])

pySDC/implementations/problem_classes/AllenCahn_Temp_MPIFFT.py

@@ -54,7 +54,7 @@ def __init__(self, problem_params, dtype_u=mesh, dtype_f=imex_mesh):
         # creating FFT structure
         ndim = len(problem_params['nvars'])
         axes = tuple(range(ndim))
-        self.fft = PFFT(problem_params['comm'], list(problem_params['nvars']), axes=axes, dtype=np.float, collapse=True)
+        self.fft = PFFT(problem_params['comm'], list(problem_params['nvars']), axes=axes, dtype=np.float64, collapse=True)
 
         # get test data to figure out type and dimensions
         tmp_u = newDistArray(self.fft, problem_params['spectral'])

pySDC/implementations/problem_classes/PenningTrap_3D.py

@@ -191,10 +191,10 @@ def u_exact(self, t):
         Ip = u0[0][1] - Im
 
         # compute position in complex notation
-        w = np.complex(Rp, Ip) * np.exp(-np.complex(0, Op * t)) + np.complex(Rm, Im) * np.exp(-np.complex(0, Om * t))
+        w = np.complex128(Rp, Ip) * np.exp(-np.complex128(0, Op * t)) + np.complex128(Rm, Im) * np.exp(-np.complex128(0, Om * t))
         # compute velocity as time derivative of the position
-        dw = -1j * Op * np.complex(Rp, Ip) * \
-            np.exp(-np.complex(0, Op * t)) - 1j * Om * np.complex(Rm, Im) * np.exp(-np.complex(0, Om * t))
+        dw = -1j * Op * np.complex128(Rp, Ip) * \
+            np.exp(-np.complex128(0, Op * t)) - 1j * Om * np.complex128(Rm, Im) * np.exp(-np.complex128(0, Om * t))
 
         # get the appropriate real and imaginary parts
         u.pos[0, 0] = w.real

pySDC/tutorial/step_3/B_adding_statistics.py

@@ -53,7 +53,7 @@ def run_penning_trap_simulation():
     problem_params = dict()
     problem_params['omega_E'] = 4.9  # E-field frequency
     problem_params['omega_B'] = 25.0  # B-field frequency
-    problem_params['u0'] = np.array([[10, 0, 0], [100, 0, 100], [1], [1]])  # initial center of positions
+    problem_params['u0'] = np.array([[10, 0, 0], [100, 0, 100], [1], [1]], dtype=object)  # initial center of positions
     problem_params['nparts'] = 1  # number of particles in the trap
     problem_params['sig'] = 0.1  # smoothing parameter for the forces
 

pySDC/tutorial/step_3/C_study_collocations.py

@@ -57,7 +57,7 @@ def run_simulation():
     problem_params = dict()
     problem_params['omega_E'] = 4.9
     problem_params['omega_B'] = 25.0
-    problem_params['u0'] = np.array([[10, 0, 0], [100, 0, 100], [1], [1]])
+    problem_params['u0'] = np.array([[10, 0, 0], [100, 0, 100], [1], [1]], dtype=object)
     problem_params['nparts'] = 1
     problem_params['sig'] = 0.1
 

pySDC/tutorial/step_4/D_MLSDC_with_particles.py

@@ -83,7 +83,7 @@ def run_penning_trap_simulation(mlsdc, finter=False):
     problem_params = dict()
     problem_params['omega_E'] = 4.9  # E-field frequency
     problem_params['omega_B'] = 25.0  # B-field frequency
-    problem_params['u0'] = np.array([[10, 0, 0], [100, 0, 100], [1], [1]])  # initial center of positions
+    problem_params['u0'] = np.array([[10, 0, 0], [100, 0, 100], [1], [1]], dtype=object)  # initial center of positions
     problem_params['nparts'] = 50  # number of particles in the trap
     problem_params['sig'] = 0.1  # smoothing parameter for the forces
 

pytest.ini

@@ -1,3 +1,4 @@
 [pytest]
 markers =
     fenics: tests relying on FEniCS
+    slow: tests taking much longer than bearable