Merge branch 'master' into develop

MmgTools · Sep 17, 2023 · 966c6ed · 966c6ed
2 parents aa5ac04 + 433519f
commit 966c6ed
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 8 deletions.
diff --git a/src/common/mmg2.c b/src/common/mmg2.c
@@ -344,7 +344,13 @@ int MMG5_MultiMat_init(MMG5_pMesh mesh) {
 
   /* Initialize the max and min reference */
   refmax = 0;
-  refmin = INT_MAX;
+
+  if ( sizeof(MMG5_int) == 8 ) {
+    refmin = LONG_MAX;
+  }
+  else {
+    refmin = INT_MAX;
+  }
 
   /* Look for the max/min reference provided in material table */
   for( k = 0; k < mesh->info.nmat; k++ ) {

diff --git a/src/mmg2d/API_functions_2d.c b/src/mmg2d/API_functions_2d.c
@@ -225,9 +225,17 @@ int MMG2D_Set_iparameter(MMG5_pMesh mesh, MMG5_pSol sol, int iparam, MMG5_int va
                   return 0);
     MMG5_SAFE_CALLOC(mesh->info.par,mesh->info.npar,MMG5_Par,return 0);
 
+    MMG5_int inival;
+    if ( sizeof(MMG5_int) == 8 ) {
+      inival = LONG_MAX;
+    }
+    else {
+      inival = INT_MAX;
+    }
+
     for (k=0; k<mesh->info.npar; k++) {
       mesh->info.par[k].elt   = MMG5_Noentity;
-      mesh->info.par[k].ref   = INT_MAX;
+      mesh->info.par[k].ref   = inival;
       mesh->info.par[k].hausd = mesh->info.hausd;
       mesh->info.par[k].hmin  = mesh->info.hmin;
       mesh->info.par[k].hmax  = mesh->info.hmax;

diff --git a/src/mmg2d/hash_2d.c b/src/mmg2d/hash_2d.c
@@ -55,7 +55,13 @@ int MMG2D_hashTria(MMG5_pMesh mesh) {
   hsize = mesh->nt;
 
   /* init */
-  inival = INT_MAX;
+  if ( sizeof(MMG5_int) == 8 ) {
+    inival = LONG_MAX;
+  }
+  else {
+    inival = INT_MAX;
+  }
+
   for (k=0; k<=mesh->nt; k++)
     hcode[k] = -inival;
 
@@ -185,7 +191,14 @@ int MMG2D_hashQuad(MMG5_pMesh mesh) {
 
   /* init */
   if ( mesh->info.ddebug )  fprintf(stdout,"  h- stage 1: init\n");
-  inival = INT_MAX;
+
+  if ( sizeof(MMG5_int) == 8 ) {
+    inival = LONG_MAX;
+  }
+  else {
+    inival = INT_MAX;
+  }
+
   iadr   = 0;
   for (k=0; k<=mesh->nquad; k++)
     hcode[k] = -inival;

diff --git a/src/mmg3d/API_functions_3d.c b/src/mmg3d/API_functions_3d.c
@@ -2234,9 +2234,17 @@ int MMG3D_Set_iparameter(MMG5_pMesh mesh, MMG5_pSol sol, int iparam,MMG5_int val
                   return 0);
     MMG5_SAFE_CALLOC(mesh->info.par,mesh->info.npar,MMG5_Par,return 0);
 
+    MMG5_int inival;
+    if ( sizeof(MMG5_int) == 8 ) {
+      inival = LONG_MAX;
+    }
+    else {
+      inival = INT_MAX;
+    }
+
     for (k=0; k<mesh->info.npar; k++) {
       mesh->info.par[k].elt   = MMG5_Noentity;
-      mesh->info.par[k].ref   = INT_MAX;
+      mesh->info.par[k].ref   = inival;
       mesh->info.par[k].hausd = mesh->info.hausd;
       mesh->info.par[k].hmin  = mesh->info.hmin;
       mesh->info.par[k].hmax  = mesh->info.hmax;

diff --git a/src/mmg3d/hash_3d.c b/src/mmg3d/hash_3d.c
@@ -151,7 +151,14 @@ int MMG3D_hashTetra(MMG5_pMesh mesh, int pack) {
 
   /* init */
   if ( mesh->info.ddebug )  fprintf(stdout,"  h- stage 1: init\n");
-  inival = INT_MAX;
+
+  if ( sizeof(MMG5_int) == 8 ) {
+    inival = LONG_MAX;
+  }
+  else {
+    inival = INT_MAX;
+  }
+
   iadr   = 0;
   for (k=0; k<=mesh->ne; k++)
     hcode[k] = -inival;
@@ -270,7 +277,14 @@ int MMG3D_hashPrism(MMG5_pMesh mesh) {
 
   /* init */
   if ( mesh->info.ddebug )  fprintf(stdout,"  h- stage 1: init\n");
-  inival = INT_MAX;
+
+  if ( sizeof(MMG5_int) == 8 ) {
+    inival = LONG_MAX;
+  }
+  else {
+    inival = INT_MAX;
+  }
+
   iadr   = 0;
   for (k=0; k<=mesh->nprism; k++)
     hcode[k] = -inival;

diff --git a/src/mmgs/API_functions_s.c b/src/mmgs/API_functions_s.c
@@ -1393,9 +1393,17 @@ int MMGS_Set_iparameter(MMG5_pMesh mesh, MMG5_pSol sol, int iparam, MMG5_int val
                   return 0);
     MMG5_SAFE_CALLOC(mesh->info.par,mesh->info.npar,MMG5_Par,return 0);
 
+    MMG5_int inival;
+    if ( sizeof(MMG5_int) == 8 ) {
+      inival = LONG_MAX;
+    }
+    else {
+      inival = INT_MAX;
+    }
+
     for (k=0; k<mesh->info.npar; k++) {
       mesh->info.par[k].elt   = MMG5_Noentity;
-      mesh->info.par[k].ref   = INT_MAX;
+      mesh->info.par[k].ref   = inival;
       mesh->info.par[k].hausd = mesh->info.hausd;
       mesh->info.par[k].hmin  = mesh->info.hmin;
       mesh->info.par[k].hmax  = mesh->info.hmax;