template <int dim>
void
-test_simple(MGDoFHandler<dim>& mgdofs, bool faces)
+test_simple(DoFHandler<dim>& dofs, bool faces)
{
TrilinosWrappers::SparsityPattern pattern;
TrilinosWrappers::SparseMatrix matrix;
- const DoFHandler<dim>& dofs = mgdofs;
const FiniteElement<dim>& fe = dofs.get_fe();
pattern.reinit (dofs.n_dofs(), dofs.n_dofs(),
(GeometryInfo<dim>::faces_per_cell
std_cxx1x::bind (&Local<dim>::bdry, local, std_cxx1x::_1, std_cxx1x::_2),
std_cxx1x::bind (&Local<dim>::face, local, std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::_3, std_cxx1x::_4),
assembler, true);
-
+
+ matrix.compress();
matrix.print(deallog.get_file_stream());
}
void
test(const FiniteElement<dim>& fe)
{
- Triangulation<dim> tr;
+ parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD,
+ Triangulation<dim>::none/*,
+ parallel::distributed::Triangulation<dim>::construct_multigrid_hierarchy*/);
GridGenerator::hyper_cube(tr);
tr.refine_global(2);
- // tr.begin(1)->set_refine_flag();
- // tr.execute_coarsening_and_refinement();
- // tr.begin(2)->set_refine_flag();
- // tr.execute_coarsening_and_refinement();
-// tr.refine_global(1);
+ //tr.begin_active()->set_refine_flag();
+ //tr.execute_coarsening_and_refinement();
+
deallog << "Triangulation levels";
for (unsigned int l=0;l<tr.n_levels();++l)
deallog << ' ' << l << ':' << tr.n_cells(l);
cell != tr.end(); ++cell, ++cn)
cell->set_user_index(cn);
- MGDoFHandler<dim> dofs(tr);
+ DoFHandler<dim> dofs(tr);
dofs.distribute_dofs(fe);
dofs.initialize_local_block_info();
- deallog << "DoFHandler " << dofs.n_dofs() << " levels";
- for (unsigned int l=0;l<tr.n_levels();++l)
- deallog << ' ' << l << ':' << dofs.n_dofs(l);
- deallog << std::endl;
+ deallog << "DoFHandler " << dofs.n_dofs() << std::endl;
test_simple(dofs, false);
deallog << "now with jump terms" << std::endl;
int main (int argc, char** argv)
{
Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
- mpi_initlog(__FILE__);
+ MPILogInitAll i(__FILE__);
FE_DGP<2> p0(0);
FE_Q<2> q1(1);
-DEAL::Triangulation levels 0:1 1:4 2:16
-DEAL::DoFHandler 16 levels 0:1 1:4 2:16
+DEAL:0::Triangulation levels 0:1 1:4 2:16
+DEAL:0::DoFHandler 16
(0,0) 10.0000
(0,1) 0.00000
(0,2) 0.00000
(15,13) 0.00000
(15,14) 0.00000
(15,15) 10.0000
-DEAL::now with jump terms
+DEAL:0::now with jump terms
(0,0) 14.0000
(0,1) -1.00000
(0,2) -1.00000
(15,13) -1.00000
(15,14) -1.00000
(15,15) 14.0000
-DEAL::Triangulation levels 0:1 1:4 2:16
-DEAL::DoFHandler 25 levels 0:4 1:9 2:25
+DEAL:0::Triangulation levels 0:1 1:4 2:16
+DEAL:0::DoFHandler 25
(0,0) 10.0000
(0,1) 10.0000
(0,2) 10.0000
(24,22) 10.0000
(24,23) 10.0000
(24,24) 10.0000
-DEAL::now with jump terms
+DEAL:0::now with jump terms
(0,0) 14.0000
(0,1) 13.0000
(0,2) 13.0000
(24,22) 13.0000
(24,23) 13.0000
(24,24) 14.0000
-DEAL::Triangulation levels 0:1 1:4 2:16
-DEAL::DoFHandler 41 levels 0:5 1:13 2:41
+DEAL:0::Triangulation levels 0:1 1:4 2:16
+DEAL:0::DoFHandler 41
(0,0) 10.0000
(0,1) 10.0000
(0,2) 10.0000
(40,38) 0.00000
(40,39) 0.00000
(40,40) 10.0000
-DEAL::now with jump terms
+DEAL:0::now with jump terms
(0,0) 14.0000
(0,1) 13.0000
(0,2) 13.0000