Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adjust to CVS HEAD modifications
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_Hexa_3D.cxx
diff --git
a/src/StdMeshers/StdMeshers_Hexa_3D.cxx
b/src/StdMeshers/StdMeshers_Hexa_3D.cxx
index 597c354049ce4488e03a2799d159c445b1b342fd..a3ed4f11a7142cca9be57bc944b2e49de2af9d57 100644
(file)
--- a/
src/StdMeshers/StdMeshers_Hexa_3D.cxx
+++ b/
src/StdMeshers/StdMeshers_Hexa_3D.cxx
@@
-606,17
+606,7
@@
bool StdMeshers_Hexa_3D::Compute(SMESH_Mesh & aMesh,
// - compute the point 3D
// - store the point 3D in SMESHDS, store its ID in 3D structure
// - compute the point 3D
// - store the point 3D in SMESHDS, store its ID in 3D structure
- TopoDS_Shell aShell;
- TopExp_Explorer exp(aShape, TopAbs_SHELL);
- if (exp.More())
- {
- aShell = TopoDS::Shell(exp.Current());
- }
- else
- {
- MESSAGE("no shell...");
- ASSERT(0);
- }
+ int shapeID = meshDS->ShapeToIndex( aShape );
Pt3 p000, p001, p010, p011, p100, p101, p110, p111;
Pt3 px00, px01, px10, px11;
Pt3 p000, p001, p010, p011, p100, p101, p110, p111;
Pt3 px00, px01, px10, px11;
@@
-690,8
+680,7
@@
bool StdMeshers_Hexa_3D::Compute(SMESH_Mesh & aMesh,
SMDS_MeshNode * node = meshDS->AddNode(X[0], X[1], X[2]);
np[ijk].node = node;
SMDS_MeshNode * node = meshDS->AddNode(X[0], X[1], X[2]);
np[ijk].node = node;
- //meshDS->SetNodeInVolume(node, TopoDS::Solid(aShape));
- meshDS->SetNodeInVolume(node, aShell);
+ meshDS->SetNodeInVolume(node, shapeID);
}
}
}
}
}
}
@@
-755,9
+744,7
@@
bool StdMeshers_Hexa_3D::Compute(SMESH_Mesh & aMesh,
np[n7].node,
np[n6].node);
np[n7].node,
np[n6].node);
- meshDS->SetMeshElementOnShape(elt, aShell);
-
-
+ meshDS->SetMeshElementOnShape(elt, shapeID);
}
}
if ( np ) delete [] np;
}
}
if ( np ) delete [] np;
@@
-1062,7
+1049,7
@@
bool ComputePentahedralMesh(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape)
//printf(" ComputePentahedralMesh HERE\n");
//
bool bOK;
//printf(" ComputePentahedralMesh HERE\n");
//
bool bOK;
- int iErr;
+
//
int iErr;
StdMeshers_Penta_3D anAlgo;
//
bOK=anAlgo.Compute(aMesh, aShape);
StdMeshers_Penta_3D anAlgo;
//
bOK=anAlgo.Compute(aMesh, aShape);