Correct signature for _jac()

Author: ba2tripleO

src/systems/diffeqs/abstractodesystem.jl

@@ -26,7 +26,6 @@ function calculate_jacobian(sys::AbstractODESystem;
     rhs = [eq.rhs for eq ∈ full_equations(sys)]
 
     iv = get_iv(sys)
-    # dvs = states(sys)
 
     if sparse
         jac = sparsejacobian(rhs, dvs, simplify=simplify)
@@ -80,7 +79,7 @@ end
 
 function generate_dae_jacobian(sys::AbstractODESystem, dvs = states(sys), ps = parameters(sys); simplify=false, sparse=false, kwargs...)
     jac_u = calculate_jacobian(sys; simplify=simplify, sparse=sparse)
-    jac_du = calculate_jacobian(sys; simplify=simplify, sparse=sparse, dvs=Differential(independent_variable(sys)).(states(sys)))
+    jac_du = calculate_jacobian(sys; simplify=simplify, sparse=sparse, dvs=Differential(get_iv(sys)).(states(sys)))
     dvs = states(sys)
     @variables ˍ₋gamma
     jac = ˍ₋gamma*jac_du + jac_u
@@ -436,7 +435,7 @@ respectively.
 function DiffEqBase.DAEFunction{iip}(sys::AbstractODESystem, dvs = states(sys),
                                      ps = parameters(sys), u0 = nothing;
                                      ddvs=map(diff2term ∘ Differential(get_iv(sys)), dvs),
-                                     version = nothing, tgrad=false,
+                                     version = nothing,
                                      jac=false,
                                      eval_expression = true,
                                      sparse=false, simplify=false,
@@ -449,36 +448,22 @@ function DiffEqBase.DAEFunction{iip}(sys::AbstractODESystem, dvs = states(sys),
     f(du,u,p,t) = f_oop(du,u,p,t)
     f(out,du,u,p,t) = f_iip(out,du,u,p,t)
 
-    if tgrad
-        tgrad_gen = generate_tgrad(sys, dvs, ps;
-                                   simplify=simplify,
-                                   expression=Val{eval_expression}, expression_module=eval_module,
-                                   checkbounds=checkbounds, kwargs...)
-        tgrad_oop, tgrad_iip = eval_expression ? (@RuntimeGeneratedFunction(eval_module, ex) for ex in tgrad_gen) : tgrad_gen
-        _tgrad(u,p,t) = tgrad_oop(u,p,t)
-        _tgrad(J,u,p,t) = tgrad_iip(J,u,p,t)
-    else
-        _tgrad = nothing
-    end
-
     if jac
         jac_gen = generate_dae_jacobian(sys, dvs, ps;
                                         simplify=simplify, sparse=sparse,
                                         expression=Val{eval_expression}, expression_module=eval_module,
                                         checkbounds=checkbounds, kwargs...)
         jac_oop, jac_iip = eval_expression ? (@RuntimeGeneratedFunction(eval_module, ex) for ex in jac_gen) : jac_gen
-        _jac(u,p,t) = jac_oop(u,p,t)
-        _jac(J,u,p,t) = jac_iip(J,u,p,t)
+        _jac(du,u,p,t) = jac_oop(du,u,p,t)
+        _jac(J,du,u,p,ˍ₋gamma,t) = jac_iip(J,du,u,p,ˍ₋gamma,t)
     else
         _jac = nothing
     end
 
     DAEFunction{iip}(
                      f,
                      jac = _jac === nothing ? nothing : _jac,
-                     tgrad = _tgrad === nothing ? nothing : _tgrad,
-                     syms = Symbol.(dvs),
-                     indepsym = Symbol(get_iv(sys)),
+                     syms = Symbol.(dvs)
                      # missing fields in `DAEFunction`
                      #indepsym = Symbol(get_iv(sys)),
                      #observed = observedfun,