update tol to rtol

bempp · Sep 30, 2024 · 8c57ca0 · 8c57ca0
1 parent 9587da2
commit 8c57ca0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/bempp/api/assembly/discrete_boundary_operator.py b/bempp/api/assembly/discrete_boundary_operator.py
@@ -74,7 +74,7 @@ class _ScaledDiscreteOperator(_DiscreteOperatorBase):
     """Return a scaled operator."""
 
     def __init__(self, op, alpha):
-        dtype = _np.result_type([op.dtype], [type(alpha)])
+        dtype = _np.result_type(op.dtype, type(alpha))
         self._op = op
         self._alpha = alpha
         super().__init__(dtype, op.shape)
@@ -105,7 +105,7 @@ def __init__(self, op1, op2):
         self._op1 = op1
         self._op2 = op2
 
-        dtype = _np.result_type([op1.dtype, op2.dtype], [])
+        dtype = _np.result_type(op1.dtype, op2.dtype)
 
         super().__init__(dtype, op1.shape)
 
@@ -135,7 +135,7 @@ def __init__(self, op1, op2):
         self._op1 = op1
         self._op2 = op2
 
-        dtype = _np.result_type([op1.dtype, op2.dtype], [])
+        dtype = _np.result_type(op1.dtype, op2.dtype)
 
         super().__init__(dtype, (op1.shape[0], op2.shape[1]))
 

diff --git a/bempp/api/linalg/iterative_solvers.py b/bempp/api/linalg/iterative_solvers.py
@@ -140,7 +140,7 @@ def cg(
     bempp.api.log("Starting CG iteration")
     start_time = time.time()
     x, info = scipy.sparse.linalg.cg(
-        A_op, b_vec, tol=tol, maxiter=maxiter, callback=callback
+        A_op, b_vec, rtol=tol, maxiter=maxiter, callback=callback
     )
     end_time = time.time()
     bempp.api.log(
@@ -202,7 +202,7 @@ def _gmres_single_op_imp(
     bempp.api.log("Starting GMRES iteration")
     start_time = time.time()
     x, info = scipy.sparse.linalg.gmres(
-        A_op, b_vec, tol=tol, restart=restart, maxiter=maxiter, callback=callback
+        A_op, b_vec, rtol=tol, restart=restart, maxiter=maxiter, callback=callback
     )
     end_time = time.time()
     bempp.api.log(
@@ -259,7 +259,7 @@ def _gmres_block_op_imp(
     bempp.api.log("Starting GMRES iteration")
     start_time = time.time()
     x, info = scipy.sparse.linalg.gmres(
-        A_op, b_vec, tol=tol, restart=restart, maxiter=maxiter, callback=callback
+        A_op, b_vec, rtol=tol, restart=restart, maxiter=maxiter, callback=callback
     )
     end_time = time.time()
     bempp.api.log(