Mercurial > repos > public > sbplib
diff +sbp/D4CompatibleVariable.m @ 261:6009f2712d13 operator_remake
Moved and renamned all implementations.
| author | Martin Almquist <martin.almquist@it.uu.se> |
|---|---|
| date | Thu, 08 Sep 2016 15:35:45 +0200 |
| parents | 07fa0d6a05bb |
| children | 23051a86faa4 |
line wrap: on
line diff
--- a/+sbp/D4CompatibleVariable.m Thu Sep 08 14:36:06 2016 +0200 +++ b/+sbp/D4CompatibleVariable.m Thu Sep 08 15:35:45 2016 +0200 @@ -14,15 +14,21 @@ function obj = D4CompatibleVariable(m,h,order) if order == 2 - [H, HI, D1, D2, D3, D4, e_1, e_m, M4, Q, S2_1, S2_m, S3_1, S3_m, S_1, S_m] = sbp.higher2_compatible_halfvariable(m,h); + [H, HI, ~, D2, ~, D4, e_1, e_m, M4, ~, S2_1, S2_m, S3_1,... + S3_m, S_1, S_m] =... + sbp.implementations.d4_compatible_halfvariable_2(m,h); obj.borrowing.N.S2 = 1.2500; obj.borrowing.N.S3 = 0.4000; elseif order == 4 - [H, HI, D2, D4, e_1, e_m, M4, S2_1, S2_m, S3_1, S3_m, S_1, S_m] = sbp.higher4_compatible_halfvariable(m,h); + [H, HI, D2, D4, e_1, e_m, M4, S2_1, S2_m, S3_1, S3_m, S_1,... + S_m] =... + sbp.implementations.d4_compatible_halfvariable_4(m,h); obj.borrowing.N.S2 = 0.5055; obj.borrowing.N.S3 = 0.9290; elseif order == 6 - [H, HI, D2, D4, e_1, e_m, M4, S2_1, S2_m, S3_1, S3_m, S_1, S_m] = sbp.higher6_compatible_halfvariable(m,h); + [H, HI, D2, D4, e_1, e_m, M4, S2_1, S2_m, S3_1, S3_m, S_1,... + S_m] =... + sbp.implementations.d4_compatible_halfvariable_6(m,h); obj.borrowing.N.S2 = 0.3259; obj.borrowing.N.S3 = 0.1580; else