fix: avoid enum regression in error estimate init

Author: MilesCranmerBot

lib/OrdinaryDiffEqCore/src/solve.jl

@@ -318,7 +318,7 @@ function _ode_init(
 
     scalar_type_tol =
         uBottomEltypeNoUnits == uBottomEltype &&
-        uBottomEltype <: Union{Real,Complex}
+        uBottomEltype <: Union{Real, Complex}
 
     if prob isa SciMLBase.AbstractDiscreteProblem && abstol === nothing
         abstol_internal = false
@@ -695,8 +695,11 @@ function _ode_init(
     kshortsize = 0
     reeval_fsal = false
     u_modified = false
-    # Avoid calling oneunit on a Quantity *type* (DynamicQuantities stores dimensions at runtime).
-    EEst = oneunit(internalnorm(u, t)) # https://github.com/JuliaPhysics/Measurements.jl/pull/135
+    EEst = try
+        oneunit(EEstT)
+    catch
+        oneunit(internalnorm(u, t))
+    end # https://github.com/JuliaPhysics/Measurements.jl/pull/135
     just_hit_tstop = false
     next_step_tstop = false
     tstop_target = zero(t)

lib/OrdinaryDiffEqCore/test/dynamicquantities_measurements.jl

@@ -12,12 +12,12 @@ using Test
     f(u, p, t) = u / (1u"s")
     prob = ODEProblem(f, u0, tspan)
 
-    sol = solve(prob, Tsit5(); abstol = 1e-9, reltol = 1e-9)
+    sol = solve(prob, Tsit5(); abstol = 1.0e-9, reltol = 1.0e-9)
 
     @test sol.u[end] isa typeof(u0)
     @test eltype(sol.u) == typeof(u0)
 
     uend_m = ustrip(u"m", sol.u[end])
-    @test isapprox(Measurements.value(uend_m), exp(1); atol = 1e-6)
+    @test isapprox(Measurements.value(uend_m), exp(1); atol = 1.0e-6)
     @test Measurements.uncertainty(uend_m) > 0
 end