Mercurial > repos > public > sbplib
changeset 311:713b125038a3 feature/beams
Fixed function names in renamed files.
| author | Jonatan Werpers <jonatan@werpers.com> |
|---|---|
| date | Fri, 23 Sep 2016 14:59:55 +0200 |
| parents | ffa5d557942b |
| children | 9230c056a574 |
| files | +sbp/+implementations/d4_variable_2.m +sbp/+implementations/d4_variable_4.m +sbp/+implementations/d4_variable_6.m |
| diffstat | 3 files changed, 9 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
diff -r ffa5d557942b -r 713b125038a3 +sbp/+implementations/d4_variable_2.m --- a/+sbp/+implementations/d4_variable_2.m Fri Sep 23 14:55:08 2016 +0200 +++ b/+sbp/+implementations/d4_variable_2.m Fri Sep 23 14:59:55 2016 +0200 @@ -1,6 +1,5 @@ % Returns D2 as a function handle -function [H, HI, D1, D2, D3, D4, e_1, e_m, M4, Q, S2_1,... - S2_m, S3_1, S3_m, S_1, S_m] = d4_compatible_halfvariable_2(m,h) +function [H, HI, D1, D2, D3, D4, e_1, e_m, M4, Q, S2_1, S2_m, S3_1, S3_m, S_1, S_m] = d4_variable_2(m,h) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%% 4:de ordn. SBP Finita differens %%% %%% operatorer framtagna av Ken Mattsson %%% @@ -26,7 +25,7 @@ % Vi b?rjar med normen. Notera att alla SBP operatorer delar samma norm, % vilket ?r n?dv?ndigt f?r stabilitet - + BP = 4; if(m<2*BP) error(['Operator requires at least ' num2str(2*BP) ' grid points']);
diff -r ffa5d557942b -r 713b125038a3 +sbp/+implementations/d4_variable_4.m --- a/+sbp/+implementations/d4_variable_4.m Fri Sep 23 14:55:08 2016 +0200 +++ b/+sbp/+implementations/d4_variable_4.m Fri Sep 23 14:59:55 2016 +0200 @@ -1,5 +1,4 @@ -function [H, HI, D2, D4, e_1, e_m, M4, S2_1, S2_m, S3_1,... - S3_m, S_1, S_m] = d4_compatible_halfvariable_4(m,h) +function [H, HI, D2, D4, e_1, e_m, M4, S2_1, S2_m, S3_1, S3_m, S_1, S_m] = d4_variable_4(m,h) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%% 4:de ordn. SBP Finita differens %%% %%% %%% @@ -12,7 +11,7 @@ %m=20; %problemstorlek %h=1/(m-1); %h=1; - + BP = 6; if(m<2*BP) error(['Operator requires at least ' num2str(2*BP) ' grid points']);
diff -r ffa5d557942b -r 713b125038a3 +sbp/+implementations/d4_variable_6.m --- a/+sbp/+implementations/d4_variable_6.m Fri Sep 23 14:55:08 2016 +0200 +++ b/+sbp/+implementations/d4_variable_6.m Fri Sep 23 14:59:55 2016 +0200 @@ -1,5 +1,4 @@ -function [H, HI, D2, D4, e_1, e_m, M4, S2_1, S2_m, S3_1,... - S3_m, S_1, S_m] = d4_compatible_halfvariable_6(m,h) +function [H, HI, D2, D4, e_1, e_m, M4, S2_1, S2_m, S3_1, S3_m, S_1, S_m] = d4_variable_6(m,h) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%% 6:te ordn. SBP Finita differens %%% %%% operatorer med diagonal norm %%% @@ -25,7 +24,7 @@ % with the unknown stored as c(1), c(2), ..., c_m % x=1:h:m*h;x=x'; % c=x.^0; - + BP = 8; if(m<2*BP) error(['Operator requires at least ' num2str(2*BP) ' grid points']); @@ -43,9 +42,9 @@ % D1=(1/60*diag(ones(m-3,1),3)-9/60*diag(ones(m-2,1),2)+45/60*diag(ones(m-1,1),1)-45/60*diag(ones(m-1,1),-1)+9/60*diag(ones(m-2,1),-2)-1/60*diag(ones(m-3,1),-3)); -% -% -% +% +% +% % D1(1:6,1:9)=[-21600/13649, 43200/13649*x1-7624/40947, -172800/13649*x1+ ... % 715489/81894, 259200/13649*x1-187917/13649, -172800/13649* ... % x1+735635/81894, 43200/13649*x1-89387/40947, 0, 0, 0; ...