Skip to content

Commit

Permalink
Remove unused methods (#2032)
Browse files Browse the repository at this point in the history
* Remove unused methods

Following #2018

* Format
  • Loading branch information
Nicolas Cornu authored Oct 21, 2022
1 parent 7e634d5 commit ea3aea1
Show file tree
Hide file tree
Showing 15 changed files with 14 additions and 7,561 deletions.
9 changes: 0 additions & 9 deletions cmake/NeuronFileLists.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -384,15 +384,10 @@ set(SPARSE13_FILES_LIST
# scopmath sources
set(SCOPMATH_FILES_LIST
abort.c
adams.c
adeuler.c
adrunge.c
advance.c
boundary.c
crank.c
crout.c
csoda.c
csodabnc.c
deflate.c
dimplic.c
scoperf.c
Expand All @@ -403,10 +398,8 @@ set(SCOPMATH_FILES_LIST
factoria.c
force.c
gauss.c
gear.c
getmem.c
harmonic.c
heun.c
hyperbol.c
invert.c
lag.c
Expand All @@ -428,10 +421,8 @@ set(SCOPMATH_FILES_LIST
runge.c
sawtooth.c
schedule.c
seidel.c
sigmoid.c
simeq.c
simplex.c
sparse.c
vsparse.c
spline.c
Expand Down
9 changes: 1 addition & 8 deletions src/modlunit/init.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -114,21 +114,14 @@ static struct { /* numerical methods */
const char* name;
long subtype; /* All the types that will work with this */
short varstep;
} methods[] = {{"adams", DERF | KINF, 0},
{"runge", DERF | KINF, 0},
} methods[] = {{"runge", DERF | KINF, 0},
{"euler", DERF | KINF, 0},
{"adeuler", DERF | KINF, 1},
{"heun", DERF | KINF, 0},
{"adrunge", DERF | KINF, 1},
{"newton", NLINF, 0},
{"simplex", NLINF, 0},
{"simeq", LINF, 0},
{"seidel", LINF, 0},
{"_advance", KINF, 0},
{"sparse", KINF, 0},
{"derivimplicit", DERF, 0}, /* name hard wired in deriv.c */
{"cnexp", DERF, 0},
{"clsoda", DERF | KINF, 0}, /* Tolerance built in to scopgear.c */
{"after_cvode", 0, 0},
{"cvode_t", 0, 0},
{"cvode_t_v", 0, 0},
Expand Down
24 changes: 12 additions & 12 deletions src/nmodl/init.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -107,18 +107,18 @@ static struct { /* numerical methods */
const char* name;
long subtype; /* All the types that will work with this */
short varstep;
} methods[] = {
{"adams", DERF | KINF, 0}, {"runge", DERF | KINF, 0},
{"euler", DERF | KINF, 0}, {"adeuler", DERF | KINF, 1},
{"heun", DERF | KINF, 0}, {"adrunge", DERF | KINF, 1},
{"gear", DERF | KINF, 1}, {"newton", NLINF, 0},
{"simplex", NLINF, 0}, {"simeq", LINF, 0},
{"seidel", LINF, 0}, {"_advance", KINF, 0},
{"sparse", KINF, 0}, {"derivimplicit", DERF, 0}, /* name hard wired in deriv.c */
{"cnexp", DERF, 0}, /* see solve.c */
{"clsoda", DERF | KINF, 1}, /* Tolerance built in to scopgear.c */
{"after_cvode", 0, 0}, {"cvode_t", 0, 0},
{"cvode_t_v", 0, 0}, {0, 0, 0}};
} methods[] = {{"runge", DERF | KINF, 0},
{"euler", DERF | KINF, 0},
{"newton", NLINF, 0},
{"simeq", LINF, 0},
{"_advance", KINF, 0},
{"sparse", KINF, 0},
{"derivimplicit", DERF, 0}, /* name hard wired in deriv.c */
{"cnexp", DERF, 0}, /* see solve.c */
{"after_cvode", 0, 0},
{"cvode_t", 0, 0},
{"cvode_t_v", 0, 0},
{0, 0, 0}};

static const char* extdef[] = {/* external names that can be used as doubles
* without giving an error message */
Expand Down
2 changes: 1 addition & 1 deletion src/nmodl/solve.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ void solvhandler() {
switch (fun->subtype) {
case DERF:
if (method == SYM0) {
method = lookup("adrunge");
method = lookup("derivimplicit");
}
if (btype == BREAKPOINT && !steadystate) {
/* derivatives recalculated after while loop */
Expand Down
194 changes: 0 additions & 194 deletions src/scopmath/adams.c

This file was deleted.

Loading

0 comments on commit ea3aea1

Please sign in to comment.