aboutsummaryrefslogtreecommitdiff
path: root/R/mkinpredict.R
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2023-02-17 14:44:29 +0100
committerJohannes Ranke <jranke@uni-bremen.de>2023-02-17 14:44:29 +0100
commitd5ff53448c61134c46cc4df9ea88fd86fa376d66 (patch)
tree2332224ea61fd28e58e9e9ff07a414da59df5bff /R/mkinpredict.R
parent84e67cd33bc9c47ae4b111873ffe39fed910d3d4 (diff)
Finish adapting to upcoming deSolve
Diffstat (limited to 'R/mkinpredict.R')
-rw-r--r--R/mkinpredict.R5
1 files changed, 2 insertions, 3 deletions
diff --git a/R/mkinpredict.R b/R/mkinpredict.R
index f0d00319..957d5793 100644
--- a/R/mkinpredict.R
+++ b/R/mkinpredict.R
@@ -117,7 +117,6 @@ mkinpredict.mkinmod <- function(x,
method.ode = "lsoda", atol = 1e-8, rtol = 1e-10, maxsteps = 20000L,
map_output = TRUE,
na_stop = TRUE,
- call_lsoda = NULL,
...)
{
@@ -170,12 +169,12 @@ mkinpredict.mkinmod <- function(x,
}
if (solution_type == "deSolve") {
- if (!is.null(x$cf) & use_compiled[1] != FALSE) {
+ if (!is.null(x$cf) & !is.null(x$symbols) & use_compiled[1] != FALSE) {
out <- deSolve::lsoda(
y = odeini,
times = outtimes,
- func = mkinmod[["symbols"]],
+ func = x$symbols,
initfunc = "initpar",
dllname = x$dll_info[["name"]],
parms = odeparms[x$parms], # Order matters when using compiled models

Contact - Imprint