This is an automated email from the git hooks/post-receive script. renard pushed a commit to branch master in repository getfem.
The following commit(s) were added to refs/heads/master by this push: new 97aac8bf minor fix on matrix_j2 operator 97aac8bf is described below commit 97aac8bfb35da839043bd43396361589544e4022 Author: Renard Yves <yves.ren...@insa-lyon.fr> AuthorDate: Mon Jun 13 15:46:09 2022 +0200 minor fix on matrix_j2 operator --- src/getfem_nonlinear_elasticity.cc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/getfem_nonlinear_elasticity.cc b/src/getfem_nonlinear_elasticity.cc index 42581611..8dc3a8ef 100644 --- a/src/getfem_nonlinear_elasticity.cc +++ b/src/getfem_nonlinear_elasticity.cc @@ -221,8 +221,7 @@ namespace getfem { const base_matrix &di2_ = grad_i2(); const base_matrix &di3_ = grad_i3(); scalar_type coeff1 = scalar_type(2) / (scalar_type(3)*i3()); - scalar_type coeff2 = scalar_type(5) * coeff1 * coeff1 * i2() - / scalar_type(2); + scalar_type coeff2 = scalar_type(5)*coeff1*coeff1*i2() / scalar_type(2); ddj2 = sym_grad_grad_i2(); gmm::add(gmm::scaled(sym_grad_grad_i3().as_vector(), -i2() * coeff1), ddj2.as_vector()); @@ -1467,7 +1466,7 @@ namespace getfem { for (size_type j = 0; j < N; ++j) for (size_type i = 0; i < N; ++i, ++it) *it = (((i == j) ? tr : scalar_type(0)) - t[j+N*i] - - scalar_type(2)*i2*M(j,i)/scalar_type(3)) + - scalar_type(2)*i2*M(j,i)/(det*scalar_type(3))) / pow(det, scalar_type(2)/scalar_type(3)); GMM_ASSERT1(it == result.end(), "Internal error"); } @@ -1494,11 +1493,11 @@ namespace getfem { for (size_type i = 0; i < N; ++i, ++it) *it = ( ((i==j) ? 1. : 0.) * ((k==l) ? 1. : 0.) - ((i==l) ? 1. : 0.) * ((k==j) ? 1. : 0.) - - 2.*tr*M(j,i)*((k==l) ? 1. : 0.)/3. - + 2.*tr*M(j,i)*M(l,k)/3. - - 2.*i2*M(i,k)*M(l,j)/3. + - 2.*tr*M(j,i)*((k==l) ? 1. : 0.)/(3.*det) + + 2.*tr*M(j,i)*M(l,k)/(3.*det) + - 2.*i2*M(i,k)*M(l,j)/(3.*det) - 2.*((tr*((i==j) ? 1. : 0.))-t[j+N*i] - - 2.*i2*M(j,i)/3)*M(l,k)/3.) + - 2.*i2*M(j,i)/(3.*det))*M(l,k)/(3.*det)) / pow(det, scalar_type(2)/scalar_type(3)); } };