]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Testsuite: Remove mumps related tests
authorMatthias Maier <tamiko@kyomu.43-1.org>
Sun, 11 Jan 2015 14:16:12 +0000 (15:16 +0100)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Sun, 11 Jan 2015 14:17:01 +0000 (15:17 +0100)
tests/CMakeLists.txt
tests/mumps/CMakeLists.txt [deleted file]
tests/mumps/mumps_01.cc [deleted file]
tests/mumps/mumps_01.output [deleted file]
tests/mumps/mumps_02.cc [deleted file]
tests/mumps/mumps_02.output [deleted file]
tests/run_testsuite.cmake

index 67678d6fabb58bc42161f663506549ca46a628da..6879a5caf3467bab1b884f4cbf11290735f8348d 100644 (file)
@@ -1,6 +1,6 @@
 ## ---------------------------------------------------------------------
 ##
-## Copyright (C) 2013 - 2014 by the deal.II authors
+## Copyright (C) 2013 - 2015 by the deal.II authors
 ##
 ## This file is part of the deal.II library.
 ##
@@ -61,8 +61,8 @@ ENDFOREACH()
 SET(_categories
   a-framework algorithms all-headers aniso arpack base bits build_tests
   codim_one deal.II distributed_grids fe gla grid hp integrators lac lapack
-  manifold matrix_free mesh_converter metis mpi multigrid mumps opencascade
-  petsc serialization slepc trilinos umfpack
+  manifold matrix_free mesh_converter metis mpi multigrid opencascade petsc
+  serialization slepc trilinos umfpack
   )
 
 #
diff --git a/tests/mumps/CMakeLists.txt b/tests/mumps/CMakeLists.txt
deleted file mode 100644 (file)
index a6be545..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
-INCLUDE(${DEAL_II_SOURCE_DIR}/tests/setup_testsubproject.cmake)
-PROJECT(testsuite CXX)
-INCLUDE(${DEAL_II_TARGET_CONFIG})
-IF(DEAL_II_WITH_MUMPS)
-  DEAL_II_PICKUP_TESTS()
-ENDIF()
diff --git a/tests/mumps/mumps_01.cc b/tests/mumps/mumps_01.cc
deleted file mode 100644 (file)
index 1904495..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-// ---------------------------------------------------------------------
-//
-// Copyright (C) 2002 - 2013 by the deal.II authors
-//
-// This file is part of the deal.II library.
-//
-// The deal.II library is free software; you can use it, redistribute
-// it, and/or modify it under the terms of the GNU Lesser General
-// Public License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-// The full text of the license can be found in the file LICENSE at
-// the top level of the deal.II distribution.
-//
-// ---------------------------------------------------------------------
-
-
-// test the mumps sparse direct solver on a mass matrix
-// - check several ways to solve
-
-#include "../tests.h"
-#include <iostream>
-#include <fstream>
-#include <cstdlib>
-
-#include <deal.II/base/quadrature_lib.h>
-#include <deal.II/base/function.h>
-
-#include <deal.II/fe/fe_q.h>
-#include <deal.II/fe/fe_values.h>
-
-#include <deal.II/dofs/dof_tools.h>
-
-#include <deal.II/lac/sparse_matrix.h>
-#include <deal.II/lac/sparsity_pattern.h>
-#include <deal.II/lac/vector.h>
-#include <deal.II/lac/sparse_direct.h>
-
-#include <deal.II/grid/tria.h>
-#include <deal.II/grid/grid_generator.h>
-
-#include <deal.II/numerics/vector_tools.h>
-#include <deal.II/numerics/matrix_tools.h>
-
-
-void solve_and_check(const SparseMatrix<double> & M,
-                    const Vector<double> & rhs,
-                    const Vector<double> & solution)
-{
-  {
-    SparseDirectMUMPS solver;
-    solver.initialize (M);
-    Vector<double> dst(rhs.size());
-    solver.vmult(dst, rhs);
-    dst -= solution;
-    Assert(dst.l2_norm() < 1e-9, ExcInternalError());
-  }
-  {
-    SparseDirectMUMPS solver;
-    solver.initialize (M, rhs);
-    Vector<double> dst(rhs.size());
-    solver.solve(dst);
-    dst -= solution;
-    Assert(dst.l2_norm() < 1e-9, ExcInternalError());
-  }
-}
-
-
-
-template <int dim>
-void test ()
-{
-  deallog << dim << 'd' << std::endl;
-
-  Triangulation<dim> tria;
-  GridGenerator::hyper_cube (tria,0,1);
-  tria.refine_global (1);
-
-  // destroy the uniformity of the matrix by
-  // refining one cell
-  tria.begin_active()->set_refine_flag ();
-  tria.execute_coarsening_and_refinement ();
-  tria.refine_global(8-2*dim);
-
-  FE_Q<dim> fe (1);
-  DoFHandler<dim> dof_handler (tria);
-  dof_handler.distribute_dofs (fe);
-
-  deallog << "Number of dofs = " << dof_handler.n_dofs() << std::endl;
-
-  SparsityPattern sparsity_pattern;
-  sparsity_pattern.reinit (dof_handler.n_dofs(),
-                           dof_handler.n_dofs(),
-                           dof_handler.max_couplings_between_dofs());
-  DoFTools::make_sparsity_pattern (dof_handler, sparsity_pattern);
-  sparsity_pattern.compress ();
-
-  SparseMatrix<double> B;
-  B.reinit (sparsity_pattern);
-
-  QGauss<dim> qr (2);
-  MatrixTools::create_mass_matrix (dof_handler, qr, B);
-
-  // compute a decomposition of the matrix
-  SparseDirectMUMPS Binv;
-  Binv.initialize (B);
-
-  // for a number of different solution
-  // vectors, make up a matching rhs vector
-  // and check what the solver finds
-  for (unsigned int i=0; i<3; ++i)
-    {
-      Vector<double> solution (dof_handler.n_dofs());
-      Vector<double> x (dof_handler.n_dofs());
-      Vector<double> b (dof_handler.n_dofs());
-
-      for (unsigned int j=0; j<dof_handler.n_dofs(); ++j)
-        solution(j) = j+j*(i+1)*(i+1);
-
-      B.vmult (b, solution);
-
-      Binv.vmult (x,b);
-
-      x -= solution;
-      deallog << "relative norm distance = "
-              << x.l2_norm() / solution.l2_norm()
-              << std::endl;
-      deallog << "absolute norms = "
-              << x.l2_norm() << ' ' << solution.l2_norm()
-              << std::endl;
-      Assert (x.l2_norm() / solution.l2_norm() < 1e-8,
-              ExcInternalError());
-
-      
-                                      //also check solving in different ways:
-      solve_and_check(B, b, solution);
-    }
-}
-
-
-int main (int argc, char **argv)
-{
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
-
-  initlog();
-  
-  test<1> ();
-  test<2> ();
-  test<3> ();
-}
diff --git a/tests/mumps/mumps_01.output b/tests/mumps/mumps_01.output
deleted file mode 100644 (file)
index bb98ce4..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-
-DEAL::1d
-DEAL::Number of dofs = 193
-DEAL::relative norm distance = 2.06357e-16
-DEAL::absolute norms = 6.36406e-13 3084.00
-DEAL::relative norm distance = 2.28670e-16
-DEAL::absolute norms = 1.76304e-12 7709.99
-DEAL::relative norm distance = 2.28670e-16
-DEAL::absolute norms = 3.52609e-12 15420.0
-DEAL::2d
-DEAL::Number of dofs = 1889
-DEAL::relative norm distance = 5.07512e-16
-DEAL::absolute norms = 4.80941e-11 94764.3
-DEAL::relative norm distance = 5.30372e-16
-DEAL::absolute norms = 1.25651e-10 236911.
-DEAL::relative norm distance = 5.30372e-16
-DEAL::absolute norms = 2.51302e-10 473822.
-DEAL::3d
-DEAL::Number of dofs = 1333
-DEAL::relative norm distance = 1.33240e-15
-DEAL::absolute norms = 7.48349e-11 56165.6
-DEAL::relative norm distance = 1.27330e-15
-DEAL::absolute norms = 1.78789e-10 140414.
-DEAL::relative norm distance = 1.27330e-15
-DEAL::absolute norms = 3.57579e-10 280828.
diff --git a/tests/mumps/mumps_02.cc b/tests/mumps/mumps_02.cc
deleted file mode 100644 (file)
index 2bfaad2..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-// ---------------------------------------------------------------------
-//
-// Copyright (C) 2002 - 2013 by the deal.II authors
-//
-// This file is part of the deal.II library.
-//
-// The deal.II library is free software; you can use it, redistribute
-// it, and/or modify it under the terms of the GNU Lesser General
-// Public License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-// The full text of the license can be found in the file LICENSE at
-// the top level of the deal.II distribution.
-//
-// ---------------------------------------------------------------------
-
-
-// test the mumps sparse direct solver on a mass matrix
-
-#include "../tests.h"
-#include <iostream>
-#include <fstream>
-#include <cstdlib>
-
-#include <deal.II/base/quadrature_lib.h>
-#include <deal.II/base/function.h>
-
-#include <deal.II/fe/fe_q.h>
-#include <deal.II/fe/fe_values.h>
-
-#include <deal.II/dofs/dof_tools.h>
-
-#include <deal.II/lac/sparse_matrix.h>
-#include <deal.II/lac/sparsity_pattern.h>
-#include <deal.II/lac/vector.h>
-#include <deal.II/lac/sparse_direct.h>
-
-#include <deal.II/grid/tria.h>
-#include <deal.II/grid/grid_generator.h>
-
-#include <deal.II/numerics/vector_tools.h>
-#include <deal.II/numerics/matrix_tools.h>
-
-
-template <int dim>
-void test ()
-{
-  deallog << dim << 'd' << std::endl;
-
-  Triangulation<dim> tria;
-  GridGenerator::hyper_cube (tria,0,1);
-  tria.refine_global (1);
-
-  // destroy the uniformity of the matrix by
-  // refining one cell
-  tria.begin_active()->set_refine_flag ();
-  tria.execute_coarsening_and_refinement ();
-  tria.refine_global(8-2*dim);
-
-  FE_Q<dim> fe (1);
-  DoFHandler<dim> dof_handler (tria);
-  dof_handler.distribute_dofs (fe);
-
-  deallog << "Number of dofs = " << dof_handler.n_dofs() << std::endl;
-
-  SparsityPattern sparsity_pattern;
-  sparsity_pattern.reinit (dof_handler.n_dofs(),
-                           dof_handler.n_dofs(),
-                           dof_handler.max_couplings_between_dofs());
-  DoFTools::make_sparsity_pattern (dof_handler, sparsity_pattern);
-  sparsity_pattern.compress ();
-
-  SparseMatrix<double> B;
-  B.reinit (sparsity_pattern);
-
-  QGauss<dim> qr (2);
-  MatrixTools::create_mass_matrix (dof_handler, qr, B);
-
-  // for a number of different solution
-  // vectors, make up a matching rhs vector
-  // and check what the  solver finds
-  for (unsigned int i=0; i<3; ++i)
-    {
-      Vector<double> solution (dof_handler.n_dofs());
-      Vector<double> x (dof_handler.n_dofs());
-      Vector<double> b (dof_handler.n_dofs());
-
-      for (unsigned int j=0; j<dof_handler.n_dofs(); ++j)
-        solution(j) = j+j*(i+1)*(i+1);
-
-      B.vmult (b, solution);
-
-      SparseDirectMUMPS solver;
-      solver.initialize(B, b);
-      solver.solve(x);
-      
-      x -= solution;
-      deallog << "relative norm distance = "
-              << x.l2_norm() / solution.l2_norm()
-              << std::endl;
-      deallog << "absolute norms = "
-              << x.l2_norm() << ' ' << solution.l2_norm()
-              << std::endl;
-      Assert (x.l2_norm() / solution.l2_norm() < 1e-8,
-              ExcInternalError());
-    }
-}
-
-
-int main (int argc, char **argv)
-{
-  Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, numbers::invalid_unsigned_int);
-  
-  std::ofstream logfile("output");
-  deallog.attach(logfile);
-  deallog.depth_console(0);
-  deallog.threshold_double(1.e-9);
-
-  test<1> ();
-  test<2> ();
-  test<3> ();
-}
diff --git a/tests/mumps/mumps_02.output b/tests/mumps/mumps_02.output
deleted file mode 100644 (file)
index 8df3f88..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-
-DEAL::1d
-DEAL::Number of dofs = 193
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 0 3084.00
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 0 7709.99
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 0 15420.0
-DEAL::2d
-DEAL::Number of dofs = 1889
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 0 94764.3
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 0 236911.
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 0 473822.
-DEAL::3d
-DEAL::Number of dofs = 1333
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 0 56165.6
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 0 140414.
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 0 280828.
index 7339eaa1d5bb633aef5c381424dfad9bd906a0ee..124ef6249bf9aa2134118d025aedea9833e89135 100644 (file)
@@ -268,7 +268,7 @@ GET_CMAKE_PROPERTY(_variables VARIABLES)
 FOREACH(_var ${_variables})
   IF( _var MATCHES "^(TEST|DEAL_II|ALLOW|WITH|FORCE|COMPONENT)_" OR
       _var MATCHES "^(COMPAT_FILES|DOCUMENTATION|EXAMPLES|MESH_CONVERTER|PARAMETER_GUI)" OR
-      _var MATCHES "^(ARPACK|BOOST|OPENCASCADE|MUPARSER|HDF5|METIS|MPI|MUMPS)_" OR
+      _var MATCHES "^(ARPACK|BOOST|OPENCASCADE|MUPARSER|HDF5|METIS|MPI)_" OR
       _var MATCHES "^(NETCDF|P4EST|PETSC|SLEPC|THREADS|TBB|TRILINOS)_" OR
       _var MATCHES "^(UMFPACK|ZLIB|LAPACK|MUPARSER)_" OR
       _var MATCHES "^(CMAKE|DEAL_II)_(C|CXX|Fortran|BUILD)_(COMPILER|FLAGS)" OR

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.