From 579a22b1cc2a3bbc29a57fb9b274b8372b461696 Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Thu, 10 Feb 2022 09:10:37 +0100
Subject: [PATCH] Naima + Philippe 10/02/2022: move data present directives for
optional dummy arguments inside if-present protected regions
---
src/MNH/condensation.f90 | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/MNH/condensation.f90 b/src/MNH/condensation.f90
index 5af15ec9d..f3fb77c5b 100644
--- a/src/MNH/condensation.f90
+++ b/src/MNH/condensation.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2002-2021 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2002-2022 CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
@@ -238,7 +238,7 @@ REAL, DIMENSION(-22:11),PARAMETER :: ZSRC_1D =(/ &
!
!-------------------------------------------------------------------------------
!
-!$acc data present(PPABS, PZZ, PT, PRV, PRC, PRI, PRS, PRG, PSIGS, PMFCONV, PCLDFR, PSIGRC, PLV, PLS, PCPH)
+!$acc data present(PPABS, PZZ, PT, PRV, PRC, PRI, PRS, PRG, PSIGS, PMFCONV, PCLDFR, PSIGRC)
IF (MPPDB_INITIALIZED) THEN
!Check all IN arrays
@@ -305,8 +305,10 @@ END DO
! Preliminary calculations
! latent heat of vaporisation/sublimation
IF(GPRESENT_PLV .AND. GPRESENT_PLS) THEN
+!$acc data present( PLV, PLS )
ZLV(:,:,:)=PLV(:,:,:)
ZLS(:,:,:)=PLS(:,:,:)
+!$acc end data
ELSE
DO JK=IKTB,IKTE
DO JJ=KJB,KJE
@@ -320,7 +322,9 @@ ELSE
ENDDO
ENDIF
IF(GPRESENT_PCPH) THEN
+!$acc data present( PCPH )
ZCPD(:,:,:)=PCPH(:,:,:)
+!$acc end data
ELSE
DO JK=IKTB,IKTE
DO JJ=KJB,KJE
--
GitLab