From e4dbad578e7c54f56844781e18f3fc6ddcbc2e94 Mon Sep 17 00:00:00 2001 From: ESCOBAR Juan <escj@nuwa> Date: Mon, 10 Nov 2014 17:48:31 +0100 Subject: [PATCH] Juan 10/11/2014 : proporly manage MPPDB_CHECK3D from host to DEVICE --- MNH/ppm.f90 | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/MNH/ppm.f90 b/MNH/ppm.f90 index 60d661d79..0f8ebfaae 100644 --- a/MNH/ppm.f90 +++ b/MNH/ppm.f90 @@ -542,9 +542,9 @@ ZFNEG=PSRC #ifdef TEMPO_JUAN !$acc end kernels CALL GET_HALO_D(ZDMQ,HDIR="01_X") -IF (MPPDB_INITIALIZED) THEN -!$acc update host(ZDMQ) -ENDIF +!!$IF (MPPDB_INITIALIZED) THEN +!!$!$acc update host(ZDMQ) +!!$ENDIF CALL MPPDB_CHECK3DM("PPM::PPM_01_X OPEN ::ZDMQ",PRECISION,ZDMQ) !$acc kernels #endif @@ -1575,9 +1575,9 @@ ZFNEG(:,:,IKE+1) = (ZQR(:,:,IKE)-PSRC(:,:,IKE+1))*PCR(:,:,IKE+1) + & #endif CALL GET_HALO_D(PR) -IF (MPPDB_INITIALIZED) THEN -!$acc update host(PR) -ENDIF +!!$IF (MPPDB_INITIALIZED) THEN +!!$!$acc update host(PR) +!!$ENDIF CALL MPPDB_CHECK3DM("PPM::PPM_01_Z ::PR",PRECISION,PR) ! !!$CONTAINS @@ -2003,10 +2003,10 @@ ENDIF !$acc end kernels #endif ! -CALL GET_HALO(PR,HDIR="S0_X") -IF (MPPDB_INITIALIZED) THEN -!$acc update host(PR) -ENDIF +CALL GET_HALO_D(PR,HDIR="S0_X") +!!$IF (MPPDB_INITIALIZED) THEN +!!$!$acc update host(PR) +!!$ENDIF CALL MPPDB_CHECK3DM("PPM::PPM_S0_X OPEN ::PR",PRECISION,PR) !!$! !!$END SELECT @@ -2344,10 +2344,10 @@ ENDIF ! acc end data #endif ! - CALL GET_HALO(PR,HDIR="S0_Y") - IF (MPPDB_INITIALIZED) THEN - !$acc update host(PR) - ENDIF + CALL GET_HALO_D(PR,HDIR="S0_Y") +!!$ IF (MPPDB_INITIALIZED) THEN +!!$ !$acc update host(PR) +!!$ ENDIF CALL MPPDB_CHECK3DM("PPM::PPM_S0_Y OPEN ::PR",PRECISION,PR) ! !!$END SELECT @@ -2540,10 +2540,10 @@ ZFNEG(:,:,IKE+1) = (ZPHAT(:,:,IKE+1) - PSRC(:,:,IKE+1))*PCR(:,:,IKE+1) + & ! acc end data #endif ! - CALL GET_HALO(PR) ! JUAN - IF (MPPDB_INITIALIZED) THEN - !$acc update host(PR) - ENDIF + CALL GET_HALO_D(PR) ! JUAN +!!$ IF (MPPDB_INITIALIZED) THEN +!!$ !$acc update host(PR) +!!$ ENDIF CALL MPPDB_CHECK3DM("PPM::PPM_S0_Z ::PR",PRECISION,PR) ! END SUBROUTINE PPM_S0_Z_D -- GitLab