From 91422610a219773041eedadcc64d14471963add1 Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Tue, 4 Apr 2023 16:48:18 +0200
Subject: [PATCH] Philippe 04/04/2023: OpenACC: merge COPY_ZONE_TRANS_DEVICE
into COPY_ZONE_TRANS
---
src/LIB/SURCOUCHE/src/mode_exchange_ll.f90 | 91 +---------------------
1 file changed, 2 insertions(+), 89 deletions(-)
diff --git a/src/LIB/SURCOUCHE/src/mode_exchange_ll.f90 b/src/LIB/SURCOUCHE/src/mode_exchange_ll.f90
index 9aba7c897..e50387f7d 100644
--- a/src/LIB/SURCOUCHE/src/mode_exchange_ll.f90
+++ b/src/LIB/SURCOUCHE/src/mode_exchange_ll.f90
@@ -1600,7 +1600,7 @@ END IF
!
!* 1.2.1 If so, copy the zone
!
- CALL COPY_ZONE_TRANS_DEVICE(TZSEND%TELT, TZRECV%TELT, PFIELDIN, PFIELDOUT, &
+ CALL COPY_ZONE_TRANS(TZSEND%TELT, TZRECV%TELT, PFIELDIN, PFIELDOUT, &
KINFO)
!
ENDIF
@@ -1700,92 +1700,6 @@ END IF
!* 2. COPY THE VALUES OF PFIELDIN SITUATED IN THE TPSEND ZONE
!* IN THE ENTRIES OF PFIELDOUT DEFINED BY TPRECV
! -------------------------------------------------------
-!
- PFIELDOUT(IIBR:IIER,IJBR:IJER,IKBR:IKER) = &
- PFIELDIN(IIBS:IIES,IJBS:IJES,IKBS:IKES)
-!
-!-------------------------------------------------------------------------------
-!
- END SUBROUTINE COPY_ZONE_TRANS
-!
-#ifdef MNH_OPENACC
-! ######################################################################
- SUBROUTINE COPY_ZONE_TRANS_DEVICE(TPSEND, TPRECV, PFIELDIN, PFIELDOUT, KINFO)
-! ######################################################################
-!
-!!**** *COPY_ZONE_TRANS* -
-!
-!! Purpose
-!! -------
-! this routine copies the values of the PFIELDIN field situated
-! in the TPSEND zone, into the PFIELDOUT field at the TPRECV zone
-!
-!! Implicit Arguments
-!! ------------------
-! Module MODD_ARGSLIST_ll
-! type LIST_ll
-!
-! Module MODD_STRUCTURE_ll
-! type ZONE_ll
-!
-!! Reference
-!! ---------
-!
-!! Author
-!! ------
-! N. Gicquel * CERFACS - CNRM *
-!!
-!! Modifications
-!! -------------
-!! 1 october 1998
-!
-!-------------------------------------------------------------------------------
-!
-!* 0. DECLARATIONS
-! ------------
-!
- USE MODD_ARGSLIST_ll, ONLY : LIST_ll
- USE MODD_STRUCTURE_ll, ONLY : ZONE_ll
-!
- IMPLICIT NONE
-!
-!* 0.1 declarations of arguments
-!
-
- TYPE(ZONE_ll) :: TPSEND ! ZONE_ll to be sent
- TYPE(ZONE_ll) :: TPRECV ! ZONE_ll to be received
- REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PFIELDIN
- REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PFIELDOUT
- INTEGER :: KINFO ! return status
-!
-!* 0.2 declarations of local variables
-!
- TYPE(LIST_ll), POINTER :: TZLIST
- INTEGER :: IIBS, IIES, IJBS, IJES, IKBS, IKES, IIBR, IIER, &
- IJBR, IJER, IKBR, IKER
-!
-!-------------------------------------------------------------------------------
-!
-!* 1. INITIALISE DIMENSIONS
-! ---------------------
-!
- IIBS = TPSEND%NXOR
- IIES = TPSEND%NXEND
- IJBS = TPSEND%NYOR
- IJES = TPSEND%NYEND
- IKBS = TPSEND%NZOR
- IKES = TPSEND%NZEND
-!
- IIBR = TPRECV%NXOR
- IIER = TPRECV%NXEND
- IJBR = TPRECV%NYOR
- IJER = TPRECV%NYEND
- IKBR = TPRECV%NZOR
- IKER = TPRECV%NZEND
-!
-!* 2. COPY THE VALUES OF PFIELDIN SITUATED IN THE TPSEND ZONE
-!* IN THE ENTRIES OF PFIELDOUT DEFINED BY TPRECV
-! -------------------------------------------------------
!
!$acc kernels present( PFIELDIN, PFIELDOUT )
PFIELDOUT(IIBR:IIER,IJBR:IJER,IKBR:IKER) = &
@@ -1794,9 +1708,8 @@ END IF
!
!-------------------------------------------------------------------------------
!
- END SUBROUTINE COPY_ZONE_TRANS_DEVICE
+ END SUBROUTINE COPY_ZONE_TRANS
!
-#endif
! ########################################################
SUBROUTINE FILLIN_BUFFER(TPFIELD, TPZONE, PBUFFER, KINC)
! ########################################################
--
GitLab