Mercurial > repos > public > sbplib
comparison +sbp/D2Standard.m @ 269:479194747f9c operator_remake
Bug fix
author | Martin Almquist <martin.almquist@it.uu.se> |
---|---|
date | Fri, 09 Sep 2016 15:51:57 +0200 |
parents | 4b9310edcdf8 |
children | 3fdfad20037e a39fe3bcbd95 |
comparison
equal
deleted
inserted
replaced
268:4b9310edcdf8 | 269:479194747f9c |
---|---|
27 obj.x = linspace(x_l,x_r,m)'; | 27 obj.x = linspace(x_l,x_r,m)'; |
28 | 28 |
29 if order == 2 | 29 if order == 2 |
30 [obj.H, obj.HI, obj.D1, obj.D2, obj.e_l,... | 30 [obj.H, obj.HI, obj.D1, obj.D2, obj.e_l,... |
31 obj.e_r, obj.M, obj.Q, obj.d1_l, obj.d1_r] =... | 31 obj.e_r, obj.M, obj.Q, obj.d1_l, obj.d1_r] =... |
32 sbp.implementations.ordinary2(m,obj.h); | 32 sbp.implementations.d2_2(m,obj.h); |
33 obj.borrowing.M.S = 0.4000; | 33 obj.borrowing.M.S = 0.4000; |
34 elseif order == 4 | 34 elseif order == 4 |
35 [obj.H, obj.HI, obj.D1, obj.D2, obj.e_l,... | 35 [obj.H, obj.HI, obj.D1, obj.D2, obj.e_l,... |
36 obj.e_r, obj.M, obj.Q, obj.d1_l, obj.d1_r] =... | 36 obj.e_r, obj.M, obj.Q, obj.d1_l, obj.d1_r] =... |
37 sbp.implementations.ordinary4(m,obj.h); | 37 sbp.implementations.d2_4(m,obj.h); |
38 obj.borrowing.M.S = 0.2508; | 38 obj.borrowing.M.S = 0.2508; |
39 elseif order == 6 | 39 elseif order == 6 |
40 [obj.H, obj.HI, obj.D1, obj.D2, obj.e_l,... | 40 [obj.H, obj.HI, obj.D1, obj.D2, obj.e_l,... |
41 obj.e_r, obj.M, obj.Q, obj.d1_l, obj.d1_r] =... | 41 obj.e_r, obj.M, obj.Q, obj.d1_l, obj.d1_r] =... |
42 sbp.implementations.ordinary6(m,obj.h); | 42 sbp.implementations.d2_6(m,obj.h); |
43 obj.borrowing.M.S = 0.1878; | 43 obj.borrowing.M.S = 0.1878; |
44 elseif order == 8 | 44 elseif order == 8 |
45 [obj.H, obj.HI, obj.D1, obj.D2, obj.e_l,... | 45 [obj.H, obj.HI, obj.D1, obj.D2, obj.e_l,... |
46 obj.e_r, obj.M, obj.Q, obj.d1_l, obj.d1_r] =... | 46 obj.e_r, obj.M, obj.Q, obj.d1_l, obj.d1_r] =... |
47 sbp.implementations.ordinary8(m,obj.h); | 47 sbp.implementations.d2_8(m,obj.h); |
48 obj.borrowing.M.S = 0.0015; | 48 obj.borrowing.M.S = 0.0015; |
49 elseif order == 10 | 49 elseif order == 10 |
50 [obj.H, obj.HI, obj.D1, obj.D2, obj.e_l,... | 50 [obj.H, obj.HI, obj.D1, obj.D2, obj.e_l,... |
51 obj.e_r, obj.M, obj.Q, obj.d1_l, obj.d1_r] =... | 51 obj.e_r, obj.M, obj.Q, obj.d1_l, obj.d1_r] =... |
52 sbp.implementations.ordinary10(m,obj.h); | 52 sbp.implementations.d2_10(m,obj.h); |
53 obj.borrowing.M.S = 0.0351; | 53 obj.borrowing.M.S = 0.0351; |
54 elseif order == 12 | 54 elseif order == 12 |
55 [obj.H, obj.HI, obj.D1, obj.D2, obj.e_l,... | 55 [obj.H, obj.HI, obj.D1, obj.D2, obj.e_l,... |
56 obj.e_r, obj.M, obj.Q, obj.d1_l, obj.d1_r] =... | 56 obj.e_r, obj.M, obj.Q, obj.d1_l, obj.d1_r] =... |
57 sbp.implementations.ordinary12(m,obj.h); | 57 sbp.implementations.d2_12(m,obj.h); |
58 obj.borrowing.M.S = []; % Need to compute! | 58 obj.borrowing.M.S = []; % Need to compute! |
59 warning('D2=D1*D1 (wide stencil).'); | 59 warning('D2=D1*D1 (wide stencil).'); |
60 warning('The borrowing constant has not been computed.') | 60 warning('The borrowing constant has not been computed.') |
61 else | 61 else |
62 error('Invalid operator order %d.',order); | 62 error('Invalid operator order %d.',order); |