Mercurial > repos > public > sbplib

changeset 13:b18d3d201a71

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed initialization of step counter in timesteppers.
author Jonatan Werpers <jonatan@werpers.com>
date Tue, 22 Sep 2015 08:41:28 +0200
parents c71095442c57
children a66aefd5e6ac
files +time/Cdiff.m +time/CdiffNonlin.m +time/Rk4SecondOrderNonlin.m +time/Rungekutta4.m +time/Rungekutta4SecondOrder.m +time/Timestepper.m
diffstat 6 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
diff -r c71095442c57 -r b18d3d201a71 +time/Cdiff.m
--- a/+time/Cdiff.m	Tue Sep 22 08:35:57 2015 +0200
+++ b/+time/Cdiff.m	Tue Sep 22 08:41:28 2015 +0200
@@ -12,7 +12,7 @@
 
 
     methods
-        function obj = Cdiff(D, E, S, k, t0, v, v_prev)
+        function obj = Cdiff(D, E, S, k, t0, n0, v, v_prev)
             m = size(D,1);
             default_arg('E',sparse(m,m));
             default_arg('S',sparse(m,1));
@@ -29,6 +29,7 @@
             obj.S = S;
             obj.k = k;
             obj.t = t0;
+            obj.n = n0;
             obj.v = v;
             obj.v_prev = v_prev;
         end
diff -r c71095442c57 -r b18d3d201a71 +time/CdiffNonlin.m
--- a/+time/CdiffNonlin.m	Tue Sep 22 08:35:57 2015 +0200
+++ b/+time/CdiffNonlin.m	Tue Sep 22 08:41:28 2015 +0200
@@ -12,7 +12,7 @@
 
 
     methods
-        function obj = CdiffNonlin(D, E, S, k, t0, v, v_prev)
+        function obj = CdiffNonlin(D, E, S, k, t0,n0, v, v_prev)
             m = size(D(v),1);
             default_arg('E',@(v)sparse(m,m));
             default_arg('S',@(v,t)sparse(m,1));
@@ -27,6 +27,7 @@
             obj.S = S;
             obj.k = k;
             obj.t = t0;
+            obj.n = n0;
             obj.v = v;
             obj.v_prev = v_prev;
         end
diff -r c71095442c57 -r b18d3d201a71 +time/Rk4SecondOrderNonlin.m
--- a/+time/Rk4SecondOrderNonlin.m	Tue Sep 22 08:35:57 2015 +0200
+++ b/+time/Rk4SecondOrderNonlin.m	Tue Sep 22 08:41:28 2015 +0200
@@ -47,6 +47,7 @@
             obj.E = E;
             obj.S = S;
             obj.m = m;
+            obj.n = 0;
         end
 
         function [v,t] = getV(obj)
diff -r c71095442c57 -r b18d3d201a71 +time/Rungekutta4.m
--- a/+time/Rungekutta4.m	Tue Sep 22 08:35:57 2015 +0200
+++ b/+time/Rungekutta4.m	Tue Sep 22 08:41:28 2015 +0200
@@ -18,6 +18,7 @@
             obj.t = t0;
             obj.v = v0;
             obj.m = length(v0);
+            obj.n = 0;
 
             if S == 0
                 obj.S = zeros(obj.m,1);
diff -r c71095442c57 -r b18d3d201a71 +time/Rungekutta4SecondOrder.m
--- a/+time/Rungekutta4SecondOrder.m	Tue Sep 22 08:35:57 2015 +0200
+++ b/+time/Rungekutta4SecondOrder.m	Tue Sep 22 08:41:28 2015 +0200
@@ -20,6 +20,7 @@
             obj.E = E;
             obj.S = S;
             obj.m = length(v0);
+            obj.n = 0;
 
             I = speye(obj.m);
             O = sparse(obj.m,obj.m);
diff -r c71095442c57 -r b18d3d201a71 +time/Timestepper.m
--- a/+time/Timestepper.m	Tue Sep 22 08:35:57 2015 +0200
+++ b/+time/Timestepper.m	Tue Sep 22 08:41:28 2015 +0200
@@ -13,6 +13,7 @@
 
     methods
         function [v,t] = stepN(obj,n,progress_bar)
+            default_arg('progress_bar',false);
 
             if progress_bar && n > 1500
                 n1000 = floor(n/1000);