TO REVERT : Add checks to validate the previous modifications.

MmgTools · Aug 22, 2024 · 4a5e687 · 4a5e687
1 parent 8ee20c9
commit 4a5e687
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 2 deletions.
diff --git a/src/grpsplit_pmmg.c b/src/grpsplit_pmmg.c
@@ -33,6 +33,7 @@
  */
 #include "parmmg.h"
 #include "metis_pmmg.h"
+#include "mmgexterns_private.h"
 
 /**
  * \param nelem number of elements in the initial group
@@ -1843,6 +1844,13 @@ int PMMG_split_n2mGrps(PMMG_pParMesh parmesh,int target,int fitMesh,int repartit
  if ( !ier ) {
  fprintf(stderr,"\n ## Merge groups problem.\n");
  }
+ for (int k=0; k<parmesh->ngrp; ++k ) {
+ if ( !MMG5_chkmsh(parmesh->listgrp[k].mesh,1,1) ) {
+ fprintf(stderr," ## Problem. Invalid mesh.\n");
+ return 0;
+ }
+ }
+
 
  if ( parmesh->info.imprim > PMMG_VERB_DETQUAL ) {
  chrono(OFF,&(ctim[tim]));
@@ -1907,9 +1915,23 @@ int PMMG_split_n2mGrps(PMMG_pParMesh parmesh,int target,int fitMesh,int repartit
  }
 
  /** Split the group into the suitable number of groups */
+ for (int k=0; k<parmesh->ngrp; ++k ) {
+ if ( !MMG5_chkmsh(parmesh->listgrp[k].mesh,1,1) ) {
+ fprintf(stderr," ## Problem. Invalid mesh.\n");
+ return 0;
+ }
+ }
+
  if ( ier )
  ier = PMMG_splitPart_grps(parmesh,target,fitMesh,repartitioning_mode);
 
+ for (int k=0; k<parmesh->ngrp; ++k ) {
+ if ( !MMG5_chkmsh(parmesh->listgrp[k].mesh,1,1) ) {
+ fprintf(stderr," ## Problem. Invalid mesh.\n");
+ return 0;
+ }
+ }
+
  if ( parmesh->info.imprim > PMMG_VERB_DETQUAL ) {
  chrono(OFF,&(ctim[tim]));
  printim(ctim[tim].gdif,stim);

diff --git a/src/libparmmg1.c b/src/libparmmg1.c
@@ -269,7 +269,7 @@ int PMMG_packParMesh( PMMG_pParMesh parmesh )
  }
 
  /* to could save the mesh, the adjacency have to be correct */
- if ( mesh->info.ddebug ) {
+// if ( mesh->info.ddebug ) {
  if ( (!mesh->adja) && !MMG3D_hashTetra(mesh,1) ) {
  fprintf(stderr,"\n ## Error: %s: tetra hashing problem. Exit program.\n",
  __func__);
@@ -279,7 +279,7 @@ int PMMG_packParMesh( PMMG_pParMesh parmesh )
  fprintf(stderr," ## Problem. Invalid mesh.\n");
  return 0;
  }
- }
+// }
  }
 
  return 1;
@@ -624,6 +624,12 @@ int PMMG_parmmglib1( PMMG_pParMesh parmesh )
 
  if ( !mesh ) continue;
 
+ if ( !MMG5_chkmsh(mesh,1,1) ) {
+ fprintf(stderr," ## Problem. Invalid mesh.\n");
+ return 0;
+ }
+
+
  memset(&mesh->xtetra[mesh->xt+1],0,(mesh->xtmax-mesh->xt)*sizeof(MMG5_xTetra));
  memset(&mesh->xpoint[mesh->xp+1],0,(mesh->xpmax-mesh->xp)*sizeof(MMG5_xPoint));
 
@@ -665,6 +671,12 @@ int PMMG_parmmglib1( PMMG_pParMesh parmesh )
  met = parmesh->listgrp[i].met;
  field = parmesh->listgrp[i].field;
 
+
+ if ( !MMG5_chkmsh(mesh,1,1) ) {
+ fprintf(stderr," ## Problem. Invalid mesh.\n");
+ return 0;
+ }
+
 #warning Luca: until analysis is not ready
 #ifdef USE_POINTMAP
  for( k = 1; k <= mesh->np; k++ )
@@ -939,6 +951,14 @@ int PMMG_parmmglib1( PMMG_pParMesh parmesh )
  ier = PMMG_merge_grps(parmesh,0);
  MPI_Allreduce( &ier, &ieresult, 1, MPI_INT, MPI_MIN, parmesh->comm );
 
+ for (int k=0; k<parmesh->ngrp; ++k ) {
+ if ( !MMG5_chkmsh(parmesh->listgrp[k].mesh,1,1) ) {
+ fprintf(stderr," ## Problem. Invalid mesh.\n");
+ return 0;
+ }
+ }
+
+
  if ( parmesh->info.imprim > PMMG_VERB_STEPS ) {
  chrono(OFF,&(ctim[tim]));
  printim(ctim[tim].gdif,stim);

diff --git a/src/loadbalancing_pmmg.c b/src/loadbalancing_pmmg.c
@@ -32,6 +32,8 @@
  *
  */
 #include "parmmg.h"
+#include "mmgexterns_private.h"
+
 
 /**
  * \param parmesh pointer toward a parmesh structure
@@ -89,6 +91,14 @@ int PMMG_loadBalancing(PMMG_pParMesh parmesh,int partitioning_mode) {
  ier = PMMG_split_n2mGrps(parmesh,PMMG_GRPSPL_DISTR_TARGET,1,partitioning_mode);
  }
 
+ for (int k=0; k<parmesh->ngrp; ++k ) {
+ if ( !MMG5_chkmsh(parmesh->listgrp[k].mesh,1,1) ) {
+ fprintf(stderr," ## Problem. Invalid mesh.\n");
+ return 0;
+ }
+ }
+
+
  /* There is mpi comms in distribute_grps thus we don't want that one proc
  * enters the function and not the other proc */
  MPI_Allreduce( &ier, &ier_glob, 1, MPI_INT, MPI_MIN, parmesh->comm);
@@ -152,6 +162,12 @@ int PMMG_loadBalancing(PMMG_pParMesh parmesh,int partitioning_mode) {
  }
  }
  }
+ for (int k=0; k<parmesh->ngrp; ++k ) {
+ if ( !MMG5_chkmsh(parmesh->listgrp[k].mesh,1,1) ) {
+ fprintf(stderr," ## Problem. Invalid mesh.\n");
+ return 0;
+ }
+ }
 
  if ( parmesh->info.imprim > PMMG_VERB_DETQUAL ) {
  chrono(OFF,&(ctim[tim]));