Skip to content

Commit a7e282a

Browse files
author
oscarddssmith
committed
fixes
1 parent fbc0737 commit a7e282a

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

src/scimlfunctions.jl

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2666,7 +2666,7 @@ end
26662666
@add_kwonly function SplitFunction(f1, f2, mass_matrix, cache, analytic, tgrad, jac, jvp,
26672667
vjp, jac_prototype, W_prototype, sparsity, Wfact, Wfact_t, paramjac,
26682668
observed, colorvec, sys, initializeprob, update_initializeprob!,
2669-
initializeprobmap, initializeprobpmap)
2669+
initializeprobmap, initializeprobpmap, nlfunc)
26702670
f1 = ODEFunction(f1)
26712671
f2 = ODEFunction(f2)
26722672

@@ -2681,11 +2681,11 @@ end
26812681
typeof(vjp), typeof(jac_prototype), typeof(W_prototype), typeof(sparsity),
26822682
typeof(Wfact), typeof(Wfact_t), typeof(paramjac), typeof(observed), typeof(colorvec),
26832683
typeof(sys), typeof(initializeprob), typeof(update_initializeprob!), typeof(initializeprobmap),
2684-
typeof(initializeprobpmap)}(
2684+
typeof(initializeprobpmap), typeof(nlfunc)}(
26852685
f1, f2, mass_matrix,
26862686
cache, analytic, tgrad, jac, jvp, vjp,
26872687
jac_prototype, W_prototype, sparsity, Wfact, Wfact_t, paramjac, observed, colorvec, sys,
2688-
initializeprob, update_initializeprob!, initializeprobmap, initializeprobpmap)
2688+
initializeprob, update_initializeprob!, initializeprobmap, initializeprobpmap, nlfunc)
26892689
end
26902690
function SplitFunction{iip, specialize}(f1, f2;
26912691
mass_matrix = __has_mass_matrix(f1) ?
@@ -2721,7 +2721,8 @@ function SplitFunction{iip, specialize}(f1, f2;
27212721
update_initializeprob! = __has_update_initializeprob!(f1) ?
27222722
f1.update_initializeprob! : nothing,
27232723
initializeprobmap = __has_initializeprobmap(f1) ? f1.initializeprobmap : nothing,
2724-
initializeprobpmap = __has_initializeprobpmap(f1) ? f1.initializeprobpmap : nothing
2724+
initializeprobpmap = __has_initializeprobpmap(f1) ? f1.initializeprobpmap : nothing,
2725+
nlfunc = __has_nlfunc(f1) ? f1.nlfunc : nothing
27252726
) where {iip,
27262727
specialize
27272728
}
@@ -2732,12 +2733,12 @@ function SplitFunction{iip, specialize}(f1, f2;
27322733
if specialize === NoSpecialize
27332734
SplitFunction{iip, specialize, Any, Any, Any, Any, Any, Any, Any, Any, Any,
27342735
Any, Any, Any, Any, Any, Any, Any,
2735-
Any, Any, Any, Any, Any, Any}(f1, f2, mass_matrix, _func_cache,
2736+
Any, Any, Any, Any, Any, Any, Any}(f1, f2, mass_matrix, _func_cache,
27362737
analytic,
27372738
tgrad, jac, jvp, vjp, jac_prototype, W_prototype,
27382739
sparsity, Wfact, Wfact_t, paramjac,
27392740
observed, colorvec, sys, initializeprob.update_initializeprob!, initializeprobmap,
2740-
initializeprobpmap, initializeprobpmap)
2741+
initializeprobpmap, initializeprobpmap, nlfunc)
27412742
else
27422743
SplitFunction{iip, specialize, typeof(f1), typeof(f2), typeof(mass_matrix),
27432744
typeof(_func_cache), typeof(analytic),
@@ -2747,11 +2748,11 @@ function SplitFunction{iip, specialize}(f1, f2;
27472748
typeof(colorvec),
27482749
typeof(sys), typeof(initializeprob), typeof(update_initializeprob!),
27492750
typeof(initializeprobmap),
2750-
typeof(initializeprobpmap)}(f1, f2,
2751+
typeof(initializeprobpmap), typeof(nlfunc)}(f1, f2,
27512752
mass_matrix, _func_cache, analytic, tgrad, jac,
27522753
jvp, vjp, jac_prototype, W_prototype,
27532754
sparsity, Wfact, Wfact_t, paramjac, observed, colorvec, sys,
2754-
initializeprob, update_initializeprob!, initializeprobmap, initializeprobpmap)
2755+
initializeprob, update_initializeprob!, initializeprobmap, initializeprobpmap, nlfunc)
27552756
end
27562757
end
27572758

@@ -3094,7 +3095,7 @@ SDEFunction(f::SDEFunction; kwargs...) = f
30943095

30953096
@add_kwonly function SplitSDEFunction(f1, f2, g, mass_matrix, cache, analytic, tgrad, jac,
30963097
jvp, vjp,
3097-
jac_prototype, W_prototype, Wfact, Wfact_t, paramjac, observed,
3098+
jac_prototype, Wfact, Wfact_t, paramjac, observed,
30983099
colorvec, sys)
30993100
f1 = f1 isa AbstractSciMLOperator ? f1 : SDEFunction(f1)
31003101
f2 = SDEFunction(f2)
@@ -3105,7 +3106,7 @@ SDEFunction(f::SDEFunction; kwargs...) = f
31053106
typeof(Wfact), typeof(Wfact_t), typeof(paramjac), typeof(observed),
31063107
typeof(colorvec),
31073108
typeof(sys)}(f1, f2, mass_matrix, cache, analytic, tgrad, jac,
3108-
jac_prototype, W_prototype, Wfact, Wfact_t, paramjac, observed, colorvec, sys)
3109+
jac_prototype, Wfact, Wfact_t, paramjac, observed, colorvec, sys)
31093110
end
31103111

31113112
function SplitSDEFunction{iip, specialize}(f1, f2, g;

0 commit comments

Comments
 (0)