]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Some more minor edits.
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Fri, 11 Feb 2011 04:06:56 +0000 (04:06 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Fri, 11 Feb 2011 04:06:56 +0000 (04:06 +0000)
git-svn-id: https://svn.dealii.org/trunk@23332 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/source/grid/grid_generator.cc

index b41268bdf04f724d725964d1c3c1c0f995ae3ec3..a3454f78319ccf92cbfa43e21b755992cacb4971 100644 (file)
@@ -2281,7 +2281,7 @@ GridGenerator::hyper_shell (Triangulation<3>& tria,
 
                                   // Start with the shell bounded by
                                   // two nested cubes
-  if (n <= 6)
+  if (n == 6)
     {
       for (unsigned int i=0;i<8;++i)
        vertices.push_back(p+hexahedron[i]*irad);
@@ -2305,11 +2305,13 @@ GridGenerator::hyper_shell (Triangulation<3>& tria,
            cells[i].vertices[j] = cell_vertices[i][j];
          cells[i].material_id = 0;
        }
+
+      tria.create_triangulation (vertices, cells, SubCellData());
     }
                                   // A more regular subdivision can
                                   // be obtained by two nested
                                   // rhombic dodecahedra
-  else if (n <= 12)
+  else if (n == 12)
     {
       for (unsigned int i=0;i<8;++i)
        vertices.push_back(p+hexahedron[i]*irad);
@@ -2346,16 +2348,14 @@ GridGenerator::hyper_shell (Triangulation<3>& tria,
            }
          cells[i].material_id = 0;
        }
+
+      tria.create_triangulation (vertices, cells, SubCellData());
     }
   else
     {
-      Assert(false, ExcIndexRange(n, 1, 12));
+      Assert(false, ExcMessage ("Invalid number of coarse mesh cells."));
     }
 
-  tria.create_triangulation (vertices, cells,
-                            SubCellData());       // no boundary
-                                                  // information
-
   if (colorize)
     colorize_hyper_shell(tria, p, inner_radius, outer_radius);
 }

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.