diff --git a/Geo/CMakeLists.txt b/Geo/CMakeLists.txt index b0f5ee1961907c16044c04c7a7e150a0b9b8dfab..b1d3a1d9d2d281e3058bc801e92700aed7b49124 100644 --- a/Geo/CMakeLists.txt +++ b/Geo/CMakeLists.txt @@ -15,7 +15,7 @@ set(SRC gmshSurface.cpp OCCVertex.cpp OCCEdge.cpp OCCFace.cpp OCCRegion.cpp GenericVertex.cpp GenericEdge.cpp GenericFace.cpp GenericRegion.cpp - discreteEdge.cpp discreteFace.cpp discreteDiskFace.cpp discreteRegion.cpp + discreteEdge.cpp discreteFace.cpp discreteRegion.cpp fourierEdge.cpp fourierFace.cpp fourierProjectionFace.cpp ACISVertex.cpp ACISEdge.cpp diff --git a/Mesh/meshGRegionLocalMeshMod.cpp b/Mesh/meshGRegionLocalMeshMod.cpp index 79f601add24053d72321df9fb77a763c06685987..11e16d634957052530c1f400b2844a31ef8d1d9b 100644 --- a/Mesh/meshGRegionLocalMeshMod.cpp +++ b/Mesh/meshGRegionLocalMeshMod.cpp @@ -71,11 +71,6 @@ bool buildEdgeCavity(MTet4 *t, int iLocalEdge, MVertex **v1, MVertex **v2, while (1){ MVertex *ov1 = t->tet()->getVertex(edges[5 - iLocalEdge][0]); MVertex *ov2 = t->tet()->getVertex(edges[5 - iLocalEdge][1]); - // printf("edge %d %d tet %d %d %d %d\n",(*v1)->getNum(),(*v2)->getNum(), - // t->tet()->getVertex(0)->getNum(), - // t->tet()->getVertex(1)->getNum(), - // t->tet()->getVertex(2)->getNum(), - // t->tet()->getVertex(3)->getNum()); int K = ov1 == lastinring ? 1 : 0; lastinring = ov1 == lastinring ? ov2 : ov1; // look in the 2 faces sharing this edge the one that has vertex diff --git a/benchmarks/3d/hex.geo b/benchmarks/3d/hex.geo index 720b8ab79f4e6043cf793912c413fef9a6d3992a..8b533e4d68cdacb5b0f1db00ed68cb1ffe330a47 100644 --- a/benchmarks/3d/hex.geo +++ b/benchmarks/3d/hex.geo @@ -40,8 +40,8 @@ Line Loop(24) = {6,-12,3,10}; Ruled Surface(25) = {24}; Surface Loop(1) = {17,-25,-23,-21,19,15}; Volume(1) = {1}; -Transfinite Line{1:4,6:9} = 10; -Transfinite Line{10:13} = 10; +Transfinite Line{1:4,6:9} = 30; +Transfinite Line{10:13} = 30; Transfinite Surface {15} = {1,2,3,4};