diff --git a/AutoGeneratedFile.tar.gz b/AutoGeneratedFile.tar.gz index d1df51170..0534f23b0 100644 Binary files a/AutoGeneratedFile.tar.gz and b/AutoGeneratedFile.tar.gz differ diff --git a/CHANGELOG.md b/CHANGELOG.md index ce6473d3a..8e53ecdf3 100644 --- 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 index 049ed4ae9..d38cd2cea 100644 --- 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 index 1a4c93ce0..3514b7d77 100644 --- 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 index 47cc07038..da0318965 100644 --- 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 index bd9876c4d..e72d68fb9 100644 --- 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 index 7635df6e2..fcea45500 100644 --- 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 index 37fa14641..cc61e1ac3 100644 --- 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 index 3b130beca..71bc91d6f 100644 --- 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 index fc40ee091..39723cce8 100644 --- 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 index 80ae9a009..66f9facb8 100644 --- 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 index 25429d500..99f456037 100644 --- 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 index e22de9337..ce52fb7f0 100644 --- 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 index 9d5c95888..0d85e85e6 100644 --- 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 index da45d8b48..1cb0656e8 100644 --- 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 index 01c60d388..f1225c5c2 100644 --- 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 index 11e250a27..8eb1947de 100644 --- 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 0) { AddLayers(overlapName, suppPartition[], sizeoverlaps, phi[]); - phibase[] = phi[]; if(usedARGV("-steep") != -1)