Mercurial > repos > public > sbplib

comparison +multiblock/DiffOp.m @ 438:225765e345c4 feature/grids

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix bug in multiblock DiffOp
author Jonatan Werpers <jonatan@werpers.com>
date Mon, 13 Mar 2017 14:33:01 +0100
parents 30ff8879162e
children 68178e013868
comparison
equal deleted inserted replaced
437:b0361f203492 438:225765e345c4
159 temp{I,I} = blockClosure{i}; 159 temp{I,I} = blockClosure{i};
160 closure{i} = blockmatrix.toMatrix(temp); 160 closure{i} = blockmatrix.toMatrix(temp);
161 end 161 end
162 end 162 end
163 163
164 div{2} = size(blockPenalty, 2); % Penalty is a column vector
165 if ~iscell(blockPenalty) 164 if ~iscell(blockPenalty)
165 div{2} = size(blockPenalty, 2); % Penalty is a column vector
166 p = blockmatrix.zero(div); 166 p = blockmatrix.zero(div);
167 p{I} = blockPenalty; 167 p{I} = blockPenalty;
168 penalty = blockmatrix.toMatrix(p); 168 penalty = blockmatrix.toMatrix(p);
169 else 169 else
170 for i = 1:length(blockPenalty) 170 for i = 1:length(blockPenalty)
171 div{2} = size(blockPenalty{i}, 2); % Penalty is a column vector
171 p = blockmatrix.zero(div); 172 p = blockmatrix.zero(div);
172 p{I} = blockPenalty{i}; 173 p{I} = blockPenalty{i};
173 penalty{i} = blockmatrix.toMatrix(p); 174 penalty{i} = blockmatrix.toMatrix(p);
174 end 175 end
175 end 176 end