diff --git a/Geo/GEdgeCompound.cpp b/Geo/GEdgeCompound.cpp index c7937afcdf0c840088b787eb79e9d318e1644f4c..d2cfb9ad785844a6628132322c8347eae1e0dfd5 100644 --- a/Geo/GEdgeCompound.cpp +++ b/Geo/GEdgeCompound.cpp @@ -51,8 +51,11 @@ GEdgeCompound::GEdgeCompound(GModel *m, int tag, std::vector<GEdge*> &compound, return; } - for (unsigned int i = 0; i < _compound.size(); i++) + for (unsigned int i = 0; i < _compound.size(); i++){ _compound[i]->setCompound(this); + discreteEdge *de = dynamic_cast<discreteEdge*> (_compound[i]); + if(de) de->createGeometry(); + } for(std::vector<GEdge*>::iterator it = _compound.begin(); it != _compound.end(); ++it){ if(!(*it)){ @@ -82,8 +85,11 @@ GEdgeCompound::GEdgeCompound(GModel *m, int tag, std::vector<GEdge*> &compound) return; } - for (unsigned int i = 0; i < _compound.size(); i++) + for (unsigned int i = 0; i < _compound.size(); i++){ _compound[i]->setCompound(this); + discreteEdge *de = dynamic_cast<discreteEdge*> (_compound[i]); + if(de) de->createGeometry(); + } parametrize(); } diff --git a/Mesh/meshGFace.cpp b/Mesh/meshGFace.cpp index c4f82aa4a262a10d2450011c3677e98ce27e429e..c6151f435173850724b9bc5d833ca987c966c2b7 100644 --- a/Mesh/meshGFace.cpp +++ b/Mesh/meshGFace.cpp @@ -807,7 +807,7 @@ static void modifyInitialMeshForTakingIntoAccountBoundaryLayers(GFace *gf) deMeshGFace kil_; kil_(gf); meshGenerator(gf, 0, 0, true , false, &hop); - + gf->quadrangles = blQuads; gf->triangles.insert(gf->triangles.begin(),blTris.begin(),blTris.end()); gf->mesh_vertices.insert(gf->mesh_vertices.begin(),verts.begin(),verts.end()); @@ -2597,8 +2597,8 @@ void partitionAndRemesh(GFaceCompound *gf) Msg::Info("*** Starting meshing 1D edges ...:"); for (int i = 0; i < NE; i++){ GEdge *gec = gf->model()->getEdgeByTag(nume + NE + i); - meshGEdge mge; - mge(gec); + meshGEdge mge; + mge(gec); } double t2 = Cpu(); Msg::Info("*** Meshing 1D edges done (%gs)", t2-t1); diff --git a/doc/VERSIONS.txt b/doc/VERSIONS.txt index 0059dc46cd14b4ad86233bf5cab6a3642d9584ba..0848b28dc5112c28a1096615bfd4c3e9c891b6b0 100644 --- a/doc/VERSIONS.txt +++ b/doc/VERSIONS.txt @@ -1,5 +1,6 @@ -2.14.2: fixed regression in multi-file partitioned grid export; fixed regression -for Mesh.SubdivisionAlgorithm=1; simplified 2D boundary layer field. +2.15.0: fixed several regressions (multi-file partitioned grid export, mesh +subdivision, old compound mesher); simplified 2D boundary layer field; faster +rendering of large meshes. 2.14.1 (October 30, 2016): fixed regression in periodic meshes; small bug fixes and code cleanups.