change usage of some packages

Author: AndreaNeumayr

Project.toml

@@ -4,7 +4,6 @@ uuid = "cb905087-75eb-5f27-8515-1ce0ec8e839e"
 version = "0.12.2"
 
 [deps]
-DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
 DifferentialEquations = "0c46a032-eb83-5123-abaf-570d42b7fbaa"
 FiniteDiff = "6a86dc24-6348-571c-b903-95158fe2bd41"
@@ -21,17 +20,15 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 Sundials = "c3572dad-4567-51f8-b174-8c6c989267f4"
 TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
 Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
+SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
-InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
-OrdinaryDiffEqCore = "bbf590c4-e513-4bbe-9b18-05decba2e5d8"
-
 
 [compat]
-DiffEqBase = "6"
 DataFrames = "1"
 DifferentialEquations = "7"
+SciMLBase = "2"
 FiniteDiff = "2"
 ForwardDiff = "1"
 JSON = "1"
@@ -46,12 +43,14 @@ StaticArrays = "1"
 Sundials = "5"
 TimerOutputs = "0.5"
 Unitful = "1"
-Test = "1"
-InteractiveUtils = "1"
+CPUSummary = "0.2"
 LinearAlgebra = "1"
 Printf = "1"
-OrdinaryDiffEqCore = "3.0 - 3.99"
 julia = "1.10"
 
+
 [extras]
 CPUSummary = "2a0fbf3d-bb9c-48f3-b0a9-814d99fd7ab9"
+
+[targets]
+test = ["Test", "CPUSummary"]

examples/CauerLowPassFilter.jl

@@ -1,7 +1,6 @@
 module CauerLowPassFilterModel
 
 using Modia
-using Test
 @usingModiaPlot
 
 include("$(Modia.modelsPath)/Electric.jl")
@@ -17,11 +16,11 @@ c5 = 0.7262*1u"F"
 CauerLowPassOPVWithoutNodes(i=1) = Model(
   # Cauer low pass filter with operational amplifiers
 
-  C1 = Capacitor | Map(C=c1 + c2), 
+  C1 = Capacitor | Map(C=c1 + c2),
   C2 = Capacitor | Map(C=c2, v=Var(init=nothing)),
-  C3 = Capacitor | Map(C=l1*1u"F"), 
+  C3 = Capacitor | Map(C=l1*1u"F"),
   C4 = Capacitor | Map(C=c4*i, v=Var(init=nothing)),
-  C5 = Capacitor | Map(C=c2, v=Var(init=nothing)), 
+  C5 = Capacitor | Map(C=c2, v=Var(init=nothing)),
   R1 = Resistor | Map(R=1u"Ω"),
   R2 = Resistor | Map(R=1u"Ω"),
   R3 = Resistor | Map(R=1u"Ω"),
@@ -40,9 +39,9 @@ CauerLowPassOPVWithoutNodes(i=1) = Model(
   R10 = Resistor | Map(R=1u"Ω"),
   Op4 = IdealOpAmp3Pin,
   Op5 = IdealOpAmp3Pin,
-  C7 = Capacitor | Map(C=l2*1u"F"), 
-  C8 = Capacitor | Map(C=c4, i=Var(start=0u"A")), 
-  C9 = Capacitor | Map(C=c4 + c5), 
+  C7 = Capacitor | Map(C=l2*1u"F"),
+  C8 = Capacitor | Map(C=c4, i=Var(start=0u"A")),
+  C9 = Capacitor | Map(C=c4 + c5),
   R11 = Resistor | Map(R=1u"Ω"),
 
   G2 = Ground,
@@ -51,23 +50,23 @@ CauerLowPassOPVWithoutNodes(i=1) = Model(
   V = ConstantVoltage | Map(V=1.0u"V"),
   Ground1 = Ground,
 
-connect = :[ 
-  (Op1.in_p, G.p) 
-  (G1.p, Op2.in_p) 
-  (R1.n, Op1.in_n, C2.n, R2.n, C1.p, R3.p) 
-  (R3.n, C1.n, Op1.out, R4.p, C5.p) 
-  (R4.n, Op2.in_n, C3.p, R5.n) 
-  (C2.p, R5.p, Op3.out, C6.n, R9.p, C8.p) 
+connect = :[
+  (Op1.in_p, G.p)
+  (G1.p, Op2.in_p)
+  (R1.n, Op1.in_n, C2.n, R2.n, C1.p, R3.p)
+  (R3.n, C1.n, Op1.out, R4.p, C5.p)
+  (R4.n, Op2.in_n, C3.p, R5.n)
+  (C2.p, R5.p, Op3.out, C6.n, R9.p, C8.p)
   (C3.n, Op2.out, R2.p, R7.p)
-  (R7.n, Op3.in_n, C5.n, R6.n, C6.p, C4.n) 
+  (R7.n, Op3.in_n, C5.n, R6.n, C6.p, C4.n)
   (C4.p, R8.p, R11.n, C9.n, Op5.out)
-  (R9.n, R8.n, Op4.in_n, C7.p) 
+  (R9.n, R8.n, Op4.in_n, C7.p)
   (R6.p, C7.n, Op4.out, R10.p)
-  (G2.p, Op3.in_p) 
-  (R11.p, C9.p, R10.n, Op5.in_n, C8.n) 
-  (Op4.in_p, G3.p) 
-  (Op5.in_p, G4.p) 
-  (V.p, Ground1.p)            
+  (G2.p, Op3.in_p)
+  (R11.p, C9.p, R10.n, Op5.in_n, C8.n)
+  (Op4.in_p, G3.p)
+  (Op5.in_p, G4.p)
+  (V.p, Ground1.p)
   (V.n, R1.p)  ]
 )
 
@@ -82,7 +81,7 @@ println("Build array of $n Cauer low pass filters")
 model = @instantiateModel(Filters, logDetails=false, logTiming=true, unitless=true)
 
 println("Simulate")
-@time simulate!(model, Tsit5(), stopTime = 60, requiredFinalStates = 
+@time simulate!(model, Tsit5(), stopTime = 60, requiredFinalStates =
     [-0.5000732186007855, -0.5002239998029879, 0.4996923410661849, -0.4996706636198064, -0.5000929741546876, -0.5001255383344897, -0.500147742207576, 0.49981113006573824, -0.4996196061432069, -0.5001392063603706, -0.5001815616147427, -0.5000459266587362, 0.49996685095395915, -0.49958392015463465, -0.5001886259176451, -0.5002389821958331, -0.4999173001411904, 0.5001611780149184, -0.49957016523210945, -0.5002393712119582, -0.5002944833191254, -0.49976183273648583, 0.5003940588092074, -0.49958591550449066, -0.5002887040151874, -0.500343478728503, -0.4995812991530469, 0.5006629055320556, -0.49963969356758026, -0.5003327561376948, -0.50037980690654, -0.49938004306850625, 0.5009615326279456, -0.4997407922705924, -0.5003662177501006, -0.500395375828166, -0.4991659724894459, 0.5012787730322307, -0.4998989295998676, -0.5003819572251011, -0.5003797586125351, -0.49895184523346914, 0.5015966895590688, -0.5001236602409048, -0.5003705619890064, -0.5003197458974357, -0.49875691633150787, 0.5018882791340892, -0.5004234377294563, -0.5003197904255381])
 plot(model, ["filters_1.C9.v", "filters_2.C9.v", "filters_3.C9.v"])
 end

src/CodeGeneration.jl

@@ -3,8 +3,7 @@
 
 using  OrderedCollections: OrderedDict, OrderedSet
 using  DataFrames
-using  OrdinaryDiffEqCore
-
+using  SciMLBase
 #=
 fieldnames(typeof(integrator)) = (:sol, :u, :du, :k, :t, :dt, :f, :p, :uprev, :uprev2, :duprev, :tprev, :alg,
                                   :dtcache, :dtchangeable, :dtpropose, :tdir, :eigen_est, :EEst, :qold, :q11,
@@ -1523,7 +1522,7 @@ function affectEvent!(integrator, stateEvent::Bool, eventIndex::Int)::Nothing
     end
 
     # Adapt step size
-    if eh.restart != NoRestart && supertype(typeof(integrator.alg)) == OrdinaryDiffEqCore.OrdinaryDiffEqAdaptiveAlgorithm
+    if eh.restart != NoRestart && SciMLBase.isadaptive(integrator)
         DifferentialEquations.auto_dt_reset!(integrator)
         DifferentialEquations.set_proposed_dt!(integrator, integrator.dt)
     end

src/Modia.jl

@@ -147,7 +147,6 @@ using JSON
 #using Profile
 import Test
 using  TimerOutputs
-using  InteractiveUtils
 
 global to = TimerOutput()