sbplib: +multiblock/DiffOp.m comparison

I remove cell support in multiblock.DiffOp.boundary_condition

author	Jonatan Werpers <jonatan@werpers.com>
date	Wed, 25 Jul 2018 15:17:16 -0700
parents	e05465aa2e25
children	1cc5a0d26453

comparison

equal deleted inserted replaced

-:8e4b9a5d7c50
+:517d6019d63c
 % Get the closure and penaly matrices
 [blockClosure, blockPenalty] = obj.diffOps{I}.boundary_condition(name, type);
 % Expand to matrix for full domain.
 div = obj.blockmatrixDiv;
-if ~iscell(blockClosure)
+temp = blockmatrix.zero(div);
-temp = blockmatrix.zero(div);
+temp{I,I} = blockClosure;
-temp{I,I} = blockClosure;
+closure = blockmatrix.toMatrix(temp);
-closure = blockmatrix.toMatrix(temp);
-else
+div{2} = size(blockPenalty, 2); % Penalty is a column vector
-for i = 1:length(blockClosure)
+p = blockmatrix.zero(div);
-temp = blockmatrix.zero(div);
+p{I} = blockPenalty;
-temp{I,I} = blockClosure{i};
+penalty = blockmatrix.toMatrix(p);
-closure{i} = blockmatrix.toMatrix(temp);
-end
-end
-if ~iscell(blockPenalty)
-div{2} = size(blockPenalty, 2); % Penalty is a column vector
-p = blockmatrix.zero(div);
-p{I} = blockPenalty;
-penalty = blockmatrix.toMatrix(p);
-else
-% TODO: used by beam equation, should be eliminated. SHould only set one BC per call
-for i = 1:length(blockPenalty)
-div{2} = size(blockPenalty{i}, 2); % Penalty is a column vector
-p = blockmatrix.zero(div);
-p{I} = blockPenalty{i};
-penalty{i} = blockmatrix.toMatrix(p);
-end
-end
 end
 function [closure, penalty] = interface(obj,boundary,neighbour_scheme,neighbour_boundary)
 error('not implemented')
 end

Mercurial > repos > public > sbplib