comparison +sbp/D2Variable.m @ 1140:738de3a4058b feature/laplace_curvilinear_test

Update borrowing constants so that M constants are from Virta2014 and R constants are for bp=2,4,7.
author Martin Almquist <malmquist@stanford.edu>
date Fri, 21 Jun 2019 17:28:02 +0200
parents 52a9dedb9171
children
comparison
equal deleted inserted replaced
1139:6bc93c091682 1140:738de3a4058b
31 31
32 [obj.H, obj.HI, obj.D1, obj.D2, ... 32 [obj.H, obj.HI, obj.D1, obj.D2, ...
33 ~, obj.e_l, obj.e_r, ~, ~, ~, ~, ~,... 33 ~, obj.e_l, obj.e_r, ~, ~, ~, ~, ~,...
34 obj.d1_l, obj.d1_r] = ... 34 obj.d1_l, obj.d1_r] = ...
35 sbp.implementations.d4_variable_6(m, obj.h); 35 sbp.implementations.d4_variable_6(m, obj.h);
36 obj.borrowing.M.d1 = 0.1878; 36 % obj.borrowing.M.d1 = 0.1878;
37 obj.borrowing.R.delta_D = 0.3696; 37
38 % From Virta 2014:
39 obj.borrowing.M.d1 = 0.1878687080;
40
41 obj.borrowing.R.delta_D = 0.369684816368150;
38 % Borrowing e^T*D1 - d1 from R 42 % Borrowing e^T*D1 - d1 from R
39 43
40 case 4 44 case 4
41 [obj.H, obj.HI, obj.D1, obj.D2, obj.e_l,... 45 [obj.H, obj.HI, obj.D1, obj.D2, obj.e_l,...
42 obj.e_r, obj.d1_l, obj.d1_r] = ... 46 obj.e_r, obj.d1_l, obj.d1_r] = ...
43 sbp.implementations.d2_variable_4(m,obj.h); 47 sbp.implementations.d2_variable_4(m,obj.h);
48
49 % From Virta 2014:
44 obj.borrowing.M.d1 = 0.2505765857; 50 obj.borrowing.M.d1 = 0.2505765857;
45 51
46 obj.borrowing.R.delta_D = 0.577587500088313; 52 obj.borrowing.R.delta_D = 0.577587500088252;
47 % Borrowing e^T*D1 - d1 from R 53 % Borrowing e^T*D1 - d1 from R
48 case 2 54 case 2
49 [obj.H, obj.HI, obj.D1, obj.D2, obj.e_l,... 55 [obj.H, obj.HI, obj.D1, obj.D2, obj.e_l,...
50 obj.e_r, obj.d1_l, obj.d1_r] = ... 56 obj.e_r, obj.d1_l, obj.d1_r] = ...
51 sbp.implementations.d2_variable_2(m,obj.h); 57 sbp.implementations.d2_variable_2(m,obj.h);
52 obj.borrowing.M.d1 = 0.3636363636; 58 obj.borrowing.M.d1 = 0.3636363636;
53 % Borrowing const taken from Virta 2014 59 % Borrowing const taken from Virta 2014
54 60
55 obj.borrowing.R.delta_D = 1.000000538455350; 61 obj.borrowing.R.delta_D = 1.000000000000000;
56 % Borrowing e^T*D1 - d1 from R 62 % Borrowing e^T*D1 - d1 from R
57 63
58 otherwise 64 otherwise
59 error('Invalid operator order %d.',order); 65 error('Invalid operator order %d.',order);
60 end 66 end
61 obj.borrowing.H11 = obj.H(1,1)/obj.h; % First element in H/h, 67 obj.borrowing.H11 = obj.H(1,1)/obj.h; % First element in H/h,
62 obj.m = m; 68 obj.m = m;