Mercurial > repos > public > sbplib
changeset 927:4291731570bb feature/utux2D
Rename AWW OP. Make Interpolation operator classes take grid points as arguments. Remove LaplCurv.interpolationOperators. Introduce default struct in LaplCurv.interface.
| author | Martin Almquist <malmquist@stanford.edu> |
|---|---|
| date | Mon, 03 Dec 2018 14:53:52 -0800 |
| parents | 60a3bc79835a |
| children | 1c61d8fa9903 |
| files | +sbp/+implementations/intOpAWW_orders_2to2_ratio2to1.m +sbp/+implementations/intOpAWW_orders_2to2_ratio_2to1_accC2F1_accF2C2.m +sbp/+implementations/intOpAWW_orders_2to2_ratio_2to1_accC2F2_accF2C1.m +sbp/+implementations/intOpAWW_orders_4to4_ratio2to1.m +sbp/+implementations/intOpAWW_orders_4to4_ratio_2to1_accC2F2_accF2C3.m +sbp/+implementations/intOpAWW_orders_4to4_ratio_2to1_accC2F3_accF2C2.m +sbp/+implementations/intOpAWW_orders_6to6_ratio2to1.m +sbp/+implementations/intOpAWW_orders_6to6_ratio_2to1_accC2F3_accF2C4.m +sbp/+implementations/intOpAWW_orders_6to6_ratio_2to1_accC2F4_accF2C3.m +sbp/+implementations/intOpAWW_orders_8to8_ratio2to1.m +sbp/+implementations/intOpAWW_orders_8to8_ratio_2to1_accC2F4_accF2C5.m +sbp/+implementations/intOpAWW_orders_8to8_ratio_2to1_accC2F5_accF2C4.m +sbp/+implementations/intOpOP_orders_2to2_ratio2to1.m +sbp/+implementations/intOpOP_orders_2to2_ratio_2to1_accC2F1_accF2C2.m +sbp/+implementations/intOpOP_orders_2to2_ratio_2to1_accC2F2_accF2C1.m +sbp/+implementations/intOpOP_orders_4to4_ratio2to1.m +sbp/+implementations/intOpOP_orders_4to4_ratio_2to1_accC2F2_accF2C3.m +sbp/+implementations/intOpOP_orders_4to4_ratio_2to1_accC2F3_accF2C2.m +sbp/+implementations/intOpOP_orders_6to6_ratio2to1.m +sbp/+implementations/intOpOP_orders_6to6_ratio_2to1_accC2F3_accF2C4.m +sbp/+implementations/intOpOP_orders_6to6_ratio_2to1_accC2F4_accF2C3.m +sbp/+implementations/intOpOP_orders_8to8_ratio2to1.m +sbp/+implementations/intOpOP_orders_8to8_ratio_2to1_accC2F4_accF2C5.m +sbp/+implementations/intOpOP_orders_8to8_ratio_2to1_accC2F5_accF2C4.m +sbp/InterpAWW.m +sbp/InterpMC.m +sbp/InterpOps.m +sbp/InterpOpsMC.m +sbp/InterpOpsOP.m +scheme/LaplaceCurvilinear.m |
| diffstat | 30 files changed, 481 insertions(+), 537 deletions(-) [+] |
line wrap: on
line diff
diff -r 60a3bc79835a -r 4291731570bb +sbp/+implementations/intOpAWW_orders_2to2_ratio2to1.m --- a/+sbp/+implementations/intOpAWW_orders_2to2_ratio2to1.m Mon Dec 03 12:02:27 2018 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -function [IC2F,IF2C,Hc,Hf] = IntOp_orders_2to2_ratio2to1(mc,hc,ACC) - -% ACC is a string. -% ACC = 'C2F' creates IC2F with one order of accuracy higher than IF2C. -% ACC = 'F2C' creates IF2C with one order of accuracy higher than IC2F. -ratio = 2; -mf = ratio*mc-1; -hf = hc/ratio; - -switch ACC - case 'F2C' - [stencil_F2C,BC_F2C,HcU,HfU] = ... - sbp.implementations.intOpAWW_orders_2to2_ratio_2to1_accC2F1_accF2C2; - case 'C2F' - [stencil_F2C,BC_F2C,HcU,HfU] = ... - sbp.implementations.intOpAWW_orders_2to2_ratio_2to1_accC2F2_accF2C1; -end - -stencil_width = length(stencil_F2C); -stencil_hw = (stencil_width-1)/2; -[BC_rows,BC_cols] = size(BC_F2C); - -%%% Norm matrices %%% -Hc = speye(mc,mc); -HcUm = length(HcU); -Hc(1:HcUm,1:HcUm) = spdiags(HcU',0,HcUm,HcUm); -Hc(mc-HcUm+1:mc,mc-HcUm+1:mc) = spdiags(rot90(HcU',2),0,HcUm,HcUm); -Hc = Hc*hc; - -Hf = speye(mf,mf); -HfUm = length(HfU); -Hf(1:HfUm,1:HfUm) = spdiags(HfU',0,HfUm,HfUm); -Hf(mf-length(HfU)+1:mf,mf-length(HfU)+1:mf) = spdiags(rot90(HfU',2),0,HfUm,HfUm); -Hf = Hf*hf; -%%%%%%%%%%%%%%%%%%%%%% - -%%% Create IF2C from stencil and BC -IF2C = sparse(mc,mf); -for i = BC_rows+1 : mc-BC_rows - IF2C(i,ratio*i-1+(-stencil_hw:stencil_hw)) = stencil_F2C; %#ok<SPRIX> -end -IF2C(1:BC_rows,1:BC_cols) = BC_F2C; -IF2C(end-BC_rows+1:end,end-BC_cols+1:end) = rot90(BC_F2C,2); -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -%%% Create IC2F using symmetry condition %%%% -IC2F = Hf\IF2C.'*Hc; \ No newline at end of file
diff -r 60a3bc79835a -r 4291731570bb +sbp/+implementations/intOpAWW_orders_2to2_ratio_2to1_accC2F1_accF2C2.m --- a/+sbp/+implementations/intOpAWW_orders_2to2_ratio_2to1_accC2F1_accF2C2.m Mon Dec 03 12:02:27 2018 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -function [stencil_F2C,BC_F2C,HcU,HfU] = intOpAWW_orders_2to2_ratio_2to1_accC2F1_accF2C2 -%INT_ORDERS_2TO2_RATIO_2TO1_ACCC2F1_ACCF2C2_STENCIL_5_BC_2_5 -% [STENCIL_F2C,BC_F2C,HCU,HFU] = INT_ORDERS_2TO2_RATIO_2TO1_ACCC2F1_ACCF2C2_STENCIL_5_BC_2_5 - -% This function was generated by the Symbolic Math Toolbox version 8.0. -% 21-May-2018 15:36:07 - -stencil_F2C = [-1.0./8.0,1.0./4.0,3.0./4.0,1.0./4.0,-1.0./8.0]; -if nargout > 1 - BC_F2C = reshape([6.288191560529559e-1,-6.440957802647795e-2,6.855471317807184e-1,1.572264341096408e-1,-2.438028498638558e-1,7.469014249319279e-1,-8.431231982626708e-2,2.921561599131335e-1,1.374888185644862e-2,-1.318744409282243e-1],[2,5]); -end -if nargout > 2 - HcU = 1.0./2.0; -end -if nargout > 3 - HfU = 1.0./2.0; -end
diff -r 60a3bc79835a -r 4291731570bb +sbp/+implementations/intOpAWW_orders_2to2_ratio_2to1_accC2F2_accF2C1.m --- a/+sbp/+implementations/intOpAWW_orders_2to2_ratio_2to1_accC2F2_accF2C1.m Mon Dec 03 12:02:27 2018 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -function [stencil_F2C,BC_F2C,HcU,HfU] = intOpAWW_orders_2to2_ratio_2to1_accC2F2_accF2C1 -%INT_ORDERS_2TO2_RATIO_2TO1_ACCC2F2_ACCF2C1_STENCIL_5_BC_1_3 -% [STENCIL_F2C,BC_F2C,HCU,HFU] = INT_ORDERS_2TO2_RATIO_2TO1_ACCC2F2_ACCF2C1_STENCIL_5_BC_1_3 - -% This function was generated by the Symbolic Math Toolbox version 8.0. -% 21-May-2018 15:36:08 - -stencil_F2C = [1.0./4.0,1.0./2.0,1.0./4.0]; -if nargout > 1 - BC_F2C = [1.0./2.0,1.0./2.0]; -end -if nargout > 2 - HcU = 1.0./2.0; -end -if nargout > 3 - HfU = 1.0./2.0; -end
diff -r 60a3bc79835a -r 4291731570bb +sbp/+implementations/intOpAWW_orders_4to4_ratio2to1.m --- a/+sbp/+implementations/intOpAWW_orders_4to4_ratio2to1.m Mon Dec 03 12:02:27 2018 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -function [IC2F,IF2C,Hc,Hf] = IntOp_orders_4to4_ratio2to1(mc,hc,ACC) - -% ACC is a string. -% ACC = 'C2F' creates IC2F with one order of accuracy higher than IF2C. -% ACC = 'F2C' creates IF2C with one order of accuracy higher than IC2F. -ratio = 2; -mf = ratio*mc-1; -hf = hc/ratio; - -switch ACC - case 'F2C' - [stencil_F2C,BC_F2C,HcU,HfU] = ... - sbp.implementations.intOpAWW_orders_4to4_ratio_2to1_accC2F2_accF2C3; - case 'C2F' - [stencil_F2C,BC_F2C,HcU,HfU] = ... - sbp.implementations.intOpAWW_orders_4to4_ratio_2to1_accC2F3_accF2C2; -end - -stencil_width = length(stencil_F2C); -stencil_hw = (stencil_width-1)/2; -[BC_rows,BC_cols] = size(BC_F2C); - -%%% Norm matrices %%% -Hc = speye(mc,mc); -HcUm = length(HcU); -Hc(1:HcUm,1:HcUm) = spdiags(HcU',0,HcUm,HcUm); -Hc(mc-HcUm+1:mc,mc-HcUm+1:mc) = spdiags(rot90(HcU',2),0,HcUm,HcUm); -Hc = Hc*hc; - -Hf = speye(mf,mf); -HfUm = length(HfU); -Hf(1:HfUm,1:HfUm) = spdiags(HfU',0,HfUm,HfUm); -Hf(mf-length(HfU)+1:mf,mf-length(HfU)+1:mf) = spdiags(rot90(HfU',2),0,HfUm,HfUm); -Hf = Hf*hf; -%%%%%%%%%%%%%%%%%%%%%% - -%%% Create IF2C from stencil and BC -IF2C = sparse(mc,mf); -for i = BC_rows+1 : mc-BC_rows - IF2C(i,ratio*i-1+(-stencil_hw:stencil_hw)) = stencil_F2C; %#ok<SPRIX> -end -IF2C(1:BC_rows,1:BC_cols) = BC_F2C; -IF2C(end-BC_rows+1:end,end-BC_cols+1:end) = rot90(BC_F2C,2); -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -%%% Create IC2F using symmetry condition %%%% -IC2F = Hf\IF2C.'*Hc; \ No newline at end of file
diff -r 60a3bc79835a -r 4291731570bb +sbp/+implementations/intOpAWW_orders_4to4_ratio_2to1_accC2F2_accF2C3.m --- a/+sbp/+implementations/intOpAWW_orders_4to4_ratio_2to1_accC2F2_accF2C3.m Mon Dec 03 12:02:27 2018 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -function [stencil_F2C,BC_F2C,HcU,HfU] = intOpAWW_orders_4to4_ratio_2to1_accC2F2_accF2C3 -%INT_ORDERS_4TO4_RATIO_2TO1_ACCC2F2_ACCF2C3_STENCIL_9_BC_3_11 -% [STENCIL_F2C,BC_F2C,HCU,HFU] = INT_ORDERS_4TO4_RATIO_2TO1_ACCC2F2_ACCF2C3_STENCIL_9_BC_3_11 - -% This function was generated by the Symbolic Math Toolbox version 8.0. -% 21-May-2018 15:36:01 - -stencil_F2C = [7.0./2.56e2,-1.0./3.2e1,-7.0./6.4e1,9.0./3.2e1,8.5e1./1.28e2,9.0./3.2e1,-7.0./6.4e1,-1.0./3.2e1,7.0./2.56e2]; -if nargout > 1 - BC_F2C = reshape([7.523257802630956e-2,2.447812262221267e-1,-1.679313063616916e-1,1.290510950666589,6.315723344677289e-3,1.67178747937954e-1,1.982667903557025,-7.554383893379468e-1,7.215271362899867e-1,-2.820478831383137,1.807034411305536,-7.589683751979843e-1,-7.685973268458095e-1,3.965751544535173e-1,4.119789638051451e-1,1.574000556785898e-1,-1.113618964927466e-1,3.631000220124657e-1,1.639694219982991,-9.114074742274862e-1,4.952715520862987e-1,-4.524162151353456e-1,2.65481378213589e-1,-2.268273408674622e-1,3.455365956773523e-1,-2.009765975089827e-1,1.722179564305811e-1,-5.52933488235368e-1,3.18109976271229e-1,-2.171481232558432e-1,1.033835580108027e-1,-5.911351224351343e-2,3.960076712054991e-2],[3,11]); -end -if nargout > 2 - t2 = [1.7e1./4.8e1,5.9e1./4.8e1,4.3e1./4.8e1,4.9e1./4.8e1]; - HcU = t2; -end -if nargout > 3 - HfU = t2; -end
diff -r 60a3bc79835a -r 4291731570bb +sbp/+implementations/intOpAWW_orders_4to4_ratio_2to1_accC2F3_accF2C2.m --- a/+sbp/+implementations/intOpAWW_orders_4to4_ratio_2to1_accC2F3_accF2C2.m Mon Dec 03 12:02:27 2018 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -function [stencil_F2C,BC_F2C,HcU,HfU] = intOpAWW_orders_4to4_ratio_2to1_accC2F3_accF2C2 -%INT_ORDERS_4TO4_RATIO_2TO1_ACCC2F3_ACCF2C2_STENCIL_9_BC_3_11 -% [STENCIL_F2C,BC_F2C,HCU,HFU] = INT_ORDERS_4TO4_RATIO_2TO1_ACCC2F3_ACCF2C2_STENCIL_9_BC_3_11 - -% This function was generated by the Symbolic Math Toolbox version 8.0. -% 21-May-2018 15:36:05 - -stencil_F2C = [-1.0./2.56e2,-1.0./3.2e1,1.0./6.4e1,9.0./3.2e1,6.1e1./1.28e2,9.0./3.2e1,1.0./6.4e1,-1.0./3.2e1,-1.0./2.56e2]; -if nargout > 1 - BC_F2C = reshape([1.0./2.0,0.0,0.0,1.77e2./2.72e2,3.0./8.0,-5.9e1./6.88e2,1.125919117647059e-2,3.546742584745763e-1,1.335392441860465e-2,-4.9e1./5.44e2,2.335805084745763e-1,3.204941860465116e-1,-1.194852941176471e-2,1.350635593220339e-2,5.308866279069767e-1,-9.0./5.44e2,-1.11228813559322e-2,2.943313953488372e-1,-2.803308823529412e-2,2.105402542372881e-2,-1.580668604651163e-2,-9.0./5.44e2,1.430084745762712e-2,-5.450581395348837e-2,-9.191176470588235e-4,7.944915254237288e-4,-5.450581395348837e-3,1.0./5.44e2,-1.588983050847458e-3,2.180232558139535e-3,2.297794117647059e-4,-1.986228813559322e-4,2.725290697674419e-4],[3,11]); -end -if nargout > 2 - t2 = [1.7e1./4.8e1,5.9e1./4.8e1,4.3e1./4.8e1,4.9e1./4.8e1]; - HcU = t2; -end -if nargout > 3 - HfU = t2; -end
diff -r 60a3bc79835a -r 4291731570bb +sbp/+implementations/intOpAWW_orders_6to6_ratio2to1.m --- a/+sbp/+implementations/intOpAWW_orders_6to6_ratio2to1.m Mon Dec 03 12:02:27 2018 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -function [IC2F,IF2C,Hc,Hf] = IntOp_orders_6to6_ratio2to1(mc,hc,ACC) - -% ACC is a string. -% ACC = 'C2F' creates IC2F with one order of accuracy higher than IF2C. -% ACC = 'F2C' creates IF2C with one order of accuracy higher than IC2F. -ratio = 2; -mf = ratio*mc-1; -hf = hc/ratio; - -switch ACC - case 'F2C' - [stencil_F2C,BC_F2C,HcU,HfU] = ... - sbp.implementations.intOpAWW_orders_6to6_ratio_2to1_accC2F3_accF2C4; - case 'C2F' - [stencil_F2C,BC_F2C,HcU,HfU] = ... - sbp.implementations.intOpAWW_orders_6to6_ratio_2to1_accC2F4_accF2C3; -end - -stencil_width = length(stencil_F2C); -stencil_hw = (stencil_width-1)/2; -[BC_rows,BC_cols] = size(BC_F2C); - -%%% Norm matrices %%% -Hc = speye(mc,mc); -HcUm = length(HcU); -Hc(1:HcUm,1:HcUm) = spdiags(HcU',0,HcUm,HcUm); -Hc(mc-HcUm+1:mc,mc-HcUm+1:mc) = spdiags(rot90(HcU',2),0,HcUm,HcUm); -Hc = Hc*hc; - -Hf = speye(mf,mf); -HfUm = length(HfU); -Hf(1:HfUm,1:HfUm) = spdiags(HfU',0,HfUm,HfUm); -Hf(mf-length(HfU)+1:mf,mf-length(HfU)+1:mf) = spdiags(rot90(HfU',2),0,HfUm,HfUm); -Hf = Hf*hf; -%%%%%%%%%%%%%%%%%%%%%% - -%%% Create IF2C from stencil and BC -IF2C = sparse(mc,mf); -for i = BC_rows+1 : mc-BC_rows - IF2C(i,ratio*i-1+(-stencil_hw:stencil_hw)) = stencil_F2C; %#ok<SPRIX> -end -IF2C(1:BC_rows,1:BC_cols) = BC_F2C; -IF2C(end-BC_rows+1:end,end-BC_cols+1:end) = rot90(BC_F2C,2); -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -%%% Create IC2F using symmetry condition %%%% -IC2F = Hf\IF2C.'*Hc; \ No newline at end of file
diff -r 60a3bc79835a -r 4291731570bb +sbp/+implementations/intOpAWW_orders_6to6_ratio_2to1_accC2F3_accF2C4.m --- a/+sbp/+implementations/intOpAWW_orders_6to6_ratio_2to1_accC2F3_accF2C4.m Mon Dec 03 12:02:27 2018 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -function [stencil_F2C,BC_F2C,HcU,HfU] = intOpAWW_orders_6to6_ratio_2to1_accC2F3_accF2C4 -%INT_ORDERS_6TO6_RATIO_2TO1_ACCC2F3_ACCF2C4_STENCIL_13_BC_3_17 -% [STENCIL_F2C,BC_F2C,HCU,HFU] = INT_ORDERS_6TO6_RATIO_2TO1_ACCC2F3_ACCF2C4_STENCIL_13_BC_3_17 - -% This function was generated by the Symbolic Math Toolbox version 8.0. -% 21-May-2018 15:35:47 - -stencil_F2C = [-5.95703125e-3,3.0./5.12e2,3.57421875e-2,-2.5e1./5.12e2,-8.935546875e-2,7.5e1./2.56e2,3.17e2./5.12e2,7.5e1./2.56e2,-8.935546875e-2,-2.5e1./5.12e2,3.57421875e-2,3.0./5.12e2,-5.95703125e-3]; -if nargout > 1 - BC_F2C = reshape([5.233890618131365e-1,-1.594459192645467e-2,3.532688727637403e-2,8.021234957689208e-1,3.90683205173562e-1,-1.73222951632239e-1,-8.87662686483442e-2,2.90091235796637e-1,-1.600356115709148e-1,-1.044025375027475e-1,2.346179009198368e-1,6.091329306528956e-1,1.561275522703128e-1,-1.168382445709856e-1,1.040987887887311,-2.387061036980731e-1,1.363504965974361e-1,1.082611928255256e-1,-5.745310654054326e-1,3.977694249198785e-1,-9.376217911402619e-1,3.554518646054656e-2,5.609157787396987e-5,-1.564625311232018e-1,6.107907974027401e-1,-3.786608696698368e-1,7.02265869951125e-1,2.054294270642538e-1,-1.302300112378257e-1,2.478941407690889e-1,-2.657085326191479e-1,1.568761445933572e-1,-2.632906518005349e-1,-1.228047556139644e-1,7.182193248980271e-2,-1.1291238242346e-1,5.811258780405158e-2,-3.466364400805378e-2,5.683680203338252e-2,1.781337575097077e-2,-1.030572999042704e-2,1.577197067502767e-2,-1.443802115768554e-2,8.391316308374261e-3,-1.29534117369052e-2,-1.548018627738296e-3,8.794183904936319e-4,-1.298961407229805e-3,1.573818938200601e-3,-8.940753636685258e-4,1.320610764016968e-3],[3,17]); -end -if nargout > 2 - t2 = [3.159490740740741e-1,1.390393518518519,6.275462962962963e-1,1.240509259259259,9.116898148148148e-1,1.013912037037037]; - HcU = t2; -end -if nargout > 3 - HfU = t2; -end
diff -r 60a3bc79835a -r 4291731570bb +sbp/+implementations/intOpAWW_orders_6to6_ratio_2to1_accC2F4_accF2C3.m --- a/+sbp/+implementations/intOpAWW_orders_6to6_ratio_2to1_accC2F4_accF2C3.m Mon Dec 03 12:02:27 2018 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -function [stencil_F2C,BC_F2C,HcU,HfU] = intOpAWW_orders_6to6_ratio_2to1_accC2F4_accF2C3 -%INT_ORDERS_6TO6_RATIO_2TO1_ACCC2F4_ACCF2C3_STENCIL_13_BC_4_17 -% [STENCIL_F2C,BC_F2C,HCU,HFU] = INT_ORDERS_6TO6_RATIO_2TO1_ACCC2F4_ACCF2C3_STENCIL_13_BC_4_17 - -% This function was generated by the Symbolic Math Toolbox version 8.0. -% 21-May-2018 15:35:56 - -stencil_F2C = [1.07421875e-3,3.0./5.12e2,-6.4453125e-3,-2.5e1./5.12e2,1.611328125e-2,7.5e1./2.56e2,2.45e2./5.12e2,7.5e1./2.56e2,1.611328125e-2,-2.5e1./5.12e2,-6.4453125e-3,3.0./5.12e2,1.07421875e-3]; -if nargout > 1 - BC_F2C = reshape([1.0./2.0,0.0,0.0,0.0,6.876076086160158e-1,1.5e1./3.2e1,-3.461879841386942e-1,3.502577439820862e-2,3.099721991995751e-3,2.228547003766753e-1,9.363652999354482e-3,-3.15791046603844e-3,-1.05789143206462e-1,2.35563165945226e-1,6.070385985337514e-1,-4.847496617839149e-2,-4.809232246867902e-3,5.154694068405061e-3,7.049223649022501e-1,1.016749349808733e-2,3.460117842882262e-2,-4.996621498584866e-2,5.210650763094799e-1,2.233592875303228e-1,-2.239024779745769e-3,4.254668119953384e-4,9.213872590833641e-3,3.910524351558127e-1,-9.048711215107334e-2,8.597375629526346e-2,-3.468219752858724e-1,3.250682992395969e-1,-1.309107466664224e-1,1.199249722306043e-1,-4.071552384959425e-1,1.474417123938701e-1,-3.02863877390285e-2,3.046016554982103e-2,-1.081315128181483e-1,1.120705238850532e-2,7.977722870036266e-2,-6.772545887788229e-2,2.00270418837606e-1,-5.427183680490763e-2,6.524845570188292e-2,-5.637610037043203e-2,1.711235764016968e-1,-4.203646902407166e-2,4.639548341453586e-3,-4.055884445496545e-3,1.258630924935448e-2,-2.776451559292779e-3,-1.023784366070774e-2,8.817108288936985e-3,-2.659664906860937e-2,7.14445034054861e-3,-1.435466025441424e-3,1.240274208149505e-3,-3.764718680837329e-3,1.028716295017727e-3,1.032012418492197e-3,-8.794183904936319e-4,2.597922814459609e-3,-6.571159498040679e-4,1.892022767235695e-4,-1.612267049238325e-4,4.76285849317595e-4,-1.204712574640791e-4],[4,17]); -end -if nargout > 2 - t2 = [3.159490740740741e-1,1.390393518518519,6.275462962962963e-1,1.240509259259259,9.116898148148148e-1,1.013912037037037]; - HcU = t2; -end -if nargout > 3 - HfU = t2; -end
diff -r 60a3bc79835a -r 4291731570bb +sbp/+implementations/intOpAWW_orders_8to8_ratio2to1.m --- a/+sbp/+implementations/intOpAWW_orders_8to8_ratio2to1.m Mon Dec 03 12:02:27 2018 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -function [IC2F,IF2C,Hc,Hf] = IntOp_orders_8to8_ratio2to1(mc,hc,ACC) - -% ACC is a string. -% ACC = 'C2F' creates IC2F with one order of accuracy higher than IF2C. -% ACC = 'F2C' creates IF2C with one order of accuracy higher than IC2F. -ratio = 2; -mf = ratio*mc-1; -hf = hc/ratio; - -switch ACC - case 'F2C' - [stencil_F2C,BC_F2C,HcU,HfU] = ... - sbp.implementations.intOpAWW_orders_8to8_ratio_2to1_accC2F4_accF2C5; - case 'C2F' - [stencil_F2C,BC_F2C,HcU,HfU] = ... - sbp.implementations.intOpAWW_orders_8to8_ratio_2to1_accC2F5_accF2C4; -end - -stencil_width = length(stencil_F2C); -stencil_hw = (stencil_width-1)/2; -[BC_rows,BC_cols] = size(BC_F2C); - -%%% Norm matrices %%% -Hc = speye(mc,mc); -HcUm = length(HcU); -Hc(1:HcUm,1:HcUm) = spdiags(HcU',0,HcUm,HcUm); -Hc(mc-HcUm+1:mc,mc-HcUm+1:mc) = spdiags(rot90(HcU',2),0,HcUm,HcUm); -Hc = Hc*hc; - -Hf = speye(mf,mf); -HfUm = length(HfU); -Hf(1:HfUm,1:HfUm) = spdiags(HfU',0,HfUm,HfUm); -Hf(mf-length(HfU)+1:mf,mf-length(HfU)+1:mf) = spdiags(rot90(HfU',2),0,HfUm,HfUm); -Hf = Hf*hf; -%%%%%%%%%%%%%%%%%%%%%% - -%%% Create IF2C from stencil and BC -IF2C = sparse(mc,mf); -for i = BC_rows+1 : mc-BC_rows - IF2C(i,ratio*i-1+(-stencil_hw:stencil_hw)) = stencil_F2C; %#ok<SPRIX> -end -IF2C(1:BC_rows,1:BC_cols) = BC_F2C; -IF2C(end-BC_rows+1:end,end-BC_cols+1:end) = rot90(BC_F2C,2); -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -%%% Create IC2F using symmetry condition %%%% -IC2F = Hf\IF2C.'*Hc; \ No newline at end of file
diff -r 60a3bc79835a -r 4291731570bb +sbp/+implementations/intOpAWW_orders_8to8_ratio_2to1_accC2F4_accF2C5.m --- a/+sbp/+implementations/intOpAWW_orders_8to8_ratio_2to1_accC2F4_accF2C5.m Mon Dec 03 12:02:27 2018 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -function [stencil_F2C,BC_F2C,HcU,HfU] = intOpAWW_orders_8to8_ratio_2to1_accC2F4_accF2C5 -%INT_ORDERS_8TO8_RATIO_2TO1_ACCC2F4_ACCF2C5_STENCIL_17_BC_5_24 -% [STENCIL_F2C,BC_F2C,HCU,HFU] = INT_ORDERS_8TO8_RATIO_2TO1_ACCC2F4_ACCF2C5_STENCIL_17_BC_5_24 - -% This function was generated by the Symbolic Math Toolbox version 8.0. -% 21-May-2018 15:35:02 - -stencil_F2C = [1.324608212425595e-3,-1.220703125e-3,-1.059686569940476e-2,1.1962890625e-2,3.708902994791667e-2,-5.9814453125e-2,-7.417805989583333e-2,2.99072265625e-1,5.927225748697917e-1,2.99072265625e-1,-7.417805989583333e-2,-5.9814453125e-2,3.708902994791667e-2,1.1962890625e-2,-1.059686569940476e-2,-1.220703125e-3,1.324608212425595e-3]; -if nargout > 1 - BC_F2C = reshape([2.087365925359584,-1.227221822236823,1.090916714284468e1,-1.041312149906314,1.134214373258162,-1.269686811479259,2.075368250436277,-1.520771409696474e1,1.389750473974189,-1.48485748783569,-1.040579640776707,8.899721508624742e-1,-7.177691661032869,6.882712043721976e-1,-7.599347599660409e-1,-1.26440526850463,1.160658043364166,-5.391509178445742,6.679923135342851e-1,-7.521725463922262e-1,3.752349810676949,-2.906684049793639,2.672876913566556e1,-2.493145660873,2.782825829667436,1.443588084644871e-1,-1.307230271348211e-1,2.216804748506809,1.437719804483573e-1,-1.145830952112369e-1,3.2149320801083e-1,-2.34361439272989e-1,1.855837403850803,1.286992417665136e-1,-5.758238484341108e-2,-1.301103772185027,9.973408313121463e-1,-8.837520107531879,9.534930382604288e-1,-1.429199518808459e-2,-2.384453600787036,1.818345997558567,-1.577342441239303e1,1.422846302346762,3.154159322410927e-3,3.589377915408905e-1,-2.109524979864723e-1,9.363227187483732e-1,6.301238593470628e-2,5.732390257964316e-2,2.793582225299658,-2.033528056927806,1.621324028555783e1,-1.189222718426265,6.189671387692164e-2,5.342131492864642e-1,-4.222231296997605e-1,3.787253511209165,-3.350064226195165e-1,1.245325350855226e-2,-2.184146687275183,1.551331905163865,-1.19387312118926e1,8.349589004472998e-1,-1.35383591594438e-1,-8.014367493869704e-1,5.668415377001197e-1,-4.302842643863972,2.84183319528176e-1,3.83514596570461e-2,9.45794880458861e-1,-6.732638898386457e-1,5.234390273661413,-3.83498639699941e-1,1.440453495443018e-1,5.645065377027613e-1,-4.039220855868618e-1,3.170156487564899,-2.383074337879712e-1,1.216617375214008e-1,-1.937863224145611e-1,1.358891032584724e-1,-1.023378722711107,6.830621267493578e-2,-4.169135139842575e-3,2.270306426219975e-2,-2.38399209865252e-2,2.928388757260058e-1,-4.02060181933195e-2,6.880595419697505e-2,9.638828970166005e-2,-6.98778025332229e-2,5.609317796857676e-1,-4.429526993510467e-2,2.882554468024363e-2,3.582431391759518e-2,-2.671910644265286e-2,2.251335440088556e-1,-1.966486325944329e-2,1.791756577091828e-2,-3.350790201878844e-1,2.581411034605136e-1,-2.283079071439122,2.162064132948073e-1,-2.321676317817421e-1,6.356644993195555e-2,-4.921907141164279e-2,4.384534411523264e-1,-4.198474091936761e-2,4.597203884996652e-2,2.261662512481835e-2,-1.740429407604355e-2,1.537038474929879e-1,-1.452709057733876e-2,1.556101844926456e-2,3.097679325854209e-2,-2.394872918869654e-2,2.128879105995857e-1,-2.032077838507769e-2,2.213372706946953e-2],[5,24]); -end -if nargout > 2 - t2 = [2.948906761778786e-1,1.525720623897707,2.57452876984127e-1,1.798113701499118,4.127080577601411e-1,1.278484623015873,9.232955798059965e-1,1.009333860859158]; - HcU = t2; -end -if nargout > 3 - HfU = t2; -end
diff -r 60a3bc79835a -r 4291731570bb +sbp/+implementations/intOpAWW_orders_8to8_ratio_2to1_accC2F5_accF2C4.m --- a/+sbp/+implementations/intOpAWW_orders_8to8_ratio_2to1_accC2F5_accF2C4.m Mon Dec 03 12:02:27 2018 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -function [stencil_F2C,BC_F2C,HcU,HfU] = intOpAWW_orders_8to8_ratio_2to1_accC2F5_accF2C4 -%INT_ORDERS_8TO8_RATIO_2TO1_ACCC2F5_ACCF2C4_STENCIL_17_BC_6_24 -% [STENCIL_F2C,BC_F2C,HCU,HFU] = INT_ORDERS_8TO8_RATIO_2TO1_ACCC2F5_ACCF2C4_STENCIL_17_BC_6_24 - -% This function was generated by the Symbolic Math Toolbox version 8.0. -% 21-May-2018 15:35:39 - -stencil_F2C = [-2.564929780505952e-4,-1.220703125e-3,2.051943824404762e-3,1.1962890625e-2,-7.181803385416667e-3,-5.9814453125e-2,1.436360677083333e-2,2.99072265625e-1,4.820454915364583e-1,2.99072265625e-1,1.436360677083333e-2,-5.9814453125e-2,-7.181803385416667e-3,1.1962890625e-2,2.051943824404762e-3,-1.220703125e-3,-2.564929780505952e-4]; -if nargout > 1 - BC_F2C = reshape([-1.673327822994457e1,1.665420585653232e1,-1.973927473454954e2,2.826257908914756e1,-6.156813484052936e1,3.974966126696054,2.880639373222355e1,-2.660797294399895e1,3.202303847857831e2,-4.598960974033412e1,1.003152507870138e2,-6.481221721577338,8.061874893005659,-7.706608975219419,9.234201483040626e1,-1.322147613066874e1,2.880209985918895e1,-1.859523138300886,-2.19528557898034e1,2.13763239391502e1,-2.476320412310993e2,3.572924955195535e1,-7.795290920161567e1,5.036097395109802,-1.287197329845376,1.244100160910233,-1.394684346537857e1,2.112320869857597,-4.60441856527933,2.978264879234002e-1,1.935199269380359,-1.88580031845933,2.330807783420723e1,-2.91749306966336,6.644427567385864,-4.302395355488564e-1,-1.148984264037686,1.109982778464842,-1.314799057941425e1,2.137017065505111,-4.084082382904703,2.606486561845403e-1,1.565462612018858,-1.508309105065004,1.772442871757061e1,-2.40060893717649,6.31422909250156,-4.052444871368164e-1,3.179380137695096e-1,-3.071741522636364e-1,3.636264382483117,-5.183996466001354e-1,2.322192602480252,-6.467931586900172e-2,6.277081831671831e-1,-6.107890751034906e-1,7.335850436798604,-1.091016872160133,3.089218691662174,6.988892111841499e-2,1.639756762532723,-1.583883992641009,1.876236237708381e1,-2.685390559486947,5.859855615166555,3.919312696253764e-3,1.611803934956753,-1.540778869185931,1.795955382224485e1,-2.495154500270907,5.003492494640851,-4.157919873785453e-2,-6.213413520816026e-1,6.242581523412814e-1,-7.823535324240331,1.222418137438074,-3.120142966701915,2.975831327541895e-1,2.12230710100161,-2.0451058741188,2.412395225004063e1,-3.423544496956294,7.325914828631551,-4.793445914188063e-1,-4.31809447483846,4.158975059021769,-4.906211424150023e1,6.975058620124194,-1.501259943091044e1,9.418983630154896e-1,-6.138797742037704e-1,5.810969368378602e-1,-6.6821474226667,9.113864351863538e-1,-1.814400062103318,1.002574935832871e-1,-9.860044240994036e-2,9.448685284232805e-2,-1.106188847377502,1.552858946803229e-1,-3.265426230113952e-1,2.062042480203908e-2,-2.745034502159738,2.655226942873441,-3.151193386341271e1,4.520932327069998,-9.883338555855938,6.423439846307804e-1,2.139968493382333,-2.067738462547628,2.450223844197562e1,-3.50699574523559,7.635005983192545,-4.923960464980415e-1,1.036406872394752,-1.002008838408551,1.188339891704641e1,-1.70302259679446,3.715789696036691,-2.407301455417931e-1,1.606428513214277,-1.552524985439685,1.840245870449254e1,-2.635131753653705,5.741508438443495,-3.708346905830083e-1,5.659562678739624e-2,-5.465656201303744e-2,6.471932864664631e-1,-9.253169145609999e-2,2.010909570941804e-1,-1.292046400706276e-2,5.435391241988039e-1,-5.252672844681129e-1,6.225561585258754,-8.91344337215917e-1,1.941632399616401,-1.253426955105431e-1,-1.552116972709218,1.499962759958308,-1.777819805127299e1,2.545472086708348,-5.545140384142844,3.580057322157566e-1],[6,24]); -end -if nargout > 2 - t2 = [2.948906761778786e-1,1.525720623897707,2.57452876984127e-1,1.798113701499118,4.127080577601411e-1,1.278484623015873,9.232955798059965e-1,1.009333860859158]; - HcU = t2; -end -if nargout > 3 - HfU = t2; -end
diff -r 60a3bc79835a -r 4291731570bb +sbp/+implementations/intOpOP_orders_2to2_ratio2to1.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/+sbp/+implementations/intOpOP_orders_2to2_ratio2to1.m Mon Dec 03 14:53:52 2018 -0800 @@ -0,0 +1,47 @@ +function [IC2F,IF2C,Hc,Hf] = IntOpOP_orders_2to2_ratio2to1(mc,hc,ACC) + +% ACC is a string. +% ACC = 'C2F' creates IC2F with one order of accuracy higher than IF2C. +% ACC = 'F2C' creates IF2C with one order of accuracy higher than IC2F. +ratio = 2; +mf = ratio*mc-1; +hf = hc/ratio; + +switch ACC + case 'F2C' + [stencil_F2C,BC_F2C,HcU,HfU] = ... + sbp.implementations.intOpOP_orders_2to2_ratio_2to1_accC2F1_accF2C2; + case 'C2F' + [stencil_F2C,BC_F2C,HcU,HfU] = ... + sbp.implementations.intOpOP_orders_2to2_ratio_2to1_accC2F2_accF2C1; +end + +stencil_width = length(stencil_F2C); +stencil_hw = (stencil_width-1)/2; +[BC_rows,BC_cols] = size(BC_F2C); + +%%% Norm matrices %%% +Hc = speye(mc,mc); +HcUm = length(HcU); +Hc(1:HcUm,1:HcUm) = spdiags(HcU',0,HcUm,HcUm); +Hc(mc-HcUm+1:mc,mc-HcUm+1:mc) = spdiags(rot90(HcU',2),0,HcUm,HcUm); +Hc = Hc*hc; + +Hf = speye(mf,mf); +HfUm = length(HfU); +Hf(1:HfUm,1:HfUm) = spdiags(HfU',0,HfUm,HfUm); +Hf(mf-length(HfU)+1:mf,mf-length(HfU)+1:mf) = spdiags(rot90(HfU',2),0,HfUm,HfUm); +Hf = Hf*hf; +%%%%%%%%%%%%%%%%%%%%%% + +%%% Create IF2C from stencil and BC +IF2C = sparse(mc,mf); +for i = BC_rows+1 : mc-BC_rows + IF2C(i,ratio*i-1+(-stencil_hw:stencil_hw)) = stencil_F2C; %#ok<SPRIX> +end +IF2C(1:BC_rows,1:BC_cols) = BC_F2C; +IF2C(end-BC_rows+1:end,end-BC_cols+1:end) = rot90(BC_F2C,2); +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%% Create IC2F using symmetry condition %%%% +IC2F = Hf\IF2C.'*Hc; \ No newline at end of file
diff -r 60a3bc79835a -r 4291731570bb +sbp/+implementations/intOpOP_orders_2to2_ratio_2to1_accC2F1_accF2C2.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/+sbp/+implementations/intOpOP_orders_2to2_ratio_2to1_accC2F1_accF2C2.m Mon Dec 03 14:53:52 2018 -0800 @@ -0,0 +1,17 @@ +function [stencil_F2C,BC_F2C,HcU,HfU] = intOpOP_orders_2to2_ratio_2to1_accC2F1_accF2C2 +%INT_ORDERS_2TO2_RATIO_2TO1_ACCC2F1_ACCF2C2_STENCIL_5_BC_2_5 +% [STENCIL_F2C,BC_F2C,HCU,HFU] = INT_ORDERS_2TO2_RATIO_2TO1_ACCC2F1_ACCF2C2_STENCIL_5_BC_2_5 + +% This function was generated by the Symbolic Math Toolbox version 8.0. +% 21-May-2018 15:36:07 + +stencil_F2C = [-1.0./8.0,1.0./4.0,3.0./4.0,1.0./4.0,-1.0./8.0]; +if nargout > 1 + BC_F2C = reshape([6.288191560529559e-1,-6.440957802647795e-2,6.855471317807184e-1,1.572264341096408e-1,-2.438028498638558e-1,7.469014249319279e-1,-8.431231982626708e-2,2.921561599131335e-1,1.374888185644862e-2,-1.318744409282243e-1],[2,5]); +end +if nargout > 2 + HcU = 1.0./2.0; +end +if nargout > 3 + HfU = 1.0./2.0; +end
diff -r 60a3bc79835a -r 4291731570bb +sbp/+implementations/intOpOP_orders_2to2_ratio_2to1_accC2F2_accF2C1.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/+sbp/+implementations/intOpOP_orders_2to2_ratio_2to1_accC2F2_accF2C1.m Mon Dec 03 14:53:52 2018 -0800 @@ -0,0 +1,17 @@ +function [stencil_F2C,BC_F2C,HcU,HfU] = intOpOP_orders_2to2_ratio_2to1_accC2F2_accF2C1 +%INT_ORDERS_2TO2_RATIO_2TO1_ACCC2F2_ACCF2C1_STENCIL_5_BC_1_3 +% [STENCIL_F2C,BC_F2C,HCU,HFU] = INT_ORDERS_2TO2_RATIO_2TO1_ACCC2F2_ACCF2C1_STENCIL_5_BC_1_3 + +% This function was generated by the Symbolic Math Toolbox version 8.0. +% 21-May-2018 15:36:08 + +stencil_F2C = [1.0./4.0,1.0./2.0,1.0./4.0]; +if nargout > 1 + BC_F2C = [1.0./2.0,1.0./2.0]; +end +if nargout > 2 + HcU = 1.0./2.0; +end +if nargout > 3 + HfU = 1.0./2.0; +end
diff -r 60a3bc79835a -r 4291731570bb +sbp/+implementations/intOpOP_orders_4to4_ratio2to1.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/+sbp/+implementations/intOpOP_orders_4to4_ratio2to1.m Mon Dec 03 14:53:52 2018 -0800 @@ -0,0 +1,47 @@ +function [IC2F,IF2C,Hc,Hf] = IntOpOP_orders_4to4_ratio2to1(mc,hc,ACC) + +% ACC is a string. +% ACC = 'C2F' creates IC2F with one order of accuracy higher than IF2C. +% ACC = 'F2C' creates IF2C with one order of accuracy higher than IC2F. +ratio = 2; +mf = ratio*mc-1; +hf = hc/ratio; + +switch ACC + case 'F2C' + [stencil_F2C,BC_F2C,HcU,HfU] = ... + sbp.implementations.intOpOP_orders_4to4_ratio_2to1_accC2F2_accF2C3; + case 'C2F' + [stencil_F2C,BC_F2C,HcU,HfU] = ... + sbp.implementations.intOpOP_orders_4to4_ratio_2to1_accC2F3_accF2C2; +end + +stencil_width = length(stencil_F2C); +stencil_hw = (stencil_width-1)/2; +[BC_rows,BC_cols] = size(BC_F2C); + +%%% Norm matrices %%% +Hc = speye(mc,mc); +HcUm = length(HcU); +Hc(1:HcUm,1:HcUm) = spdiags(HcU',0,HcUm,HcUm); +Hc(mc-HcUm+1:mc,mc-HcUm+1:mc) = spdiags(rot90(HcU',2),0,HcUm,HcUm); +Hc = Hc*hc; + +Hf = speye(mf,mf); +HfUm = length(HfU); +Hf(1:HfUm,1:HfUm) = spdiags(HfU',0,HfUm,HfUm); +Hf(mf-length(HfU)+1:mf,mf-length(HfU)+1:mf) = spdiags(rot90(HfU',2),0,HfUm,HfUm); +Hf = Hf*hf; +%%%%%%%%%%%%%%%%%%%%%% + +%%% Create IF2C from stencil and BC +IF2C = sparse(mc,mf); +for i = BC_rows+1 : mc-BC_rows + IF2C(i,ratio*i-1+(-stencil_hw:stencil_hw)) = stencil_F2C; %#ok<SPRIX> +end +IF2C(1:BC_rows,1:BC_cols) = BC_F2C; +IF2C(end-BC_rows+1:end,end-BC_cols+1:end) = rot90(BC_F2C,2); +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%% Create IC2F using symmetry condition %%%% +IC2F = Hf\IF2C.'*Hc; \ No newline at end of file
diff -r 60a3bc79835a -r 4291731570bb +sbp/+implementations/intOpOP_orders_4to4_ratio_2to1_accC2F2_accF2C3.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/+sbp/+implementations/intOpOP_orders_4to4_ratio_2to1_accC2F2_accF2C3.m Mon Dec 03 14:53:52 2018 -0800 @@ -0,0 +1,18 @@ +function [stencil_F2C,BC_F2C,HcU,HfU] = intOpOP_orders_4to4_ratio_2to1_accC2F2_accF2C3 +%INT_ORDERS_4TO4_RATIO_2TO1_ACCC2F2_ACCF2C3_STENCIL_9_BC_3_11 +% [STENCIL_F2C,BC_F2C,HCU,HFU] = INT_ORDERS_4TO4_RATIO_2TO1_ACCC2F2_ACCF2C3_STENCIL_9_BC_3_11 + +% This function was generated by the Symbolic Math Toolbox version 8.0. +% 21-May-2018 15:36:01 + +stencil_F2C = [7.0./2.56e2,-1.0./3.2e1,-7.0./6.4e1,9.0./3.2e1,8.5e1./1.28e2,9.0./3.2e1,-7.0./6.4e1,-1.0./3.2e1,7.0./2.56e2]; +if nargout > 1 + BC_F2C = reshape([7.523257802630956e-2,2.447812262221267e-1,-1.679313063616916e-1,1.290510950666589,6.315723344677289e-3,1.67178747937954e-1,1.982667903557025,-7.554383893379468e-1,7.215271362899867e-1,-2.820478831383137,1.807034411305536,-7.589683751979843e-1,-7.685973268458095e-1,3.965751544535173e-1,4.119789638051451e-1,1.574000556785898e-1,-1.113618964927466e-1,3.631000220124657e-1,1.639694219982991,-9.114074742274862e-1,4.952715520862987e-1,-4.524162151353456e-1,2.65481378213589e-1,-2.268273408674622e-1,3.455365956773523e-1,-2.009765975089827e-1,1.722179564305811e-1,-5.52933488235368e-1,3.18109976271229e-1,-2.171481232558432e-1,1.033835580108027e-1,-5.911351224351343e-2,3.960076712054991e-2],[3,11]); +end +if nargout > 2 + t2 = [1.7e1./4.8e1,5.9e1./4.8e1,4.3e1./4.8e1,4.9e1./4.8e1]; + HcU = t2; +end +if nargout > 3 + HfU = t2; +end
diff -r 60a3bc79835a -r 4291731570bb +sbp/+implementations/intOpOP_orders_4to4_ratio_2to1_accC2F3_accF2C2.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/+sbp/+implementations/intOpOP_orders_4to4_ratio_2to1_accC2F3_accF2C2.m Mon Dec 03 14:53:52 2018 -0800 @@ -0,0 +1,18 @@ +function [stencil_F2C,BC_F2C,HcU,HfU] = intOpOP_orders_4to4_ratio_2to1_accC2F3_accF2C2 +%INT_ORDERS_4TO4_RATIO_2TO1_ACCC2F3_ACCF2C2_STENCIL_9_BC_3_11 +% [STENCIL_F2C,BC_F2C,HCU,HFU] = INT_ORDERS_4TO4_RATIO_2TO1_ACCC2F3_ACCF2C2_STENCIL_9_BC_3_11 + +% This function was generated by the Symbolic Math Toolbox version 8.0. +% 21-May-2018 15:36:05 + +stencil_F2C = [-1.0./2.56e2,-1.0./3.2e1,1.0./6.4e1,9.0./3.2e1,6.1e1./1.28e2,9.0./3.2e1,1.0./6.4e1,-1.0./3.2e1,-1.0./2.56e2]; +if nargout > 1 + BC_F2C = reshape([1.0./2.0,0.0,0.0,1.77e2./2.72e2,3.0./8.0,-5.9e1./6.88e2,1.125919117647059e-2,3.546742584745763e-1,1.335392441860465e-2,-4.9e1./5.44e2,2.335805084745763e-1,3.204941860465116e-1,-1.194852941176471e-2,1.350635593220339e-2,5.308866279069767e-1,-9.0./5.44e2,-1.11228813559322e-2,2.943313953488372e-1,-2.803308823529412e-2,2.105402542372881e-2,-1.580668604651163e-2,-9.0./5.44e2,1.430084745762712e-2,-5.450581395348837e-2,-9.191176470588235e-4,7.944915254237288e-4,-5.450581395348837e-3,1.0./5.44e2,-1.588983050847458e-3,2.180232558139535e-3,2.297794117647059e-4,-1.986228813559322e-4,2.725290697674419e-4],[3,11]); +end +if nargout > 2 + t2 = [1.7e1./4.8e1,5.9e1./4.8e1,4.3e1./4.8e1,4.9e1./4.8e1]; + HcU = t2; +end +if nargout > 3 + HfU = t2; +end
diff -r 60a3bc79835a -r 4291731570bb +sbp/+implementations/intOpOP_orders_6to6_ratio2to1.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/+sbp/+implementations/intOpOP_orders_6to6_ratio2to1.m Mon Dec 03 14:53:52 2018 -0800 @@ -0,0 +1,47 @@ +function [IC2F,IF2C,Hc,Hf] = IntOpOP_orders_6to6_ratio2to1(mc,hc,ACC) + +% ACC is a string. +% ACC = 'C2F' creates IC2F with one order of accuracy higher than IF2C. +% ACC = 'F2C' creates IF2C with one order of accuracy higher than IC2F. +ratio = 2; +mf = ratio*mc-1; +hf = hc/ratio; + +switch ACC + case 'F2C' + [stencil_F2C,BC_F2C,HcU,HfU] = ... + sbp.implementations.intOpOP_orders_6to6_ratio_2to1_accC2F3_accF2C4; + case 'C2F' + [stencil_F2C,BC_F2C,HcU,HfU] = ... + sbp.implementations.intOpOP_orders_6to6_ratio_2to1_accC2F4_accF2C3; +end + +stencil_width = length(stencil_F2C); +stencil_hw = (stencil_width-1)/2; +[BC_rows,BC_cols] = size(BC_F2C); + +%%% Norm matrices %%% +Hc = speye(mc,mc); +HcUm = length(HcU); +Hc(1:HcUm,1:HcUm) = spdiags(HcU',0,HcUm,HcUm); +Hc(mc-HcUm+1:mc,mc-HcUm+1:mc) = spdiags(rot90(HcU',2),0,HcUm,HcUm); +Hc = Hc*hc; + +Hf = speye(mf,mf); +HfUm = length(HfU); +Hf(1:HfUm,1:HfUm) = spdiags(HfU',0,HfUm,HfUm); +Hf(mf-length(HfU)+1:mf,mf-length(HfU)+1:mf) = spdiags(rot90(HfU',2),0,HfUm,HfUm); +Hf = Hf*hf; +%%%%%%%%%%%%%%%%%%%%%% + +%%% Create IF2C from stencil and BC +IF2C = sparse(mc,mf); +for i = BC_rows+1 : mc-BC_rows + IF2C(i,ratio*i-1+(-stencil_hw:stencil_hw)) = stencil_F2C; %#ok<SPRIX> +end +IF2C(1:BC_rows,1:BC_cols) = BC_F2C; +IF2C(end-BC_rows+1:end,end-BC_cols+1:end) = rot90(BC_F2C,2); +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%% Create IC2F using symmetry condition %%%% +IC2F = Hf\IF2C.'*Hc; \ No newline at end of file
diff -r 60a3bc79835a -r 4291731570bb +sbp/+implementations/intOpOP_orders_6to6_ratio_2to1_accC2F3_accF2C4.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/+sbp/+implementations/intOpOP_orders_6to6_ratio_2to1_accC2F3_accF2C4.m Mon Dec 03 14:53:52 2018 -0800 @@ -0,0 +1,18 @@ +function [stencil_F2C,BC_F2C,HcU,HfU] = intOpOP_orders_6to6_ratio_2to1_accC2F3_accF2C4 +%INT_ORDERS_6TO6_RATIO_2TO1_ACCC2F3_ACCF2C4_STENCIL_13_BC_3_17 +% [STENCIL_F2C,BC_F2C,HCU,HFU] = INT_ORDERS_6TO6_RATIO_2TO1_ACCC2F3_ACCF2C4_STENCIL_13_BC_3_17 + +% This function was generated by the Symbolic Math Toolbox version 8.0. +% 21-May-2018 15:35:47 + +stencil_F2C = [-5.95703125e-3,3.0./5.12e2,3.57421875e-2,-2.5e1./5.12e2,-8.935546875e-2,7.5e1./2.56e2,3.17e2./5.12e2,7.5e1./2.56e2,-8.935546875e-2,-2.5e1./5.12e2,3.57421875e-2,3.0./5.12e2,-5.95703125e-3]; +if nargout > 1 + BC_F2C = reshape([5.233890618131365e-1,-1.594459192645467e-2,3.532688727637403e-2,8.021234957689208e-1,3.90683205173562e-1,-1.73222951632239e-1,-8.87662686483442e-2,2.90091235796637e-1,-1.600356115709148e-1,-1.044025375027475e-1,2.346179009198368e-1,6.091329306528956e-1,1.561275522703128e-1,-1.168382445709856e-1,1.040987887887311,-2.387061036980731e-1,1.363504965974361e-1,1.082611928255256e-1,-5.745310654054326e-1,3.977694249198785e-1,-9.376217911402619e-1,3.554518646054656e-2,5.609157787396987e-5,-1.564625311232018e-1,6.107907974027401e-1,-3.786608696698368e-1,7.02265869951125e-1,2.054294270642538e-1,-1.302300112378257e-1,2.478941407690889e-1,-2.657085326191479e-1,1.568761445933572e-1,-2.632906518005349e-1,-1.228047556139644e-1,7.182193248980271e-2,-1.1291238242346e-1,5.811258780405158e-2,-3.466364400805378e-2,5.683680203338252e-2,1.781337575097077e-2,-1.030572999042704e-2,1.577197067502767e-2,-1.443802115768554e-2,8.391316308374261e-3,-1.29534117369052e-2,-1.548018627738296e-3,8.794183904936319e-4,-1.298961407229805e-3,1.573818938200601e-3,-8.940753636685258e-4,1.320610764016968e-3],[3,17]); +end +if nargout > 2 + t2 = [3.159490740740741e-1,1.390393518518519,6.275462962962963e-1,1.240509259259259,9.116898148148148e-1,1.013912037037037]; + HcU = t2; +end +if nargout > 3 + HfU = t2; +end
diff -r 60a3bc79835a -r 4291731570bb +sbp/+implementations/intOpOP_orders_6to6_ratio_2to1_accC2F4_accF2C3.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/+sbp/+implementations/intOpOP_orders_6to6_ratio_2to1_accC2F4_accF2C3.m Mon Dec 03 14:53:52 2018 -0800 @@ -0,0 +1,18 @@ +function [stencil_F2C,BC_F2C,HcU,HfU] = intOpOP_orders_6to6_ratio_2to1_accC2F4_accF2C3 +%INT_ORDERS_6TO6_RATIO_2TO1_ACCC2F4_ACCF2C3_STENCIL_13_BC_4_17 +% [STENCIL_F2C,BC_F2C,HCU,HFU] = INT_ORDERS_6TO6_RATIO_2TO1_ACCC2F4_ACCF2C3_STENCIL_13_BC_4_17 + +% This function was generated by the Symbolic Math Toolbox version 8.0. +% 21-May-2018 15:35:56 + +stencil_F2C = [1.07421875e-3,3.0./5.12e2,-6.4453125e-3,-2.5e1./5.12e2,1.611328125e-2,7.5e1./2.56e2,2.45e2./5.12e2,7.5e1./2.56e2,1.611328125e-2,-2.5e1./5.12e2,-6.4453125e-3,3.0./5.12e2,1.07421875e-3]; +if nargout > 1 + BC_F2C = reshape([1.0./2.0,0.0,0.0,0.0,6.876076086160158e-1,1.5e1./3.2e1,-3.461879841386942e-1,3.502577439820862e-2,3.099721991995751e-3,2.228547003766753e-1,9.363652999354482e-3,-3.15791046603844e-3,-1.05789143206462e-1,2.35563165945226e-1,6.070385985337514e-1,-4.847496617839149e-2,-4.809232246867902e-3,5.154694068405061e-3,7.049223649022501e-1,1.016749349808733e-2,3.460117842882262e-2,-4.996621498584866e-2,5.210650763094799e-1,2.233592875303228e-1,-2.239024779745769e-3,4.254668119953384e-4,9.213872590833641e-3,3.910524351558127e-1,-9.048711215107334e-2,8.597375629526346e-2,-3.468219752858724e-1,3.250682992395969e-1,-1.309107466664224e-1,1.199249722306043e-1,-4.071552384959425e-1,1.474417123938701e-1,-3.02863877390285e-2,3.046016554982103e-2,-1.081315128181483e-1,1.120705238850532e-2,7.977722870036266e-2,-6.772545887788229e-2,2.00270418837606e-1,-5.427183680490763e-2,6.524845570188292e-2,-5.637610037043203e-2,1.711235764016968e-1,-4.203646902407166e-2,4.639548341453586e-3,-4.055884445496545e-3,1.258630924935448e-2,-2.776451559292779e-3,-1.023784366070774e-2,8.817108288936985e-3,-2.659664906860937e-2,7.14445034054861e-3,-1.435466025441424e-3,1.240274208149505e-3,-3.764718680837329e-3,1.028716295017727e-3,1.032012418492197e-3,-8.794183904936319e-4,2.597922814459609e-3,-6.571159498040679e-4,1.892022767235695e-4,-1.612267049238325e-4,4.76285849317595e-4,-1.204712574640791e-4],[4,17]); +end +if nargout > 2 + t2 = [3.159490740740741e-1,1.390393518518519,6.275462962962963e-1,1.240509259259259,9.116898148148148e-1,1.013912037037037]; + HcU = t2; +end +if nargout > 3 + HfU = t2; +end
diff -r 60a3bc79835a -r 4291731570bb +sbp/+implementations/intOpOP_orders_8to8_ratio2to1.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/+sbp/+implementations/intOpOP_orders_8to8_ratio2to1.m Mon Dec 03 14:53:52 2018 -0800 @@ -0,0 +1,47 @@ +function [IC2F,IF2C,Hc,Hf] = IntOpOP_orders_8to8_ratio2to1(mc,hc,ACC) + +% ACC is a string. +% ACC = 'C2F' creates IC2F with one order of accuracy higher than IF2C. +% ACC = 'F2C' creates IF2C with one order of accuracy higher than IC2F. +ratio = 2; +mf = ratio*mc-1; +hf = hc/ratio; + +switch ACC + case 'F2C' + [stencil_F2C,BC_F2C,HcU,HfU] = ... + sbp.implementations.intOpOP_orders_8to8_ratio_2to1_accC2F4_accF2C5; + case 'C2F' + [stencil_F2C,BC_F2C,HcU,HfU] = ... + sbp.implementations.intOpOP_orders_8to8_ratio_2to1_accC2F5_accF2C4; +end + +stencil_width = length(stencil_F2C); +stencil_hw = (stencil_width-1)/2; +[BC_rows,BC_cols] = size(BC_F2C); + +%%% Norm matrices %%% +Hc = speye(mc,mc); +HcUm = length(HcU); +Hc(1:HcUm,1:HcUm) = spdiags(HcU',0,HcUm,HcUm); +Hc(mc-HcUm+1:mc,mc-HcUm+1:mc) = spdiags(rot90(HcU',2),0,HcUm,HcUm); +Hc = Hc*hc; + +Hf = speye(mf,mf); +HfUm = length(HfU); +Hf(1:HfUm,1:HfUm) = spdiags(HfU',0,HfUm,HfUm); +Hf(mf-length(HfU)+1:mf,mf-length(HfU)+1:mf) = spdiags(rot90(HfU',2),0,HfUm,HfUm); +Hf = Hf*hf; +%%%%%%%%%%%%%%%%%%%%%% + +%%% Create IF2C from stencil and BC +IF2C = sparse(mc,mf); +for i = BC_rows+1 : mc-BC_rows + IF2C(i,ratio*i-1+(-stencil_hw:stencil_hw)) = stencil_F2C; %#ok<SPRIX> +end +IF2C(1:BC_rows,1:BC_cols) = BC_F2C; +IF2C(end-BC_rows+1:end,end-BC_cols+1:end) = rot90(BC_F2C,2); +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%% Create IC2F using symmetry condition %%%% +IC2F = Hf\IF2C.'*Hc; \ No newline at end of file
diff -r 60a3bc79835a -r 4291731570bb +sbp/+implementations/intOpOP_orders_8to8_ratio_2to1_accC2F4_accF2C5.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/+sbp/+implementations/intOpOP_orders_8to8_ratio_2to1_accC2F4_accF2C5.m Mon Dec 03 14:53:52 2018 -0800 @@ -0,0 +1,18 @@ +function [stencil_F2C,BC_F2C,HcU,HfU] = intOpOP_orders_8to8_ratio_2to1_accC2F4_accF2C5 +%INT_ORDERS_8TO8_RATIO_2TO1_ACCC2F4_ACCF2C5_STENCIL_17_BC_5_24 +% [STENCIL_F2C,BC_F2C,HCU,HFU] = INT_ORDERS_8TO8_RATIO_2TO1_ACCC2F4_ACCF2C5_STENCIL_17_BC_5_24 + +% This function was generated by the Symbolic Math Toolbox version 8.0. +% 21-May-2018 15:35:02 + +stencil_F2C = [1.324608212425595e-3,-1.220703125e-3,-1.059686569940476e-2,1.1962890625e-2,3.708902994791667e-2,-5.9814453125e-2,-7.417805989583333e-2,2.99072265625e-1,5.927225748697917e-1,2.99072265625e-1,-7.417805989583333e-2,-5.9814453125e-2,3.708902994791667e-2,1.1962890625e-2,-1.059686569940476e-2,-1.220703125e-3,1.324608212425595e-3]; +if nargout > 1 + BC_F2C = reshape([2.087365925359584,-1.227221822236823,1.090916714284468e1,-1.041312149906314,1.134214373258162,-1.269686811479259,2.075368250436277,-1.520771409696474e1,1.389750473974189,-1.48485748783569,-1.040579640776707,8.899721508624742e-1,-7.177691661032869,6.882712043721976e-1,-7.599347599660409e-1,-1.26440526850463,1.160658043364166,-5.391509178445742,6.679923135342851e-1,-7.521725463922262e-1,3.752349810676949,-2.906684049793639,2.672876913566556e1,-2.493145660873,2.782825829667436,1.443588084644871e-1,-1.307230271348211e-1,2.216804748506809,1.437719804483573e-1,-1.145830952112369e-1,3.2149320801083e-1,-2.34361439272989e-1,1.855837403850803,1.286992417665136e-1,-5.758238484341108e-2,-1.301103772185027,9.973408313121463e-1,-8.837520107531879,9.534930382604288e-1,-1.429199518808459e-2,-2.384453600787036,1.818345997558567,-1.577342441239303e1,1.422846302346762,3.154159322410927e-3,3.589377915408905e-1,-2.109524979864723e-1,9.363227187483732e-1,6.301238593470628e-2,5.732390257964316e-2,2.793582225299658,-2.033528056927806,1.621324028555783e1,-1.189222718426265,6.189671387692164e-2,5.342131492864642e-1,-4.222231296997605e-1,3.787253511209165,-3.350064226195165e-1,1.245325350855226e-2,-2.184146687275183,1.551331905163865,-1.19387312118926e1,8.349589004472998e-1,-1.35383591594438e-1,-8.014367493869704e-1,5.668415377001197e-1,-4.302842643863972,2.84183319528176e-1,3.83514596570461e-2,9.45794880458861e-1,-6.732638898386457e-1,5.234390273661413,-3.83498639699941e-1,1.440453495443018e-1,5.645065377027613e-1,-4.039220855868618e-1,3.170156487564899,-2.383074337879712e-1,1.216617375214008e-1,-1.937863224145611e-1,1.358891032584724e-1,-1.023378722711107,6.830621267493578e-2,-4.169135139842575e-3,2.270306426219975e-2,-2.38399209865252e-2,2.928388757260058e-1,-4.02060181933195e-2,6.880595419697505e-2,9.638828970166005e-2,-6.98778025332229e-2,5.609317796857676e-1,-4.429526993510467e-2,2.882554468024363e-2,3.582431391759518e-2,-2.671910644265286e-2,2.251335440088556e-1,-1.966486325944329e-2,1.791756577091828e-2,-3.350790201878844e-1,2.581411034605136e-1,-2.283079071439122,2.162064132948073e-1,-2.321676317817421e-1,6.356644993195555e-2,-4.921907141164279e-2,4.384534411523264e-1,-4.198474091936761e-2,4.597203884996652e-2,2.261662512481835e-2,-1.740429407604355e-2,1.537038474929879e-1,-1.452709057733876e-2,1.556101844926456e-2,3.097679325854209e-2,-2.394872918869654e-2,2.128879105995857e-1,-2.032077838507769e-2,2.213372706946953e-2],[5,24]); +end +if nargout > 2 + t2 = [2.948906761778786e-1,1.525720623897707,2.57452876984127e-1,1.798113701499118,4.127080577601411e-1,1.278484623015873,9.232955798059965e-1,1.009333860859158]; + HcU = t2; +end +if nargout > 3 + HfU = t2; +end
diff -r 60a3bc79835a -r 4291731570bb +sbp/+implementations/intOpOP_orders_8to8_ratio_2to1_accC2F5_accF2C4.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/+sbp/+implementations/intOpOP_orders_8to8_ratio_2to1_accC2F5_accF2C4.m Mon Dec 03 14:53:52 2018 -0800 @@ -0,0 +1,18 @@ +function [stencil_F2C,BC_F2C,HcU,HfU] = intOpOP_orders_8to8_ratio_2to1_accC2F5_accF2C4 +%INT_ORDERS_8TO8_RATIO_2TO1_ACCC2F5_ACCF2C4_STENCIL_17_BC_6_24 +% [STENCIL_F2C,BC_F2C,HCU,HFU] = INT_ORDERS_8TO8_RATIO_2TO1_ACCC2F5_ACCF2C4_STENCIL_17_BC_6_24 + +% This function was generated by the Symbolic Math Toolbox version 8.0. +% 21-May-2018 15:35:39 + +stencil_F2C = [-2.564929780505952e-4,-1.220703125e-3,2.051943824404762e-3,1.1962890625e-2,-7.181803385416667e-3,-5.9814453125e-2,1.436360677083333e-2,2.99072265625e-1,4.820454915364583e-1,2.99072265625e-1,1.436360677083333e-2,-5.9814453125e-2,-7.181803385416667e-3,1.1962890625e-2,2.051943824404762e-3,-1.220703125e-3,-2.564929780505952e-4]; +if nargout > 1 + BC_F2C = reshape([-1.673327822994457e1,1.665420585653232e1,-1.973927473454954e2,2.826257908914756e1,-6.156813484052936e1,3.974966126696054,2.880639373222355e1,-2.660797294399895e1,3.202303847857831e2,-4.598960974033412e1,1.003152507870138e2,-6.481221721577338,8.061874893005659,-7.706608975219419,9.234201483040626e1,-1.322147613066874e1,2.880209985918895e1,-1.859523138300886,-2.19528557898034e1,2.13763239391502e1,-2.476320412310993e2,3.572924955195535e1,-7.795290920161567e1,5.036097395109802,-1.287197329845376,1.244100160910233,-1.394684346537857e1,2.112320869857597,-4.60441856527933,2.978264879234002e-1,1.935199269380359,-1.88580031845933,2.330807783420723e1,-2.91749306966336,6.644427567385864,-4.302395355488564e-1,-1.148984264037686,1.109982778464842,-1.314799057941425e1,2.137017065505111,-4.084082382904703,2.606486561845403e-1,1.565462612018858,-1.508309105065004,1.772442871757061e1,-2.40060893717649,6.31422909250156,-4.052444871368164e-1,3.179380137695096e-1,-3.071741522636364e-1,3.636264382483117,-5.183996466001354e-1,2.322192602480252,-6.467931586900172e-2,6.277081831671831e-1,-6.107890751034906e-1,7.335850436798604,-1.091016872160133,3.089218691662174,6.988892111841499e-2,1.639756762532723,-1.583883992641009,1.876236237708381e1,-2.685390559486947,5.859855615166555,3.919312696253764e-3,1.611803934956753,-1.540778869185931,1.795955382224485e1,-2.495154500270907,5.003492494640851,-4.157919873785453e-2,-6.213413520816026e-1,6.242581523412814e-1,-7.823535324240331,1.222418137438074,-3.120142966701915,2.975831327541895e-1,2.12230710100161,-2.0451058741188,2.412395225004063e1,-3.423544496956294,7.325914828631551,-4.793445914188063e-1,-4.31809447483846,4.158975059021769,-4.906211424150023e1,6.975058620124194,-1.501259943091044e1,9.418983630154896e-1,-6.138797742037704e-1,5.810969368378602e-1,-6.6821474226667,9.113864351863538e-1,-1.814400062103318,1.002574935832871e-1,-9.860044240994036e-2,9.448685284232805e-2,-1.106188847377502,1.552858946803229e-1,-3.265426230113952e-1,2.062042480203908e-2,-2.745034502159738,2.655226942873441,-3.151193386341271e1,4.520932327069998,-9.883338555855938,6.423439846307804e-1,2.139968493382333,-2.067738462547628,2.450223844197562e1,-3.50699574523559,7.635005983192545,-4.923960464980415e-1,1.036406872394752,-1.002008838408551,1.188339891704641e1,-1.70302259679446,3.715789696036691,-2.407301455417931e-1,1.606428513214277,-1.552524985439685,1.840245870449254e1,-2.635131753653705,5.741508438443495,-3.708346905830083e-1,5.659562678739624e-2,-5.465656201303744e-2,6.471932864664631e-1,-9.253169145609999e-2,2.010909570941804e-1,-1.292046400706276e-2,5.435391241988039e-1,-5.252672844681129e-1,6.225561585258754,-8.91344337215917e-1,1.941632399616401,-1.253426955105431e-1,-1.552116972709218,1.499962759958308,-1.777819805127299e1,2.545472086708348,-5.545140384142844,3.580057322157566e-1],[6,24]); +end +if nargout > 2 + t2 = [2.948906761778786e-1,1.525720623897707,2.57452876984127e-1,1.798113701499118,4.127080577601411e-1,1.278484623015873,9.232955798059965e-1,1.009333860859158]; + HcU = t2; +end +if nargout > 3 + HfU = t2; +end
diff -r 60a3bc79835a -r 4291731570bb +sbp/InterpAWW.m --- a/+sbp/InterpAWW.m Mon Dec 03 12:02:27 2018 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,67 +0,0 @@ -classdef InterpAWW < sbp.InterpOps - properties - - % Interpolation operators - IC2F - IF2C - - % Orders used on coarse and fine sides - order_C - order_F - - % Grid points, refinement ratio. - ratio - m_C - m_F - - % Boundary accuracy of IC2F and IF2C. - acc_C2F - acc_F2C - end - - methods - % accOp : String, 'C2F' or 'F2C'. Specifies which of the operators - % should have higher accuracy. - function obj = InterpAWW(m_C,m_F,order_C,order_F,accOp) - - ratio = (m_F-1)/(m_C-1); - h_C = 1; - - assert(order_C == order_F,... - 'Error: Different orders of accuracy not available'); - - switch ratio - case 2 - switch order_C - case 2 - [IC2F,IF2C] = sbp.implementations.intOpAWW_orders_2to2_ratio2to1(m_C, h_C, accOp); - case 4 - [IC2F,IF2C] = sbp.implementations.intOpAWW_orders_4to4_ratio2to1(m_C, h_C, accOp); - case 6 - [IC2F,IF2C] = sbp.implementations.intOpAWW_orders_6to6_ratio2to1(m_C, h_C, accOp); - case 8 - [IC2F,IF2C] = sbp.implementations.intOpAWW_orders_8to8_ratio2to1(m_C, h_C, accOp); - otherwise - error(['Order ' num2str(order_C) ' not available.']); - end - otherwise - error(['Grid ratio ' num2str(ratio) ' not available']); - end - - obj.IC2F = IC2F; - obj.IF2C = IF2C; - obj.order_C = order_C; - obj.order_F = order_F; - obj.ratio = ratio; - obj.m_C = m_C; - obj.m_F = m_F; - - end - - function str = string(obj) - str = [class(obj) '_orders' num2str(obj.order_F) 'to'... - num2str(obj.order_C) '_ratio' num2str(obj.ratio) 'to1']; - end - - end -end
diff -r 60a3bc79835a -r 4291731570bb +sbp/InterpMC.m --- a/+sbp/InterpMC.m Mon Dec 03 12:02:27 2018 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,61 +0,0 @@ -classdef InterpMC < sbp.InterpOps - properties - - % Interpolation operators - IC2F - IF2C - - % Orders used on coarse and fine sides - order_C - order_F - - % Grid points, refinement ratio. - ratio - m_C - m_F - end - - methods - function obj = InterpMC(m_C,m_F,order_C,order_F) - - ratio = (m_F-1)/(m_C-1); - - assert(order_C == order_F,... - 'Error: Different orders of accuracy not available'); - - switch ratio - case 2 - switch order_C - case 2 - [IC2F,IF2C] = sbp.implementations.intOpMC_orders_2to2_ratio2to1(m_C); - case 4 - [IC2F,IF2C] = sbp.implementations.intOpMC_orders_4to4_ratio2to1(m_C); - case 6 - [IC2F,IF2C] = sbp.implementations.intOpMC_orders_6to6_ratio2to1(m_C); - case 8 - [IC2F,IF2C] = sbp.implementations.intOpMC_orders_8to8_ratio2to1(m_C); - otherwise - error(['Order ' num2str(order_C) ' not available.']); - end - otherwise - error(['Grid ratio ' num2str(ratio) ' not available']); - end - - obj.IC2F = IC2F; - obj.IF2C = IF2C; - obj.order_C = order_C; - obj.order_F = order_F; - obj.ratio = ratio; - obj.m_C = m_C; - obj.m_F = m_F; - - - end - - function str = string(obj) - str = [class(obj) '_orders' num2str(obj.order_F) 'to'... - num2str(obj.order_C) '_ratio' num2str(obj.ratio) 'to1']; - end - - end -end
diff -r 60a3bc79835a -r 4291731570bb +sbp/InterpOps.m --- a/+sbp/InterpOps.m Mon Dec 03 12:02:27 2018 -0800 +++ b/+sbp/InterpOps.m Mon Dec 03 14:53:52 2018 -0800 @@ -1,9 +1,7 @@ classdef (Abstract) InterpOps properties (Abstract) - % C and F may refer to coarse and fine, but it's not a must. - IC2F % Interpolation operator from "C" to "F" - IF2C % Interpolation operator from "F" to "C" - + Iu2v % Interpolation operator(s) from "u" to "v" + Iv2u % Interpolation operator(s) from "v" to "u" end methods (Abstract)
diff -r 60a3bc79835a -r 4291731570bb +sbp/InterpOpsMC.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/+sbp/InterpOpsMC.m Mon Dec 03 14:53:52 2018 -0800 @@ -0,0 +1,65 @@ +classdef InterpOpsMC < sbp.InterpOps + properties + + % Structs of interpolation operators, fields .good and .bad + % Here .good and .bad are the same, but this makes them fit in the + % OP (order-preserving) framework. + Iu2v + Iv2u + end + + methods + % x_u, x_v -- vectors of the coordinate that varies along the boundary + % order_u, order_v -- order of accuracy in the different blocks + function obj = InterpOpsMC(x_u, x_v, order_u, order_v) + + assert(order_u == order_v,... + 'InterpOpsMC: Different orders of accuracy not available'); + + switch order_u + case 2 + intOpSet = @sbp.implementations.intOpMC_orders_2to2_ratio2to1; + case 4 + intOpSet = @sbp.implementations.intOpMC_orders_4to4_ratio2to1; + case 6 + intOpSet = @sbp.implementations.intOpMC_orders_6to6_ratio2to1; + case 8 + intOpSet = @sbp.implementations.intOpMC_orders_8to8_ratio2to1; + otherwise + error('InterpOpsMC: Order of accuracy %d not available.', order_u); + end + + m_u = length(x_u) - 1; + m_v = length(x_v) - 1; + + Iu2v = struct; + Iv2u = struct; + + if m_u/m_v == 2 + % Block u is fine, v is coarse + m_C = m_v; + [Iv2u.good, Iu2v.bad] = intOpSet(m_C+1); + Iv2u.bad = Iv2u.good; + Iu2v.good = Iu2v.bad; + + elseif m_v/m_u == 2 + % Block v is fine, u is coarse + m_C = m_u; + [Iu2v.good, Iv2u.bad] = intOpSet(m_C+1); + Iu2v.bad = Iu2v.good; + Iv2u.good = Iv2u.bad; + else + error('InterpOpsMC: Interpolation operators for grid ratio %f have not yet been constructed', m_u/m_v); + end + + obj.Iu2v = Iu2v; + obj.Iv2u = Iv2u; + + end + + function str = string(obj) + str = [class(obj)]; + end + + end +end
diff -r 60a3bc79835a -r 4291731570bb +sbp/InterpOpsOP.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/+sbp/InterpOpsOP.m Mon Dec 03 14:53:52 2018 -0800 @@ -0,0 +1,61 @@ +classdef InterpOpsOP < sbp.InterpOps + properties + + % Structs of interpolation operators, fields .good and .bad + Iu2v + Iv2u + end + + methods + % x_u, x_v -- vectors of the coordinate that varies along the boundary + % order_u, order_v -- order of accuracy in the different blocks + function obj = InterpOpsOP(x_u, x_v, order_u, order_v) + + assert(order_u == order_v,... + 'InterpOpsOP: Different orders of accuracy not available'); + + switch order_u + case 2 + intOpSet = @sbp.implementations.intOpOP_orders_2to2_ratio2to1; + case 4 + intOpSet = @sbp.implementations.intOpOP_orders_4to4_ratio2to1; + case 6 + intOpSet = @sbp.implementations.intOpOP_orders_6to6_ratio2to1; + case 8 + intOpSet = @sbp.implementations.intOpOP_orders_8to8_ratio2to1; + otherwise + error('InterpOpsOP: Order of accuracy %d not available.', order_u); + end + + m_u = length(x_u) - 1; + m_v = length(x_v) - 1; + + Iu2v = struct; + Iv2u = struct; + + if m_u/m_v == 2 + % Block u is fine, v is coarse + m_C = m_v; + [Iv2u.good, Iu2v.bad] = intOpSet(m_C+1, 1, 'C2F'); + [Iv2u.bad, Iu2v.good] = intOpSet(m_C+1, 1, 'F2C'); + + elseif m_v/m_u == 2 + % Block v is fine, u is coarse + m_C = m_u; + [Iu2v.good, Iv2u.bad] = intOpSet(m_C+1, 1, 'C2F'); + [Iu2v.bad, Iv2u.good] = intOpSet(m_C+1, 1, 'F2C'); + else + error('InterpOpsOP: Interpolation operators for grid ratio %f have not yet been constructed', m_u/m_v); + end + + obj.Iu2v = Iu2v; + obj.Iv2u = Iv2u; + + end + + function str = string(obj) + str = [class(obj)]; + end + + end +end
diff -r 60a3bc79835a -r 4291731570bb +scheme/LaplaceCurvilinear.m --- a/+scheme/LaplaceCurvilinear.m Mon Dec 03 12:02:27 2018 -0800 +++ b/+scheme/LaplaceCurvilinear.m Mon Dec 03 14:53:52 2018 -0800 @@ -278,15 +278,18 @@ % -- tuning: penalty strength, defaults to 1.2 % -- interpolation: struct of interpolation operators (empty for conforming grids) function [closure, penalty] = interface(obj,boundary,neighbour_scheme,neighbour_boundary,opts) - if isempty(opts) + + defaultType.tuning = 1.2; + defaultType.interpolation = 'none'; + default_struct('opts', defaultType); + + switch opts.interpolation + case {'none', ''} [closure, penalty] = interfaceStandard(obj,boundary,neighbour_scheme,neighbour_boundary); - else - assertType(opts, 'struct'); - if isfield(opts, 'interpolation') - [closure, penalty] = interfaceNonConforming(obj,boundary,neighbour_scheme,neighbour_boundary,opts); - else - [closure, penalty] = interfaceStandard(obj,boundary,neighbour_scheme,neighbour_boundary,opts); - end + case {'op','OP'} + [closure, penalty] = interfaceNonConforming(obj,boundary,neighbour_scheme,neighbour_boundary,opts); + otherwise + error('Unknown type of interpolation: %s ', type.interpolation); end end @@ -328,10 +331,12 @@ % TODO: Make this work for curvilinear grids warning('LaplaceCurvilinear: Non-conforming grid interpolation only works for Cartesian grids.'); - default_field(opts, 'tuning', 1.2); - default_field(opts, 'interpolation', 'OP'); + % User can request special interpolation operators by specifying type.interpOpSet + default_field(opts, 'interpOpSet', @sbp.InterpOpsOP); + interpOpSet = opts.interpOpSet; tuning = opts.tuning; + % u denotes the solution in the own domain % v denotes the solution in the neighbour domain [e_u, d_u, gamm_u, H_b_u, I_u, ~, X_u] = obj.get_boundary_ops(boundary); @@ -371,19 +376,19 @@ beta_u = tau_v; % Build interpolation operators - [I_u2v_good, I_u2v_bad, I_v2u_good, I_v2u_bad] = ... - obj.interpolationOperators(x_u, x_v, obj.order, opts.interpolation); + intOps = interpOpSet(x_u, x_v, obj.order, neighbour_scheme.order); + Iu2v = intOps.Iu2v; + Iv2u = intOps.Iv2u; closure = a*Hi*e_u*tau_u*H_b_u*e_u' + ... - a*Hi*e_u*H_b_u*I_v2u_bad*beta_u*I_u2v_good*e_u' + ... + a*Hi*e_u*H_b_u*Iv2u.bad*beta_u*Iu2v.good*e_u' + ... a*1/2*Hi*d_u*H_b_u*e_u' + ... -a*1/2*Hi*e_u*H_b_u*d_u'; - penalty = -a*Hi*e_u*tau_u*H_b_u*I_v2u_good*e_v' + ... - -a*Hi*e_u*H_b_u*I_v2u_bad*beta_u*e_v' + ... - -a*1/2*Hi*d_u*H_b_u*I_v2u_good*e_v' + ... - -a*1/2*Hi*e_u*H_b_u*I_v2u_bad*d_v'; - + penalty = -a*Hi*e_u*tau_u*H_b_u*Iv2u.good*e_v' + ... + -a*Hi*e_u*H_b_u*Iv2u.bad*beta_u*e_v' + ... + -a*1/2*Hi*d_u*H_b_u*Iv2u.good*e_v' + ... + -a*1/2*Hi*e_u*H_b_u*Iv2u.bad*d_v'; end @@ -441,63 +446,6 @@ end - % x_u, x_v -- vectors of the coordinate that varies along the boundary - % interpOpSet -- string, e.g 'MC' or 'OP'. - % TODO: Allow for general x_u, x_v. Currently only works for 2:1 ratio. - function [I_u2v_good, I_u2v_bad, I_v2u_good, I_v2u_bad] = interpolationOperators(obj, x_u, x_v, order, interpOpSet) - default_arg(interpOpSet, 'OP'); - - m_u = length(x_u) - 1; - m_v = length(x_v) - 1; - - if m_u == m_v - % Matching grids, no interpolation required (presumably) - error('LaplaceCurvilinear.interpolationOperators: m_u equals m_v, this interface should not need interpolation.') - elseif m_u/m_v == 2 - % Block u is finer - - switch interpOpSet - case 'MC' - interpOps = sbp.InterpMC(m_v+1, m_u+1, order, order); - I_u2v_good = interpOps.IF2C; - I_u2v_bad = interpOps.IF2C; - I_v2u_good = interpOps.IC2F; - I_v2u_bad = interpOps.IC2F; - - case {'OP', 'AWW'} - interpOpsF2C = sbp.InterpAWW(m_v+1, m_u+1, order, order, 'F2C'); - interpOpsC2F = sbp.InterpAWW(m_v+1, m_u+1, order, order, 'C2F'); - I_u2v_good = interpOpsF2C.IF2C; - I_u2v_bad = interpOpsC2F.IF2C; - I_v2u_good = interpOpsC2F.IC2F; - I_v2u_bad = interpOpsF2C.IC2F; - end - - elseif m_v/m_u == 2 - % Block v is finer - - switch interpOpSet - case 'MC' - interpOps = sbp.InterpMC(m_u+1, m_v+1, order, order); - I_u2v_good = interpOps.IC2F; - I_u2v_bad = interpOps.IC2F; - I_v2u_good = interpOps.IF2C; - I_v2u_bad = interpOps.IF2C; - - case {'OP', 'AWW'} - interpOpsF2C = sbp.InterpAWW(m_u+1, m_v+1, order, order, 'F2C'); - interpOpsC2F = sbp.InterpAWW(m_u+1, m_v+1, order, order, 'C2F'); - I_u2v_good = interpOpsC2F.IC2F; - I_u2v_bad = interpOpsF2C.IC2F; - I_v2u_good = interpOpsF2C.IF2C; - I_v2u_bad = interpOpsC2F.IF2C; - end - else - error(sprintf('Interpolation operators for grid ratio %f have not yet been constructed', m_u/m_v)); - end - - end - function N = size(obj) N = prod(obj.m); end