Merge branch 'develop'

CHANGELOG.md

@@ -37,6 +37,7 @@ 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 
 - 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`

configure.ac

@@ -2105,8 +2105,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)
-TOOL_DISABLE(mumps,MUMPS.$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)
 

etc/config/m4/acmpi.m4

@@ -117,13 +117,6 @@ esac
 
 		   mkdir -p 3rdparty/include/msmpi
 		   mkdir -p 3rdparty/lib/msmpi
-		   ## add to msmpi 10.0
-		   echo " hack MSMPI V10.0 "
-		   echo "void __guard_check_icall_fptr(unsigned long ptr) { }" > 3rdparty/lib/msmpi/cfg_stub.c
-		   gcc -o 3rdparty/lib/msmpi/cfg_stub.o -c 3rdparty/lib/msmpi/cfg_stub.c
-		   #gcc -shared -o 3rdparty/lib/msmpi/cfg_stub.dll 3rdparty/lib/msmpi/cfg_stub.o
-		   #rm 3rdparty/lib/msmpi/cfg_stub.o
-		   #rm 3rdparty/lib/msmpi/cfg_stub.c
 
 		   cp "$MSMPI_INC"/*.h 3rdparty/include/msmpi
 		   grep -v INT_PTR_KIND "$MSMPI_INC"/mpif.h >3rdparty/include/msmpi/mpif.h
@@ -139,15 +132,16 @@ esac
 		   # to reinstall msmpi .. 
 
 #  MSMPI
-    if test -x "`which msmpi.dll`"
+    msmpi_dll="`which msmpi.dll`"
+    if test -x "$msmpi_dll"
     then
 #  Remove for scotch and parmetis
 	ff_MPI_INCLUDE="-I$ff_MPI_INCLUDE_DIR  -D__int64=long\ long"
 	with_mpiinc="$ff_MPI_INCLUDE"
 	test -z "$MPIRUN" -a -x "$ffMSMPI_BIN/mpiexe.exe" && MPIRUN="$MSMPI_BIN\mpiexe.exe"
-	ff_MPI_LIBC="'$ff_msmpi_lib/msmpi.lib'"
-	ff_MPI_LIB="'$ff_msmpi_lib/msmpi.lib'"
-	ff_MPI_LIBFC="'$ff_msmpi_lib/msmpifec.lib' '$ff_msmpi_lib/msmpi.lib' '$ff_msmpi_lib/cfg_stub.o' "
+	ff_MPI_LIBC="$msmpi_dll"
+	ff_MPI_LIB="$msmpi_dll"
+	ff_MPI_LIBFC="$msmpi_dll"
 	ff_mpiexec_win="C:\Program Files\Microsoft MPI\Bin\mpiexec.exe"
 	test -z "$ff_mpiexec_win" && MPIRUN="$ff_mpiexec_win"
 	test -z "$MPICXX" && MPICXX="$CXX $ff_MPI_INCLUDE"

etc/jenkins/deployDEB-ffpetsc.sh

@@ -12,14 +12,7 @@ VERSION=`grep AC_INIT configure.ac | cut -d"," -f2`
 RELEASE_TAG_NAME="v$VERSION"
 distrib=`uname -s`-`uname -r`
 
-##if [ "$distrib" == "Linux-4.4.0-166-generic" ]; then
-  # 16.04
 DISTRIB="Ubuntu"
-##elif [ "$distrib" == "Linux-4.15.0-51-generic" ]; then
-  # 18.04
-##DISTRIB="Ubuntu_18.04"
-##fi
-
 
 DEB_NAME="freefem_${VERSION}_withPETSc_amd64"
 GH_DEB_NAME="FreeFEM_${VERSION}_${DISTRIB}_withPETSc_amd64.deb"
@@ -89,6 +82,6 @@ fi
 
 # clean the VM
 rm -rf $DEB_NAME
-rm -rf $GH_DEB_NAME
+rm $GH_DEB_NAME
 
 . ./bin/uninstall-ff++

etc/jenkins/deployDEB.sh

@@ -14,7 +14,7 @@ distrib=`uname -s`-`uname -r`
 
 DISTRIB="Ubuntu"
 
-DEB_NAME="freefem_${VERSION}-1_amd64.deb"
+DEB_NAME="freefem_${VERSION}-1_amd64"
 GH_DEB_NAME="FreeFEM_${VERSION}_${DISTRIB}_amd64.deb"
 
 ## DEB build
@@ -79,6 +79,6 @@ fi
 
 # clean the VM
 rm -rf $DEB_NAME
-rm -rf $GH_DEB_NAME
+rm $GH_DEB_NAME
 
 . ./bin/uninstall-ff++

examples/mpi/MUMPS.edp

@@ -1,7 +1,7 @@
 //  run with MPI:  ff-mpirun -np 4 script.edp
 // NBPROC 4
 
-load "MUMPS"
+load "MUMPS_mpi" // add _mpi for windows do day
 // load "symmetrizeCSR"
 int[int] l = [1, 1, 2, 2];
 mesh Th = square(150, 150, label = l);