]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Port tests/multigrid
authorMatthias Maier <tamiko@kyomu.43-1.org>
Thu, 22 Aug 2013 01:58:56 +0000 (01:58 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Thu, 22 Aug 2013 01:58:56 +0000 (01:58 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30399 0785d39b-7218-0410-832d-ea1e28bc413d

77 files changed:
tests/CMakeLists.txt
tests/multigrid/CMakeLists.txt [new file with mode: 0644]
tests/multigrid/boundary_01.cc
tests/multigrid/boundary_01.output [moved from tests/multigrid/boundary_01/cmp/generic with 100% similarity]
tests/multigrid/count_01.cc
tests/multigrid/count_01.output [moved from tests/multigrid/count_01/cmp/generic with 100% similarity]
tests/multigrid/cycles.cc
tests/multigrid/cycles.output [moved from tests/multigrid/cycles/cmp/generic with 100% similarity]
tests/multigrid/dof_01.output [moved from tests/multigrid/dof_01/cmp/generic with 100% similarity]
tests/multigrid/dof_02.output [moved from tests/multigrid/dof_02/cmp/generic with 100% similarity]
tests/multigrid/dof_03.output [moved from tests/multigrid/dof_03/cmp/generic with 100% similarity]
tests/multigrid/mg_output.cc
tests/multigrid/mg_output.output [moved from tests/multigrid/mg_output/cmp/generic with 100% similarity]
tests/multigrid/mg_renumbered_01.cc
tests/multigrid/mg_renumbered_01.output [moved from tests/multigrid/mg_renumbered_01/cmp/generic with 100% similarity]
tests/multigrid/mg_renumbered_02.cc
tests/multigrid/mg_renumbered_02.output [moved from tests/multigrid/mg_renumbered_02/cmp/generic with 100% similarity]
tests/multigrid/mg_renumbered_03.cc
tests/multigrid/mg_renumbered_03.output [moved from tests/multigrid/mg_renumbered_03/cmp/generic with 100% similarity]
tests/multigrid/renumbering_01.output [moved from tests/multigrid/renumbering_01/cmp/generic with 100% similarity]
tests/multigrid/renumbering_02.output [moved from tests/multigrid/renumbering_02/cmp/generic with 100% similarity]
tests/multigrid/renumbering_03.output [moved from tests/multigrid/renumbering_03/cmp/generic with 100% similarity]
tests/multigrid/smoother_block.cc
tests/multigrid/smoother_block.output [moved from tests/multigrid/smoother_block/cmp/generic with 100% similarity]
tests/multigrid/step-16.cc
tests/multigrid/step-16.output [moved from tests/multigrid/step-16/cmp/generic with 100% similarity]
tests/multigrid/step-39-02.cc
tests/multigrid/step-39-02.output [moved from tests/multigrid/step-39-02/cmp/generic with 100% similarity]
tests/multigrid/step-39-03.cc
tests/multigrid/step-39-03.output [moved from tests/multigrid/step-39-03/cmp/generic with 100% similarity]
tests/multigrid/step-39.cc
tests/multigrid/step-39.output [moved from tests/multigrid/step-39/cmp/generic with 100% similarity]
tests/multigrid/transfer_01.cc
tests/multigrid/transfer_01.output [moved from tests/multigrid/transfer_01/cmp/generic with 100% similarity]
tests/multigrid/transfer_02.cc
tests/multigrid/transfer_02.output [moved from tests/multigrid/transfer_02/cmp/generic with 100% similarity]
tests/multigrid/transfer_03.cc
tests/multigrid/transfer_03.output [moved from tests/multigrid/transfer_03/cmp/generic with 100% similarity]
tests/multigrid/transfer_block.cc
tests/multigrid/transfer_block.output [moved from tests/multigrid/transfer_block/cmp/generic with 100% similarity]
tests/multigrid/transfer_block_select.cc
tests/multigrid/transfer_block_select.output [moved from tests/multigrid/transfer_block_select/cmp/generic with 100% similarity]
tests/multigrid/transfer_compare_01.cc
tests/multigrid/transfer_compare_01.output [moved from tests/multigrid/transfer_compare_01/cmp/generic with 100% similarity]
tests/multigrid/transfer_prebuilt_01.output [moved from tests/multigrid/transfer_prebuilt_01/cmp/generic with 100% similarity]
tests/multigrid/transfer_prebuilt_02.output [moved from tests/multigrid/transfer_prebuilt_02/cmp/generic with 100% similarity]
tests/multigrid/transfer_prebuilt_03.output [moved from tests/multigrid/transfer_prebuilt_03/cmp/generic with 100% similarity]
tests/multigrid/transfer_select.cc
tests/multigrid/transfer_select.output [moved from tests/multigrid/transfer_select/cmp/generic with 100% similarity]
tests/multigrid/transfer_system_01.cc
tests/multigrid/transfer_system_01.output [moved from tests/multigrid/transfer_system_01/cmp/generic with 100% similarity]
tests/multigrid/transfer_system_02.cc
tests/multigrid/transfer_system_02.output [moved from tests/multigrid/transfer_system_02/cmp/generic with 100% similarity]
tests/multigrid/transfer_system_03.cc
tests/multigrid/transfer_system_03.output [moved from tests/multigrid/transfer_system_03/cmp/generic with 100% similarity]
tests/multigrid/transfer_system_04.cc
tests/multigrid/transfer_system_04.output [moved from tests/multigrid/transfer_system_04/cmp/generic with 100% similarity]
tests/multigrid/transfer_system_05.cc
tests/multigrid/transfer_system_05.output [moved from tests/multigrid/transfer_system_05/cmp/generic with 100% similarity]
tests/multigrid/transfer_system_adaptive_01.cc
tests/multigrid/transfer_system_adaptive_01.output [moved from tests/multigrid/transfer_system_adaptive_01/cmp/generic with 100% similarity]
tests/multigrid/transfer_system_adaptive_02.cc
tests/multigrid/transfer_system_adaptive_02.output [moved from tests/multigrid/transfer_system_adaptive_02/cmp/generic with 100% similarity]
tests/multigrid/transfer_system_adaptive_03.cc
tests/multigrid/transfer_system_adaptive_03.output [moved from tests/multigrid/transfer_system_adaptive_03/cmp/generic with 100% similarity]
tests/multigrid/transfer_system_adaptive_04.cc
tests/multigrid/transfer_system_adaptive_04.output [moved from tests/multigrid/transfer_system_adaptive_04/cmp/generic with 100% similarity]
tests/multigrid/transfer_system_adaptive_05.cc
tests/multigrid/transfer_system_adaptive_05.output [moved from tests/multigrid/transfer_system_adaptive_05/cmp/generic with 100% similarity]
tests/multigrid/transfer_system_adaptive_06.cc
tests/multigrid/transfer_system_adaptive_06.output [moved from tests/multigrid/transfer_system_adaptive_06/cmp/generic with 100% similarity]
tests/multigrid/transfer_system_adaptive_07.cc
tests/multigrid/transfer_system_adaptive_07.output [moved from tests/multigrid/transfer_system_adaptive_07/cmp/generic with 100% similarity]
tests/multigrid/transfer_system_adaptive_08.cc
tests/multigrid/transfer_system_adaptive_08.output [moved from tests/multigrid/transfer_system_adaptive_08/cmp/generic with 100% similarity]
tests/multigrid/transfer_system_adaptive_09.cc
tests/multigrid/transfer_system_adaptive_09.output [moved from tests/multigrid/transfer_system_adaptive_09/cmp/generic with 100% similarity]

index 41594f786d6d10237ebd0ebfd66f94f32fcc3094..596c326afa85debbefb0abc5f0c1c6bc2ea0c3d9 100644 (file)
@@ -70,7 +70,6 @@ MESSAGE(STATUS "Proceed to test definitions")
 #$(if $(USE_CONTRIB_PETSC:no=),    petsc,) \
 #$(if $(USE_CONTRIB_SLEPC:no=),    slepc,) \
 #$(if $(USE_CONTRIB_TRILINOS:no=), trilinos,) \
-#$(if $(USE_CONTRIB_HSL:no=),      hsl,) \
 #$(if $(USE_CONTRIB_LAPACK:no=),   lapack,)
 
 #a-framework
@@ -81,23 +80,23 @@ ADD_SUBDIRECTORY(base)
 #bits
 ADD_SUBDIRECTORY(codim_one)
 #deal.II
-#distributed_grids
 #fail
 #fe
-#gla
 #grid
 #hp
-#hsl
 #integrators
 #lac
 #lapack
 #lib
 #matrix_free
 #mesh_converter
+ADD_SUBDIRECTORY(multigrid)
+#serialization
+
+#distributed_grids
+#gla
 #mpi
-#multigrid
 #petsc
-#serialization
 #slepc
 #trilinos
 
diff --git a/tests/multigrid/CMakeLists.txt b/tests/multigrid/CMakeLists.txt
new file mode 100644 (file)
index 0000000..0efb828
--- /dev/null
@@ -0,0 +1 @@
+DEAL_II_PICKUP_TESTS()
index 2dad33fa8a743ee98bc7546e634b4c8bc99c07b0..b8548755fb837ee3004037b7a84941bbf675517b 100644 (file)
@@ -92,7 +92,7 @@ void check()
 
 int main()
 {
-  std::ofstream logfile("boundary_01/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
index 26207cba697bdd9ed8cc48d35d40865521f21603..eb93433e2b671914d54bddfb24156ae50227d161 100644 (file)
@@ -110,7 +110,7 @@ void check()
 
 int main()
 {
-  std::ofstream logfile("count_01/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
index d8a2c7f66ff92b6a9176de9df3f7f56b5e557dac..068b752093cdb08cc367213d8c0244a9bb1a3e01 100644 (file)
@@ -91,7 +91,7 @@ void test_cycles(unsigned int minlevel, unsigned int maxlevel)
 
 int main()
 {
-  std::ofstream logfile("cycles/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
index 4d8ca154f0ae7bb7391c4dec14c88072dd80de8e..39c5e72e06ff443fa41d126cefd5a43fd5412540 100644 (file)
@@ -283,7 +283,7 @@ void check_simple(const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("mg_output/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
index ffa4202d32be493da15c038efee333a1de8f0369..d860d13c06dba7eb09655f24b6b8a02682f146b1 100644 (file)
@@ -479,7 +479,7 @@ void LaplaceProblem<dim>::run ()
 
 int main ()
 {
-  std::ofstream logfile("mg_renumbered_01/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
index 2b5fa393aee7eb2c7cb348620053f88ea29c235f..fda0e5a06beb4f47e300b6b4bcd32ec5bc3f66e6 100644 (file)
@@ -357,7 +357,7 @@ void LaplaceProblem<dim>::run ()
 
 int main ()
 {
-  std::ofstream logfile("mg_renumbered_02/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
index eec64558458331fb3ff02d2d0c020b66dff9f575..9bcb1b87fc7fa44b6b337076b2dd9c477bfcf4ef 100644 (file)
@@ -425,7 +425,7 @@ void LaplaceProblem<dim>::run ()
 
 int main ()
 {
-  std::ofstream logfile("mg_renumbered_03/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
index d9d86cab4dde88b658bd736b2ed35cfd274cfd8c..a18bd10b3342f4543474a3dd4a3d4f4394268921 100644 (file)
@@ -210,7 +210,7 @@ void check()
 
 int main()
 {
-  std::ofstream logfile("smoother_block/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
index 1d881e62b5f41400bb878eee7fc5ce82f101219b..0064dc0a62c497503ed425c7628ea7d2d9877b61 100644 (file)
@@ -913,7 +913,7 @@ void LaplaceProblem<dim>::run ()
 // in step-6:
 int main ()
 {
-  std::ofstream logfile("step-16/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
index c3c1279750b6865dcbeb00ff4cd7e850d6e6f72a..32d858e58ddf52ef05406cd18bd6b86348371215 100644 (file)
@@ -658,7 +658,7 @@ namespace Step39
   void InteriorPenaltyProblem<dim>::output_results (const unsigned int cycle) const
   {
     char *fn = new char[100];
-    sprintf(fn, "step-39-02/sol-%02d", cycle);
+    sprintf(fn, "sol-%02d", cycle);
 
     std::string filename(fn);
     filename += ".gnuplot";
index 51283061681e632192a6f108f393666a30f9fbc5..87e33b7662f26db229aa8d306c5beedb61c9915f 100644 (file)
@@ -659,7 +659,7 @@ namespace Step39
   void InteriorPenaltyProblem<dim>::output_results (const unsigned int cycle) const
   {
     char *fn = new char[100];
-    sprintf(fn, "step-39-03/sol-%02d", cycle);
+    sprintf(fn, "sol-%02d", cycle);
 
     std::string filename(fn);
     filename += ".gnuplot";
index b0964a4a17886774fe778d271a8c990f621213df..9b6ae035185ba8f51b676251a6d1975e029ba435 100644 (file)
@@ -647,7 +647,7 @@ namespace Step39
   void InteriorPenaltyProblem<dim>::output_results (const unsigned int cycle) const
   {
     char *fn = new char[100];
-    sprintf(fn, "step-39/sol-%02d", cycle);
+    sprintf(fn, "sol-%02d", cycle);
 
     std::string filename(fn);
     filename += ".gnuplot";
index 5927575dfbceda6ba62d6853a0bf9ea1d1ed4f1e..e7878b8716511a51404e0e07e74ebe0b8f467ed0 100644 (file)
@@ -139,7 +139,7 @@ void check_simple(const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("transfer_01/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(6);
   deallog.attach(logfile);
   deallog.depth_console(0);
index 8f3f824e49dd5526cbb2154433e38d3199f28083..80bd42ee5afabca76b27a8914f3a5b824fe5fbfd 100644 (file)
@@ -169,7 +169,7 @@ void check_simple(const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("transfer_02/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(6);
   deallog.attach(logfile);
   deallog.depth_console(0);
index c5279c3066e42a5c6c51d604735a40f21156eb35..c7c0f700a5af374d4510cc2a24f843eb7c049a54 100644 (file)
@@ -244,7 +244,7 @@ void check_simple(const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("transfer_03/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
index 0edda40480969a0c02015e145bf7f5099fe951f3..355b9e136abc9daad3e7f735d7b73dec31f429f0 100644 (file)
@@ -199,7 +199,7 @@ void check_block(const FiniteElement<dim> &fe,
 
 int main()
 {
-  std::ofstream logfile("transfer_block/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
index a2597b678710eee1dfd1226f80d7a6a5763da9de..d0a9b2f64a03023fd80d98dce85af273db01802e 100644 (file)
@@ -170,7 +170,7 @@ void check_select(const FiniteElement<dim> &fe, unsigned int selected)
 
 int main()
 {
-  std::ofstream logfile("transfer_block_select/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
index 14065a0777117672243656b8f3ccfd7258c29a1c..65fbe1cf237e6a8c3581eefec68e584dfc718b7f 100644 (file)
@@ -275,7 +275,7 @@ void check_block(const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("transfer_compare_01/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
index c7ffc4ff873edfd570d30606554ccdb00f07d3d8..65cd16252e5b462bb3b140a2595e093a1129975c 100644 (file)
@@ -125,7 +125,7 @@ void check_select(const FiniteElement<dim> &fe,
 
 int main()
 {
-  std::ofstream logfile("transfer_select/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
index 7d150ae66bab2d3a6384b6a1e7b8b7b3665c44e7..99d248db34378ab6bb5c15fb0397b0105b42f28e 100644 (file)
@@ -125,7 +125,7 @@ void check (const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("transfer_system_01/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
index 6568622c84320874e8310c5cf987ad4b742fe27f..a7663cd5771334656816800cf99f3fac5bb1ed88 100644 (file)
@@ -133,7 +133,7 @@ void check (const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("transfer_system_02/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
index 411f2a58c6d9b012858bdebc63ed59454efe833f..92bf2711ab938565c0a7300da2972bacb7cf2590 100644 (file)
@@ -134,7 +134,7 @@ void check (const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("transfer_system_03/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
index 1234a8d9f19c4311778eff7d005f9578c24b75a0..0b5a3b093d115d22b5f10696a8d70f6ab9c6bfac 100644 (file)
@@ -134,7 +134,7 @@ void check (const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("transfer_system_04/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
index b81f3d88ec5373bc89cd083c93285948489adb8a..731f7a5c86dbc356a46776500a1ac7ab6c968fb6 100644 (file)
@@ -124,7 +124,7 @@ void check (const FiniteElement<dim> &fe, const unsigned int selected_block)
 
 int main()
 {
-  std::ofstream logfile("transfer_system_05/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
index 6b9e1c1a7086b88acce53d4ff2bf882cc1daef15..9a24dc704cbc0b545aa9606b1d981d9cd8642ce0 100644 (file)
@@ -161,7 +161,7 @@ void check (const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("transfer_system_adaptive_01/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
index 379ece26959ce17a41ad38876bd3a736fcc959ba..ede711bea343730db273e59b60b178b87c4eb9bd 100644 (file)
@@ -170,7 +170,7 @@ void check (const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("transfer_system_adaptive_02/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
index ed1243f81ee131b752b792e37051a400ceb996c3..88d93399ac8b9a1443f3efeb95faf4da853ca10c 100644 (file)
@@ -163,7 +163,7 @@ void check (const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("transfer_system_adaptive_03/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
index 9936f01ce92d61756e1b998de60ade45b8bb5fdc..950e8d8f0bc8d167a694a889d1ef7448a46c1a13 100644 (file)
@@ -172,7 +172,7 @@ void check (const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("transfer_system_adaptive_04/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
index eecee130a36b63764a77f42e15195dc8e855571f..853713dda7ef0f400cd342f2879f100ca51e8a24 100644 (file)
@@ -167,7 +167,7 @@ void check (const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("transfer_system_adaptive_05/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
index 11b281a4b5b81621cff60cc1e0eeb4cabaa54740..8059004152338e888944cdc5664d37a1a9a1cbe8 100644 (file)
@@ -174,7 +174,7 @@ void check (const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("transfer_system_adaptive_06/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
index ffbeb5729f5a813befe9593492f374ee34853d48..aa1cd97312518831cda77a4d1e7dc4050441c9af 100644 (file)
@@ -174,7 +174,7 @@ void check (const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("transfer_system_adaptive_07/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
index 37e5c3be8a2e19e0af602a8656a51ec157c9453e..29f30addc3eed47bbd9cf414594a5dc7d50b4781 100644 (file)
@@ -181,7 +181,7 @@ void check (const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("transfer_system_adaptive_08/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
index 7534013357301fdea9e8bc47e4c9db18a3e3eac1..3d25ca3beea4db6faa212ea378e28982ef55f076 100644 (file)
@@ -167,7 +167,7 @@ void check (const FiniteElement<dim> &fe, const unsigned int selected_block)
 
 int main()
 {
-  std::ofstream logfile("transfer_system_adaptive_09/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);

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.