From: maier Date: Fri, 1 Mar 2013 09:02:57 +0000 (+0000) Subject: Merge from Mainline X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46c02573873c97232ce2794a4cdd43e3d728938f;p=dealii-svn.git Merge from Mainline Conflicts: deal.II/configure deal.II/configure.in deal.II/contrib/configure deal.II/contrib/utilities/configure deal.II/doc/doxygen/Makefile.in deal.II/examples/step-42/step-42.cc git-svn-id: https://svn.dealii.org/branches/branch_cmake@28678 0785d39b-7218-0410-832d-ea1e28bc413d --- 46c02573873c97232ce2794a4cdd43e3d728938f diff --cc deal.II/examples/step-42/step-42.cc index cf3a6203ab,501dac8dd1..d8dc043fcf --- a/deal.II/examples/step-42/step-42.cc +++ b/deal.II/examples/step-42/step-42.cc @@@ -396,11 -310,11 +310,19 @@@ namespace Step4 } template ++<<<<<<< HEAD + void ConstitutiveLaw::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 ConstitutiveLaw::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) ++>>>>>>> mirror/trunk { if (dim == 3) { @@@ -429,9 -343,9 +351,15 @@@ } template ++<<<<<<< HEAD + void ConstitutiveLaw::linearized_plast_linear_hardening (SymmetricTensor<4,dim> &stress_strain_tensor_linearized, + SymmetricTensor<4,dim> &stress_strain_tensor, + SymmetricTensor<2,dim> &strain_tensor) ++======= + void ConstitutiveLaw::linearized_plast_linear_hardening (SymmetricTensor<4,dim> &stress_strain_tensor_linearized, + SymmetricTensor<4,dim> &stress_strain_tensor, + const SymmetricTensor<2,dim> &strain_tensor) ++>>>>>>> mirror/trunk { if (dim == 3) {