diff --git a/Geo/GModelIO_GEO.cpp b/Geo/GModelIO_GEO.cpp index 0fec60f139b63d63ac38a5a24072cea68f2f7097..59d761acc4af527dab2726b000a67d022a52a6c2 100644 --- a/Geo/GModelIO_GEO.cpp +++ b/Geo/GModelIO_GEO.cpp @@ -164,7 +164,6 @@ int GModel::importGEOInternals() add(e); } - if(!c->Visible) e->setVisibility(0); if(c->Color.type) e->setColor(c->Color.mesh); if(c->degenerated) { @@ -195,7 +194,6 @@ int GModel::importGEOInternals() } } int param = CTX::instance()->mesh.remeshParam; - GFaceCompound::typeOfCompound typ = GFaceCompound::HARMONIC_CIRCLE; if (param == 1) typ = GFaceCompound::CONFORMAL_SPECTRAL; if (param == 2) typ = GFaceCompound::RADIAL_BASIS; @@ -204,18 +202,16 @@ int GModel::importGEOInternals() if (param == 5) typ = GFaceCompound::CONVEX_PLANE; if (param == 6) typ = GFaceCompound::HARMONIC_SQUARE; if (param == 7) typ = GFaceCompound::CONFORMAL_FE; - int algo = CTX::instance()->mesh.remeshAlgo; f = new GFaceCompound(this, s->Num, comp, b[0], b[1], b[2], b[3], typ, algo); - f->meshAttributes.recombine = s->Recombine; f->meshAttributes.recombineAngle = s->RecombineAngle; f->meshAttributes.method = s->Method; f->meshAttributes.extrude = s->Extrude; - // transfinite import Added by Trevor Strickler. This helps when experimenting - // to create compounds from transfinite surfs. Not having it does not break - // anything Gmsh *officially* does right now, but maybe it was left out by mistake??? and could - // cause problems later? + // transfinite import Added by Trevor Strickler. This helps when + // experimenting to create compounds from transfinite surfs. Not having + // it does not break anything Gmsh *officially* does right now, but + // maybe it was left out by mistake??? and could cause problems later? f->meshAttributes.transfiniteArrangement = s->Recombine_Dir; f->meshAttributes.corners.clear(); for(int i = 0; i < List_Nbr(s->TrsfPoints); i++){ @@ -227,7 +223,6 @@ int GModel::importGEOInternals() else Msg::Error("Unknown vertex %d in transfinite attributes", corn->Num); } - add(f); if(s->EmbeddedCurves){ for(int i = 0; i < List_Nbr(s->EmbeddedCurves); i++){ @@ -256,8 +251,10 @@ int GModel::importGEOInternals() f = new gmshFace(this, s); add(f); } - else + else{ + if(s->Typ == MSH_SURF_PLAN) f->computeMeanPlane(); // recompute in case geom has changed f->resetMeshAttributes(); + } if(!s->Visible) f->setVisibility(0); if(s->Color.type) f->setColor(s->Color.mesh); } diff --git a/Geo/gmshEdge.cpp b/Geo/gmshEdge.cpp index abfe16ea78acccfed8bab5aacd4e24199f7ba1ae..4d99633c7945d741bb046779d851b4a5fed0f2d1 100644 --- a/Geo/gmshEdge.cpp +++ b/Geo/gmshEdge.cpp @@ -46,7 +46,6 @@ Range<double> gmshEdge::parBounds(int i) const GPoint gmshEdge::point(double par) const { - Vertex a = InterpolateCurve(c, par, 0); return GPoint(a.Pos.X, a.Pos.Y, a.Pos.Z, this, par); } @@ -59,7 +58,6 @@ SVector3 gmshEdge::firstDer(double par) const SVector3 gmshEdge::secondDer(double par) const { - Vertex a = InterpolateCurve(c, par, 2); return SVector3(a.Pos.X, a.Pos.Y, a.Pos.Z); } diff --git a/Geo/gmshFace.cpp b/Geo/gmshFace.cpp index a5f4db21749eb2e990a9f3f8f9bf9296f1f22b61..39fa65879041bca01779dce4cce698cb73a0bcfe 100644 --- a/Geo/gmshFace.cpp +++ b/Geo/gmshFace.cpp @@ -437,5 +437,4 @@ bool gmshFace::buildSTLTriangulation(bool force) } va_geom_triangles->finalize(); return true; - }