Skip to content
Snippets Groups Projects
Commit 56ee4cb2 authored by Oliver Sander's avatar Oliver Sander Committed by sander
Browse files

removed the generic Gamma penalty functional again

[[Imported from SVN: r9277]]
parent 79914f22
Branches
Tags
No related merge requests found
...@@ -254,8 +254,7 @@ getLocalMatrix( EntityType &entity, ...@@ -254,8 +254,7 @@ getLocalMatrix( EntityType &entity,
#else #else
// Fischer / Wriggers // Fischer / Wriggers
C[i][j][k][l] = lambda_*(parJparU[i][j]*parJparU[k][l] + (J-1)*Elasticity::det_dudu_tmpl(parDerU,i,j,k,l)); C[i][j][k][l] = lambda_*(parJparU[i][j]*parJparU[k][l] + (J-1)*Elasticity::det_dudu_tmpl(parDerU,i,j,k,l));
//C[i][j][k][l] += -(2*mu_)/J/J * (J*det_dudu_tmpl(parDerU,i,j,k,l) - parJparU[i][j]*parJparU[k][l]); C[i][j][k][l] += -(2*mu_)/J/J * (J*Elasticity::det_dudu_tmpl(parDerU,i,j,k,l) - parJparU[i][j]*parJparU[k][l]);
C[i][j][k][l] += (2*mu_)*Gamma_xx(J)*det_dudu_tmpl(parDerU,i,j,k,l);
C[i][j][k][l] += mu_ * tr_E_dudu; C[i][j][k][l] += mu_ * tr_E_dudu;
#endif #endif
} }
...@@ -292,7 +291,7 @@ getLocalMatrix( EntityType &entity, ...@@ -292,7 +291,7 @@ getLocalMatrix( EntityType &entity,
#else #else
// Fischer // Fischer
fu[i][j] = lambda_ * (J-1) * parJparU[i][j]; fu[i][j] = lambda_ * (J-1) * parJparU[i][j];
fu[i][j] += 2* mu_ *Gamma_x(J) * parJparU[i][j]; fu[i][j] -= 2* mu_ /J * parJparU[i][j];
fu[i][j] += mu_ * trE_du[i][j]; fu[i][j] += mu_ * trE_du[i][j];
#endif #endif
} }
...@@ -469,7 +468,7 @@ computeEnergy(const BlockVector<FieldVector<double, dim> >& sol) const ...@@ -469,7 +468,7 @@ computeEnergy(const BlockVector<FieldVector<double, dim> >& sol) const
energy += weight * (lambda_ * (J*J-1)/4 - (lambda_/2 + mu_ ) * std::log(J) + mu_*trE); energy += weight * (lambda_ * (J*J-1)/4 - (lambda_/2 + mu_ ) * std::log(J) + mu_*trE);
#else #else
// Fischer // Fischer
energy += weight * (lambda_ * (J-1)*(J-1)/2 + 2*mu_ * Gamma(J) + mu_*trE); energy += weight * (lambda_ * (J-1)*(J-1)/2 - 2*mu_ * std::log(J) + mu_*trE);
#endif #endif
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment