]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Merge trunk into branch_port_the_testsuite
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 19 Sep 2013 10:15:09 +0000 (10:15 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 19 Sep 2013 10:15:09 +0000 (10:15 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30823 0785d39b-7218-0410-832d-ea1e28bc413d

1  2 
tests/bits/faceq_face_interpolation.cc
tests/bits/faceq_face_interpolation.output
tests/bits/faceq_subface_interpolation.cc
tests/bits/faceq_subface_interpolation.output
tests/fe/fe_data_test.cc
tests/fe/fe_data_test.output
tests/mpi/periodicity_01.cc

index 4bd06fa87e56036d3588919bc16b37e2f68272bf,ca0d9067386b11b411dc426ddb2e08f1963a02c5..9e6efe0e2c85fd205b85eaff8babf1b78f57af14
  #include <deal.II/fe/fe_face.h>
  
  // check
- //   FE_FaceQ::face_interpolation
+ //   FE_FaceQ/P::face_interpolation
  
  
 -std::string output_file_name = "faceq_face_interpolation/output";
 +std::string output_file_name = "output";
  
  
  void
index 4571796713417c136783e66862fcfe107131aefb,ecf6cb319600126fe6c9d421d9e4c72347adbffe..cd85880d0a6c4fae0eb06c798bdc5504ab9b8180
  #include <deal.II/fe/fe_face.h>
  
  // check
- //   FE_FaceQ::subface_interpolation
+ //   FE_FaceQ/P::subface_interpolation
  
  
 -std::string output_file_name = "faceq_subface_interpolation/output";
 +std::string output_file_name = "output";
  
  
  void
Simple merge
Simple merge
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.