Mercurial > repos > public > sbplib
changeset 1329:7df63b17e078 feature/D2_boundary_opt
Add support for boundary optimized grids in DefCurvilinear, and add boundaryOptimizedCurvilinear for constructing a curvilinear grid with boundary optimized grid point placement.
| author | Vidar Stiernström <vidar.stiernstrom@it.uu.se> |
|---|---|
| date | Mon, 14 Feb 2022 14:55:29 +0100 |
| parents | 3a286d2d1939 |
| children | 855871e0b852 |
| files | +grid/boundaryOptimized.m +grid/boundaryOptimizedCurvilinear.m +multiblock/DefCurvilinear.m |
| diffstat | 3 files changed, 92 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
diff -r 3a286d2d1939 -r 7df63b17e078 +grid/boundaryOptimized.m --- a/+grid/boundaryOptimized.m Mon Feb 14 11:14:46 2022 +0100 +++ b/+grid/boundaryOptimized.m Mon Feb 14 14:55:29 2022 +0100 @@ -23,7 +23,7 @@ % Check that stencil options are passed correctly (if supplied) if length(varargin) == n+2 % Stencil options supplied - availabe_opts = ["Accurate","accurate","A","Minimal","minimal","M"]; + availabe_opts = ["Accurate","accurate","A","acc","Minimal","minimal","M","min"]; assert(any(varargin{n+2} == availabe_opts), ... 'grid:boundaryOptimized:InvalidOption',"The operator option must be 'accurate' or 'minimal.'"); else %If not passed, populate varargin with default option 'accurate' @@ -32,9 +32,9 @@ % Specify generating function switch varargin{n+2} - case {'Accurate','accurate','A'} + case {'Accurate','accurate','A','acc'} gridgenerator = @sbp.grid.accurateBoundaryOptimizedGrid; - case {'Minimal','minimal','M'} + case {'Minimal','minimal','M','min'} gridgenerator = @sbp.grid.minimalBoundaryOptimizedGrid; end
diff -r 3a286d2d1939 -r 7df63b17e078 +grid/boundaryOptimizedCurvilinear.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/+grid/boundaryOptimizedCurvilinear.m Mon Feb 14 14:55:29 2022 +0100 @@ -0,0 +1,57 @@ +% Creates a curvilinear grid of dimension length(m). +% over the logical domain xi_lim, eta_lim, ... +% The grid point distribution is based on the boundary +% optimized SBP operators, passed as arguments, order +% and opt. +% Examples: +% g = grid.boundaryOptimizedCurvilinear(mapping, [mx, my], xlim, ylim, order, opt) +% g = grid.boundaryOptimizedCurvilinear(mapping, [10, 15], {0,1}, {0,2}, 4) - defaults to 'accurate' stencils +% g = grid.boundaryOptimizedCurvilinear(mapping, [10, 15], {0,1}, {0,2}, 4, 'minimal') +function g = boundaryOptimizedCurvilinear(mapping, m, varargin) + n = length(m); + % TODO: The input parameter check is also present in boundaryOptimizedGrid.m, + % Consider refactoring it. + + % Check that parameters matches dimensions + matchingParams = false; + if length(varargin) == n+1 % Minimal number of arguments + matchingParams = iscell([varargin{1:n}]) && ... + isfloat([varargin{n+1}]); + elseif length(varargin) == n+2 % Stencil options supplied + matchingParams = iscell([varargin{1:n}]) && ... + isfloat([varargin{n+1}]) && ... + ischar([varargin{n+2}]); + end + assert(matchingParams,'grid:boundaryOptimizedCurvilinear:NonMatchingParameters','The number of parameters per dimensions do not match.'); + + % Check that stencil options are passed correctly (if supplied) + if length(varargin) == n+2 % Stencil options supplied + availabe_opts = ["Accurate","accurate","A","acc","Minimal","minimal","M","min"]; + assert(any(varargin{n+2} == availabe_opts), ... + 'grid:boundaryOptimizedCurvilinear:InvalidOption',"The operator option must be 'accurate' or 'minimal.'"); + else %If not passed, populate varargin with default option 'accurate' + varargin(n+2) = {'accurate'}; + end + + % Specify generating function + switch varargin{n+2} + case {'Accurate','accurate','A','acc'} + gridgenerator = @sbp.grid.accurateBoundaryOptimizedGrid; + case {'Minimal','minimal','M','min'} + gridgenerator = @sbp.grid.minimalBoundaryOptimizedGrid; + end + + X = {}; + h = []; + for i = 1:n + try + [X{i},h(i)] = gridgenerator(varargin{i},m(i),varargin{n+1}); + catch exception % Propagate any errors in the grid generation functions. + msgText = getReport(exception); + error('grid:boundaryOptimizedCurvilinear:InvalidParameter',msgText) + end + end + + g = grid.Curvilinear(mapping, X{:}); + g.logic.h = h; +end \ No newline at end of file
diff -r 3a286d2d1939 -r 7df63b17e078 +multiblock/DefCurvilinear.m --- a/+multiblock/DefCurvilinear.m Mon Feb 14 11:14:46 2022 +0100 +++ b/+multiblock/DefCurvilinear.m Mon Feb 14 14:55:29 2022 +0100 @@ -37,13 +37,39 @@ obj.boundaryGroups = boundaryGroups; end - function g = getGrid(obj, varargin) - ms = obj.getGridSizes(varargin{:}); + % Returns a multiblock.Grid given some parameters + % ms: cell array of [mx, my] vectors + % Currently defaults to an equidistant curvilinear grid if varargin is empty. + % If varargin is non-empty, the first argument should supply the grid type, followed by + % additional arguments required to construct the grid. + % Grid types: + % 'equidist' - equidistant curvilinear grid + % Additional argumets: none + % 'boundaryopt' - boundary optimized grid based on boundary + % optimized SBP operators + % Additional arguments: order, stencil option + function g = getGrid(obj, ms, varargin) + % If a scalar is passed, defer to getGridSizes implemented by subclass + % TODO: This forces the interface of subclasses. + % Should ms be included in varargin? Figure out bow to do it properly + if length(ms) == 1 + ms = obj.getGridSizes(ms); + end - grids = cell(1, obj.nBlocks); - for i = 1:obj.nBlocks - grids{i} = grid.equidistantCurvilinear(obj.blockMaps{i}.S, ms{i}); - end + if isempty(varargin) || strcmp(varargin{1},'equidist') + gridgenerator = @(blockMap,m) grid.equidistantCurvilinear(blockMap, m); + elseif strcmp(varargin{1},'boundaryopt') + order = varargin{2}; + stenciloption = varargin{3}; + gridgenerator = @(blockMap,m) grid.boundaryOptimizedCurvilinear(blockMap,m,{0,1},{0,1},... + order,stenciloption); + else + error('No grid type supplied!'); + end + grids = cell(1, obj.nBlocks); + for i = 1:obj.nBlocks + grids{i} = gridgenerator(obj.blockMaps{i}.S, ms{i}); + end g = multiblock.Grid(grids, obj.connections, obj.boundaryGroups); end