Mercurial > repos > public > sbplib

comparison +sbp/upwind3_3bp.m @ 52:4f5a65f49035

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed the upwind operators.
author Jonatan Werpers <jonatan@werpers.com>
date Wed, 11 Nov 2015 15:43:15 -0800
parents ebd25e5a481a
children
comparison
equal deleted inserted replaced
51:0be702829bb9 52:4f5a65f49035
1 function [H, HI, Dp, Dm, e_1, e_m] = upwind3(m,h) 1 function [H, HI, Dp, Dm, e_1, e_m] = upwind3(m,h)
2 H(1:3,1:3)=[0.3e1 / 0.8e1 0 0; 0 0.7e1 / 0.6e1 0; 0 0 0.23e2 / 0.24e2;]; 2 Hv = ones(m,1);
3 H(m-2:m,m-2:m)=fliplr(flipud(H(1:3,1:3))); 3 Hv(1:3) = [3/8; 7/6; 23/24];
4 H=H*h; 4 Hv(m-2:m) = rot90(Hv(1:3),2);
5 H=spdiag(ones(m,1),0); 5 Hv = Hv*h;
6 HI=inv(H); 6 H = spdiag(Hv,0);
7 HI = spdiag(1./Hv,0);
7 8
8 Qp=(-1/3*spdiag(ones(m-1,1),-1)-1/2*spdiag(ones(m,1),0)+1*spdiag(ones(m-1,1),+1)-1/6*spdiag(ones(m-2,1),+2)); 9 q_diags = [-1, 0, 1, 2];
9 %Q_U = [-0.49e2 / 0.2640e4 0.11167e5 / 0.15840e5 -0.1541e4 / 0.7920e4 0.43e2 / 0.5280e4; -0.9403e4 / 0.15840e5 -0.551e3 / 0.2640e4 0.1779e4 / 0.1760e4 -0.2311e4 / 0.7920e4; 0.659e3 / 0.7920e4 -0.751e3 / 0.1760e4 -0.1541e4 / 0.2640e4 0.21287e5 / 0.15840e5; 0.51e2 / 0.1760e4 -0.551e3 / 0.7920e4 -0.3683e4 / 0.15840e5 -0.713e3 / 0.880e3;]; 10 q_stencil = [-1/3 -1/2 1 -1/6];
10 %Q_U = [-0.29e2 / 0.1680e4 0.7067e4 / 0.10080e5 -0.961e3 / 0.5040e4 0.23e2 / 0.3360e4; -0.6023e4 / 0.10080e5 -0.331e3 / 0.1680e4 0.1119e4 / 0.1120e4 -0.1451e4 / 0.5040e4; 0.439e3 / 0.5040e4 -0.491e3 / 0.1120e4 -0.961e3 / 0.1680e4 0.13507e5 / 0.10080e5; 0.31e2 / 0.1120e4 -0.331e3 / 0.5040e4 -0.2383e4 / 0.10080e5 -0.453e3 / 0.560e3;]; 11 Qp = stripeMatrix(q_stencil, q_diags,m);
11 12
12 Q_U = [-0.1e1 / 0.24e2 0.17e2 / 0.24e2 -0.1e1 / 0.6e1; -0.13e2 / 0.24e2 -0.1e1 / 0.4e1 0.23e2 / 0.24e2; 0.1e1 / 0.12e2 -0.11e2 / 0.24e2 -0.11e2 / 0.24e2;]; 13 Q_U = [
14 -1/24 17/24 -1/6;
15 -13/24 -1/4 23/24;
16 1/12 -11/24 -11/24;
17 ];
13 Qp(1:3,1:3)=Q_U; 18 Qp(1:3,1:3)=Q_U;
14 Qp(m-2:m,m-2:m)=flipud( fliplr(Q_U(1:3,1:3) ) )'; %%% This is different from standard SBP 19 Qp(m-2:m,m-2:m)=rot90(Q_U,2)'; %%% This is different from standard SBP
15 20
16 Qm=-Qp'; 21 Qm=-Qp';
17 22
18 e_1=sparse(m,1);e_1(1)=1; 23 e_1=sparse(m,1);
19 e_m=sparse(m,1);e_m(m)=1; 24 e_1(1)=1;
25 e_m=sparse(m,1);
26 e_m(m)=1;
20 27
21 Dp=HI*(Qp-1/2*e_1*e_1'+1/2*e_m*e_m') ; 28 Dp=HI*(Qp-1/2*e_1*e_1'+1/2*e_m*e_m') ;
22 29
23 Dm=HI*(Qm-1/2*e_1*e_1'+1/2*e_m*e_m') ; 30 Dm=HI*(Qm-1/2*e_1*e_1'+1/2*e_m*e_m') ;
24 end 31 end