Addition of the possibility to declare local remeshing parameters at corners in the default file.

Author: dapogny

src/common/libmmgtypes.h

@@ -231,6 +231,7 @@ enum MMG5_entities {
   MMG5_Edg,  /*!< Edge entity */
   MMG5_Triangle, /*!< Triangle entity */
   MMG5_Tetrahedron, /*!< Tetra entity */
+  MMG5_Crn, /*!< Corner entity */
 };
 
 /**
@@ -545,6 +546,7 @@ typedef struct {
                       * connecting 2 bdy points and tet with more than 1 bdy
                       * face) */
   int8_t        fem; /*!< internal value for fem / no fem mesh output */
+  int8_t        kiso; /*!< Retain previous ls entities (in ls mode) */
   int8_t        lag; /*!< lagrangian mode */
   int8_t        parTyp; /*!< Contains binary flags to say which kind of local
                           param are setted: if \f$tag = 1+2+4\f$ then the point

src/common/mmgcommon_private.h

@@ -161,7 +161,7 @@ extern "C" {
 #define  MG_Tria   (1 << 1 )  /**< 2 local parameter applied over triangle */
 #define  MG_Tetra  (1 << 2 )  /**< 4 local parameter applied over tetrahedron */
 #define  MG_Edge   (1 << 3 )  /**< 8 local parameter applied over edge */
-
+#define  MG_Crn (1 << 4 )  /**< 16 local parameter applied over corner */
 
 #define MG_VOK(ppt)      (ppt && ((ppt)->tag < MG_NUL)) /**< Vertex OK */
 #define MG_EOK(pt)       (pt && ((pt)->v[0] > 0))       /**< Element OK */

src/mmg2d/API_functions_2d.c

@@ -108,7 +108,6 @@ void MMG2D_Init_parameters(MMG5_pMesh mesh) {
   mesh->info.dhd      = MMG5_ANGEDG;
 }
 
-
 int MMG2D_Set_iparameter(MMG5_pMesh mesh, MMG5_pSol sol, int iparam, MMG5_int val){
   int k;
 
@@ -147,6 +146,9 @@ int MMG2D_Set_iparameter(MMG5_pMesh mesh, MMG5_pSol sol, int iparam, MMG5_int va
       mesh->info.dhd    = MMG5_ANGEDG;
     }
     break;
+  case MMG2D_IPARAM_kiso :
+    mesh->info.kiso = val;
+    break;
   case MMG2D_IPARAM_nofem :
     mesh->info.setfem = (val==1)? 0 : 1;
     break;
@@ -397,11 +399,11 @@ int MMG2D_Set_localParameter(MMG5_pMesh mesh,MMG5_pSol sol, int typ, MMG5_int re
     fprintf(stderr,"    max number of local parameters: %d\n",mesh->info.npar);
     return 0;
   }
-  if ( typ != MMG5_Triangle && typ != MMG5_Edg ) {
+  if ( typ != MMG5_Triangle && typ != MMG5_Edg && typ != MMG5_Crn ) {
     fprintf(stderr,"\n  ## Warning: %s: you must apply your local parameters",
             __func__);
-    fprintf(stderr," on triangles (MMG5_Triangle or %d) or edges"
-            " (MMG5_Edg or %d).\n",MMG5_Triangle,MMG5_Edg);
+    fprintf(stderr," on triangles (MMG5_Triangle or %d), edges"
+            " (MMG5_Edg or %d) or corners (MMG5_Crn or %d).\n",MMG5_Triangle,MMG5_Edg,MMG5_Crn);
     fprintf(stderr,"\n  ## Unknown type of entity: ignored.\n");
     return 0;
   }
@@ -447,7 +449,7 @@ int MMG2D_Set_localParameter(MMG5_pMesh mesh,MMG5_pSol sol, int typ, MMG5_int re
   mesh->info.par[mesh->info.npari].hmin  = hmin;
   mesh->info.par[mesh->info.npari].hmax  = hmax;
   mesh->info.par[mesh->info.npari].hausd = hausd;
-
+  
   switch ( typ )
   {
   case ( MMG5_Triangle ):
@@ -456,6 +458,9 @@ int MMG2D_Set_localParameter(MMG5_pMesh mesh,MMG5_pSol sol, int typ, MMG5_int re
   case ( MMG5_Edg ):
     mesh->info.parTyp |= MG_Edge;
     break;
+  case ( MMG5_Crn ) :
+    mesh->info.parTyp |= MG_Crn;
+    break;
   default:
     fprintf(stderr,"\n  ## Error: %s: unexpected entity type: %s.\n",
             __func__,MMG5_Get_entitiesName(typ));

src/mmg2d/hash_2d.c

@@ -404,7 +404,6 @@ int MMG2D_assignEdge(MMG5_pMesh mesh) {
         pa = &mesh->edge[ia];
         pt->edg[i2] = pa->ref;
         pt->tag[i2] |= pa->tag;
-
       }
     }
   }

src/mmg2d/isosiz_2d.c

@@ -339,6 +339,17 @@ int MMG2D_defsiz_iso(MMG5_pMesh mesh,MMG5_pSol met) {
           break;
         }
       }
+      
+      /* Retrieve local parameters associated to vertex k if corner */
+      if ( p0->tag & MG_CRN ) {
+        for (l=0; l<mesh->info.npar; l++) {
+          ppa = &mesh->info.par[l];
+          if ( ppa->elt == MMG5_Crn && ppa->ref == p0->ref ) {
+            met->m[k] = MG_MAX(hmin,MG_MIN(met->m[k],ppa->hmax));
+            break;
+          }
+        }
+      }
     }
   }
 

src/mmg2d/libmmg2d.h

@@ -143,6 +143,7 @@ extern "C" {
     MMG2D_DPARAM_xreg,              /*!< [val], Relaxation parameter for coordinate regularization (0<val<1) */
     MMG2D_DPARAM_rmc,               /*!< [-1/val], Remove small disconnected components in level-set mode */
     MMG2D_IPARAM_nofem,             /*!< [1/0], Do not attempt to make the mesh suitable for finite-element computations */
+    MMG2D_IPARAM_kiso,             /*!< [1/0], Keep previous isoline in mesh (in ls mode) */
     MMG2D_IPARAM_isoref,            /*!< [0/n], Iso-surface boundary material reference */
   };
 

src/mmg2d/libmmg2d_tools.c

@@ -240,6 +240,12 @@ int MMG2D_parsar(int argc,char *argv[],MMG5_pMesh mesh,MMG5_pSol met,MMG5_pSol s
           return 0;
         }
         break;
+      case 'k':
+        if ( !strcmp(argv[i],"-kiso") ) {
+          if ( !MMG2D_Set_iparameter(mesh,met,MMG2D_IPARAM_kiso,1) )
+            return 0;
+        }
+        break;
       case 'l':
         if ( !strcmp(argv[i],"-lag") ) {
           if ( ++i < argc && isdigit(argv[i][0]) ) {
@@ -695,6 +701,11 @@ int MMG2D_parsop(MMG5_pMesh mesh,MMG5_pSol met) {
               return 0;
             }
           }
+          else if ( !strcmp(data,"corners") || !strcmp(data,"corner") ) {
+            if ( !MMG2D_Set_localParameter(mesh,met,MMG5_Crn,ref,fp1,fp2,fp3) ) {
+              return 0;
+            }
+          }
           else {
             fprintf(stderr,"  %%%% Wrong format: %s\n",data);
             return 0;

src/mmg2d/mmg2d6_open.c

@@ -45,15 +45,22 @@ int MMG5_resetRef_ls_open(MMG5_pMesh mesh) {
   MMG5_pPoint     p0;
   MMG5_int        ref,k;
   int8_t          i;
-
+  
   for (k=1; k<=mesh->nt; k++) {
     pt = &mesh->tria[k];
     if ( !pt->v[0] ) continue;
 
     for (i=0; i<3; i++) {
       p0 = &mesh->point[pt->v[i]];
-      if ( pt->edg[i] == mesh->info.isoref ) pt->edg[i] = 0;
-      if ( p0->ref == mesh->info.isoref ) p0->ref = 0;
+      if ( pt->edg[i] == mesh->info.isoref ) {
+        pt->tag[i] &= ~MG_BDY;
+        pt->tag[i] &= ~MG_REF;
+        pt->edg[i] = 0;
+      }
+      if ( p0->ref == mesh->info.isoref ) {
+        p0->ref = 0;
+        p0->tag = 0;
+      }
     }
   }
 
@@ -435,17 +442,19 @@ int MMG2D_mmg2d6_open(MMG5_pMesh mesh, MMG5_pSol phi,MMG5_pSol psi) {
     return 0;
   }
 
-  /* Snapping: to do */
+  /* Snapping: not sure... may create troubles if several lines intersect */
 
   /* Removal of small parasitic components: to do */
 
   /* No need to keep adjacencies from now on */
   MMG5_DEL_MEM(mesh,mesh->adja);
 
   /* Reset the mesh->info.isoref field everywhere it appears */
-  if ( !MMG5_resetRef_ls_open(mesh) ) {
-    fprintf(stderr,"\n  ## Problem in resetting references. Exit program.\n");
-    return 0;
+  if ( !mesh->info.kiso ) {
+    if ( !MMG5_resetRef_ls_open(mesh) ) {
+      fprintf(stderr,"\n  ## Problem in resetting references. Exit program.\n");
+      return 0;
+    }
   }
 
   /* Effective splitting of the crossed triangles */