Mercurial > repos > public > sbplib
diff +sbp/D4Variable.m @ 324:c0cbffcf6513 feature/beams
Created new operator class for lonely D4 operators. Removed some output parameters of implementations.
| author | Jonatan Werpers <jonatan@werpers.com> |
|---|---|
| date | Mon, 26 Sep 2016 09:51:45 +0200 |
| parents | 9230c056a574 |
| children | 31d6698c1edf |
line wrap: on
line diff
--- a/+sbp/D4Variable.m Mon Sep 26 09:19:08 2016 +0200 +++ b/+sbp/D4Variable.m Mon Sep 26 09:51:45 2016 +0200 @@ -1,4 +1,4 @@ -classdef D4CompatibleVariable < sbp.OpSet +classdef D4Variable < sbp.OpSet properties D1 % SBP operator approximating first derivative H % Norm matrix @@ -6,18 +6,16 @@ Q % Skew-symmetric matrix e_l % Left boundary operator e_r % Right boundary operator - D2 % SBP operator for second derivative - M % Norm matrix, second derivative d1_l % Left boundary first derivative d1_r % Right boundary first derivative - D3 % SBP operator for third derivative - Q3 % Skew-symmetric matrix in third derivative d2_l % Left boundary second derivative d2_r % Right boundary second derivative + d3_l % Left boundary third derivative + d3_r % Right boundary third derivative + D2 % SBP operator for second derivative + M % Norm matrix, second derivative D4 % SBP operator for fourth derivative M4 % Norm matrix, fourth derivative - d3_l % Left boundary third derivative - d3_r % Right boundary third derivative m % Number of grid points. h % Step size x % grid @@ -25,9 +23,7 @@ end methods - function obj = D4CompatibleVariable(m, lim, order, opt) - default_arg('opt', '') - + function obj = D4Variable(m, lim, order) x_l = lim{1}; x_r = lim{2}; L = x_r-x_l; @@ -39,58 +35,16 @@ sbp.implementations.d4_variable_2(m, obj.h); obj.borrowing.N.S2 = 1.2500; obj.borrowing.N.S3 = 0.4000; - elseif order == 4 - switch opt - case 'min_boundary_points' - [H, HI, D1, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ... - 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, D1, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ... - sbp.implementations.d4_variable_4(m, obj.h); - obj.borrowing.N.S2 = 0.5055; - obj.borrowing.N.S3 = 0.9290; - end - + [H, HI, D1, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ... + sbp.implementations.d4_variable_4(m, obj.h); + obj.borrowing.N.S2 = 0.5055; + obj.borrowing.N.S3 = 0.9290; elseif order == 6 - switch opt - case '2' - [H, HI, D1, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ... - 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, D1, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ... - 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, D1, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ... - 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, D1, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ... - sbp.implementations.d4_variable_6(m, obj.h); - obj.borrowing.N.S2 = 0.3259; - obj.borrowing.N.S3 = 0.1580; - end - - elseif order == 8 - switch opt - case 'min_boundary_points' - [H, HI, D1, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ... - 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, D1, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ... - sbp.implementations.d4_variable_8_higher_boundary_order(m, obj.h); - % obj.borrowing.N.S2 = 0.3259; - % obj.borrowing.N.S3 = 0.1580; - end + [H, HI, D1, D2, D4, e_l, e_r, M4, d2_l, d2_r, d3_l, d3_r, d1_l, d1_r] = ... + sbp.implementations.d4_variable_6(m, obj.h); + obj.borrowing.N.S2 = 0.3259; + obj.borrowing.N.S3 = 0.1580; else error('Invalid operator order.'); end @@ -99,6 +53,7 @@ obj.H = H; obj.HI = HI; + obj.D1 = D1; obj.D2 = D2; obj.D4 = D4; obj.M4 = M4; @@ -110,9 +65,6 @@ obj.d2_r = d2_r; obj.d3_l = d3_l; obj.d3_r = d3_r; - - obj.D1 = []; - obj.D3 = []; end end end \ No newline at end of file