From 035aefb5b1c02c8c491018e4eeae9ba697c61557 Mon Sep 17 00:00:00 2001 From: Juan Escobar <juan.escobar@aero.obs-mip.fr> Date: Fri, 17 Sep 2021 18:28:49 +0200 Subject: [PATCH] Juan 17/09/2021:advecuvw_rk.f90,contrav.f90,ppm.f90 : Use Fast GET_HALO2_DF --- src/ZSOLVER/advecuvw_rk.f90 | 6 +++--- src/ZSOLVER/contrav.f90 | 8 ++++---- src/ZSOLVER/ppm.f90 | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/ZSOLVER/advecuvw_rk.f90 b/src/ZSOLVER/advecuvw_rk.f90 index ffdce5df2..6bdfae2fe 100644 --- a/src/ZSOLVER/advecuvw_rk.f90 +++ b/src/ZSOLVER/advecuvw_rk.f90 @@ -467,9 +467,9 @@ IF (GFIRST_CALL_ADVECUVW_RK) THEN CALL INIT_HALO2_ll(TZHALO2_VT,1,IIU,IJU,IKU) CALL INIT_HALO2_ll(TZHALO2_WT,1,IIU,IJU,IKU) END IF - CALL GET_HALO2_D(ZUT,TZHALO2_UT,HNAME='ZUT') - CALL GET_HALO2_D(ZVT,TZHALO2_VT,HNAME='ZVT') - CALL GET_HALO2_D(ZWT,TZHALO2_WT,HNAME='ZWT') + CALL GET_HALO2_DF(ZUT,TZHALO2_UT,HNAME='ZUT') + CALL GET_HALO2_DF(ZVT,TZHALO2_VT,HNAME='ZVT') + CALL GET_HALO2_DF(ZWT,TZHALO2_WT,HNAME='ZWT') ! acc update device(ZUT,ZVT,ZWT) #endif diff --git a/src/ZSOLVER/contrav.f90 b/src/ZSOLVER/contrav.f90 index b909f2298..97df82096 100644 --- a/src/ZSOLVER/contrav.f90 +++ b/src/ZSOLVER/contrav.f90 @@ -651,10 +651,10 @@ IF (KADV_ORDER == 4 ) THEN !!$ CALL UPDATE_HALO2_ll(TZFIELD_DZX, TZHALO2_DZX, IINFO_ll) !!$ CALL UPDATE_HALO2_ll(TZFIELD_DZY, TZHALO2_DZY, IINFO_ll) ! - CALL GET_HALO2_D(PRUCT,TZHALO2_U,'CONTRAV::PRUCT') - CALL GET_HALO2_D(PRVCT,TZHALO2_V,'CONTRAV::PRVCT') - CALL GET_HALO2_D(PDZX,TZHALO2_DZX,'CONTRAV::PDZX') - CALL GET_HALO2_D(PDZY,TZHALO2_DZY,'CONTRAV::PDZY') + CALL GET_HALO2_DF(PRUCT,TZHALO2_U,'CONTRAV::PRUCT') + CALL GET_HALO2_DF(PRVCT,TZHALO2_V,'CONTRAV::PRVCT') + CALL GET_HALO2_DF(PDZX,TZHALO2_DZX,'CONTRAV::PDZX') + CALL GET_HALO2_DF(PDZY,TZHALO2_DZY,'CONTRAV::PDZY') !!$!$acc update device(PRUCT,PRVCT) !!$ !!$ END IF diff --git a/src/ZSOLVER/ppm.f90 b/src/ZSOLVER/ppm.f90 index bfeac23c6..11f508d76 100644 --- a/src/ZSOLVER/ppm.f90 +++ b/src/ZSOLVER/ppm.f90 @@ -2598,7 +2598,7 @@ IF (GFIRST_CALL_PPM_S0_X) THEN NULLIFY(TZ_PSRC_HALO2_ll) CALL INIT_HALO2_ll(TZ_PSRC_HALO2_ll,1,IIU,IJU,IKU) END IF -CALL GET_HALO2_D(PSRC, TZ_PSRC_HALO2_ll, HNAME='PSRC') +CALL GET_HALO2_DF(PSRC, TZ_PSRC_HALO2_ll, HNAME='PSRC') !$acc kernels ZPSRC_HALO2_WEST(:,:) = TZ_PSRC_HALO2_ll%HALO2%WEST(:,:) ZPHAT=PSRC @@ -3057,7 +3057,7 @@ IF (GFIRST_CALL_PPM_S0_Y) THEN NULLIFY(TZ_PSRC_HALO2_ll) CALL INIT_HALO2_ll(TZ_PSRC_HALO2_ll,1,IIU,IJU,IKU) END IF -CALL GET_HALO2_D(PSRC, TZ_PSRC_HALO2_ll, HNAME='PSRC') +CALL GET_HALO2_DF(PSRC, TZ_PSRC_HALO2_ll, HNAME='PSRC') ! ! Initialize with relalistic value all work array ! -- GitLab