Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change tag type (int -> uint) and add the tag MG_OVERLAP (for ParMmg) #280

Merged
merged 14 commits into from
Sep 10, 2024
Merged

Change tag type (int -> uint) and add the tag MG_OVERLAP (for ParMmg) #280

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
380a6a3
Modify function MMG3D_ismaniball to be used by ParMmg
laetitia-m Apr 12, 2024
f16cc07
Modify type of TAGS to be able to add MG_OVERLAP tag
laetitia-m May 15, 2024
b966c94
Merge branch 'develop' into feature/overlap
laetitia-m May 15, 2024
7e7d1a9
Modify tag type - but not sure in fortran function if it is ok - need…
laetitia-m May 15, 2024
56f3d69
Modify analysis to support MG_OVERLAP tag in ParMmg
laetitia-m Jul 24, 2024
3f3d720
Merge of develop
laetitia-m Jul 24, 2024
81d7774
Fix mimatch tag types.
Algiane Sep 6, 2024
a26e4eb
Add coverage for get_tagname function.
Algiane Sep 6, 2024
1364593
Fix missing header for new unit test.
Algiane Sep 6, 2024
89c54bb
Missing scotch includes.
Algiane Sep 6, 2024
e496a19
Move unit test in libtestsfor easy fix.
Algiane Sep 6, 2024
fbb1804
Revert "Move unit test in libtestsfor easy fix."
Algiane Sep 9, 2024
cbf26b9
Attempt to fix compilation issue for new unit test.
Algiane Sep 10, 2024
176f3b2
Don't test get_tagname function on windows du to dll import errors.
Algiane Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .vscode/c_cpp_properties.json
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that this file should not be added to the commit ( no link with the PR + private paths inside it).

Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"configurations": [
{
"name": "Linux",
"includePath": [
"${workspaceFolder}/**",
"/usr/lib/x86_64-linux-gnu/openmpi/include",
"/usr/local/include/vtk-9.2/**",
"/home/lmottet/Work/Software/ParMmg/**",
"/home/lmottet/Work/Software/mmg/**",
"/home/lmottet/Work/Software/mmg/build-dev/include/**",
"/home/lmottet/Work/Software/mmg/build-dev/lib/**",
"/home/lmottet/Work/Software/mmg/build-*/include/**",
"/home/lmottet/Work/Software/mmg/build-*/lib/**"

],
"defines": [],
"compilerPath": "/usr/bin/mpirun",
"cStandard": "gnu17",
"cppStandard": "gnu++14",
"intelliSenseMode": "linux-gcc-x64"
}
],
"version": 4
}
9 changes: 7 additions & 2 deletions src/common/API_functions.c
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This function is not covered by the tests: it is not directly linked to your PR but I will propose a unit test as it is the occasion to improve the code coverage of this part of the software.

Original file line number Diff line number Diff line change
Expand Up @@ -734,7 +734,7 @@
}
}

const char* MMG5_Get_tagName(int tag)
const char* MMG5_Get_tagName(uint16_t tag)

Check warning on line 737 in src/common/API_functions.c

View check run for this annotation

Codecov / codecov/patch

src/common/API_functions.c#L737 

Added line #L737 was not covered by tests
{
static char tags_name[1024];

Expand Down Expand Up @@ -791,7 +791,12 @@

if ( tag & MG_PARBDY) {
strcat(tags_name,"Parbdy ");
}
}

if ( tag & MG_OVERLAP) {
strcat(tags_name,"Overlap ");

Check warning on line 797 in src/common/API_functions.c

View check run for this annotation

Codecov / codecov/patch

src/common/API_functions.c#L797 

Added line #L797 was not covered by tests
}

strcat(tags_name,"tag(s).");

return tags_name;
Expand Down
2 changes: 1 addition & 1 deletion src/common/hash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ int MMG5_hashUpdate(MMG5_Hash *hash, MMG5_int a,MMG5_int b,MMG5_int k) {
* tag. If the edge exist, add the new tag to the already stored tags.
*
*/
int MMG5_hashEdgeTag(MMG5_pMesh mesh,MMG5_Hash *hash, MMG5_int a,MMG5_int b,int16_t tag) {
int MMG5_hashEdgeTag(MMG5_pMesh mesh,MMG5_Hash *hash, MMG5_int a,MMG5_int b,uint16_t tag) {
MMG5_hedge *ph;
MMG5_int key;
MMG5_int ia,ib,j;
Expand Down
2 changes: 1 addition & 1 deletion src/common/libmmgcommon_private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ LIBMMG_CORE_EXPORT int MMG5_Compute_constantSize(MMG5_pMesh mesh,MMG5_pSol met,d
*
* \warning for debug purpose, no thread safe.
*/
const char* MMG5_Get_tagName(int tag);
const char* MMG5_Get_tagName(uint16_t tag);

/**
* \param mesh pointer to the mesh structure.
Expand Down
22 changes: 11 additions & 11 deletions src/common/libmmgtypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ typedef struct {
the unused points)*/
MMG5_int flag; /*!< Flag to know if we have already treated the point */
MMG5_int s;
int16_t tag; /*!< Contains binary flags : if \f$tag=23=16+4+2+1\f$, then
uint16_t tag; /*!< Contains binary flags : if \f$tag=23=16+4+2+1\f$, then
the point is \a MG_REF, \a MG_GEO, \a MG_REQ and \a MG_BDY */
int8_t tagdel; /*!< Tag for delaunay */
} MMG5_Point;
Expand All @@ -313,7 +313,7 @@ typedef struct {
MMG5_int ref; /*!< Reference of the edge */
MMG5_int base; /*!< 2Donly: used to store the tria+ tria edge indices
that allow to access to the edge */
int16_t tag; /*!< Binary flags */
uint16_t tag; /*!< Binary flags */
} MMG5_Edge;
typedef MMG5_Edge * MMG5_pEdge;

Expand Down Expand Up @@ -345,7 +345,7 @@ typedef struct {
MMG5_int edg[3]; /*!< edg[i] contains the ref of the \f$i^{th}\f$ edge
of triangle */
MMG5_int flag;
int16_t tag[3]; /*!< tag[i] contains the tag associated to the
uint16_t tag[3]; /*!< tag[i] contains the tag associated to the
\f$i^{th}\f$ edge of triangle */
} MMG5_Tria;
typedef MMG5_Tria * MMG5_pTria;
Expand Down Expand Up @@ -375,7 +375,7 @@ typedef struct {
MMG5_int base;
MMG5_int edg[4]; /*!< edg[i] contains the ref of the \f$i^{th}\f$ edge
of quadrangle */
int16_t tag[4]; /*!< tag[i] contains the tag associated to the
uint16_t tag[4]; /*!< tag[i] contains the tag associated to the
\f$i^{th}\f$ edge of quadrangle */
} MMG5_Quad;
typedef MMG5_Quad * MMG5_pQuad;
Expand Down Expand Up @@ -414,7 +414,7 @@ typedef struct {
tetrahedron (only for tetrahedra that are adjacent to
surfaces) */
MMG5_int flag;
int16_t tag;
uint16_t tag;
} MMG5_Tetra;
typedef MMG5_Tetra * MMG5_pTetra;

Expand All @@ -427,9 +427,9 @@ typedef struct {
\f$i^{th}\f$ vertex of the tetrahedron;*/
MMG5_int edg[6]; /*!< edg[i] contains the reference of the
\f$i^{th}\f$ edge of the tetrahedron */
int16_t ftag[4]; /*!< ftag[i] contains the tag associated to the
uint16_t ftag[4]; /*!< ftag[i] contains the tag associated to the
\f$i^{th}\f$ face of the tetrahedron */
int16_t tag[6]; /*!< tag[i] contains the tag associated to the
uint16_t tag[6]; /*!< tag[i] contains the tag associated to the
\f$i^{th}\f$ edge of the tetrahedron */
int8_t ori; /*!< Orientation of the triangles of the tetrahedron:
the $\f$i^{th}\f$ bit of ori is set to 0 when the
Expand Down Expand Up @@ -473,7 +473,7 @@ typedef struct {
MMG5_int flag;
MMG5_int xpr; /*!< Index of the surface \ref MMG5_xPrism associated to
the prism*/
int8_t tag;
uint8_t tag;
} MMG5_Prism;
typedef MMG5_Prism * MMG5_pPrism;

Expand All @@ -488,9 +488,9 @@ typedef struct {
* edg[0]={0,1},edg[1]={0,2},edg[2]={0,3},edg[3]={1,2},
* edg[4]={1,4},edg[5]={2,5},edg[6]={3,4},edg[7]={3,5},
* edg[8]={4,5}*/
int16_t ftag[5]; /*!< ftag[i] contains the tag associated to the
uint16_t ftag[5]; /*!< ftag[i] contains the tag associated to the
\f$i^{th}\f$ face of the prism */
int16_t tag[9]; /*!< tag[i] contains the tag associated to the
uint16_t tag[9]; /*!< tag[i] contains the tag associated to the
\f$i^{th}\f$ edge of the prism */
} MMG5_xPrism;
typedef MMG5_xPrism * MMG5_pxPrism;
Expand Down Expand Up @@ -572,7 +572,7 @@ typedef struct {
MMG5_int b; /*!< Second extremity of edge */
MMG5_int ref; /*!< Reference or idx (2D) of edge */
MMG5_int nxt; /*!< Next element of hash table */
int16_t tag; /*!< tag of edge */
uint16_t tag; /*!< tag of edge */
} MMG5_hgeom;

/**
Expand Down
5 changes: 3 additions & 2 deletions src/common/mmgcommon_private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,8 @@ extern "C" {
#define MG_OLDPARBDY (1 << 11) /**< 2048 old parallel boundary */
#define MG_PARBDYBDY (1 << 12) /**< 4096 parallel boundary over a boundary */
#define MG_PARBDY (1 << 13) /**< 8192 parallel boundary */
#define MG_NUL (1 << 14) /**< 16384 vertex removed */
#define MG_OVERLAP (1 << 14) /**< 16384 elements on overlap */
#define MG_NUL (1 << 15) /**< 32768 vertex removed */

/* binary tags for local parameters */
#define MG_Vert (1 << 0 ) /**< 1 local parameter applied over vertex */
Expand Down Expand Up @@ -676,7 +677,7 @@ typedef struct MMG5_iNode_s {
MMG5_int MMG5_hashFace(MMG5_pMesh,MMG5_Hash*,MMG5_int,MMG5_int,MMG5_int,MMG5_int);
int MMG5_hashEdge(MMG5_pMesh mesh,MMG5_Hash *hash,MMG5_int a,MMG5_int b,MMG5_int k);
int MMG5_hashUpdate(MMG5_Hash *hash,MMG5_int a,MMG5_int b,MMG5_int k);
int MMG5_hashEdgeTag(MMG5_pMesh mesh,MMG5_Hash *hash,MMG5_int a,MMG5_int b,int16_t k);
int MMG5_hashEdgeTag(MMG5_pMesh mesh,MMG5_Hash *hash,MMG5_int a,MMG5_int b,uint16_t k);
MMG5_int MMG5_hashGet(MMG5_Hash *hash,MMG5_int a,MMG5_int b);
int MMG5_hashNew(MMG5_pMesh mesh, MMG5_Hash *hash,MMG5_int hsiz,MMG5_int hmax);
int MMG5_intmetsavedir(MMG5_pMesh mesh, double *m,double *n,double *mr);
Expand Down
2 changes: 1 addition & 1 deletion src/mmg2d/analys_2d.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ int MMG2D_setadj(MMG5_pMesh mesh, int8_t init_cc) {
MMG5_pTria pt,pt1;
MMG5_pQuad pq;
MMG5_int *pile,*adja,ipil,k,kk,ncc,ip1,ip2,nr,nref;
int16_t tag;
uint16_t tag;
int8_t i,ii,i1,i2;

if ( !mesh->nt ) {
Expand Down
2 changes: 1 addition & 1 deletion src/mmg2d/libmmg2d_private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ static const unsigned int MMG2D_idir[5] = {0,1,2,0,1};

/* Prototypes */
/*zaldy*/
MMG5_int MMG2D_newPt(MMG5_pMesh mesh,double c[2],int16_t tag);
MMG5_int MMG2D_newPt(MMG5_pMesh mesh,double c[2],uint16_t tag);
void MMG2D_delPt(MMG5_pMesh mesh,MMG5_int ip) ;
void MMG5_delEdge(MMG5_pMesh mesh,MMG5_int iel);
MMG5_int MMG2D_newElt(MMG5_pMesh mesh);
Expand Down
2 changes: 1 addition & 1 deletion src/mmg2d/zaldy_2d.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@


/* Create a new vertex in the mesh, and return its number */
MMG5_int MMG2D_newPt(MMG5_pMesh mesh,double c[2],int16_t tag) {
MMG5_int MMG2D_newPt(MMG5_pMesh mesh,double c[2],uint16_t tag) {
MMG5_pPoint ppt;
MMG5_int curpt;

Expand Down
2 changes: 1 addition & 1 deletion src/mmg3d/analys_3d.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ int MMG5_setadj(MMG5_pMesh mesh){
MMG5_pTria pt,pt1;
MMG5_int *adja,*adjb,adji1,adji2,*pile,iad,ipil,ip1,ip2,gen;
MMG5_int k,kk,iel,jel,nvf,nf,nr,nm,nt,nre,nreq,ncc,ned,ref;
int16_t tag;
uint16_t tag;
int8_t i,ii,i1,i2,ii1,ii2,voy;

nvf = nf = ncc = ned = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/mmg3d/anisomovpt_3d.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ int MMG5_movbdyregpt_ani(MMG5_pMesh mesh, MMG5_pSol met, MMG3D_pPROctree PROctre
*/
static inline
int MMG3D_movbdycurvept_ani(MMG5_pMesh mesh, MMG5_pSol met, MMG3D_pPROctree PROctree,int64_t *listv,
int ilistv,MMG5_int *lists, int ilists,int improve,const int16_t edgTag){
int ilistv,MMG5_int *lists, int ilists,int improve,const uint16_t edgTag){
MMG5_pTetra pt;
MMG5_pPoint p0;
MMG5_Tria tt;
Expand Down
14 changes: 7 additions & 7 deletions src/mmg3d/boulep_3d.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ int MMG5_boulenm(MMG5_pMesh mesh,MMG5_int start,int ip,int iface,
double dd,nt[3];
int nr,nnm;
MMG5_int base,nump,k,*adja,piv,nvstart,aux,na,nb,adj,fstart,ip0,ip1;
int16_t tag;
uint16_t tag;
int8_t iopp,ipiv,indb,inda,i,isface;
int8_t indedg[4][4] = { {-1,0,1,2}, {0,-1,3,4}, {1,3,-1,5}, {2,4,5,-1} };

Expand Down Expand Up @@ -1176,11 +1176,11 @@ int MMG5_bouletrid(MMG5_pMesh mesh,MMG5_int start,int iface,int ip,int *il1,MMG5
*/
static inline
int MMG3D_settag_oneDir(MMG5_pMesh mesh,MMG5_int start, MMG5_int na, MMG5_int nb,
int16_t tag,int edg, MMG5_int piv,MMG5_int adj) {
uint16_t tag,int edg, MMG5_int piv,MMG5_int adj) {
MMG5_pTetra pt;
MMG5_pxTetra pxt;
MMG5_int *adja;
int16_t taginit;
uint16_t taginit;
int8_t i;

while ( adj && (adj != start) ) {
Expand Down Expand Up @@ -1231,11 +1231,11 @@ int MMG3D_settag_oneDir(MMG5_pMesh mesh,MMG5_int start, MMG5_int na, MMG5_int n
* travelling its shell.
*
*/
int MMG5_settag(MMG5_pMesh mesh,MMG5_int start,int ia,int16_t tag,int edg) {
int MMG5_settag(MMG5_pMesh mesh,MMG5_int start,int ia,uint16_t tag,int edg) {
MMG5_pTetra pt;
MMG5_pxTetra pxt;
MMG5_int na,nb,*adja,adj,piv;
int16_t taginit;
uint16_t taginit;

assert( start >= 1 );
pt = &mesh->tetra[start];
Expand Down Expand Up @@ -1298,7 +1298,7 @@ int MMG5_settag(MMG5_pMesh mesh,MMG5_int start,int ia,int16_t tag,int edg) {
*/
static inline
int MMG3D_deltag_oneDir(MMG5_pMesh mesh,MMG5_int start, MMG5_int na, MMG5_int nb,
int16_t tag,MMG5_int piv,MMG5_int adj) {
uint16_t tag,MMG5_int piv,MMG5_int adj) {
MMG5_pTetra pt;
MMG5_pxTetra pxt;
MMG5_int *adja;
Expand Down Expand Up @@ -1344,7 +1344,7 @@ int MMG3D_deltag_oneDir(MMG5_pMesh mesh,MMG5_int start, MMG5_int na, MMG5_int n
* shell.
*
*/
int MMG5_deltag(MMG5_pMesh mesh,MMG5_int start,int ia,int16_t tag) {
int MMG5_deltag(MMG5_pMesh mesh,MMG5_int start,int ia,uint16_t tag) {
MMG5_pTetra pt;
MMG5_pxTetra pxt;
MMG5_int na,nb,*adja,adj,piv;
Expand Down
8 changes: 4 additions & 4 deletions src/mmg3d/chkmsh_3d.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ void MMG5_chkvol(MMG5_pMesh mesh) {
*/
static inline
int MMG3D_chk_shellEdgeTag_oneDir(MMG5_pMesh mesh,MMG5_int start, MMG5_int na, MMG5_int nb,
int16_t tag,MMG5_int ref, MMG5_int piv,MMG5_int adj) {
uint16_t tag,MMG5_int ref, MMG5_int piv,MMG5_int adj) {
MMG5_pTetra pt;
MMG5_pxTetra pxt;
MMG5_int *adja;
Expand Down Expand Up @@ -139,7 +139,7 @@ int MMG3D_chk_shellEdgeTag_oneDir(MMG5_pMesh mesh,MMG5_int start, MMG5_int na,
* traveling its shell.
*
*/
int MMG3D_chk_shellEdgeTag(MMG5_pMesh mesh,MMG5_int start, int8_t ia,int16_t tag,MMG5_int ref) {
int MMG3D_chk_shellEdgeTag(MMG5_pMesh mesh,MMG5_int start, int8_t ia,uint16_t tag,MMG5_int ref) {
MMG5_pTetra pt;
MMG5_pxTetra pxt;
MMG5_int piv,na,nb,adj,*adja;
Expand Down Expand Up @@ -235,7 +235,7 @@ void MMG3D_chkmeshedgestags(MMG5_pMesh mesh) {
ip1 = pt->v[MMG5_iare[i][0]];
ip2 = pt->v[MMG5_iare[i][1]];

int16_t tag = 0;
uint16_t tag = 0;
MMG5_int dummy = 0;
int ier = MMG5_hGet ( &hash,ip1,ip2,&dummy,&tag);

Expand Down Expand Up @@ -899,7 +899,7 @@ int srcface(MMG5_pMesh mesh,MMG5_int n0,MMG5_int n1,MMG5_int n2) {
MMG5_pTetra pt;
MMG5_pxTetra pxt;
MMG5_int ref,minn,maxn,sn,k,ip0,ip1,ip2,mins,maxs,sum;
int16_t tag;
uint16_t tag;
int8_t i;
static int8_t mmgWarn0 = 0;

Expand Down
22 changes: 11 additions & 11 deletions src/mmg3d/colver_3d.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ MMG5_topchkcol_bdy(MMG5_pMesh mesh,MMG5_int k,int iface,int8_t iedg,MMG5_int *li
*/
static inline
int MMG3D_get_shellEdgeTag_oneDir(MMG5_pMesh mesh,MMG5_int start, MMG5_int na, MMG5_int nb,
int16_t *tag,MMG5_int *ref, MMG5_int piv,MMG5_int adj,
uint16_t *tag,MMG5_int *ref, MMG5_int piv,MMG5_int adj,
int8_t *filled) {
MMG5_pTetra pt;
MMG5_pxTetra pxt;
Expand Down Expand Up @@ -436,7 +436,7 @@ int MMG3D_get_shellEdgeTag_oneDir(MMG5_pMesh mesh,MMG5_int start, MMG5_int na,
* consistent through the edge shell);
*
*/
int MMG3D_get_shellEdgeTag(MMG5_pMesh mesh,MMG5_int start, int8_t ia,int16_t *tag,MMG5_int *ref) {
int MMG3D_get_shellEdgeTag(MMG5_pMesh mesh,MMG5_int start, int8_t ia,uint16_t *tag,MMG5_int *ref) {
MMG5_pTetra pt;
MMG5_pxTetra pxt;
MMG5_int piv,na,nb,adj,*adja;
Expand Down Expand Up @@ -535,7 +535,7 @@ int MMG5_chkcol_bdy(MMG5_pMesh mesh,MMG5_pSol met,MMG5_int k,int8_t iface,
double ps,devold,devnew,hmax,hausd;
MMG5_int nump,numq,ndepmin,ndepplus,l,kk,iel;
int nr,nbbdy,isloc,iedgeOpp,ipp;
int16_t tag;
uint16_t tag;
int8_t iopp,iopp2,ia,ip,i,iq,i0,i1,ier,isminp,isplp;
#ifndef NDEBUG
MMG5_pPoint p0;
Expand Down Expand Up @@ -635,7 +635,7 @@ int MMG5_chkcol_bdy(MMG5_pMesh mesh,MMG5_pSol met,MMG5_int k,int8_t iface,
* shell because some MG_BDY tags may be missings due to the creation
* of an xtetra during a previous collapse */
if ( (!pt->xt) || !(pxt->ftag[i] & MG_BDY) ) {
int16_t tag0,tag1,tag2;
uint16_t tag0,tag1,tag2;
MMG5_int ref0,ref1,ref2;

tag0 = tag1 = tag2 = 0;
Expand Down Expand Up @@ -954,7 +954,7 @@ void MMG3D_update_edgeTag(MMG5_pTetra pt,MMG5_pxTetra pxt,MMG5_int np, MMG5_int
int i,j;
MMG5_int p0,p1;
uint8_t ia,iav;
int16_t tag,tag1;
uint16_t tag,tag1;

/* update tags for edges */
for ( j=0; j<3; j++ ) {
Expand Down Expand Up @@ -1010,11 +1010,11 @@ void MMG3D_update_edgeTag(MMG5_pTetra pt,MMG5_pxTetra pxt,MMG5_int np, MMG5_int
*/
static inline
MMG5_int MMG3D_update_shellEdgeTag_oneDir(MMG5_pMesh mesh,MMG5_int start, MMG5_int na, MMG5_int nb,
int16_t tag,MMG5_int ref, MMG5_int piv,MMG5_int adj) {
uint16_t tag,MMG5_int ref, MMG5_int piv,MMG5_int adj) {
MMG5_pTetra pt;
MMG5_pxTetra pxt;
MMG5_int *adja;
int16_t xtag;
uint16_t xtag;
int8_t i;

assert ( tag & MG_BDY && "Unexpected non boundary tag");
Expand Down Expand Up @@ -1074,11 +1074,11 @@ MMG5_int MMG3D_update_shellEdgeTag_oneDir(MMG5_pMesh mesh,MMG5_int start, MMG5_
*
*/
static inline
int MMG3D_update_shellEdgeTag(MMG5_pMesh mesh,MMG5_int start, int8_t ia,int16_t tag,MMG5_int ref) {
int MMG3D_update_shellEdgeTag(MMG5_pMesh mesh,MMG5_int start, int8_t ia,uint16_t tag,MMG5_int ref) {
MMG5_pTetra pt;
MMG5_pxTetra pxt;
MMG5_int piv,na,nb,adj,*adja;
int16_t xtag;
uint16_t xtag;

pt = &mesh->tetra[start];

Expand Down Expand Up @@ -1278,9 +1278,9 @@ MMG5_int MMG5_colver(MMG5_pMesh mesh,MMG5_pSol met,int64_t *list,int ilist,int8_
int iped = coled[l+0];
int iqed = coled[l+1];

int16_t tagip = 0;
uint16_t tagip = 0;
MMG5_int refip = 0;
int16_t tagiq = 0;
uint16_t tagiq = 0;
MMG5_int refiq = 0;

if ( !MMG3D_get_shellEdgeTag(mesh,iel,iped,&tagip,&refip) ) {
Expand Down
Loading