Mercurial > repos > public > sbplib

changeset 329:bf801c3709be feature/beams

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bug fixes in operators.
author Jonatan Werpers <jonatan@werpers.com>
date Wed, 28 Sep 2016 16:31:06 +0200
parents 31d6698c1edf
children 25b01643e438
files +sbp/+implementations/d4_lonely_8_higher_boundary_order.m +sbp/+implementations/d4_variable_2.m +sbp/+implementations/d4_variable_4.m +sbp/+implementations/d4_variable_6.m +scheme/Beam.m
diffstat 5 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/+sbp/+implementations/d4_lonely_8_higher_boundary_order.m	Wed Sep 28 12:39:12 2016 +0200
+++ b/+sbp/+implementations/d4_lonely_8_higher_boundary_order.m	Wed Sep 28 16:31:06 2016 +0200
@@ -55,6 +55,7 @@
 
     stencil = [-0.41e2/0.7560e4, 0.1261e4/0.15120e5, -0.541e3/0.840e3, 0.4369e4/0.1260e4, -0.1669e4/0.180e3, 0.1529e4/0.120e3, -0.1669e4/0.180e3, 0.4369e4/0.1260e4, -0.541e3/0.840e3, 0.1261e4/0.15120e5,-0.41e2/0.7560e4];
     diags = -5:5;
+    M4 = stripeMatrix(stencil, diags, m);
 
     M4_U = [
         0.1031569831e10/0.155675520e9 -0.32874237931e11/0.1452971520e10 0.3069551773e10/0.90810720e8 -0.658395212131e12/0.21794572800e11 0.31068454007e11/0.1816214400e10 -0.39244130657e11/0.7264857600e10 0.1857767503e10/0.2724321600e10 0.1009939e7/0.49420800e8;
--- a/+sbp/+implementations/d4_variable_2.m	Wed Sep 28 12:39:12 2016 +0200
+++ b/+sbp/+implementations/d4_variable_2.m	Wed Sep 28 16:31:06 2016 +0200
@@ -65,7 +65,7 @@
         M(m-1:m,m-1:m) = [c(m-2)/2 + c(m-1) + c(m)/2 -c(m-1)/2 - c(m)/2; -c(m-1)/2 - c(m)/2 c(m-1)/2 + c(m)/2;];
         M = 1/h*M;
 
-        D2 = HI*(-M - c(1)*e_1*d1_l' + c(m)*e_r*d1_r');
+        D2 = HI*(-M - c(1)*e_l*d1_l' + c(m)*e_r*d1_r');
     end
     D2 = @D2_fun;
 
--- a/+sbp/+implementations/d4_variable_4.m	Wed Sep 28 12:39:12 2016 +0200
+++ b/+sbp/+implementations/d4_variable_4.m	Wed Sep 28 16:31:06 2016 +0200
@@ -93,7 +93,7 @@
         ];
 
         M = M/h;
-        D2 = HI*(-M-c(1)*e_1*S_1'+c(m)*e_m*S_m');
+        D2 = HI*(-M - c(1)*e_l*d1_l' + c(m)*e_r*d1_r');
     end
     D2 = @D2_fun;
 
--- a/+sbp/+implementations/d4_variable_6.m	Wed Sep 28 12:39:12 2016 +0200
+++ b/+sbp/+implementations/d4_variable_6.m	Wed Sep 28 16:31:06 2016 +0200
@@ -127,7 +127,7 @@
 
         M=M/h;
 
-        D2=HI*(-M-diag(c)*e_1*S_1'+diag(c)*e_m*S_m');
+        D2 = HI*(-M - c(1)*e_l*d1_l' + c(m)*e_r*d1_r');
     end
     D2 = @D2_fun;
 
--- a/+scheme/Beam.m	Wed Sep 28 12:39:12 2016 +0200
+++ b/+scheme/Beam.m	Wed Sep 28 16:31:06 2016 +0200
@@ -37,9 +37,6 @@
             opt_default.interface_r.sig = [];
             default_struct('opt', opt_default);
 
-
-
-
             if ~isa(grid, 'grid.Cartesian') || grid.D() ~= 1
                 error('Grid must be 1d cartesian');
             end