From 5a7b8a1e2d6ef32ebcff50cfe097fa6f1bd98207 Mon Sep 17 00:00:00 2001 From: Balthasar Reuter Date: Wed, 19 Jun 2024 15:38:03 +0200 Subject: [PATCH] Fixes for GPU-aware MPI with CCE17, ROCm 5.7.1 --- src/trans/gpu/internal/uvtvd_mod.F90 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/trans/gpu/internal/uvtvd_mod.F90 b/src/trans/gpu/internal/uvtvd_mod.F90 index 486596b8..e67fae2f 100755 --- a/src/trans/gpu/internal/uvtvd_mod.F90 +++ b/src/trans/gpu/internal/uvtvd_mod.F90 @@ -1,6 +1,6 @@ ! (C) Copyright 1991- ECMWF. ! (C) Copyright 1991- Meteo-France. -! +! ! This software is licensed under the terms of the Apache Licence Version 2.0 ! which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. ! In applying this licence, ECMWF does not waive the privileges and immunities @@ -102,8 +102,7 @@ SUBROUTINE UVTVD(KFIELD) !$OMP& MAP(ALLOC:ZN) & !$OMP& MAP(TO:D_MYMS,D_NUMP,R_NTMAX) & !$OMP& MAP(TO:F_RN) & -!$OMP& MAP(ALLOC:ZEPSNM) & -!$OMP& SHARED(I_DIV_OFFSET) +!$OMP& MAP(ALLOC:ZEPSNM,ZOA1,ZOA2) #endif #ifdef OMPGPU @@ -126,7 +125,7 @@ SUBROUTINE UVTVD(KFIELD) #ifdef ACCGPU !$ACC PARALLEL LOOP COLLAPSE(2) PRIVATE(KM,IN) DEFAULT(NONE) & !$ACC& COPYIN(KFIELD) & -!$ACC& PRESENT(D_NUMP,D_MYMS,F_RN,R_NTMAX) +!$ACC& PRESENT(D_NUMP,D_MYMS,F_RN,R_NTMAX,ZOA1) #endif DO KMLOC=1,D_NUMP DO J=1,2*KFIELD @@ -142,7 +141,7 @@ SUBROUTINE UVTVD(KFIELD) #ifdef OMPGPU !$OMP TARGET TEAMS DISTRIBUTE PARALLEL DO COLLAPSE(3) PRIVATE(IR,II,IN,KM,ZKM) DEFAULT(NONE) & -!$OMP& SHARED(D_NUMP,R_NTMAX,KFIELD,D_MYMS,ZN,ZEPSNM) +!$OMP& SHARED(D_NUMP,R_NTMAX,KFIELD,D_MYMS,ZN,ZEPSNM,I_DIV_OFFSET,ZOA1,ZOA2) #endif #ifdef ACCGPU !$ACC PARALLEL LOOP COLLAPSE(3) PRIVATE(IR,II,IN,KM,ZKM) DEFAULT(NONE) &