From 8b77e5d6e5408fb066d194c85cabbb58458c72d1 Mon Sep 17 00:00:00 2001 From: PeterMeisrimelModelon <92585725+PeterMeisrimelModelon@users.noreply.github.com> Date: Thu, 21 Dec 2023 08:55:46 +0100 Subject: [PATCH] remaining import & exception cleanup --- src/__init__.py | 2 +- src/algebraic.pyx | 6 +-- src/implicit_ode.pyx | 2 +- src/lib/sundials_callbacks_ida_cvode.pxi | 52 ++++++++++++------------ src/lib/sundials_callbacks_kinsol.pxi | 16 ++++---- src/ode.pyx | 4 +- src/problem.pyx | 6 +-- src/solvers/euler.pyx | 7 ++-- src/solvers/kinsol.pyx | 3 +- src/solvers/runge_kutta.py | 2 +- src/solvers/sdirk_dae.pyx | 4 +- src/solvers/sundials.pyx | 32 +++++++-------- tests/solvers/test_radau5.py | 2 +- tests/solvers/test_sundials.py | 2 +- 14 files changed, 68 insertions(+), 72 deletions(-) diff --git a/src/__init__.py b/src/__init__.py index e31e2d81..105fcf13 100644 --- a/src/__init__.py +++ b/src/__init__.py @@ -35,6 +35,6 @@ def wrap(func): with open(_fpath, 'r') as f: __version__=f.readline().strip() __revision__=f.readline().strip() -except: +except Exception: __version__ = "unknown" __revision__ = "unknown" diff --git a/src/algebraic.pyx b/src/algebraic.pyx index 379ce717..b3f1320b 100644 --- a/src/algebraic.pyx +++ b/src/algebraic.pyx @@ -19,9 +19,7 @@ import numpy as N cimport numpy as N from timeit import default_timer as timer -import itertools - -from exception import * +from exception import Algebraic_Exception from problem import Algebraic_Problem include "constants.pxi" #Includes the constants (textual include) @@ -129,7 +127,7 @@ cdef class Algebraic: def _set_verbosity(self, verb): try: self.options["verbosity"] = int(verb) - except: + except Exception: raise AssimuloException("Verbosity must be an integer.") def _get_verbosity(self): diff --git a/src/implicit_ode.pyx b/src/implicit_ode.pyx index d3f420a6..e9348219 100644 --- a/src/implicit_ode.pyx +++ b/src/implicit_ode.pyx @@ -24,7 +24,7 @@ import sys import numpy as N cimport numpy as N -from exception import * +from exception import TerminateSimulation from timeit import default_timer as timer import warnings diff --git a/src/lib/sundials_callbacks_ida_cvode.pxi b/src/lib/sundials_callbacks_ida_cvode.pxi index 7b16f70c..50d8c9d1 100644 --- a/src/lib/sundials_callbacks_ida_cvode.pxi +++ b/src/lib/sundials_callbacks_ida_cvode.pxi @@ -37,7 +37,7 @@ cdef int cv_rhs(realtype t, N_Vector yv, N_Vector yvdot, void* problem_data): rhs = (pData.RHS)(t,y,sw=pData.sw, p=p) else: rhs = (pData.RHS)(t,y,p) - except: + except Exception: return CV_REC_ERR #Recoverable Error (See Sundials description) else: #No sensitivity @@ -46,7 +46,7 @@ cdef int cv_rhs(realtype t, N_Vector yv, N_Vector yvdot, void* problem_data): rhs = (pData.RHS)(t,y,pData.sw) else: rhs = (pData.RHS)(t,y) - except: + except Exception: return CV_REC_ERR #Recoverable Error (See Sundials description) for i in range(pData.dim): @@ -82,7 +82,7 @@ cdef int cv_sens_rhs_all(int Ns, realtype t, N_Vector yv, N_Vector yvdot, return CV_SUCCESS except(N.linalg.LinAlgError,ZeroDivisionError,AssimuloRecoverableError): return CV_REC_ERR - except: + except Exception: traceback.print_exc() return CV_UNREC_RHSFUNC_ERR @@ -138,7 +138,7 @@ IF SUNDIALS_VERSION >= (3,0,0): return CVDLS_SUCCESS except(N.linalg.LinAlgError,ZeroDivisionError,AssimuloRecoverableError): return CVDLS_JACFUNC_RECVR #Recoverable Error (See Sundials description) - except: + except Exception: traceback.print_exc() return CVDLS_JACFUNC_UNRECVR ELSE: @@ -205,7 +205,7 @@ ELSE: return CVDLS_SUCCESS except(N.linalg.LinAlgError,ZeroDivisionError,AssimuloRecoverableError): return CVDLS_JACFUNC_RECVR #Recoverable Error (See Sundials description) - except: + except Exception: traceback.print_exc() return CVDLS_JACFUNC_UNRECVR @@ -234,7 +234,7 @@ IF SUNDIALS_VERSION >= (3,0,0): jac=(pData.JAC)(t,y,p) except(N.linalg.LinAlgError,ZeroDivisionError,AssimuloRecoverableError): return CVDLS_JACFUNC_RECVR #Recoverable Error (See Sundials description) - except: + except Exception: traceback.print_exc() return CVDLS_JACFUNC_UNRECVR else: @@ -245,7 +245,7 @@ IF SUNDIALS_VERSION >= (3,0,0): jac=(pData.JAC)(t,y) except(N.linalg.LinAlgError,ZeroDivisionError,AssimuloRecoverableError): return CVDLS_JACFUNC_RECVR #Recoverable Error (See Sundials description) - except: + except Exception: traceback.print_exc() return CVDLS_JACFUNC_UNRECVR @@ -284,7 +284,7 @@ ELSE: jac=(pData.JAC)(t,y,p) except(N.linalg.LinAlgError,ZeroDivisionError,AssimuloRecoverableError): return CVDLS_JACFUNC_RECVR #Recoverable Error (See Sundials description) - except: + except Exception: traceback.print_exc() return CVDLS_JACFUNC_UNRECVR else: @@ -295,7 +295,7 @@ ELSE: jac=(pData.JAC)(t,y) except(N.linalg.LinAlgError,ZeroDivisionError,AssimuloRecoverableError): return CVDLS_JACFUNC_RECVR #Recoverable Error (See Sundials description) - except: + except Exception: traceback.print_exc() return CVDLS_JACFUNC_UNRECVR @@ -341,7 +341,7 @@ cdef int cv_jacv(N_Vector vv, N_Vector Jv, realtype t, N_Vector yv, N_Vector fyv return SPGMR_SUCCESS except(N.linalg.LinAlgError,ZeroDivisionError,AssimuloRecoverableError): return SPGMR_ATIMES_FAIL_REC - except: + except Exception: traceback.print_exc() return SPGMR_PSOLVE_FAIL_UNREC else: @@ -357,7 +357,7 @@ cdef int cv_jacv(N_Vector vv, N_Vector Jv, realtype t, N_Vector yv, N_Vector fyv return SPGMR_SUCCESS except(N.linalg.LinAlgError,ZeroDivisionError,AssimuloRecoverableError): return SPGMR_ATIMES_FAIL_REC - except: + except Exception: traceback.print_exc() return SPGMR_PSOLVE_FAIL_UNREC @@ -375,7 +375,7 @@ IF SUNDIALS_VERSION >= (3,0,0): try: ret = (pData.PREC_SETUP)(t,y,fy,jok,gamma,pData.PREC_DATA) - except: + except Exception: return CV_REC_ERR #Recoverable Error (See Sundials description) jcurPtr[0] = 1 if ret[0] else 0 @@ -399,7 +399,7 @@ IF SUNDIALS_VERSION >= (3,0,0): try: zres = (pData.PREC_SOLVE)(t,y,fy,r,gamma,delta,pData.PREC_DATA) - except: + except Exception: return CV_REC_ERR #Recoverable Error (See Sundials description) for i in range(pData.dim): @@ -422,7 +422,7 @@ ELSE: try: ret = (pData.PREC_SETUP)(t,y,fy,jok,gamma,pData.PREC_DATA) - except: + except Exception: return CV_REC_ERR #Recoverable Error (See Sundials description) jcurPtr[0] = 1 if ret[0] else 0 @@ -446,7 +446,7 @@ ELSE: try: zres = (pData.PREC_SOLVE)(t,y,fy,r,gamma,delta,pData.PREC_DATA) - except: + except Exception: return CV_REC_ERR #Recoverable Error (See Sundials description) for i in range(pData.dim): @@ -475,7 +475,7 @@ cdef int cv_prec(realtype t, N Vector yv, N Vector fyv, zptr[i] = zres[i] return SPGMR_SUCCESS - except: + except Exception: return SPGMR_PSOLVE_FAIL_UNREC """ @@ -501,7 +501,7 @@ cdef int cv_root(realtype t, N_Vector yv, realtype *gout, void* problem_data): gout[i]=root[i] return CV_SUCCESS - except: + except Exception: return CV_RTFUNC_FAIL # Unrecoverable Error cdef int ida_res(realtype t, N_Vector yv, N_Vector yvdot, N_Vector residual, void* problem_data): @@ -534,7 +534,7 @@ cdef int ida_res(realtype t, N_Vector yv, N_Vector yvdot, N_Vector residual, voi return IDA_SUCCESS except(N.linalg.LinAlgError,ZeroDivisionError,AssimuloRecoverableError): return IDA_REC_ERR # recoverable error (see Sundials description) - except: + except Exception: traceback.print_exc() return IDA_RES_FAIL else: #NO SENSITIVITY @@ -552,7 +552,7 @@ cdef int ida_res(realtype t, N_Vector yv, N_Vector yvdot, N_Vector residual, voi return IDA_SUCCESS except(N.linalg.LinAlgError,ZeroDivisionError,AssimuloRecoverableError): return IDA_REC_ERR # recoverable error (see Sundials description) - except: + except Exception: traceback.print_exc() return IDA_RES_FAIL @@ -589,7 +589,7 @@ IF SUNDIALS_VERSION >= (3,0,0): return IDADLS_SUCCESS except(N.linalg.LinAlgError,ZeroDivisionError,AssimuloRecoverableError): return IDADLS_JACFUNC_RECVR #Recoverable Error - except: + except Exception: traceback.print_exc() return IDADLS_JACFUNC_UNRECVR else: @@ -606,7 +606,7 @@ IF SUNDIALS_VERSION >= (3,0,0): return IDADLS_SUCCESS except(N.linalg.LinAlgError,ZeroDivisionError,AssimuloRecoverableError): return IDADLS_JACFUNC_RECVR #Recoverable Error - except: + except Exception: traceback.print_exc() return IDADLS_JACFUNC_UNRECVR ELSE: @@ -641,7 +641,7 @@ ELSE: return IDADLS_SUCCESS except(N.linalg.LinAlgError,ZeroDivisionError,AssimuloRecoverableError): return IDADLS_JACFUNC_RECVR #Recoverable Error - except: + except Exception: traceback.print_exc() return IDADLS_JACFUNC_UNRECVR else: @@ -658,7 +658,7 @@ ELSE: return IDADLS_SUCCESS except(N.linalg.LinAlgError,ZeroDivisionError,AssimuloRecoverableError): return IDADLS_JACFUNC_RECVR #Recoverable Error - except: + except Exception: traceback.print_exc() return IDADLS_JACFUNC_UNRECVR @@ -688,7 +688,7 @@ cdef int ida_root(realtype t, N_Vector yv, N_Vector yvdot, realtype *gout, void gout[i]=root[i] return IDA_SUCCESS - except: + except Exception: return IDA_RTFUNC_FAIL # Unrecoverable Error cdef int ida_jacv(realtype t, N_Vector yy, N_Vector yp, N_Vector rr, N_Vector vv, N_Vector Jv, realtype cj, @@ -720,7 +720,7 @@ cdef int ida_jacv(realtype t, N_Vector yy, N_Vector yp, N_Vector rr, N_Vector vv return SPGMR_SUCCESS except(N.linalg.LinAlgError,ZeroDivisionError,AssimuloRecoverableError): return SPGMR_ATIMES_FAIL_REC - except: + except Exception: traceback.print_exc() return SPGMR_PSOLVE_FAIL_UNREC else: @@ -736,7 +736,7 @@ cdef int ida_jacv(realtype t, N_Vector yy, N_Vector yp, N_Vector rr, N_Vector vv return SPGMR_SUCCESS except(N.linalg.LinAlgError,ZeroDivisionError,AssimuloRecoverableError): return SPGMR_ATIMES_FAIL_REC - except: + except Exception: traceback.print_exc() return SPGMR_PSOLVE_FAIL_UNREC diff --git a/src/lib/sundials_callbacks_kinsol.pxi b/src/lib/sundials_callbacks_kinsol.pxi index bf31cf9c..0f606a3e 100644 --- a/src/lib/sundials_callbacks_kinsol.pxi +++ b/src/lib/sundials_callbacks_kinsol.pxi @@ -39,7 +39,7 @@ IF SUNDIALS_VERSION >= (3,0,0): col_i[j] = jac[j,i] return KINDLS_SUCCESS - except: + except Exception: return KINDLS_JACFUNC_RECVR #Recoverable Error (See Sundials description) ELSE: cdef int kin_jac(long int Neq, N_Vector xv, N_Vector fval, DlsMat Jacobian, @@ -62,7 +62,7 @@ ELSE: col_i[j] = jac[j,i] return KINDLS_SUCCESS - except: + except Exception: return KINDLS_JACFUNC_RECVR #Recoverable Error (See Sundials description) cdef int kin_jacv(N_Vector vv, N_Vector Jv, N_Vector vx, int* new_u, @@ -83,7 +83,7 @@ cdef int kin_jacv(N_Vector vv, N_Vector Jv, N_Vector vx, int* new_u, return SPGMR_SUCCESS except(N.linalg.LinAlgError,ZeroDivisionError,AssimuloRecoverableError): return SPGMR_ATIMES_FAIL_REC - except: + except Exception: traceback.print_exc() return SPGMR_PSOLVE_FAIL_UNREC @@ -105,7 +105,7 @@ cdef int kin_res(N_Vector xv, N_Vector fval, void *problem_data): return KIN_SUCCESS except(N.linalg.LinAlgError,ZeroDivisionError,AssimuloRecoverableError): return KIN_REC_ERR - except: + except Exception: traceback.print_exc() return KIN_SYSFUNC_FAIL @@ -132,7 +132,7 @@ IF SUNDIALS_VERSION >= (3,0,0): zres = (pData.PREC_SOLVE)(r) except(N.linalg.LinAlgError,ZeroDivisionError,AssimuloRecoverableError): return KIN_REC_ERR - except: + except Exception: traceback.print_exc() return KIN_SYSFUNC_FAIL @@ -157,7 +157,7 @@ IF SUNDIALS_VERSION >= (3,0,0): (pData.PREC_SETUP)(u, fval, uscale, fscale) except(N.linalg.LinAlgError,ZeroDivisionError,AssimuloRecoverableError): return KIN_REC_ERR - except: + except Exception: traceback.print_exc() return KIN_SYSFUNC_FAIL @@ -186,7 +186,7 @@ ELSE: zres = (pData.PREC_SOLVE)(r) except(N.linalg.LinAlgError,ZeroDivisionError,AssimuloRecoverableError): return KIN_REC_ERR - except: + except Exception: traceback.print_exc() return KIN_SYSFUNC_FAIL @@ -211,7 +211,7 @@ ELSE: (pData.PREC_SETUP)(u, fval, uscale, fscale) except(N.linalg.LinAlgError,ZeroDivisionError,AssimuloRecoverableError): return KIN_REC_ERR - except: + except Exception: traceback.print_exc() return KIN_SYSFUNC_FAIL diff --git a/src/ode.pyx b/src/ode.pyx index 503d98dc..8bd333fb 100644 --- a/src/ode.pyx +++ b/src/ode.pyx @@ -22,7 +22,7 @@ from timeit import default_timer as timer import itertools import multiprocessing -from exception import * +from exception import ODE_Exception, AssimuloException from problem import Explicit_Problem, Delay_Explicit_Problem, Implicit_Problem, SingPerturbed_Problem from support import Statistics @@ -345,7 +345,7 @@ cdef class ODE: def _set_verbosity(self, verb): try: self.options["verbosity"] = int(verb) - except: + except Exception: raise AssimuloException("Verbosity must be an integer.") def _get_verbosity(self): diff --git a/src/problem.pyx b/src/problem.pyx index a9bfc23c..45572267 100644 --- a/src/problem.pyx +++ b/src/problem.pyx @@ -103,7 +103,7 @@ cdef class cImplicit_Problem(cProblem): cpdef res_internal(self, N.ndarray[double, ndim=1] res, double t, N.ndarray[double, ndim=1] y, N.ndarray[double, ndim=1] yd): try: res[:] = self.res(t,y,yd) - except: + except Exception: return ID_FAIL return ID_OK @@ -132,7 +132,7 @@ cdef class cOverdetermined_Problem(cProblem): cpdef res_internal(self, N.ndarray[double, ndim=1] res, double t, N.ndarray[double, ndim=1] y, N.ndarray[double, ndim=1] yd): try: res[:] = self.res(t,y,yd) - except: + except Exception: return ID_FAIL return ID_OK @@ -161,7 +161,7 @@ cdef class cExplicit_Problem(cProblem): cpdef int rhs_internal(self, N.ndarray[double, ndim=1] yd, double t, N.ndarray[double, ndim=1] y): try: yd[:] = self.rhs(t,y) - except: + except Exception: return ID_FAIL return ID_OK diff --git a/src/solvers/euler.pyx b/src/solvers/euler.pyx index 0c3d3f5d..6f7e0c5f 100644 --- a/src/solvers/euler.pyx +++ b/src/solvers/euler.pyx @@ -20,9 +20,8 @@ import numpy as N import numpy.linalg as LIN import scipy.sparse as sp -#from assimulo.ode import * from assimulo.explicit_ode cimport Explicit_ODE -from assimulo.exception import * +from assimulo.exception import AssimuloException include "constants.pxi" #Includes the constants (textual include) @@ -442,7 +441,7 @@ cdef class ImplicitEuler(Explicit_ODE): def _set_h(self,h): try: self.options["h"] = float(h) - except: + except Exception: raise AssimuloException("Step-size must be a (scalar) float.") def _get_h(self): @@ -651,7 +650,7 @@ cdef class ExplicitEuler(Explicit_ODE): def _set_h(self,h): try: self.options["h"] = float(h) - except: + except Exception: raise AssimuloException("Step-size must be a (scalar) float.") def _get_h(self): diff --git a/src/solvers/kinsol.pyx b/src/solvers/kinsol.pyx index efdf76c3..be0c53fa 100644 --- a/src/solvers/kinsol.pyx +++ b/src/solvers/kinsol.pyx @@ -24,7 +24,6 @@ N.import_array() import numpy.linalg import traceback -from assimulo.exception import * from assimulo.algebraic cimport Algebraic cimport sundials_includes as SUNDIALS @@ -700,7 +699,7 @@ cdef class KINSOL(Algebraic): def _set_max_krylov(self, max_krylov): try: self.options["max_krylov"] = int(max_krylov) - except: + except Exception: raise Exception("Maximum number of krylov dimension should be an integer.") if self.options["max_krylov"] < 0: raise Exception("Maximum number of krylov dimension should be an positive integer.") diff --git a/src/solvers/runge_kutta.py b/src/solvers/runge_kutta.py index f52acc6c..32b2eff2 100644 --- a/src/solvers/runge_kutta.py +++ b/src/solvers/runge_kutta.py @@ -479,7 +479,7 @@ def event_func(t, y): def f(dy ,t, y): try: dy[:] = self.problem.rhs(t, y, self.sw) - except: + except Exception: return False return True self.f = f diff --git a/src/solvers/sdirk_dae.pyx b/src/solvers/sdirk_dae.pyx index 70ac01ef..5e748f31 100644 --- a/src/solvers/sdirk_dae.pyx +++ b/src/solvers/sdirk_dae.pyx @@ -18,8 +18,8 @@ import numpy as N import sys -from assimulo.exception import * -from assimulo.ode import * +from assimulo.exception import ODEPACK_Exception, RKStarter_Exception +from assimulo.ode import ID_PY_COMPLETE, ID_PY_EVENT, NORMAL from assimulo.explicit_ode import Implicit_ODE diff --git a/src/solvers/sundials.pyx b/src/solvers/sundials.pyx index 7927f5a2..10c3eb04 100644 --- a/src/solvers/sundials.pyx +++ b/src/solvers/sundials.pyx @@ -25,7 +25,7 @@ import numpy.linalg import traceback import scipy.sparse as sparse -from assimulo.exception import * +from assimulo.exception import AssimuloException from assimulo.explicit_ode cimport Explicit_ODE from assimulo.implicit_ode cimport Implicit_ODE @@ -855,7 +855,7 @@ cdef class IDA(Implicit_ODE): def _set_lsoff(self, lsoff): try: self.options["lsoff"] = bool(lsoff) - except: + except Exception: Exception('Unkown input to lsoff, must be a boolean.') def _get_lsoff(self): @@ -933,7 +933,7 @@ cdef class IDA(Implicit_ODE): def _set_suppress_alg(self,suppress_alg): try: self.options["suppress_alg"] = bool(suppress_alg) - except: + except Exception: raise AssimuloException("Unkown input to suppress_alg, must be a boolean.") def _get_suppress_alg(self): @@ -962,7 +962,7 @@ cdef class IDA(Implicit_ODE): def _set_suppress_sens(self,suppress_sens): try: self.options["suppress_sens"] = bool(suppress_sens) - except: + except Exception: raise AssimuloException("Unkown input to suppress_sens, must be a boolean.") def _get_suppress_sens(self): @@ -1090,7 +1090,7 @@ cdef class IDA(Implicit_ODE): def _set_max_cor_S(self,maxcorS): try: self.options["maxcorS"] = int(maxcorS) - except: + except Exception: raise AssimuloException("The maximum nonlinear sensitivity iterations must be a positiv integer.") def _get_max_cor_S(self): @@ -1141,7 +1141,7 @@ cdef class IDA(Implicit_ODE): def _set_max_h(self,max_h): try: self.options["maxh"] = float(max_h) - except: + except Exception: raise AssimuloException("Maximal stepsize must be a (scalar) float.") def _get_max_h(self): @@ -1167,7 +1167,7 @@ cdef class IDA(Implicit_ODE): def _set_linear_solver(self, lsolver): if lsolver.upper() == "DENSE" or lsolver.upper() == "SPGMR": self.options["linear_solver"] = lsolver.upper() - else: + else Exception: raise AssimuloException('The linear solver must be either "DENSE" or "SPGMR".') def _get_linear_solver(self): @@ -1388,7 +1388,7 @@ cdef class IDA(Implicit_ODE): def _set_external_event_detection(self, event_opt): try: self.options["external_event_detection"] = bool(event_opt) - except: + except Exception: raise AssimuloException("Unkown input to external_event_detection, must be a boolean.") def _get_external_event_detection(self): @@ -2108,7 +2108,7 @@ cdef class CVode(Explicit_ODE): if opts["report_continuously"]: try: flag_initialize = self.report_solution(t, y, opts) - except: + except Exception: self.store_statistics(CV_TSTOP_RETURN) raise if flag_initialize: @@ -2803,7 +2803,7 @@ cdef class CVode(Explicit_ODE): def _set_max_cor_S(self,maxcorS): try: self.options["maxcorS"] = int(maxcorS) - except: + except Exception: raise AssimuloException("The maximum nonlinear sensitivity iterations must be a positiv integer.") def _get_max_cor_S(self): @@ -2827,7 +2827,7 @@ cdef class CVode(Explicit_ODE): def _set_max_cor(self, maxcor): try: self.options["maxcor"] = int(maxcor) - except: + except Exception: raise AssimuloException("The maximum nonlinear iterations must be a positiv integer.") def _get_max_cor(self): @@ -2850,7 +2850,7 @@ cdef class CVode(Explicit_ODE): def _set_max_h(self,max_h): try: self.options["maxh"] = float(max_h) - except: + except Exception: raise AssimuloException("Maximal stepsize must be a (scalar) float.") def _get_max_h(self): @@ -2876,7 +2876,7 @@ cdef class CVode(Explicit_ODE): def _set_min_h(self,min_h): try: self.options["minh"] = float(min_h) - except: + except Exception: raise AssimuloException("Minimal stepsize must be a (scalar) float.") def _get_min_h(self): @@ -2981,7 +2981,7 @@ cdef class CVode(Explicit_ODE): def _set_suppress_sens(self,suppress_sens): try: self.options["suppress_sens"] = bool(suppress_sens) - except: + except Exception: raise AssimuloException("Unkown input to suppress_sens, must be a boolean.") def _get_suppress_sens(self): @@ -3098,7 +3098,7 @@ cdef class CVode(Explicit_ODE): def _set_max_krylov(self, maxkrylov): try: self.options["maxkrylov"] = int(maxkrylov) - except: + except Exception: raise AssimuloException("Maximum number of krylov dimension should be an integer.") if self.options["maxkrylov"] < 0: raise AssimuloException("Maximum number of krylov dimension should be an positive integer.") @@ -3192,7 +3192,7 @@ cdef class CVode(Explicit_ODE): def _set_external_event_detection(self, event_opt): try: self.options["external_event_detection"] = bool(event_opt) - except: + except Exception: raise AssimuloException("Unkown input to external_event_detection, must be a boolean.") def _get_external_event_detection(self): diff --git a/tests/solvers/test_radau5.py b/tests/solvers/test_radau5.py index 52a5fff1..000c0bf4 100644 --- a/tests/solvers/test_radau5.py +++ b/tests/solvers/test_radau5.py @@ -1140,7 +1140,7 @@ def f(t, y): try: sim.simulate(1.0) assert False, "Simulation passed without Exception, TimeLimitException should have been raised" - except: + except Exception: pass found_data = False diff --git a/tests/solvers/test_sundials.py b/tests/solvers/test_sundials.py index 4ef2c333..8019c107 100644 --- a/tests/solvers/test_sundials.py +++ b/tests/solvers/test_sundials.py @@ -393,7 +393,7 @@ def test_statistics_stored(self): try: exp_sim.simulate(1.0) assert False, "Simulation passed without Exception, TimeLimitException should have been raised" - except: + except Exception: pass found_data = False