Mercurial > repos > public > sbplib
changeset 1208:7f427275bc9c feature/poroelastic
Merge heads
| author | Martin Almquist <malmquist@stanford.edu> |
|---|---|
| date | Fri, 20 Sep 2019 15:00:19 -0700 |
| parents | 05a01f77d0e3 (diff) 6b203030fb37 (current diff) |
| children | 67eee83fd9c9 |
| files | +scheme/Elastic2dVariableAnisotropic.m |
| diffstat | 1 files changed, 16 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/+scheme/Elastic2dVariableAnisotropic.m Sun Sep 15 14:39:42 2019 -0700 +++ b/+scheme/Elastic2dVariableAnisotropic.m Fri Sep 20 15:00:19 2019 -0700 @@ -193,10 +193,10 @@ % D2 - for i = 1:dim + for j = 1:dim for k = 1:dim for l = 1:dim - obj.D2{i,k,l} = sparse(m_tot,m_tot); + obj.D2{j,k,l} = sparse(m_tot,m_tot); end end end @@ -205,11 +205,11 @@ k = 1; for r = 1:m(2) p = ind(:,r); - for i = 1:dim + for j = 1:dim for l = 1:dim - coeff = C{i,k,k,l}; + coeff = C{k,j,k,l}; D_kk = D2{1}(coeff(p)); - obj.D2{i,k,l}(p,p) = D_kk; + obj.D2{j,k,l}(p,p) = D_kk; end end end @@ -217,11 +217,11 @@ k = 2; for r = 1:m(1) p = ind(r,:); - for i = 1:dim + for j = 1:dim for l = 1:dim - coeff = C{i,k,k,l}; + coeff = C{k,j,k,l}; D_kk = D2{2}(coeff(p)); - obj.D2{i,k,l}(p,p) = D_kk; + obj.D2{j,k,l}(p,p) = D_kk; end end end @@ -243,10 +243,10 @@ for j = 1:dim for k = 1:dim for l = 1:dim - if j == k - D = D + E{i}*D2{i,k,l}*E{l}'; + if i == k + D = D + E{j}*D2{j,k,l}*E{l}'; else - D = D + E{i}*D1{j}*C_mat{i,j,k,l}*D1{k}*E{l}'; + D = D + E{j}*D1{i}*C_mat{i,j,k,l}*D1{k}*E{l}'; end end end @@ -290,9 +290,9 @@ % Derivative direction k for k = 1:dim T_l{j}{i,l} = T_l{j}{i,l} ... - - (e_l{j}'*C_mat{i,j,k,l}*D1{k})'; + - (e_l{j}'*C_mat{j,i,k,l}*D1{k})'; T_r{j}{i,l} = T_r{j}{i,l} ... - + (e_r{j}'*C_mat{i,j,k,l}*D1{k})'; + + (e_r{j}'*C_mat{j,i,k,l}*D1{k})'; end tau_l{j}{i} = tau_l{j}{i} + (T_l{j}{i,l}'*E{l}')'; tau_r{j}{i} = tau_r{j}{i} + (T_r{j}{i,l}'*E{l}')'; @@ -436,7 +436,7 @@ Z = sparse(m_tot, m_tot); for l = 1:dim for k = 1:dim - Z = Z + nu(l)*C{i,l,k,j}*nu(k); + Z = Z + nu(l)*C{l,i,k,j}*nu(k); end end Z = -tuning*dim/h11*Z; @@ -537,8 +537,8 @@ Z_v = sparse(m_int, m_int); for l = 1:dim for k = 1:dim - Z_u = Z_u + e_u'*nu_u(l)*C_u{i,l,k,j}*nu_u(k)*e_u; - Z_v = Z_v + e_v'*nu_v(l)*C_v{i,l,k,j}*nu_v(k)*e_v; + Z_u = Z_u + e_u'*nu_u(l)*C_u{l,i,k,j}*nu_u(k)*e_u; + Z_v = Z_v + e_v'*nu_v(l)*C_v{l,i,k,j}*nu_v(k)*e_v; end end Z = -tuning*dim*( 1/(4*h11_u)*Z_u + 1/(4*h11_v)*Z_v );