]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Added test and fixed 1d issue. 784/head
authorLuca Heltai <luca.heltai@sissa.it>
Sun, 12 Apr 2015 17:54:14 +0000 (19:54 +0200)
committerLuca Heltai <luca.heltai@sissa.it>
Sun, 12 Apr 2015 17:54:14 +0000 (19:54 +0200)
source/grid/grid_generator.cc
tests/grid/grid_generator_08.cc
tests/grid/grid_generator_08.output

index b4cb0578ad6668986b60c0181cc1baec8846753e..5dd92b5e48cef4649a4d0cb8ba633e6839523aa7 100644 (file)
@@ -83,13 +83,14 @@ namespace GridGenerator
 
 
 
+    template<int spacedim>
     void
-    colorize_subdivided_hyper_rectangle (Triangulation<1> &tria,
-                                         const Point<1> &,
-                                         const Point<1> &,
+    colorize_subdivided_hyper_rectangle (Triangulation<1,spacedim> &tria,
+                                         const Point<spacedim> &,
+                                         const Point<spacedim> &,
                                          const double)
     {
-      for (Triangulation<1>::cell_iterator cell = tria.begin();
+      for (typename Triangulation<1,spacedim>::cell_iterator cell = tria.begin();
            cell != tria.end(); ++cell)
         if (cell->center()(0) > 0)
           cell->set_material_id(1);
index 740b483ea5d2d65393fdf8904f2ed745a5d50c36..9df022f024aa8e90aeeed01b3d49cc7aa750450b 100644 (file)
@@ -93,12 +93,12 @@ int main()
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-//  deallog.push("1d");
-//  test<1,2>(logfile);
-//  deallog.pop();
-//  deallog.push("2d");
-//  test<1,3>(logfile);
-//  deallog.pop();
+  deallog.push("1-2");
+  test<1,2>(logfile);
+  deallog.pop();
+  deallog.push("1-3");
+  test<1,3>(logfile);
+  deallog.pop();
   deallog.push("2-3");
   test<2,3>(logfile);
   deallog.pop();
index 455c752ba97ecf871488fb6dbf333201630b3f4d..4844213b23119290e08be75cb43f9a83918df1c3 100644 (file)
@@ -1,4 +1,96 @@
 
+DEAL:1-2::hyper_cube
+$NOD
+2
+1  3.00000 0.00000 0
+2  7.00000 0.00000 0
+$ENDNOD
+$ELM
+1
+1 1 0 0 2 1 2 
+$ENDELM
+DEAL:1-2::subdivided_hyper_cube
+$NOD
+4
+1  1.00000 0.00000 0
+2  3.00000 0.00000 0
+3  5.00000 0.00000 0
+4  7.00000 0.00000 0
+$ENDNOD
+$ELM
+3
+1 1 0 0 2 1 2 
+2 1 0 0 2 2 3 
+3 1 0 0 2 3 4 
+$ENDELM
+DEAL:1-2::hyper_rectangle
+$NOD
+2
+1  2.00000 0.00000 0
+2  3.00000 0.00000 0
+$ENDNOD
+$ELM
+1
+1 1 0 0 2 1 2 
+$ENDELM
+DEAL:1-2::subdivided_hyper_rectangle
+$NOD
+3
+1  2.00000 0.00000 0
+2  2.50000 0.00000 0
+3  3.00000 0.00000 0
+$ENDNOD
+$ELM
+2
+1 1 1 0 2 1 2 
+2 1 1 0 2 2 3 
+$ENDELM
+DEAL:1-3::hyper_cube
+$NOD
+2
+1  3.00000 0.00000 0.00000
+2  7.00000 0.00000 0.00000
+$ENDNOD
+$ELM
+1
+1 1 0 0 2 1 2 
+$ENDELM
+DEAL:1-3::subdivided_hyper_cube
+$NOD
+4
+1  1.00000 0.00000 0.00000
+2  3.00000 0.00000 0.00000
+3  5.00000 0.00000 0.00000
+4  7.00000 0.00000 0.00000
+$ENDNOD
+$ELM
+3
+1 1 0 0 2 1 2 
+2 1 0 0 2 2 3 
+3 1 0 0 2 3 4 
+$ENDELM
+DEAL:1-3::hyper_rectangle
+$NOD
+2
+1  2.00000 0.00000 0.00000
+2  3.00000 0.00000 0.00000
+$ENDNOD
+$ELM
+1
+1 1 0 0 2 1 2 
+$ENDELM
+DEAL:1-3::subdivided_hyper_rectangle
+$NOD
+3
+1  2.00000 0.00000 0.00000
+2  2.50000 0.00000 0.00000
+3  3.00000 0.00000 0.00000
+$ENDNOD
+$ELM
+2
+1 1 1 0 2 1 2 
+2 1 1 0 2 2 3 
+$ENDELM
 DEAL:2-3::hyper_cube
 $NOD
 4

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.