Mercurial > repos > public > sbplib

changeset 389:42c89b5eedc0 feature/beams

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add borrowing constants for D2 operators in D4Variable
author Jonatan Werpers <jonatan@werpers.com>
date Tue, 10 Jan 2017 17:31:28 +0100
parents 288138d9586d
children 4b9e82eab88a
files +sbp/D2Variable.m +sbp/D4Variable.m +scheme/Wave2dCurve.m
diffstat 3 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
diff -r 288138d9586d -r 42c89b5eedc0 +sbp/D2Variable.m
--- a/+sbp/D2Variable.m	Mon Jan 09 11:20:28 2017 +0100
+++ b/+sbp/D2Variable.m	Tue Jan 10 17:31:28 2017 +0100
@@ -30,7 +30,7 @@
                     [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;
                 otherwise
                     error('Invalid operator order %d.',order);
             end
diff -r 288138d9586d -r 42c89b5eedc0 +sbp/D4Variable.m
--- a/+sbp/D4Variable.m	Mon Jan 09 11:20:28 2017 +0100
+++ b/+sbp/D4Variable.m	Tue Jan 10 17:31:28 2017 +0100
@@ -30,16 +30,19 @@
             if order == 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_2(m, obj.h);
+                obj.borrowing.M.d1 = 0.4000;
                 obj.borrowing.N.S2 = 1.2500;
                 obj.borrowing.N.S3 = 0.4000;
             elseif order == 4
                 [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.M.d1 = 0.2508;
                 obj.borrowing.N.S2 = 0.5055;
                 obj.borrowing.N.S3 = 0.9290;
             elseif order == 6
                 [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.M.d1 = 0.1878;
                 obj.borrowing.N.S2 = 0.3259;
                 obj.borrowing.N.S3 = 0.1580;
             else
diff -r 288138d9586d -r 42c89b5eedc0 +scheme/Wave2dCurve.m
--- a/+scheme/Wave2dCurve.m	Mon Jan 09 11:20:28 2017 +0100
+++ b/+scheme/Wave2dCurve.m	Tue Jan 10 17:31:28 2017 +0100
@@ -153,8 +153,8 @@
             obj.D = obj.Ji*c^2*(Duu + Duv + Dvu + Dvv);
             obj.lambda = lambda;
 
-            obj.gamm_u = h_u*ops_u.borrowing.M.S;
-            obj.gamm_v = h_v*ops_v.borrowing.M.S;
+            obj.gamm_u = h_u*ops_u.borrowing.M.d1;
+            obj.gamm_v = h_v*ops_v.borrowing.M.d1;
         end