From 757c3c441370aad7b33c1b2b8d003d2dd8d9305a Mon Sep 17 00:00:00 2001 From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr> Date: Mon, 24 Jan 2022 15:27:00 +0100 Subject: [PATCH] Philippe 24/01/2022: OpenACC: put JPHEXT on device + update it when necessary --- src/MNH/modd_parameters.f90 | 3 ++- src/MNH/read_desfmn.f90 | 3 ++- src/MNH/read_exsegn.f90 | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/MNH/modd_parameters.f90 b/src/MNH/modd_parameters.f90 index c21c6e709..5ac0994ca 100644 --- a/src/MNH/modd_parameters.f90 +++ b/src/MNH/modd_parameters.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-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. @@ -53,6 +53,7 @@ IMPLICIT NONE !JUAN CYCLK !INTEGER, PARAMETER :: JPHEXT = 3 ! Horizontal External points number INTEGER,SAVE :: JPHEXT = 1 ! Horizontal External points number +!$acc declare copyin( JPHEXT ) ! !JUAN CYCLK INTEGER, PARAMETER :: JPVEXT = 1 ! Vertical External points number diff --git a/src/MNH/read_desfmn.f90 b/src/MNH/read_desfmn.f90 index 2f781f8e7..e433fd433 100644 --- a/src/MNH/read_desfmn.f90 +++ b/src/MNH/read_desfmn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-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. @@ -482,6 +482,7 @@ END IF IF (KMI == 1) THEN CALL POSNAM(ILUDES,'NAM_CONF',GFOUND) IF (GFOUND) READ(UNIT=ILUDES,NML=NAM_CONF) +!$acc update device( JPHEXT ) CALL POSNAM(ILUDES,'NAM_DYN',GFOUND) IF (GFOUND) READ(UNIT=ILUDES,NML=NAM_DYN) CALL POSNAM(ILUDES,'NAM_NESTING',GFOUND) diff --git a/src/MNH/read_exsegn.f90 b/src/MNH/read_exsegn.f90 index 9db15fc16..1172ca4db 100644 --- a/src/MNH/read_exsegn.f90 +++ b/src/MNH/read_exsegn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-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. @@ -560,6 +560,7 @@ IF (KMI == 1) THEN WRITE(UNIT=ILUOUT,FMT="(' namelists common to all the models ')") CALL POSNAM(ILUSEG,'NAM_CONF',GFOUND,ILUOUT) IF (GFOUND) READ(UNIT=ILUSEG,NML=NAM_CONF) +!$acc update device( JPHEXT ) CALL POSNAM(ILUSEG,'NAM_CONFZ',GFOUND,ILUOUT) IF (GFOUND) READ(UNIT=ILUSEG,NML=NAM_CONFZ) CALL POSNAM(ILUSEG,'NAM_DYN',GFOUND,ILUOUT) -- GitLab