Mercurial > repos > public > sbplib

comparison +scheme/Burgers1d.m @ 1222:55463e3c1e4a rv_diffOp_test

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge bug fix from feature/rv
author Vidar Stiernström <vidar.stiernstrom@it.uu.se>
date Tue, 05 Mar 2019 10:59:39 +0100
parents 635386c073b9
children f6c571d8f22f
comparison
equal deleted inserted replaced
1221:0c906f7ab8bf 1222:55463e3c1e4a
30 if (isequal(opSet, @sbp.D1Upwind)) 30 if (isequal(opSet, @sbp.D1Upwind))
31 obj.D1 = (ops.Dp + ops.Dm)/2; 31 obj.D1 = (ops.Dp + ops.Dm)/2;
32 DissOp = (ops.Dm - ops.Dp)/2; 32 DissOp = (ops.Dm - ops.Dp)/2;
33 switch pde_form 33 switch pde_form
34 case 'skew-symmetric' 34 case 'skew-symmetric'
35 obj.D = @(v) -(1/3*obj.D1*v.*v + (1/3*spdiag(v)*obj.D1 + fluxSplitting(v)*DissOp)*v); 35 obj.D = @(v) -(1/3*obj.D1*(v.*v) + (1/3*spdiag(v)*obj.D1 + fluxSplitting(v)*DissOp)*v);
36 case 'conservative' 36 case 'conservative'
37 obj.D = @(v) -(1/2*obj.D1*v.*v + fluxSplitting(v)*DissOp*v); 37 obj.D = @(v) -(1/2*obj.D1*(v.*v) + fluxSplitting(v)*DissOp*v);
38 end 38 end
39 else 39 else
40 obj.D1 = ops.D1; 40 obj.D1 = ops.D1;
41 switch pde_form 41 switch pde_form
42 case 'skew-symmetric' 42 case 'skew-symmetric'
43 obj.D = @(v) -(1/3*obj.D1*v.*v + 1/3*spdiag(v)*obj.D1*v); 43 obj.D = @(v) -(1/3*obj.D1*(v.*v) + 1/3*spdiag(v)*obj.D1*v);
44 case 'conservative' 44 case 'conservative'
45 obj.D = @(v) -1/2*obj.D1*v.*v; 45 obj.D = @(v) -1/2*obj.D1*(v.*v);
46 end 46 end
47 end 47 end
48 obj.grid = g; 48 obj.grid = g;
49 49
50 obj.H = ops.H; 50 obj.H = ops.H;