revert bad initdt "fix"

Author: ChrisRackauckas

.travis.yml

@@ -4,12 +4,10 @@ os:
   - linux
   - osx
 julia:
-  - 0.5
   - 0.6
   - nightly
 matrix:
   allow_failures:
-    - julia: 0.6
     - julia: nightly
 notifications:
   email: false

appveyor.yml

@@ -1,15 +1,11 @@
 environment:
   matrix:
-    - JULIAVERSION: "julialang/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"
-    - JULIAVERSION: "julialang/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
     - JULIAVERSION: "julialang/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
     - JULIAVERSION: "julialang/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
     - JULIAVERSION: "julianightlies/bin/winnt/x86/julia-latest-win32.exe"
     - JULIAVERSION: "julianightlies/bin/winnt/x64/julia-latest-win64.exe"
 matrix:
   allow_failures:
-    - JULIAVERSION: "julialang/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
-    - JULIAVERSION: "julialang/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
     - JULIAVERSION: "julianightlies/bin/winnt/x86/julia-latest-win32.exe"
     - JULIAVERSION: "julianightlies/bin/winnt/x64/julia-latest-win64.exe"
 branches:

src/initdt.jl

@@ -12,7 +12,7 @@ function ode_determine_initdt{tType,uType}(u0,t::tType,tdir,dtmax,abstol,reltol,
   else
     dt₀ = tType((d₀/d₁)/100)
   end
-  dt₀ = min(dt₀,dtmax)
+  dt₀ = min(dt₀,tdir*dtmax)
   @inbounds for i in eachindex(u0)
      u₁[i] = u0[i] + tdir*dt₀*f₀[i]
   end
@@ -26,7 +26,7 @@ function ode_determine_initdt{tType,uType}(u0,t::tType,tdir,dtmax,abstol,reltol,
   else
     dt₁ = tType(10.0^(-(2+log10(unitless_max))/(order)))
   end
-  dt = tdir*min(100dt₀,dt₁,dtmax)
+  dt = tdir*min(100dt₀,dt₁,tdir*dtmax)
 end
 
 function ode_determine_initdt{uType,tType}(u0::uType,t,tdir,dtmax,abstol,reltol,internalnorm,prob::AbstractODEProblem{uType,tType,false},order)
@@ -42,7 +42,7 @@ function ode_determine_initdt{uType,tType}(u0::uType,t,tdir,dtmax,abstol,reltol,
   else
     dt₀ = tType((d₀/d₁)/100)
   end
-  dt₀ = min(dt₀,dtmax)
+  dt₀ = min(dt₀,tdir*dtmax)
   u₁ = u0 + tdir*dt₀*f₀
   f₁ = f(t+tdir*dt₀,u₁)
   d₂ = internalnorm((f₁-f₀)./(abstol+abs.(u0).*reltol))/dt₀*tType(1)
@@ -51,5 +51,5 @@ function ode_determine_initdt{uType,tType}(u0::uType,t,tdir,dtmax,abstol,reltol,
   else
     dt₁ = tType(10.0^(-(2+log10(max(d₁,d₂)/T1(1)))/(order)))
   end
-  dt = tdir*min(100dt₀,dt₁,dtmax)
+  dt = tdir*min(100dt₀,dt₁,tdir*dtmax)
 end

test/ode/ode_initdt_tests.jl

@@ -23,33 +23,40 @@ dt₀ = sol3.t[2]
 
 @test 1e-7 < dt₀ < .3
 
+prob = prob_ode_linear
+sol = solve(prob,DP5())
+
 if !is_windows()
   using ODEInterfaceDiffEq, Base.Test
-  prob = prob_ode_linear
-  sol = solve(prob,DP5())
   sol2 = solve(prob,dopri5())
-
   @test sol.t[2] ≈ sol2.t[2]
+end
+
 
-  prob = prob_ode_2Dlinear
-  sol = solve(prob,DP5(),internalnorm=(u)->sqrt(sum(abs2,u)))
+prob = prob_ode_2Dlinear
+sol = solve(prob,DP5(),internalnorm=(u)->sqrt(sum(abs2,u)))
+
+if !is_windows()
   # Change the norm due to error in dopri5.f
   sol2 = solve(prob,dopri5())
-
   @test sol.t[2] ≈ sol2.t[2]
+end
 
-  prob = deepcopy(prob_ode_linear)
-  prob.tspan = (1.0,0.0)
-  sol = solve(prob,DP5())
-  sol2 = solve(prob,dopri5())
+prob = deepcopy(prob_ode_linear)
+prob.tspan = (1.0,0.0)
+sol = solve(prob,DP5())
 
+if !is_windows()
+  sol2 = solve(prob,dopri5())
   @test sol.t[2] ≈ sol2.t[2]
+end
+
+prob = deepcopy(prob_ode_2Dlinear)
+prob.tspan = (1.0,0.0)
+sol = solve(prob,DP5(),internalnorm=(u)->sqrt(sum(abs2,u)))
 
-  prob = deepcopy(prob_ode_2Dlinear)
-  prob.tspan = (1.0,0.0)
-  sol = solve(prob,DP5(),internalnorm=(u)->sqrt(sum(abs2,u)))
+if !is_windows()
   # Change the norm due to error in dopri5.f
   sol2 = solve(prob,dopri5())
-
   @test sol.t[2] ≈ sol2.t[2]
 end