Mercurial > repos > public > sbplib

annotate +multiblock/DiffOp.m @ 928:1c61d8fa9903 feature/utux2D

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace opts by type everywhere
author Martin Almquist <malmquist@stanford.edu>
date Mon, 03 Dec 2018 15:01:24 -0800
parents d232483eb72f
children 21394c78c72e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
186
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
1 classdef DiffOp < scheme.Scheme
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
2 properties
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
3 grid
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
4 order
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
5 diffOps
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
6 D
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
7 H
210
39b7dcb2c724 multiblock: Implemented boundary conditions.
Jonatan Werpers <jonatan@werpers.com>
parents: 202
diff changeset
8
39b7dcb2c724 multiblock: Implemented boundary conditions.
Jonatan Werpers <jonatan@werpers.com>
parents: 202
diff changeset
9 blockmatrixDiv
186
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
10 end
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
11
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
12 methods
928
1c61d8fa9903 Replace opts by type everywhere
Martin Almquist <malmquist@stanford.edu>
parents: 923
diff changeset
13 function obj = DiffOp(doHand, grid, order, doParam, intfTypes)
186
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
14 % doHand -- may either be a function handle or a cell array of
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
15 % function handles for each grid. The function handle(s)
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
16 % should be on the form do = doHand(grid, order, ...)
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
17 % Additional parameters for each doHand may be provided in
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
18 % the doParam input.
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
19 % grid -- a multiblock grid
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
20 % order -- integer specifying the order of accuracy
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
21 % doParam -- may either be a cell array or a cell array of cell arrays
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
22 % for each block. If it is a cell array with length equal
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
23 % to the number of blocks then each element is sent to the
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
24 % corresponding function handle as extra parameters:
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
25 % doHand(..., doParam{i}{:}) Otherwise doParam is sent as
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
26 % extra parameters to all doHand: doHand(..., doParam{:})
903
703183ed8c8b Include interface type in multiblock.DiffOp, passed to all scheme.interface methods.
Martin Almquist <malmquist@stanford.edu>
parents: 618
diff changeset
27 %
928
1c61d8fa9903 Replace opts by type everywhere
Martin Almquist <malmquist@stanford.edu>
parents: 923
diff changeset
28 % intfTypes (optional) -- nBlocks x nBlocks cell array of types for
907
c0652621bd69 Add new class multiblock.InterfaceOptions whose instances are passed to multiblock.DiffOp.
Martin Almquist <malmquist@stanford.edu>
parents: 903
diff changeset
29 % every interface.
186
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
30 default_arg('doParam', [])
928
1c61d8fa9903 Replace opts by type everywhere
Martin Almquist <malmquist@stanford.edu>
parents: 923
diff changeset
31 default_arg('intfTypes', cell(grid.nBlocks(), grid.nBlocks()) );
186
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
32
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
33 [getHand, getParam] = parseInput(doHand, grid, doParam);
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
34
907
c0652621bd69 Add new class multiblock.InterfaceOptions whose instances are passed to multiblock.DiffOp.
Martin Almquist <malmquist@stanford.edu>
parents: 903
diff changeset
35 obj.order = order;
186
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
36 nBlocks = grid.nBlocks();
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
37
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
38 % Create the diffOps for each block
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
39 obj.diffOps = cell(1, nBlocks);
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
40 for i = 1:nBlocks
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
41 h = getHand(i);
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
42 p = getParam(i);
343
ac30761d7bdb Fixed bug in parameter parsing.
Jonatan Werpers <jonatan@werpers.com>
parents: 335
diff changeset
43 if ~iscell(p)
ac30761d7bdb Fixed bug in parameter parsing.
Jonatan Werpers <jonatan@werpers.com>
parents: 335
diff changeset
44 p = {p};
ac30761d7bdb Fixed bug in parameter parsing.
Jonatan Werpers <jonatan@werpers.com>
parents: 335
diff changeset
45 end
201
38f203f00f3a Exeendend tests of multiblock.DiffOp.
Jonatan Werpers <jonatan@werpers.com>
parents: 186
diff changeset
46 obj.diffOps{i} = h(grid.grids{i}, order, p{:});
186
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
47 end
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
48
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
49
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
50 % Build the norm matrix
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
51 H = cell(nBlocks, nBlocks);
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
52 for i = 1:nBlocks
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
53 H{i,i} = obj.diffOps{i}.H;
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
54 end
210
39b7dcb2c724 multiblock: Implemented boundary conditions.
Jonatan Werpers <jonatan@werpers.com>
parents: 202
diff changeset
55 obj.H = blockmatrix.toMatrix(H);
186
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
56
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
57
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
58 % Build the differentiation matrix
233
b8ee5212f651 multiblock: Added a function to return number of points in each block for a mbGrid. Fixed a bug in DiffOp.
Jonatan Werpers <jonatan@werpers.com>
parents: 220
diff changeset
59 obj.blockmatrixDiv = {grid.Ns, grid.Ns};
b8ee5212f651 multiblock: Added a function to return number of points in each block for a mbGrid. Fixed a bug in DiffOp.
Jonatan Werpers <jonatan@werpers.com>
parents: 220
diff changeset
60 D = blockmatrix.zero(obj.blockmatrixDiv);
186
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
61 for i = 1:nBlocks
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
62 D{i,i} = obj.diffOps{i}.D;
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
63 end
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
64
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
65 for i = 1:nBlocks
237
0fc1de5cd85b multigrid.DiffOp: Bug fix.
Jonatan Werpers <jonatan@werpers.com>
parents: 233
diff changeset
66 for j = 1:nBlocks
186
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
67 intf = grid.connections{i,j};
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
68 if isempty(intf)
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
69 continue
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
70 end
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
71
928
1c61d8fa9903 Replace opts by type everywhere
Martin Almquist <malmquist@stanford.edu>
parents: 923
diff changeset
72 [ii, ij] = obj.diffOps{i}.interface(intf{1}, obj.diffOps{j}, intf{2}, intfTypes{i,j});
186
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
73 D{i,i} = D{i,i} + ii;
233
b8ee5212f651 multiblock: Added a function to return number of points in each block for a mbGrid. Fixed a bug in DiffOp.
Jonatan Werpers <jonatan@werpers.com>
parents: 220
diff changeset
74 D{i,j} = D{i,j} + ij;
186
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
75
928
1c61d8fa9903 Replace opts by type everywhere
Martin Almquist <malmquist@stanford.edu>
parents: 923
diff changeset
76 [jj, ji] = obj.diffOps{j}.interface(intf{2}, obj.diffOps{i}, intf{1}, intfTypes{i,j});
186
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
77 D{j,j} = D{j,j} + jj;
233
b8ee5212f651 multiblock: Added a function to return number of points in each block for a mbGrid. Fixed a bug in DiffOp.
Jonatan Werpers <jonatan@werpers.com>
parents: 220
diff changeset
78 D{j,i} = D{j,i} + ji;
186
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
79 end
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
80 end
210
39b7dcb2c724 multiblock: Implemented boundary conditions.
Jonatan Werpers <jonatan@werpers.com>
parents: 202
diff changeset
81 obj.D = blockmatrix.toMatrix(D);
186
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
82
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
83
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
84 function [getHand, getParam] = parseInput(doHand, grid, doParam)
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
85 if ~isa(grid, 'multiblock.Grid')
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
86 error('multiblock:DiffOp:DiffOp:InvalidGrid', 'Requires a multiblock grid.');
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
87 end
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
88
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
89 if iscell(doHand) && length(doHand) == grid.nBlocks()
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
90 getHand = @(i)doHand{i};
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
91 elseif isa(doHand, 'function_handle')
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
92 getHand = @(i)doHand;
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
93 else
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
94 error('multiblock:DiffOp:DiffOp:InvalidGridDoHand', 'doHand must be a function handle or a cell array of length grid.nBlocks');
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
95 end
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
96
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
97 if isempty(doParam)
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
98 getParam = @(i){};
392
30ff8879162e Better input parsing for multiblock DiffOp.
Jonatan Werpers <jonatan@werpers.com>
parents: 346
diff changeset
99 return
30ff8879162e Better input parsing for multiblock DiffOp.
Jonatan Werpers <jonatan@werpers.com>
parents: 346
diff changeset
100 end
30ff8879162e Better input parsing for multiblock DiffOp.
Jonatan Werpers <jonatan@werpers.com>
parents: 346
diff changeset
101
30ff8879162e Better input parsing for multiblock DiffOp.
Jonatan Werpers <jonatan@werpers.com>
parents: 346
diff changeset
102 if ~iscell(doParam)
30ff8879162e Better input parsing for multiblock DiffOp.
Jonatan Werpers <jonatan@werpers.com>
parents: 346
diff changeset
103 getParam = @(i)doParam;
30ff8879162e Better input parsing for multiblock DiffOp.
Jonatan Werpers <jonatan@werpers.com>
parents: 346
diff changeset
104 return
30ff8879162e Better input parsing for multiblock DiffOp.
Jonatan Werpers <jonatan@werpers.com>
parents: 346
diff changeset
105 end
30ff8879162e Better input parsing for multiblock DiffOp.
Jonatan Werpers <jonatan@werpers.com>
parents: 346
diff changeset
106
30ff8879162e Better input parsing for multiblock DiffOp.
Jonatan Werpers <jonatan@werpers.com>
parents: 346
diff changeset
107 % doParam is a non-empty cell-array
30ff8879162e Better input parsing for multiblock DiffOp.
Jonatan Werpers <jonatan@werpers.com>
parents: 346
diff changeset
108
30ff8879162e Better input parsing for multiblock DiffOp.
Jonatan Werpers <jonatan@werpers.com>
parents: 346
diff changeset
109 if length(doParam) == grid.nBlocks() && all(cellfun(@iscell, doParam))
30ff8879162e Better input parsing for multiblock DiffOp.
Jonatan Werpers <jonatan@werpers.com>
parents: 346
diff changeset
110 % doParam is a cell-array of cell-arrays
186
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
111 getParam = @(i)doParam{i};
392
30ff8879162e Better input parsing for multiblock DiffOp.
Jonatan Werpers <jonatan@werpers.com>
parents: 346
diff changeset
112 return
186
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
113 end
392
30ff8879162e Better input parsing for multiblock DiffOp.
Jonatan Werpers <jonatan@werpers.com>
parents: 346
diff changeset
114
30ff8879162e Better input parsing for multiblock DiffOp.
Jonatan Werpers <jonatan@werpers.com>
parents: 346
diff changeset
115 getParam = @(i)doParam;
186
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
116 end
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
117 end
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
118
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
119 function ops = splitOp(obj, op)
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
120 % Splits a matrix operator into a cell-matrix of matrix operators for
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
121 % each grid.
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
122 ops = sparse2cell(op, obj.NNN);
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
123 end
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
124
532
b29f04ab5d99 Implement getBoundaryOperator for boundaryGroups in multiblock.DiffOp
Jonatan Werpers <jonatan@werpers.com>
parents: 529
diff changeset
125 % Get a boundary operator specified by opName for the given boundary/BoundaryGroup
b29f04ab5d99 Implement getBoundaryOperator for boundaryGroups in multiblock.DiffOp
Jonatan Werpers <jonatan@werpers.com>
parents: 529
diff changeset
126 function op = getBoundaryOperator(obj, opName, boundary)
529
2ec8080027ab Add some documentation and decide on public function signatures
Jonatan Werpers <jonatan@werpers.com>
parents: 522
diff changeset
127 switch class(boundary)
2ec8080027ab Add some documentation and decide on public function signatures
Jonatan Werpers <jonatan@werpers.com>
parents: 522
diff changeset
128 case 'cell'
532
b29f04ab5d99 Implement getBoundaryOperator for boundaryGroups in multiblock.DiffOp
Jonatan Werpers <jonatan@werpers.com>
parents: 529
diff changeset
129 localOpName = [opName '_' boundary{2}];
529
2ec8080027ab Add some documentation and decide on public function signatures
Jonatan Werpers <jonatan@werpers.com>
parents: 522
diff changeset
130 blockId = boundary{1};
2ec8080027ab Add some documentation and decide on public function signatures
Jonatan Werpers <jonatan@werpers.com>
parents: 522
diff changeset
131 localOp = obj.diffOps{blockId}.(localOpName);
344
61b75d6d4899 Added get method for boundary operators on multiblock DiffOp
Jonatan Werpers <jonatan@werpers.com>
parents: 343
diff changeset
132
529
2ec8080027ab Add some documentation and decide on public function signatures
Jonatan Werpers <jonatan@werpers.com>
parents: 522
diff changeset
133 div = {obj.blockmatrixDiv{1}, size(localOp,2)};
2ec8080027ab Add some documentation and decide on public function signatures
Jonatan Werpers <jonatan@werpers.com>
parents: 522
diff changeset
134 blockOp = blockmatrix.zero(div);
2ec8080027ab Add some documentation and decide on public function signatures
Jonatan Werpers <jonatan@werpers.com>
parents: 522
diff changeset
135 blockOp{blockId,1} = localOp;
2ec8080027ab Add some documentation and decide on public function signatures
Jonatan Werpers <jonatan@werpers.com>
parents: 522
diff changeset
136 op = blockmatrix.toMatrix(blockOp);
2ec8080027ab Add some documentation and decide on public function signatures
Jonatan Werpers <jonatan@werpers.com>
parents: 522
diff changeset
137 return
2ec8080027ab Add some documentation and decide on public function signatures
Jonatan Werpers <jonatan@werpers.com>
parents: 522
diff changeset
138 case 'multiblock.BoundaryGroup'
584
b0386d2c180d In case of empty grids, make grid functions with the correct dimensions
Jonatan Werpers <jonatan@werpers.com>
parents: 534
diff changeset
139 op = sparse(size(obj.D,1),0);
532
b29f04ab5d99 Implement getBoundaryOperator for boundaryGroups in multiblock.DiffOp
Jonatan Werpers <jonatan@werpers.com>
parents: 529
diff changeset
140 for i = 1:length(boundary)
b29f04ab5d99 Implement getBoundaryOperator for boundaryGroups in multiblock.DiffOp
Jonatan Werpers <jonatan@werpers.com>
parents: 529
diff changeset
141 op = [op, obj.getBoundaryOperator(opName, boundary{i})];
b29f04ab5d99 Implement getBoundaryOperator for boundaryGroups in multiblock.DiffOp
Jonatan Werpers <jonatan@werpers.com>
parents: 529
diff changeset
142 end
529
2ec8080027ab Add some documentation and decide on public function signatures
Jonatan Werpers <jonatan@werpers.com>
parents: 522
diff changeset
143 otherwise
2ec8080027ab Add some documentation and decide on public function signatures
Jonatan Werpers <jonatan@werpers.com>
parents: 522
diff changeset
144 error('Unknown boundary indentifier')
344
61b75d6d4899 Added get method for boundary operators on multiblock DiffOp
Jonatan Werpers <jonatan@werpers.com>
parents: 343
diff changeset
145 end
61b75d6d4899 Added get method for boundary operators on multiblock DiffOp
Jonatan Werpers <jonatan@werpers.com>
parents: 343
diff changeset
146 end
61b75d6d4899 Added get method for boundary operators on multiblock DiffOp
Jonatan Werpers <jonatan@werpers.com>
parents: 343
diff changeset
147
335
2d48db7151cf Bug fix in boundary condition.
Jonatan Werpers <jonatan@werpers.com>
parents: 237
diff changeset
148 % Creates the closure and penalty matrix for a given boundary condition,
346
33b2ef863519 Allowed muliple closure BCs in multiblock.DiffOp.
Jonatan Werpers <jonatan@werpers.com>
parents: 344
diff changeset
149 % boundary -- the name of the boundary on the form {id,name} where
202
e2fefb6f0746 multiblock.DiffOp: Fleshed out boundary_condition() a bit more
Jonatan Werpers <jonatan@werpers.com>
parents: 201
diff changeset
150 % id is the number of a block and name is the name of a
529
2ec8080027ab Add some documentation and decide on public function signatures
Jonatan Werpers <jonatan@werpers.com>
parents: 522
diff changeset
151 % boundary of that block example: {1,'s'} or {3,'w'}. It
2ec8080027ab Add some documentation and decide on public function signatures
Jonatan Werpers <jonatan@werpers.com>
parents: 522
diff changeset
152 % can also be a boundary group
335
2d48db7151cf Bug fix in boundary condition.
Jonatan Werpers <jonatan@werpers.com>
parents: 237
diff changeset
153 function [closure, penalty] = boundary_condition(obj, boundary, type)
529
2ec8080027ab Add some documentation and decide on public function signatures
Jonatan Werpers <jonatan@werpers.com>
parents: 522
diff changeset
154 switch class(boundary)
2ec8080027ab Add some documentation and decide on public function signatures
Jonatan Werpers <jonatan@werpers.com>
parents: 522
diff changeset
155 case 'cell'
534
55a7777dfcd0 Implement boundary_condition for boundary groups
Jonatan Werpers <jonatan@werpers.com>
parents: 533
diff changeset
156 [closure, penalty] = obj.singleBoundaryCondition(boundary, type);
529
2ec8080027ab Add some documentation and decide on public function signatures
Jonatan Werpers <jonatan@werpers.com>
parents: 522
diff changeset
157 case 'multiblock.BoundaryGroup'
534
55a7777dfcd0 Implement boundary_condition for boundary groups
Jonatan Werpers <jonatan@werpers.com>
parents: 533
diff changeset
158 [n,m] = size(obj.D);
55a7777dfcd0 Implement boundary_condition for boundary groups
Jonatan Werpers <jonatan@werpers.com>
parents: 533
diff changeset
159 closure = sparse(n,m);
584
b0386d2c180d In case of empty grids, make grid functions with the correct dimensions
Jonatan Werpers <jonatan@werpers.com>
parents: 534
diff changeset
160 penalty = sparse(n,0);
534
55a7777dfcd0 Implement boundary_condition for boundary groups
Jonatan Werpers <jonatan@werpers.com>
parents: 533
diff changeset
161 for i = 1:length(boundary)
55a7777dfcd0 Implement boundary_condition for boundary groups
Jonatan Werpers <jonatan@werpers.com>
parents: 533
diff changeset
162 [closurePart, penaltyPart] = obj.boundary_condition(boundary{i}, type);
55a7777dfcd0 Implement boundary_condition for boundary groups
Jonatan Werpers <jonatan@werpers.com>
parents: 533
diff changeset
163 closure = closure + closurePart;
55a7777dfcd0 Implement boundary_condition for boundary groups
Jonatan Werpers <jonatan@werpers.com>
parents: 533
diff changeset
164 penalty = [penalty, penaltyPart];
55a7777dfcd0 Implement boundary_condition for boundary groups
Jonatan Werpers <jonatan@werpers.com>
parents: 533
diff changeset
165 end
529
2ec8080027ab Add some documentation and decide on public function signatures
Jonatan Werpers <jonatan@werpers.com>
parents: 522
diff changeset
166 otherwise
2ec8080027ab Add some documentation and decide on public function signatures
Jonatan Werpers <jonatan@werpers.com>
parents: 522
diff changeset
167 error('Unknown boundary indentifier')
346
33b2ef863519 Allowed muliple closure BCs in multiblock.DiffOp.
Jonatan Werpers <jonatan@werpers.com>
parents: 344
diff changeset
168 end
210
39b7dcb2c724 multiblock: Implemented boundary conditions.
Jonatan Werpers <jonatan@werpers.com>
parents: 202
diff changeset
169
186
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
170 end
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
171
533
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
172 function [closure, penalty] = singleBoundaryCondition(obj, boundary, type)
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
173 I = boundary{1};
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
174 name = boundary{2};
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
175
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
176 % Get the closure and penaly matrices
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
177 [blockClosure, blockPenalty] = obj.diffOps{I}.boundary_condition(name, type);
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
178
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
179 % Expand to matrix for full domain.
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
180 div = obj.blockmatrixDiv;
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
181 if ~iscell(blockClosure)
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
182 temp = blockmatrix.zero(div);
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
183 temp{I,I} = blockClosure;
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
184 closure = blockmatrix.toMatrix(temp);
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
185 else
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
186 for i = 1:length(blockClosure)
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
187 temp = blockmatrix.zero(div);
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
188 temp{I,I} = blockClosure{i};
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
189 closure{i} = blockmatrix.toMatrix(temp);
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
190 end
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
191 end
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
192
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
193 if ~iscell(blockPenalty)
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
194 div{2} = size(blockPenalty, 2); % Penalty is a column vector
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
195 p = blockmatrix.zero(div);
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
196 p{I} = blockPenalty;
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
197 penalty = blockmatrix.toMatrix(p);
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
198 else
618
c360bbecf260 Add some todos
Jonatan Werpers <jonatan@werpers.com>
parents: 584
diff changeset
199 % TODO: used by beam equation, should be eliminated. SHould only set one BC per call
533
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
200 for i = 1:length(blockPenalty)
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
201 div{2} = size(blockPenalty{i}, 2); % Penalty is a column vector
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
202 p = blockmatrix.zero(div);
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
203 p{I} = blockPenalty{i};
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
204 penalty{i} = blockmatrix.toMatrix(p);
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
205 end
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
206 end
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
207 end
06d1606d6977 Factor out function for handling a single boundary condition
Jonatan Werpers <jonatan@werpers.com>
parents: 532
diff changeset
208
202
e2fefb6f0746 multiblock.DiffOp: Fleshed out boundary_condition() a bit more
Jonatan Werpers <jonatan@werpers.com>
parents: 201
diff changeset
209 function [closure, penalty] = interface(obj,boundary,neighbour_scheme,neighbour_boundary)
522
68178e013868 Add not-implemented-error for interface method in multiblock.DiffOp
Jonatan Werpers <jonatan@werpers.com>
parents: 438
diff changeset
210 error('not implemented')
186
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
211 end
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
212
201
38f203f00f3a Exeendend tests of multiblock.DiffOp.
Jonatan Werpers <jonatan@werpers.com>
parents: 186
diff changeset
213 % Size returns the number of degrees of freedom
186
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
214 function N = size(obj)
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
215 N = 0;
201
38f203f00f3a Exeendend tests of multiblock.DiffOp.
Jonatan Werpers <jonatan@werpers.com>
parents: 186
diff changeset
216 for i = 1:length(obj.diffOps)
38f203f00f3a Exeendend tests of multiblock.DiffOp.
Jonatan Werpers <jonatan@werpers.com>
parents: 186
diff changeset
217 N = N + obj.diffOps{i}.size();
186
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
218 end
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
219 end
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
220 end
1fc2eeb4f4e6 Moved multiblock grid to the multiblock package. Continued implementation. Added multiblock diffOp and removed some functions no longer needed.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
221 end