From bb541e6b263261479e9ede3903f1e653e95de2d0 Mon Sep 17 00:00:00 2001 From: Jerome Jackson Date: Mon, 26 Apr 2021 19:35:52 +0100 Subject: [PATCH] add a default mpi interface level --- README.install | 2 +- src/Makefile.2 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.install b/README.install index 56644a948..a3dc9dd2a 100644 --- a/README.install +++ b/README.install @@ -101,7 +101,7 @@ Parallel builds is to be used to compile wannier90. The specific interface to be used must be chosen by setting COMMS in make.inc - to one of "mpi08", "mpi90" or "mpih" (no other value is meaningful). + to one of "mpi08", "mpi90" or "mpih" (plain "mpi" is the same as "mpi90"). Particularly when wannier90 is to be used in library mode, the MPI interface specified by COMMS must be the same as that used in the calling code; otherwise diff --git a/src/Makefile.2 b/src/Makefile.2 index 5d8b4dc05..a5c85879e 100644 --- a/src/Makefile.2 +++ b/src/Makefile.2 @@ -21,7 +21,11 @@ TEMP2 = $(MPIF90) else ifeq ($(COMMS),mpih) TEMP1 = -DMPI -DMPIH TEMP2 = $(MPIF90) +else ifeq ($(COMMS),mpi90) +TEMP1 = -DMPI -DMPI90 +TEMP2 = $(MPIF90) else ifeq ($(COMMS),mpi) +# default to f90 style "use mpi" TEMP1 = -DMPI -DMPI90 TEMP2 = $(MPIF90) else