From 071a5d29a7805ff2aefdb7af8300979bffe060d0 Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Thu, 21 Nov 2019 11:03:13 +0100
Subject: [PATCH] Philippe 21/11/2019: OpenACC: protect some OpenACC calls
available from 2.6 standard
---
src/LIB/SURCOUCHE/src/mode_mnh_world.f90 | 2 ++
src/Rules.LXpgi.mk | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/LIB/SURCOUCHE/src/mode_mnh_world.f90 b/src/LIB/SURCOUCHE/src/mode_mnh_world.f90
index a03ef1c48..56f1f3fdc 100644
--- a/src/LIB/SURCOUCHE/src/mode_mnh_world.f90
+++ b/src/LIB/SURCOUCHE/src/mode_mnh_world.f90
@@ -188,6 +188,7 @@ CONTAINS
INUMDEV = ACC_GET_NUM_DEVICES(KDEVTYPE)
WRITE(*,*) " with ",INUMDEV," ",TRIM(HMSG)," (for rank 0)"
!
+#if _OPENACC >= 201711
DO JI = 1,INUMDEV
IMEMDEV = ACC_GET_PROPERTY(JI,KDEVTYPE,ACC_PROPERTY_MEMORY)
CALL ACC_GET_PROPERTY_STRING(JI,KDEVTYPE,ACC_PROPERTY_NAME, YNAMEDEV)
@@ -203,6 +204,7 @@ CONTAINS
WRITE(*,'( " #",I3,": vendor: ",A,", name: ",A,", driver: ",A )') &
INUMDEV,YVENDORDEV(1:IDXVENDORDEV),YNAMEDEV(1:IDXNAMEDEV),YDRIVERDEV(1:IDXDRIVERDEV)
END DO
+#endif
END SUBROUTINE MNH_PRINT_DEVICE_PROPERTIES
#endif
END SUBROUTINE INIT_NMNH_COMM_WORLD
diff --git a/src/Rules.LXpgi.mk b/src/Rules.LXpgi.mk
index fb94ccde3..aed227b9d 100644
--- a/src/Rules.LXpgi.mk
+++ b/src/Rules.LXpgi.mk
@@ -143,7 +143,7 @@ LDFLAGS = -Wl,-warn-once $(OPT)
#
# preprocessing flags
#
-CPP = cpp -P -traditional -Wcomment
+CPP = cpp -P -traditional -Wcomment -D_OPENACC=201711
#
CPPFLAGS_SURFEX =
CPPFLAGS_SURCOUCHE +=
--
GitLab