Skip to content
Snippets Groups Projects
Commit 6d3cf0ea authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

if a "plane" surface has a non-nil geometry then tag the surface as

"ParametricSurface" (not Plane)
parent 9008038e
No related branches found
No related tags found
No related merge requests found
// $Id: GFace.cpp,v 1.63 2008-06-03 08:55:33 remacle Exp $ // $Id: GFace.cpp,v 1.64 2008-06-03 21:39:01 geuzaine Exp $
// //
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
// //
...@@ -387,17 +387,16 @@ end: ...@@ -387,17 +387,16 @@ end:
Msg::Debug("Surface: %d", tag()); Msg::Debug("Surface: %d", tag());
Msg::Debug("SVD : %g,%g,%g (min=%d)", svd[0], svd[1], svd[2], min); Msg::Debug("SVD : %g,%g,%g (min=%d)", svd[0], svd[1], svd[2], min);
Msg::Debug("Plane : (%g x + %g y + %g z = %g)", Msg::Debug("Plane : (%g x + %g y + %g z = %g)",
meanPlane.a, meanPlane.b, meanPlane.c, meanPlane.d); meanPlane.a, meanPlane.b, meanPlane.c, meanPlane.d);
Msg::Debug("Normal : (%g , %g , %g )", Msg::Debug("Normal : (%g , %g , %g )",
meanPlane.a, meanPlane.b, meanPlane.c); meanPlane.a, meanPlane.b, meanPlane.c);
Msg::Debug("t1 : (%g , %g , %g )", t1[0], t1[1], t1[2]); Msg::Debug("t1 : (%g , %g , %g )", t1[0], t1[1], t1[2]);
Msg::Debug("t2 : (%g , %g , %g )", t2[0], t2[1], t2[2]); Msg::Debug("t2 : (%g , %g , %g )", t2[0], t2[1], t2[2]);
Msg::Debug("pt : (%g , %g , %g )", Msg::Debug("pt : (%g , %g , %g )",
meanPlane.x, meanPlane.y, meanPlane.z); meanPlane.x, meanPlane.y, meanPlane.z);
//check coherence for plane surfaces //check coherence for plane surfaces
//check commented out because parametric surfaces are not plane in this sense if(geomType() == Plane) {
/*if(geomType() == Plane) {
SBoundingBox3d bb = bounds(); SBoundingBox3d bb = bounds();
double lc = norm(SVector3(bb.max(), bb.min())); double lc = norm(SVector3(bb.max(), bb.min()));
std::list<GVertex*> verts = vertices(); std::list<GVertex*> verts = vertices();
...@@ -414,7 +413,7 @@ end: ...@@ -414,7 +413,7 @@ end:
return; return;
} }
} }
}*/ }
#endif #endif
} }
......
// $Id: gmshFace.cpp,v 1.56 2008-05-04 08:31:14 geuzaine Exp $ // $Id: gmshFace.cpp,v 1.57 2008-06-03 21:39:01 geuzaine Exp $
// //
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
// //
...@@ -224,12 +224,20 @@ SPoint2 gmshFace::parFromPoint(const SPoint3 &qp) const ...@@ -224,12 +224,20 @@ SPoint2 gmshFace::parFromPoint(const SPoint3 &qp) const
GEntity::GeomType gmshFace::geomType() const GEntity::GeomType gmshFace::geomType() const
{ {
switch(s->Typ){ switch(s->Typ){
case MSH_SURF_PLAN: return Plane; case MSH_SURF_PLAN:
if(s->geometry)
return ParametricSurface;
else
return Plane;
case MSH_SURF_REGL: case MSH_SURF_REGL:
case MSH_SURF_TRIC: return RuledSurface; case MSH_SURF_TRIC:
case MSH_SURF_DISCRETE: return DiscreteSurface; return RuledSurface;
case MSH_SURF_BND_LAYER: return BoundaryLayerSurface; case MSH_SURF_DISCRETE:
default: return Unknown; return DiscreteSurface;
case MSH_SURF_BND_LAYER:
return BoundaryLayerSurface;
default:
return Unknown;
} }
} }
......
...@@ -4,32 +4,12 @@ VQ(0.1,1,0,0,1,0,0,0.8,0,0.1,0.8,0){0,0,0, 0,0,0, 1,0,0, 0,0,0}; ...@@ -4,32 +4,12 @@ VQ(0.1,1,0,0,1,0,0,0.8,0,0.1,0.8,0){0,0,0, 0,0,0, 1,0,0, 0,0,0};
INTERPOLATION_SCHEME INTERPOLATION_SCHEME
{ {
{.25,-.25,.25,-.25},
{.25,.25,-.25,-.25},
{.25,.25,.25,.25},
{.25,-.25,-.25,.25},
{.25,-.25,.25,-.25},
{.25,.25,-.25,-.25},
{.25,.25,.25,.25},
{.25,-.25,-.25,.25},
{.25,-.25,.25,-.25}, {.25,-.25,.25,-.25},
{.25,.25,-.25,-.25}, {.25,.25,-.25,-.25},
{.25,.25,.25,.25}, {.25,.25,.25,.25},
{.25,-.25,-.25,.25} {.25,-.25,-.25,.25}
} }
{ {
{0,0,0},
{1,0,0},
{0,1,0},
{1,1,0},
{0,0,0},
{1,0,0},
{0,1,0},
{1,1,0},
{0,0,0}, {0,0,0},
{1,0,0}, {1,0,0},
{0,1,0}, {0,1,0},
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment