From 5bbafa7f9d79ccfd1c685559c17f3aff2e04b0ed Mon Sep 17 00:00:00 2001 From: philippkraft Date: Fri, 22 Mar 2019 15:54:32 +0100 Subject: [PATCH] Fixed #34 for cmf1.5. Can start to fix all 1.5 issues in this branch --- cmf/__init__.py | 4 +- cmf/cmf_core.py | 475 +---- cmf/cmf_core_src/cmf_wrap.cpp | 3792 +++++++-------------------------- 3 files changed, 845 insertions(+), 3426 deletions(-) diff --git a/cmf/__init__.py b/cmf/__init__.py index 1e15b180..93160998 100644 --- a/cmf/__init__.py +++ b/cmf/__init__.py @@ -22,8 +22,8 @@ from .stopwatch import StopWatch -__version__ = '1.5.0a' -__compiletime__ = 'Fri Mar 15 16:02:14 2019' +__version__ = '1.5.0a.cmf_1_5' +__compiletime__ = 'Fri Mar 22 15:51:52 2019' from .cmf_core import connect_cells_with_flux as __ccwf diff --git a/cmf/cmf_core.py b/cmf/cmf_core.py index 234a5865..ca687484 100644 --- a/cmf/cmf_core.py +++ b/cmf/cmf_core.py @@ -1688,9 +1688,6 @@ def as_timedelta(self): second = property(lambda self: self.AsDate().second) ms = property(lambda self: self.AsDate().ms) - def __format__(self, fmt): - return self.AsPython().__format__(fmt) - __swig_destroy__ = _cmf_core.delete_Time Time.AsDays = new_instancemethod(_cmf_core.Time_AsDays, None, Time) Time.AsHours = new_instancemethod(_cmf_core.Time_AsHours, None, Time) @@ -2409,7 +2406,7 @@ def from_sequence(cls, begin, step, sequence, interpolation_mode=1): @classmethod def from_buffer(cls,buf): import numpy as np - header_length=struct.calcsize('qqqq') + header_length=struct.calcsize('qqqq') header=struct.unpack('qqqq',buf[:header_length]) res=cls(header[1]*ms,header[2]*ms,header[3]) res.extend(np.fromstring(buf[header_length:], dtype=float)) @@ -2772,16 +2769,6 @@ def to_string(self, *args, **kwargs): return _cmf_core.StateVariable_to_string(self, *args, **kwargs) __swig_destroy__ = _cmf_core.delete_StateVariable - - def is_connected(self, *args, **kwargs): - """ - is_connected(StateVariable self, StateVariable other) -> bool - - virtual bool is_connected(const cmf::math::StateVariable &other) const - - """ - return _cmf_core.StateVariable_is_connected(self, *args, **kwargs) - state = _swig_property(_cmf_core.StateVariable_state_get, _cmf_core.StateVariable_state_set) def __repr__(self): @@ -2790,7 +2777,6 @@ def __repr__(self): StateVariable.dxdt = new_instancemethod(_cmf_core.StateVariable_dxdt, None, StateVariable) StateVariable.get_abs_errtol = new_instancemethod(_cmf_core.StateVariable_get_abs_errtol, None, StateVariable) StateVariable.to_string = new_instancemethod(_cmf_core.StateVariable_to_string, None, StateVariable) -StateVariable.is_connected = new_instancemethod(_cmf_core.StateVariable_is_connected, None, StateVariable) _cmf_core.StateVariable_swigregister(StateVariable) # StateVariable end @@ -2887,42 +2873,6 @@ def __init__(self, *args, **kwargs): _cmf_core.StateVariableList_swigregister(StateVariableList) # StateVariableList end -class sparse_structure(object): - """Proxy of C++ cmf::math::sparse_structure class.""" - - thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') - __repr__ = _swig_repr - indexvalues = _swig_property(_cmf_core.sparse_structure_indexvalues_get, _cmf_core.sparse_structure_indexvalues_set) - indexpointers = _swig_property(_cmf_core.sparse_structure_indexpointers_get, _cmf_core.sparse_structure_indexpointers_set) - - def __init__(self, *args, **kwargs): - """ - __init__(cmf::math::sparse_structure self) -> sparse_structure - - sparse_structure() - - Creates the sparse row compressed structure from states variable list. - - """ - _cmf_core.sparse_structure_swiginit(self, _cmf_core.new_sparse_structure(*args, **kwargs)) - - def generate(self, *args, **kwargs): - """ - generate(sparse_structure self, StateVariableList states) -> size_t - - size_t - generate(const StateVariableList &states) - """ - return _cmf_core.sparse_structure_generate(self, *args, **kwargs) - - NNZ = _swig_property(_cmf_core.sparse_structure_NNZ_get, _cmf_core.sparse_structure_NNZ_set) - NP = _swig_property(_cmf_core.sparse_structure_NP_get, _cmf_core.sparse_structure_NP_set) - N = _swig_property(_cmf_core.sparse_structure_N_get, _cmf_core.sparse_structure_N_set) - __swig_destroy__ = _cmf_core.delete_sparse_structure -sparse_structure.generate = new_instancemethod(_cmf_core.sparse_structure_generate, None, sparse_structure) -_cmf_core.sparse_structure_swigregister(sparse_structure) -# sparse_structure end - class Adsorption(object): """ @@ -3512,28 +3462,6 @@ def set_adsorption(self, *args, **kwargs): decay = _swig_property(_cmf_core.SoluteStorage_decay_get, _cmf_core.SoluteStorage_decay_set) source = _swig_property(_cmf_core.SoluteStorage_source_get, _cmf_core.SoluteStorage_source_set) Solute = _swig_property(_cmf_core.SoluteStorage_Solute_get) - - def get_water(self, *args, **kwargs): - """ - get_water(SoluteStorage self) -> WaterStorage - - const - WaterStorage& get_water() const - - get the waterstorge of the solute storage - """ - return _cmf_core.SoluteStorage_get_water(self, *args, **kwargs) - - - def add_connected_states(self, *args, **kwargs): - """ - add_connected_states(SoluteStorage self, cmf::math::StateVariable::list & states) - - virtual void add_connected_states(cmf::math::StateVariable::list - &states) - """ - return _cmf_core.SoluteStorage_add_connected_states(self, *args, **kwargs) - conc = _swig_property(_cmf_core.SoluteStorage_conc_get, _cmf_core.SoluteStorage_conc_set) def __repr__(self): @@ -3541,8 +3469,6 @@ def __repr__(self): __swig_destroy__ = _cmf_core.delete_SoluteStorage SoluteStorage.set_adsorption = new_instancemethod(_cmf_core.SoluteStorage_set_adsorption, None, SoluteStorage) -SoluteStorage.get_water = new_instancemethod(_cmf_core.SoluteStorage_get_water, None, SoluteStorage) -SoluteStorage.add_connected_states = new_instancemethod(_cmf_core.SoluteStorage_add_connected_states, None, SoluteStorage) _cmf_core.SoluteStorage_swigregister(SoluteStorage) # SoluteStorage end @@ -14144,7 +14070,7 @@ def __init__(self, *args, **kwargs): __repr__ = _swig_repr def __getitem__(self, *args, **kwargs): - """__getitem__(Integrator self, long position) -> cmf::math::StateVariable::ptr""" + """__getitem__(Integrator self, int position) -> cmf::math::StateVariable::ptr""" return _cmf_core.Integrator___getitem__(self, *args, **kwargs) @@ -14413,7 +14339,7 @@ def run(self, start=None, end=None, step=day*1, max_errors=0, reset=False): cmf.Time the actual timestep """ - from logging import warning + import logging if not start is None: self.t = start if end is None: @@ -14427,7 +14353,7 @@ def run(self, start=None, end=None, step=day*1, max_errors=0, reset=False): if len(errors) < max_errors: errors.append((t, e)) self.reset() - warning(str(t) + ': ' + str(e)) + logging.warning(str(t) + ': ' + str(e)) yield t Integrator.__getitem__ = new_instancemethod(_cmf_core.Integrator___getitem__, None, Integrator) @@ -14627,355 +14553,79 @@ def __init__(self, *args): _cmf_core.RKFIntegrator_swigregister(RKFIntegrator) # RKFIntegrator end -class CVodeOptions(object): - """ - - - A set of options for all CVode3 solver. - - Negative numbers indicate that this option stays on the default value. - For the meaning of the options see CVODE-UD, section 4.5.6 - - See Hindmarsh, A., Serban, R. and Reynolds, D.: User Documentation for - cvode v3.1.0, 2017, UCRL-SM-208108 - - Usage example: >>>solver = CVodeDens(p, 1e-9) - >>>solver.options.max_order = 2 - - C++ includes: cvode.h - """ +class CVodeIntegrator(Integrator): + """Proxy of C++ cmf::math::CVodeIntegrator class.""" thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') __repr__ = _swig_repr - max_order = _swig_property(_cmf_core.CVodeOptions_max_order_get, _cmf_core.CVodeOptions_max_order_set) - max_non_linear_iterations = _swig_property(_cmf_core.CVodeOptions_max_non_linear_iterations_get, _cmf_core.CVodeOptions_max_non_linear_iterations_set) - max_error_test_failures = _swig_property(_cmf_core.CVodeOptions_max_error_test_failures_get, _cmf_core.CVodeOptions_max_error_test_failures_set) - max_convergence_failures = _swig_property(_cmf_core.CVodeOptions_max_convergence_failures_get, _cmf_core.CVodeOptions_max_convergence_failures_set) - max_num_steps = _swig_property(_cmf_core.CVodeOptions_max_num_steps_get, _cmf_core.CVodeOptions_max_num_steps_set) - max_hnil_warnings = _swig_property(_cmf_core.CVodeOptions_max_hnil_warnings_get, _cmf_core.CVodeOptions_max_hnil_warnings_set) - - def __init__(self, *args, **kwargs): - """ - __init__(cmf::math::CVodeOptions self) -> CVodeOptions - - CVodeOptions() - """ - _cmf_core.CVodeOptions_swiginit(self, _cmf_core.new_CVodeOptions(*args, **kwargs)) - __swig_destroy__ = _cmf_core.delete_CVodeOptions -_cmf_core.CVodeOptions_swigregister(CVodeOptions) -# CVodeOptions end - -class CVodeInfo(object): - """ + preconditioner = _swig_property(_cmf_core.CVodeIntegrator_preconditioner_get, _cmf_core.CVodeIntegrator_preconditioner_set) + MaxNonLinearIterations = _swig_property(_cmf_core.CVodeIntegrator_MaxNonLinearIterations_get, _cmf_core.CVodeIntegrator_MaxNonLinearIterations_set) + MaxConvergenceFailures = _swig_property(_cmf_core.CVodeIntegrator_MaxConvergenceFailures_get, _cmf_core.CVodeIntegrator_MaxConvergenceFailures_set) + MaxErrorTestFailures = _swig_property(_cmf_core.CVodeIntegrator_MaxErrorTestFailures_get, _cmf_core.CVodeIntegrator_MaxErrorTestFailures_set) + maxl = _swig_property(_cmf_core.CVodeIntegrator_maxl_get, _cmf_core.CVodeIntegrator_maxl_set) + LinearSolver = _swig_property(_cmf_core.CVodeIntegrator_LinearSolver_get, _cmf_core.CVodeIntegrator_LinearSolver_set) + MaxOrder = _swig_property(_cmf_core.CVodeIntegrator_MaxOrder_get, _cmf_core.CVodeIntegrator_MaxOrder_set) + max_step = _swig_property(_cmf_core.CVodeIntegrator_max_step_get, _cmf_core.CVodeIntegrator_max_step_set) + def get_order(self, *args, **kwargs): + """get_order(CVodeIntegrator self) -> int""" + return _cmf_core.CVodeIntegrator_get_order(self, *args, **kwargs) - Reports the current state of a CVode solver. - - C++ includes: cvode.h - """ - - thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') - __repr__ = _swig_repr - size = _swig_property(_cmf_core.CVodeInfo_size_get, _cmf_core.CVodeInfo_size_set) - workspace_real = _swig_property(_cmf_core.CVodeInfo_workspace_real_get, _cmf_core.CVodeInfo_workspace_real_set) - workspace_int = _swig_property(_cmf_core.CVodeInfo_workspace_int_get, _cmf_core.CVodeInfo_workspace_int_set) - workspace_byte = _swig_property(_cmf_core.CVodeInfo_workspace_byte_get, _cmf_core.CVodeInfo_workspace_byte_set) - steps = _swig_property(_cmf_core.CVodeInfo_steps_get, _cmf_core.CVodeInfo_steps_set) - current_order = _swig_property(_cmf_core.CVodeInfo_current_order_get, _cmf_core.CVodeInfo_current_order_set) - rhs_evaluations = _swig_property(_cmf_core.CVodeInfo_rhs_evaluations_get, _cmf_core.CVodeInfo_rhs_evaluations_set) - linear_solver_setups = _swig_property(_cmf_core.CVodeInfo_linear_solver_setups_get, _cmf_core.CVodeInfo_linear_solver_setups_set) - error_test_fails = _swig_property(_cmf_core.CVodeInfo_error_test_fails_get, _cmf_core.CVodeInfo_error_test_fails_set) - order_reductions = _swig_property(_cmf_core.CVodeInfo_order_reductions_get, _cmf_core.CVodeInfo_order_reductions_set) - nonlinear_solver_iterations = _swig_property(_cmf_core.CVodeInfo_nonlinear_solver_iterations_get, _cmf_core.CVodeInfo_nonlinear_solver_iterations_set) - nonlinear_solver_convergence_failures = _swig_property(_cmf_core.CVodeInfo_nonlinear_solver_convergence_failures_get, _cmf_core.CVodeInfo_nonlinear_solver_convergence_failures_set) - dxdt_method_calls = _swig_property(_cmf_core.CVodeInfo_dxdt_method_calls_get, _cmf_core.CVodeInfo_dxdt_method_calls_set) - sundials_version = _swig_property(_cmf_core.CVodeInfo_sundials_version_get, _cmf_core.CVodeInfo_sundials_version_set) - - def to_string(self, *args, **kwargs): - """ - to_string(CVodeInfo self) -> std::string - - std::string - to_string() const - """ - return _cmf_core.CVodeInfo_to_string(self, *args, **kwargs) - - - def __init__(self, *args, **kwargs): - """__init__(cmf::math::CVodeInfo self) -> CVodeInfo""" - _cmf_core.CVodeInfo_swiginit(self, _cmf_core.new_CVodeInfo(*args, **kwargs)) - __swig_destroy__ = _cmf_core.delete_CVodeInfo -CVodeInfo.to_string = new_instancemethod(_cmf_core.CVodeInfo_to_string, None, CVodeInfo) -_cmf_core.CVodeInfo_swigregister(CVodeInfo) -# CVodeInfo end - -class CVodeBase(Integrator): - """ - - - Abstract base class for different modes of the CVode solver. - - Initantiate one of the child classes to gain different modes of the - CVode solver - - C++ includes: cvode.h - """ - - thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') - - def __init__(self, *args, **kwargs): - raise AttributeError("No constructor defined - class is abstract") - __repr__ = _swig_repr - options = _swig_property(_cmf_core.CVodeBase_options_get, _cmf_core.CVodeBase_options_set) def initialize(self, *args, **kwargs): - """ - initialize(CVodeBase self) -> int - - int - initialize() - - Initialize the internal memory. - - Automatically called, when one starts to integrate - """ - return _cmf_core.CVodeBase_initialize(self, *args, **kwargs) - - - def set_error_msg(self, *args, **kwargs): - """ - set_error_msg(CVodeBase self, std::string error) - - void - set_error_msg(std::string error) - - Sets an error message. - """ - return _cmf_core.CVodeBase_set_error_msg(self, *args, **kwargs) - - - def copy(self, *args, **kwargs): - """ - copy(CVodeBase self) -> CVodeBase - - CVodeBase* copy() - const - - Returns a copy of the solver. - """ - return _cmf_core.CVodeBase_copy(self, *args, **kwargs) - - error_msg = _swig_property(_cmf_core.CVodeBase_error_msg_get, _cmf_core.CVodeBase_error_msg_set) - - def get_info(self, *args, **kwargs): - """ - get_info(CVodeBase self) -> CVodeInfo + """initialize(CVodeIntegrator self)""" + return _cmf_core.CVodeIntegrator_initialize(self, *args, **kwargs) - CVodeInfo - get_info() const - Returns the current solver statistics. - """ - return _cmf_core.CVodeBase_get_info(self, *args, **kwargs) + def release(self, *args, **kwargs): + """release(CVodeIntegrator self)""" + return _cmf_core.CVodeIntegrator_release(self, *args, **kwargs) - def to_string(self, *args, **kwargs): + def __init__(self, *args): """ - to_string(CVodeBase self) -> std::string - - virtual - std::string to_string() const =0 - - Returns a string representation of the solver. + __init__(cmf::math::CVodeIntegrator self, real epsilon=1e-9, char _preconditioner) -> CVodeIntegrator + __init__(cmf::math::CVodeIntegrator self, StateVariableOwner states, real epsilon=1e-9, char _preconditioner) -> CVodeIntegrator + __init__(cmf::math::CVodeIntegrator self, CVodeIntegrator templ) -> CVodeIntegrator """ - return _cmf_core.CVodeBase_to_string(self, *args, **kwargs) - + _cmf_core.CVodeIntegrator_swiginit(self, _cmf_core.new_CVodeIntegrator(*args)) def get_error(self, *args, **kwargs): - """ - get_error(CVodeBase self) -> cmf::math::num_array - - cmf::math::num_array get_error() const - - Error vector of the integrator. - """ - return _cmf_core.CVodeBase_get_error(self, *args, **kwargs) + """get_error(CVodeIntegrator self) -> cmf::math::num_array""" + return _cmf_core.CVodeIntegrator_get_error(self, *args, **kwargs) - def _get_jacobian(self, *args, **kwargs): - """ - _get_jacobian(CVodeBase self) -> cmf::math::num_array - - virtual - cmf::math::num_array _get_jacobian() const + def get_nonlinear_iterations(self, *args, **kwargs): + """get_nonlinear_iterations(CVodeIntegrator self) -> int""" + return _cmf_core.CVodeIntegrator_get_nonlinear_iterations(self, *args, **kwargs) - Returns a continuous 1D array representing the Jacobian columns - concatenated. - - In Python, get_jacobian returns the Jacobian as a 2D array - """ - return _cmf_core.CVodeBase__get_jacobian(self, *args, **kwargs) - - __swig_destroy__ = _cmf_core.delete_CVodeBase - - def get_jacobian(self): - return self._get_jacobian().reshape((self.size(), self.size()), order='F') - -CVodeBase.initialize = new_instancemethod(_cmf_core.CVodeBase_initialize, None, CVodeBase) -CVodeBase.set_error_msg = new_instancemethod(_cmf_core.CVodeBase_set_error_msg, None, CVodeBase) -CVodeBase.copy = new_instancemethod(_cmf_core.CVodeBase_copy, None, CVodeBase) -CVodeBase.get_info = new_instancemethod(_cmf_core.CVodeBase_get_info, None, CVodeBase) -CVodeBase.to_string = new_instancemethod(_cmf_core.CVodeBase_to_string, None, CVodeBase) -CVodeBase.get_error = new_instancemethod(_cmf_core.CVodeBase_get_error, None, CVodeBase) -CVodeBase._get_jacobian = new_instancemethod(_cmf_core.CVodeBase__get_jacobian, None, CVodeBase) -_cmf_core.CVodeBase_swigregister(CVodeBase) -# CVodeBase end - -class CVodeDense(CVodeBase): - """ - - - implicit BDF CVode solver with full Jacobian approximation - - Use this solver for small but stiff systems (<20 state variables) - - The solver calculates for each step the full Jacobian matrix of the - system using a difference quotient approximation of the real Jacobian - - C++ includes: cvode.h - """ - - thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') - __repr__ = _swig_repr - - def __init__(self, *args, **kwargs): - """ - __init__(cmf::math::CVodeDense self, StateVariableOwner states, real epsilon=1e-9) -> CVodeDense - - CVodeDense(cmf::math::StateVariableOwner &states, real epsilon=1e-9) - - Creates a new implicit dense CVode solver. - """ - _cmf_core.CVodeDense_swiginit(self, _cmf_core.new_CVodeDense(*args, **kwargs)) - __swig_destroy__ = _cmf_core.delete_CVodeDense -_cmf_core.CVodeDense_swigregister(CVodeDense) -# CVodeDense end - -class CVodeAdams(CVodeBase): - """ - - - Explizit multistep solver using CVode. - - C++ includes: cvode.h - """ - - thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') - __repr__ = _swig_repr - - def __init__(self, *args, **kwargs): - """ - __init__(cmf::math::CVodeAdams self, StateVariableOwner states, real epsilon=1e-9) -> CVodeAdams - - CVodeAdams(cmf::math::StateVariableOwner &states, real epsilon=1e-9) - - """ - _cmf_core.CVodeAdams_swiginit(self, _cmf_core.new_CVodeAdams(*args, **kwargs)) - __swig_destroy__ = _cmf_core.delete_CVodeAdams -_cmf_core.CVodeAdams_swigregister(CVodeAdams) -# CVodeAdams end - -class CVodeBanded(CVodeBase): - """ + def get_rhsevals(self, *args, **kwargs): + """get_rhsevals(CVodeIntegrator self) -> int""" + return _cmf_core.CVodeIntegrator_get_rhsevals(self, *args, **kwargs) - implicit BDF CVode solver with a banded Jacobian approximation - C++ includes: cvode.h - """ - - thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') - __repr__ = _swig_repr - bandwidth = _swig_property(_cmf_core.CVodeBanded_bandwidth_get, _cmf_core.CVodeBanded_bandwidth_set) - - def __init__(self, *args, **kwargs): - """ - __init__(cmf::math::CVodeBanded self, StateVariableOwner states, real epsilon=1e-9, int w=5) -> CVodeBanded - - CVodeBanded(cmf::math::StateVariableOwner &states, real epsilon=1e-9, - int w=5) - """ - _cmf_core.CVodeBanded_swiginit(self, _cmf_core.new_CVodeBanded(*args, **kwargs)) - __swig_destroy__ = _cmf_core.delete_CVodeBanded -_cmf_core.CVodeBanded_swigregister(CVodeBanded) -# CVodeBanded end - -class CVodeDiag(CVodeBase): - """ - - - implicit BDF CVode solver with a one line diagonal Jacobian - approximation - - C++ includes: cvode.h - """ - - thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') - __repr__ = _swig_repr - - def __init__(self, *args, **kwargs): - """ - __init__(cmf::math::CVodeDiag self, StateVariableOwner states, real epsilon=1e-9) -> CVodeDiag - - CVodeDiag(cmf::math::StateVariableOwner &states, real epsilon=1e-9) - """ - _cmf_core.CVodeDiag_swiginit(self, _cmf_core.new_CVodeDiag(*args, **kwargs)) - __swig_destroy__ = _cmf_core.delete_CVodeDiag -_cmf_core.CVodeDiag_swigregister(CVodeDiag) -# CVodeDiag end - -class CVodeKrylov(CVodeBase): - """ - - - implicit BDF CVode solver with a Krylov preconditioner - - C++ includes: cvode.h - """ - - thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') - __repr__ = _swig_repr - bandwidth = _swig_property(_cmf_core.CVodeKrylov_bandwidth_get, _cmf_core.CVodeKrylov_bandwidth_set) - preconditioner = _swig_property(_cmf_core.CVodeKrylov_preconditioner_get, _cmf_core.CVodeKrylov_preconditioner_set) - - def __init__(self, *args, **kwargs): - """ - __init__(cmf::math::CVodeKrylov self, StateVariableOwner states, real epsilon=1e-9, int w=5, char p) -> CVodeKrylov - - CVodeKrylov(cmf::math::StateVariableOwner &states, real epsilon=1e-9, - int w=5, char p='L') + def copy(self, *args, **kwargs): """ - _cmf_core.CVodeKrylov_swiginit(self, _cmf_core.new_CVodeKrylov(*args, **kwargs)) - __swig_destroy__ = _cmf_core.delete_CVodeKrylov -_cmf_core.CVodeKrylov_swigregister(CVodeKrylov) -# CVodeKrylov end - -class CVodeKLU(CVodeBase): - """Proxy of C++ cmf::math::CVodeKLU class.""" + copy(CVodeIntegrator self) -> CVodeIntegrator - thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') - __repr__ = _swig_repr + virtual + Integrator* copy() const =0 - def __init__(self, *args, **kwargs): + Polymorphic copy constructor. """ - __init__(cmf::math::CVodeKLU self, StateVariableOwner states, real epsilon=1e-9) -> CVodeKLU + return _cmf_core.CVodeIntegrator_copy(self, *args, **kwargs) - CVodeKLU(cmf::math::StateVariableOwner &states, real epsilon=1e-9) - """ - _cmf_core.CVodeKLU_swiginit(self, _cmf_core.new_CVodeKLU(*args, **kwargs)) - __swig_destroy__ = _cmf_core.delete_CVodeKLU -_cmf_core.CVodeKLU_swigregister(CVodeKLU) -# CVodeKLU end + __swig_destroy__ = _cmf_core.delete_CVodeIntegrator +CVodeIntegrator.get_order = new_instancemethod(_cmf_core.CVodeIntegrator_get_order, None, CVodeIntegrator) +CVodeIntegrator.initialize = new_instancemethod(_cmf_core.CVodeIntegrator_initialize, None, CVodeIntegrator) +CVodeIntegrator.release = new_instancemethod(_cmf_core.CVodeIntegrator_release, None, CVodeIntegrator) +CVodeIntegrator.get_error = new_instancemethod(_cmf_core.CVodeIntegrator_get_error, None, CVodeIntegrator) +CVodeIntegrator.get_nonlinear_iterations = new_instancemethod(_cmf_core.CVodeIntegrator_get_nonlinear_iterations, None, CVodeIntegrator) +CVodeIntegrator.get_rhsevals = new_instancemethod(_cmf_core.CVodeIntegrator_get_rhsevals, None, CVodeIntegrator) +CVodeIntegrator.copy = new_instancemethod(_cmf_core.CVodeIntegrator_copy, None, CVodeIntegrator) +_cmf_core.CVodeIntegrator_swigregister(CVodeIntegrator) +# CVodeIntegrator end class MultiIntegrator(Integrator): """ @@ -15107,29 +14757,6 @@ def to_string(self, *args, **kwargs): # SoluteWaterIntegrator end -def CVodeIntegrator(project, tolerance=1e-9): - """ - Backwards compatibility layer for the CVodeIntegrator. - - Will return a CVodeKrylov solver as in cmf 1.x. - - Parameters - ---------- - project - CMF project - tolerance: - Solver tolerance - - Returns - ------- - CVodeKrylov - The integrator - """ - from logging import warning - warning('CVodeIntegrator is not available in CMF 2.0. Creating a CVodeKrylov solver instead') - return CVodeKrylov(project, tolerance) - - ConstantFlux = TechnicalFlux ConstantStateFlux = statecontrol_connection WaterBalanceFlux = waterbalance_connection diff --git a/cmf/cmf_core_src/cmf_wrap.cpp b/cmf/cmf_core_src/cmf_wrap.cpp index d7b4624c..9dc158cc 100644 --- a/cmf/cmf_core_src/cmf_wrap.cpp +++ b/cmf/cmf_core_src/cmf_wrap.cpp @@ -3030,206 +3030,196 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) { #define SWIGTYPE_p_cmf__geometry__point swig_types[18] #define SWIGTYPE_p_cmf__geometry__point_vector swig_types[19] #define SWIGTYPE_p_cmf__math__BDF2 swig_types[20] -#define SWIGTYPE_p_cmf__math__CVodeAdams swig_types[21] -#define SWIGTYPE_p_cmf__math__CVodeBanded swig_types[22] -#define SWIGTYPE_p_cmf__math__CVodeBase swig_types[23] -#define SWIGTYPE_p_cmf__math__CVodeDense swig_types[24] -#define SWIGTYPE_p_cmf__math__CVodeDiag swig_types[25] -#define SWIGTYPE_p_cmf__math__CVodeInfo swig_types[26] -#define SWIGTYPE_p_cmf__math__CVodeKLU swig_types[27] -#define SWIGTYPE_p_cmf__math__CVodeKrylov swig_types[28] -#define SWIGTYPE_p_cmf__math__CVodeOptions swig_types[29] -#define SWIGTYPE_p_cmf__math__Date swig_types[30] -#define SWIGTYPE_p_cmf__math__ExplicitEuler_fixed swig_types[31] -#define SWIGTYPE_p_cmf__math__HeunIntegrator swig_types[32] -#define SWIGTYPE_p_cmf__math__ImplicitEuler swig_types[33] -#define SWIGTYPE_p_cmf__math__Integrator swig_types[34] -#define SWIGTYPE_p_cmf__math__MultiIntegrator swig_types[35] -#define SWIGTYPE_p_cmf__math__RKFIntegrator swig_types[36] -#define SWIGTYPE_p_cmf__math__SoluteWaterIntegrator swig_types[37] -#define SWIGTYPE_p_cmf__math__StateVariable swig_types[38] -#define SWIGTYPE_p_cmf__math__StateVariableList swig_types[39] -#define SWIGTYPE_p_cmf__math__StateVariableOwner swig_types[40] -#define SWIGTYPE_p_cmf__math__StateVariable__list swig_types[41] -#define SWIGTYPE_p_cmf__math__Time swig_types[42] -#define SWIGTYPE_p_cmf__math__cubicspline swig_types[43] -#define SWIGTYPE_p_cmf__math__integratable swig_types[44] -#define SWIGTYPE_p_cmf__math__integratable_list swig_types[45] -#define SWIGTYPE_p_cmf__math__num_array swig_types[46] -#define SWIGTYPE_p_cmf__math__sparse_structure swig_types[47] -#define SWIGTYPE_p_cmf__math__timeseries swig_types[48] -#define SWIGTYPE_p_cmf__project swig_types[49] -#define SWIGTYPE_p_cmf__river__Channel swig_types[50] -#define SWIGTYPE_p_cmf__river__CrossSectionReach swig_types[51] -#define SWIGTYPE_p_cmf__river__IChannel swig_types[52] -#define SWIGTYPE_p_cmf__river__IVolumeHeightFunction swig_types[53] -#define SWIGTYPE_p_cmf__river__Manning swig_types[54] -#define SWIGTYPE_p_cmf__river__Manning_Diffusive swig_types[55] -#define SWIGTYPE_p_cmf__river__Manning_Kinematic swig_types[56] -#define SWIGTYPE_p_cmf__river__MeanChannel swig_types[57] -#define SWIGTYPE_p_cmf__river__OpenWaterStorage swig_types[58] -#define SWIGTYPE_p_cmf__river__PipeReach swig_types[59] -#define SWIGTYPE_p_cmf__river__Prism swig_types[60] -#define SWIGTYPE_p_cmf__river__Reach swig_types[61] -#define SWIGTYPE_p_cmf__river__ReachIterator swig_types[62] -#define SWIGTYPE_p_cmf__river__RectangularReach swig_types[63] -#define SWIGTYPE_p_cmf__river__SWATReachType swig_types[64] -#define SWIGTYPE_p_cmf__river__TriangularReach swig_types[65] -#define SWIGTYPE_p_cmf__river__volume_height_function swig_types[66] -#define SWIGTYPE_p_cmf__upslope__BrooksCoreyRetentionCurve swig_types[67] -#define SWIGTYPE_p_cmf__upslope__Cell swig_types[68] -#define SWIGTYPE_p_cmf__upslope__CellConnector swig_types[69] -#define SWIGTYPE_p_cmf__upslope__ET__CanopyStorageEvaporation swig_types[70] -#define SWIGTYPE_p_cmf__upslope__ET__ContentStress swig_types[71] -#define SWIGTYPE_p_cmf__upslope__ET__HargreaveET swig_types[72] -#define SWIGTYPE_p_cmf__upslope__ET__OudinET swig_types[73] -#define SWIGTYPE_p_cmf__upslope__ET__PenmanEvaporation swig_types[74] -#define SWIGTYPE_p_cmf__upslope__ET__PenmanMonteithET swig_types[75] -#define SWIGTYPE_p_cmf__upslope__ET__PriestleyTaylorET swig_types[76] -#define SWIGTYPE_p_cmf__upslope__ET__RootUptakeStessFunction swig_types[77] -#define SWIGTYPE_p_cmf__upslope__ET__SW_evap_from_canopy swig_types[78] -#define SWIGTYPE_p_cmf__upslope__ET__SW_evap_from_layer swig_types[79] -#define SWIGTYPE_p_cmf__upslope__ET__SW_evap_from_snow swig_types[80] -#define SWIGTYPE_p_cmf__upslope__ET__SW_evap_from_surfacewater swig_types[81] -#define SWIGTYPE_p_cmf__upslope__ET__SW_transpiration swig_types[82] -#define SWIGTYPE_p_cmf__upslope__ET__ShuttleworthWallace swig_types[83] -#define SWIGTYPE_p_cmf__upslope__ET__SuctionStress swig_types[84] -#define SWIGTYPE_p_cmf__upslope__ET__TurcET swig_types[85] -#define SWIGTYPE_p_cmf__upslope__ET__VolumeStress swig_types[86] -#define SWIGTYPE_p_cmf__upslope__ET__constantETpot swig_types[87] -#define SWIGTYPE_p_cmf__upslope__ET__stressedET swig_types[88] -#define SWIGTYPE_p_cmf__upslope__ET__timeseriesETpot swig_types[89] -#define SWIGTYPE_p_cmf__upslope__LinearRetention swig_types[90] -#define SWIGTYPE_p_cmf__upslope__MacroPore swig_types[91] -#define SWIGTYPE_p_cmf__upslope__RetentionCurve swig_types[92] -#define SWIGTYPE_p_cmf__upslope__SoilLayer swig_types[93] -#define SWIGTYPE_p_cmf__upslope__SurfaceWater swig_types[94] -#define SWIGTYPE_p_cmf__upslope__Topology swig_types[95] -#define SWIGTYPE_p_cmf__upslope__VanGenuchtenMualem swig_types[96] -#define SWIGTYPE_p_cmf__upslope__aquifer swig_types[97] -#define SWIGTYPE_p_cmf__upslope__aquifer_Darcy swig_types[98] -#define SWIGTYPE_p_cmf__upslope__cell_vector swig_types[99] -#define SWIGTYPE_p_cmf__upslope__connections__BaseMacroFlow swig_types[100] -#define SWIGTYPE_p_cmf__upslope__connections__CanopyOverflow swig_types[101] -#define SWIGTYPE_p_cmf__upslope__connections__Darcy swig_types[102] -#define SWIGTYPE_p_cmf__upslope__connections__DarcyKinematic swig_types[103] -#define SWIGTYPE_p_cmf__upslope__connections__DiffusiveMacroMicroExchange swig_types[104] -#define SWIGTYPE_p_cmf__upslope__connections__DiffusiveSurfaceRunoff swig_types[105] -#define SWIGTYPE_p_cmf__upslope__connections__EnergyBudgetSnowMelt swig_types[106] -#define SWIGTYPE_p_cmf__upslope__connections__FreeDrainagePercolation swig_types[107] -#define SWIGTYPE_p_cmf__upslope__connections__GradientMacroFlow swig_types[108] -#define SWIGTYPE_p_cmf__upslope__connections__GradientMacroMicroExchange swig_types[109] -#define SWIGTYPE_p_cmf__upslope__connections__GreenAmptInfiltration swig_types[110] -#define SWIGTYPE_p_cmf__upslope__connections__JarvisMacroFlow swig_types[111] -#define SWIGTYPE_p_cmf__upslope__connections__KinematicMacroFlow swig_types[112] -#define SWIGTYPE_p_cmf__upslope__connections__KinematicSurfaceRunoff swig_types[113] -#define SWIGTYPE_p_cmf__upslope__connections__LayerBypass swig_types[114] -#define SWIGTYPE_p_cmf__upslope__connections__MACROlikeMacroMicroExchange swig_types[115] -#define SWIGTYPE_p_cmf__upslope__connections__MatrixInfiltration swig_types[116] -#define SWIGTYPE_p_cmf__upslope__connections__Rainfall swig_types[117] -#define SWIGTYPE_p_cmf__upslope__connections__Richards swig_types[118] -#define SWIGTYPE_p_cmf__upslope__connections__Richards_lateral swig_types[119] -#define SWIGTYPE_p_cmf__upslope__connections__RutterInterception swig_types[120] -#define SWIGTYPE_p_cmf__upslope__connections__SWATPercolation swig_types[121] -#define SWIGTYPE_p_cmf__upslope__connections__SimplRichards swig_types[122] -#define SWIGTYPE_p_cmf__upslope__connections__SimpleInfiltration swig_types[123] -#define SWIGTYPE_p_cmf__upslope__connections__SimpleTindexSnowMelt swig_types[124] -#define SWIGTYPE_p_cmf__upslope__connections__Snowfall swig_types[125] -#define SWIGTYPE_p_cmf__upslope__connections__TOPModelFlow swig_types[126] -#define SWIGTYPE_p_cmf__upslope__connections__TopographicGradientDarcy swig_types[127] -#define SWIGTYPE_p_cmf__upslope__connections__lateral_sub_surface_flux swig_types[128] -#define SWIGTYPE_p_cmf__upslope__layer_list swig_types[129] -#define SWIGTYPE_p_cmf__upslope__neighbor_iterator swig_types[130] -#define SWIGTYPE_p_cmf__upslope__subcatchment swig_types[131] -#define SWIGTYPE_p_cmf__upslope__vegetation__Vegetation swig_types[132] -#define SWIGTYPE_p_cmf__water__Adsorption swig_types[133] -#define SWIGTYPE_p_cmf__water__ConstraintLinearStorageConnection swig_types[134] -#define SWIGTYPE_p_cmf__water__DirichletBoundary swig_types[135] -#define SWIGTYPE_p_cmf__water__ExponentialDeclineConnection swig_types[136] -#define SWIGTYPE_p_cmf__water__FreundlichAdsorbtion swig_types[137] -#define SWIGTYPE_p_cmf__water__LangmuirAdsorption swig_types[138] -#define SWIGTYPE_p_cmf__water__LinearAdsorption swig_types[139] -#define SWIGTYPE_p_cmf__water__LinearStorageConnection swig_types[140] -#define SWIGTYPE_p_cmf__water__NeumannBoundary swig_types[141] -#define SWIGTYPE_p_cmf__water__NeumannBoundary_list swig_types[142] -#define SWIGTYPE_p_cmf__water__NeumannFlux swig_types[143] -#define SWIGTYPE_p_cmf__water__NullAdsorption swig_types[144] -#define SWIGTYPE_p_cmf__water__PowerLawConnection swig_types[145] -#define SWIGTYPE_p_cmf__water__SoluteStorage swig_types[146] -#define SWIGTYPE_p_cmf__water__SoluteTimeseries swig_types[147] -#define SWIGTYPE_p_cmf__water__SystemBridge swig_types[148] -#define SWIGTYPE_p_cmf__water__SystemBridgeConnection swig_types[149] -#define SWIGTYPE_p_cmf__water__TechnicalFlux swig_types[150] -#define SWIGTYPE_p_cmf__water__WaterStorage swig_types[151] -#define SWIGTYPE_p_cmf__water__bidirectional_kinematic_exchange swig_types[152] -#define SWIGTYPE_p_cmf__water__connection_list swig_types[153] -#define SWIGTYPE_p_cmf__water__constraint_kinematic_wave swig_types[154] -#define SWIGTYPE_p_cmf__water__external_control_connection swig_types[155] -#define SWIGTYPE_p_cmf__water__flux_connection swig_types[156] -#define SWIGTYPE_p_cmf__water__flux_integrator swig_types[157] -#define SWIGTYPE_p_cmf__water__flux_node swig_types[158] -#define SWIGTYPE_p_cmf__water__generic_gradient_connection swig_types[159] -#define SWIGTYPE_p_cmf__water__kinematic_wave swig_types[160] -#define SWIGTYPE_p_cmf__water__linear_scale swig_types[161] -#define SWIGTYPE_p_cmf__water__node_list swig_types[162] -#define SWIGTYPE_p_cmf__water__solute swig_types[163] -#define SWIGTYPE_p_cmf__water__solute_vector swig_types[164] -#define SWIGTYPE_p_cmf__water__statecontrol_connection swig_types[165] -#define SWIGTYPE_p_cmf__water__waterbalance_connection swig_types[166] -#define SWIGTYPE_p_cmf__water__waterbalance_integrator swig_types[167] -#define SWIGTYPE_p_const_iterator swig_types[168] -#define SWIGTYPE_p_difference_type swig_types[169] -#define SWIGTYPE_p_double swig_types[170] -#define SWIGTYPE_p_f_r_cmf__upslope__Cell_r_cmf__upslope__Cell_ptrdiff_t__void swig_types[171] -#define SWIGTYPE_p_iterator swig_types[172] -#define SWIGTYPE_p_p_PyObject swig_types[173] -#define SWIGTYPE_p_ptr swig_types[174] -#define SWIGTYPE_p_size_type swig_types[175] -#define SWIGTYPE_p_std__allocatorT_double_t swig_types[176] -#define SWIGTYPE_p_std__allocatorT_int_t swig_types[177] -#define SWIGTYPE_p_std__allocatorT_size_t_t swig_types[178] -#define SWIGTYPE_p_std__invalid_argument swig_types[179] -#define SWIGTYPE_p_std__shared_ptrT_SoilLayer_t swig_types[180] -#define SWIGTYPE_p_std__shared_ptrT_cmf__atmosphere__ConstantRainSource_t swig_types[181] -#define SWIGTYPE_p_std__shared_ptrT_cmf__atmosphere__IDWRainfall_t swig_types[182] -#define SWIGTYPE_p_std__shared_ptrT_cmf__atmosphere__MeteoStation_t swig_types[183] -#define SWIGTYPE_p_std__shared_ptrT_cmf__atmosphere__RainSource_t swig_types[184] -#define SWIGTYPE_p_std__shared_ptrT_cmf__atmosphere__RainfallStationReference_t swig_types[185] -#define SWIGTYPE_p_std__shared_ptrT_cmf__atmosphere__RainfallStation_t swig_types[186] -#define SWIGTYPE_p_std__shared_ptrT_cmf__atmosphere__TimeseriesRainSource_t swig_types[187] -#define SWIGTYPE_p_std__shared_ptrT_cmf__atmosphere__aerodynamic_resistance_t swig_types[188] -#define SWIGTYPE_p_std__shared_ptrT_cmf__math__StateVariable_t swig_types[189] -#define SWIGTYPE_p_std__shared_ptrT_cmf__math__integratable_t swig_types[190] -#define SWIGTYPE_p_std__shared_ptrT_cmf__river__OpenWaterStorage_t swig_types[191] -#define SWIGTYPE_p_std__shared_ptrT_cmf__river__Reach_t swig_types[192] -#define SWIGTYPE_p_std__shared_ptrT_cmf__upslope__ET__ShuttleworthWallace_t swig_types[193] -#define SWIGTYPE_p_std__shared_ptrT_cmf__upslope__ET__aerodynamic_resistance_t swig_types[194] -#define SWIGTYPE_p_std__shared_ptrT_cmf__upslope__MacroPore_t swig_types[195] -#define SWIGTYPE_p_std__shared_ptrT_cmf__upslope__SoilLayer_t swig_types[196] -#define SWIGTYPE_p_std__shared_ptrT_cmf__upslope__SurfaceWater_t swig_types[197] -#define SWIGTYPE_p_std__shared_ptrT_cmf__upslope__aquifer_t swig_types[198] -#define SWIGTYPE_p_std__shared_ptrT_cmf__water__DirichletBoundary_t swig_types[199] -#define SWIGTYPE_p_std__shared_ptrT_cmf__water__NeumannBoundary_t swig_types[200] -#define SWIGTYPE_p_std__shared_ptrT_cmf__water__SoluteStorage_t swig_types[201] -#define SWIGTYPE_p_std__shared_ptrT_cmf__water__SystemBridge_t swig_types[202] -#define SWIGTYPE_p_std__shared_ptrT_cmf__water__WaterStorage_t swig_types[203] -#define SWIGTYPE_p_std__shared_ptrT_cmf__water__flux_connection_t swig_types[204] -#define SWIGTYPE_p_std__shared_ptrT_cmf__water__flux_integrator_t swig_types[205] -#define SWIGTYPE_p_std__shared_ptrT_cmf__water__flux_node_t swig_types[206] -#define SWIGTYPE_p_std__shared_ptrT_cmf__water__waterbalance_integrator_t swig_types[207] -#define SWIGTYPE_p_std__shared_ptrT_std__shared_ptrT_cmf__atmosphere__ConstantRainSource_t_t swig_types[208] -#define SWIGTYPE_p_std__shared_ptrT_std__shared_ptrT_cmf__atmosphere__RainfallStationReference_t_t swig_types[209] -#define SWIGTYPE_p_std__string swig_types[210] -#define SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t swig_types[211] -#define SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t swig_types[212] -#define SWIGTYPE_p_std__vectorT_size_t_std__allocatorT_size_t_t_t swig_types[213] -#define SWIGTYPE_p_std__vectorT_std__shared_ptrT_cmf__water__WaterStorage_t_std__allocatorT_std__shared_ptrT_cmf__water__WaterStorage_t_t_t swig_types[214] -#define SWIGTYPE_p_std__vectorT_std__shared_ptrT_cmf__water__flux_connection_t_std__allocatorT_std__shared_ptrT_cmf__water__flux_connection_t_t_t__const_iterator swig_types[215] -#define SWIGTYPE_p_std__vectorT_std__shared_ptrT_cmf__water__flux_connection_t_std__allocatorT_std__shared_ptrT_cmf__water__flux_connection_t_t_t__iterator swig_types[216] -#define SWIGTYPE_p_swig__SwigPyIterator swig_types[217] -#define SWIGTYPE_p_value_type swig_types[218] -static swig_type_info *swig_types[220]; -static swig_module_info swig_module = {swig_types, 219, 0, 0, 0, 0}; +#define SWIGTYPE_p_cmf__math__CVodeIntegrator swig_types[21] +#define SWIGTYPE_p_cmf__math__Date swig_types[22] +#define SWIGTYPE_p_cmf__math__ExplicitEuler_fixed swig_types[23] +#define SWIGTYPE_p_cmf__math__HeunIntegrator swig_types[24] +#define SWIGTYPE_p_cmf__math__ImplicitEuler swig_types[25] +#define SWIGTYPE_p_cmf__math__Integrator swig_types[26] +#define SWIGTYPE_p_cmf__math__MultiIntegrator swig_types[27] +#define SWIGTYPE_p_cmf__math__RKFIntegrator swig_types[28] +#define SWIGTYPE_p_cmf__math__SoluteWaterIntegrator swig_types[29] +#define SWIGTYPE_p_cmf__math__StateVariable swig_types[30] +#define SWIGTYPE_p_cmf__math__StateVariableList swig_types[31] +#define SWIGTYPE_p_cmf__math__StateVariableOwner swig_types[32] +#define SWIGTYPE_p_cmf__math__Time swig_types[33] +#define SWIGTYPE_p_cmf__math__cubicspline swig_types[34] +#define SWIGTYPE_p_cmf__math__integratable swig_types[35] +#define SWIGTYPE_p_cmf__math__integratable_list swig_types[36] +#define SWIGTYPE_p_cmf__math__num_array swig_types[37] +#define SWIGTYPE_p_cmf__math__timeseries swig_types[38] +#define SWIGTYPE_p_cmf__project swig_types[39] +#define SWIGTYPE_p_cmf__river__Channel swig_types[40] +#define SWIGTYPE_p_cmf__river__CrossSectionReach swig_types[41] +#define SWIGTYPE_p_cmf__river__IChannel swig_types[42] +#define SWIGTYPE_p_cmf__river__IVolumeHeightFunction swig_types[43] +#define SWIGTYPE_p_cmf__river__Manning swig_types[44] +#define SWIGTYPE_p_cmf__river__Manning_Diffusive swig_types[45] +#define SWIGTYPE_p_cmf__river__Manning_Kinematic swig_types[46] +#define SWIGTYPE_p_cmf__river__MeanChannel swig_types[47] +#define SWIGTYPE_p_cmf__river__OpenWaterStorage swig_types[48] +#define SWIGTYPE_p_cmf__river__PipeReach swig_types[49] +#define SWIGTYPE_p_cmf__river__Prism swig_types[50] +#define SWIGTYPE_p_cmf__river__Reach swig_types[51] +#define SWIGTYPE_p_cmf__river__ReachIterator swig_types[52] +#define SWIGTYPE_p_cmf__river__RectangularReach swig_types[53] +#define SWIGTYPE_p_cmf__river__SWATReachType swig_types[54] +#define SWIGTYPE_p_cmf__river__TriangularReach swig_types[55] +#define SWIGTYPE_p_cmf__river__volume_height_function swig_types[56] +#define SWIGTYPE_p_cmf__upslope__BrooksCoreyRetentionCurve swig_types[57] +#define SWIGTYPE_p_cmf__upslope__Cell swig_types[58] +#define SWIGTYPE_p_cmf__upslope__CellConnector swig_types[59] +#define SWIGTYPE_p_cmf__upslope__ET__CanopyStorageEvaporation swig_types[60] +#define SWIGTYPE_p_cmf__upslope__ET__ContentStress swig_types[61] +#define SWIGTYPE_p_cmf__upslope__ET__HargreaveET swig_types[62] +#define SWIGTYPE_p_cmf__upslope__ET__OudinET swig_types[63] +#define SWIGTYPE_p_cmf__upslope__ET__PenmanEvaporation swig_types[64] +#define SWIGTYPE_p_cmf__upslope__ET__PenmanMonteithET swig_types[65] +#define SWIGTYPE_p_cmf__upslope__ET__PriestleyTaylorET swig_types[66] +#define SWIGTYPE_p_cmf__upslope__ET__RootUptakeStessFunction swig_types[67] +#define SWIGTYPE_p_cmf__upslope__ET__SW_evap_from_canopy swig_types[68] +#define SWIGTYPE_p_cmf__upslope__ET__SW_evap_from_layer swig_types[69] +#define SWIGTYPE_p_cmf__upslope__ET__SW_evap_from_snow swig_types[70] +#define SWIGTYPE_p_cmf__upslope__ET__SW_evap_from_surfacewater swig_types[71] +#define SWIGTYPE_p_cmf__upslope__ET__SW_transpiration swig_types[72] +#define SWIGTYPE_p_cmf__upslope__ET__ShuttleworthWallace swig_types[73] +#define SWIGTYPE_p_cmf__upslope__ET__SuctionStress swig_types[74] +#define SWIGTYPE_p_cmf__upslope__ET__TurcET swig_types[75] +#define SWIGTYPE_p_cmf__upslope__ET__VolumeStress swig_types[76] +#define SWIGTYPE_p_cmf__upslope__ET__constantETpot swig_types[77] +#define SWIGTYPE_p_cmf__upslope__ET__stressedET swig_types[78] +#define SWIGTYPE_p_cmf__upslope__ET__timeseriesETpot swig_types[79] +#define SWIGTYPE_p_cmf__upslope__LinearRetention swig_types[80] +#define SWIGTYPE_p_cmf__upslope__MacroPore swig_types[81] +#define SWIGTYPE_p_cmf__upslope__RetentionCurve swig_types[82] +#define SWIGTYPE_p_cmf__upslope__SoilLayer swig_types[83] +#define SWIGTYPE_p_cmf__upslope__SurfaceWater swig_types[84] +#define SWIGTYPE_p_cmf__upslope__Topology swig_types[85] +#define SWIGTYPE_p_cmf__upslope__VanGenuchtenMualem swig_types[86] +#define SWIGTYPE_p_cmf__upslope__aquifer swig_types[87] +#define SWIGTYPE_p_cmf__upslope__aquifer_Darcy swig_types[88] +#define SWIGTYPE_p_cmf__upslope__cell_vector swig_types[89] +#define SWIGTYPE_p_cmf__upslope__connections__BaseMacroFlow swig_types[90] +#define SWIGTYPE_p_cmf__upslope__connections__CanopyOverflow swig_types[91] +#define SWIGTYPE_p_cmf__upslope__connections__Darcy swig_types[92] +#define SWIGTYPE_p_cmf__upslope__connections__DarcyKinematic swig_types[93] +#define SWIGTYPE_p_cmf__upslope__connections__DiffusiveMacroMicroExchange swig_types[94] +#define SWIGTYPE_p_cmf__upslope__connections__DiffusiveSurfaceRunoff swig_types[95] +#define SWIGTYPE_p_cmf__upslope__connections__EnergyBudgetSnowMelt swig_types[96] +#define SWIGTYPE_p_cmf__upslope__connections__FreeDrainagePercolation swig_types[97] +#define SWIGTYPE_p_cmf__upslope__connections__GradientMacroFlow swig_types[98] +#define SWIGTYPE_p_cmf__upslope__connections__GradientMacroMicroExchange swig_types[99] +#define SWIGTYPE_p_cmf__upslope__connections__GreenAmptInfiltration swig_types[100] +#define SWIGTYPE_p_cmf__upslope__connections__JarvisMacroFlow swig_types[101] +#define SWIGTYPE_p_cmf__upslope__connections__KinematicMacroFlow swig_types[102] +#define SWIGTYPE_p_cmf__upslope__connections__KinematicSurfaceRunoff swig_types[103] +#define SWIGTYPE_p_cmf__upslope__connections__LayerBypass swig_types[104] +#define SWIGTYPE_p_cmf__upslope__connections__MACROlikeMacroMicroExchange swig_types[105] +#define SWIGTYPE_p_cmf__upslope__connections__MatrixInfiltration swig_types[106] +#define SWIGTYPE_p_cmf__upslope__connections__Rainfall swig_types[107] +#define SWIGTYPE_p_cmf__upslope__connections__Richards swig_types[108] +#define SWIGTYPE_p_cmf__upslope__connections__Richards_lateral swig_types[109] +#define SWIGTYPE_p_cmf__upslope__connections__RutterInterception swig_types[110] +#define SWIGTYPE_p_cmf__upslope__connections__SWATPercolation swig_types[111] +#define SWIGTYPE_p_cmf__upslope__connections__SimplRichards swig_types[112] +#define SWIGTYPE_p_cmf__upslope__connections__SimpleInfiltration swig_types[113] +#define SWIGTYPE_p_cmf__upslope__connections__SimpleTindexSnowMelt swig_types[114] +#define SWIGTYPE_p_cmf__upslope__connections__Snowfall swig_types[115] +#define SWIGTYPE_p_cmf__upslope__connections__TOPModelFlow swig_types[116] +#define SWIGTYPE_p_cmf__upslope__connections__TopographicGradientDarcy swig_types[117] +#define SWIGTYPE_p_cmf__upslope__connections__lateral_sub_surface_flux swig_types[118] +#define SWIGTYPE_p_cmf__upslope__layer_list swig_types[119] +#define SWIGTYPE_p_cmf__upslope__neighbor_iterator swig_types[120] +#define SWIGTYPE_p_cmf__upslope__subcatchment swig_types[121] +#define SWIGTYPE_p_cmf__upslope__vegetation__Vegetation swig_types[122] +#define SWIGTYPE_p_cmf__water__Adsorption swig_types[123] +#define SWIGTYPE_p_cmf__water__ConstraintLinearStorageConnection swig_types[124] +#define SWIGTYPE_p_cmf__water__DirichletBoundary swig_types[125] +#define SWIGTYPE_p_cmf__water__ExponentialDeclineConnection swig_types[126] +#define SWIGTYPE_p_cmf__water__FreundlichAdsorbtion swig_types[127] +#define SWIGTYPE_p_cmf__water__LangmuirAdsorption swig_types[128] +#define SWIGTYPE_p_cmf__water__LinearAdsorption swig_types[129] +#define SWIGTYPE_p_cmf__water__LinearStorageConnection swig_types[130] +#define SWIGTYPE_p_cmf__water__NeumannBoundary swig_types[131] +#define SWIGTYPE_p_cmf__water__NeumannBoundary_list swig_types[132] +#define SWIGTYPE_p_cmf__water__NeumannFlux swig_types[133] +#define SWIGTYPE_p_cmf__water__NullAdsorption swig_types[134] +#define SWIGTYPE_p_cmf__water__PowerLawConnection swig_types[135] +#define SWIGTYPE_p_cmf__water__SoluteStorage swig_types[136] +#define SWIGTYPE_p_cmf__water__SoluteTimeseries swig_types[137] +#define SWIGTYPE_p_cmf__water__SystemBridge swig_types[138] +#define SWIGTYPE_p_cmf__water__SystemBridgeConnection swig_types[139] +#define SWIGTYPE_p_cmf__water__TechnicalFlux swig_types[140] +#define SWIGTYPE_p_cmf__water__WaterStorage swig_types[141] +#define SWIGTYPE_p_cmf__water__bidirectional_kinematic_exchange swig_types[142] +#define SWIGTYPE_p_cmf__water__connection_list swig_types[143] +#define SWIGTYPE_p_cmf__water__constraint_kinematic_wave swig_types[144] +#define SWIGTYPE_p_cmf__water__external_control_connection swig_types[145] +#define SWIGTYPE_p_cmf__water__flux_connection swig_types[146] +#define SWIGTYPE_p_cmf__water__flux_integrator swig_types[147] +#define SWIGTYPE_p_cmf__water__flux_node swig_types[148] +#define SWIGTYPE_p_cmf__water__generic_gradient_connection swig_types[149] +#define SWIGTYPE_p_cmf__water__kinematic_wave swig_types[150] +#define SWIGTYPE_p_cmf__water__linear_scale swig_types[151] +#define SWIGTYPE_p_cmf__water__node_list swig_types[152] +#define SWIGTYPE_p_cmf__water__solute swig_types[153] +#define SWIGTYPE_p_cmf__water__solute_vector swig_types[154] +#define SWIGTYPE_p_cmf__water__statecontrol_connection swig_types[155] +#define SWIGTYPE_p_cmf__water__waterbalance_connection swig_types[156] +#define SWIGTYPE_p_cmf__water__waterbalance_integrator swig_types[157] +#define SWIGTYPE_p_const_iterator swig_types[158] +#define SWIGTYPE_p_difference_type swig_types[159] +#define SWIGTYPE_p_double swig_types[160] +#define SWIGTYPE_p_f_r_cmf__upslope__Cell_r_cmf__upslope__Cell_ptrdiff_t__void swig_types[161] +#define SWIGTYPE_p_iterator swig_types[162] +#define SWIGTYPE_p_p_PyObject swig_types[163] +#define SWIGTYPE_p_ptr swig_types[164] +#define SWIGTYPE_p_size_type swig_types[165] +#define SWIGTYPE_p_std__allocatorT_double_t swig_types[166] +#define SWIGTYPE_p_std__allocatorT_int_t swig_types[167] +#define SWIGTYPE_p_std__allocatorT_size_t_t swig_types[168] +#define SWIGTYPE_p_std__invalid_argument swig_types[169] +#define SWIGTYPE_p_std__shared_ptrT_SoilLayer_t swig_types[170] +#define SWIGTYPE_p_std__shared_ptrT_cmf__atmosphere__ConstantRainSource_t swig_types[171] +#define SWIGTYPE_p_std__shared_ptrT_cmf__atmosphere__IDWRainfall_t swig_types[172] +#define SWIGTYPE_p_std__shared_ptrT_cmf__atmosphere__MeteoStation_t swig_types[173] +#define SWIGTYPE_p_std__shared_ptrT_cmf__atmosphere__RainSource_t swig_types[174] +#define SWIGTYPE_p_std__shared_ptrT_cmf__atmosphere__RainfallStationReference_t swig_types[175] +#define SWIGTYPE_p_std__shared_ptrT_cmf__atmosphere__RainfallStation_t swig_types[176] +#define SWIGTYPE_p_std__shared_ptrT_cmf__atmosphere__TimeseriesRainSource_t swig_types[177] +#define SWIGTYPE_p_std__shared_ptrT_cmf__atmosphere__aerodynamic_resistance_t swig_types[178] +#define SWIGTYPE_p_std__shared_ptrT_cmf__math__StateVariable_t swig_types[179] +#define SWIGTYPE_p_std__shared_ptrT_cmf__math__integratable_t swig_types[180] +#define SWIGTYPE_p_std__shared_ptrT_cmf__river__OpenWaterStorage_t swig_types[181] +#define SWIGTYPE_p_std__shared_ptrT_cmf__river__Reach_t swig_types[182] +#define SWIGTYPE_p_std__shared_ptrT_cmf__upslope__ET__ShuttleworthWallace_t swig_types[183] +#define SWIGTYPE_p_std__shared_ptrT_cmf__upslope__ET__aerodynamic_resistance_t swig_types[184] +#define SWIGTYPE_p_std__shared_ptrT_cmf__upslope__MacroPore_t swig_types[185] +#define SWIGTYPE_p_std__shared_ptrT_cmf__upslope__SoilLayer_t swig_types[186] +#define SWIGTYPE_p_std__shared_ptrT_cmf__upslope__SurfaceWater_t swig_types[187] +#define SWIGTYPE_p_std__shared_ptrT_cmf__upslope__aquifer_t swig_types[188] +#define SWIGTYPE_p_std__shared_ptrT_cmf__water__DirichletBoundary_t swig_types[189] +#define SWIGTYPE_p_std__shared_ptrT_cmf__water__NeumannBoundary_t swig_types[190] +#define SWIGTYPE_p_std__shared_ptrT_cmf__water__SoluteStorage_t swig_types[191] +#define SWIGTYPE_p_std__shared_ptrT_cmf__water__SystemBridge_t swig_types[192] +#define SWIGTYPE_p_std__shared_ptrT_cmf__water__WaterStorage_t swig_types[193] +#define SWIGTYPE_p_std__shared_ptrT_cmf__water__flux_connection_t swig_types[194] +#define SWIGTYPE_p_std__shared_ptrT_cmf__water__flux_integrator_t swig_types[195] +#define SWIGTYPE_p_std__shared_ptrT_cmf__water__flux_node_t swig_types[196] +#define SWIGTYPE_p_std__shared_ptrT_cmf__water__waterbalance_integrator_t swig_types[197] +#define SWIGTYPE_p_std__shared_ptrT_std__shared_ptrT_cmf__atmosphere__ConstantRainSource_t_t swig_types[198] +#define SWIGTYPE_p_std__shared_ptrT_std__shared_ptrT_cmf__atmosphere__RainfallStationReference_t_t swig_types[199] +#define SWIGTYPE_p_std__string swig_types[200] +#define SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t swig_types[201] +#define SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t swig_types[202] +#define SWIGTYPE_p_std__vectorT_size_t_std__allocatorT_size_t_t_t swig_types[203] +#define SWIGTYPE_p_std__vectorT_std__shared_ptrT_cmf__water__WaterStorage_t_std__allocatorT_std__shared_ptrT_cmf__water__WaterStorage_t_t_t swig_types[204] +#define SWIGTYPE_p_std__vectorT_std__shared_ptrT_cmf__water__flux_connection_t_std__allocatorT_std__shared_ptrT_cmf__water__flux_connection_t_t_t__const_iterator swig_types[205] +#define SWIGTYPE_p_std__vectorT_std__shared_ptrT_cmf__water__flux_connection_t_std__allocatorT_std__shared_ptrT_cmf__water__flux_connection_t_t_t__iterator swig_types[206] +#define SWIGTYPE_p_swig__SwigPyIterator swig_types[207] +#define SWIGTYPE_p_value_type swig_types[208] +static swig_type_info *swig_types[210]; +static swig_module_info swig_module = {swig_types, 209, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -5971,6 +5961,16 @@ SWIGINTERN size_t cmf_water_SoluteTimeseries___len__(cmf::water::SoluteTimeserie #define cmf_water_SoluteStorage_conc_set(self_, val_) self_->set_conc(val_) +#define cmf_water_flux_node_project_get(self_) &self_->get_project() + + +#define cmf_water_flux_node_potential_get(self_) self_->get_potential() +#define cmf_water_flux_node_potential_set(self_, val_) self_->set_potential(val_) + + +#define cmf_water_flux_node_connections_get(self_) new cmf::water::connection_list(self_->get_connections()) + + struct SWIG_null_deleter { void operator() (void const *) const { } @@ -5984,16 +5984,6 @@ struct SWIG_null_deleter { #define SWIG_NO_NULL_DELETER_SWIG_BUILTIN_INIT -#define cmf_water_flux_node_project_get(self_) &self_->get_project() - - -#define cmf_water_flux_node_potential_get(self_) self_->get_potential() -#define cmf_water_flux_node_potential_set(self_, val_) self_->set_potential(val_) - - -#define cmf_water_flux_node_connections_get(self_) new cmf::water::connection_list(self_->get_connections()) - - SWIGINTERN int SWIG_AsVal_bool (PyObject *obj, bool *val) { @@ -6274,7 +6264,7 @@ SWIGINTERN cmf::upslope::SoilLayer::ptr cmf_upslope_layer_list___get(cmf::upslop #include "math/integrators/explicit_euler.h" #include "math/integrators/implicit_euler.h" #include "math/integrators/RKFintegrator.h" -#include "math/integrators/cvode.h" +#include "math/integrators/cvodeintegrator.h" #include "math/integrators/multiintegrator.h" #include "math/integrators/WaterSoluteIntegrator.h" @@ -25904,74 +25894,6 @@ SWIGINTERN PyObject *_wrap_delete_StateVariable(PyObject *SWIGUNUSEDPARM(self), } -SWIGINTERN PyObject *_wrap_StateVariable_is_connected(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - cmf::math::StateVariable *arg1 = (cmf::math::StateVariable *) 0 ; - cmf::math::StateVariable *arg2 = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - std::shared_ptr< cmf::math::StateVariable const > tempshared1 ; - std::shared_ptr< cmf::math::StateVariable const > *smartarg1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - std::shared_ptr< cmf::math::StateVariable const > tempshared2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "other", NULL - }; - bool result; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StateVariable_is_connected",kwnames,&obj0,&obj1)) SWIG_fail; - { - int newmem = 0; - res1 = SWIG_ConvertPtrAndOwn(obj0, &argp1, SWIGTYPE_p_std__shared_ptrT_cmf__math__StateVariable_t, 0 | 0 , &newmem); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StateVariable_is_connected" "', argument " "1"" of type '" "cmf::math::StateVariable const *""'"); - } - if (newmem & SWIG_CAST_NEW_MEMORY) { - tempshared1 = *reinterpret_cast< std::shared_ptr< const cmf::math::StateVariable > * >(argp1); - delete reinterpret_cast< std::shared_ptr< const cmf::math::StateVariable > * >(argp1); - arg1 = const_cast< cmf::math::StateVariable * >(tempshared1.get()); - } else { - smartarg1 = reinterpret_cast< std::shared_ptr< const cmf::math::StateVariable > * >(argp1); - arg1 = const_cast< cmf::math::StateVariable * >((smartarg1 ? smartarg1->get() : 0)); - } - } - { - int newmem = 0; - res2 = SWIG_ConvertPtrAndOwn(obj1, &argp2, SWIGTYPE_p_std__shared_ptrT_cmf__math__StateVariable_t, 0 , &newmem); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StateVariable_is_connected" "', argument " "2"" of type '" "cmf::math::StateVariable const &""'"); - } - if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "StateVariable_is_connected" "', argument " "2"" of type '" "cmf::math::StateVariable const &""'"); - } - if (newmem & SWIG_CAST_NEW_MEMORY) { - tempshared2 = *reinterpret_cast< std::shared_ptr< const cmf::math::StateVariable > * >(argp2); - delete reinterpret_cast< std::shared_ptr< const cmf::math::StateVariable > * >(argp2); - arg2 = const_cast< cmf::math::StateVariable * >(tempshared2.get()); - } else { - arg2 = const_cast< cmf::math::StateVariable * >(reinterpret_cast< std::shared_ptr< const cmf::math::StateVariable > * >(argp2)->get()); - } - } - { - try { - result = (bool)((cmf::math::StateVariable const *)arg1)->is_connected((cmf::math::StateVariable const &)*arg2); - } catch (const std::out_of_range& e) { - SWIG_exception(SWIG_IndexError, e.what()); - } catch (const std::exception& e) { - SWIG_exception(SWIG_RuntimeError, e.what()); - } - - } - resultobj = SWIG_From_bool(static_cast< bool >(result)); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_StateVariable_state_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; cmf::math::StateVariable *arg1 = (cmf::math::StateVariable *) 0 ; @@ -26534,377 +26456,6 @@ SWIGINTERN PyObject *StateVariableList_swiginit(PyObject *SWIGUNUSEDPARM(self), return SWIG_Python_InitShadowInstance(args); } -SWIGINTERN PyObject *_wrap_sparse_structure_indexvalues_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::sparse_structure *arg1 = (cmf::math::sparse_structure *) 0 ; - std::vector< size_t,std::allocator< size_t > > *arg2 = (std::vector< size_t,std::allocator< size_t > > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject *swig_obj[2] ; - - if (!SWIG_Python_UnpackTuple(args,"sparse_structure_indexvalues_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__sparse_structure, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "sparse_structure_indexvalues_set" "', argument " "1"" of type '" "cmf::math::sparse_structure *""'"); - } - arg1 = reinterpret_cast< cmf::math::sparse_structure * >(argp1); - res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_std__vectorT_size_t_std__allocatorT_size_t_t_t, 0 | 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "sparse_structure_indexvalues_set" "', argument " "2"" of type '" "std::vector< size_t,std::allocator< size_t > > *""'"); - } - arg2 = reinterpret_cast< std::vector< size_t,std::allocator< size_t > > * >(argp2); - if (arg1) (arg1)->indexvalues = *arg2; - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_sparse_structure_indexvalues_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::sparse_structure *arg1 = (cmf::math::sparse_structure *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - std::vector< size_t,std::allocator< size_t > > *result = 0 ; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__sparse_structure, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "sparse_structure_indexvalues_get" "', argument " "1"" of type '" "cmf::math::sparse_structure *""'"); - } - arg1 = reinterpret_cast< cmf::math::sparse_structure * >(argp1); - result = (std::vector< size_t,std::allocator< size_t > > *)& ((arg1)->indexvalues); - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_size_t_std__allocatorT_size_t_t_t, 0 | 0 ); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_sparse_structure_indexpointers_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::sparse_structure *arg1 = (cmf::math::sparse_structure *) 0 ; - std::vector< size_t,std::allocator< size_t > > *arg2 = (std::vector< size_t,std::allocator< size_t > > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject *swig_obj[2] ; - - if (!SWIG_Python_UnpackTuple(args,"sparse_structure_indexpointers_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__sparse_structure, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "sparse_structure_indexpointers_set" "', argument " "1"" of type '" "cmf::math::sparse_structure *""'"); - } - arg1 = reinterpret_cast< cmf::math::sparse_structure * >(argp1); - res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_std__vectorT_size_t_std__allocatorT_size_t_t_t, 0 | 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "sparse_structure_indexpointers_set" "', argument " "2"" of type '" "std::vector< size_t,std::allocator< size_t > > *""'"); - } - arg2 = reinterpret_cast< std::vector< size_t,std::allocator< size_t > > * >(argp2); - if (arg1) (arg1)->indexpointers = *arg2; - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_sparse_structure_indexpointers_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::sparse_structure *arg1 = (cmf::math::sparse_structure *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - std::vector< size_t,std::allocator< size_t > > *result = 0 ; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__sparse_structure, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "sparse_structure_indexpointers_get" "', argument " "1"" of type '" "cmf::math::sparse_structure *""'"); - } - arg1 = reinterpret_cast< cmf::math::sparse_structure * >(argp1); - result = (std::vector< size_t,std::allocator< size_t > > *)& ((arg1)->indexpointers); - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_size_t_std__allocatorT_size_t_t_t, 0 | 0 ); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_new_sparse_structure(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::sparse_structure *result = 0 ; - - if (!SWIG_Python_UnpackTuple(args,"new_sparse_structure",0,0,0)) SWIG_fail; - { - try { - result = (cmf::math::sparse_structure *)new cmf::math::sparse_structure(); - } catch (const std::out_of_range& e) { - SWIG_exception(SWIG_IndexError, e.what()); - } catch (const std::exception& e) { - SWIG_exception(SWIG_RuntimeError, e.what()); - } - - } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_cmf__math__sparse_structure, SWIG_POINTER_NEW | 0 ); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_sparse_structure_generate(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - cmf::math::sparse_structure *arg1 = (cmf::math::sparse_structure *) 0 ; - cmf::math::StateVariableList *arg2 = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - cmf::math::StateVariableList temp_list2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "states", NULL - }; - size_t result; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:sparse_structure_generate",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_cmf__math__sparse_structure, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "sparse_structure_generate" "', argument " "1"" of type '" "cmf::math::sparse_structure *""'"); - } - arg1 = reinterpret_cast< cmf::math::sparse_structure * >(argp1); - { - if (SWIG_ConvertPtr(obj1, (void **) &arg2, SWIGTYPE_p_cmf__math__StateVariableList, SWIG_POINTER_EXCEPTION) == -1) { - int res = iterable_to_list(obj1,SWIGTYPE_p_std__shared_ptrT_cmf__math__StateVariable_t, temp_list2); - if (SWIG_IsOK(res)) { - arg2 = &temp_list2; - } else { - SWIG_exception_fail(SWIG_TypeError,"Only iterables can be converted to cmf::math::StateVariableList"); - } - } - } - { - try { - result = (arg1)->generate((cmf::math::StateVariableList const &)*arg2); - } catch (const std::out_of_range& e) { - SWIG_exception(SWIG_IndexError, e.what()); - } catch (const std::exception& e) { - SWIG_exception(SWIG_RuntimeError, e.what()); - } - - } - resultobj = SWIG_From_size_t(static_cast< size_t >(result)); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_sparse_structure_NNZ_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::sparse_structure *arg1 = (cmf::math::sparse_structure *) 0 ; - size_t arg2 ; - void *argp1 = 0 ; - int res1 = 0 ; - size_t val2 ; - int ecode2 = 0 ; - PyObject *swig_obj[2] ; - - if (!SWIG_Python_UnpackTuple(args,"sparse_structure_NNZ_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__sparse_structure, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "sparse_structure_NNZ_set" "', argument " "1"" of type '" "cmf::math::sparse_structure *""'"); - } - arg1 = reinterpret_cast< cmf::math::sparse_structure * >(argp1); - ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "sparse_structure_NNZ_set" "', argument " "2"" of type '" "size_t""'"); - } - arg2 = static_cast< size_t >(val2); - if (arg1) (arg1)->NNZ = arg2; - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_sparse_structure_NNZ_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::sparse_structure *arg1 = (cmf::math::sparse_structure *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - size_t result; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__sparse_structure, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "sparse_structure_NNZ_get" "', argument " "1"" of type '" "cmf::math::sparse_structure *""'"); - } - arg1 = reinterpret_cast< cmf::math::sparse_structure * >(argp1); - result = ((arg1)->NNZ); - resultobj = SWIG_From_size_t(static_cast< size_t >(result)); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_sparse_structure_NP_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::sparse_structure *arg1 = (cmf::math::sparse_structure *) 0 ; - size_t arg2 ; - void *argp1 = 0 ; - int res1 = 0 ; - size_t val2 ; - int ecode2 = 0 ; - PyObject *swig_obj[2] ; - - if (!SWIG_Python_UnpackTuple(args,"sparse_structure_NP_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__sparse_structure, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "sparse_structure_NP_set" "', argument " "1"" of type '" "cmf::math::sparse_structure *""'"); - } - arg1 = reinterpret_cast< cmf::math::sparse_structure * >(argp1); - ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "sparse_structure_NP_set" "', argument " "2"" of type '" "size_t""'"); - } - arg2 = static_cast< size_t >(val2); - if (arg1) (arg1)->NP = arg2; - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_sparse_structure_NP_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::sparse_structure *arg1 = (cmf::math::sparse_structure *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - size_t result; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__sparse_structure, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "sparse_structure_NP_get" "', argument " "1"" of type '" "cmf::math::sparse_structure *""'"); - } - arg1 = reinterpret_cast< cmf::math::sparse_structure * >(argp1); - result = ((arg1)->NP); - resultobj = SWIG_From_size_t(static_cast< size_t >(result)); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_sparse_structure_N_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::sparse_structure *arg1 = (cmf::math::sparse_structure *) 0 ; - size_t arg2 ; - void *argp1 = 0 ; - int res1 = 0 ; - size_t val2 ; - int ecode2 = 0 ; - PyObject *swig_obj[2] ; - - if (!SWIG_Python_UnpackTuple(args,"sparse_structure_N_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__sparse_structure, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "sparse_structure_N_set" "', argument " "1"" of type '" "cmf::math::sparse_structure *""'"); - } - arg1 = reinterpret_cast< cmf::math::sparse_structure * >(argp1); - ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "sparse_structure_N_set" "', argument " "2"" of type '" "size_t""'"); - } - arg2 = static_cast< size_t >(val2); - if (arg1) (arg1)->N = arg2; - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_sparse_structure_N_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::sparse_structure *arg1 = (cmf::math::sparse_structure *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - size_t result; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__sparse_structure, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "sparse_structure_N_get" "', argument " "1"" of type '" "cmf::math::sparse_structure *""'"); - } - arg1 = reinterpret_cast< cmf::math::sparse_structure * >(argp1); - result = ((arg1)->N); - resultobj = SWIG_From_size_t(static_cast< size_t >(result)); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_delete_sparse_structure(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::sparse_structure *arg1 = (cmf::math::sparse_structure *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__sparse_structure, SWIG_POINTER_DISOWN | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_sparse_structure" "', argument " "1"" of type '" "cmf::math::sparse_structure *""'"); - } - arg1 = reinterpret_cast< cmf::math::sparse_structure * >(argp1); - { - try { - delete arg1; - } catch (const std::out_of_range& e) { - SWIG_exception(SWIG_IndexError, e.what()); - } catch (const std::exception& e) { - SWIG_exception(SWIG_RuntimeError, e.what()); - } - - } - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *sparse_structure_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *obj; - if (!SWIG_Python_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL; - SWIG_TypeNewClientData(SWIGTYPE_p_cmf__math__sparse_structure, SWIG_NewClientData(obj)); - return SWIG_Py_Void(); -} - -SWIGINTERN PyObject *sparse_structure_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - return SWIG_Python_InitShadowInstance(args); -} - SWIGINTERN PyObject *_wrap_Adsorption_freesolute(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; cmf::water::Adsorption *arg1 = (cmf::water::Adsorption *) 0 ; @@ -29978,110 +29529,6 @@ SWIGINTERN PyObject *_wrap_SoluteStorage_Solute_get(PyObject *SWIGUNUSEDPARM(sel } -SWIGINTERN PyObject *_wrap_SoluteStorage_get_water(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::water::SoluteStorage *arg1 = (cmf::water::SoluteStorage *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - std::shared_ptr< cmf::water::SoluteStorage const > tempshared1 ; - std::shared_ptr< cmf::water::SoluteStorage const > *smartarg1 = 0 ; - PyObject *swig_obj[1] ; - cmf::water::WaterStorage *result = 0 ; - - if (!args) SWIG_fail; - swig_obj[0] = args; - { - int newmem = 0; - res1 = SWIG_ConvertPtrAndOwn(swig_obj[0], &argp1, SWIGTYPE_p_std__shared_ptrT_cmf__water__SoluteStorage_t, 0 | 0 , &newmem); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SoluteStorage_get_water" "', argument " "1"" of type '" "cmf::water::SoluteStorage const *""'"); - } - if (newmem & SWIG_CAST_NEW_MEMORY) { - tempshared1 = *reinterpret_cast< std::shared_ptr< const cmf::water::SoluteStorage > * >(argp1); - delete reinterpret_cast< std::shared_ptr< const cmf::water::SoluteStorage > * >(argp1); - arg1 = const_cast< cmf::water::SoluteStorage * >(tempshared1.get()); - } else { - smartarg1 = reinterpret_cast< std::shared_ptr< const cmf::water::SoluteStorage > * >(argp1); - arg1 = const_cast< cmf::water::SoluteStorage * >((smartarg1 ? smartarg1->get() : 0)); - } - } - { - try { - result = (cmf::water::WaterStorage *) &((cmf::water::SoluteStorage const *)arg1)->get_water(); - } catch (const std::out_of_range& e) { - SWIG_exception(SWIG_IndexError, e.what()); - } catch (const std::exception& e) { - SWIG_exception(SWIG_RuntimeError, e.what()); - } - - } - { - std::shared_ptr< const cmf::water::WaterStorage > *smartresult = new std::shared_ptr< const cmf::water::WaterStorage >(result SWIG_NO_NULL_DELETER_0); - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(smartresult), SWIGTYPE_p_std__shared_ptrT_cmf__water__WaterStorage_t, SWIG_POINTER_OWN); - } - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_SoluteStorage_add_connected_states(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - cmf::water::SoluteStorage *arg1 = (cmf::water::SoluteStorage *) 0 ; - cmf::math::StateVariable::list *arg2 = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - std::shared_ptr< cmf::water::SoluteStorage > tempshared1 ; - std::shared_ptr< cmf::water::SoluteStorage > *smartarg1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "states", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SoluteStorage_add_connected_states",kwnames,&obj0,&obj1)) SWIG_fail; - { - int newmem = 0; - res1 = SWIG_ConvertPtrAndOwn(obj0, &argp1, SWIGTYPE_p_std__shared_ptrT_cmf__water__SoluteStorage_t, 0 | 0 , &newmem); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SoluteStorage_add_connected_states" "', argument " "1"" of type '" "cmf::water::SoluteStorage *""'"); - } - if (newmem & SWIG_CAST_NEW_MEMORY) { - tempshared1 = *reinterpret_cast< std::shared_ptr< cmf::water::SoluteStorage > * >(argp1); - delete reinterpret_cast< std::shared_ptr< cmf::water::SoluteStorage > * >(argp1); - arg1 = const_cast< cmf::water::SoluteStorage * >(tempshared1.get()); - } else { - smartarg1 = reinterpret_cast< std::shared_ptr< cmf::water::SoluteStorage > * >(argp1); - arg1 = const_cast< cmf::water::SoluteStorage * >((smartarg1 ? smartarg1->get() : 0)); - } - } - res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_cmf__math__StateVariable__list, 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SoluteStorage_add_connected_states" "', argument " "2"" of type '" "cmf::math::StateVariable::list &""'"); - } - if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SoluteStorage_add_connected_states" "', argument " "2"" of type '" "cmf::math::StateVariable::list &""'"); - } - arg2 = reinterpret_cast< cmf::math::StateVariable::list * >(argp2); - { - try { - (arg1)->add_connected_states(*arg2); - } catch (const std::out_of_range& e) { - SWIG_exception(SWIG_IndexError, e.what()); - } catch (const std::exception& e) { - SWIG_exception(SWIG_RuntimeError, e.what()); - } - - } - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_SoluteStorage_conc_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; cmf::water::SoluteStorage *arg1 = (cmf::water::SoluteStorage *) 0 ; @@ -82605,10 +82052,10 @@ SWIGINTERN PyObject *project_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject * SWIGINTERN PyObject *_wrap_Integrator___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; cmf::math::Integrator *arg1 = (cmf::math::Integrator *) 0 ; - long arg2 ; + int arg2 ; void *argp1 = 0 ; int res1 = 0 ; - long val2 ; + int val2 ; int ecode2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -82623,11 +82070,11 @@ SWIGINTERN PyObject *_wrap_Integrator___getitem__(PyObject *SWIGUNUSEDPARM(self) SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Integrator___getitem__" "', argument " "1"" of type '" "cmf::math::Integrator *""'"); } arg1 = reinterpret_cast< cmf::math::Integrator * >(argp1); - ecode2 = SWIG_AsVal_long(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Integrator___getitem__" "', argument " "2"" of type '" "long""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Integrator___getitem__" "', argument " "2"" of type '" "int""'"); } - arg2 = static_cast< long >(val2); + arg2 = static_cast< int >(val2); { try { result = (arg1)->operator [](arg2); @@ -85075,28 +84522,28 @@ SWIGINTERN PyObject *RKFIntegrator_swiginit(PyObject *SWIGUNUSEDPARM(self), PyOb return SWIG_Python_InitShadowInstance(args); } -SWIGINTERN PyObject *_wrap_CVodeOptions_max_order_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CVodeIntegrator_preconditioner_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - cmf::math::CVodeOptions *arg1 = (cmf::math::CVodeOptions *) 0 ; - int arg2 ; + cmf::math::CVodeIntegrator *arg1 = (cmf::math::CVodeIntegrator *) 0 ; + char arg2 ; void *argp1 = 0 ; int res1 = 0 ; - int val2 ; + char val2 ; int ecode2 = 0 ; PyObject *swig_obj[2] ; - if (!SWIG_Python_UnpackTuple(args,"CVodeOptions_max_order_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeOptions, 0 | 0 ); + if (!SWIG_Python_UnpackTuple(args,"CVodeIntegrator_preconditioner_set",2,2,swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeIntegrator, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeOptions_max_order_set" "', argument " "1"" of type '" "cmf::math::CVodeOptions *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeIntegrator_preconditioner_set" "', argument " "1"" of type '" "cmf::math::CVodeIntegrator *""'"); } - arg1 = reinterpret_cast< cmf::math::CVodeOptions * >(argp1); - ecode2 = SWIG_AsVal_int(swig_obj[1], &val2); + arg1 = reinterpret_cast< cmf::math::CVodeIntegrator * >(argp1); + ecode2 = SWIG_AsVal_char(swig_obj[1], &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CVodeOptions_max_order_set" "', argument " "2"" of type '" "int""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CVodeIntegrator_preconditioner_set" "', argument " "2"" of type '" "char""'"); } - arg2 = static_cast< int >(val2); - if (arg1) (arg1)->max_order = arg2; + arg2 = static_cast< char >(val2); + if (arg1) (arg1)->preconditioner = arg2; resultobj = SWIG_Py_Void(); return resultobj; fail: @@ -85104,32 +84551,32 @@ SWIGINTERN PyObject *_wrap_CVodeOptions_max_order_set(PyObject *SWIGUNUSEDPARM(s } -SWIGINTERN PyObject *_wrap_CVodeOptions_max_order_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CVodeIntegrator_preconditioner_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - cmf::math::CVodeOptions *arg1 = (cmf::math::CVodeOptions *) 0 ; + cmf::math::CVodeIntegrator *arg1 = (cmf::math::CVodeIntegrator *) 0 ; void *argp1 = 0 ; int res1 = 0 ; PyObject *swig_obj[1] ; - int result; + char result; if (!args) SWIG_fail; swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeOptions, 0 | 0 ); + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeIntegrator, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeOptions_max_order_get" "', argument " "1"" of type '" "cmf::math::CVodeOptions *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeIntegrator_preconditioner_get" "', argument " "1"" of type '" "cmf::math::CVodeIntegrator *""'"); } - arg1 = reinterpret_cast< cmf::math::CVodeOptions * >(argp1); - result = (int) ((arg1)->max_order); - resultobj = SWIG_From_int(static_cast< int >(result)); + arg1 = reinterpret_cast< cmf::math::CVodeIntegrator * >(argp1); + result = (char) ((arg1)->preconditioner); + resultobj = SWIG_From_char(static_cast< char >(result)); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_CVodeOptions_max_non_linear_iterations_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CVodeIntegrator_MaxNonLinearIterations_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - cmf::math::CVodeOptions *arg1 = (cmf::math::CVodeOptions *) 0 ; + cmf::math::CVodeIntegrator *arg1 = (cmf::math::CVodeIntegrator *) 0 ; int arg2 ; void *argp1 = 0 ; int res1 = 0 ; @@ -85137,18 +84584,18 @@ SWIGINTERN PyObject *_wrap_CVodeOptions_max_non_linear_iterations_set(PyObject * int ecode2 = 0 ; PyObject *swig_obj[2] ; - if (!SWIG_Python_UnpackTuple(args,"CVodeOptions_max_non_linear_iterations_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeOptions, 0 | 0 ); + if (!SWIG_Python_UnpackTuple(args,"CVodeIntegrator_MaxNonLinearIterations_set",2,2,swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeIntegrator, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeOptions_max_non_linear_iterations_set" "', argument " "1"" of type '" "cmf::math::CVodeOptions *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeIntegrator_MaxNonLinearIterations_set" "', argument " "1"" of type '" "cmf::math::CVodeIntegrator *""'"); } - arg1 = reinterpret_cast< cmf::math::CVodeOptions * >(argp1); + arg1 = reinterpret_cast< cmf::math::CVodeIntegrator * >(argp1); ecode2 = SWIG_AsVal_int(swig_obj[1], &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CVodeOptions_max_non_linear_iterations_set" "', argument " "2"" of type '" "int""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CVodeIntegrator_MaxNonLinearIterations_set" "', argument " "2"" of type '" "int""'"); } arg2 = static_cast< int >(val2); - if (arg1) (arg1)->max_non_linear_iterations = arg2; + if (arg1) (arg1)->MaxNonLinearIterations = arg2; resultobj = SWIG_Py_Void(); return resultobj; fail: @@ -85156,9 +84603,9 @@ SWIGINTERN PyObject *_wrap_CVodeOptions_max_non_linear_iterations_set(PyObject * } -SWIGINTERN PyObject *_wrap_CVodeOptions_max_non_linear_iterations_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CVodeIntegrator_MaxNonLinearIterations_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - cmf::math::CVodeOptions *arg1 = (cmf::math::CVodeOptions *) 0 ; + cmf::math::CVodeIntegrator *arg1 = (cmf::math::CVodeIntegrator *) 0 ; void *argp1 = 0 ; int res1 = 0 ; PyObject *swig_obj[1] ; @@ -85166,12 +84613,12 @@ SWIGINTERN PyObject *_wrap_CVodeOptions_max_non_linear_iterations_get(PyObject * if (!args) SWIG_fail; swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeOptions, 0 | 0 ); + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeIntegrator, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeOptions_max_non_linear_iterations_get" "', argument " "1"" of type '" "cmf::math::CVodeOptions *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeIntegrator_MaxNonLinearIterations_get" "', argument " "1"" of type '" "cmf::math::CVodeIntegrator *""'"); } - arg1 = reinterpret_cast< cmf::math::CVodeOptions * >(argp1); - result = (int) ((arg1)->max_non_linear_iterations); + arg1 = reinterpret_cast< cmf::math::CVodeIntegrator * >(argp1); + result = (int) ((arg1)->MaxNonLinearIterations); resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; fail: @@ -85179,9 +84626,9 @@ SWIGINTERN PyObject *_wrap_CVodeOptions_max_non_linear_iterations_get(PyObject * } -SWIGINTERN PyObject *_wrap_CVodeOptions_max_error_test_failures_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CVodeIntegrator_MaxConvergenceFailures_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - cmf::math::CVodeOptions *arg1 = (cmf::math::CVodeOptions *) 0 ; + cmf::math::CVodeIntegrator *arg1 = (cmf::math::CVodeIntegrator *) 0 ; int arg2 ; void *argp1 = 0 ; int res1 = 0 ; @@ -85189,18 +84636,18 @@ SWIGINTERN PyObject *_wrap_CVodeOptions_max_error_test_failures_set(PyObject *SW int ecode2 = 0 ; PyObject *swig_obj[2] ; - if (!SWIG_Python_UnpackTuple(args,"CVodeOptions_max_error_test_failures_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeOptions, 0 | 0 ); + if (!SWIG_Python_UnpackTuple(args,"CVodeIntegrator_MaxConvergenceFailures_set",2,2,swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeIntegrator, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeOptions_max_error_test_failures_set" "', argument " "1"" of type '" "cmf::math::CVodeOptions *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeIntegrator_MaxConvergenceFailures_set" "', argument " "1"" of type '" "cmf::math::CVodeIntegrator *""'"); } - arg1 = reinterpret_cast< cmf::math::CVodeOptions * >(argp1); + arg1 = reinterpret_cast< cmf::math::CVodeIntegrator * >(argp1); ecode2 = SWIG_AsVal_int(swig_obj[1], &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CVodeOptions_max_error_test_failures_set" "', argument " "2"" of type '" "int""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CVodeIntegrator_MaxConvergenceFailures_set" "', argument " "2"" of type '" "int""'"); } arg2 = static_cast< int >(val2); - if (arg1) (arg1)->max_error_test_failures = arg2; + if (arg1) (arg1)->MaxConvergenceFailures = arg2; resultobj = SWIG_Py_Void(); return resultobj; fail: @@ -85208,9 +84655,9 @@ SWIGINTERN PyObject *_wrap_CVodeOptions_max_error_test_failures_set(PyObject *SW } -SWIGINTERN PyObject *_wrap_CVodeOptions_max_error_test_failures_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CVodeIntegrator_MaxConvergenceFailures_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - cmf::math::CVodeOptions *arg1 = (cmf::math::CVodeOptions *) 0 ; + cmf::math::CVodeIntegrator *arg1 = (cmf::math::CVodeIntegrator *) 0 ; void *argp1 = 0 ; int res1 = 0 ; PyObject *swig_obj[1] ; @@ -85218,12 +84665,12 @@ SWIGINTERN PyObject *_wrap_CVodeOptions_max_error_test_failures_get(PyObject *SW if (!args) SWIG_fail; swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeOptions, 0 | 0 ); + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeIntegrator, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeOptions_max_error_test_failures_get" "', argument " "1"" of type '" "cmf::math::CVodeOptions *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeIntegrator_MaxConvergenceFailures_get" "', argument " "1"" of type '" "cmf::math::CVodeIntegrator *""'"); } - arg1 = reinterpret_cast< cmf::math::CVodeOptions * >(argp1); - result = (int) ((arg1)->max_error_test_failures); + arg1 = reinterpret_cast< cmf::math::CVodeIntegrator * >(argp1); + result = (int) ((arg1)->MaxConvergenceFailures); resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; fail: @@ -85231,9 +84678,9 @@ SWIGINTERN PyObject *_wrap_CVodeOptions_max_error_test_failures_get(PyObject *SW } -SWIGINTERN PyObject *_wrap_CVodeOptions_max_convergence_failures_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CVodeIntegrator_MaxErrorTestFailures_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - cmf::math::CVodeOptions *arg1 = (cmf::math::CVodeOptions *) 0 ; + cmf::math::CVodeIntegrator *arg1 = (cmf::math::CVodeIntegrator *) 0 ; int arg2 ; void *argp1 = 0 ; int res1 = 0 ; @@ -85241,18 +84688,18 @@ SWIGINTERN PyObject *_wrap_CVodeOptions_max_convergence_failures_set(PyObject *S int ecode2 = 0 ; PyObject *swig_obj[2] ; - if (!SWIG_Python_UnpackTuple(args,"CVodeOptions_max_convergence_failures_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeOptions, 0 | 0 ); + if (!SWIG_Python_UnpackTuple(args,"CVodeIntegrator_MaxErrorTestFailures_set",2,2,swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeIntegrator, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeOptions_max_convergence_failures_set" "', argument " "1"" of type '" "cmf::math::CVodeOptions *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeIntegrator_MaxErrorTestFailures_set" "', argument " "1"" of type '" "cmf::math::CVodeIntegrator *""'"); } - arg1 = reinterpret_cast< cmf::math::CVodeOptions * >(argp1); + arg1 = reinterpret_cast< cmf::math::CVodeIntegrator * >(argp1); ecode2 = SWIG_AsVal_int(swig_obj[1], &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CVodeOptions_max_convergence_failures_set" "', argument " "2"" of type '" "int""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CVodeIntegrator_MaxErrorTestFailures_set" "', argument " "2"" of type '" "int""'"); } arg2 = static_cast< int >(val2); - if (arg1) (arg1)->max_convergence_failures = arg2; + if (arg1) (arg1)->MaxErrorTestFailures = arg2; resultobj = SWIG_Py_Void(); return resultobj; fail: @@ -85260,9 +84707,9 @@ SWIGINTERN PyObject *_wrap_CVodeOptions_max_convergence_failures_set(PyObject *S } -SWIGINTERN PyObject *_wrap_CVodeOptions_max_convergence_failures_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CVodeIntegrator_MaxErrorTestFailures_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - cmf::math::CVodeOptions *arg1 = (cmf::math::CVodeOptions *) 0 ; + cmf::math::CVodeIntegrator *arg1 = (cmf::math::CVodeIntegrator *) 0 ; void *argp1 = 0 ; int res1 = 0 ; PyObject *swig_obj[1] ; @@ -85270,12 +84717,12 @@ SWIGINTERN PyObject *_wrap_CVodeOptions_max_convergence_failures_get(PyObject *S if (!args) SWIG_fail; swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeOptions, 0 | 0 ); + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeIntegrator, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeOptions_max_convergence_failures_get" "', argument " "1"" of type '" "cmf::math::CVodeOptions *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeIntegrator_MaxErrorTestFailures_get" "', argument " "1"" of type '" "cmf::math::CVodeIntegrator *""'"); } - arg1 = reinterpret_cast< cmf::math::CVodeOptions * >(argp1); - result = (int) ((arg1)->max_convergence_failures); + arg1 = reinterpret_cast< cmf::math::CVodeIntegrator * >(argp1); + result = (int) ((arg1)->MaxErrorTestFailures); resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; fail: @@ -85283,9 +84730,9 @@ SWIGINTERN PyObject *_wrap_CVodeOptions_max_convergence_failures_get(PyObject *S } -SWIGINTERN PyObject *_wrap_CVodeOptions_max_num_steps_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CVodeIntegrator_maxl_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - cmf::math::CVodeOptions *arg1 = (cmf::math::CVodeOptions *) 0 ; + cmf::math::CVodeIntegrator *arg1 = (cmf::math::CVodeIntegrator *) 0 ; int arg2 ; void *argp1 = 0 ; int res1 = 0 ; @@ -85293,18 +84740,18 @@ SWIGINTERN PyObject *_wrap_CVodeOptions_max_num_steps_set(PyObject *SWIGUNUSEDPA int ecode2 = 0 ; PyObject *swig_obj[2] ; - if (!SWIG_Python_UnpackTuple(args,"CVodeOptions_max_num_steps_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeOptions, 0 | 0 ); + if (!SWIG_Python_UnpackTuple(args,"CVodeIntegrator_maxl_set",2,2,swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeIntegrator, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeOptions_max_num_steps_set" "', argument " "1"" of type '" "cmf::math::CVodeOptions *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeIntegrator_maxl_set" "', argument " "1"" of type '" "cmf::math::CVodeIntegrator *""'"); } - arg1 = reinterpret_cast< cmf::math::CVodeOptions * >(argp1); + arg1 = reinterpret_cast< cmf::math::CVodeIntegrator * >(argp1); ecode2 = SWIG_AsVal_int(swig_obj[1], &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CVodeOptions_max_num_steps_set" "', argument " "2"" of type '" "int""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CVodeIntegrator_maxl_set" "', argument " "2"" of type '" "int""'"); } arg2 = static_cast< int >(val2); - if (arg1) (arg1)->max_num_steps = arg2; + if (arg1) (arg1)->maxl = arg2; resultobj = SWIG_Py_Void(); return resultobj; fail: @@ -85312,9 +84759,9 @@ SWIGINTERN PyObject *_wrap_CVodeOptions_max_num_steps_set(PyObject *SWIGUNUSEDPA } -SWIGINTERN PyObject *_wrap_CVodeOptions_max_num_steps_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CVodeIntegrator_maxl_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - cmf::math::CVodeOptions *arg1 = (cmf::math::CVodeOptions *) 0 ; + cmf::math::CVodeIntegrator *arg1 = (cmf::math::CVodeIntegrator *) 0 ; void *argp1 = 0 ; int res1 = 0 ; PyObject *swig_obj[1] ; @@ -85322,12 +84769,12 @@ SWIGINTERN PyObject *_wrap_CVodeOptions_max_num_steps_get(PyObject *SWIGUNUSEDPA if (!args) SWIG_fail; swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeOptions, 0 | 0 ); + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeIntegrator, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeOptions_max_num_steps_get" "', argument " "1"" of type '" "cmf::math::CVodeOptions *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeIntegrator_maxl_get" "', argument " "1"" of type '" "cmf::math::CVodeIntegrator *""'"); } - arg1 = reinterpret_cast< cmf::math::CVodeOptions * >(argp1); - result = (int) ((arg1)->max_num_steps); + arg1 = reinterpret_cast< cmf::math::CVodeIntegrator * >(argp1); + result = (int) ((arg1)->maxl); resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; fail: @@ -85335,9 +84782,9 @@ SWIGINTERN PyObject *_wrap_CVodeOptions_max_num_steps_get(PyObject *SWIGUNUSEDPA } -SWIGINTERN PyObject *_wrap_CVodeOptions_max_hnil_warnings_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CVodeIntegrator_LinearSolver_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - cmf::math::CVodeOptions *arg1 = (cmf::math::CVodeOptions *) 0 ; + cmf::math::CVodeIntegrator *arg1 = (cmf::math::CVodeIntegrator *) 0 ; int arg2 ; void *argp1 = 0 ; int res1 = 0 ; @@ -85345,18 +84792,18 @@ SWIGINTERN PyObject *_wrap_CVodeOptions_max_hnil_warnings_set(PyObject *SWIGUNUS int ecode2 = 0 ; PyObject *swig_obj[2] ; - if (!SWIG_Python_UnpackTuple(args,"CVodeOptions_max_hnil_warnings_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeOptions, 0 | 0 ); + if (!SWIG_Python_UnpackTuple(args,"CVodeIntegrator_LinearSolver_set",2,2,swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeIntegrator, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeOptions_max_hnil_warnings_set" "', argument " "1"" of type '" "cmf::math::CVodeOptions *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeIntegrator_LinearSolver_set" "', argument " "1"" of type '" "cmf::math::CVodeIntegrator *""'"); } - arg1 = reinterpret_cast< cmf::math::CVodeOptions * >(argp1); + arg1 = reinterpret_cast< cmf::math::CVodeIntegrator * >(argp1); ecode2 = SWIG_AsVal_int(swig_obj[1], &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CVodeOptions_max_hnil_warnings_set" "', argument " "2"" of type '" "int""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CVodeIntegrator_LinearSolver_set" "', argument " "2"" of type '" "int""'"); } arg2 = static_cast< int >(val2); - if (arg1) (arg1)->max_hnil_warnings = arg2; + if (arg1) (arg1)->LinearSolver = arg2; resultobj = SWIG_Py_Void(); return resultobj; fail: @@ -85364,9 +84811,9 @@ SWIGINTERN PyObject *_wrap_CVodeOptions_max_hnil_warnings_set(PyObject *SWIGUNUS } -SWIGINTERN PyObject *_wrap_CVodeOptions_max_hnil_warnings_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CVodeIntegrator_LinearSolver_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - cmf::math::CVodeOptions *arg1 = (cmf::math::CVodeOptions *) 0 ; + cmf::math::CVodeIntegrator *arg1 = (cmf::math::CVodeIntegrator *) 0 ; void *argp1 = 0 ; int res1 = 0 ; PyObject *swig_obj[1] ; @@ -85374,12 +84821,12 @@ SWIGINTERN PyObject *_wrap_CVodeOptions_max_hnil_warnings_get(PyObject *SWIGUNUS if (!args) SWIG_fail; swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeOptions, 0 | 0 ); + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeIntegrator, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeOptions_max_hnil_warnings_get" "', argument " "1"" of type '" "cmf::math::CVodeOptions *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeIntegrator_LinearSolver_get" "', argument " "1"" of type '" "cmf::math::CVodeIntegrator *""'"); } - arg1 = reinterpret_cast< cmf::math::CVodeOptions * >(argp1); - result = (int) ((arg1)->max_hnil_warnings); + arg1 = reinterpret_cast< cmf::math::CVodeIntegrator * >(argp1); + result = (int) ((arg1)->LinearSolver); resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; fail: @@ -85387,1716 +84834,9 @@ SWIGINTERN PyObject *_wrap_CVodeOptions_max_hnil_warnings_get(PyObject *SWIGUNUS } -SWIGINTERN PyObject *_wrap_new_CVodeOptions(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeOptions *result = 0 ; - - if (!SWIG_Python_UnpackTuple(args,"new_CVodeOptions",0,0,0)) SWIG_fail; - { - try { - result = (cmf::math::CVodeOptions *)new cmf::math::CVodeOptions(); - } catch (const std::out_of_range& e) { - SWIG_exception(SWIG_IndexError, e.what()); - } catch (const std::exception& e) { - SWIG_exception(SWIG_RuntimeError, e.what()); - } - - } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_cmf__math__CVodeOptions, SWIG_POINTER_NEW | 0 ); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_delete_CVodeOptions(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeOptions *arg1 = (cmf::math::CVodeOptions *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeOptions, SWIG_POINTER_DISOWN | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CVodeOptions" "', argument " "1"" of type '" "cmf::math::CVodeOptions *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeOptions * >(argp1); - { - try { - delete arg1; - } catch (const std::out_of_range& e) { - SWIG_exception(SWIG_IndexError, e.what()); - } catch (const std::exception& e) { - SWIG_exception(SWIG_RuntimeError, e.what()); - } - - } - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *CVodeOptions_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *obj; - if (!SWIG_Python_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL; - SWIG_TypeNewClientData(SWIGTYPE_p_cmf__math__CVodeOptions, SWIG_NewClientData(obj)); - return SWIG_Py_Void(); -} - -SWIGINTERN PyObject *CVodeOptions_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - return SWIG_Python_InitShadowInstance(args); -} - -SWIGINTERN PyObject *_wrap_CVodeInfo_size_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeInfo *arg1 = (cmf::math::CVodeInfo *) 0 ; - long arg2 ; - void *argp1 = 0 ; - int res1 = 0 ; - long val2 ; - int ecode2 = 0 ; - PyObject *swig_obj[2] ; - - if (!SWIG_Python_UnpackTuple(args,"CVodeInfo_size_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeInfo, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeInfo_size_set" "', argument " "1"" of type '" "cmf::math::CVodeInfo *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeInfo * >(argp1); - ecode2 = SWIG_AsVal_long(swig_obj[1], &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CVodeInfo_size_set" "', argument " "2"" of type '" "long""'"); - } - arg2 = static_cast< long >(val2); - if (arg1) (arg1)->size = arg2; - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeInfo_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeInfo *arg1 = (cmf::math::CVodeInfo *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - long result; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeInfo, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeInfo_size_get" "', argument " "1"" of type '" "cmf::math::CVodeInfo *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeInfo * >(argp1); - result = (long) ((arg1)->size); - resultobj = SWIG_From_long(static_cast< long >(result)); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeInfo_workspace_real_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeInfo *arg1 = (cmf::math::CVodeInfo *) 0 ; - long arg2 ; - void *argp1 = 0 ; - int res1 = 0 ; - long val2 ; - int ecode2 = 0 ; - PyObject *swig_obj[2] ; - - if (!SWIG_Python_UnpackTuple(args,"CVodeInfo_workspace_real_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeInfo, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeInfo_workspace_real_set" "', argument " "1"" of type '" "cmf::math::CVodeInfo *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeInfo * >(argp1); - ecode2 = SWIG_AsVal_long(swig_obj[1], &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CVodeInfo_workspace_real_set" "', argument " "2"" of type '" "long""'"); - } - arg2 = static_cast< long >(val2); - if (arg1) (arg1)->workspace_real = arg2; - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeInfo_workspace_real_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeInfo *arg1 = (cmf::math::CVodeInfo *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - long result; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeInfo, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeInfo_workspace_real_get" "', argument " "1"" of type '" "cmf::math::CVodeInfo *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeInfo * >(argp1); - result = (long) ((arg1)->workspace_real); - resultobj = SWIG_From_long(static_cast< long >(result)); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeInfo_workspace_int_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeInfo *arg1 = (cmf::math::CVodeInfo *) 0 ; - long arg2 ; - void *argp1 = 0 ; - int res1 = 0 ; - long val2 ; - int ecode2 = 0 ; - PyObject *swig_obj[2] ; - - if (!SWIG_Python_UnpackTuple(args,"CVodeInfo_workspace_int_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeInfo, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeInfo_workspace_int_set" "', argument " "1"" of type '" "cmf::math::CVodeInfo *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeInfo * >(argp1); - ecode2 = SWIG_AsVal_long(swig_obj[1], &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CVodeInfo_workspace_int_set" "', argument " "2"" of type '" "long""'"); - } - arg2 = static_cast< long >(val2); - if (arg1) (arg1)->workspace_int = arg2; - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeInfo_workspace_int_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeInfo *arg1 = (cmf::math::CVodeInfo *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - long result; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeInfo, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeInfo_workspace_int_get" "', argument " "1"" of type '" "cmf::math::CVodeInfo *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeInfo * >(argp1); - result = (long) ((arg1)->workspace_int); - resultobj = SWIG_From_long(static_cast< long >(result)); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeInfo_workspace_byte_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeInfo *arg1 = (cmf::math::CVodeInfo *) 0 ; - long arg2 ; - void *argp1 = 0 ; - int res1 = 0 ; - long val2 ; - int ecode2 = 0 ; - PyObject *swig_obj[2] ; - - if (!SWIG_Python_UnpackTuple(args,"CVodeInfo_workspace_byte_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeInfo, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeInfo_workspace_byte_set" "', argument " "1"" of type '" "cmf::math::CVodeInfo *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeInfo * >(argp1); - ecode2 = SWIG_AsVal_long(swig_obj[1], &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CVodeInfo_workspace_byte_set" "', argument " "2"" of type '" "long""'"); - } - arg2 = static_cast< long >(val2); - if (arg1) (arg1)->workspace_byte = arg2; - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeInfo_workspace_byte_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeInfo *arg1 = (cmf::math::CVodeInfo *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - long result; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeInfo, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeInfo_workspace_byte_get" "', argument " "1"" of type '" "cmf::math::CVodeInfo *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeInfo * >(argp1); - result = (long) ((arg1)->workspace_byte); - resultobj = SWIG_From_long(static_cast< long >(result)); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeInfo_steps_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeInfo *arg1 = (cmf::math::CVodeInfo *) 0 ; - long arg2 ; - void *argp1 = 0 ; - int res1 = 0 ; - long val2 ; - int ecode2 = 0 ; - PyObject *swig_obj[2] ; - - if (!SWIG_Python_UnpackTuple(args,"CVodeInfo_steps_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeInfo, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeInfo_steps_set" "', argument " "1"" of type '" "cmf::math::CVodeInfo *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeInfo * >(argp1); - ecode2 = SWIG_AsVal_long(swig_obj[1], &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CVodeInfo_steps_set" "', argument " "2"" of type '" "long""'"); - } - arg2 = static_cast< long >(val2); - if (arg1) (arg1)->steps = arg2; - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeInfo_steps_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeInfo *arg1 = (cmf::math::CVodeInfo *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - long result; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeInfo, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeInfo_steps_get" "', argument " "1"" of type '" "cmf::math::CVodeInfo *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeInfo * >(argp1); - result = (long) ((arg1)->steps); - resultobj = SWIG_From_long(static_cast< long >(result)); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeInfo_current_order_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeInfo *arg1 = (cmf::math::CVodeInfo *) 0 ; - long arg2 ; - void *argp1 = 0 ; - int res1 = 0 ; - long val2 ; - int ecode2 = 0 ; - PyObject *swig_obj[2] ; - - if (!SWIG_Python_UnpackTuple(args,"CVodeInfo_current_order_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeInfo, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeInfo_current_order_set" "', argument " "1"" of type '" "cmf::math::CVodeInfo *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeInfo * >(argp1); - ecode2 = SWIG_AsVal_long(swig_obj[1], &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CVodeInfo_current_order_set" "', argument " "2"" of type '" "long""'"); - } - arg2 = static_cast< long >(val2); - if (arg1) (arg1)->current_order = arg2; - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeInfo_current_order_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeInfo *arg1 = (cmf::math::CVodeInfo *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - long result; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeInfo, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeInfo_current_order_get" "', argument " "1"" of type '" "cmf::math::CVodeInfo *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeInfo * >(argp1); - result = (long) ((arg1)->current_order); - resultobj = SWIG_From_long(static_cast< long >(result)); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeInfo_rhs_evaluations_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeInfo *arg1 = (cmf::math::CVodeInfo *) 0 ; - long arg2 ; - void *argp1 = 0 ; - int res1 = 0 ; - long val2 ; - int ecode2 = 0 ; - PyObject *swig_obj[2] ; - - if (!SWIG_Python_UnpackTuple(args,"CVodeInfo_rhs_evaluations_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeInfo, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeInfo_rhs_evaluations_set" "', argument " "1"" of type '" "cmf::math::CVodeInfo *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeInfo * >(argp1); - ecode2 = SWIG_AsVal_long(swig_obj[1], &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CVodeInfo_rhs_evaluations_set" "', argument " "2"" of type '" "long""'"); - } - arg2 = static_cast< long >(val2); - if (arg1) (arg1)->rhs_evaluations = arg2; - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeInfo_rhs_evaluations_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeInfo *arg1 = (cmf::math::CVodeInfo *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - long result; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeInfo, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeInfo_rhs_evaluations_get" "', argument " "1"" of type '" "cmf::math::CVodeInfo *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeInfo * >(argp1); - result = (long) ((arg1)->rhs_evaluations); - resultobj = SWIG_From_long(static_cast< long >(result)); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeInfo_linear_solver_setups_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeInfo *arg1 = (cmf::math::CVodeInfo *) 0 ; - long arg2 ; - void *argp1 = 0 ; - int res1 = 0 ; - long val2 ; - int ecode2 = 0 ; - PyObject *swig_obj[2] ; - - if (!SWIG_Python_UnpackTuple(args,"CVodeInfo_linear_solver_setups_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeInfo, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeInfo_linear_solver_setups_set" "', argument " "1"" of type '" "cmf::math::CVodeInfo *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeInfo * >(argp1); - ecode2 = SWIG_AsVal_long(swig_obj[1], &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CVodeInfo_linear_solver_setups_set" "', argument " "2"" of type '" "long""'"); - } - arg2 = static_cast< long >(val2); - if (arg1) (arg1)->linear_solver_setups = arg2; - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeInfo_linear_solver_setups_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeInfo *arg1 = (cmf::math::CVodeInfo *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - long result; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeInfo, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeInfo_linear_solver_setups_get" "', argument " "1"" of type '" "cmf::math::CVodeInfo *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeInfo * >(argp1); - result = (long) ((arg1)->linear_solver_setups); - resultobj = SWIG_From_long(static_cast< long >(result)); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeInfo_error_test_fails_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeInfo *arg1 = (cmf::math::CVodeInfo *) 0 ; - long arg2 ; - void *argp1 = 0 ; - int res1 = 0 ; - long val2 ; - int ecode2 = 0 ; - PyObject *swig_obj[2] ; - - if (!SWIG_Python_UnpackTuple(args,"CVodeInfo_error_test_fails_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeInfo, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeInfo_error_test_fails_set" "', argument " "1"" of type '" "cmf::math::CVodeInfo *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeInfo * >(argp1); - ecode2 = SWIG_AsVal_long(swig_obj[1], &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CVodeInfo_error_test_fails_set" "', argument " "2"" of type '" "long""'"); - } - arg2 = static_cast< long >(val2); - if (arg1) (arg1)->error_test_fails = arg2; - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeInfo_error_test_fails_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeInfo *arg1 = (cmf::math::CVodeInfo *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - long result; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeInfo, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeInfo_error_test_fails_get" "', argument " "1"" of type '" "cmf::math::CVodeInfo *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeInfo * >(argp1); - result = (long) ((arg1)->error_test_fails); - resultobj = SWIG_From_long(static_cast< long >(result)); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeInfo_order_reductions_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeInfo *arg1 = (cmf::math::CVodeInfo *) 0 ; - long arg2 ; - void *argp1 = 0 ; - int res1 = 0 ; - long val2 ; - int ecode2 = 0 ; - PyObject *swig_obj[2] ; - - if (!SWIG_Python_UnpackTuple(args,"CVodeInfo_order_reductions_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeInfo, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeInfo_order_reductions_set" "', argument " "1"" of type '" "cmf::math::CVodeInfo *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeInfo * >(argp1); - ecode2 = SWIG_AsVal_long(swig_obj[1], &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CVodeInfo_order_reductions_set" "', argument " "2"" of type '" "long""'"); - } - arg2 = static_cast< long >(val2); - if (arg1) (arg1)->order_reductions = arg2; - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeInfo_order_reductions_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeInfo *arg1 = (cmf::math::CVodeInfo *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - long result; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeInfo, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeInfo_order_reductions_get" "', argument " "1"" of type '" "cmf::math::CVodeInfo *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeInfo * >(argp1); - result = (long) ((arg1)->order_reductions); - resultobj = SWIG_From_long(static_cast< long >(result)); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeInfo_nonlinear_solver_iterations_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeInfo *arg1 = (cmf::math::CVodeInfo *) 0 ; - long arg2 ; - void *argp1 = 0 ; - int res1 = 0 ; - long val2 ; - int ecode2 = 0 ; - PyObject *swig_obj[2] ; - - if (!SWIG_Python_UnpackTuple(args,"CVodeInfo_nonlinear_solver_iterations_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeInfo, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeInfo_nonlinear_solver_iterations_set" "', argument " "1"" of type '" "cmf::math::CVodeInfo *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeInfo * >(argp1); - ecode2 = SWIG_AsVal_long(swig_obj[1], &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CVodeInfo_nonlinear_solver_iterations_set" "', argument " "2"" of type '" "long""'"); - } - arg2 = static_cast< long >(val2); - if (arg1) (arg1)->nonlinear_solver_iterations = arg2; - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeInfo_nonlinear_solver_iterations_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeInfo *arg1 = (cmf::math::CVodeInfo *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - long result; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeInfo, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeInfo_nonlinear_solver_iterations_get" "', argument " "1"" of type '" "cmf::math::CVodeInfo *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeInfo * >(argp1); - result = (long) ((arg1)->nonlinear_solver_iterations); - resultobj = SWIG_From_long(static_cast< long >(result)); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeInfo_nonlinear_solver_convergence_failures_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeInfo *arg1 = (cmf::math::CVodeInfo *) 0 ; - long arg2 ; - void *argp1 = 0 ; - int res1 = 0 ; - long val2 ; - int ecode2 = 0 ; - PyObject *swig_obj[2] ; - - if (!SWIG_Python_UnpackTuple(args,"CVodeInfo_nonlinear_solver_convergence_failures_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeInfo, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeInfo_nonlinear_solver_convergence_failures_set" "', argument " "1"" of type '" "cmf::math::CVodeInfo *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeInfo * >(argp1); - ecode2 = SWIG_AsVal_long(swig_obj[1], &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CVodeInfo_nonlinear_solver_convergence_failures_set" "', argument " "2"" of type '" "long""'"); - } - arg2 = static_cast< long >(val2); - if (arg1) (arg1)->nonlinear_solver_convergence_failures = arg2; - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeInfo_nonlinear_solver_convergence_failures_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeInfo *arg1 = (cmf::math::CVodeInfo *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - long result; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeInfo, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeInfo_nonlinear_solver_convergence_failures_get" "', argument " "1"" of type '" "cmf::math::CVodeInfo *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeInfo * >(argp1); - result = (long) ((arg1)->nonlinear_solver_convergence_failures); - resultobj = SWIG_From_long(static_cast< long >(result)); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeInfo_dxdt_method_calls_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeInfo *arg1 = (cmf::math::CVodeInfo *) 0 ; - long arg2 ; - void *argp1 = 0 ; - int res1 = 0 ; - long val2 ; - int ecode2 = 0 ; - PyObject *swig_obj[2] ; - - if (!SWIG_Python_UnpackTuple(args,"CVodeInfo_dxdt_method_calls_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeInfo, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeInfo_dxdt_method_calls_set" "', argument " "1"" of type '" "cmf::math::CVodeInfo *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeInfo * >(argp1); - ecode2 = SWIG_AsVal_long(swig_obj[1], &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CVodeInfo_dxdt_method_calls_set" "', argument " "2"" of type '" "long""'"); - } - arg2 = static_cast< long >(val2); - if (arg1) (arg1)->dxdt_method_calls = arg2; - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeInfo_dxdt_method_calls_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeInfo *arg1 = (cmf::math::CVodeInfo *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - long result; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeInfo, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeInfo_dxdt_method_calls_get" "', argument " "1"" of type '" "cmf::math::CVodeInfo *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeInfo * >(argp1); - result = (long) ((arg1)->dxdt_method_calls); - resultobj = SWIG_From_long(static_cast< long >(result)); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeInfo_sundials_version_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeInfo *arg1 = (cmf::math::CVodeInfo *) 0 ; - std::string *arg2 = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - int res2 = SWIG_OLDOBJ ; - PyObject *swig_obj[2] ; - - if (!SWIG_Python_UnpackTuple(args,"CVodeInfo_sundials_version_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeInfo, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeInfo_sundials_version_set" "', argument " "1"" of type '" "cmf::math::CVodeInfo *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeInfo * >(argp1); - { - std::string *ptr = (std::string *)0; - res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CVodeInfo_sundials_version_set" "', argument " "2"" of type '" "std::string const &""'"); - } - if (!ptr) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CVodeInfo_sundials_version_set" "', argument " "2"" of type '" "std::string const &""'"); - } - arg2 = ptr; - } - if (arg1) (arg1)->sundials_version = *arg2; - resultobj = SWIG_Py_Void(); - if (SWIG_IsNewObj(res2)) delete arg2; - return resultobj; -fail: - if (SWIG_IsNewObj(res2)) delete arg2; - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeInfo_sundials_version_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeInfo *arg1 = (cmf::math::CVodeInfo *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - std::string *result = 0 ; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeInfo, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeInfo_sundials_version_get" "', argument " "1"" of type '" "cmf::math::CVodeInfo *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeInfo * >(argp1); - result = (std::string *) & ((arg1)->sundials_version); - resultobj = SWIG_From_std_string(static_cast< std::string >(*result)); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeInfo_to_string(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeInfo *arg1 = (cmf::math::CVodeInfo *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - std::string result; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeInfo, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeInfo_to_string" "', argument " "1"" of type '" "cmf::math::CVodeInfo const *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeInfo * >(argp1); - { - try { - result = ((cmf::math::CVodeInfo const *)arg1)->to_string(); - } catch (const std::out_of_range& e) { - SWIG_exception(SWIG_IndexError, e.what()); - } catch (const std::exception& e) { - SWIG_exception(SWIG_RuntimeError, e.what()); - } - - } - resultobj = SWIG_From_std_string(static_cast< std::string >(result)); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_new_CVodeInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeInfo *result = 0 ; - - if (!SWIG_Python_UnpackTuple(args,"new_CVodeInfo",0,0,0)) SWIG_fail; - { - try { - result = (cmf::math::CVodeInfo *)new cmf::math::CVodeInfo(); - } catch (const std::out_of_range& e) { - SWIG_exception(SWIG_IndexError, e.what()); - } catch (const std::exception& e) { - SWIG_exception(SWIG_RuntimeError, e.what()); - } - - } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_cmf__math__CVodeInfo, SWIG_POINTER_NEW | 0 ); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_delete_CVodeInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeInfo *arg1 = (cmf::math::CVodeInfo *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeInfo, SWIG_POINTER_DISOWN | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CVodeInfo" "', argument " "1"" of type '" "cmf::math::CVodeInfo *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeInfo * >(argp1); - { - try { - delete arg1; - } catch (const std::out_of_range& e) { - SWIG_exception(SWIG_IndexError, e.what()); - } catch (const std::exception& e) { - SWIG_exception(SWIG_RuntimeError, e.what()); - } - - } - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *CVodeInfo_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *obj; - if (!SWIG_Python_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL; - SWIG_TypeNewClientData(SWIGTYPE_p_cmf__math__CVodeInfo, SWIG_NewClientData(obj)); - return SWIG_Py_Void(); -} - -SWIGINTERN PyObject *CVodeInfo_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - return SWIG_Python_InitShadowInstance(args); -} - -SWIGINTERN PyObject *_wrap_CVodeBase_options_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeBase *arg1 = (cmf::math::CVodeBase *) 0 ; - cmf::math::CVodeOptions *arg2 = (cmf::math::CVodeOptions *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject *swig_obj[2] ; - - if (!SWIG_Python_UnpackTuple(args,"CVodeBase_options_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeBase, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeBase_options_set" "', argument " "1"" of type '" "cmf::math::CVodeBase *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeBase * >(argp1); - res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_cmf__math__CVodeOptions, 0 | 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CVodeBase_options_set" "', argument " "2"" of type '" "cmf::math::CVodeOptions *""'"); - } - arg2 = reinterpret_cast< cmf::math::CVodeOptions * >(argp2); - if (arg1) (arg1)->options = *arg2; - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeBase_options_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeBase *arg1 = (cmf::math::CVodeBase *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - cmf::math::CVodeOptions *result = 0 ; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeBase, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeBase_options_get" "', argument " "1"" of type '" "cmf::math::CVodeBase *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeBase * >(argp1); - result = (cmf::math::CVodeOptions *)& ((arg1)->options); - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_cmf__math__CVodeOptions, 0 | 0 ); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeBase_initialize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeBase *arg1 = (cmf::math::CVodeBase *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - int result; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeBase, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeBase_initialize" "', argument " "1"" of type '" "cmf::math::CVodeBase *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeBase * >(argp1); - { - try { - result = (int)(arg1)->initialize(); - } catch (const std::out_of_range& e) { - SWIG_exception(SWIG_IndexError, e.what()); - } catch (const std::exception& e) { - SWIG_exception(SWIG_RuntimeError, e.what()); - } - - } - resultobj = SWIG_From_int(static_cast< int >(result)); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeBase_set_error_msg(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - cmf::math::CVodeBase *arg1 = (cmf::math::CVodeBase *) 0 ; - std::string arg2 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "error", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CVodeBase_set_error_msg",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_cmf__math__CVodeBase, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeBase_set_error_msg" "', argument " "1"" of type '" "cmf::math::CVodeBase *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeBase * >(argp1); - { - std::string *ptr = (std::string *)0; - int res = SWIG_AsPtr_std_string(obj1, &ptr); - if (!SWIG_IsOK(res) || !ptr) { - SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "CVodeBase_set_error_msg" "', argument " "2"" of type '" "std::string""'"); - } - arg2 = *ptr; - if (SWIG_IsNewObj(res)) delete ptr; - } - { - try { - (arg1)->set_error_msg(arg2); - } catch (const std::out_of_range& e) { - SWIG_exception(SWIG_IndexError, e.what()); - } catch (const std::exception& e) { - SWIG_exception(SWIG_RuntimeError, e.what()); - } - - } - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeBase_copy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeBase *arg1 = (cmf::math::CVodeBase *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - cmf::math::CVodeBase *result = 0 ; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeBase, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeBase_copy" "', argument " "1"" of type '" "cmf::math::CVodeBase const *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeBase * >(argp1); - { - try { - result = (cmf::math::CVodeBase *)((cmf::math::CVodeBase const *)arg1)->copy(); - } catch (const std::out_of_range& e) { - SWIG_exception(SWIG_IndexError, e.what()); - } catch (const std::exception& e) { - SWIG_exception(SWIG_RuntimeError, e.what()); - } - - } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_cmf__math__CVodeBase, 0 | 0 ); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeBase_error_msg_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeBase *arg1 = (cmf::math::CVodeBase *) 0 ; - std::string *arg2 = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - int res2 = SWIG_OLDOBJ ; - PyObject *swig_obj[2] ; - - if (!SWIG_Python_UnpackTuple(args,"CVodeBase_error_msg_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeBase, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeBase_error_msg_set" "', argument " "1"" of type '" "cmf::math::CVodeBase *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeBase * >(argp1); - { - std::string *ptr = (std::string *)0; - res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CVodeBase_error_msg_set" "', argument " "2"" of type '" "std::string const &""'"); - } - if (!ptr) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CVodeBase_error_msg_set" "', argument " "2"" of type '" "std::string const &""'"); - } - arg2 = ptr; - } - if (arg1) (arg1)->error_msg = *arg2; - resultobj = SWIG_Py_Void(); - if (SWIG_IsNewObj(res2)) delete arg2; - return resultobj; -fail: - if (SWIG_IsNewObj(res2)) delete arg2; - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeBase_error_msg_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeBase *arg1 = (cmf::math::CVodeBase *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - std::string *result = 0 ; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeBase, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeBase_error_msg_get" "', argument " "1"" of type '" "cmf::math::CVodeBase *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeBase * >(argp1); - result = (std::string *) & ((arg1)->error_msg); - resultobj = SWIG_From_std_string(static_cast< std::string >(*result)); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeBase_get_info(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeBase *arg1 = (cmf::math::CVodeBase *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - cmf::math::CVodeInfo result; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeBase, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeBase_get_info" "', argument " "1"" of type '" "cmf::math::CVodeBase const *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeBase * >(argp1); - { - try { - result = ((cmf::math::CVodeBase const *)arg1)->get_info(); - } catch (const std::out_of_range& e) { - SWIG_exception(SWIG_IndexError, e.what()); - } catch (const std::exception& e) { - SWIG_exception(SWIG_RuntimeError, e.what()); - } - - } - resultobj = SWIG_NewPointerObj((new cmf::math::CVodeInfo(static_cast< const cmf::math::CVodeInfo& >(result))), SWIGTYPE_p_cmf__math__CVodeInfo, SWIG_POINTER_OWN | 0 ); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeBase_to_string(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeBase *arg1 = (cmf::math::CVodeBase *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - std::string result; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeBase, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeBase_to_string" "', argument " "1"" of type '" "cmf::math::CVodeBase const *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeBase * >(argp1); - { - try { - result = ((cmf::math::CVodeBase const *)arg1)->to_string(); - } catch (const std::out_of_range& e) { - SWIG_exception(SWIG_IndexError, e.what()); - } catch (const std::exception& e) { - SWIG_exception(SWIG_RuntimeError, e.what()); - } - - } - resultobj = SWIG_From_std_string(static_cast< std::string >(result)); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeBase_get_error(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeBase *arg1 = (cmf::math::CVodeBase *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - cmf::math::num_array result; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeBase, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeBase_get_error" "', argument " "1"" of type '" "cmf::math::CVodeBase const *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeBase * >(argp1); - { - try { - result = ((cmf::math::CVodeBase const *)arg1)->get_error(); - } catch (const std::out_of_range& e) { - SWIG_exception(SWIG_IndexError, e.what()); - } catch (const std::exception& e) { - SWIG_exception(SWIG_RuntimeError, e.what()); - } - - } - { - resultobj = as_npy_array(result); - } - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeBase__get_jacobian(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeBase *arg1 = (cmf::math::CVodeBase *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - cmf::math::num_array result; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeBase, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeBase__get_jacobian" "', argument " "1"" of type '" "cmf::math::CVodeBase const *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeBase * >(argp1); - { - try { - result = ((cmf::math::CVodeBase const *)arg1)->_get_jacobian(); - } catch (const std::out_of_range& e) { - SWIG_exception(SWIG_IndexError, e.what()); - } catch (const std::exception& e) { - SWIG_exception(SWIG_RuntimeError, e.what()); - } - - } - { - resultobj = as_npy_array(result); - } - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_delete_CVodeBase(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeBase *arg1 = (cmf::math::CVodeBase *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeBase, SWIG_POINTER_DISOWN | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CVodeBase" "', argument " "1"" of type '" "cmf::math::CVodeBase *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeBase * >(argp1); - { - try { - delete arg1; - } catch (const std::out_of_range& e) { - SWIG_exception(SWIG_IndexError, e.what()); - } catch (const std::exception& e) { - SWIG_exception(SWIG_RuntimeError, e.what()); - } - - } - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *CVodeBase_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *obj; - if (!SWIG_Python_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL; - SWIG_TypeNewClientData(SWIGTYPE_p_cmf__math__CVodeBase, SWIG_NewClientData(obj)); - return SWIG_Py_Void(); -} - -SWIGINTERN PyObject *_wrap_new_CVodeDense(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - cmf::math::StateVariableOwner *arg1 = 0 ; - real arg2 = (real) 1e-9 ; - void *argp1 = 0 ; - int res1 = 0 ; - double val2 ; - int ecode2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "states",(char *) "epsilon", NULL - }; - cmf::math::CVodeDense *result = 0 ; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_CVodeDense",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_cmf__math__StateVariableOwner, 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CVodeDense" "', argument " "1"" of type '" "cmf::math::StateVariableOwner &""'"); - } - if (!argp1) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CVodeDense" "', argument " "1"" of type '" "cmf::math::StateVariableOwner &""'"); - } - arg1 = reinterpret_cast< cmf::math::StateVariableOwner * >(argp1); - if (obj1) { - ecode2 = SWIG_AsVal_double(obj1, &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CVodeDense" "', argument " "2"" of type '" "real""'"); - } - arg2 = static_cast< real >(val2); - } - { - try { - result = (cmf::math::CVodeDense *)new cmf::math::CVodeDense(*arg1,arg2); - } catch (const std::out_of_range& e) { - SWIG_exception(SWIG_IndexError, e.what()); - } catch (const std::exception& e) { - SWIG_exception(SWIG_RuntimeError, e.what()); - } - - } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_cmf__math__CVodeDense, SWIG_POINTER_NEW | 0 ); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_delete_CVodeDense(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeDense *arg1 = (cmf::math::CVodeDense *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeDense, SWIG_POINTER_DISOWN | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CVodeDense" "', argument " "1"" of type '" "cmf::math::CVodeDense *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeDense * >(argp1); - { - try { - delete arg1; - } catch (const std::out_of_range& e) { - SWIG_exception(SWIG_IndexError, e.what()); - } catch (const std::exception& e) { - SWIG_exception(SWIG_RuntimeError, e.what()); - } - - } - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *CVodeDense_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *obj; - if (!SWIG_Python_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL; - SWIG_TypeNewClientData(SWIGTYPE_p_cmf__math__CVodeDense, SWIG_NewClientData(obj)); - return SWIG_Py_Void(); -} - -SWIGINTERN PyObject *CVodeDense_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - return SWIG_Python_InitShadowInstance(args); -} - -SWIGINTERN PyObject *_wrap_new_CVodeAdams(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - cmf::math::StateVariableOwner *arg1 = 0 ; - real arg2 = (real) 1e-9 ; - void *argp1 = 0 ; - int res1 = 0 ; - double val2 ; - int ecode2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "states",(char *) "epsilon", NULL - }; - cmf::math::CVodeAdams *result = 0 ; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_CVodeAdams",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_cmf__math__StateVariableOwner, 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CVodeAdams" "', argument " "1"" of type '" "cmf::math::StateVariableOwner &""'"); - } - if (!argp1) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CVodeAdams" "', argument " "1"" of type '" "cmf::math::StateVariableOwner &""'"); - } - arg1 = reinterpret_cast< cmf::math::StateVariableOwner * >(argp1); - if (obj1) { - ecode2 = SWIG_AsVal_double(obj1, &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CVodeAdams" "', argument " "2"" of type '" "real""'"); - } - arg2 = static_cast< real >(val2); - } - { - try { - result = (cmf::math::CVodeAdams *)new cmf::math::CVodeAdams(*arg1,arg2); - } catch (const std::out_of_range& e) { - SWIG_exception(SWIG_IndexError, e.what()); - } catch (const std::exception& e) { - SWIG_exception(SWIG_RuntimeError, e.what()); - } - - } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_cmf__math__CVodeAdams, SWIG_POINTER_NEW | 0 ); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_delete_CVodeAdams(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeAdams *arg1 = (cmf::math::CVodeAdams *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeAdams, SWIG_POINTER_DISOWN | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CVodeAdams" "', argument " "1"" of type '" "cmf::math::CVodeAdams *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeAdams * >(argp1); - { - try { - delete arg1; - } catch (const std::out_of_range& e) { - SWIG_exception(SWIG_IndexError, e.what()); - } catch (const std::exception& e) { - SWIG_exception(SWIG_RuntimeError, e.what()); - } - - } - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *CVodeAdams_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *obj; - if (!SWIG_Python_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL; - SWIG_TypeNewClientData(SWIGTYPE_p_cmf__math__CVodeAdams, SWIG_NewClientData(obj)); - return SWIG_Py_Void(); -} - -SWIGINTERN PyObject *CVodeAdams_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - return SWIG_Python_InitShadowInstance(args); -} - -SWIGINTERN PyObject *_wrap_CVodeBanded_bandwidth_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeBanded *arg1 = (cmf::math::CVodeBanded *) 0 ; - int arg2 ; - void *argp1 = 0 ; - int res1 = 0 ; - int val2 ; - int ecode2 = 0 ; - PyObject *swig_obj[2] ; - - if (!SWIG_Python_UnpackTuple(args,"CVodeBanded_bandwidth_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeBanded, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeBanded_bandwidth_set" "', argument " "1"" of type '" "cmf::math::CVodeBanded *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeBanded * >(argp1); - ecode2 = SWIG_AsVal_int(swig_obj[1], &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CVodeBanded_bandwidth_set" "', argument " "2"" of type '" "int""'"); - } - arg2 = static_cast< int >(val2); - if (arg1) (arg1)->bandwidth = arg2; - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CVodeBanded_bandwidth_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeBanded *arg1 = (cmf::math::CVodeBanded *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - int result; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeBanded, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeBanded_bandwidth_get" "', argument " "1"" of type '" "cmf::math::CVodeBanded *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeBanded * >(argp1); - result = (int) ((arg1)->bandwidth); - resultobj = SWIG_From_int(static_cast< int >(result)); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_new_CVodeBanded(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - cmf::math::StateVariableOwner *arg1 = 0 ; - real arg2 = (real) 1e-9 ; - int arg3 = (int) 5 ; - void *argp1 = 0 ; - int res1 = 0 ; - double val2 ; - int ecode2 = 0 ; - int val3 ; - int ecode3 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - char * kwnames[] = { - (char *) "states",(char *) "epsilon",(char *) "w", NULL - }; - cmf::math::CVodeBanded *result = 0 ; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:new_CVodeBanded",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_cmf__math__StateVariableOwner, 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CVodeBanded" "', argument " "1"" of type '" "cmf::math::StateVariableOwner &""'"); - } - if (!argp1) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CVodeBanded" "', argument " "1"" of type '" "cmf::math::StateVariableOwner &""'"); - } - arg1 = reinterpret_cast< cmf::math::StateVariableOwner * >(argp1); - if (obj1) { - ecode2 = SWIG_AsVal_double(obj1, &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CVodeBanded" "', argument " "2"" of type '" "real""'"); - } - arg2 = static_cast< real >(val2); - } - if (obj2) { - ecode3 = SWIG_AsVal_int(obj2, &val3); - if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CVodeBanded" "', argument " "3"" of type '" "int""'"); - } - arg3 = static_cast< int >(val3); - } - { - try { - result = (cmf::math::CVodeBanded *)new cmf::math::CVodeBanded(*arg1,arg2,arg3); - } catch (const std::out_of_range& e) { - SWIG_exception(SWIG_IndexError, e.what()); - } catch (const std::exception& e) { - SWIG_exception(SWIG_RuntimeError, e.what()); - } - - } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_cmf__math__CVodeBanded, SWIG_POINTER_NEW | 0 ); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_delete_CVodeBanded(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeBanded *arg1 = (cmf::math::CVodeBanded *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeBanded, SWIG_POINTER_DISOWN | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CVodeBanded" "', argument " "1"" of type '" "cmf::math::CVodeBanded *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeBanded * >(argp1); - { - try { - delete arg1; - } catch (const std::out_of_range& e) { - SWIG_exception(SWIG_IndexError, e.what()); - } catch (const std::exception& e) { - SWIG_exception(SWIG_RuntimeError, e.what()); - } - - } - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *CVodeBanded_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *obj; - if (!SWIG_Python_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL; - SWIG_TypeNewClientData(SWIGTYPE_p_cmf__math__CVodeBanded, SWIG_NewClientData(obj)); - return SWIG_Py_Void(); -} - -SWIGINTERN PyObject *CVodeBanded_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - return SWIG_Python_InitShadowInstance(args); -} - -SWIGINTERN PyObject *_wrap_new_CVodeDiag(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - cmf::math::StateVariableOwner *arg1 = 0 ; - real arg2 = (real) 1e-9 ; - void *argp1 = 0 ; - int res1 = 0 ; - double val2 ; - int ecode2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "states",(char *) "epsilon", NULL - }; - cmf::math::CVodeDiag *result = 0 ; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_CVodeDiag",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_cmf__math__StateVariableOwner, 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CVodeDiag" "', argument " "1"" of type '" "cmf::math::StateVariableOwner &""'"); - } - if (!argp1) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CVodeDiag" "', argument " "1"" of type '" "cmf::math::StateVariableOwner &""'"); - } - arg1 = reinterpret_cast< cmf::math::StateVariableOwner * >(argp1); - if (obj1) { - ecode2 = SWIG_AsVal_double(obj1, &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CVodeDiag" "', argument " "2"" of type '" "real""'"); - } - arg2 = static_cast< real >(val2); - } - { - try { - result = (cmf::math::CVodeDiag *)new cmf::math::CVodeDiag(*arg1,arg2); - } catch (const std::out_of_range& e) { - SWIG_exception(SWIG_IndexError, e.what()); - } catch (const std::exception& e) { - SWIG_exception(SWIG_RuntimeError, e.what()); - } - - } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_cmf__math__CVodeDiag, SWIG_POINTER_NEW | 0 ); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_delete_CVodeDiag(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - cmf::math::CVodeDiag *arg1 = (cmf::math::CVodeDiag *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeDiag, SWIG_POINTER_DISOWN | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CVodeDiag" "', argument " "1"" of type '" "cmf::math::CVodeDiag *""'"); - } - arg1 = reinterpret_cast< cmf::math::CVodeDiag * >(argp1); - { - try { - delete arg1; - } catch (const std::out_of_range& e) { - SWIG_exception(SWIG_IndexError, e.what()); - } catch (const std::exception& e) { - SWIG_exception(SWIG_RuntimeError, e.what()); - } - - } - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *CVodeDiag_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *obj; - if (!SWIG_Python_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL; - SWIG_TypeNewClientData(SWIGTYPE_p_cmf__math__CVodeDiag, SWIG_NewClientData(obj)); - return SWIG_Py_Void(); -} - -SWIGINTERN PyObject *CVodeDiag_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - return SWIG_Python_InitShadowInstance(args); -} - -SWIGINTERN PyObject *_wrap_CVodeKrylov_bandwidth_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CVodeIntegrator_MaxOrder_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - cmf::math::CVodeKrylov *arg1 = (cmf::math::CVodeKrylov *) 0 ; + cmf::math::CVodeIntegrator *arg1 = (cmf::math::CVodeIntegrator *) 0 ; int arg2 ; void *argp1 = 0 ; int res1 = 0 ; @@ -87104,18 +84844,18 @@ SWIGINTERN PyObject *_wrap_CVodeKrylov_bandwidth_set(PyObject *SWIGUNUSEDPARM(se int ecode2 = 0 ; PyObject *swig_obj[2] ; - if (!SWIG_Python_UnpackTuple(args,"CVodeKrylov_bandwidth_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeKrylov, 0 | 0 ); + if (!SWIG_Python_UnpackTuple(args,"CVodeIntegrator_MaxOrder_set",2,2,swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeIntegrator, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeKrylov_bandwidth_set" "', argument " "1"" of type '" "cmf::math::CVodeKrylov *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeIntegrator_MaxOrder_set" "', argument " "1"" of type '" "cmf::math::CVodeIntegrator *""'"); } - arg1 = reinterpret_cast< cmf::math::CVodeKrylov * >(argp1); + arg1 = reinterpret_cast< cmf::math::CVodeIntegrator * >(argp1); ecode2 = SWIG_AsVal_int(swig_obj[1], &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CVodeKrylov_bandwidth_set" "', argument " "2"" of type '" "int""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CVodeIntegrator_MaxOrder_set" "', argument " "2"" of type '" "int""'"); } arg2 = static_cast< int >(val2); - if (arg1) (arg1)->bandwidth = arg2; + if (arg1) (arg1)->MaxOrder = arg2; resultobj = SWIG_Py_Void(); return resultobj; fail: @@ -87123,9 +84863,9 @@ SWIGINTERN PyObject *_wrap_CVodeKrylov_bandwidth_set(PyObject *SWIGUNUSEDPARM(se } -SWIGINTERN PyObject *_wrap_CVodeKrylov_bandwidth_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CVodeIntegrator_MaxOrder_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - cmf::math::CVodeKrylov *arg1 = (cmf::math::CVodeKrylov *) 0 ; + cmf::math::CVodeIntegrator *arg1 = (cmf::math::CVodeIntegrator *) 0 ; void *argp1 = 0 ; int res1 = 0 ; PyObject *swig_obj[1] ; @@ -87133,12 +84873,12 @@ SWIGINTERN PyObject *_wrap_CVodeKrylov_bandwidth_get(PyObject *SWIGUNUSEDPARM(se if (!args) SWIG_fail; swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeKrylov, 0 | 0 ); + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeIntegrator, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeKrylov_bandwidth_get" "', argument " "1"" of type '" "cmf::math::CVodeKrylov *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeIntegrator_MaxOrder_get" "', argument " "1"" of type '" "cmf::math::CVodeIntegrator *""'"); } - arg1 = reinterpret_cast< cmf::math::CVodeKrylov * >(argp1); - result = (int) ((arg1)->bandwidth); + arg1 = reinterpret_cast< cmf::math::CVodeIntegrator * >(argp1); + result = (int) ((arg1)->MaxOrder); resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; fail: @@ -87146,28 +84886,28 @@ SWIGINTERN PyObject *_wrap_CVodeKrylov_bandwidth_get(PyObject *SWIGUNUSEDPARM(se } -SWIGINTERN PyObject *_wrap_CVodeKrylov_preconditioner_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CVodeIntegrator_max_step_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - cmf::math::CVodeKrylov *arg1 = (cmf::math::CVodeKrylov *) 0 ; - char arg2 ; + cmf::math::CVodeIntegrator *arg1 = (cmf::math::CVodeIntegrator *) 0 ; + cmf::math::Time *arg2 = (cmf::math::Time *) 0 ; void *argp1 = 0 ; int res1 = 0 ; - char val2 ; - int ecode2 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; PyObject *swig_obj[2] ; - if (!SWIG_Python_UnpackTuple(args,"CVodeKrylov_preconditioner_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeKrylov, 0 | 0 ); + if (!SWIG_Python_UnpackTuple(args,"CVodeIntegrator_max_step_set",2,2,swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeIntegrator, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeKrylov_preconditioner_set" "', argument " "1"" of type '" "cmf::math::CVodeKrylov *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeIntegrator_max_step_set" "', argument " "1"" of type '" "cmf::math::CVodeIntegrator *""'"); } - arg1 = reinterpret_cast< cmf::math::CVodeKrylov * >(argp1); - ecode2 = SWIG_AsVal_char(swig_obj[1], &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CVodeKrylov_preconditioner_set" "', argument " "2"" of type '" "char""'"); - } - arg2 = static_cast< char >(val2); - if (arg1) (arg1)->preconditioner = arg2; + arg1 = reinterpret_cast< cmf::math::CVodeIntegrator * >(argp1); + res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_cmf__math__Time, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CVodeIntegrator_max_step_set" "', argument " "2"" of type '" "cmf::math::Time *""'"); + } + arg2 = reinterpret_cast< cmf::math::Time * >(argp2); + if (arg1) (arg1)->max_step = *arg2; resultobj = SWIG_Py_Void(); return resultobj; fail: @@ -87175,85 +84915,237 @@ SWIGINTERN PyObject *_wrap_CVodeKrylov_preconditioner_set(PyObject *SWIGUNUSEDPA } -SWIGINTERN PyObject *_wrap_CVodeKrylov_preconditioner_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CVodeIntegrator_max_step_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - cmf::math::CVodeKrylov *arg1 = (cmf::math::CVodeKrylov *) 0 ; + cmf::math::CVodeIntegrator *arg1 = (cmf::math::CVodeIntegrator *) 0 ; void *argp1 = 0 ; int res1 = 0 ; PyObject *swig_obj[1] ; - char result; + cmf::math::Time *result = 0 ; if (!args) SWIG_fail; swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeKrylov, 0 | 0 ); + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeIntegrator, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeKrylov_preconditioner_get" "', argument " "1"" of type '" "cmf::math::CVodeKrylov *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeIntegrator_max_step_get" "', argument " "1"" of type '" "cmf::math::CVodeIntegrator *""'"); } - arg1 = reinterpret_cast< cmf::math::CVodeKrylov * >(argp1); - result = (char) ((arg1)->preconditioner); - resultobj = SWIG_From_char(static_cast< char >(result)); + arg1 = reinterpret_cast< cmf::math::CVodeIntegrator * >(argp1); + result = (cmf::math::Time *)& ((arg1)->max_step); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_cmf__math__Time, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_CVodeIntegrator_get_order(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + cmf::math::CVodeIntegrator *arg1 = (cmf::math::CVodeIntegrator *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + int result; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeIntegrator, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeIntegrator_get_order" "', argument " "1"" of type '" "cmf::math::CVodeIntegrator const *""'"); + } + arg1 = reinterpret_cast< cmf::math::CVodeIntegrator * >(argp1); + { + try { + result = (int)((cmf::math::CVodeIntegrator const *)arg1)->get_order(); + } catch (const std::out_of_range& e) { + SWIG_exception(SWIG_IndexError, e.what()); + } catch (const std::exception& e) { + SWIG_exception(SWIG_RuntimeError, e.what()); + } + + } + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_CVodeIntegrator_initialize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + cmf::math::CVodeIntegrator *arg1 = (cmf::math::CVodeIntegrator *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeIntegrator, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeIntegrator_initialize" "', argument " "1"" of type '" "cmf::math::CVodeIntegrator *""'"); + } + arg1 = reinterpret_cast< cmf::math::CVodeIntegrator * >(argp1); + { + try { + (arg1)->initialize(); + } catch (const std::out_of_range& e) { + SWIG_exception(SWIG_IndexError, e.what()); + } catch (const std::exception& e) { + SWIG_exception(SWIG_RuntimeError, e.what()); + } + + } + resultobj = SWIG_Py_Void(); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_new_CVodeKrylov(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_CVodeIntegrator_release(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + cmf::math::CVodeIntegrator *arg1 = (cmf::math::CVodeIntegrator *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeIntegrator, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeIntegrator_release" "', argument " "1"" of type '" "cmf::math::CVodeIntegrator *""'"); + } + arg1 = reinterpret_cast< cmf::math::CVodeIntegrator * >(argp1); + { + try { + (arg1)->release(); + } catch (const std::out_of_range& e) { + SWIG_exception(SWIG_IndexError, e.what()); + } catch (const std::exception& e) { + SWIG_exception(SWIG_RuntimeError, e.what()); + } + + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_new_CVodeIntegrator__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { + PyObject *resultobj = 0; + real arg1 = (real) 1e-9 ; + char arg2 = (char) 'R' ; + double val1 ; + int ecode1 = 0 ; + char val2 ; + int ecode2 = 0 ; + cmf::math::CVodeIntegrator *result = 0 ; + + if ((nobjs < 0) || (nobjs > 2)) SWIG_fail; + if (swig_obj[0]) { + ecode1 = SWIG_AsVal_double(swig_obj[0], &val1); + if (!SWIG_IsOK(ecode1)) { + SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CVodeIntegrator" "', argument " "1"" of type '" "real""'"); + } + arg1 = static_cast< real >(val1); + } + if (swig_obj[1]) { + ecode2 = SWIG_AsVal_char(swig_obj[1], &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CVodeIntegrator" "', argument " "2"" of type '" "char""'"); + } + arg2 = static_cast< char >(val2); + } + { + try { + result = (cmf::math::CVodeIntegrator *)new cmf::math::CVodeIntegrator(arg1,arg2); + } catch (const std::out_of_range& e) { + SWIG_exception(SWIG_IndexError, e.what()); + } catch (const std::exception& e) { + SWIG_exception(SWIG_RuntimeError, e.what()); + } + + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_cmf__math__CVodeIntegrator, SWIG_POINTER_NEW | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_new_CVodeIntegrator__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; cmf::math::StateVariableOwner *arg1 = 0 ; real arg2 = (real) 1e-9 ; - int arg3 = (int) 5 ; - char arg4 = (char) 'L' ; + char arg3 = (char) 'R' ; void *argp1 = 0 ; int res1 = 0 ; double val2 ; int ecode2 = 0 ; - int val3 ; + char val3 ; int ecode3 = 0 ; - char val4 ; - int ecode4 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - char * kwnames[] = { - (char *) "states",(char *) "epsilon",(char *) "w",(char *) "p", NULL - }; - cmf::math::CVodeKrylov *result = 0 ; + cmf::math::CVodeIntegrator *result = 0 ; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:new_CVodeKrylov",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_cmf__math__StateVariableOwner, 0 ); + if ((nobjs < 1) || (nobjs > 3)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_cmf__math__StateVariableOwner, 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CVodeKrylov" "', argument " "1"" of type '" "cmf::math::StateVariableOwner &""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CVodeIntegrator" "', argument " "1"" of type '" "cmf::math::StateVariableOwner &""'"); } if (!argp1) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CVodeKrylov" "', argument " "1"" of type '" "cmf::math::StateVariableOwner &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CVodeIntegrator" "', argument " "1"" of type '" "cmf::math::StateVariableOwner &""'"); } arg1 = reinterpret_cast< cmf::math::StateVariableOwner * >(argp1); - if (obj1) { - ecode2 = SWIG_AsVal_double(obj1, &val2); + if (swig_obj[1]) { + ecode2 = SWIG_AsVal_double(swig_obj[1], &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CVodeKrylov" "', argument " "2"" of type '" "real""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CVodeIntegrator" "', argument " "2"" of type '" "real""'"); } arg2 = static_cast< real >(val2); } - if (obj2) { - ecode3 = SWIG_AsVal_int(obj2, &val3); + if (swig_obj[2]) { + ecode3 = SWIG_AsVal_char(swig_obj[2], &val3); if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CVodeKrylov" "', argument " "3"" of type '" "int""'"); + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CVodeIntegrator" "', argument " "3"" of type '" "char""'"); } - arg3 = static_cast< int >(val3); + arg3 = static_cast< char >(val3); } - if (obj3) { - ecode4 = SWIG_AsVal_char(obj3, &val4); - if (!SWIG_IsOK(ecode4)) { - SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_CVodeKrylov" "', argument " "4"" of type '" "char""'"); - } - arg4 = static_cast< char >(val4); + { + try { + result = (cmf::math::CVodeIntegrator *)new cmf::math::CVodeIntegrator(*arg1,arg2,arg3); + } catch (const std::out_of_range& e) { + SWIG_exception(SWIG_IndexError, e.what()); + } catch (const std::exception& e) { + SWIG_exception(SWIG_RuntimeError, e.what()); + } + + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_cmf__math__CVodeIntegrator, SWIG_POINTER_NEW | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_new_CVodeIntegrator__SWIG_2(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { + PyObject *resultobj = 0; + cmf::math::CVodeIntegrator *arg1 = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + cmf::math::CVodeIntegrator *result = 0 ; + + if ((nobjs < 1) || (nobjs > 1)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_cmf__math__CVodeIntegrator, 0 | 0); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CVodeIntegrator" "', argument " "1"" of type '" "cmf::math::CVodeIntegrator const &""'"); + } + if (!argp1) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CVodeIntegrator" "', argument " "1"" of type '" "cmf::math::CVodeIntegrator const &""'"); } + arg1 = reinterpret_cast< cmf::math::CVodeIntegrator * >(argp1); { try { - result = (cmf::math::CVodeKrylov *)new cmf::math::CVodeKrylov(*arg1,arg2,arg3,arg4); + result = (cmf::math::CVodeIntegrator *)new cmf::math::CVodeIntegrator((cmf::math::CVodeIntegrator const &)*arg1); } catch (const std::out_of_range& e) { SWIG_exception(SWIG_IndexError, e.what()); } catch (const std::exception& e) { @@ -87261,30 +85153,164 @@ SWIGINTERN PyObject *_wrap_new_CVodeKrylov(PyObject *SWIGUNUSEDPARM(self), PyObj } } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_cmf__math__CVodeKrylov, SWIG_POINTER_NEW | 0 ); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_cmf__math__CVodeIntegrator, SWIG_POINTER_NEW | 0 ); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_delete_CVodeKrylov(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_new_CVodeIntegrator(PyObject *self, PyObject *args) { + Py_ssize_t argc; + PyObject *argv[4] = { + 0 + }; + + if (!(argc = SWIG_Python_UnpackTuple(args,"new_CVodeIntegrator",0,3,argv))) SWIG_fail; + --argc; + { + unsigned long _index = 0; + SWIG_TypeRank _rank = 0; + if ((argc >= 0) && (argc <= 2)) { + SWIG_TypeRank _ranki = 0; + SWIG_TypeRank _rankm = 0; + SWIG_TypeRank _pi = 1; + int _v = 0; + if (argc > 0) { + { + { + int res = SWIG_AsVal_double(argv[0], NULL); + _v = SWIG_CheckState(res); + } + } + if (!_v) goto check_1; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + if (argc > 1) { + { + { + int res = SWIG_AsVal_char(argv[1], NULL); + _v = SWIG_CheckState(res); + } + } + if (!_v) goto check_1; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + } + } + if (!_index || (_ranki < _rank)) { + _rank = _ranki; _index = 1; + if (_rank == _rankm) goto dispatch; + } + } + check_1: + + if ((argc >= 1) && (argc <= 3)) { + SWIG_TypeRank _ranki = 0; + SWIG_TypeRank _rankm = 0; + SWIG_TypeRank _pi = 1; + int _v = 0; + { + void *vptr = 0; + int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_cmf__math__StateVariableOwner, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_2; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + if (argc > 1) { + { + { + int res = SWIG_AsVal_double(argv[1], NULL); + _v = SWIG_CheckState(res); + } + } + if (!_v) goto check_2; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + if (argc > 2) { + { + { + int res = SWIG_AsVal_char(argv[2], NULL); + _v = SWIG_CheckState(res); + } + } + if (!_v) goto check_2; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + } + } + if (!_index || (_ranki < _rank)) { + _rank = _ranki; _index = 2; + if (_rank == _rankm) goto dispatch; + } + } + check_2: + + if (argc == 1) { + SWIG_TypeRank _ranki = 0; + SWIG_TypeRank _rankm = 0; + SWIG_TypeRank _pi = 1; + int _v = 0; + { + int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_cmf__math__CVodeIntegrator, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_3; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + if (!_index || (_ranki < _rank)) { + _rank = _ranki; _index = 3; + if (_rank == _rankm) goto dispatch; + } + } + check_3: + + dispatch: + switch(_index) { + case 1: + return _wrap_new_CVodeIntegrator__SWIG_0(self, argc, argv); + case 2: + return _wrap_new_CVodeIntegrator__SWIG_1(self, argc, argv); + case 3: + return _wrap_new_CVodeIntegrator__SWIG_2(self, argc, argv); + } + } + +fail: + SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_CVodeIntegrator'.\n" + " Possible C/C++ prototypes are:\n" + " cmf::math::CVodeIntegrator::CVodeIntegrator(real,char)\n" + " cmf::math::CVodeIntegrator::CVodeIntegrator(cmf::math::StateVariableOwner &,real,char)\n" + " cmf::math::CVodeIntegrator::CVodeIntegrator(cmf::math::CVodeIntegrator const &)\n"); + return 0; +} + + +SWIGINTERN PyObject *_wrap_CVodeIntegrator_get_error(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - cmf::math::CVodeKrylov *arg1 = (cmf::math::CVodeKrylov *) 0 ; + cmf::math::CVodeIntegrator *arg1 = (cmf::math::CVodeIntegrator *) 0 ; void *argp1 = 0 ; int res1 = 0 ; PyObject *swig_obj[1] ; + cmf::math::num_array result; if (!args) SWIG_fail; swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeKrylov, SWIG_POINTER_DISOWN | 0 ); + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeIntegrator, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CVodeKrylov" "', argument " "1"" of type '" "cmf::math::CVodeKrylov *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeIntegrator_get_error" "', argument " "1"" of type '" "cmf::math::CVodeIntegrator const *""'"); } - arg1 = reinterpret_cast< cmf::math::CVodeKrylov * >(argp1); + arg1 = reinterpret_cast< cmf::math::CVodeIntegrator * >(argp1); { try { - delete arg1; + result = ((cmf::math::CVodeIntegrator const *)arg1)->get_error(); } catch (const std::out_of_range& e) { SWIG_exception(SWIG_IndexError, e.what()); } catch (const std::exception& e) { @@ -87292,58 +85318,97 @@ SWIGINTERN PyObject *_wrap_delete_CVodeKrylov(PyObject *SWIGUNUSEDPARM(self), Py } } - resultobj = SWIG_Py_Void(); + { + resultobj = as_npy_array(result); + } return resultobj; fail: return NULL; } -SWIGINTERN PyObject *CVodeKrylov_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *obj; - if (!SWIG_Python_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL; - SWIG_TypeNewClientData(SWIGTYPE_p_cmf__math__CVodeKrylov, SWIG_NewClientData(obj)); - return SWIG_Py_Void(); +SWIGINTERN PyObject *_wrap_CVodeIntegrator_get_nonlinear_iterations(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + cmf::math::CVodeIntegrator *arg1 = (cmf::math::CVodeIntegrator *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + int result; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeIntegrator, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeIntegrator_get_nonlinear_iterations" "', argument " "1"" of type '" "cmf::math::CVodeIntegrator const *""'"); + } + arg1 = reinterpret_cast< cmf::math::CVodeIntegrator * >(argp1); + { + try { + result = (int)((cmf::math::CVodeIntegrator const *)arg1)->get_nonlinear_iterations(); + } catch (const std::out_of_range& e) { + SWIG_exception(SWIG_IndexError, e.what()); + } catch (const std::exception& e) { + SWIG_exception(SWIG_RuntimeError, e.what()); + } + + } + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; } -SWIGINTERN PyObject *CVodeKrylov_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - return SWIG_Python_InitShadowInstance(args); -} -SWIGINTERN PyObject *_wrap_new_CVodeKLU(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_CVodeIntegrator_get_rhsevals(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - cmf::math::StateVariableOwner *arg1 = 0 ; - real arg2 = (real) 1e-9 ; + cmf::math::CVodeIntegrator *arg1 = (cmf::math::CVodeIntegrator *) 0 ; void *argp1 = 0 ; int res1 = 0 ; - double val2 ; - int ecode2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "states",(char *) "epsilon", NULL - }; - cmf::math::CVodeKLU *result = 0 ; + PyObject *swig_obj[1] ; + int result; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_CVodeKLU",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_cmf__math__StateVariableOwner, 0 ); + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeIntegrator, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CVodeKLU" "', argument " "1"" of type '" "cmf::math::StateVariableOwner &""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeIntegrator_get_rhsevals" "', argument " "1"" of type '" "cmf::math::CVodeIntegrator const *""'"); } - if (!argp1) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CVodeKLU" "', argument " "1"" of type '" "cmf::math::StateVariableOwner &""'"); + arg1 = reinterpret_cast< cmf::math::CVodeIntegrator * >(argp1); + { + try { + result = (int)((cmf::math::CVodeIntegrator const *)arg1)->get_rhsevals(); + } catch (const std::out_of_range& e) { + SWIG_exception(SWIG_IndexError, e.what()); + } catch (const std::exception& e) { + SWIG_exception(SWIG_RuntimeError, e.what()); + } + } - arg1 = reinterpret_cast< cmf::math::StateVariableOwner * >(argp1); - if (obj1) { - ecode2 = SWIG_AsVal_double(obj1, &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CVodeKLU" "', argument " "2"" of type '" "real""'"); - } - arg2 = static_cast< real >(val2); + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_CVodeIntegrator_copy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + cmf::math::CVodeIntegrator *arg1 = (cmf::math::CVodeIntegrator *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + cmf::math::CVodeIntegrator *result = 0 ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeIntegrator, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CVodeIntegrator_copy" "', argument " "1"" of type '" "cmf::math::CVodeIntegrator const *""'"); } + arg1 = reinterpret_cast< cmf::math::CVodeIntegrator * >(argp1); { try { - result = (cmf::math::CVodeKLU *)new cmf::math::CVodeKLU(*arg1,arg2); + result = (cmf::math::CVodeIntegrator *)((cmf::math::CVodeIntegrator const *)arg1)->copy(); } catch (const std::out_of_range& e) { SWIG_exception(SWIG_IndexError, e.what()); } catch (const std::exception& e) { @@ -87351,27 +85416,27 @@ SWIGINTERN PyObject *_wrap_new_CVodeKLU(PyObject *SWIGUNUSEDPARM(self), PyObject } } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_cmf__math__CVodeKLU, SWIG_POINTER_NEW | 0 ); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_cmf__math__CVodeIntegrator, 0 | 0 ); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_delete_CVodeKLU(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_delete_CVodeIntegrator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - cmf::math::CVodeKLU *arg1 = (cmf::math::CVodeKLU *) 0 ; + cmf::math::CVodeIntegrator *arg1 = (cmf::math::CVodeIntegrator *) 0 ; void *argp1 = 0 ; int res1 = 0 ; PyObject *swig_obj[1] ; if (!args) SWIG_fail; swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeKLU, SWIG_POINTER_DISOWN | 0 ); + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__math__CVodeIntegrator, SWIG_POINTER_DISOWN | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CVodeKLU" "', argument " "1"" of type '" "cmf::math::CVodeKLU *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CVodeIntegrator" "', argument " "1"" of type '" "cmf::math::CVodeIntegrator *""'"); } - arg1 = reinterpret_cast< cmf::math::CVodeKLU * >(argp1); + arg1 = reinterpret_cast< cmf::math::CVodeIntegrator * >(argp1); { try { delete arg1; @@ -87389,14 +85454,14 @@ SWIGINTERN PyObject *_wrap_delete_CVodeKLU(PyObject *SWIGUNUSEDPARM(self), PyObj } -SWIGINTERN PyObject *CVodeKLU_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *CVodeIntegrator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char *)"swigregister", 1, 1,&obj)) return NULL; - SWIG_TypeNewClientData(SWIGTYPE_p_cmf__math__CVodeKLU, SWIG_NewClientData(obj)); + SWIG_TypeNewClientData(SWIGTYPE_p_cmf__math__CVodeIntegrator, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } -SWIGINTERN PyObject *CVodeKLU_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *CVodeIntegrator_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { return SWIG_Python_InitShadowInstance(args); } @@ -88889,12 +86954,6 @@ static PyMethodDef SwigMethods[] = { "\n" "virtual ~StateVariable() \n" ""}, - { (char *)"StateVariable_is_connected", (PyCFunction) _wrap_StateVariable_is_connected, METH_VARARGS | METH_KEYWORDS, (char *)"\n" - "StateVariable_is_connected(StateVariable self, StateVariable other) -> bool\n" - "\n" - "virtual bool is_connected(const cmf::math::StateVariable &other) const\n" - "\n" - ""}, { (char *)"StateVariable_state_set", _wrap_StateVariable_state_set, METH_VARARGS, (char *)"StateVariable_state_set(StateVariable self, real state)"}, { (char *)"StateVariable_state_get", (PyCFunction)_wrap_StateVariable_state_get, METH_O, (char *)"StateVariable_state_get(StateVariable self) -> real"}, { (char *)"StateVariable_swigregister", StateVariable_swigregister, METH_VARARGS, NULL}, @@ -88945,33 +87004,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_StateVariableList", (PyCFunction)_wrap_new_StateVariableList, METH_NOARGS, (char *)"new_StateVariableList() -> StateVariableList"}, { (char *)"StateVariableList_swigregister", StateVariableList_swigregister, METH_VARARGS, NULL}, { (char *)"StateVariableList_swiginit", StateVariableList_swiginit, METH_VARARGS, NULL}, - { (char *)"sparse_structure_indexvalues_set", _wrap_sparse_structure_indexvalues_set, METH_VARARGS, (char *)"sparse_structure_indexvalues_set(sparse_structure self, vector_size_t indexvalues)"}, - { (char *)"sparse_structure_indexvalues_get", (PyCFunction)_wrap_sparse_structure_indexvalues_get, METH_O, (char *)"sparse_structure_indexvalues_get(sparse_structure self) -> vector_size_t"}, - { (char *)"sparse_structure_indexpointers_set", _wrap_sparse_structure_indexpointers_set, METH_VARARGS, (char *)"sparse_structure_indexpointers_set(sparse_structure self, vector_size_t indexpointers)"}, - { (char *)"sparse_structure_indexpointers_get", (PyCFunction)_wrap_sparse_structure_indexpointers_get, METH_O, (char *)"sparse_structure_indexpointers_get(sparse_structure self) -> vector_size_t"}, - { (char *)"new_sparse_structure", (PyCFunction)_wrap_new_sparse_structure, METH_NOARGS, (char *)"\n" - "new_sparse_structure() -> sparse_structure\n" - "\n" - "sparse_structure()\n" - "\n" - "Creates the sparse row compressed structure from states variable list.\n" - "\n" - ""}, - { (char *)"sparse_structure_generate", (PyCFunction) _wrap_sparse_structure_generate, METH_VARARGS | METH_KEYWORDS, (char *)"\n" - "sparse_structure_generate(sparse_structure self, StateVariableList states) -> size_t\n" - "\n" - "size_t\n" - "generate(const StateVariableList &states) \n" - ""}, - { (char *)"sparse_structure_NNZ_set", _wrap_sparse_structure_NNZ_set, METH_VARARGS, (char *)"sparse_structure_NNZ_set(sparse_structure self, size_t NNZ)"}, - { (char *)"sparse_structure_NNZ_get", (PyCFunction)_wrap_sparse_structure_NNZ_get, METH_O, (char *)"sparse_structure_NNZ_get(sparse_structure self) -> size_t"}, - { (char *)"sparse_structure_NP_set", _wrap_sparse_structure_NP_set, METH_VARARGS, (char *)"sparse_structure_NP_set(sparse_structure self, size_t NP)"}, - { (char *)"sparse_structure_NP_get", (PyCFunction)_wrap_sparse_structure_NP_get, METH_O, (char *)"sparse_structure_NP_get(sparse_structure self) -> size_t"}, - { (char *)"sparse_structure_N_set", _wrap_sparse_structure_N_set, METH_VARARGS, (char *)"sparse_structure_N_set(sparse_structure self, size_t N)"}, - { (char *)"sparse_structure_N_get", (PyCFunction)_wrap_sparse_structure_N_get, METH_O, (char *)"sparse_structure_N_get(sparse_structure self) -> size_t"}, - { (char *)"delete_sparse_structure", (PyCFunction)_wrap_delete_sparse_structure, METH_O, (char *)"delete_sparse_structure(sparse_structure self)"}, - { (char *)"sparse_structure_swigregister", sparse_structure_swigregister, METH_VARARGS, NULL}, - { (char *)"sparse_structure_swiginit", sparse_structure_swiginit, METH_VARARGS, NULL}, { (char *)"Adsorption_freesolute", (PyCFunction) _wrap_Adsorption_freesolute, METH_VARARGS | METH_KEYWORDS, (char *)"\n" "Adsorption_freesolute(Adsorption self, real xt, real V) -> real\n" "\n" @@ -89223,20 +87255,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"SoluteStorage_source_set", _wrap_SoluteStorage_source_set, METH_VARARGS, (char *)"SoluteStorage_source_set(SoluteStorage self, real source)"}, { (char *)"SoluteStorage_source_get", (PyCFunction)_wrap_SoluteStorage_source_get, METH_O, (char *)"SoluteStorage_source_get(SoluteStorage self) -> real"}, { (char *)"SoluteStorage_Solute_get", (PyCFunction)_wrap_SoluteStorage_Solute_get, METH_O, (char *)"SoluteStorage_Solute_get(SoluteStorage self) -> solute"}, - { (char *)"SoluteStorage_get_water", (PyCFunction)_wrap_SoluteStorage_get_water, METH_O, (char *)"\n" - "SoluteStorage_get_water(SoluteStorage self) -> WaterStorage\n" - "\n" - "const\n" - "WaterStorage& get_water() const\n" - "\n" - "get the waterstorge of the solute storage \n" - ""}, - { (char *)"SoluteStorage_add_connected_states", (PyCFunction) _wrap_SoluteStorage_add_connected_states, METH_VARARGS | METH_KEYWORDS, (char *)"\n" - "SoluteStorage_add_connected_states(SoluteStorage self, cmf::math::StateVariable::list & states)\n" - "\n" - "virtual void add_connected_states(cmf::math::StateVariable::list\n" - "&states) \n" - ""}, { (char *)"SoluteStorage_conc_set", _wrap_SoluteStorage_conc_set, METH_VARARGS, (char *)"SoluteStorage_conc_set(SoluteStorage self, real conc)"}, { (char *)"SoluteStorage_conc_get", (PyCFunction)_wrap_SoluteStorage_conc_get, METH_O, (char *)"SoluteStorage_conc_get(SoluteStorage self) -> real"}, { (char *)"delete_SoluteStorage", (PyCFunction)_wrap_delete_SoluteStorage, METH_O, (char *)"delete_SoluteStorage(SoluteStorage self)"}, @@ -94422,7 +92440,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"project_cells_get", (PyCFunction)_wrap_project_cells_get, METH_O, (char *)"project_cells_get(project self) -> cell_vector"}, { (char *)"project_swigregister", project_swigregister, METH_VARARGS, NULL}, { (char *)"project_swiginit", project_swiginit, METH_VARARGS, NULL}, - { (char *)"Integrator___getitem__", (PyCFunction) _wrap_Integrator___getitem__, METH_VARARGS | METH_KEYWORDS, (char *)"Integrator___getitem__(Integrator self, long position) -> cmf::math::StateVariable::ptr"}, + { (char *)"Integrator___getitem__", (PyCFunction) _wrap_Integrator___getitem__, METH_VARARGS | METH_KEYWORDS, (char *)"Integrator___getitem__(Integrator self, int position) -> cmf::math::StateVariable::ptr"}, { (char *)"Integrator_get_dxdt", (PyCFunction) _wrap_Integrator_get_dxdt, METH_VARARGS | METH_KEYWORDS, (char *)"\n" "Integrator_get_dxdt(Integrator self, Time time) -> cmf::math::num_array\n" "\n" @@ -94663,194 +92681,44 @@ static PyMethodDef SwigMethods[] = { { (char *)"delete_RKFIntegrator", (PyCFunction)_wrap_delete_RKFIntegrator, METH_O, (char *)"delete_RKFIntegrator(RKFIntegrator self)"}, { (char *)"RKFIntegrator_swigregister", RKFIntegrator_swigregister, METH_VARARGS, NULL}, { (char *)"RKFIntegrator_swiginit", RKFIntegrator_swiginit, METH_VARARGS, NULL}, - { (char *)"CVodeOptions_max_order_set", _wrap_CVodeOptions_max_order_set, METH_VARARGS, (char *)"CVodeOptions_max_order_set(CVodeOptions self, int max_order)"}, - { (char *)"CVodeOptions_max_order_get", (PyCFunction)_wrap_CVodeOptions_max_order_get, METH_O, (char *)"CVodeOptions_max_order_get(CVodeOptions self) -> int"}, - { (char *)"CVodeOptions_max_non_linear_iterations_set", _wrap_CVodeOptions_max_non_linear_iterations_set, METH_VARARGS, (char *)"CVodeOptions_max_non_linear_iterations_set(CVodeOptions self, int max_non_linear_iterations)"}, - { (char *)"CVodeOptions_max_non_linear_iterations_get", (PyCFunction)_wrap_CVodeOptions_max_non_linear_iterations_get, METH_O, (char *)"CVodeOptions_max_non_linear_iterations_get(CVodeOptions self) -> int"}, - { (char *)"CVodeOptions_max_error_test_failures_set", _wrap_CVodeOptions_max_error_test_failures_set, METH_VARARGS, (char *)"CVodeOptions_max_error_test_failures_set(CVodeOptions self, int max_error_test_failures)"}, - { (char *)"CVodeOptions_max_error_test_failures_get", (PyCFunction)_wrap_CVodeOptions_max_error_test_failures_get, METH_O, (char *)"CVodeOptions_max_error_test_failures_get(CVodeOptions self) -> int"}, - { (char *)"CVodeOptions_max_convergence_failures_set", _wrap_CVodeOptions_max_convergence_failures_set, METH_VARARGS, (char *)"CVodeOptions_max_convergence_failures_set(CVodeOptions self, int max_convergence_failures)"}, - { (char *)"CVodeOptions_max_convergence_failures_get", (PyCFunction)_wrap_CVodeOptions_max_convergence_failures_get, METH_O, (char *)"CVodeOptions_max_convergence_failures_get(CVodeOptions self) -> int"}, - { (char *)"CVodeOptions_max_num_steps_set", _wrap_CVodeOptions_max_num_steps_set, METH_VARARGS, (char *)"CVodeOptions_max_num_steps_set(CVodeOptions self, int max_num_steps)"}, - { (char *)"CVodeOptions_max_num_steps_get", (PyCFunction)_wrap_CVodeOptions_max_num_steps_get, METH_O, (char *)"CVodeOptions_max_num_steps_get(CVodeOptions self) -> int"}, - { (char *)"CVodeOptions_max_hnil_warnings_set", _wrap_CVodeOptions_max_hnil_warnings_set, METH_VARARGS, (char *)"CVodeOptions_max_hnil_warnings_set(CVodeOptions self, int max_hnil_warnings)"}, - { (char *)"CVodeOptions_max_hnil_warnings_get", (PyCFunction)_wrap_CVodeOptions_max_hnil_warnings_get, METH_O, (char *)"CVodeOptions_max_hnil_warnings_get(CVodeOptions self) -> int"}, - { (char *)"new_CVodeOptions", (PyCFunction)_wrap_new_CVodeOptions, METH_NOARGS, (char *)"\n" - "new_CVodeOptions() -> CVodeOptions\n" - "\n" - "CVodeOptions() \n" - ""}, - { (char *)"delete_CVodeOptions", (PyCFunction)_wrap_delete_CVodeOptions, METH_O, (char *)"delete_CVodeOptions(CVodeOptions self)"}, - { (char *)"CVodeOptions_swigregister", CVodeOptions_swigregister, METH_VARARGS, NULL}, - { (char *)"CVodeOptions_swiginit", CVodeOptions_swiginit, METH_VARARGS, NULL}, - { (char *)"CVodeInfo_size_set", _wrap_CVodeInfo_size_set, METH_VARARGS, (char *)"CVodeInfo_size_set(CVodeInfo self, long size)"}, - { (char *)"CVodeInfo_size_get", (PyCFunction)_wrap_CVodeInfo_size_get, METH_O, (char *)"CVodeInfo_size_get(CVodeInfo self) -> long"}, - { (char *)"CVodeInfo_workspace_real_set", _wrap_CVodeInfo_workspace_real_set, METH_VARARGS, (char *)"CVodeInfo_workspace_real_set(CVodeInfo self, long workspace_real)"}, - { (char *)"CVodeInfo_workspace_real_get", (PyCFunction)_wrap_CVodeInfo_workspace_real_get, METH_O, (char *)"CVodeInfo_workspace_real_get(CVodeInfo self) -> long"}, - { (char *)"CVodeInfo_workspace_int_set", _wrap_CVodeInfo_workspace_int_set, METH_VARARGS, (char *)"CVodeInfo_workspace_int_set(CVodeInfo self, long workspace_int)"}, - { (char *)"CVodeInfo_workspace_int_get", (PyCFunction)_wrap_CVodeInfo_workspace_int_get, METH_O, (char *)"CVodeInfo_workspace_int_get(CVodeInfo self) -> long"}, - { (char *)"CVodeInfo_workspace_byte_set", _wrap_CVodeInfo_workspace_byte_set, METH_VARARGS, (char *)"CVodeInfo_workspace_byte_set(CVodeInfo self, long workspace_byte)"}, - { (char *)"CVodeInfo_workspace_byte_get", (PyCFunction)_wrap_CVodeInfo_workspace_byte_get, METH_O, (char *)"CVodeInfo_workspace_byte_get(CVodeInfo self) -> long"}, - { (char *)"CVodeInfo_steps_set", _wrap_CVodeInfo_steps_set, METH_VARARGS, (char *)"CVodeInfo_steps_set(CVodeInfo self, long steps)"}, - { (char *)"CVodeInfo_steps_get", (PyCFunction)_wrap_CVodeInfo_steps_get, METH_O, (char *)"CVodeInfo_steps_get(CVodeInfo self) -> long"}, - { (char *)"CVodeInfo_current_order_set", _wrap_CVodeInfo_current_order_set, METH_VARARGS, (char *)"CVodeInfo_current_order_set(CVodeInfo self, long current_order)"}, - { (char *)"CVodeInfo_current_order_get", (PyCFunction)_wrap_CVodeInfo_current_order_get, METH_O, (char *)"CVodeInfo_current_order_get(CVodeInfo self) -> long"}, - { (char *)"CVodeInfo_rhs_evaluations_set", _wrap_CVodeInfo_rhs_evaluations_set, METH_VARARGS, (char *)"CVodeInfo_rhs_evaluations_set(CVodeInfo self, long rhs_evaluations)"}, - { (char *)"CVodeInfo_rhs_evaluations_get", (PyCFunction)_wrap_CVodeInfo_rhs_evaluations_get, METH_O, (char *)"CVodeInfo_rhs_evaluations_get(CVodeInfo self) -> long"}, - { (char *)"CVodeInfo_linear_solver_setups_set", _wrap_CVodeInfo_linear_solver_setups_set, METH_VARARGS, (char *)"CVodeInfo_linear_solver_setups_set(CVodeInfo self, long linear_solver_setups)"}, - { (char *)"CVodeInfo_linear_solver_setups_get", (PyCFunction)_wrap_CVodeInfo_linear_solver_setups_get, METH_O, (char *)"CVodeInfo_linear_solver_setups_get(CVodeInfo self) -> long"}, - { (char *)"CVodeInfo_error_test_fails_set", _wrap_CVodeInfo_error_test_fails_set, METH_VARARGS, (char *)"CVodeInfo_error_test_fails_set(CVodeInfo self, long error_test_fails)"}, - { (char *)"CVodeInfo_error_test_fails_get", (PyCFunction)_wrap_CVodeInfo_error_test_fails_get, METH_O, (char *)"CVodeInfo_error_test_fails_get(CVodeInfo self) -> long"}, - { (char *)"CVodeInfo_order_reductions_set", _wrap_CVodeInfo_order_reductions_set, METH_VARARGS, (char *)"CVodeInfo_order_reductions_set(CVodeInfo self, long order_reductions)"}, - { (char *)"CVodeInfo_order_reductions_get", (PyCFunction)_wrap_CVodeInfo_order_reductions_get, METH_O, (char *)"CVodeInfo_order_reductions_get(CVodeInfo self) -> long"}, - { (char *)"CVodeInfo_nonlinear_solver_iterations_set", _wrap_CVodeInfo_nonlinear_solver_iterations_set, METH_VARARGS, (char *)"CVodeInfo_nonlinear_solver_iterations_set(CVodeInfo self, long nonlinear_solver_iterations)"}, - { (char *)"CVodeInfo_nonlinear_solver_iterations_get", (PyCFunction)_wrap_CVodeInfo_nonlinear_solver_iterations_get, METH_O, (char *)"CVodeInfo_nonlinear_solver_iterations_get(CVodeInfo self) -> long"}, - { (char *)"CVodeInfo_nonlinear_solver_convergence_failures_set", _wrap_CVodeInfo_nonlinear_solver_convergence_failures_set, METH_VARARGS, (char *)"CVodeInfo_nonlinear_solver_convergence_failures_set(CVodeInfo self, long nonlinear_solver_convergence_failures)"}, - { (char *)"CVodeInfo_nonlinear_solver_convergence_failures_get", (PyCFunction)_wrap_CVodeInfo_nonlinear_solver_convergence_failures_get, METH_O, (char *)"CVodeInfo_nonlinear_solver_convergence_failures_get(CVodeInfo self) -> long"}, - { (char *)"CVodeInfo_dxdt_method_calls_set", _wrap_CVodeInfo_dxdt_method_calls_set, METH_VARARGS, (char *)"CVodeInfo_dxdt_method_calls_set(CVodeInfo self, long dxdt_method_calls)"}, - { (char *)"CVodeInfo_dxdt_method_calls_get", (PyCFunction)_wrap_CVodeInfo_dxdt_method_calls_get, METH_O, (char *)"CVodeInfo_dxdt_method_calls_get(CVodeInfo self) -> long"}, - { (char *)"CVodeInfo_sundials_version_set", _wrap_CVodeInfo_sundials_version_set, METH_VARARGS, (char *)"CVodeInfo_sundials_version_set(CVodeInfo self, std::string const & sundials_version)"}, - { (char *)"CVodeInfo_sundials_version_get", (PyCFunction)_wrap_CVodeInfo_sundials_version_get, METH_O, (char *)"CVodeInfo_sundials_version_get(CVodeInfo self) -> std::string const &"}, - { (char *)"CVodeInfo_to_string", (PyCFunction)_wrap_CVodeInfo_to_string, METH_O, (char *)"\n" - "CVodeInfo_to_string(CVodeInfo self) -> std::string\n" - "\n" - "std::string\n" - "to_string() const \n" - ""}, - { (char *)"new_CVodeInfo", (PyCFunction)_wrap_new_CVodeInfo, METH_NOARGS, (char *)"new_CVodeInfo() -> CVodeInfo"}, - { (char *)"delete_CVodeInfo", (PyCFunction)_wrap_delete_CVodeInfo, METH_O, (char *)"delete_CVodeInfo(CVodeInfo self)"}, - { (char *)"CVodeInfo_swigregister", CVodeInfo_swigregister, METH_VARARGS, NULL}, - { (char *)"CVodeInfo_swiginit", CVodeInfo_swiginit, METH_VARARGS, NULL}, - { (char *)"CVodeBase_options_set", _wrap_CVodeBase_options_set, METH_VARARGS, (char *)"CVodeBase_options_set(CVodeBase self, CVodeOptions options)"}, - { (char *)"CVodeBase_options_get", (PyCFunction)_wrap_CVodeBase_options_get, METH_O, (char *)"CVodeBase_options_get(CVodeBase self) -> CVodeOptions"}, - { (char *)"CVodeBase_initialize", (PyCFunction)_wrap_CVodeBase_initialize, METH_O, (char *)"\n" - "CVodeBase_initialize(CVodeBase self) -> int\n" - "\n" - "int\n" - "initialize()\n" - "\n" - "Initialize the internal memory.\n" - "\n" - "Automatically called, when one starts to integrate \n" - ""}, - { (char *)"CVodeBase_set_error_msg", (PyCFunction) _wrap_CVodeBase_set_error_msg, METH_VARARGS | METH_KEYWORDS, (char *)"\n" - "CVodeBase_set_error_msg(CVodeBase self, std::string error)\n" - "\n" - "void\n" - "set_error_msg(std::string error)\n" - "\n" - "Sets an error message. \n" - ""}, - { (char *)"CVodeBase_copy", (PyCFunction)_wrap_CVodeBase_copy, METH_O, (char *)"\n" - "CVodeBase_copy(CVodeBase self) -> CVodeBase\n" - "\n" - "CVodeBase* copy()\n" - "const\n" - "\n" - "Returns a copy of the solver. \n" - ""}, - { (char *)"CVodeBase_error_msg_set", _wrap_CVodeBase_error_msg_set, METH_VARARGS, (char *)"CVodeBase_error_msg_set(CVodeBase self, std::string const & error_msg)"}, - { (char *)"CVodeBase_error_msg_get", (PyCFunction)_wrap_CVodeBase_error_msg_get, METH_O, (char *)"CVodeBase_error_msg_get(CVodeBase self) -> std::string const &"}, - { (char *)"CVodeBase_get_info", (PyCFunction)_wrap_CVodeBase_get_info, METH_O, (char *)"\n" - "CVodeBase_get_info(CVodeBase self) -> CVodeInfo\n" - "\n" - "CVodeInfo\n" - "get_info() const\n" - "\n" - "Returns the current solver statistics. \n" - ""}, - { (char *)"CVodeBase_to_string", (PyCFunction)_wrap_CVodeBase_to_string, METH_O, (char *)"\n" - "CVodeBase_to_string(CVodeBase self) -> std::string\n" + { (char *)"CVodeIntegrator_preconditioner_set", _wrap_CVodeIntegrator_preconditioner_set, METH_VARARGS, (char *)"CVodeIntegrator_preconditioner_set(CVodeIntegrator self, char preconditioner)"}, + { (char *)"CVodeIntegrator_preconditioner_get", (PyCFunction)_wrap_CVodeIntegrator_preconditioner_get, METH_O, (char *)"CVodeIntegrator_preconditioner_get(CVodeIntegrator self) -> char"}, + { (char *)"CVodeIntegrator_MaxNonLinearIterations_set", _wrap_CVodeIntegrator_MaxNonLinearIterations_set, METH_VARARGS, (char *)"CVodeIntegrator_MaxNonLinearIterations_set(CVodeIntegrator self, int MaxNonLinearIterations)"}, + { (char *)"CVodeIntegrator_MaxNonLinearIterations_get", (PyCFunction)_wrap_CVodeIntegrator_MaxNonLinearIterations_get, METH_O, (char *)"CVodeIntegrator_MaxNonLinearIterations_get(CVodeIntegrator self) -> int"}, + { (char *)"CVodeIntegrator_MaxConvergenceFailures_set", _wrap_CVodeIntegrator_MaxConvergenceFailures_set, METH_VARARGS, (char *)"CVodeIntegrator_MaxConvergenceFailures_set(CVodeIntegrator self, int MaxConvergenceFailures)"}, + { (char *)"CVodeIntegrator_MaxConvergenceFailures_get", (PyCFunction)_wrap_CVodeIntegrator_MaxConvergenceFailures_get, METH_O, (char *)"CVodeIntegrator_MaxConvergenceFailures_get(CVodeIntegrator self) -> int"}, + { (char *)"CVodeIntegrator_MaxErrorTestFailures_set", _wrap_CVodeIntegrator_MaxErrorTestFailures_set, METH_VARARGS, (char *)"CVodeIntegrator_MaxErrorTestFailures_set(CVodeIntegrator self, int MaxErrorTestFailures)"}, + { (char *)"CVodeIntegrator_MaxErrorTestFailures_get", (PyCFunction)_wrap_CVodeIntegrator_MaxErrorTestFailures_get, METH_O, (char *)"CVodeIntegrator_MaxErrorTestFailures_get(CVodeIntegrator self) -> int"}, + { (char *)"CVodeIntegrator_maxl_set", _wrap_CVodeIntegrator_maxl_set, METH_VARARGS, (char *)"CVodeIntegrator_maxl_set(CVodeIntegrator self, int maxl)"}, + { (char *)"CVodeIntegrator_maxl_get", (PyCFunction)_wrap_CVodeIntegrator_maxl_get, METH_O, (char *)"CVodeIntegrator_maxl_get(CVodeIntegrator self) -> int"}, + { (char *)"CVodeIntegrator_LinearSolver_set", _wrap_CVodeIntegrator_LinearSolver_set, METH_VARARGS, (char *)"CVodeIntegrator_LinearSolver_set(CVodeIntegrator self, int LinearSolver)"}, + { (char *)"CVodeIntegrator_LinearSolver_get", (PyCFunction)_wrap_CVodeIntegrator_LinearSolver_get, METH_O, (char *)"CVodeIntegrator_LinearSolver_get(CVodeIntegrator self) -> int"}, + { (char *)"CVodeIntegrator_MaxOrder_set", _wrap_CVodeIntegrator_MaxOrder_set, METH_VARARGS, (char *)"CVodeIntegrator_MaxOrder_set(CVodeIntegrator self, int MaxOrder)"}, + { (char *)"CVodeIntegrator_MaxOrder_get", (PyCFunction)_wrap_CVodeIntegrator_MaxOrder_get, METH_O, (char *)"CVodeIntegrator_MaxOrder_get(CVodeIntegrator self) -> int"}, + { (char *)"CVodeIntegrator_max_step_set", _wrap_CVodeIntegrator_max_step_set, METH_VARARGS, (char *)"CVodeIntegrator_max_step_set(CVodeIntegrator self, Time max_step)"}, + { (char *)"CVodeIntegrator_max_step_get", (PyCFunction)_wrap_CVodeIntegrator_max_step_get, METH_O, (char *)"CVodeIntegrator_max_step_get(CVodeIntegrator self) -> Time"}, + { (char *)"CVodeIntegrator_get_order", (PyCFunction)_wrap_CVodeIntegrator_get_order, METH_O, (char *)"CVodeIntegrator_get_order(CVodeIntegrator self) -> int"}, + { (char *)"CVodeIntegrator_initialize", (PyCFunction)_wrap_CVodeIntegrator_initialize, METH_O, (char *)"CVodeIntegrator_initialize(CVodeIntegrator self)"}, + { (char *)"CVodeIntegrator_release", (PyCFunction)_wrap_CVodeIntegrator_release, METH_O, (char *)"CVodeIntegrator_release(CVodeIntegrator self)"}, + { (char *)"new_CVodeIntegrator", _wrap_new_CVodeIntegrator, METH_VARARGS, (char *)"\n" + "CVodeIntegrator(real epsilon=1e-9, char _preconditioner)\n" + "CVodeIntegrator(StateVariableOwner states, real epsilon=1e-9, char _preconditioner)\n" + "new_CVodeIntegrator(CVodeIntegrator templ) -> CVodeIntegrator\n" + ""}, + { (char *)"CVodeIntegrator_get_error", (PyCFunction)_wrap_CVodeIntegrator_get_error, METH_O, (char *)"CVodeIntegrator_get_error(CVodeIntegrator self) -> cmf::math::num_array"}, + { (char *)"CVodeIntegrator_get_nonlinear_iterations", (PyCFunction)_wrap_CVodeIntegrator_get_nonlinear_iterations, METH_O, (char *)"CVodeIntegrator_get_nonlinear_iterations(CVodeIntegrator self) -> int"}, + { (char *)"CVodeIntegrator_get_rhsevals", (PyCFunction)_wrap_CVodeIntegrator_get_rhsevals, METH_O, (char *)"CVodeIntegrator_get_rhsevals(CVodeIntegrator self) -> int"}, + { (char *)"CVodeIntegrator_copy", (PyCFunction)_wrap_CVodeIntegrator_copy, METH_O, (char *)"\n" + "CVodeIntegrator_copy(CVodeIntegrator self) -> CVodeIntegrator\n" "\n" "virtual\n" - "std::string to_string() const =0\n" - "\n" - "Returns a string representation of the solver. \n" - ""}, - { (char *)"CVodeBase_get_error", (PyCFunction)_wrap_CVodeBase_get_error, METH_O, (char *)"\n" - "CVodeBase_get_error(CVodeBase self) -> cmf::math::num_array\n" - "\n" - "cmf::math::num_array get_error() const\n" - "\n" - "Error vector of the integrator. \n" - ""}, - { (char *)"CVodeBase__get_jacobian", (PyCFunction)_wrap_CVodeBase__get_jacobian, METH_O, (char *)"\n" - "CVodeBase__get_jacobian(CVodeBase self) -> cmf::math::num_array\n" - "\n" - "virtual\n" - "cmf::math::num_array _get_jacobian() const\n" - "\n" - "Returns a continuous 1D array representing the Jacobian columns\n" - "concatenated.\n" - "\n" - "In Python, get_jacobian returns the Jacobian as a 2D array \n" - ""}, - { (char *)"delete_CVodeBase", (PyCFunction)_wrap_delete_CVodeBase, METH_O, (char *)"\n" - "delete_CVodeBase(CVodeBase self)\n" - "\n" - "~CVodeBase()\n" - "\n" - ""}, - { (char *)"CVodeBase_swigregister", CVodeBase_swigregister, METH_VARARGS, NULL}, - { (char *)"new_CVodeDense", (PyCFunction) _wrap_new_CVodeDense, METH_VARARGS | METH_KEYWORDS, (char *)"\n" - "new_CVodeDense(StateVariableOwner states, real epsilon=1e-9) -> CVodeDense\n" - "\n" - "CVodeDense(cmf::math::StateVariableOwner &states, real epsilon=1e-9)\n" - "\n" - "Creates a new implicit dense CVode solver. \n" - ""}, - { (char *)"delete_CVodeDense", (PyCFunction)_wrap_delete_CVodeDense, METH_O, (char *)"delete_CVodeDense(CVodeDense self)"}, - { (char *)"CVodeDense_swigregister", CVodeDense_swigregister, METH_VARARGS, NULL}, - { (char *)"CVodeDense_swiginit", CVodeDense_swiginit, METH_VARARGS, NULL}, - { (char *)"new_CVodeAdams", (PyCFunction) _wrap_new_CVodeAdams, METH_VARARGS | METH_KEYWORDS, (char *)"\n" - "new_CVodeAdams(StateVariableOwner states, real epsilon=1e-9) -> CVodeAdams\n" - "\n" - "CVodeAdams(cmf::math::StateVariableOwner &states, real epsilon=1e-9)\n" - "\n" - ""}, - { (char *)"delete_CVodeAdams", (PyCFunction)_wrap_delete_CVodeAdams, METH_O, (char *)"delete_CVodeAdams(CVodeAdams self)"}, - { (char *)"CVodeAdams_swigregister", CVodeAdams_swigregister, METH_VARARGS, NULL}, - { (char *)"CVodeAdams_swiginit", CVodeAdams_swiginit, METH_VARARGS, NULL}, - { (char *)"CVodeBanded_bandwidth_set", _wrap_CVodeBanded_bandwidth_set, METH_VARARGS, (char *)"CVodeBanded_bandwidth_set(CVodeBanded self, int bandwidth)"}, - { (char *)"CVodeBanded_bandwidth_get", (PyCFunction)_wrap_CVodeBanded_bandwidth_get, METH_O, (char *)"CVodeBanded_bandwidth_get(CVodeBanded self) -> int"}, - { (char *)"new_CVodeBanded", (PyCFunction) _wrap_new_CVodeBanded, METH_VARARGS | METH_KEYWORDS, (char *)"\n" - "new_CVodeBanded(StateVariableOwner states, real epsilon=1e-9, int w=5) -> CVodeBanded\n" - "\n" - "CVodeBanded(cmf::math::StateVariableOwner &states, real epsilon=1e-9,\n" - "int w=5) \n" - ""}, - { (char *)"delete_CVodeBanded", (PyCFunction)_wrap_delete_CVodeBanded, METH_O, (char *)"delete_CVodeBanded(CVodeBanded self)"}, - { (char *)"CVodeBanded_swigregister", CVodeBanded_swigregister, METH_VARARGS, NULL}, - { (char *)"CVodeBanded_swiginit", CVodeBanded_swiginit, METH_VARARGS, NULL}, - { (char *)"new_CVodeDiag", (PyCFunction) _wrap_new_CVodeDiag, METH_VARARGS | METH_KEYWORDS, (char *)"\n" - "new_CVodeDiag(StateVariableOwner states, real epsilon=1e-9) -> CVodeDiag\n" - "\n" - "CVodeDiag(cmf::math::StateVariableOwner &states, real epsilon=1e-9) \n" - ""}, - { (char *)"delete_CVodeDiag", (PyCFunction)_wrap_delete_CVodeDiag, METH_O, (char *)"delete_CVodeDiag(CVodeDiag self)"}, - { (char *)"CVodeDiag_swigregister", CVodeDiag_swigregister, METH_VARARGS, NULL}, - { (char *)"CVodeDiag_swiginit", CVodeDiag_swiginit, METH_VARARGS, NULL}, - { (char *)"CVodeKrylov_bandwidth_set", _wrap_CVodeKrylov_bandwidth_set, METH_VARARGS, (char *)"CVodeKrylov_bandwidth_set(CVodeKrylov self, int bandwidth)"}, - { (char *)"CVodeKrylov_bandwidth_get", (PyCFunction)_wrap_CVodeKrylov_bandwidth_get, METH_O, (char *)"CVodeKrylov_bandwidth_get(CVodeKrylov self) -> int"}, - { (char *)"CVodeKrylov_preconditioner_set", _wrap_CVodeKrylov_preconditioner_set, METH_VARARGS, (char *)"CVodeKrylov_preconditioner_set(CVodeKrylov self, char preconditioner)"}, - { (char *)"CVodeKrylov_preconditioner_get", (PyCFunction)_wrap_CVodeKrylov_preconditioner_get, METH_O, (char *)"CVodeKrylov_preconditioner_get(CVodeKrylov self) -> char"}, - { (char *)"new_CVodeKrylov", (PyCFunction) _wrap_new_CVodeKrylov, METH_VARARGS | METH_KEYWORDS, (char *)"\n" - "new_CVodeKrylov(StateVariableOwner states, real epsilon=1e-9, int w=5, char p) -> CVodeKrylov\n" - "\n" - "CVodeKrylov(cmf::math::StateVariableOwner &states, real epsilon=1e-9,\n" - "int w=5, char p='L') \n" - ""}, - { (char *)"delete_CVodeKrylov", (PyCFunction)_wrap_delete_CVodeKrylov, METH_O, (char *)"delete_CVodeKrylov(CVodeKrylov self)"}, - { (char *)"CVodeKrylov_swigregister", CVodeKrylov_swigregister, METH_VARARGS, NULL}, - { (char *)"CVodeKrylov_swiginit", CVodeKrylov_swiginit, METH_VARARGS, NULL}, - { (char *)"new_CVodeKLU", (PyCFunction) _wrap_new_CVodeKLU, METH_VARARGS | METH_KEYWORDS, (char *)"\n" - "new_CVodeKLU(StateVariableOwner states, real epsilon=1e-9) -> CVodeKLU\n" + "Integrator* copy() const =0\n" "\n" - "CVodeKLU(cmf::math::StateVariableOwner &states, real epsilon=1e-9) \n" + "Polymorphic copy constructor. \n" ""}, - { (char *)"delete_CVodeKLU", (PyCFunction)_wrap_delete_CVodeKLU, METH_O, (char *)"delete_CVodeKLU(CVodeKLU self)"}, - { (char *)"CVodeKLU_swigregister", CVodeKLU_swigregister, METH_VARARGS, NULL}, - { (char *)"CVodeKLU_swiginit", CVodeKLU_swiginit, METH_VARARGS, NULL}, + { (char *)"delete_CVodeIntegrator", (PyCFunction)_wrap_delete_CVodeIntegrator, METH_O, (char *)"delete_CVodeIntegrator(CVodeIntegrator self)"}, + { (char *)"CVodeIntegrator_swigregister", CVodeIntegrator_swigregister, METH_VARARGS, NULL}, + { (char *)"CVodeIntegrator_swiginit", CVodeIntegrator_swiginit, METH_VARARGS, NULL}, { (char *)"MultiIntegrator_copy", (PyCFunction)_wrap_MultiIntegrator_copy, METH_O, (char *)"\n" "MultiIntegrator_copy(MultiIntegrator self) -> MultiIntegrator\n" "\n" @@ -95207,24 +93075,6 @@ static void *_p_std__shared_ptrT_cmf__upslope__ET__ShuttleworthWallace_tTo_p_std *newmemory = SWIG_CAST_NEW_MEMORY; return (void *) new std::shared_ptr< cmf::atmosphere::aerodynamic_resistance >(*(std::shared_ptr< cmf::upslope::ET::ShuttleworthWallace > *)x); } -static void *_p_cmf__math__CVodeKLUTo_p_cmf__math__CVodeBase(void *x, int *SWIGUNUSEDPARM(newmemory)) { - return (void *)((cmf::math::CVodeBase *) ((cmf::math::CVodeKLU *) x)); -} -static void *_p_cmf__math__CVodeDenseTo_p_cmf__math__CVodeBase(void *x, int *SWIGUNUSEDPARM(newmemory)) { - return (void *)((cmf::math::CVodeBase *) ((cmf::math::CVodeDense *) x)); -} -static void *_p_cmf__math__CVodeAdamsTo_p_cmf__math__CVodeBase(void *x, int *SWIGUNUSEDPARM(newmemory)) { - return (void *)((cmf::math::CVodeBase *) ((cmf::math::CVodeAdams *) x)); -} -static void *_p_cmf__math__CVodeBandedTo_p_cmf__math__CVodeBase(void *x, int *SWIGUNUSEDPARM(newmemory)) { - return (void *)((cmf::math::CVodeBase *) ((cmf::math::CVodeBanded *) x)); -} -static void *_p_cmf__math__CVodeDiagTo_p_cmf__math__CVodeBase(void *x, int *SWIGUNUSEDPARM(newmemory)) { - return (void *)((cmf::math::CVodeBase *) ((cmf::math::CVodeDiag *) x)); -} -static void *_p_cmf__math__CVodeKrylovTo_p_cmf__math__CVodeBase(void *x, int *SWIGUNUSEDPARM(newmemory)) { - return (void *)((cmf::math::CVodeBase *) ((cmf::math::CVodeKrylov *) x)); -} static void *_p_cmf__river__PipeReachTo_p_cmf__river__IChannel(void *x, int *SWIGUNUSEDPARM(newmemory)) { return (void *)((cmf::river::IChannel *) ((cmf::river::PipeReach *) x)); } @@ -95569,47 +93419,29 @@ static void *_p_cmf__upslope__aquiferTo_p_cmf__math__StateVariableOwner(void *x, static void *_p_cmf__projectTo_p_cmf__math__StateVariableOwner(void *x, int *SWIGUNUSEDPARM(newmemory)) { return (void *)((cmf::math::StateVariableOwner *) ((cmf::project *) x)); } +static void *_p_cmf__math__ExplicitEuler_fixedTo_p_cmf__math__Integrator(void *x, int *SWIGUNUSEDPARM(newmemory)) { + return (void *)((cmf::math::Integrator *) ((cmf::math::ExplicitEuler_fixed *) x)); +} static void *_p_cmf__math__BDF2To_p_cmf__math__Integrator(void *x, int *SWIGUNUSEDPARM(newmemory)) { return (void *)((cmf::math::Integrator *) ((cmf::math::BDF2 *) x)); } -static void *_p_cmf__math__CVodeBandedTo_p_cmf__math__Integrator(void *x, int *SWIGUNUSEDPARM(newmemory)) { - return (void *)((cmf::math::Integrator *) (cmf::math::CVodeBase *) ((cmf::math::CVodeBanded *) x)); -} -static void *_p_cmf__math__CVodeDenseTo_p_cmf__math__Integrator(void *x, int *SWIGUNUSEDPARM(newmemory)) { - return (void *)((cmf::math::Integrator *) (cmf::math::CVodeBase *) ((cmf::math::CVodeDense *) x)); -} -static void *_p_cmf__math__CVodeAdamsTo_p_cmf__math__Integrator(void *x, int *SWIGUNUSEDPARM(newmemory)) { - return (void *)((cmf::math::Integrator *) (cmf::math::CVodeBase *) ((cmf::math::CVodeAdams *) x)); -} -static void *_p_cmf__math__SoluteWaterIntegratorTo_p_cmf__math__Integrator(void *x, int *SWIGUNUSEDPARM(newmemory)) { - return (void *)((cmf::math::Integrator *) ((cmf::math::SoluteWaterIntegrator *) x)); -} -static void *_p_cmf__math__MultiIntegratorTo_p_cmf__math__Integrator(void *x, int *SWIGUNUSEDPARM(newmemory)) { - return (void *)((cmf::math::Integrator *) ((cmf::math::MultiIntegrator *) x)); -} -static void *_p_cmf__math__RKFIntegratorTo_p_cmf__math__Integrator(void *x, int *SWIGUNUSEDPARM(newmemory)) { - return (void *)((cmf::math::Integrator *) ((cmf::math::RKFIntegrator *) x)); -} -static void *_p_cmf__math__HeunIntegratorTo_p_cmf__math__Integrator(void *x, int *SWIGUNUSEDPARM(newmemory)) { - return (void *)((cmf::math::Integrator *) ((cmf::math::HeunIntegrator *) x)); -} static void *_p_cmf__math__ImplicitEulerTo_p_cmf__math__Integrator(void *x, int *SWIGUNUSEDPARM(newmemory)) { return (void *)((cmf::math::Integrator *) ((cmf::math::ImplicitEuler *) x)); } -static void *_p_cmf__math__ExplicitEuler_fixedTo_p_cmf__math__Integrator(void *x, int *SWIGUNUSEDPARM(newmemory)) { - return (void *)((cmf::math::Integrator *) ((cmf::math::ExplicitEuler_fixed *) x)); +static void *_p_cmf__math__HeunIntegratorTo_p_cmf__math__Integrator(void *x, int *SWIGUNUSEDPARM(newmemory)) { + return (void *)((cmf::math::Integrator *) ((cmf::math::HeunIntegrator *) x)); } -static void *_p_cmf__math__CVodeKrylovTo_p_cmf__math__Integrator(void *x, int *SWIGUNUSEDPARM(newmemory)) { - return (void *)((cmf::math::Integrator *) (cmf::math::CVodeBase *) ((cmf::math::CVodeKrylov *) x)); +static void *_p_cmf__math__RKFIntegratorTo_p_cmf__math__Integrator(void *x, int *SWIGUNUSEDPARM(newmemory)) { + return (void *)((cmf::math::Integrator *) ((cmf::math::RKFIntegrator *) x)); } -static void *_p_cmf__math__CVodeBaseTo_p_cmf__math__Integrator(void *x, int *SWIGUNUSEDPARM(newmemory)) { - return (void *)((cmf::math::Integrator *) ((cmf::math::CVodeBase *) x)); +static void *_p_cmf__math__CVodeIntegratorTo_p_cmf__math__Integrator(void *x, int *SWIGUNUSEDPARM(newmemory)) { + return (void *)((cmf::math::Integrator *) ((cmf::math::CVodeIntegrator *) x)); } -static void *_p_cmf__math__CVodeKLUTo_p_cmf__math__Integrator(void *x, int *SWIGUNUSEDPARM(newmemory)) { - return (void *)((cmf::math::Integrator *) (cmf::math::CVodeBase *) ((cmf::math::CVodeKLU *) x)); +static void *_p_cmf__math__MultiIntegratorTo_p_cmf__math__Integrator(void *x, int *SWIGUNUSEDPARM(newmemory)) { + return (void *)((cmf::math::Integrator *) ((cmf::math::MultiIntegrator *) x)); } -static void *_p_cmf__math__CVodeDiagTo_p_cmf__math__Integrator(void *x, int *SWIGUNUSEDPARM(newmemory)) { - return (void *)((cmf::math::Integrator *) (cmf::math::CVodeBase *) ((cmf::math::CVodeDiag *) x)); +static void *_p_cmf__math__SoluteWaterIntegratorTo_p_cmf__math__Integrator(void *x, int *SWIGUNUSEDPARM(newmemory)) { + return (void *)((cmf::math::Integrator *) ((cmf::math::SoluteWaterIntegrator *) x)); } static void *_p_cmf__water__NullAdsorptionTo_p_cmf__water__Adsorption(void *x, int *SWIGUNUSEDPARM(newmemory)) { return (void *)((cmf::water::Adsorption *) ((cmf::water::NullAdsorption *) x)); @@ -95644,15 +93476,7 @@ static swig_type_info _swigt__p_cmf__atmosphere__log_wind_profile = {"_p_cmf__at static swig_type_info _swigt__p_cmf__geometry__point = {"_p_cmf__geometry__point", "cmf::geometry::point *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_cmf__geometry__point_vector = {"_p_cmf__geometry__point_vector", "cmf::geometry::point_vector *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_cmf__math__BDF2 = {"_p_cmf__math__BDF2", "cmf::math::BDF2 *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_cmf__math__CVodeAdams = {"_p_cmf__math__CVodeAdams", "cmf::math::CVodeAdams *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_cmf__math__CVodeBanded = {"_p_cmf__math__CVodeBanded", "cmf::math::CVodeBanded *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_cmf__math__CVodeBase = {"_p_cmf__math__CVodeBase", "cmf::math::CVodeBase *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_cmf__math__CVodeDense = {"_p_cmf__math__CVodeDense", "cmf::math::CVodeDense *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_cmf__math__CVodeDiag = {"_p_cmf__math__CVodeDiag", "cmf::math::CVodeDiag *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_cmf__math__CVodeInfo = {"_p_cmf__math__CVodeInfo", "cmf::math::CVodeInfo *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_cmf__math__CVodeKLU = {"_p_cmf__math__CVodeKLU", "cmf::math::CVodeKLU *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_cmf__math__CVodeKrylov = {"_p_cmf__math__CVodeKrylov", "cmf::math::CVodeKrylov *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_cmf__math__CVodeOptions = {"_p_cmf__math__CVodeOptions", "cmf::math::CVodeOptions *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_cmf__math__CVodeIntegrator = {"_p_cmf__math__CVodeIntegrator", "cmf::math::CVodeIntegrator *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_cmf__math__Date = {"_p_cmf__math__Date", "cmf::math::Date *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_cmf__math__ExplicitEuler_fixed = {"_p_cmf__math__ExplicitEuler_fixed", "cmf::math::ExplicitEuler_fixed *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_cmf__math__HeunIntegrator = {"_p_cmf__math__HeunIntegrator", "cmf::math::HeunIntegrator *", 0, 0, (void*)0, 0}; @@ -95664,13 +93488,11 @@ static swig_type_info _swigt__p_cmf__math__SoluteWaterIntegrator = {"_p_cmf__mat static swig_type_info _swigt__p_cmf__math__StateVariable = {"_p_cmf__math__StateVariable", "cmf::math::StateVariable *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_cmf__math__StateVariableList = {"_p_cmf__math__StateVariableList", "cmf::math::StateVariableList *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_cmf__math__StateVariableOwner = {"_p_cmf__math__StateVariableOwner", "cmf::math::StateVariableOwner *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_cmf__math__StateVariable__list = {"_p_cmf__math__StateVariable__list", "cmf::math::StateVariable::list *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_cmf__math__Time = {"_p_cmf__math__Time", "cmf::math::Time *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_cmf__math__cubicspline = {"_p_cmf__math__cubicspline", "cmf::math::cubicspline *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_cmf__math__integratable = {"_p_cmf__math__integratable", "cmf::math::integratable *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_cmf__math__integratable_list = {"_p_cmf__math__integratable_list", "cmf::math::integratable_list *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_cmf__math__num_array = {"_p_cmf__math__num_array", "cmf::math::num_array *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_cmf__math__sparse_structure = {"_p_cmf__math__sparse_structure", "cmf::math::sparse_structure *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_cmf__math__timeseries = {"_p_cmf__math__timeseries", "cmf::math::timeseries *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_cmf__project = {"_p_cmf__project", "cmf::project *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_cmf__river__Channel = {"_p_cmf__river__Channel", "cmf::river::Channel *", 0, 0, (void*)0, 0}; @@ -95865,15 +93687,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_cmf__geometry__point, &_swigt__p_cmf__geometry__point_vector, &_swigt__p_cmf__math__BDF2, - &_swigt__p_cmf__math__CVodeAdams, - &_swigt__p_cmf__math__CVodeBanded, - &_swigt__p_cmf__math__CVodeBase, - &_swigt__p_cmf__math__CVodeDense, - &_swigt__p_cmf__math__CVodeDiag, - &_swigt__p_cmf__math__CVodeInfo, - &_swigt__p_cmf__math__CVodeKLU, - &_swigt__p_cmf__math__CVodeKrylov, - &_swigt__p_cmf__math__CVodeOptions, + &_swigt__p_cmf__math__CVodeIntegrator, &_swigt__p_cmf__math__Date, &_swigt__p_cmf__math__ExplicitEuler_fixed, &_swigt__p_cmf__math__HeunIntegrator, @@ -95885,13 +93699,11 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_cmf__math__StateVariable, &_swigt__p_cmf__math__StateVariableList, &_swigt__p_cmf__math__StateVariableOwner, - &_swigt__p_cmf__math__StateVariable__list, &_swigt__p_cmf__math__Time, &_swigt__p_cmf__math__cubicspline, &_swigt__p_cmf__math__integratable, &_swigt__p_cmf__math__integratable_list, &_swigt__p_cmf__math__num_array, - &_swigt__p_cmf__math__sparse_structure, &_swigt__p_cmf__math__timeseries, &_swigt__p_cmf__project, &_swigt__p_cmf__river__Channel, @@ -96086,33 +93898,23 @@ static swig_cast_info _swigc__p_cmf__atmosphere__log_wind_profile[] = { {&_swig static swig_cast_info _swigc__p_cmf__geometry__point[] = { {&_swigt__p_cmf__geometry__point, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_cmf__geometry__point_vector[] = { {&_swigt__p_cmf__geometry__point_vector, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_cmf__math__BDF2[] = { {&_swigt__p_cmf__math__BDF2, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_cmf__math__CVodeAdams[] = { {&_swigt__p_cmf__math__CVodeAdams, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_cmf__math__CVodeBanded[] = { {&_swigt__p_cmf__math__CVodeBanded, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_cmf__math__CVodeBase[] = { {&_swigt__p_cmf__math__CVodeKLU, _p_cmf__math__CVodeKLUTo_p_cmf__math__CVodeBase, 0, 0}, {&_swigt__p_cmf__math__CVodeBase, 0, 0, 0}, {&_swigt__p_cmf__math__CVodeDense, _p_cmf__math__CVodeDenseTo_p_cmf__math__CVodeBase, 0, 0}, {&_swigt__p_cmf__math__CVodeAdams, _p_cmf__math__CVodeAdamsTo_p_cmf__math__CVodeBase, 0, 0}, {&_swigt__p_cmf__math__CVodeBanded, _p_cmf__math__CVodeBandedTo_p_cmf__math__CVodeBase, 0, 0}, {&_swigt__p_cmf__math__CVodeDiag, _p_cmf__math__CVodeDiagTo_p_cmf__math__CVodeBase, 0, 0}, {&_swigt__p_cmf__math__CVodeKrylov, _p_cmf__math__CVodeKrylovTo_p_cmf__math__CVodeBase, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_cmf__math__CVodeDense[] = { {&_swigt__p_cmf__math__CVodeDense, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_cmf__math__CVodeDiag[] = { {&_swigt__p_cmf__math__CVodeDiag, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_cmf__math__CVodeInfo[] = { {&_swigt__p_cmf__math__CVodeInfo, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_cmf__math__CVodeKLU[] = { {&_swigt__p_cmf__math__CVodeKLU, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_cmf__math__CVodeKrylov[] = { {&_swigt__p_cmf__math__CVodeKrylov, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_cmf__math__CVodeOptions[] = { {&_swigt__p_cmf__math__CVodeOptions, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_cmf__math__CVodeIntegrator[] = { {&_swigt__p_cmf__math__CVodeIntegrator, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_cmf__math__Date[] = { {&_swigt__p_cmf__math__Date, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_cmf__math__ExplicitEuler_fixed[] = { {&_swigt__p_cmf__math__ExplicitEuler_fixed, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_cmf__math__HeunIntegrator[] = { {&_swigt__p_cmf__math__HeunIntegrator, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_cmf__math__ImplicitEuler[] = { {&_swigt__p_cmf__math__ImplicitEuler, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_cmf__math__Integrator[] = { {&_swigt__p_cmf__math__CVodeBanded, _p_cmf__math__CVodeBandedTo_p_cmf__math__Integrator, 0, 0}, {&_swigt__p_cmf__math__CVodeDense, _p_cmf__math__CVodeDenseTo_p_cmf__math__Integrator, 0, 0}, {&_swigt__p_cmf__math__CVodeAdams, _p_cmf__math__CVodeAdamsTo_p_cmf__math__Integrator, 0, 0}, {&_swigt__p_cmf__math__SoluteWaterIntegrator, _p_cmf__math__SoluteWaterIntegratorTo_p_cmf__math__Integrator, 0, 0}, {&_swigt__p_cmf__math__MultiIntegrator, _p_cmf__math__MultiIntegratorTo_p_cmf__math__Integrator, 0, 0}, {&_swigt__p_cmf__math__RKFIntegrator, _p_cmf__math__RKFIntegratorTo_p_cmf__math__Integrator, 0, 0}, {&_swigt__p_cmf__math__HeunIntegrator, _p_cmf__math__HeunIntegratorTo_p_cmf__math__Integrator, 0, 0}, {&_swigt__p_cmf__math__Integrator, 0, 0, 0}, {&_swigt__p_cmf__math__ImplicitEuler, _p_cmf__math__ImplicitEulerTo_p_cmf__math__Integrator, 0, 0}, {&_swigt__p_cmf__math__ExplicitEuler_fixed, _p_cmf__math__ExplicitEuler_fixedTo_p_cmf__math__Integrator, 0, 0}, {&_swigt__p_cmf__math__CVodeKrylov, _p_cmf__math__CVodeKrylovTo_p_cmf__math__Integrator, 0, 0}, {&_swigt__p_cmf__math__CVodeBase, _p_cmf__math__CVodeBaseTo_p_cmf__math__Integrator, 0, 0}, {&_swigt__p_cmf__math__BDF2, _p_cmf__math__BDF2To_p_cmf__math__Integrator, 0, 0}, {&_swigt__p_cmf__math__CVodeKLU, _p_cmf__math__CVodeKLUTo_p_cmf__math__Integrator, 0, 0}, {&_swigt__p_cmf__math__CVodeDiag, _p_cmf__math__CVodeDiagTo_p_cmf__math__Integrator, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_cmf__math__Integrator[] = { {&_swigt__p_cmf__math__BDF2, _p_cmf__math__BDF2To_p_cmf__math__Integrator, 0, 0}, {&_swigt__p_cmf__math__ExplicitEuler_fixed, _p_cmf__math__ExplicitEuler_fixedTo_p_cmf__math__Integrator, 0, 0}, {&_swigt__p_cmf__math__ImplicitEuler, _p_cmf__math__ImplicitEulerTo_p_cmf__math__Integrator, 0, 0}, {&_swigt__p_cmf__math__Integrator, 0, 0, 0}, {&_swigt__p_cmf__math__HeunIntegrator, _p_cmf__math__HeunIntegratorTo_p_cmf__math__Integrator, 0, 0}, {&_swigt__p_cmf__math__RKFIntegrator, _p_cmf__math__RKFIntegratorTo_p_cmf__math__Integrator, 0, 0}, {&_swigt__p_cmf__math__CVodeIntegrator, _p_cmf__math__CVodeIntegratorTo_p_cmf__math__Integrator, 0, 0}, {&_swigt__p_cmf__math__MultiIntegrator, _p_cmf__math__MultiIntegratorTo_p_cmf__math__Integrator, 0, 0}, {&_swigt__p_cmf__math__SoluteWaterIntegrator, _p_cmf__math__SoluteWaterIntegratorTo_p_cmf__math__Integrator, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_cmf__math__MultiIntegrator[] = { {&_swigt__p_cmf__math__MultiIntegrator, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_cmf__math__RKFIntegrator[] = { {&_swigt__p_cmf__math__RKFIntegrator, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_cmf__math__SoluteWaterIntegrator[] = { {&_swigt__p_cmf__math__SoluteWaterIntegrator, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_cmf__math__StateVariable[] = { {&_swigt__p_cmf__math__StateVariable, 0, 0, 0}, {&_swigt__p_cmf__river__Reach, _p_cmf__river__ReachTo_p_cmf__math__StateVariable, 0, 0}, {&_swigt__p_cmf__upslope__SurfaceWater, _p_cmf__upslope__SurfaceWaterTo_p_cmf__math__StateVariable, 0, 0}, {&_swigt__p_cmf__upslope__SoilLayer, _p_cmf__upslope__SoilLayerTo_p_cmf__math__StateVariable, 0, 0}, {&_swigt__p_cmf__upslope__MacroPore, _p_cmf__upslope__MacroPoreTo_p_cmf__math__StateVariable, 0, 0}, {&_swigt__p_cmf__water__SoluteStorage, _p_cmf__water__SoluteStorageTo_p_cmf__math__StateVariable, 0, 0}, {&_swigt__p_cmf__water__WaterStorage, _p_cmf__water__WaterStorageTo_p_cmf__math__StateVariable, 0, 0}, {&_swigt__p_cmf__river__OpenWaterStorage, _p_cmf__river__OpenWaterStorageTo_p_cmf__math__StateVariable, 0, 0}, {&_swigt__p_cmf__upslope__aquifer, _p_cmf__upslope__aquiferTo_p_cmf__math__StateVariable, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_cmf__math__StateVariableList[] = { {&_swigt__p_cmf__math__StateVariableList, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_cmf__math__StateVariableOwner[] = { {&_swigt__p_cmf__upslope__cell_vector, _p_cmf__upslope__cell_vectorTo_p_cmf__math__StateVariableOwner, 0, 0}, {&_swigt__p_cmf__math__StateVariableOwner, 0, 0, 0}, {&_swigt__p_cmf__river__Reach, _p_cmf__river__ReachTo_p_cmf__math__StateVariableOwner, 0, 0}, {&_swigt__p_cmf__upslope__SurfaceWater, _p_cmf__upslope__SurfaceWaterTo_p_cmf__math__StateVariableOwner, 0, 0}, {&_swigt__p_cmf__upslope__SoilLayer, _p_cmf__upslope__SoilLayerTo_p_cmf__math__StateVariableOwner, 0, 0}, {&_swigt__p_cmf__upslope__MacroPore, _p_cmf__upslope__MacroPoreTo_p_cmf__math__StateVariableOwner, 0, 0}, {&_swigt__p_cmf__math__StateVariableList, _p_cmf__math__StateVariableListTo_p_cmf__math__StateVariableOwner, 0, 0}, {&_swigt__p_cmf__water__WaterStorage, _p_cmf__water__WaterStorageTo_p_cmf__math__StateVariableOwner, 0, 0}, {&_swigt__p_cmf__river__OpenWaterStorage, _p_cmf__river__OpenWaterStorageTo_p_cmf__math__StateVariableOwner, 0, 0}, {&_swigt__p_cmf__upslope__Cell, _p_cmf__upslope__CellTo_p_cmf__math__StateVariableOwner, 0, 0}, {&_swigt__p_cmf__water__node_list, _p_cmf__water__node_listTo_p_cmf__math__StateVariableOwner, 0, 0}, {&_swigt__p_cmf__upslope__aquifer, _p_cmf__upslope__aquiferTo_p_cmf__math__StateVariableOwner, 0, 0}, {&_swigt__p_cmf__project, _p_cmf__projectTo_p_cmf__math__StateVariableOwner, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_cmf__math__StateVariable__list[] = { {&_swigt__p_cmf__math__StateVariable__list, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_cmf__math__Time[] = { {&_swigt__p_cmf__math__Time, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_cmf__math__cubicspline[] = { {&_swigt__p_cmf__math__cubicspline, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_cmf__math__integratable[] = { {&_swigt__p_cmf__math__integratable, 0, 0, 0}, {&_swigt__p_cmf__water__waterbalance_integrator, _p_cmf__water__waterbalance_integratorTo_p_cmf__math__integratable, 0, 0}, {&_swigt__p_cmf__water__flux_integrator, _p_cmf__water__flux_integratorTo_p_cmf__math__integratable, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_cmf__math__integratable_list[] = { {&_swigt__p_cmf__math__integratable_list, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_cmf__math__num_array[] = { {&_swigt__p_cmf__math__num_array, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_cmf__math__sparse_structure[] = { {&_swigt__p_cmf__math__sparse_structure, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_cmf__math__timeseries[] = { {&_swigt__p_cmf__math__timeseries, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_cmf__project[] = { {&_swigt__p_cmf__project, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_cmf__river__Channel[] = { {&_swigt__p_cmf__river__Channel, 0, 0, 0},{0, 0, 0, 0}}; @@ -96307,15 +94109,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_cmf__geometry__point, _swigc__p_cmf__geometry__point_vector, _swigc__p_cmf__math__BDF2, - _swigc__p_cmf__math__CVodeAdams, - _swigc__p_cmf__math__CVodeBanded, - _swigc__p_cmf__math__CVodeBase, - _swigc__p_cmf__math__CVodeDense, - _swigc__p_cmf__math__CVodeDiag, - _swigc__p_cmf__math__CVodeInfo, - _swigc__p_cmf__math__CVodeKLU, - _swigc__p_cmf__math__CVodeKrylov, - _swigc__p_cmf__math__CVodeOptions, + _swigc__p_cmf__math__CVodeIntegrator, _swigc__p_cmf__math__Date, _swigc__p_cmf__math__ExplicitEuler_fixed, _swigc__p_cmf__math__HeunIntegrator, @@ -96327,13 +94121,11 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_cmf__math__StateVariable, _swigc__p_cmf__math__StateVariableList, _swigc__p_cmf__math__StateVariableOwner, - _swigc__p_cmf__math__StateVariable__list, _swigc__p_cmf__math__Time, _swigc__p_cmf__math__cubicspline, _swigc__p_cmf__math__integratable, _swigc__p_cmf__math__integratable_list, _swigc__p_cmf__math__num_array, - _swigc__p_cmf__math__sparse_structure, _swigc__p_cmf__math__timeseries, _swigc__p_cmf__project, _swigc__p_cmf__river__Channel,