Merge pull request #30 from nicola-giuliani/deal_9_1

luca-heltai · web-flow · commit 4e2ba13f0031 · 2018-10-24T09:51:59.000+02:00
Deal 9 1
diff --git a/include/ass_leg_function.h b/include/ass_leg_function.h
@@ -23,7 +23,7 @@
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/grid_in.h>
 #include <deal.II/grid/grid_out.h>
-#include <deal.II/grid/tria_boundary_lib.h>
+// #include <deal.II/grid/tria_boundary_lib.h>
 
 #include <deal.II/dofs/dof_handler.h>
 #include <deal.II/dofs/dof_accessor.h>
diff --git a/include/bem_problem.h b/include/bem_problem.h
@@ -49,7 +49,7 @@
 #include<deal.II/grid/grid_generator.h>
 #include<deal.II/grid/grid_in.h>
 #include<deal.II/grid/grid_out.h>
-#include<deal.II/grid/tria_boundary_lib.h>
+#include<deal.II/grid/manifold_lib.h>
 
 #include<deal.II/dofs/dof_handler.h>
 #include<deal.II/dofs/dof_accessor.h>
diff --git a/include/boundary_conditions.h b/include/boundary_conditions.h
@@ -22,7 +22,7 @@
 #include<deal.II/grid/grid_generator.h>
 #include<deal.II/grid/grid_in.h>
 #include<deal.II/grid/grid_out.h>
-#include<deal.II/grid/tria_boundary_lib.h>
+// #include<deal.II/grid/tria_boundary_lib.h>
 
 #include<deal.II/dofs/dof_handler.h>
 #include<deal.II/dofs/dof_accessor.h>
diff --git a/include/computational_domain.h b/include/computational_domain.h
@@ -29,7 +29,7 @@
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/grid_in.h>
 #include <deal.II/grid/grid_out.h>
-#include <deal.II/grid/tria_boundary_lib.h>
+// #include <deal.II/grid/tria_boundary_lib.h>
 #include <deal.II/grid/manifold_lib.h>
 
 #include <deal.II/dofs/dof_handler.h>
diff --git a/include/driver.h b/include/driver.h
@@ -35,7 +35,7 @@
 #include<deal.II/grid/grid_generator.h>
 #include<deal.II/grid/grid_in.h>
 #include<deal.II/grid/grid_out.h>
-#include<deal.II/grid/tria_boundary_lib.h>
+// #include<deal.II/grid/tria_boundary_lib.h>
 
 #include<deal.II/dofs/dof_handler.h>
 #include<deal.II/dofs/dof_accessor.h>
diff --git a/include/octree_block.h b/include/octree_block.h
@@ -23,7 +23,7 @@
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/grid_in.h>
 #include <deal.II/grid/grid_out.h>
-#include <deal.II/grid/tria_boundary_lib.h>
+// #include <deal.II/grid/tria_boundary_lib.h>
 
 #include <deal.II/dofs/dof_handler.h>
 #include <deal.II/dofs/dof_accessor.h>
diff --git a/source/computational_domain.cc b/source/computational_domain.cc
@@ -258,6 +258,8 @@ void ComputationalDomain<dim>::read_domain()
   //
   // manifold = new SphericalManifold<dim-1, dim>;
 
+  GridTools::copy_material_to_manifold_id(tria);
+
   if (input_grid_name == "../grids/coarse_sphere" || input_grid_name == "../grids/coarse_sphere_double_nodes" || input_grid_name == "../grids/circle" )
     {
       manifold = new SphericalManifold<dim-1, dim>;

Original file line number	Diff line number	Diff line change
`@@ -258,6 +258,8 @@ void ComputationalDomain<dim>::read_domain()`
`258`	`258`	`//`
`259`	`259`	`// manifold = new SphericalManifold<dim-1, dim>;`
`260`	`260`
	`261`	`+ GridTools::copy_material_to_manifold_id(tria);`
	`262`	`+`
`261`	`263`	`if (input_grid_name == "../grids/coarse_sphere" \|\| input_grid_name == "../grids/coarse_sphere_double_nodes" \|\| input_grid_name == "../grids/circle" )`
`262`	`264`	`{`
`263`	`265`	`manifold = new SphericalManifold<dim-1, dim>;`