Homogeneization of the prototype for ppgdist and ppgdistfmm functions.

As the ppgdist_s function is not implemented, the ppgdist pointer points toward the ppgdistfmm_s function for surface test cases. In this case, both funcs have to have the same prototype. Other functions are modified to maintain the prototypes consistencies.

sources/mshdis1_2d.c

@@ -1079,7 +1079,7 @@ double actival_2d(pMesh mesh,pSol sol,int k,int i) {
 }
 
 /* Propagation of the signed distance field by the Fast Marching Method */
-int ppgdistfmm_2d(pMesh mesh,pSol sol){
+int ppgdistfmm_2d(Info info,pMesh mesh,pSol sol){
   Queue     q;
   pQueue    pq;
   pTria     pt,pt1;

sources/mshdis1_3d.c

@@ -1446,7 +1446,7 @@ double actival_3d(pMesh mesh,pSol sol,int k,int i) {
 }
 
 /* Propagation of the signed distance function by the Fast Marching Method */
-int ppgdistfmm_3d(pMesh mesh,pSol sol) {
+int ppgdistfmm_3d(Info info,pMesh mesh,pSol sol) {
   Queue            q;
   pQueue           pq;
   pTetra           pt,pt1;

sources/mshdis1_s.c

@@ -547,7 +547,7 @@ double actival_s(pMesh mesh,pSol sol,int start,int i) {
 }
 
 /* Propagation of the signed distance function by the Fast Marching Method */
-int ppgdistfmm_s(pMesh mesh,pSol sol) {
+int ppgdistfmm_s(Info info,pMesh mesh,pSol sol) {
   Queue       q;
   pQueue      pq;
   pTria       pt,pt1;

sources/mshdist.c

@@ -473,7 +473,7 @@ static int mshdis1(Info info,pMesh mesh1,pMesh mesh2,pSol sol1) {
     if ( info.imprim )  fprintf(stdout,"  ** Propagation [%d cpu]\n",info.ncpu);
 
     if ( info.fmm )
-      ier = ppgdistfmm(mesh1,sol1);
+      ier = ppgdistfmm(info,mesh1,sol1);
     else
       ier = ppgdist(info,mesh1,sol1);
     chrono(OFF,&info.ctim[4]);

sources/mshdist.h

@@ -207,9 +207,9 @@ int     pack_s(pMesh ,pSol ,int *);
 int     unpack_s(pMesh ,pSol ,int *);
 int     ppgdist_2d(Info info,pMesh mesh, pSol sol);
 int     ppgdist_3d(Info info,pMesh mesh, pSol sol);
-int     ppgdistfmm_2d(pMesh mesh, pSol sol);
-int     ppgdistfmm_s(pMesh mesh, pSol sol);
-int     ppgdistfmm_3d(pMesh mesh, pSol sol);
+int     ppgdistfmm_2d(Info info,pMesh mesh, pSol sol);
+int     ppgdistfmm_s(Info info,pMesh mesh, pSol sol);
+int     ppgdistfmm_3d(Info info,pMesh mesh, pSol sol);
 int     iniencdomain_2d(Info info,pMesh mesh, pSol sol);
 int     iniencdomain_s(Info info,pMesh mesh, pSol sol);
 int     iniencdomain_3d(Info info,pMesh mesh, pSol sol);

sources/mshdistexterns.c

@@ -8,4 +8,4 @@ extern int     (*iniredist)(Info ,pMesh ,pSol ) = NULL;
 extern int     (*iniencdomain)(Info ,pMesh ,pSol ) = NULL;
 extern int     (*inireftrias)(Info ,pMesh, pSol) = NULL;
 extern int     (*ppgdist)(Info info,pMesh mesh, pSol sol) = NULL;
-extern int     (*ppgdistfmm)(pMesh mesh, pSol sol) = NULL;
+extern int     (*ppgdistfmm)(Info info,pMesh mesh, pSol sol) = NULL;

sources/mshdistexterns.h

@@ -11,6 +11,6 @@ extern int     (*iniredist)(Info ,pMesh ,pSol );
 extern int     (*iniencdomain)(Info ,pMesh ,pSol );
 extern int     (*inireftrias)(Info ,pMesh, pSol);
 extern int     (*ppgdist)(Info info,pMesh mesh, pSol sol);
-extern int     (*ppgdistfmm)(pMesh mesh, pSol sol);
+extern int     (*ppgdistfmm)(Info info,pMesh mesh, pSol sol);
 
 #endif