Merge branch 'develop'

add lest correction for 4.5 version
FreeFem · Feb 10, 2020 · ab09a0c · ab09a0c
2 parents 26523c0 + 6e8b138
commit ab09a0c
Show file tree

Hide file tree

Showing 17 changed files with 21 additions and 21 deletions.
diff --git a/AutoGeneratedFile.tar.gz b/AutoGeneratedFile.tar.gz
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -37,7 +37,9 @@ All notable changes to this project will be documented in this file.
 ## [4.5]
 
 ### Added
-- correct link edition with fortran mpi under windows juste use the msmpi 
+-  for  windows version: rename  under mpi `MUMPS` in `MUMPS_mpi` and in sequentiel in `MUMPS_seq` 
+    due to confict between seq. and mpi version so all MUMPS load become `MUMPS_seq` or `MUMPS<-mpi`in all examples  
+- correct link edition with fortran mpi under windows juste use the msmpi (just use `libmsmpi.dll` )
 - new `mmg` and `parmmg` (parallel mmg) plugins interfacing mmg5 and parmmg libraries, to replace `mmg3d-v4.0` and `freeyams` (Thanks to P-H Tournier)
 - a true 3d anisotropic mesh adaptation  `examples/3d/Laplace-Adapt-aniso-3d.edp`
 - an example to extract surface mesh from isovalue in `examples/3dSurf/Pinochio.edp`

diff --git a/configure.ac b/configure.ac
@@ -130,7 +130,6 @@ m4_define([TOOL_PARAMETERS],
 
 m4_define([TOOL_DISABLE],
     [AC_ARG_ENABLE($1,AC_HELP_STRING([--disable-$1],[Do not use $1]))
-
     if test "$enable_$1" = "no"
     then
         AC_SUBST([TOOL_COMPILE_$1],"")
@@ -2105,8 +2104,8 @@ if test "$ff_cmake" = yes; then
 fi
 TOOL_DISABLE(mshmet,"mshmet.$DYLIB_SUFFIX aniso.$DYLIB_SUFFIX")
 TOOL_DISABLE(gmm,ilut.$DYLIB_SUFFIX,,enable_gmm=no)
-TOOL_DISABLE(scalapack,MUMPS.$DYLIB_SUFFIX MUMPS_mpi.$DYLIB_SUFFIX)
-TOOL_DISABLE(mumps,MUMPS.$DYLIB_SUFFIX MUMPS_mpi.$DYLIB_SUFFIX)
+TOOL_DISABLE(scalapack,"MUMPS.$DYLIB_SUFFIX MUMPS_mpi.$DYLIB_SUFFIX")
+TOOL_DISABLE(mumps,"MUMPS.$DYLIB_SUFFIX MUMPS_mpi.$DYLIB_SUFFIX")
 TOOL_DISABLE(mumps_seq,"MUMPS_seq.$DYLIB_SUFFIX MUMPS.$DYLIB_SUFFIX",mumps-seq)
 TOOL_DISABLE(nlopt,ff-NLopt.$DYLIB_SUFFIX)
 

diff --git a/examples/mpi/LapMPIEigenValue.edp b/examples/mpi/LapMPIEigenValue.edp
@@ -8,7 +8,7 @@
 // -------------------------------------
 //  find $\lamda$ such that:
 // $$  \int_{\omega}  \nabla u_ \nabla v = \lamba \int_{\omega} u \nabla v  $$
-load "MUMPS"
+load "MUMPS_mpi"
 verbosity=7;
 mesh Th=square(20,20,[pi*y,pi*x]);
 Th=change(Th,fregion= (mpisize*nuTriangle)/Th.nt);

diff --git a/examples/mpi/LaplaceRT-3d-matrix-mumps.edp b/examples/mpi/LaplaceRT-3d-matrix-mumps.edp
@@ -24,7 +24,7 @@ and $ u.n = (g1n,g2n).n$ on $\Gamma_2$
 
 // brochet
 load "medit"
-load "MUMPS"
+load "MUMPS_mpi"
 include "cube.idp"
 
 

diff --git a/examples/mpi/NSCaraCyl.edp b/examples/mpi/NSCaraCyl.edp
@@ -24,7 +24,7 @@
 // --------------------------------------------------
 include "getARGV.idp"
 include "getARGV.idp"
-load "MUMPS"
+load "MUMPS_mpi"
 load "shell"
 load "scotch"
 load "pipe"

diff --git a/examples/mpi/NSI3d-carac-mumps.edp b/examples/mpi/NSI3d-carac-mumps.edp
@@ -2,7 +2,7 @@
 // NBPROC 4
 
 load "msh3"
-load "MUMPS"
+load "MUMPS_mpi"
 ////////////////////
 //  parameters
 

diff --git a/examples/mpi/Stokes-v1-matrix-mumps.edp b/examples/mpi/Stokes-v1-matrix-mumps.edp
@@ -11,7 +11,7 @@ loadpath += "./"
 
 load "msh3"
 //load "medit"
-load "MUMPS"
+load "MUMPS_mpi"
 include "getARGV.idp"
 
 verbosity=0;

diff --git a/examples/mpi/Stokes-v2-matrix-mumps.edp b/examples/mpi/Stokes-v2-matrix-mumps.edp
@@ -5,7 +5,7 @@
 // other
 load "msh3"
 load "medit"
-load "MUMPS"
+load "MUMPS_mpi"
 include "getARGV.idp"
 
 real ttgv=1e10;

diff --git a/examples/mpi/Stokes-v3-matrix-mumps.edp b/examples/mpi/Stokes-v3-matrix-mumps.edp
@@ -5,7 +5,7 @@
 // other
 load "msh3"
 load "medit"
-load "MUMPS"
+load "MUMPS_mpi"
 
 real ttgv=-1;
 //string ssparams="nprow=1, npcol="+mpisize;

diff --git a/examples/mpi/VG.edp b/examples/mpi/VG.edp
@@ -3,7 +3,7 @@
 
 // other
 //load "medit"
-load "MUMPS"
+load "MUMPS_mpi"
 include "cube.idp"
 
 real ttgv=1e10;

diff --git a/examples/mpi/cavityNewtow-MUMPS.edp b/examples/mpi/cavityNewtow-MUMPS.edp
@@ -3,7 +3,7 @@
 // time on 1 proc times: compile 0.012316s, execution 4.92302s,  mpirank:0
 // NBPROC 4
 
-load "MUMPS"
+load "MUMPS_mpi"
 
 verbosity=0; 
 real ttgv=1e30;

diff --git a/examples/mpi/chaleur3D-mumps.edp b/examples/mpi/chaleur3D-mumps.edp
@@ -1,7 +1,7 @@
 /* to mush problem see afer F. hecht 
 // NBPROC 4
 //ff-mpirun -np 4 chaleur3D-mumps.edp -glut ffglut -n 20 -op 1  -dt 0.01 -niter 10
-load "MUMPS"
+load "MUMPS_mpi"
 real ttgv=1e10;
 string ssparams="nprow=1, npcol="+mpisize; 
 include "Heat3d.idp"

diff --git a/examples/mpi/testsolver_MUMPS.edp b/examples/mpi/testsolver_MUMPS.edp
@@ -1,7 +1,7 @@
 //  run with MPI:  ff-mpirun -np 4 script.edp
 // NBPROC 4
 
-load "MUMPS"  // load the library dynamic correspond to MUMPS interface
+load "MUMPS_mpi"  // load the library dynamic correspond to MUMPS interface
 verbosity = 0;
 int[int] ICNTL(40); // declaration of ICNTL parameter for MUMPS
 

diff --git a/examples/plugin/lap-solvers.edp b/examples/plugin/lap-solvers.edp
@@ -1,5 +1,5 @@
 load "SuperLu"
-load "MUMPS"
+load "MUMPS_seq"
 verbosity=3;
 //  a example to test the level of optimisation
 // --------------------------------------------

diff --git a/idp/ffddm.idp b/idp/ffddm.idp
@@ -1,5 +1,5 @@
 load "medit"
-load "MUMPS"
+load "MUMPS_mpi"
 
 include "getARGV.idp"// to process command line options
 

diff --git a/idp/ffddm_partitioning.idp b/idp/ffddm_partitioning.idp
@@ -115,18 +115,17 @@ if (pr#isincomm)
         Isend(processor(arrayIntersectioni[j],pr#commddm,rqn[j*2]),eps);
         for(int j=0;j<arrayIntersectioni.n;++j)
         Irecv(processor(arrayIntersectioni[j],pr#commddm,rqn[j*2+1]),epsn[j]);
-        for(int j=0;j<2*arrayIntersectioni.n;++j)
-        int k = mpiWaitAny(rqn);
+        for(int j=0;j<2*arrayIntersectioni.n;++j) {
+          int k = mpiWaitAny(rqn);
+        }
       }    
       for(int i = 0; i < arrayIntersectioni.n; ++i) {
         PhGlobalff suppPartition = abs(arrayIntersectioni[i] - part) < 0.1;
 
         PhGlobalff suppP0;
         suppP0[] = suppPartition[];
-
         if (sizeoverlaps > 0) {
           AddLayers(overlapName, suppPartition[], sizeoverlaps, phi[]);
-
           phibase[] = phi[];
 
           if(usedARGV("-steep") != -1)