adapt adjoint_sensitivity syntax

Author: mjohnson541

src/Simulation.jl

@@ -1,6 +1,6 @@
 using SciMLBase
-import SciMLBase: AbstractODESolution, HermiteInterpolation
-using DiffEqSensitivity
+import SciMLBase: AbstractODESolution, HermiteInterpolation, AbstractDiffEqInterpolation
+using SciMLSensitivity
 using ForwardDiff
 using PreallocationTools
 
@@ -538,15 +538,19 @@ function getadjointsensitivities(bsol::Q, target::String, solver::W; sensalg::W2
 
     if length(bsol.domain.p) <= pethane
         if target in ["T", "V", "P", "mass"] || !isempty(bsol.interfaces)
-            du0, dpadj = adjoint_sensitivities(bsol.sol, solver, g, nothing, (dgdu, dgdp); sensealg=sensalg, abstol=abstol, reltol=reltol, kwargs...)
+            du0, dpadj = adjoint_sensitivities(bsol.sol, solver; g=g, dgdu_continuous=dgdu, 
+                    dgdp_continuous=dgdp, sensealg=sensalg, abstol=abstol, reltol=reltol, kwargs...)
         else
-            du0, dpadj = adjoint_sensitivities(bsol.sol, solver, sensg, nothing, (dsensgdu, dsensgdp); sensealg=sensalg, abstol=abstol, reltol=reltol, kwargs...)
+            du0, dpadj = adjoint_sensitivities(bsol.sol, solver; g=sensg, dgdu_continuous=dsensgdu, 
+                    dgdp_continuous=dsensgdp, sensealg=sensalg, abstol=abstol, reltol=reltol, kwargs...)
         end
     else
         if target in ["T", "V", "P", "mass"] || !isempty(bsol.interfaces)
-            du0, dpadj = adjoint_sensitivities(bsol.sol, solver, g, nothing, (dgdurevdiff, dgdprevdiff); sensealg=sensalg, abstol=abstol, reltol=reltol, kwargs...)
+            du0, dpadj = adjoint_sensitivities(bsol.sol, solver; g=g, dgdu_continuous=gdurevdiff, 
+                    dgdp_continuous=dgdprevdiff, sensealg=sensalg, abstol=abstol, reltol=reltol, kwargs...)
         else
-            du0, dpadj = adjoint_sensitivities(bsol.sol, solver, sensg, nothing, (dsensgdurevdiff, dsensgdprevdiff); sensealg=sensalg, abstol=abstol, reltol=reltol, kwargs...)
+            du0, dpadj = adjoint_sensitivities(bsol.sol, solver; g=sensg, dgdu_continuous=dsensgdurevdiff,
+                     dgdp_continuous=dsensgdprevdiff, sensealg=sensalg, abstol=abstol, reltol=reltol, kwargs...)
         end
     end
     if normalize
@@ -591,7 +595,8 @@ function getadjointsensitivities(syssim::Q, bsol::W3, target::String, solver::W;
     end
     dgdu(out, y, p, t) = ForwardDiff.gradient!(out, y -> g(y, p, t), y)
     dgdp(out, y, p, t) = ForwardDiff.gradient!(out, p -> g(y, p, t), p)
-    du0, dpadj = adjoint_sensitivities(syssim.sol, solver, g, nothing, (dgdu, dgdp); sensealg=sensalg, abstol=abstol, reltol=reltol, kwargs...)
+    du0, dpadj = adjoint_sensitivities(syssim.sol, solver; g=g, dgdu_continuous=dgdu, dgdp_continuous=dgdp,
+             sensealg=sensalg, abstol=abstol, reltol=reltol, kwargs...)
     if normalize
         for domain in domains
             dpadj[domain.parameterindexes[1]+length(domain.phase.species):domain.parameterindexes[2]] .*= syssim.p[domain.parameterindexes[1]+length(domain.phase.species):domain.parameterindexes[2]]