small fixes

- add warning ignore to self.m.sqrt MathFunction due to unnecessary warnings when executing models using solve_ivp
- add np.e constant by default
- remove not yet implemented solver_kwargs argument to setup function

Author: ben1post

src/xso/backendcomps.py

@@ -198,7 +198,7 @@ def time_flux(self, **kwargs):
         """Simple linear flux, that represents time within model.
         Necessary for external solvers like odeint.
         """
-        dtdt = 1
+        dtdt = 1.
         return dtdt
 
 

src/xso/solvers.py

@@ -73,11 +73,14 @@ class MathFunctionWrappers:
 
         # Constants:
         pi = np.pi  # pi constant
+        e = np.e  # e constant
 
         def exp(x):
             """Exponential function"""
             return np.exp(x)
 
+        # add np.errstate to ignore superfluous warnings, caused by solve_ivp solver
+        @np.errstate(all='ignore')
         def sqrt(x):
             """Square root function"""
             return np.sqrt(x)

src/xso/xsimlabwrappers.py

@@ -33,7 +33,7 @@ def create(components, time_unit='d'):
     return xs.Model(components)
 
 
-def setup(solver, model, input_vars, output_vars=None, time=None, solver_kwargs=None):
+def setup(solver, model, input_vars, output_vars=None, time=None):
     """Create a specific setup for model runs.
 
     This function wraps xsimlab's create_setup and adds a dummy clock parameter