Mercurial > repos > public > sbplib

comparison +noname/calculateSolution.m @ 137:2b133d833668

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added forgotten setting of k.
author Jonatan Werpers <jonatan@werpers.com>
date Tue, 09 Feb 2016 14:04:10 +0100
parents 8298734b1938
children bd99ea1fc733
comparison
equal deleted inserted replaced
136:8298734b1938 137:2b133d833668
54 % if T contained 0 it has now been removed. 54 % if T contained 0 it has now been removed.
55 55
56 if is_int_multiples 56 if is_int_multiples
57 % Times are integer multiples, we can save time 57 % Times are integer multiples, we can save time
58 [k,N] = alignedTimestep(k_max,T(1)); 58 [k,N] = alignedTimestep(k_max,T(1));
59 tsOpt.k = k;
59 ts = discr.getTimestepper(tsOpt); 60 ts = discr.getTimestepper(tsOpt);
60 runtime = 0; 61 runtime = 0;
61 for l = 1:length(T) 62 for l = 1:length(T)
62 end_step = N * time_multiples(l); 63 end_step = N * time_multiples(l);
63 fprintf('[order = %-*d, m = %-*d, T = %-*d]: ',orderWidth,order(i),mWidth,m(j),TWidth,T(l)); 64 fprintf('[order = %-*d, m = %-*d, T = %-*d]: ',orderWidth,order(i),mWidth,m(j),TWidth,T(l));
70 end 71 end
71 else 72 else
72 % Times are not interger multiples, we have to start from 0 every time. 73 % Times are not interger multiples, we have to start from 0 every time.
73 for l = 1:length(T) 74 for l = 1:length(T)
74 [k,N] = alignedTimestep(k_max,T(l)); 75 [k,N] = alignedTimestep(k_max,T(l));
76 tsOpt.k = k;
75 ts = discr.getTimestepper(tsOpt); 77 ts = discr.getTimestepper(tsOpt);
76 fprintf('[order = %-*d, m = %-*d, T = %-*d]: ',orderWidth,order(i),mWidth,m(j),TWidth,T(l)); 78 fprintf('[order = %-*d, m = %-*d, T = %-*d]: ',orderWidth,order(i),mWidth,m(j),TWidth,T(l));
77 clock_start = tic(); 79 clock_start = tic();
78 [v,t] = ts.stepN(N-ts.n,true); 80 [v,t] = ts.stepN(N-ts.n,true);
79 runtime = toc(clock_start); 81 runtime = toc(clock_start);