From: Timo Heister Date: Thu, 28 Feb 2013 23:35:15 +0000 (+0000) Subject: merge from mainline X-Git-Tag: v8.0.0~120^2~89 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=873f5c12d41d4e13ee881b50cff96bacc09ba2a8;p=dealii.git merge from mainline git-svn-id: https://svn.dealii.org/branches/branch_unify_linear_algebra@28655 0785d39b-7218-0410-832d-ea1e28bc413d --- 873f5c12d41d4e13ee881b50cff96bacc09ba2a8 diff --cc deal.II/examples/step-42/step-42.cc index 72f8406fe5,46d9e68660..c0fdb3c1ca --- a/deal.II/examples/step-42/step-42.cc +++ b/deal.II/examples/step-42/step-42.cc @@@ -339,15 -339,15 +339,14 @@@ namespace Step4 double _gamma, MPI_Comm _mpi_communicator, ConditionalOStream _pcout); -- - void plast_linear_hardening (SymmetricTensor<4,dim> &stress_strain_tensor, - SymmetricTensor<2,dim> &strain_tensor, - unsigned int &elast_points, - unsigned int &plast_points, - double &yield); - void linearized_plast_linear_hardening (SymmetricTensor<4,dim> &stress_strain_tensor_linearized, - SymmetricTensor<4,dim> &stress_strain_tensor, - SymmetricTensor<2,dim> &strain_tensor); + void plast_linear_hardening (SymmetricTensor<4,dim> &stress_strain_tensor, + const SymmetricTensor<2,dim> &strain_tensor, + unsigned int &elast_points, + unsigned int &plast_points, + double &yield); + void linearized_plast_linear_hardening (SymmetricTensor<4,dim> &stress_strain_tensor_linearized, + SymmetricTensor<4,dim> &stress_strain_tensor, + const SymmetricTensor<2,dim> &strain_tensor); inline SymmetricTensor<2,dim> get_strain (const FEValues &fe_values, const unsigned int shape_func, const unsigned int q_point) const;