From f67e2f03d4b0daa65f2d010a0b9b32d0ff354d9b Mon Sep 17 00:00:00 2001 From: JUan ESCOBAR <juan.escobar@aero.obs-mip.fr> Date: Fri, 16 Apr 2021 16:47:12 +0200 Subject: [PATCH] Juan 16/04/2021: modd_precision.f90+Rules.LXifort.mk , for mpiifort/intel-mpi add cpp key = -DMNH_NO_MPI_LOGICAL48 --- src/MNH/modd_precision.f90 | 5 +++++ src/Rules.LXifort.mk | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/MNH/modd_precision.f90 b/src/MNH/modd_precision.f90 index 0d8b16a39..a759ddf1f 100644 --- a/src/MNH/modd_precision.f90 +++ b/src/MNH/modd_precision.f90 @@ -54,8 +54,13 @@ integer, parameter :: MNHREAL128 = selected_real_kind( p = 33, r = 4931 ) integer, parameter :: MNHINT32_MPI = MPI_INTEGER4 integer, parameter :: MNHINT64_MPI = MPI_INTEGER8 +#ifdef MNH_NO_MPI_LOGICAL48 +integer, parameter :: MNHLOG32_MPI = MPI_LOGICAL +integer, parameter :: MNHLOG64_MPI = MPI_LOGICAL +#else integer, parameter :: MNHLOG32_MPI = MPI_LOGICAL4 integer, parameter :: MNHLOG64_MPI = MPI_LOGICAL8 +#endif integer, parameter :: MNHREAL32_MPI = MPI_REAL4 integer, parameter :: MNHREAL64_MPI = MPI_REAL8 diff --git a/src/Rules.LXifort.mk b/src/Rules.LXifort.mk index 6920bf3a7..41d28547b 100644 --- a/src/Rules.LXifort.mk +++ b/src/Rules.LXifort.mk @@ -137,13 +137,13 @@ CPPFLAGS_SURCOUCHE += -DMNH_USE_MPI_STATUSES_IGNORE endif else ifeq "$(VER_MPI)" "MPIINTEL" +CPPFLAGS_SURCOUCHE += -DMNH_USE_MPI_STATUSES_IGNORE -DMNH_NO_MPI_LOGICAL48 ifneq "$(findstring TAU,$(XYZ))" "" F90 = tau_f90.sh export TAU_MAKEFILE?=/home/escj/PATCH/TAU/TAU-2.21.1-IFORT10-OMPI152-THREAD/x86_64/lib/Makefile.tau-mpi LIBS += -lz else F90 = mpiifort -CPPFLAGS_SURCOUCHE += -DMNH_USE_MPI_STATUSES_IGNORE endif ifeq "$(MNH_INT)" "8" OPT_BASE += -ilp64 -- GitLab