Mercurial > repos > public > sbplib
diff +sbp/D4Variable.m @ 310:ffa5d557942b feature/beams
Moved operator implementations and fixed some naming.
| author | Jonatan Werpers <jonatan@werpers.com> |
|---|---|
| date | Fri, 23 Sep 2016 14:55:08 +0200 |
| parents | 8fafe97bf27b |
| children | 9230c056a574 |
line wrap: on
line diff
--- a/+sbp/D4Variable.m Fri Sep 23 10:52:53 2016 +0200 +++ b/+sbp/D4Variable.m Fri Sep 23 14:55:08 2016 +0200 @@ -35,10 +35,8 @@ obj.x = linspace(x_l, x_r,m)'; if order == 2 - [obj.H, obj.HI, ~, obj.D2, ~, obj.D4, obj.e_l, obj.e_r,... - obj.M4, ~, obj.d2_l, obj.d2_r, obj.d3_l,... - obj.d3_r, obj.d1_l, obj.d1_r] =... - sbp.implementations.d4_compatible_halfvariable_2(m,obj.h); + [H, HI, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ... + sbp.implementations.d4_variable_2(m, obj.h); obj.borrowing.N.S2 = 1.2500; obj.borrowing.N.S3 = 0.4000; @@ -46,12 +44,12 @@ switch opt case 'min_boundary_points' [H, HI, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ... - sbp.higher_variable4_min_boundary_points(m, obj.h); + sbp.implementations.d4_variable_4_min_boundary_points(m, obj.h); % obj.borrowing.N.S2 = 0.5055; % obj.borrowing.N.S3 = 0.9290; otherwise [H, HI, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ... - sbp.implementations.d4_compatible_halfvariable_4(m, obj.h); + sbp.implementations.d4_variable_4(m, obj.h); obj.borrowing.N.S2 = 0.5055; obj.borrowing.N.S3 = 0.9290; end @@ -60,22 +58,22 @@ switch opt case '2' [H, HI, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ... - sbp.higher_variable6_2(m, obj.h); + sbp.implementations.d4_variable_6_2(m, obj.h); % obj.borrowing.N.S2 = 0.3259; % obj.borrowing.N.S3 = 0.1580; case '3' [H, HI, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ... - sbp.higher_variable6_3(m, obj.h); + sbp.implementations.d4_variable_6_3(m, obj.h); % obj.borrowing.N.S2 = 0.3259; % obj.borrowing.N.S3 = 0.1580; case 'min_boundary_points' [H, HI, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ... - sbp.higher_variable6_min_boundary_points(m, obj.h); + sbp.implementations.d4_variable_6_min_boundary_points(m, obj.h); % obj.borrowing.N.S2 = 0.3259; % obj.borrowing.N.S3 = 0.1580; otherwise [H, HI, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ... - sbp.implementations.d4_compatible_halfvariable_6(m, obj.h); + sbp.implementations.d4_variable_6(m, obj.h); obj.borrowing.N.S2 = 0.3259; obj.borrowing.N.S3 = 0.1580; end @@ -84,12 +82,12 @@ switch opt case 'min_boundary_points' [H, HI, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ... - sbp.higher_variable8_min_boundary_points(m, obj.h); + sbp.implementations.d4_variable_8_min_boundary_points(m, obj.h); % obj.borrowing.N.S2 = 0.3259; % obj.borrowing.N.S3 = 0.1580; otherwise [H, HI, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ... - sbp.higher_variable8_higher_boundary_order(m, obj.h); + sbp.implementations.d4_variable_8_higher_boundary_order(m, obj.h); % obj.borrowing.N.S2 = 0.3259; % obj.borrowing.N.S3 = 0.1580; end