Mercurial > repos > public > sbplib

annotate +time/ExplicitRungeKuttaDiscreteData.m @ 857:3c916a00033f feature/poroelastic

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bugfix in static getTimeStep method in RungeKuttaDiscreteData
author Martin Almquist <malmquist@stanford.edu>
date Tue, 02 Oct 2018 13:42:11 -0700
parents ee4cfb37534d
children 4c7532db42cd
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
856
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
1 classdef ExplicitRungeKuttaDiscreteData < time.Timestepper
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
2 properties
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
3 D
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
4 S % Function handle for time-dependent data
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
5 data % Matrix of data vectors, one column per stage
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
6 k
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
7 t
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
8 v
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
9 m
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
10 n
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
11 order
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
12 a, b, c, s % Butcher tableau
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
13 K % Stage rates
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
14 U % Stage approximations
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
15 T % Stage times
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
16 end
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
17
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
18
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
19 methods
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
20 function obj = ExplicitRungeKuttaDiscreteData(D, S, data, k, t0, v0, order)
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
21 default_arg('order', 4);
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
22 default_arg('S', []);
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
23 default_arg('data', []);
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
24
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
25 obj.D = D;
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
26 obj.S = S;
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
27 obj.k = k;
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
28 obj.t = t0;
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
29 obj.v = v0;
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
30 obj.m = length(v0);
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
31 obj.n = 0;
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
32 obj.order = order;
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
33 obj.data = data;
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
34
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
35 switch order
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
36 case 4
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
37 [obj.a, obj.b, obj.c, obj.s] = time.rkparameters.rk4();
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
38 otherwise
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
39 error('That RK method is not available');
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
40 end
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
41
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
42 obj.K = sparse(obj.m, obj.s);
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
43 obj.U = sparse(obj.m, obj.s);
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
44
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
45 end
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
46
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
47 function [v,t,U,T,K] = getV(obj)
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
48 v = obj.v;
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
49 t = obj.t;
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
50 U = obj.U; % Stage approximations in previous time step.
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
51 T = obj.T; % Stage times in previous time step.
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
52 K = obj.K; % Stage rates in previous time step.
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
53 end
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
54
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
55 function [a,b,c,s] = getTableau(obj)
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
56 a = obj.a;
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
57 b = obj.b;
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
58 c = obj.c;
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
59 s = obj.s;
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
60 end
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
61
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
62 function obj = step(obj)
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
63 v = obj.v;
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
64 a = obj.a;
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
65 b = obj.b;
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
66 c = obj.c;
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
67 s = obj.s;
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
68 S = obj.S;
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
69 dt = obj.k;
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
70 K = obj.K;
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
71 U = obj.U;
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
72 D = obj.D;
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
73 data = obj.data;
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
74
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
75 for i = 1:s
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
76 U(:,i) = v;
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
77 for j = 1:i-1
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
78 U(:,i) = U(:,i) + dt*a(i,j)*K(:,j);
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
79 end
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
80
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
81 K(:,i) = D*U(:,i);
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
82 obj.T(i) = obj.t + c(i)*dt;
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
83
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
84 % Data from continuous function and discrete time-points.
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
85 if ~isempty(S)
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
86 K(:,i) = K(:,i) + S(obj.T(i));
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
87 end
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
88 if ~isempty(data)
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
89 K(:,i) = K(:,i) + data(:,obj.n*s + i);
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
90 end
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
91
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
92 end
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
93
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
94 obj.v = v + dt*K*b;
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
95 obj.t = obj.t + dt;
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
96 obj.n = obj.n + 1;
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
97 obj.U = U;
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
98 obj.K = K;
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
99 end
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
100 end
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
101
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
102
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
103 methods (Static)
857
3c916a00033f Bugfix in static getTimeStep method in RungeKuttaDiscreteData
Martin Almquist <malmquist@stanford.edu>
parents: 856
diff changeset
104 function k = getTimeStep(lambda, order)
3c916a00033f Bugfix in static getTimeStep method in RungeKuttaDiscreteData
Martin Almquist <malmquist@stanford.edu>
parents: 856
diff changeset
105 default_arg('order', 4);
3c916a00033f Bugfix in static getTimeStep method in RungeKuttaDiscreteData
Martin Almquist <malmquist@stanford.edu>
parents: 856
diff changeset
106 switch order
856
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
107 case 4
857
3c916a00033f Bugfix in static getTimeStep method in RungeKuttaDiscreteData
Martin Almquist <malmquist@stanford.edu>
parents: 856
diff changeset
108 k = time.rk4.get_rk4_time_step(lambda);
856
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
109 otherwise
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
110 error('Time-step function not available for this order');
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
111 end
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
112 end
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
113 end
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
114
ee4cfb37534d Merge with feature/d1_staggered to get RK timestepper for discrete data.
Martin Almquist <malmquist@stanford.edu>
parents:
diff changeset
115 end