From 67f6f24b9288ab838911341d2244783f29aa2cae Mon Sep 17 00:00:00 2001 From: Christopher Rackauckas Date: Mon, 26 Feb 2024 09:34:05 -0600 Subject: [PATCH] Bump ordinarydiffeq --- Project.toml | 4 ++-- src/systems/diffeqs/abstractodesystem.jl | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Project.toml b/Project.toml index b63b94a0f9..76ccd0e386 100644 --- a/Project.toml +++ b/Project.toml @@ -89,12 +89,12 @@ Libdl = "1" LinearAlgebra = "1" MLStyle = "0.4.17" NaNMath = "0.3, 1" -OrdinaryDiffEq = "6" +OrdinaryDiffEq = "6.72.0" PrecompileTools = "1" RecursiveArrayTools = "2.3, 3" Reexport = "0.2, 1" RuntimeGeneratedFunctions = "0.5.9" -SciMLBase = "2.27" +SciMLBase = "2.28.0" SciMLStructures = "1.0" Serialization = "1" Setfield = "0.7, 0.8, 1" diff --git a/src/systems/diffeqs/abstractodesystem.jl b/src/systems/diffeqs/abstractodesystem.jl index 1be3ab4037..fb1b5d3fb4 100644 --- a/src/systems/diffeqs/abstractodesystem.jl +++ b/src/systems/diffeqs/abstractodesystem.jl @@ -856,17 +856,18 @@ function process_DEProblem(constructor, sys::AbstractODESystem, u0map, parammap; ps = full_parameters(sys) iv = get_iv(sys) - initializeprob = ModelingToolkit.InitializationProblem(sys, u0map, parammap; guesses, warn_initialize_determined) - initializeprobmap = getu(initializeprob, unknowns(sys)) - # Append zeros to the variables which are determined by the initialization system # This essentially bypasses the check for if initial conditions are defined for DAEs # since they will be checked in the initialization problem's construction # TODO: make check for if a DAE cheaper than calculating the mass matrix a second time! if implicit_dae || calculate_massmatrix(sys) !== I + initializeprob = ModelingToolkit.InitializationProblem(sys, u0map, parammap; guesses, warn_initialize_determined) + initializeprobmap = getu(initializeprob, unknowns(sys)) zerovars = setdiff(unknowns(sys),defaults(sys)) .=> 0.0 trueinit = identity.([zerovars;u0map]) else + initializeprob = nothing + initializeprobmap = nothing trueinit = u0map end