]> https://gitweb.dealii.org/ - dealii.git/commitdiff
merge from mainline
authorTimo Heister <timo.heister@gmail.com>
Thu, 28 Feb 2013 23:35:15 +0000 (23:35 +0000)
committerTimo Heister <timo.heister@gmail.com>
Thu, 28 Feb 2013 23:35:15 +0000 (23:35 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_unify_linear_algebra@28655 0785d39b-7218-0410-832d-ea1e28bc413d

13 files changed:
1  2 
deal.II/examples/step-18/step-18.cc
deal.II/examples/step-32/step-32.cc
deal.II/examples/step-33/step-33.cc
deal.II/examples/step-40/step-40.cc
deal.II/examples/step-42/step-42.cc
deal.II/include/deal.II/grid/grid_generator.h
deal.II/include/deal.II/grid/grid_reordering_internal.h
deal.II/include/deal.II/grid/grid_tools.h
deal.II/include/deal.II/lac/block_matrix_base.h
deal.II/include/deal.II/lac/petsc_matrix_base.h
deal.II/include/deal.II/lac/petsc_parallel_vector.h
deal.II/include/deal.II/lac/trilinos_vector.h
deal.II/source/grid/grid_tools.cc

Simple merge
Simple merge
Simple merge
Simple merge
index 72f8406fe54bc6434bf1706db1a6ca0f396750c0,46d9e68660752865f0a34adc61fe7744d2150b36..c0fdb3c1cada4149d907e0a601950a30f548ad7d
@@@ -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<dim> &fe_values,
                                                const unsigned int  shape_func,
                                                const unsigned int  q_point) const;
Simple merge

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.