Skip to content

Commit b18de14

Browse files
author
philippkraft
committed
Added first take on CVode with KLU as sparse direct solver
1 parent 052d07e commit b18de14

File tree

9 files changed

+370
-303
lines changed

9 files changed

+370
-303
lines changed

‎.gitignore‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ __pycache__/
1313
.vs/
1414
tools/Debug*
1515
tools/Release*
16-
tools/suitesparse*
17-
tools/sundials*
1816

1917
*.VC.opendb
2018

‎cmf/cmf_core.py‎

Lines changed: 156 additions & 129 deletions
Large diffs are not rendered by default.

‎cmf/cmf_core_src/cmf.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ int main(int argc, char* argv[])
159159
std::string name;
160160
create_3d(p, 10, 10, name);
161161

162-
CVode3 * integ = new CVodeBanded(p, 1e-9);
162+
CVode3 * integ = new CVodeDense(p, 1e-9);
163163

164164
int64_t duration = run(integ, p);
165165

‎cmf/cmf_core_src/cmf_wrap.cpp‎

Lines changed: 14 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -77333,11 +77333,7 @@ static PyMethodDef SwigMethods[] = {
7733377333
{ (char *)"CVodeOptions_max_num_steps_get", (PyCFunction)_wrap_CVodeOptions_max_num_steps_get, METH_O, (char *)"CVodeOptions_max_num_steps_get(CVodeOptions self) -> int"},
7733477334
{ (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)"},
7733577335
{ (char *)"CVodeOptions_max_hnil_warnings_get", (PyCFunction)_wrap_CVodeOptions_max_hnil_warnings_get, METH_O, (char *)"CVodeOptions_max_hnil_warnings_get(CVodeOptions self) -> int"},
77336-
{ (char *)"new_CVodeOptions", (PyCFunction)_wrap_new_CVodeOptions, METH_NOARGS, (char *)"\n"
77337-
"new_CVodeOptions() -> CVodeOptions\n"
77338-
"\n"
77339-
"CVodeOptions() \n"
77340-
""},
77336+
{ (char *)"new_CVodeOptions", (PyCFunction)_wrap_new_CVodeOptions, METH_NOARGS, (char *)"new_CVodeOptions() -> CVodeOptions"},
7734177337
{ (char *)"delete_CVodeOptions", (PyCFunction)_wrap_delete_CVodeOptions, METH_O, (char *)"delete_CVodeOptions(CVodeOptions self)"},
7734277338
{ (char *)"CVodeOptions_swigregister", CVodeOptions_swigregister, METH_VARARGS, NULL},
7734377339
{ (char *)"CVodeOptions_swiginit", CVodeOptions_swiginit, METH_VARARGS, NULL},
@@ -77367,113 +77363,53 @@ static PyMethodDef SwigMethods[] = {
7736777363
{ (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"},
7736877364
{ (char *)"CVodeInfo_sundials_version_set", _wrap_CVodeInfo_sundials_version_set, METH_VARARGS, (char *)"CVodeInfo_sundials_version_set(CVodeInfo self, std::string const & sundials_version)"},
7736977365
{ (char *)"CVodeInfo_sundials_version_get", (PyCFunction)_wrap_CVodeInfo_sundials_version_get, METH_O, (char *)"CVodeInfo_sundials_version_get(CVodeInfo self) -> std::string const &"},
77370-
{ (char *)"CVodeInfo_to_string", (PyCFunction)_wrap_CVodeInfo_to_string, METH_O, (char *)"\n"
77371-
"CVodeInfo_to_string(CVodeInfo self) -> std::string\n"
77372-
"\n"
77373-
"std::string\n"
77374-
"to_string() const \n"
77375-
""},
77366+
{ (char *)"CVodeInfo_to_string", (PyCFunction)_wrap_CVodeInfo_to_string, METH_O, (char *)"CVodeInfo_to_string(CVodeInfo self) -> std::string"},
7737677367
{ (char *)"new_CVodeInfo", (PyCFunction)_wrap_new_CVodeInfo, METH_NOARGS, (char *)"new_CVodeInfo() -> CVodeInfo"},
7737777368
{ (char *)"delete_CVodeInfo", (PyCFunction)_wrap_delete_CVodeInfo, METH_O, (char *)"delete_CVodeInfo(CVodeInfo self)"},
7737877369
{ (char *)"CVodeInfo_swigregister", CVodeInfo_swigregister, METH_VARARGS, NULL},
7737977370
{ (char *)"CVodeInfo_swiginit", CVodeInfo_swiginit, METH_VARARGS, NULL},
7738077371
{ (char *)"CVode3_options_set", _wrap_CVode3_options_set, METH_VARARGS, (char *)"CVode3_options_set(CVode3 self, CVodeOptions options)"},
7738177372
{ (char *)"CVode3_options_get", (PyCFunction)_wrap_CVode3_options_get, METH_O, (char *)"CVode3_options_get(CVode3 self) -> CVodeOptions"},
77382-
{ (char *)"CVode3_set_error_msg", (PyCFunction) _wrap_CVode3_set_error_msg, METH_VARARGS | METH_KEYWORDS, (char *)"\n"
77383-
"CVode3_set_error_msg(CVode3 self, std::string error)\n"
77384-
"\n"
77385-
"void\n"
77386-
"set_error_msg(std::string error)\n"
77387-
"\n"
77388-
"Sets an error message. \n"
77389-
""},
77373+
{ (char *)"CVode3_set_error_msg", (PyCFunction) _wrap_CVode3_set_error_msg, METH_VARARGS | METH_KEYWORDS, (char *)"CVode3_set_error_msg(CVode3 self, std::string error)"},
7739077374
{ (char *)"CVode3_copy", (PyCFunction)_wrap_CVode3_copy, METH_O, (char *)"\n"
7739177375
"CVode3_copy(CVode3 self) -> CVode3\n"
7739277376
"\n"
77393-
"CVode3* copy() const\n"
77377+
"virtual\n"
77378+
"Integrator* copy() const =0\n"
7739477379
"\n"
77395-
"Returns a copy of the solver. \n"
77380+
"Polymorphic copy constructor. \n"
7739677381
""},
7739777382
{ (char *)"CVode3_error_msg_set", _wrap_CVode3_error_msg_set, METH_VARARGS, (char *)"CVode3_error_msg_set(CVode3 self, std::string const & error_msg)"},
7739877383
{ (char *)"CVode3_error_msg_get", (PyCFunction)_wrap_CVode3_error_msg_get, METH_O, (char *)"CVode3_error_msg_get(CVode3 self) -> std::string const &"},
77399-
{ (char *)"CVode3_to_string", (PyCFunction)_wrap_CVode3_to_string, METH_O, (char *)"\n"
77400-
"CVode3_to_string(CVode3 self) -> std::string\n"
77401-
"\n"
77402-
"virtual\n"
77403-
"std::string to_string() const =0\n"
77404-
"\n"
77405-
"Returns a string representation of the solver. \n"
77406-
""},
77407-
{ (char *)"CVode3_get_error", (PyCFunction)_wrap_CVode3_get_error, METH_O, (char *)"\n"
77408-
"CVode3_get_error(CVode3 self) -> cmf::math::num_array\n"
77409-
"\n"
77410-
"cmf::math::num_array get_error() const\n"
77411-
"\n"
77412-
"Error vector of the integrator. \n"
77413-
""},
77384+
{ (char *)"CVode3_to_string", (PyCFunction)_wrap_CVode3_to_string, METH_O, (char *)"CVode3_to_string(CVode3 self) -> std::string"},
77385+
{ (char *)"CVode3_get_error", (PyCFunction)_wrap_CVode3_get_error, METH_O, (char *)"CVode3_get_error(CVode3 self) -> cmf::math::num_array"},
7741477386
{ (char *)"delete_CVode3", (PyCFunction)_wrap_delete_CVode3, METH_O, (char *)"delete_CVode3(CVode3 self)"},
7741577387
{ (char *)"CVode3_info_get", (PyCFunction)_wrap_CVode3_info_get, METH_O, (char *)"CVode3_info_get(CVode3 self) -> CVodeInfo"},
7741677388
{ (char *)"CVode3_swigregister", CVode3_swigregister, METH_VARARGS, NULL},
77417-
{ (char *)"new_CVodeDense", (PyCFunction) _wrap_new_CVodeDense, METH_VARARGS | METH_KEYWORDS, (char *)"\n"
77418-
"new_CVodeDense(StateVariableOwner states, real epsilon=1e-9) -> CVodeDense\n"
77419-
"\n"
77420-
"CVodeDense(cmf::math::StateVariableOwner &states, real epsilon=1e-9)\n"
77421-
"\n"
77422-
"Creates a new implicit dense CVode solver. \n"
77423-
""},
77424-
{ (char *)"CVodeDense__get_jacobian", (PyCFunction)_wrap_CVodeDense__get_jacobian, METH_O, (char *)"\n"
77425-
"CVodeDense__get_jacobian(CVodeDense self) -> cmf::math::num_array\n"
77426-
"\n"
77427-
"cmf::math::num_array _get_jacobian() const\n"
77428-
"\n"
77429-
"Returns a continuous 1D array representing the Jacobian oclumns\n"
77430-
"concatenated.\n"
77431-
"\n"
77432-
"Convert to 2D numpy nd array: jac =\n"
77433-
"solver.jacobian().reshape(solver.size(), -1) This can be implemented\n"
77434-
"in ODEsystem.i but is not now. \n"
77435-
""},
77389+
{ (char *)"new_CVodeDense", (PyCFunction) _wrap_new_CVodeDense, METH_VARARGS | METH_KEYWORDS, (char *)"new_CVodeDense(StateVariableOwner states, real epsilon=1e-9) -> CVodeDense"},
77390+
{ (char *)"CVodeDense__get_jacobian", (PyCFunction)_wrap_CVodeDense__get_jacobian, METH_O, (char *)"CVodeDense__get_jacobian(CVodeDense self) -> cmf::math::num_array"},
7743677391
{ (char *)"delete_CVodeDense", (PyCFunction)_wrap_delete_CVodeDense, METH_O, (char *)"delete_CVodeDense(CVodeDense self)"},
7743777392
{ (char *)"CVodeDense_swigregister", CVodeDense_swigregister, METH_VARARGS, NULL},
7743877393
{ (char *)"CVodeDense_swiginit", CVodeDense_swiginit, METH_VARARGS, NULL},
77439-
{ (char *)"new_CVodeAdams", (PyCFunction) _wrap_new_CVodeAdams, METH_VARARGS | METH_KEYWORDS, (char *)"\n"
77440-
"new_CVodeAdams(StateVariableOwner states, real epsilon=1e-9) -> CVodeAdams\n"
77441-
"\n"
77442-
"CVodeAdams(cmf::math::StateVariableOwner &states, real epsilon=1e-9)\n"
77443-
"\n"
77444-
""},
77394+
{ (char *)"new_CVodeAdams", (PyCFunction) _wrap_new_CVodeAdams, METH_VARARGS | METH_KEYWORDS, (char *)"new_CVodeAdams(StateVariableOwner states, real epsilon=1e-9) -> CVodeAdams"},
7744577395
{ (char *)"delete_CVodeAdams", (PyCFunction)_wrap_delete_CVodeAdams, METH_O, (char *)"delete_CVodeAdams(CVodeAdams self)"},
7744677396
{ (char *)"CVodeAdams_swigregister", CVodeAdams_swigregister, METH_VARARGS, NULL},
7744777397
{ (char *)"CVodeAdams_swiginit", CVodeAdams_swiginit, METH_VARARGS, NULL},
7744877398
{ (char *)"CVodeBanded_bandwidth_set", _wrap_CVodeBanded_bandwidth_set, METH_VARARGS, (char *)"CVodeBanded_bandwidth_set(CVodeBanded self, int bandwidth)"},
7744977399
{ (char *)"CVodeBanded_bandwidth_get", (PyCFunction)_wrap_CVodeBanded_bandwidth_get, METH_O, (char *)"CVodeBanded_bandwidth_get(CVodeBanded self) -> int"},
77450-
{ (char *)"new_CVodeBanded", (PyCFunction) _wrap_new_CVodeBanded, METH_VARARGS | METH_KEYWORDS, (char *)"\n"
77451-
"new_CVodeBanded(StateVariableOwner states, real epsilon=1e-9, int w=5) -> CVodeBanded\n"
77452-
"\n"
77453-
"CVodeBanded(cmf::math::StateVariableOwner &states, real epsilon=1e-9,\n"
77454-
"int w=5) \n"
77455-
""},
77400+
{ (char *)"new_CVodeBanded", (PyCFunction) _wrap_new_CVodeBanded, METH_VARARGS | METH_KEYWORDS, (char *)"new_CVodeBanded(StateVariableOwner states, real epsilon=1e-9, int w=5) -> CVodeBanded"},
7745677401
{ (char *)"delete_CVodeBanded", (PyCFunction)_wrap_delete_CVodeBanded, METH_O, (char *)"delete_CVodeBanded(CVodeBanded self)"},
7745777402
{ (char *)"CVodeBanded_swigregister", CVodeBanded_swigregister, METH_VARARGS, NULL},
7745877403
{ (char *)"CVodeBanded_swiginit", CVodeBanded_swiginit, METH_VARARGS, NULL},
77459-
{ (char *)"new_CVodeDiag", (PyCFunction) _wrap_new_CVodeDiag, METH_VARARGS | METH_KEYWORDS, (char *)"\n"
77460-
"new_CVodeDiag(StateVariableOwner states, real epsilon=1e-9) -> CVodeDiag\n"
77461-
"\n"
77462-
"CVodeDiag(cmf::math::StateVariableOwner &states, real epsilon=1e-9) \n"
77463-
""},
77404+
{ (char *)"new_CVodeDiag", (PyCFunction) _wrap_new_CVodeDiag, METH_VARARGS | METH_KEYWORDS, (char *)"new_CVodeDiag(StateVariableOwner states, real epsilon=1e-9) -> CVodeDiag"},
7746477405
{ (char *)"delete_CVodeDiag", (PyCFunction)_wrap_delete_CVodeDiag, METH_O, (char *)"delete_CVodeDiag(CVodeDiag self)"},
7746577406
{ (char *)"CVodeDiag_swigregister", CVodeDiag_swigregister, METH_VARARGS, NULL},
7746677407
{ (char *)"CVodeDiag_swiginit", CVodeDiag_swiginit, METH_VARARGS, NULL},
7746777408
{ (char *)"CVodeKrylov_bandwidth_set", _wrap_CVodeKrylov_bandwidth_set, METH_VARARGS, (char *)"CVodeKrylov_bandwidth_set(CVodeKrylov self, int bandwidth)"},
7746877409
{ (char *)"CVodeKrylov_bandwidth_get", (PyCFunction)_wrap_CVodeKrylov_bandwidth_get, METH_O, (char *)"CVodeKrylov_bandwidth_get(CVodeKrylov self) -> int"},
7746977410
{ (char *)"CVodeKrylov_preconditioner_set", _wrap_CVodeKrylov_preconditioner_set, METH_VARARGS, (char *)"CVodeKrylov_preconditioner_set(CVodeKrylov self, char preconditioner)"},
7747077411
{ (char *)"CVodeKrylov_preconditioner_get", (PyCFunction)_wrap_CVodeKrylov_preconditioner_get, METH_O, (char *)"CVodeKrylov_preconditioner_get(CVodeKrylov self) -> char"},
77471-
{ (char *)"new_CVodeKrylov", (PyCFunction) _wrap_new_CVodeKrylov, METH_VARARGS | METH_KEYWORDS, (char *)"\n"
77472-
"new_CVodeKrylov(StateVariableOwner states, real epsilon=1e-9, int w=5, char p) -> CVodeKrylov\n"
77473-
"\n"
77474-
"CVodeKrylov(cmf::math::StateVariableOwner &states, real epsilon=1e-9,\n"
77475-
"int w=5, char p='L') \n"
77476-
""},
77412+
{ (char *)"new_CVodeKrylov", (PyCFunction) _wrap_new_CVodeKrylov, METH_VARARGS | METH_KEYWORDS, (char *)"new_CVodeKrylov(StateVariableOwner states, real epsilon=1e-9, int w=5, char p) -> CVodeKrylov"},
7747777413
{ (char *)"delete_CVodeKrylov", (PyCFunction)_wrap_delete_CVodeKrylov, METH_O, (char *)"delete_CVodeKrylov(CVodeKrylov self)"},
7747877414
{ (char *)"CVodeKrylov_swigregister", CVodeKrylov_swigregister, METH_VARARGS, NULL},
7747977415
{ (char *)"CVodeKrylov_swiginit", CVodeKrylov_swiginit, METH_VARARGS, NULL},

0 commit comments

Comments
 (0)