Skip to content
Snippets Groups Projects
Commit c86ae651 authored by Oliver Sander's avatar Oliver Sander
Browse files

NewGeometryType 

[[Imported from SVN: r3930]]
parent 451ddc5a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
io/file/amiramesh/amirameshwriter.cc
+ 1
− 1
View file @ c86ae651
......@@ -30,7 +30,7 @@ void Dune::AmiraMeshWriter<GridType>::writeGrid(const GridType& grid,
? ((containsOnlySimplices) ? 4 : 8)
: ((containsOnlySimplices) ? 3 : 4);
int noOfNodes = leafIndexSet.size(dim, vertex);
int noOfNodes = leafIndexSet.size(dim);
int noOfElem = leafIndexSet.size(0);
// create amiramesh object
......
io/file/amiramesh/amuggridreader.cc
+ 9
− 9
View file @ c86ae651
......@@ -245,7 +245,7 @@ void Dune::AmiraMeshReader<Dune::UGGrid<3,3> >::buildGrid(UGGrid<3,3>& grid,
for (int j=0; j<numberOfCorners; j++)
cornerIDs[j] = elemData[numberOfCorners*i+j]-1;
grid.insertElement(simplex, cornerIDs);
grid.insertElement(NewGeometryType(NewGeometryType::simplex,3), cornerIDs);
} else {
......@@ -262,7 +262,7 @@ void Dune::AmiraMeshReader<Dune::UGGrid<3,3> >::buildGrid(UGGrid<3,3>& grid,
cornerIDs[2] = thisElem[2]-1;
cornerIDs[3] = thisElem[4]-1;
grid.insertElement(simplex, cornerIDs);
grid.insertElement(NewGeometryType(NewGeometryType::simplex,3), cornerIDs);
}else if (thisElem[4]==thisElem[5] && thisElem[5]==thisElem[6]
&& thisElem[6]==thisElem[7]) {
......@@ -276,7 +276,7 @@ void Dune::AmiraMeshReader<Dune::UGGrid<3,3> >::buildGrid(UGGrid<3,3>& grid,
cornerIDs[3] = thisElem[3]-1;
cornerIDs[4] = thisElem[4]-1;
grid.insertElement(pyramid, cornerIDs);
grid.insertElement(NewGeometryType(NewGeometryType::pyramid,3), cornerIDs);
} else if (thisElem[1]==thisElem[2] && thisElem[5]==thisElem[6]) {
......@@ -290,7 +290,7 @@ void Dune::AmiraMeshReader<Dune::UGGrid<3,3> >::buildGrid(UGGrid<3,3>& grid,
cornerIDs[4] = thisElem[5]-1;
cornerIDs[5] = thisElem[7]-1;
grid.insertElement(prism, cornerIDs);
grid.insertElement(NewGeometryType(NewGeometryType::prism,3), cornerIDs);
} else if (thisElem[2]==thisElem[3] && thisElem[6]==thisElem[7]) {
......@@ -303,7 +303,7 @@ void Dune::AmiraMeshReader<Dune::UGGrid<3,3> >::buildGrid(UGGrid<3,3>& grid,
cornerIDs[4] = thisElem[5]-1;
cornerIDs[5] = thisElem[6]-1;
grid.insertElement(prism, cornerIDs);
grid.insertElement(NewGeometryType(NewGeometryType::prism,3), cornerIDs);
} else {
......@@ -319,7 +319,7 @@ void Dune::AmiraMeshReader<Dune::UGGrid<3,3> >::buildGrid(UGGrid<3,3>& grid,
cornerIDs[6] = elemData[numberOfCorners*i+7]-1;
cornerIDs[7] = elemData[numberOfCorners*i+6]-1;
grid.insertElement(cube, cornerIDs);
grid.insertElement(NewGeometryType(NewGeometryType::cube,3), cornerIDs);
}
......@@ -423,7 +423,7 @@ void Dune::AmiraMeshReader<Dune::UGGrid<2,2> >::read(Dune::UGGrid<2,2>& grid,
cornerIDs[1] = elemData[3*i+1]-1;
cornerIDs[2] = elemData[3*i+2]-1;
grid.insertElement(simplex, cornerIDs);
grid.insertElement(NewGeometryType(NewGeometryType::simplex,2), cornerIDs);
} else {
......@@ -436,7 +436,7 @@ void Dune::AmiraMeshReader<Dune::UGGrid<2,2> >::read(Dune::UGGrid<2,2>& grid,
cornerIDs[1] = elemData[4*i+1]-1;
cornerIDs[2] = elemData[4*i+2]-1;
grid.insertElement(simplex, cornerIDs);
grid.insertElement(NewGeometryType(NewGeometryType::simplex,2), cornerIDs);
} else {
......@@ -448,7 +448,7 @@ void Dune::AmiraMeshReader<Dune::UGGrid<2,2> >::read(Dune::UGGrid<2,2>& grid,
cornerIDs[2] = elemData[4*i+3]-1;
cornerIDs[3] = elemData[4*i+2]-1;
grid.insertElement(cube, cornerIDs);
grid.insertElement(NewGeometryType(NewGeometryType::cube,2), cornerIDs);
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment