Mercurial > repos > public > sbplib
diff +sbp/D2Variable.m @ 886:8894e9c49e40 feature/timesteppers
Merge with default for latest changes
| author | Vidar Stiernström <vidar.stiernstrom@it.uu.se> |
|---|---|
| date | Thu, 15 Nov 2018 16:36:21 -0800 |
| parents | 52a9dedb9171 |
| children | 738de3a4058b |
line wrap: on
line diff
--- a/+sbp/D2Variable.m Mon Sep 10 16:19:16 2018 +0200 +++ b/+sbp/D2Variable.m Thu Nov 15 16:36:21 2018 -0800 @@ -18,7 +18,7 @@ methods function obj = D2Variable(m,lim,order) - + x_l = lim{1}; x_r = lim{2}; L = x_r-x_l; @@ -26,28 +26,48 @@ obj.x = linspace(x_l,x_r,m)'; switch order + + case 6 + + [obj.H, obj.HI, obj.D1, obj.D2, ... + ~, obj.e_l, obj.e_r, ~, ~, ~, ~, ~,... + obj.d1_l, obj.d1_r] = ... + sbp.implementations.d4_variable_6(m, obj.h); + obj.borrowing.M.d1 = 0.1878; + obj.borrowing.R.delta_D = 0.3696; + % Borrowing e^T*D1 - d1 from R + case 4 [obj.H, obj.HI, obj.D1, obj.D2, obj.e_l,... obj.e_r, obj.d1_l, obj.d1_r] = ... sbp.implementations.d2_variable_4(m,obj.h); - obj.borrowing.M.S = 0.2505765857; + obj.borrowing.M.d1 = 0.2505765857; + + obj.borrowing.R.delta_D = 0.577587500088313; + % Borrowing e^T*D1 - d1 from R case 2 [obj.H, obj.HI, obj.D1, obj.D2, obj.e_l,... obj.e_r, obj.d1_l, obj.d1_r] = ... sbp.implementations.d2_variable_2(m,obj.h); - obj.borrowing.M.S = 0.3636363636; + obj.borrowing.M.d1 = 0.3636363636; % Borrowing const taken from Virta 2014 + + obj.borrowing.R.delta_D = 1.000000538455350; + % Borrowing e^T*D1 - d1 from R otherwise error('Invalid operator order %d.',order); end - + obj.borrowing.H11 = obj.H(1,1)/obj.h; % First element in H/h, obj.m = m; obj.M = []; - + end + function str = string(obj) + str = [class(obj) '_' num2str(obj.order)]; end end + end