Mercurial > repos > public > sbplib_julia

diff TimeStepper.jl @ 28:32a53cbee6c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Resolved merge conflict adding plotting function to grid.jl
author Vidar Stiernström <vidar.stiernstrom@it.uu.se>
date Thu, 10 Jan 2019 10:38:42 +0100
parents 1e845cd91cd3
children
line wrap: on
line diff
--- a/TimeStepper.jl	Tue Jan 08 11:17:20 2019 +0100
+++ b/TimeStepper.jl	Thu Jan 10 10:38:42 2019 +0100
@@ -6,7 +6,7 @@
 end
 
 
-function step(ts::TimeStepper)
+function step!(ts::TimeStepper)
 	error("not implemented")
 end
 
@@ -45,7 +45,7 @@
 	return ts.t, ts.v
 end
 
-function step(ts::Rk4)
+function step!(ts::Rk4)
     k1 = ts.F(ts.v,ts.t)
 	k2 = ts.F(ts.v+0.5*ts.k*k1,ts.t+0.5*ts.k)
 	k3 = ts.F(ts.v+0.5*ts.k*k2,ts.t+0.5*ts.k)