Mercurial > repos > public > sbplib

changeset 147:03151dd46534

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed function name bug in calc_borrowing and added ordinary operators.
author Jonatan Werpers <jonatan@werpers.com>
date Mon, 04 Apr 2016 18:34:12 +0200
parents 2ccfe80e9b58
children 1f5f988e9682
files +util/calc_borrowing.m
diffstat 1 files changed, 27 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/+util/calc_borrowing.m	Mon Mar 21 16:27:19 2016 +0100
+++ b/+util/calc_borrowing.m	Mon Apr 04 18:34:12 2016 +0200
@@ -32,7 +32,7 @@
 
 
 %% 2nd order compatible
-[H, HI, D1, D4, e_1, e_m, M4, Q, S2_1, S2_m, S3_1, S3_m, S_1, S_m] = sbp.higher2_compatible(m,h);
+[H, HI, D1, D4, e_1, e_m, M4, Q, S2_1, S2_m, S3_1, S3_m, S_1, S_m] = sbp.higher_compatible2(m,h);
 S1 = S_1*S_1'  + S_m*S_m';
 S2 = S2_1*S2_1' + S2_m*S2_m';
 S3 = S3_1*S3_1' + S3_m*S3_m';
@@ -46,7 +46,7 @@
 
 
 %% 4th order compatible
-[H, HI, D1, D4, e_1, e_m, M4, Q, S2_1, S2_m, S3_1, S3_m, S_1, S_m] = sbp.higher4_compatible(m,h);
+[H, HI, D1, D4, e_1, e_m, M4, Q, S2_1, S2_m, S3_1, S3_m, S_1, S_m] = sbp.higher_compatible4(m,h);
 S1 = S_1*S_1'  + S_m*S_m';
 S2 = S2_1*S2_1' + S2_m*S2_m';
 S3 = S3_1*S3_1' + S3_m*S3_m';
@@ -59,7 +59,7 @@
 fprintf('\n')
 
 %% 6th order compatible
-[H, HI, D1, D4, e_1, e_m, M4, Q, S2_1, S2_m, S3_1, S3_m, S_1, S_m] = sbp.higher6_compatible(m,h);
+[H, HI, D1, D4, e_1, e_m, M4, Q, S2_1, S2_m, S3_1, S3_m, S_1, S_m] = sbp.higher_compatible6(m,h);
 S1 = S_1*S_1'  + S_m*S_m';
 S2 = S2_1*S2_1' + S2_m*S2_m';
 S3 = S3_1*S3_1' + S3_m*S3_m';
@@ -69,3 +69,27 @@
 fprintf('6th order compatible\n')
 fprintf('alpha_II:  %.10f\n',alpha_II)
 fprintf('alpha_III: %.10f\n',alpha_III)
+fprintf('\n')3
+
+
+
+
+
+% Ordinary
+
+for order = [2 4 6 8 10]
+    op = sbp.Ordinary(m,h, order);
+
+    S_1 = op.boundary.S_1;
+    S_m = op.boundary.S_m;
+
+    M = op.norms.M;
+
+    S1 = S_1*S_1'  + S_m*S_m';
+    alpha  = util.matrixborrow(M, h*S1);
+    fprintf('%dth order Ordinary\n', order)
+    fprintf('alpha:  %.10f\n', alpha)
+    fprintf('\n')
+end
+
+