Mercurial > repos > public > sbplib
changeset 1163:65a577db5ca0 feature/rv
Move all functions in constructDiffOps to subpackage and refactor
| author | Vidar Stiernström <vidar.stiernstrom@it.uu.se> |
|---|---|
| date | Thu, 27 Jun 2019 11:04:34 +0200 |
| parents | 0ec06ca3fc36 |
| children | fc2631ba4da5 |
| files | +rv/+diffops/addClosuresToDiffOp.m +rv/+diffops/constructDiffOpsBdf.m +rv/+diffops/constructDiffOpsMultiGrid.m +rv/+diffops/constructDiffOpsStandard.m +rv/+diffops/constructFluxDiffOp.m +rv/+diffops/constructFluxDiffOpWithClosures.m +rv/+diffops/constructSchemeDiffOp.m +rv/+diffops/constructSymmetricD2.m +rv/constructDiffOps.m |
| diffstat | 9 files changed, 106 insertions(+), 100 deletions(-) [+] |
line wrap: on
line diff
diff -r 0ec06ca3fc36 -r 65a577db5ca0 +rv/+diffops/addClosuresToDiffOp.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/+rv/+diffops/addClosuresToDiffOp.m Thu Jun 27 11:04:34 2019 +0200 @@ -0,0 +1,12 @@ +function [D, penalties] = addClosuresToDiffOp(diffOp, D, BCs) + penalties = cell(size(BCs)); + for i = 1:size(BCs,1) + for j = 1:size(BCs,2) + [closure, penalties{i,j}] = diffOp.boundary_condition(BCs{i,j}.boundary, BCs{i,j}.type); + if ~isa(closure, 'function_handle') + closure = @(v) closure*v; + end + D = @(v) D(v) + closure(v); + end + end +end \ No newline at end of file
diff -r 0ec06ca3fc36 -r 65a577db5ca0 +rv/+diffops/constructDiffOpsBdf.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/+rv/+diffops/constructDiffOpsBdf.m Thu Jun 27 11:04:34 2019 +0200 @@ -0,0 +1,7 @@ +function [D_scheme, D_flux, penalties_scheme] = constructDiffOpsBdf(scheme, g, schemeOrder, residualOrder, schemeParams, opSet, BCs) + %% DiffOps for solution vector + [D_scheme, penalties_scheme, ~] = rv.diffops.constructSchemeDiffOp(scheme, g, schemeOrder, schemeParams, opSet, BCs) + %% DiffOps for residual viscosity + [D_flux, ~] = rv.diffops.constructFluxDiffOp(scheme, g, order, schemeParams, opSet, BCs) + D_flux = @(v) -D_flux(v); +end \ No newline at end of file
diff -r 0ec06ca3fc36 -r 65a577db5ca0 +rv/+diffops/constructDiffOpsMultiGrid.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/+rv/+diffops/constructDiffOpsMultiGrid.m Thu Jun 27 11:04:34 2019 +0200 @@ -0,0 +1,7 @@ +function [D_scheme, D_flux, D_t, penalties_scheme, penalties_res] = constructDiffOpsMultiGrid(scheme, g, schemeOrder, residualOrder, schemeParams, opSet, BCs) + % DiffOps for solution vector + [D_scheme, penalties_scheme, ~] = rv.diffops.constructSchemeDiffOp(scheme, g, schemeOrder, schemeParams, opSet, BCs) + %% DiffOps for residual viscosity + [D_t, penalties_res] = rv.diffops.constructFluxDiffOpWithClosures(scheme, g, residualOrder, schemeParams, opSet, BCs); + D_flux = @(v) -D_t(v); +end \ No newline at end of file
diff -r 0ec06ca3fc36 -r 65a577db5ca0 +rv/+diffops/constructDiffOpsStandard.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/+rv/+diffops/constructDiffOpsStandard.m Thu Jun 27 11:04:34 2019 +0200 @@ -0,0 +1,8 @@ +function [D_scheme, D_flux, D_t, penalties_scheme, penalties_res] = constructDiffOpsStandard(scheme, g, schemeOrder, residualOrder, schemeParams, opSet, BCs) + % DiffOps for solution vector + [D_scheme, D, penalties_scheme] = rv.diffops.constructSchemeDiffOp(scheme, g, schemeOrder, schemeParams, opSet, BCs) + %% DiffOps for residual viscosity + [D_flux, penalties_res] = rv.diffops.constructFluxDiffOpWithClosures(scheme, g, residualOrder, schemeParams, opSet, BCs); + D_flux = @(v) -D_flux(v); + D_t = D; +end \ No newline at end of file
diff -r 0ec06ca3fc36 -r 65a577db5ca0 +rv/+diffops/constructFluxDiffOp.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/+rv/+diffops/constructFluxDiffOp.m Thu Jun 27 11:04:34 2019 +0200 @@ -0,0 +1,8 @@ +function [D, diffOp] = constructFluxDiffOp(scheme, g, order, schemeParams, opSet, BCs) + diffOp = scheme(g, order, schemeParams{:}, opSet); + if ~isa(diffOp.D, 'function_handle') + D = @(v) diffOp.D*v; + else + D = diffOp.D; + end +end \ No newline at end of file
diff -r 0ec06ca3fc36 -r 65a577db5ca0 +rv/+diffops/constructFluxDiffOpWithClosures.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/+rv/+diffops/constructFluxDiffOpWithClosures.m Thu Jun 27 11:04:34 2019 +0200 @@ -0,0 +1,4 @@ +function [D, penalties] = constructFluxDiffOpWithClosures(scheme, g, order, schemeParams, opSet, BCs) + [D, diffOp] = rv.diffops.constructFluxDiffOp(scheme, g, order, schemeParams, opSet, BCs) + [D, penalties] = rv.diffops.addClosuresToDiffOp(diffOp, D, BCs) +end \ No newline at end of file
diff -r 0ec06ca3fc36 -r 65a577db5ca0 +rv/+diffops/constructSchemeDiffOp.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/+rv/+diffops/constructSchemeDiffOp.m Thu Jun 27 11:04:34 2019 +0200 @@ -0,0 +1,6 @@ +function [D_scheme, penalties_scheme, D] = constructSchemeDiffOp(scheme, g, schemeOrder, schemeParams, opSet, BCs) + %% DiffOps for solution vector + [D, penalties_scheme] = rv.diffops.constructFluxDiffOpWithClosures(scheme, g, schemeOrder, schemeParams, opSet, BCs); + D2 = rv.diffops.constructSymmetricD2(g, schemeOrder, opSet); + D_scheme = @(v,Viscosity)(D(v) + D2(Viscosity)*v); +end \ No newline at end of file
diff -r 0ec06ca3fc36 -r 65a577db5ca0 +rv/+diffops/constructSymmetricD2.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/+rv/+diffops/constructSymmetricD2.m Thu Jun 27 11:04:34 2019 +0200 @@ -0,0 +1,54 @@ +function D2 = constructSymmetricD2(g, order, opSet) + m = g.size(); + ops = cell(g.D(),1); + I = cell(g.D(),1); + for i = 1:g.D() + lim = {g.x{i}(1), g.x{i}(end)}; + ops{i} = opSet(m(i), lim, order); + I{i} = speye(m(i)); + end + + switch g.D() + case 1 + e_r = ops{1}.e_r; + e_l = ops{1}.e_l; + Hi = ops{1}.HI; + B = e_r*e_r' - e_l*e_l'; + if isequal(opSet,@sbp.D1Upwind) + Dm = ops{1}.Dm; + Dp = ops{1}.Dp; + M = Dm - Hi*B; + D2 = @(Viscosity) M*Viscosity*Dp; + else + % TODO: Fix closure for D2Variable + % TODO: Fix Viscosity not being vector + D2 = @(Viscosity)ops{1}.D2(diag(Viscosity)); + end + case 2 + % TODO: + % Currently only implemented for upwind operators. + % Remove this part once the time-dependent D2 operator is implemented for other opSets + % or if it is decided that it should only be supported for upwind operators. + assert(isequal(opSet,@sbp.D1Upwind)) + e_e = kron(ops{1}.e_r,I{2}); + e_w = kron(ops{1}.e_l,I{2}); + Dm_x = kron(ops{1}.Dm,I{2}); + Dp_x = kron(ops{1}.Dp,I{2}); + H_x = kron(ops{1}.HI,I{2}); + B_x = e_e*e_e' - e_w*e_w'; + M_x = Dm_x-H_x*B_x; + D2_x = @(Viscosity) M_x*Viscosity*Dp_x; + + e_n = kron(I{1},ops{2}.e_r); + e_s = kron(I{1},ops{2}.e_l); + Dm_y = kron(I{1},ops{2}.Dm); + Dp_y = kron(I{1},ops{2}.Dp); + H_y = kron(I{1},ops{2}.HI); + B_y = e_n*e_n' - e_s*e_s'; + M_y = Dm_y-H_y*B_y; + D2_y = @(Viscosity) M_y*Viscosity*Dp_y; + D2 = @(Viscosity) D2_x(Viscosity) + D2_y(Viscosity); + otherwise + error('3D not yet implemented') + end +end \ No newline at end of file
diff -r 0ec06ca3fc36 -r 65a577db5ca0 +rv/constructDiffOps.m --- a/+rv/constructDiffOps.m Thu Jun 27 11:03:40 2019 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,100 +0,0 @@ -function [D_rv, D_flux, DvDt, solutionPenalties, residualPenalties] = constructDiffOps(scheme, g, schemeOrder, residualOrder, schemeParams, opSet, BCs) - %% DiffOps for solution vector - [D, solutionPenalties] = constructFluxDiffOp(scheme, g, schemeOrder, schemeParams, opSet, BCs); - D2 = constructSymmetricD2Operator(g, schemeOrder, opSet); - D_rv = @(v,Viscosity)(D(v) + D2(Viscosity)*v); - - %% DiffOps for residual viscosity - [D_res, residualPenalties] = constructFluxDiffOp(scheme, g, residualOrder, schemeParams, opSet, BCs); - % TODO: Construct D_flux without closures when using bdfs. - % diffOp = scheme(g, residualOrder, schemeParams{:}, opSet); - % if ~isa(diffOp.D, 'function_handle') - % D_flux = @(v) diffOp.D*v; - % else - % D_flux = diffOp.D; - % end - - % DiffOp for flux in residual viscosity. Due to sign conventions of the implemented schemes, we need to - % change the sign. - D_flux = @(v) -D_res(v); - % DiffOp for time derivative in residual viscosity - DvDt = D_res; -end - -function [D, penalties] = constructFluxDiffOp(scheme, g, order, schemeParams, opSet, BCs) - diffOp = scheme(g, order, schemeParams{:}, opSet); - [D, penalties] = addClosuresToDiffOp(diffOp, BCs); -end - -function [D, penalties] = addClosuresToDiffOp(diffOp, BCs) - if ~isa(diffOp.D, 'function_handle') - D = @(v) diffOp.D*v; - else - D = diffOp.D; - end - penalties = cell(size(BCs)); - for i = 1:size(BCs,1) - for j = 1:size(BCs,2) - [closure, penalties{i,j}] = diffOp.boundary_condition(BCs{i,j}.boundary, BCs{i,j}.type); - if ~isa(closure, 'function_handle') - closure = @(v) closure*v; - end - D = @(v) D(v) + closure(v); - end - end -end - -function D2 = constructSymmetricD2Operator(g, order, opSet) - m = g.size(); - ops = cell(g.D(),1); - I = cell(g.D(),1); - for i = 1:g.D() - lim = {g.x{i}(1), g.x{i}(end)}; - ops{i} = opSet(m(i), lim, order); - I{i} = speye(m(i)); - end - - switch g.D() - case 1 - e_r = ops{1}.e_r; - e_l = ops{1}.e_l; - Hi = ops{1}.HI; - B = e_r*e_r' - e_l*e_l'; - if isequal(opSet,@sbp.D1Upwind) - Dm = ops{1}.Dm; - Dp = ops{1}.Dp; - M = Dm - Hi*B; - D2 = @(Viscosity) M*Viscosity*Dp; - else - % TODO: Fix closure for D2Variable - % TODO: Fix Viscosity not being vector - D2 = @(Viscosity)ops{1}.D2(diag(Viscosity)); - end - case 2 - % TODO: - % Currently only implemented for upwind operators. - % Remove this part once the time-dependent D2 operator is implemented for other opSets - % or if it is decided that it should only be supported for upwind operators. - assert(isequal(opSet,@sbp.D1Upwind)) - e_e = kron(ops{1}.e_r,I{2}); - e_w = kron(ops{1}.e_l,I{2}); - Dm_x = kron(ops{1}.Dm,I{2}); - Dp_x = kron(ops{1}.Dp,I{2}); - H_x = kron(ops{1}.HI,I{2}); - B_x = e_e*e_e' - e_w*e_w'; - M_x = Dm_x-H_x*B_x; - D2_x = @(Viscosity) M_x*Viscosity*Dp_x; - - e_n = kron(I{1},ops{2}.e_r); - e_s = kron(I{1},ops{2}.e_l); - Dm_y = kron(I{1},ops{2}.Dm); - Dp_y = kron(I{1},ops{2}.Dp); - H_y = kron(I{1},ops{2}.HI); - B_y = e_n*e_n' - e_s*e_s'; - M_y = Dm_y-H_y*B_y; - D2_y = @(Viscosity) M_y*Viscosity*Dp_y; - D2 = @(Viscosity) D2_x(Viscosity) + D2_y(Viscosity); - otherwise - error('3D not yet implemented') - end -end \ No newline at end of file