From 3fb4893352cb6784c1e37c22f5deb30374491309 Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Fri, 14 Jan 2022 09:30:24 +0100
Subject: [PATCH] Philippe 14/01/2022: OpenACC: use ACC_DEVICE_KIND kind
---
src/LIB/SURCOUCHE/src/mode_mnh_world.f90 | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/src/LIB/SURCOUCHE/src/mode_mnh_world.f90 b/src/LIB/SURCOUCHE/src/mode_mnh_world.f90
index 287f0a519..52a9bb5ed 100644
--- a/src/LIB/SURCOUCHE/src/mode_mnh_world.f90
+++ b/src/LIB/SURCOUCHE/src/mode_mnh_world.f90
@@ -2,15 +2,6 @@
#undef MNH_OPENACC
#endif
-#ifdef MNH_COMPILER_NVHPC
-#define MNH_ACC_SZ MNHINT32
-#elif MNH_COMPILER_CCE
-#define MNH_ACC_SZ MNHINT64
-#else
-#define MNH_ACC_SZ KIND(1)
-#endif
-
-
!MNH_LIC Copyright 1994-2022 CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
@@ -221,8 +212,8 @@ CONTAINS
CONTAINS
SUBROUTINE MNH_PRINT_DEVICE_PROPERTIES(KDEVTYPE,HMSG)
!
- INTEGER(KIND=MNH_ACC_SZ), INTENT(IN) :: KDEVTYPE
- CHARACTER(LEN=*), INTENT(IN) :: HMSG
+ INTEGER(KIND=ACC_DEVICE_KIND), INTENT(IN) :: KDEVTYPE
+ CHARACTER(LEN=*), INTENT(IN) :: HMSG
!
INTEGER :: INUMDEV, IDXNAMEDEV, IDXVENDORDEV, IDXDRIVERDEV
INTEGER(KIND=MNHINT64) :: IMEMDEV
--
GitLab