sbplib: +scheme/Elastic2dVariable.m comparison

Remove use of tensor library in B assembly

author	Martin Almquist <malmquist@stanford.edu>
date	Sat, 22 Dec 2018 16:41:17 +0100
parents	c75ddd568fcc
children	4a85cff53107

comparison

equal deleted inserted replaced

-:99c2ef883dc6
+:db3411264b96
 obj.h = h;
 obj.order = order;
 obj.grid = g;
 obj.dim = dim;
-% Used for adjoint optimization
+% B, used for adjoint optimization
-obj.B = cell(1,dim);
+B = cell(dim, 1);
 for i = 1:dim
-obj.B{i} = zeros(m(i),m(i),m(i));
+B{i} = cell(m_tot, 1);
-for k = 1:m(i)
+end
-c = sparse(m(i),1);
-c(k) = 1;
+for i = 1:dim
-[~, obj.B{i}(:,:,k)] = ops{i}.D2(c);
+for j = 1:m_tot
-end
+B{i}{j} = sparse(m_tot, m_tot);
 end
+end
+ind = grid.funcToMatrix(g, 1:m_tot);
+% Direction 1
+for k = 1:m(1)
+c = sparse(m(1),1);
+c(k) = 1;
+[~, B_1D] = ops{1}.D2(c);
+for l = 1:m(2)
+p = ind(:,l);
+B{1}{(k-1)*m(2) + l}(p, p) = B_1D;
+end
+end
+% Direction 2
+for k = 1:m(2)
+c = sparse(m(2),1);
+c(k) = 1;
+[~, B_1D] = ops{2}.D2(c);
+for l = 1:m(1)
+p = ind(l,:);
+B{2}{(l-1)*m(2) + k}(p, p) = B_1D;
+end
+end
+obj.B = B;
 end
 % Closure functions return the operators applied to the own domain to close the boundary

Mercurial > repos > public > sbplib