Commit e9f9ef2e authored by Christophe Geuzaine's avatar Christophe Geuzaine

test TRIANGLE_2 with edge fcts

parent 8e52327a
Pipeline #956 passed with stage
in 22 minutes 4 seconds
......@@ -32,6 +32,7 @@ void BF_Edge(struct Element * Element, int NumEdge,
break ;
case TRIANGLE :
case TRIANGLE_2 :
switch(NumEdge) {
case 1 : s[0] = 1.-v ; s[1] = u ; s[2] = 0. ; break ;
case 2 : s[0] = v ; s[1] = 1.-u ; s[2] = 0. ; break ;
......@@ -207,6 +208,7 @@ void BF_CurlEdge(struct Element * Element, int NumEdge,
break ;
case TRIANGLE :
case TRIANGLE_2 :
switch(NumEdge) {
case 1 : s[0] = 0. ; s[1] = 0. ; s[2] = 2. ; break ;
case 2 : s[0] = 0. ; s[1] = 0. ; s[2] = -2. ; break ;
......
......@@ -16,7 +16,7 @@
#define WrongNumEntity Message::Error("Wrong Edge number in 'BF_Edge_2E'")
void BF_Edge_2E(struct Element * Element, int NumEntity,
void BF_Edge_2E(struct Element * Element, int NumEntity,
double u, double v, double w, double s[])
{
switch (Element->Type) {
......@@ -26,8 +26,9 @@ void BF_Edge_2E(struct Element * Element, int NumEntity,
default : WrongNumEntity ;
}
break ;
case TRIANGLE :
case TRIANGLE_2 :
switch(NumEntity) {
case 1 : s[0] = -2.0*u+1.0-v ; s[1] = -u ; s[2] = 0. ; break ;
case 2 : s[0] = -v ; s[1] = -2.0*v+1.0-u ; s[2] = 0. ; break ;
......@@ -86,7 +87,7 @@ void BF_Edge_2E(struct Element * Element, int NumEntity,
#define WrongNumEntity Message::Error("Wrong Face number in 'BF_Edge_2F'")
void BF_Edge_2F(struct Element * Element, int NumEntity,
void BF_Edge_2F(struct Element * Element, int NumEntity,
double u, double v, double w, double s[])
{
Message::Error("You should never end up here!") ;
......@@ -98,7 +99,7 @@ void BF_Edge_2F(struct Element * Element, int NumEntity,
/* Volume */
/* -------- */
void BF_Edge_2V(struct Element * Element, int NumEntity,
void BF_Edge_2V(struct Element * Element, int NumEntity,
double u, double v, double w, double s[])
{
Message::Error("You should never end up here!") ;
......@@ -112,28 +113,28 @@ void BF_Edge_2V(struct Element * Element, int NumEntity,
/* Edges */
/* ------- */
void BF_CurlEdge_2E(struct Element * Element, int NumEntity,
void BF_CurlEdge_2E(struct Element * Element, int NumEntity,
double u, double v, double w, double s[])
{
s[0] = 0. ; s[1] = 0. ; s[2] = 0. ;
s[0] = 0. ; s[1] = 0. ; s[2] = 0. ;
}
/* ------- */
/* Faces */
/* ------- */
void BF_CurlEdge_2F(struct Element * Element, int NumEntity,
void BF_CurlEdge_2F(struct Element * Element, int NumEntity,
double u, double v, double w, double s[])
{
s[0] = 0. ; s[1] = 0. ; s[2] = 0. ;
s[0] = 0. ; s[1] = 0. ; s[2] = 0. ;
}
/* -------- */
/* Volume */
/* -------- */
void BF_CurlEdge_2V(struct Element * Element, int NumEntity,
void BF_CurlEdge_2V(struct Element * Element, int NumEntity,
double u, double v, double w, double s[])
{
s[0] = 0. ; s[1] = 0. ; s[2] = 0. ;
s[0] = 0. ; s[1] = 0. ; s[2] = 0. ;
}
......@@ -239,6 +239,9 @@ void Get_GroupsOfElementaryEntitiesOfElement
int i, j, Num_Entity, Nbr_SubFunction, i_SF ;
struct TwoInt * Key_P ;
// FIXME: we should check when we do Element->NbrGroupsOfEntities++ that we
// won't exceed NBR_MAX_GROUPS_IN_ELEMENT - this is dynamic and can happen
if (Element->NumLastElementForGroupsOfEntities != Element->Num) {
Element->NumLastElementForGroupsOfEntities = Element->Num ;
Element->NbrGroupsOfEntities = 0 ;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment