From 177e70e0fed61f91b0e600c6b706af9e5cd6125f Mon Sep 17 00:00:00 2001 From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr> Date: Thu, 10 Feb 2022 12:01:15 +0100 Subject: [PATCH] Philippe 10/02/2022: fix: MNH_MEM_RELEASE was outside OpenACC ifdef --- src/MNH/advecuvw_4th.f90 | 2 ++ src/MNH/advecuvw_rk.f90 | 2 ++ src/MNH/advecuvw_weno_k.f90 | 2 ++ src/ZSOLVER/advecuvw_rk.f90 | 2 ++ src/ZSOLVER/advecuvw_weno_k.f90 | 2 ++ 5 files changed, 10 insertions(+) diff --git a/src/MNH/advecuvw_4th.f90 b/src/MNH/advecuvw_4th.f90 index 7f596bd9d..d523b56f5 100644 --- a/src/MNH/advecuvw_4th.f90 +++ b/src/MNH/advecuvw_4th.f90 @@ -364,8 +364,10 @@ PRWS(:,:,:) = PRWS(:,:,:) - ZTEMP4 !$acc end data +#ifdef MNH_OPENACC !Release all memory allocated with MNH_MEM_GET calls since last call to MNH_MEM_POSITION_PIN CALL MNH_MEM_RELEASE() +#endif IF (MPPDB_INITIALIZED) THEN !Check all INOUT arrays diff --git a/src/MNH/advecuvw_rk.f90 b/src/MNH/advecuvw_rk.f90 index fe1f69f13..fc1572e0e 100644 --- a/src/MNH/advecuvw_rk.f90 +++ b/src/MNH/advecuvw_rk.f90 @@ -616,8 +616,10 @@ CALL DEL_HALO2_ll(TZHALO2MT_ll) !$acc end data +#ifdef MNH_OPENACC !Release all memory allocated with MNH_MEM_GET calls since last call to MNH_MEM_POSITION_PIN CALL MNH_MEM_RELEASE() +#endif IF (MPPDB_INITIALIZED) THEN !Check all OUT arrays diff --git a/src/MNH/advecuvw_weno_k.f90 b/src/MNH/advecuvw_weno_k.f90 index 3d5e27a03..edd110e87 100644 --- a/src/MNH/advecuvw_weno_k.f90 +++ b/src/MNH/advecuvw_weno_k.f90 @@ -678,8 +678,10 @@ END SELECT !$acc end data +#ifdef MNH_OPENACC !Release all memory allocated with MNH_MEM_GET calls since beginning of subroutine CALL MNH_MEM_RELEASE() +#endif IF (MPPDB_INITIALIZED) THEN CALL MPPDB_CHECK(PRUS,"ADVECUVW_WENO_K end:PRUS") diff --git a/src/ZSOLVER/advecuvw_rk.f90 b/src/ZSOLVER/advecuvw_rk.f90 index 8f62e91d0..4e2f367d6 100644 --- a/src/ZSOLVER/advecuvw_rk.f90 +++ b/src/ZSOLVER/advecuvw_rk.f90 @@ -630,8 +630,10 @@ CALL DEL_HALO2_ll(TZHALO2MT_ll) !$acc end data +#ifdef MNH_OPENACC !Release all memory allocated with MNH_MEM_GET calls since last call to MNH_MEM_POSITION_PIN CALL MNH_MEM_RELEASE() +#endif IF (MPPDB_INITIALIZED) THEN !Check all OUT arrays diff --git a/src/ZSOLVER/advecuvw_weno_k.f90 b/src/ZSOLVER/advecuvw_weno_k.f90 index 098ab2c8c..28ac37630 100644 --- a/src/ZSOLVER/advecuvw_weno_k.f90 +++ b/src/ZSOLVER/advecuvw_weno_k.f90 @@ -700,8 +700,10 @@ END SELECT !$acc end data +#ifdef MNH_OPENACC !Release all memory allocated with MNH_MEM_GET calls since beginning of subroutine CALL MNH_MEM_RELEASE() +#endif IF (MPPDB_INITIALIZED) THEN CALL MPPDB_CHECK(PRUS,"ADVECUVW_WENO_K end:PRUS") -- GitLab