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

read grids in a parallel setting 

[[Imported from SVN: r1730]]
parent 742cb281
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
io/file/amiramesh/amuggridreader.cc
+ 28
− 45
View file @ 1e9e03de
......@@ -82,14 +82,6 @@ static int SegmentDescriptionByAmira(void *data, double *param, double *result)
barCoords[0] += b[0];
barCoords[1] += b[1];
#ifndef NDEBUG
const float eps = 1e-6;
if (barCoords[0]<-eps || barCoords[1]<-eps || (1-barCoords[0]-barCoords[1])<-eps) {
printf("Illegal barycentric coordinate\n");
assert(false);
}
#endif
AmiraCallPositionParametrizationForDomain(domainNum, triNum, barCoords, result);
return 0;
......@@ -511,10 +503,8 @@ void Dune::AmiraMeshReader<Dune::UGGrid<3,3> >::read(Dune::UGGrid<3,3>& grid,
DUNE_THROW(IOError, "Could not open AmiraMesh file" << filename);
if (am->findData("Hexahedra", HxINT32, 8, "Nodes")) {
//readHexaGrid(grid, am);
std::cout << "This is the AmiraMesh HexaGrid reader for UGGrid<3,3>!" << std::endl;
//loaddomain $file @PARA_FILE $name @DOMAIN
// Load a domain from an AmiraMesh hexagrid file
createHexaDomain(grid, am);
} else {
......@@ -548,10 +538,7 @@ void Dune::AmiraMeshReader<Dune::UGGrid<3,3> >::read(Dune::UGGrid<3,3>& grid,
if (am->findData("Hexahedra", HxINT32, 8, "Nodes")) {
//readHexaGrid(grid, am);
std::cout << "This is the AmiraMesh HexaGrid reader for UGGrid<3,3>!" << std::endl;
//loaddomain $file @PARA_FILE $name @DOMAIN
// Create a domain from an AmiraMesh hexagrid file
createHexaDomain(grid, am);
} else {
......@@ -576,6 +563,16 @@ void Dune::AmiraMeshReader<Dune::UGGrid<3,3> >::buildGrid(UGGrid<3,3>& grid, Ami
// call configureCommand and newCommand
grid.makeNewUGMultigrid();
// If we are in a parallel setting and we are _not_ the master
// process we can exit here.
#ifdef ModelP
if (me!=0) {
delete(am);
grid.createend();
return;
}
#endif
// ////////////////////////////////////////////
// loadmesh $file @GRID_FILE $name @DOMAIN;
......@@ -616,21 +613,11 @@ void Dune::AmiraMeshReader<Dune::UGGrid<3,3> >::buildGrid(UGGrid<3,3>& grid, Ami
int maxBndNodeID = -1;
for (theNode=UG_NS<3>::FirstNode(grid.multigrid_->grids[0]); theNode!=NULL; theNode=theNode->succ)
{
// The following two lines ought to be in here, but the
// OBJT macros is somewhat complicated, so I leave it out
// for the time being.
// if(OBJT(theNode->myvertex) == UG3d::IVOBJ)
// UserWriteF("Warning: Node %d is inner node\n", ID(theNode));
maxBndNodeID = std::max(theNode->id, maxBndNodeID);
}
std::cout << "Already " << maxBndNodeID+1 << " nodes existing\n";
int noOfBndNodes = maxBndNodeID;
int noOfNodes = am->nElements("Nodes");
std::cout << "AmiraMesh has " << noOfNodes << " total nodes." << std::endl;
......@@ -648,8 +635,7 @@ void Dune::AmiraMeshReader<Dune::UGGrid<3,3> >::buildGrid(UGGrid<3,3>& grid, Ami
nodePos[2] = am_node_coordinates_double[3*i+2];
}
/// \todo Warum ist nicht UG3d::InsertInnerNode Pflicht???
if (InsertInnerNode(grid.multigrid_->grids[0], nodePos) == NULL)
if (UG3d::InsertInnerNode(grid.multigrid_->grids[0], nodePos) == NULL)
DUNE_THROW(IOError, "inserting an inner node failed");
}
......@@ -674,9 +660,9 @@ void Dune::AmiraMeshReader<Dune::UGGrid<3,3> >::buildGrid(UGGrid<3,3>& grid, Ami
for (int j=0; j<numberOfCorners; j++)
cornerIDs[j] = elemData[numberOfCorners*i+j]-1;
/// \todo Warum ist nicht UG3d::InsertElementFromIDs Pflicht???
if (InsertElementFromIDs(grid.multigrid_->grids[0], numberOfCorners, cornerIDs, NULL) == NULL)
if (UG3d::InsertElementFromIDs(grid.multigrid_->grids[0], numberOfCorners, cornerIDs, NULL) == NULL)
DUNE_THROW(IOError, "Inserting element failed");
} else {
// Prism
......@@ -685,8 +671,7 @@ void Dune::AmiraMeshReader<Dune::UGGrid<3,3> >::buildGrid(UGGrid<3,3>& grid, Ami
int cornerIDs[6] = {thisElem[0]-1, thisElem[1]-1, thisElem[3]-1,
thisElem[4]-1, thisElem[5]-1, thisElem[7]-1};
/// \todo Warum ist nicht UG3d::InsertElementFromIDs Pflicht???
if (InsertElementFromIDs(grid.multigrid_->grids[0], 6, cornerIDs, NULL) == NULL)
if (UG3d::InsertElementFromIDs(grid.multigrid_->grids[0], 6, cornerIDs, NULL) == NULL)
DUNE_THROW(IOError, "Inserting element failed");
} else if (thisElem[2]==thisElem[3] && thisElem[6]==thisElem[7]) {
......@@ -694,8 +679,7 @@ void Dune::AmiraMeshReader<Dune::UGGrid<3,3> >::buildGrid(UGGrid<3,3>& grid, Ami
int cornerIDs[6] = {thisElem[0]-1, thisElem[1]-1, thisElem[2]-1,
thisElem[4]-1, thisElem[5]-1, thisElem[6]-1};
/// \todo Warum ist nicht UG3d::InsertElementFromIDs Pflicht???
if (InsertElementFromIDs(grid.multigrid_->grids[0], 6, cornerIDs, NULL) == NULL)
if (UG3d::InsertElementFromIDs(grid.multigrid_->grids[0], 6, cornerIDs, NULL) == NULL)
DUNE_THROW(IOError, "Inserting element failed");
} else {
......@@ -706,7 +690,7 @@ void Dune::AmiraMeshReader<Dune::UGGrid<3,3> >::buildGrid(UGGrid<3,3>& grid, Ami
for (int j=0; j<numberOfCorners; j++)
cornerIDs[j] = elemData[numberOfCorners*i+j]-1;
if (InsertElementFromIDs(grid.multigrid_->grids[0], numberOfCorners, cornerIDs, NULL) == NULL)
if (UG3d::InsertElementFromIDs(grid.multigrid_->grids[0], numberOfCorners, cornerIDs, NULL) == NULL)
DUNE_THROW(IOError, "Inserting element failed");
}
......@@ -1332,6 +1316,16 @@ void Dune::AmiraMeshReader<Dune::UGGrid<2,2> >::read(Dune::UGGrid<2,2>& grid,
// call configureCommand and newCommand
grid.makeNewUGMultigrid();
// If we are in a parallel setting and we are _not_ the master
// process we can exit here.
#ifdef ModelP
if (me!=0) {
delete(am);
grid.createend();
return;
}
#endif
// Determine whether grid contains only triangles
bool containsOnlyTriangles = am->findData("Triangles", HxINT32, 3, "Nodes");
......@@ -1368,14 +1362,7 @@ void Dune::AmiraMeshReader<Dune::UGGrid<2,2> >::read(Dune::UGGrid<2,2>& grid,
maxBndNodeID = -1;
for (theNode=UG_NS<2>::FirstNode(theMG->grids[0]); theNode!=NULL; theNode=theNode->succ)
{
// The following two lines ought to be in here, but the
// OBJT macros is somewhat complicated, so I leave it out
// for the time being.
// if(OBJT(theNode->myvertex) == UG3d::IVOBJ)
// UserWriteF("Warning: Node %d is inner node\n", ID(theNode));
maxBndNodeID = std::max(theNode->id, maxBndNodeID);
}
std::cout << "Already " << maxBndNodeID+1 << " nodes existing" << std::endl;
......@@ -1400,7 +1387,6 @@ void Dune::AmiraMeshReader<Dune::UGGrid<2,2> >::read(Dune::UGGrid<2,2>& grid,
nodePos[0] = am_node_coordinates[2*i];
nodePos[1] = am_node_coordinates[2*i+1];
/** \todo Why is InsertInnerNode outside of the UG namespaces?? */
if (InsertInnerNode(theMG->grids[0], nodePos) == NULL)
DUNE_THROW(IOError, "2d AmiraMesh reader: Inserting an inner node failed");
......@@ -1420,9 +1406,7 @@ void Dune::AmiraMeshReader<Dune::UGGrid<2,2> >::read(Dune::UGGrid<2,2>& grid,
cornerIDs[0] = isBoundaryNode[elemData[3*i]-1];
cornerIDs[1] = isBoundaryNode[elemData[3*i+1]-1];
cornerIDs[2] = isBoundaryNode[elemData[3*i+2]-1];
//printf("elem id : %d, node ids : %d %d %d\n", i, cornerIDs[0], cornerIDs[1], cornerIDs[2]);
/** \todo Why is InsertElementFromIDs outside of the UG namespaces?? */
if (InsertElementFromIDs(theMG->grids[0], 3,cornerIDs, NULL) == NULL)
DUNE_THROW(IOError, "2d AmiraMesh reader: Inserting an element failed");
......@@ -1436,7 +1420,6 @@ void Dune::AmiraMeshReader<Dune::UGGrid<2,2> >::read(Dune::UGGrid<2,2>& grid,
cornerIDs[2] = isBoundaryNode[elemData[4*i+2]-1];
cornerIDs[3] = isBoundaryNode[elemData[4*i+3]-1];
/** \todo Why is InsertElementFromIDs outside of the UG namespaces?? */
if (InsertElementFromIDs(theMG->grids[0], 4,cornerIDs, NULL) == NULL)
DUNE_THROW(IOError, "2d AmiraMesh reader: Inserting an element failed");
......
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