Merge pull request #306 from corentin-prigent/feature/mmg2d-adpcol-colelt

Removal of duplicate function `MMG2D_adpcol`

Author: corentin-prigent

src/mmg2d/libmmg2d_private.h

@@ -266,7 +266,7 @@ int MMG2D_grad2metreq_ani(MMG5_pMesh ,MMG5_pSol ,MMG5_pTria,MMG5_int,MMG5_int);
 int MMG2D_gradsiz_ani(MMG5_pMesh ,MMG5_pSol );
 int MMG2D_gradsizreq_ani(MMG5_pMesh ,MMG5_pSol );
 MMG5_int MMG2D_anaelt(MMG5_pMesh ,MMG5_pSol ,int );
-MMG5_int MMG2D_colelt(MMG5_pMesh ,MMG5_pSol ,int );
+MMG5_int MMG2D_colelt(MMG5_pMesh ,MMG5_pSol ,int, double );
 MMG5_int MMG2D_swpmsh(MMG5_pMesh ,MMG5_pSol ,int );
 double MMG2D_lencurv_iso(MMG5_pMesh ,MMG5_pSol ,MMG5_int ,MMG5_int );
 double MMG2D_lencurv_ani(MMG5_pMesh ,MMG5_pSol ,MMG5_int ,MMG5_int );
@@ -288,7 +288,6 @@ int MMG5_interpmet22(MMG5_pMesh ,double *,double *,double ,double *);
 int MMG2D_intmet_iso(MMG5_pMesh ,MMG5_pSol ,MMG5_int ,int8_t ,MMG5_int ,double );
 int MMG2D_intmet_ani(MMG5_pMesh ,MMG5_pSol ,MMG5_int ,int8_t ,MMG5_int ,double );
 MMG5_int MMG2D_adpspl(MMG5_pMesh ,MMG5_pSol );
-int MMG2D_adpcol(MMG5_pMesh ,MMG5_pSol );
 MMG5_int MMG2D_movtri(MMG5_pMesh ,MMG5_pSol ,int ,int8_t );
 MMG5_int MMG2D_chkspl(MMG5_pMesh ,MMG5_pSol ,MMG5_int ,int8_t );
 int MMG2D_split1b(MMG5_pMesh ,MMG5_int ,int8_t ,MMG5_int );

src/mmg2d/mmg2d1.c

@@ -69,7 +69,7 @@ int MMG2D_anatri(MMG5_pMesh mesh,MMG5_pSol met,int8_t typchk) {
       }
 
       /* Collapse short edges */
-      nc = MMG2D_colelt(mesh,met,typchk);
+      nc = MMG2D_colelt(mesh,met,typchk,MMG2D_LSHRT);
       if ( nc < 0 ) {
         fprintf(stderr,"  ## Unable to collapse mesh. Exiting.\n");
         return 0;
@@ -434,18 +434,17 @@ int MMG2D_dichoto(MMG5_pMesh mesh,MMG5_pSol met,MMG5_int k,MMG5_int *vx) {
 }
 
 /* Travel triangles and collapse short edges */
-MMG5_int MMG2D_colelt(MMG5_pMesh mesh,MMG5_pSol met,int typchk) {
+MMG5_int MMG2D_colelt(MMG5_pMesh mesh,MMG5_pSol met,int typchk, double lmax) {
   MMG5_pTria   pt;
   MMG5_pPoint  p1,p2;
-  double       ux,uy,ll,hmin2;
+  double       ll;
   MMG5_int     k;
   int          ilist;
   MMG5_int     nc;
   uint8_t      i,i1,i2,open;
   MMG5_int     list[MMG5_TRIA_LMAX+2];
 
   nc = 0;
-  hmin2 = mesh->info.hmin * mesh->info.hmin;
 
   for (k=1; k<=mesh->nt; k++) {
     pt = &mesh->tria[k];
@@ -476,14 +475,16 @@ MMG5_int MMG2D_colelt(MMG5_pMesh mesh,MMG5_pSol met,int typchk) {
 
       /* Check length */
       if ( typchk == 1 ) {
+        double ux, uy, hmin2;
         ux = p2->c[0] - p1->c[0];
         uy = p2->c[1] - p1->c[1];
         ll = ux*ux + uy*uy;
+        hmin2 = mesh->info.hmin * mesh->info.hmin;
         if ( ll > hmin2 ) continue;
       }
       else {
         ll = MMG2D_lencurv(mesh,met,pt->v[i1],pt->v[i2]);
-        if ( ll > MMG2D_LSHRT ) continue;
+        if ( ll > lmax ) continue;
       }
 
       /* Check whether the geometry is preserved */
@@ -564,9 +565,9 @@ int MMG2D_adptri(MMG5_pMesh mesh,MMG5_pSol met) {
         return 0;
       }
 
-      nc = MMG2D_adpcol(mesh,met);
+      nc = MMG2D_colelt(mesh,met,2,MMG2D_LOPTS);
       if ( nc < 0 ) {
-        fprintf(stderr,"  ## Problem in function adpcol."
+        fprintf(stderr,"  ## Problem in function colelt."
                 " Unable to complete mesh. Exit program.\n");
         return 0;
       }
@@ -692,65 +693,6 @@ MMG5_int MMG2D_adpspl(MMG5_pMesh mesh,MMG5_pSol met) {
   return ns;
 }
 
-/* Analysis and collapse routine for edges in the final step of the algorithm */
-int MMG2D_adpcol(MMG5_pMesh mesh,MMG5_pSol met) {
-  MMG5_pTria        pt;
-  MMG5_pPoint       p1,p2;
-  double            len;
-  MMG5_int          k,nc;
-  int               ilist;
-  int8_t            i,i1,i2,open;
-  MMG5_int          list[MMG5_TRIA_LMAX+2];
-  
-  nc = 0;
-  for (k=1; k<=mesh->nt; k++) {
-    pt = &mesh->tria[k];
-    if ( !MG_EOK(pt) || pt->ref < 0 ) continue;
-
-    /* Check edge length, and attempt collapse */
-    pt->flag = 0;
-    for (i=0; i<3; i++) {
-      if ( MG_SIN(pt->tag[i]) ) continue;
-
-      open = ( mesh->adja[3*(k-1)+1+i] == 0 ) ? 1 : 0;
-
-      i1 = MMG5_inxt2[i];
-      i2 = MMG5_iprv2[i];
-      p1 = &mesh->point[pt->v[i1]];
-      p2 = &mesh->point[pt->v[i2]];
-
-      if ( MG_SIN(p1->tag) || p1->tag & MG_NOM ) continue;
-      else if ( p1->tag & MG_GEO ) {
-        if ( ! (p2->tag & MG_GEO) || !(pt->tag[i] & MG_GEO) ) continue;
-      }
-      else if ( p1->tag & MG_REF ) {
-        if ( ! (p2->tag & MG_GEO || p2->tag & MG_REF) || !(pt->tag[i] & MG_REF) ) continue;
-      }
-
-      len = MMG2D_lencurv(mesh,met,pt->v[i1],pt->v[i2]);
-
-      if ( len > MMG2D_LOPTS ) continue;
-
-      ilist = MMG2D_chkcol(mesh,met,k,i,list,2);
-
-      if ( ilist > 3 || ( ilist==3 && open ) ) {
-        nc += MMG2D_colver(mesh,ilist,list);
-        break;
-      }
-      else if ( ilist == 3 ) {
-        nc += MMG2D_colver3(mesh,list);
-        break;
-      }
-      else if ( ilist == 2 ) {
-        nc += MMG2D_colver2(mesh,list);
-        break;
-      }
-    }
-  }
-
-  return nc;
-}
-
 /* Analyze points to relocate them according to a quality criterion */
 MMG5_int MMG2D_movtri(MMG5_pMesh mesh,MMG5_pSol met,int maxit,int8_t improve) {
   MMG5_pTria           pt;