Merge pull request #92 from laetitia-m/feature/fix-citest-multidom-distrib

Feature/fix citest multidom distrib

Author: Algiane

src/API_functions_pmmg.c

@@ -410,7 +410,7 @@ void PMMG_Init_parameters(PMMG_pParMesh parmesh,MPI_Comm comm) {
   parmesh->ddebug                  = PMMG_NUL;
   parmesh->iter                    = PMMG_UNSET;
   parmesh->niter                   = PMMG_NITER;
-  parmesh->info.fem                = MMG5_FEM;
+  parmesh->info.setfem             = MMG5_FEM;
   parmesh->info.repartitioning     = PMMG_REDISTRIBUTION_mode;
   parmesh->info.ifc_layers         = PMMG_MVIFCS_NLAYERS;
   parmesh->info.grps_ratio         = PMMG_GRPS_RATIO;
@@ -675,7 +675,7 @@ int PMMG_Set_iparameter(PMMG_pParMesh parmesh, int iparam,int val) {
     break;
 
   case PMMG_IPARAM_nofem :
-    parmesh->info.fem    = (val==1)? 0 : 1;
+    parmesh->info.setfem = (val==1)? 0 : 1;
     for ( k=0; k<parmesh->ngrp; ++k ) {
       mesh = parmesh->listgrp[k].mesh;
       met  = parmesh->listgrp[k].met;

src/libparmmg1.c

@@ -672,7 +672,7 @@ int PMMG_parmmglib1( PMMG_pParMesh parmesh )
 #endif
 
       /* Reset the value of the fem mode */
-      mesh->info.fem = parmesh->info.fem;
+      mesh->info.fem = parmesh->info.setfem;
 
       if ( (!mesh->np) && (!mesh->ne) ) {
         /* Empty mesh */

src/libparmmg_tools.c

@@ -501,7 +501,7 @@ int PMMG_parsar( int argc, char *argv[], PMMG_pParMesh parmesh )
   /** Step 5: Transfer options parsed by Mmg toward ParMmg (if needed) and raise
    * errors for unsupported options */
   parmesh->info.iso = parmesh->listgrp[0].mesh->info.iso;
-  parmesh->info.fem = parmesh->listgrp[0].mesh->info.fem;
+  parmesh->info.setfem = parmesh->listgrp[0].mesh->info.setfem;
   parmesh->info.sethmin = parmesh->listgrp[0].mesh->info.sethmin;
   parmesh->info.sethmax = parmesh->listgrp[0].mesh->info.sethmax;
 

src/libparmmgtypes.h

@@ -359,7 +359,7 @@ typedef struct {
   int isosurf; /*!< ls mode on boundaries only (not yet available) */
   int lag;     /*!< lagrangian motion (not yet available) */
   int root;    /*!< MPI root rank */
-  int fem;     /*!< fem mesh (no elt with more than 1 bdy face */
+  int setfem;  /*!< fem mesh (no elt with more than 1 bdy face */
   int mmg_imprim; /*!< 1 if the user has manually setted the mmg verbosity */
   int repartitioning; /*!< way to perform mesh repartitioning */
   int ifc_layers;  /*!< nb of layers for interface displacement */

src/parmmg.c

@@ -493,7 +493,7 @@ int main( int argc, char *argv[] )
     }
   }
 
-  /* Check ouput success */
+  /* Check output success */
   if ( ierSave<1 ) {
     PMMG_RETURN_AND_FREE(parmesh,PMMG_STRONGFAILURE);
   }