Mercurial > repos > public > sbplib

comparison +sbp/D4Variable.m @ 312:9230c056a574 feature/beams

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed formatting.
author Jonatan Werpers <jonatan@werpers.com>
date Fri, 23 Sep 2016 19:14:04 +0200
parents ffa5d557942b
children c0cbffcf6513
comparison
equal deleted inserted replaced
311:713b125038a3 312:9230c056a574
33 L = x_r-x_l; 33 L = x_r-x_l;
34 obj.h = L/(m-1); 34 obj.h = L/(m-1);
35 obj.x = linspace(x_l, x_r,m)'; 35 obj.x = linspace(x_l, x_r,m)';
36 36
37 if order == 2 37 if order == 2
38 [H, HI, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ... 38 [H, HI, D1, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ...
39 sbp.implementations.d4_variable_2(m, obj.h); 39 sbp.implementations.d4_variable_2(m, obj.h);
40 obj.borrowing.N.S2 = 1.2500; 40 obj.borrowing.N.S2 = 1.2500;
41 obj.borrowing.N.S3 = 0.4000; 41 obj.borrowing.N.S3 = 0.4000;
42 42
43 elseif order == 4 43 elseif order == 4
44 switch opt 44 switch opt
45 case 'min_boundary_points' 45 case 'min_boundary_points'
46 [H, HI, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ... 46 [H, HI, D1, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ...
47 sbp.implementations.d4_variable_4_min_boundary_points(m, obj.h); 47 sbp.implementations.d4_variable_4_min_boundary_points(m, obj.h);
48 % obj.borrowing.N.S2 = 0.5055; 48 % obj.borrowing.N.S2 = 0.5055;
49 % obj.borrowing.N.S3 = 0.9290; 49 % obj.borrowing.N.S3 = 0.9290;
50 otherwise 50 otherwise
51 [H, HI, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ... 51 [H, HI, D1, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ...
52 sbp.implementations.d4_variable_4(m, obj.h); 52 sbp.implementations.d4_variable_4(m, obj.h);
53 obj.borrowing.N.S2 = 0.5055; 53 obj.borrowing.N.S2 = 0.5055;
54 obj.borrowing.N.S3 = 0.9290; 54 obj.borrowing.N.S3 = 0.9290;
55 end 55 end
56 56
57 elseif order == 6 57 elseif order == 6
58 switch opt 58 switch opt
59 case '2' 59 case '2'
60 [H, HI, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ... 60 [H, HI, D1, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ...
61 sbp.implementations.d4_variable_6_2(m, obj.h); 61 sbp.implementations.d4_variable_6_2(m, obj.h);
62 % obj.borrowing.N.S2 = 0.3259; 62 % obj.borrowing.N.S2 = 0.3259;
63 % obj.borrowing.N.S3 = 0.1580; 63 % obj.borrowing.N.S3 = 0.1580;
64 case '3' 64 case '3'
65 [H, HI, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ... 65 [H, HI, D1, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ...
66 sbp.implementations.d4_variable_6_3(m, obj.h); 66 sbp.implementations.d4_variable_6_3(m, obj.h);
67 % obj.borrowing.N.S2 = 0.3259; 67 % obj.borrowing.N.S2 = 0.3259;
68 % obj.borrowing.N.S3 = 0.1580; 68 % obj.borrowing.N.S3 = 0.1580;
69 case 'min_boundary_points' 69 case 'min_boundary_points'
70 [H, HI, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ... 70 [H, HI, D1, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ...
71 sbp.implementations.d4_variable_6_min_boundary_points(m, obj.h); 71 sbp.implementations.d4_variable_6_min_boundary_points(m, obj.h);
72 % obj.borrowing.N.S2 = 0.3259; 72 % obj.borrowing.N.S2 = 0.3259;
73 % obj.borrowing.N.S3 = 0.1580; 73 % obj.borrowing.N.S3 = 0.1580;
74 otherwise 74 otherwise
75 [H, HI, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ... 75 [H, HI, D1, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ...
76 sbp.implementations.d4_variable_6(m, obj.h); 76 sbp.implementations.d4_variable_6(m, obj.h);
77 obj.borrowing.N.S2 = 0.3259; 77 obj.borrowing.N.S2 = 0.3259;
78 obj.borrowing.N.S3 = 0.1580; 78 obj.borrowing.N.S3 = 0.1580;
79 end 79 end
80 80
81 elseif order == 8 81 elseif order == 8
82 switch opt 82 switch opt
83 case 'min_boundary_points' 83 case 'min_boundary_points'
84 [H, HI, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ... 84 [H, HI, D1, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ...
85 sbp.implementations.d4_variable_8_min_boundary_points(m, obj.h); 85 sbp.implementations.d4_variable_8_min_boundary_points(m, obj.h);
86 % obj.borrowing.N.S2 = 0.3259; 86 % obj.borrowing.N.S2 = 0.3259;
87 % obj.borrowing.N.S3 = 0.1580; 87 % obj.borrowing.N.S3 = 0.1580;
88 otherwise 88 otherwise
89 [H, HI, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ... 89 [H, HI, D1, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ...
90 sbp.implementations.d4_variable_8_higher_boundary_order(m, obj.h); 90 sbp.implementations.d4_variable_8_higher_boundary_order(m, obj.h);
91 % obj.borrowing.N.S2 = 0.3259; 91 % obj.borrowing.N.S2 = 0.3259;
92 % obj.borrowing.N.S3 = 0.1580; 92 % obj.borrowing.N.S3 = 0.1580;
93 end 93 end
94 else 94 else
103 obj.D4 = D4; 103 obj.D4 = D4;
104 obj.M4 = M4; 104 obj.M4 = M4;
105 obj.e_l = e_l; 105 obj.e_l = e_l;
106 obj.e_r = e_r; 106 obj.e_r = e_r;
107 obj.d1_l = d1_l; 107 obj.d1_l = d1_l;
108 obj.d1_r = d1_r ; 108 obj.d1_r = d1_r;
109 obj.d2_l = d2_l; 109 obj.d2_l = d2_l;
110 obj.d2_r = d2_r; 110 obj.d2_r = d2_r;
111 obj.d3_l = d3_l; 111 obj.d3_l = d3_l;
112 obj.d3_r = d3_r; 112 obj.d3_r = d3_r;
113 113