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

fix tetra edge lighting fir order >1

parent 810b6317
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Geo/MElement.cpp
+ 47
− 62
View file @ b6f9dbab
......@@ -813,13 +813,11 @@ const gmshFunctionSpace* MTriangle::getFunctionSpace(int o) const
return 0;
}
#define NUM_SUB_EDGES (CTX.mesh.num_sub_edges)
int MTriangleN::getNumEdgesRep(){ return 3 * CTX.mesh.num_sub_edges; }
int MTriangle6::getNumEdgesRep(){ return 3 * CTX.mesh.num_sub_edges; }
int MTriangleN::getNumEdgesRep(){ return 3 * NUM_SUB_EDGES; }
int MTriangle6::getNumEdgesRep(){ return 3 * NUM_SUB_EDGES; }
static void _myGetEdgeRep(MTriangle *t, int num, double *x, double *y, double *z, SVector3 *n,
int numSubEdges)
static void _myGetEdgeRep(MTriangle *t, int num, double *x, double *y, double *z,
SVector3 *n, int numSubEdges)
{
n[0] = n[1] = n[2] = t->getFace(0).normal();
......@@ -853,18 +851,21 @@ static void _myGetEdgeRep(MTriangle *t, int num, double *x, double *y, double *z
}
}
void MTriangleN::getEdgeRep(int num, double *x, double *y, double *z, SVector3 *n){
_myGetEdgeRep(this,num,x,y,z,n,NUM_SUB_EDGES);
void MTriangleN::getEdgeRep(int num, double *x, double *y, double *z, SVector3 *n)
{
_myGetEdgeRep(this, num, x, y, z, n, CTX.mesh.num_sub_edges);
}
void MTriangle6::getEdgeRep(int num, double *x, double *y, double *z, SVector3 *n){
_myGetEdgeRep(this,num,x,y,z,n,NUM_SUB_EDGES);
void MTriangle6::getEdgeRep(int num, double *x, double *y, double *z, SVector3 *n)
{
_myGetEdgeRep(this, num, x, y, z, n, CTX.mesh.num_sub_edges);
}
int MTriangle6::getNumFacesRep(){ return NUM_SUB_EDGES * NUM_SUB_EDGES; }
int MTriangleN::getNumFacesRep(){ return NUM_SUB_EDGES * NUM_SUB_EDGES; }
int MTriangle6::getNumFacesRep(){ return SQU(CTX.mesh.num_sub_edges); }
int MTriangleN::getNumFacesRep(){ return SQU(CTX.mesh.num_sub_edges); }
static void _myGetFaceRep(MTriangle *t, int num, double *x, double *y, double *z, SVector3 *n,
int numSubEdges)
static void _myGetFaceRep(MTriangle *t, int num, double *x, double *y, double *z,
SVector3 *n, int numSubEdges)
{
// on the first layer, we have (numSubEdges-1) * 2 + 1 triangles
......@@ -926,14 +927,15 @@ static void _myGetFaceRep(MTriangle *t, int num, double *x, double *y, double *z
z[0] = pnt1.z(); z[1] = pnt2.z(); z[2] = pnt3.z();
}
void MTriangleN::getFaceRep(int num, double *x, double *y, double *z, SVector3 *n){
_myGetFaceRep(this,num,x,y,z,n,NUM_SUB_EDGES);
void MTriangleN::getFaceRep(int num, double *x, double *y, double *z, SVector3 *n)
{
_myGetFaceRep(this, num, x, y, z, n, CTX.mesh.num_sub_edges);
}
void MTriangle6::getFaceRep(int num, double *x, double *y, double *z, SVector3 *n){
_myGetFaceRep(this,num,x,y,z,n,NUM_SUB_EDGES);
void MTriangle6::getFaceRep(int num, double *x, double *y, double *z, SVector3 *n)
{
_myGetFaceRep(this, num, x, y, z, n, CTX.mesh.num_sub_edges);
}
void MTriangle::getIntegrationPoints(int pOrder, int *npts, IntPt **pts) const
{
#if !defined(HAVE_GMSH_EMBEDDED)
......@@ -1052,10 +1054,11 @@ const gmshFunctionSpace* MTetrahedron::getFunctionSpace(int o) const
return 0;
}
int MTetrahedron10::getNumEdgesRep(){ return 6 * NUM_SUB_EDGES; }
int MTetrahedronN::getNumEdgesRep(){ return 6 * NUM_SUB_EDGES; }
int MTetrahedron10::getNumEdgesRep(){ return 6 * CTX.mesh.num_sub_edges; }
int MTetrahedronN::getNumEdgesRep(){ return 6 * CTX.mesh.num_sub_edges; }
static void _myGetEdgeRep(MTetrahedron *tet, int num, double *x, double *y, double *z, SVector3 *n, int numSubEdges)
static void _myGetEdgeRep(MTetrahedron *tet, int num, double *x, double *y, double *z,
SVector3 *n, int numSubEdges)
{
static double pp[4][3] = {{0,0,0},{1,0,0},{0,1,0},{0,0,1}};
static int ed [6][2] = {{0,1},{0,2},{0,3},{1,2},{1,3},{2,3}};
......@@ -1080,22 +1083,27 @@ static void _myGetEdgeRep(MTetrahedron *tet, int num, double *x, double *y, doub
x[0] = pnt1.x(); x[1] = pnt2.x();
y[0] = pnt1.y(); y[1] = pnt2.y();
z[0] = pnt1.z(); z[1] = pnt2.z();
// not great, but better than nothing
static const int f[6] = {0, 0, 0, 1, 2, 3};
n[0] = n[1] = tet->getFace(f[iEdge]).normal();
}
void MTetrahedron10::getEdgeRep(int num, double *x, double *y, double *z, SVector3 *n)
{
_myGetEdgeRep(this,num,x,y,z,n,NUM_SUB_EDGES);
_myGetEdgeRep(this, num, x, y, z, n, CTX.mesh.num_sub_edges);
}
void MTetrahedronN::getEdgeRep(int num, double *x, double *y, double *z, SVector3 *n)
{
_myGetEdgeRep(this,num,x,y,z,n,NUM_SUB_EDGES);
_myGetEdgeRep(this, num, x, y, z, n, CTX.mesh.num_sub_edges);
}
int MTetrahedronN::getNumFacesRep(){ return 4 * NUM_SUB_EDGES * NUM_SUB_EDGES; }
int MTetrahedron10::getNumFacesRep(){ return 4 * NUM_SUB_EDGES * NUM_SUB_EDGES; }
int MTetrahedronN::getNumFacesRep(){ return 4 * SQU(CTX.mesh.num_sub_edges); }
int MTetrahedron10::getNumFacesRep(){ return 4 * SQU(CTX.mesh.num_sub_edges); }
void _myGetFaceRep (MTetrahedron *tet, int num, double *x, double *y, double *z, SVector3 *n, int numSubEdges )
static void _myGetFaceRep(MTetrahedron *tet, int num, double *x, double *y, double *z,
SVector3 *n, int numSubEdges)
{
static double pp[4][3] = {{0,0,0},{1,0,0},{0,1,0},{0,0,1}};
static int fak [4][3] = {{0,1,2},{0,1,3},{0,2,3},{1,2,3}};
......@@ -1166,45 +1174,22 @@ void _myGetFaceRep (MTetrahedron *tet, int num, double *x, double *y, double *z,
y[0] = pnt1.y(); y[1] = pnt2.y(); y[2] = pnt3.y();
z[0] = pnt1.z(); z[1] = pnt2.z(); z[2] = pnt3.z();
// facetted first
SVector3 d1(x[1]-x[0],y[1]-y[0],z[1]-z[0]);
SVector3 d2(x[2]-x[0],y[2]-y[0],z[2]-z[0]);
n[0] = crossprod(d1, d2);
n[0].normalize();
n[1] = n[0];
n[2] = n[0];
return;
{
SVector3 d1(J1[0][0], J1[0][1], J1[0][2]);
SVector3 d2(J1[1][0], J1[1][1], J1[1][2]);
n[0] = crossprod(d1, d2);
n[0].normalize();
}
{
SVector3 d1(J2[0][0], J2[0][1], J2[0][2]);
SVector3 d2(J2[1][0], J2[1][1], J2[1][2]);
n[1] = crossprod(d1, d2);
n[1].normalize();
}
{
SVector3 d1(J3[0][0], J3[0][1], J3[0][2]);
SVector3 d2(J3[1][0], J3[1][1], J3[1][2]);
n[2] = crossprod(d1, d2);
n[2].normalize();
}
}
void MTetrahedronN::getFaceRep(int num, double *x, double *y, double *z, SVector3 *n)
{
_myGetFaceRep(this,num,x,y,z,n,NUM_SUB_EDGES);
_myGetFaceRep(this, num, x, y, z, n, CTX.mesh.num_sub_edges);
}
void MTetrahedron10::getFaceRep(int num, double *x, double *y, double *z, SVector3 *n)
{
_myGetFaceRep(this,num,x,y,z,n,NUM_SUB_EDGES);
_myGetFaceRep(this, num, x, y, z, n, CTX.mesh.num_sub_edges);
}
void MTetrahedron::getIntegrationPoints(int pOrder, int *npts, IntPt **pts) const
......
doc/texinfo/gmsh.texi
+ 8
− 2
View file @ b6f9dbab
......@@ -1999,12 +1999,18 @@ characteristic lengths:
@ftable @code
@item Characteristic Length @{ @var{expression-list} @} = @var{expression};
Modifies the characteristic length of the points whose identification
Modify the characteristic length of the points whose identification
numbers are listed in @var{expression-list}. The new value is given by
@var{expression}.
@item Field[@var{expression}] = @var{string};
Create a new field (with id number @var{expression}), of type
@var{string}.
@item Field[@var{expression}].@var{string} = @var{char-expression} | @var{expression} | @var{expression-list};
Set the option @var{string} of the @var{expression}-th field.
@item Background Field = @var{expression};
Select the @var{expression}-th field as the one used to compute element
sizes. Only one background field can be given; if you want to combine
several field, use the @code{Min} or @code{Max} field (see below).
@end ftable
Here is the list of all available fields with their associated options:
......@@ -2088,7 +2094,7 @@ line.
(A deprecated synonym for @code{Progression} is @code{Power}.)
@item Transfinite Surface @{ @var{expression} @} = @{ @var{expression-list} @} < Left | Right | Alternate > ;
@item Transfinite Surface @{ @var{expression} @} < = @{ @var{expression-list} @} > < Left | Right | Alternate > ;
Selects the surface @var{expression} to be meshed with the 2D
transfinite algorithm. The @var{expression-list} should contain the
identification numbers of three or four points on the boundary of the
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment