Fix tester.

.travis.yml

@@ -12,10 +12,9 @@ notifications:
 language: cpp 
 
 before_install:
-  - test -d build-travis || mkdir build-travis; sudo chown -R 1000:1000 build-travis
-  - test -d ./scripts/programs || ./scripts/dr.sh "cd deal2lkit; ./scripts/download_clang_format"
-  - ./scripts/dr.sh "cd deal2lkit; ./scripts/check_indentation.sh"
+  - test -d build-travis || mkdir build-travis
+  - ./scripts/dr.sh "./scripts/check_indentation.sh"
 
 script:
-  - ./scripts/dr.sh "cd deal2lkit/build-travis; cmake -DD2K_ENABLE_TESTING=ON -DD2K_COMPONENT_DOCUMENTATION=OFF -DCMAKE_BUILD_TYPE=$BUILD_TYPE ..; make -j4"
-  - ./scripts/dr.sh "cd deal2lkit/build-travis; make setup_tests; ctest -j4 -V"
+  - ./scripts/dr.sh "cd build-travis; cmake -DD2K_ENABLE_TESTING=ON -DD2K_COMPONENT_DOCUMENTATION=OFF -DCMAKE_BUILD_TYPE=$BUILD_TYPE ..; make -j4"
+  - ./scripts/dr.sh "cd build-travis; make setup_tests; ctest -j4 -V"

docker/Makefile

@@ -11,7 +11,7 @@ locks/base.%: Dockerfile.base.%
 	touch locks/base.$*
 
 locks/deal2lkit.%: Dockerfile.deal2lkit.%
-	docker build -t mathlab/deal2lkit:$*-debugrelease -f Dockerfile.deal2lkit.$* .
+	docker build --build-arg VER=$* -t mathlab/deal2lkit:$*-debugrelease -f Dockerfile.deal2lkit.$* .
 	touch locks/deal2lkit.$*
 
 push-%: locks/base.% locks/deal2lkit.%

examples/CMakeLists.txt

@@ -39,7 +39,6 @@ IF(D2K_COMPONENT_EXAMPLES)
     # All CMakeLists.txt except the one in examples/
     #
     PATTERN "poisson/CMakeLists.txt"
-    PATTERN "assimp_importer/CMakeLists.txt"
     PATTERN "heat_equation/CMakeLists.txt"
     PATTERN "heat_equation/tests/CMakeLists.txt"
     PATTERN "dynamic_stokes/CMakeLists.txt"

examples/heat_equation/include/heat_ida.h

@@ -13,49 +13,48 @@
 //
 //-----------------------------------------------------------
 
-#ifndef _d2k_heat_ida_h
-#define _d2k_heat_ida_h
+#ifndef d2k_heat_ida_h
+#define d2k_heat_ida_h
 
-#include <deal2lkit/config.h>
+#include <deal.II/base/index_set.h>
+#include <deal.II/base/parsed_convergence_table.h>
+#include <deal.II/base/timer.h>
 
-#ifdef D2K_WITH_SUNDIALS
-#  include <deal.II/base/index_set.h>
-#  include <deal.II/base/timer.h>
+#include <deal.II/dofs/dof_handler.h>
 
-#  include <deal.II/dofs/dof_handler.h>
+#include <deal.II/lac/block_sparsity_pattern.h>
+#include <deal.II/lac/constraint_matrix.h>
+#include <deal.II/lac/sparsity_tools.h>
+#include <deal.II/lac/trilinos_precondition.h>
+#include <deal.II/lac/trilinos_sparse_matrix.h>
+#include <deal.II/lac/trilinos_vector.h>
 
-#  include <deal.II/lac/block_sparsity_pattern.h>
-#  include <deal.II/lac/constraint_matrix.h>
-#  include <deal.II/lac/sparsity_tools.h>
-#  include <deal.II/lac/trilinos_precondition.h>
-#  include <deal.II/lac/trilinos_sparse_matrix.h>
-#  include <deal.II/lac/trilinos_vector.h>
+#include <deal.II/numerics/error_estimator.h>
 
-#  include <deal.II/numerics/error_estimator.h>
+#include <deal.II/sundials/ida.h>
 
-#  include <deal2lkit/error_handler.h>
-#  include <deal2lkit/ida_interface.h>
-#  include <deal2lkit/parameter_acceptor.h>
-#  include <deal2lkit/parsed_data_out.h>
-#  include <deal2lkit/parsed_dirichlet_bcs.h>
-#  include <deal2lkit/parsed_finite_element.h>
-#  include <deal2lkit/parsed_function.h>
-#  include <deal2lkit/parsed_grid_generator.h>
-#  include <deal2lkit/parsed_grid_refinement.h>
-#  include <deal2lkit/parsed_solver.h>
-#  include <mpi.h>
-#  include <stdio.h>
-#  include <stdlib.h>
+#include <deal2lkit/config.h>
+#include <deal2lkit/parameter_acceptor.h>
+#include <deal2lkit/parsed_data_out.h>
+#include <deal2lkit/parsed_dirichlet_bcs.h>
+#include <deal2lkit/parsed_finite_element.h>
+#include <deal2lkit/parsed_grid_generator.h>
+#include <deal2lkit/parsed_grid_refinement.h>
+#include <deal2lkit/parsed_solver.h>
+#include <mpi.h>
+#include <stdio.h>
+#include <stdlib.h>
 
-#  include <fstream>
+#include <fstream>
 
 
 using namespace dealii;
 using namespace deal2lkit;
 
-typedef TrilinosWrappers::MPI::Vector VEC;
+using VEC = TrilinosWrappers::MPI::Vector;
+
 template <int dim>
-class Heat : public ParameterAcceptor
+class Heat : public deal2lkit::ParameterAcceptor
 {
 public:
   Heat(const MPI_Comm comm);
@@ -141,7 +140,7 @@ class Heat : public ParameterAcceptor
 
   const MPI_Comm comm;
 
-  unsigned int initial_global_refinement;
+  unsigned int initial_global_refinement = 4;
   unsigned int max_time_iterations;
 
   std::string timer_file_name;
@@ -150,13 +149,13 @@ class Heat : public ParameterAcceptor
   std::ofstream      timer_outfile;
   ConditionalOStream tcout;
 
-  shared_ptr<Mapping<dim, dim>> mapping;
+  std::unique_ptr<Mapping<dim, dim>> mapping;
 
-  shared_ptr<parallel::distributed::Triangulation<dim, dim>> triangulation;
-  shared_ptr<FiniteElement<dim, dim>>                        fe;
-  shared_ptr<DoFHandler<dim, dim>>                           dof_handler;
+  std::unique_ptr<parallel::distributed::Triangulation<dim, dim>> triangulation;
+  std::unique_ptr<FiniteElement<dim, dim>>                        fe;
+  std::unique_ptr<DoFHandler<dim, dim>>                           dof_handler;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   TrilinosWrappers::SparsityPattern jacobian_matrix_sp;
   TrilinosWrappers::SparseMatrix    jacobian_matrix;
@@ -172,23 +171,23 @@ class Heat : public ParameterAcceptor
 
   mutable TimerOutput computing_timer;
 
-  ErrorHandler<dim>             eh;
+  ParsedConvergenceTable        convergence_table;
   ParsedGridGenerator<dim, dim> pgg;
   ParsedGridRefinement          pgr;
   ParsedFiniteElement<dim, dim> fe_builder;
 
-  ParsedFunction<dim> exact_solution;
-  ParsedFunction<dim> forcing_term;
-
-  ParsedFunction<dim>          initial_solution;
-  ParsedFunction<dim>          initial_solution_dot;
-  ParsedDirichletBCs<dim, dim> dirichlet_bcs;
+  ParameterAcceptorProxy<Functions::ParsedFunction<dim>> exact_solution;
+  ParameterAcceptorProxy<Functions::ParsedFunction<dim>> forcing_term;
+  ParameterAcceptorProxy<Functions::ParsedFunction<dim>> initial_solution;
+  ParameterAcceptorProxy<Functions::ParsedFunction<dim>> initial_solution_dot;
+  ParsedDirichletBCs<dim, dim>                           dirichlet_bcs;
 
   ParsedDataOut<dim, dim> data_out;
 
   ParsedSolver<VEC> Ainv;
 
-  IDAInterface<VEC> ida;
+  SUNDIALS::IDA<VEC>::AdditionalData ida_parameters;
+  SUNDIALS::IDA<VEC>                 ida;
 
   IndexSet global_partitioning;
   IndexSet partitioning;
@@ -201,5 +200,3 @@ class Heat : public ParameterAcceptor
 };
 
 #endif
-
-#endif