From db47c4f1d176142eb785867eb6d84e95f71ac2c1 Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Wed, 2 Oct 2019 16:16:37 +0200
Subject: [PATCH] Philippe 02/10/2019: OpenACC: remove declare present
directives from module declaration sections (to be standard compliant)
---
src/MNH/adv_boundaries.f90 | 3 ---
src/MNH/advec_4th_order_aux.f90 | 2 --
src/MNH/advec_ppm_algo.f90 | 4 ----
src/MNH/advec_weno_k_1_aux.f90 | 10 ++------
src/MNH/advec_weno_k_2_aux.f90 | 38 +-----------------------------
src/MNH/advec_weno_k_3_aux.f90 | 40 +-------------------------------
src/MNH/advecuvw_4th.f90 | 3 ---
src/MNH/advecuvw_rk.f90 | 8 -------
src/MNH/advecuvw_weno_k.f90 | 6 +----
src/MNH/contrav.f90 | 4 ----
src/MNH/emoist.f90 | 10 ++------
src/MNH/etheta.f90 | 10 ++------
src/MNH/get_halo.f90 | 1 -
src/MNH/gradient_m.f90 | 6 -----
src/MNH/gradient_u.f90 | 12 ++--------
src/MNH/gradient_v.f90 | 12 ++--------
src/MNH/gradient_w.f90 | 12 ++--------
src/MNH/les_mean_subgrid.f90 | 2 --
src/MNH/les_ver_int.f90 | 1 -
src/MNH/ppm.f90 | 1 -
src/MNH/ppm_met.f90 | 16 +------------
src/MNH/ppm_rhodj.f90 | 9 +++----
src/MNH/prandtl.f90 | 5 ----
src/MNH/rotate_wind.f90 | 11 ++-------
src/MNH/shuman_device.f90 | 21 ++---------------
src/MNH/tke_eps_sources.f90 | 4 ----
src/MNH/tm06_h.f90 | 2 --
src/MNH/tridiag_thermo.f90 | 11 ++-------
src/MNH/tridiag_tke.f90 | 11 ++-------
src/MNH/tridiag_w.f90 | 7 +++---
src/MNH/tridiag_wind.f90 | 11 ++-------
src/MNH/turb_hor.f90 | 12 ----------
src/MNH/turb_hor_dyn_corr.f90 | 7 ------
src/MNH/turb_hor_splt.f90 | 13 -----------
src/MNH/turb_hor_sv_flux.f90 | 8 -------
src/MNH/turb_hor_thermo_corr.f90 | 9 -------
src/MNH/turb_hor_thermo_flux.f90 | 9 -------
src/MNH/turb_hor_tke.f90 | 14 ++---------
src/MNH/turb_hor_uv.f90 | 5 ----
src/MNH/turb_hor_uw.f90 | 5 ----
src/MNH/turb_hor_vw.f90 | 9 -------
src/MNH/turb_ver.f90 | 13 -----------
src/MNH/turb_ver_dyn_flux.f90 | 9 -------
src/MNH/turb_ver_thermo_corr.f90 | 12 ----------
src/MNH/turb_ver_thermo_flux.f90 | 12 ----------
src/MNH/update_lm.f90 | 1 -
46 files changed, 34 insertions(+), 397 deletions(-)
diff --git a/src/MNH/adv_boundaries.f90 b/src/MNH/adv_boundaries.f90
index c5e4df752..43cbe4735 100644
--- a/src/MNH/adv_boundaries.f90
+++ b/src/MNH/adv_boundaries.f90
@@ -24,7 +24,6 @@ END INTERFACE
!
CHARACTER(LEN=4), DIMENSION(2), INTENT(IN) :: HLBCX,HLBCY ! X and Y-direc. LBC type
REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PFIELD
-!$acc declare present(PFIELD)
!
END SUBROUTINE ADV_BOUNDARIES_DEVICE1
!
@@ -33,7 +32,6 @@ END SUBROUTINE ADV_BOUNDARIES_DEVICE1
CHARACTER(LEN=4), DIMENSION(2), INTENT(IN) :: HLBCX,HLBCY ! X and Y-direc. LBC type
REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PFIELD
REAL, DIMENSION(:,:,:), INTENT(IN) :: PFIELDI
-!$acc declare present(PFIELD,PFIELDI)
!
END SUBROUTINE ADV_BOUNDARIES_DEVICE2
!
@@ -43,7 +41,6 @@ CHARACTER(LEN=4), DIMENSION(2), INTENT(IN) :: HLBCX,HLBCY ! X and Y-direc
REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PFIELD
REAL, DIMENSION(:,:,:), INTENT(IN) :: PFIELDI
CHARACTER(LEN=1), INTENT(IN) :: HFIELD ! Field type
-!$acc declare present(PFIELD,PFIELDI)
!
END SUBROUTINE ADV_BOUNDARIES_DEVICE3
!
diff --git a/src/MNH/advec_4th_order_aux.f90 b/src/MNH/advec_4th_order_aux.f90
index 4313d08eb..c06782fd5 100644
--- a/src/MNH/advec_4th_order_aux.f90
+++ b/src/MNH/advec_4th_order_aux.f90
@@ -18,9 +18,7 @@ CHARACTER (LEN=4), DIMENSION(2), INTENT(IN) :: HLBCX ! X direction LBC type
CHARACTER (LEN=4), DIMENSION(2), INTENT(IN) :: HLBCY ! Y direction LBC type
!
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PMEANX, PMEANY ! fluxes
-!$acc declare present(PMEANX,PMEANY)
REAL, DIMENSION(:,:,:), INTENT(IN) :: PFIELDT ! variable at t
-!$acc declare present(PFIELDT)
INTEGER, INTENT(IN) :: KGRID ! C grid localisation
!
TYPE(HALO2_ll), OPTIONAL, POINTER :: TPHALO2 ! halo2 for the field at t
diff --git a/src/MNH/advec_ppm_algo.f90 b/src/MNH/advec_ppm_algo.f90
index 6fc8e9945..196b546cf 100644
--- a/src/MNH/advec_ppm_algo.f90
+++ b/src/MNH/advec_ppm_algo.f90
@@ -21,18 +21,14 @@ CHARACTER (LEN=4), DIMENSION(2), INTENT(IN) :: HLBCY ! Y direction LBC type
CHARACTER (LEN=6), INTENT(IN) :: HMET_ADV_SCHEME
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PFIELDT ! variable at t
-!$acc declare present(PFIELDT)
INTEGER, INTENT(IN) :: KGRID ! C grid localisation
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PCRU, PCRV, PCRW ! Courant numbers
-!$acc declare present(PCRU,PCRV,PCRW)
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHODJ ! density
-!$acc declare present(PRHODJ)
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHOX1, PRHOX2
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHOY1, PRHOY2
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHOZ1, PRHOZ2
-!$acc declare present(PRHOX1,PRHOX2,PRHOY1,PRHOY2,PRHOZ1,PRHOZ2)
REAL, INTENT(IN) :: PTSTEP ! Time step model
REAL, INTENT(IN) :: PTSTEP_PPM ! Time Step PPM
TYPE (DATE_TIME), INTENT(IN) :: TPDTCUR ! current date and time
diff --git a/src/MNH/advec_weno_k_1_aux.f90 b/src/MNH/advec_weno_k_1_aux.f90
index 0af47fef5..b12e73b45 100644
--- a/src/MNH/advec_weno_k_1_aux.f90
+++ b/src/MNH/advec_weno_k_1_aux.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2013-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
! ##############################
MODULE MODI_ADVEC_WENO_K_1_AUX
@@ -20,7 +20,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PSRC ! variable on U grid at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRUCT ! contrav. comp. on MASS GRID
!
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PR ! output src term
-!$acc declare present(PSRC,PRUCT,PR)
END SUBROUTINE UP_UX_DEVICE
!
FUNCTION UP_MX(PSRC, PRUCT) RESULT(PR)
@@ -35,7 +34,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PSRC ! variable on U grid at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRUCT ! contrav. comp. on MASS GRID
!
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PR ! output src term
-!$acc declare present(PSRC,PRUCT,PR)
END SUBROUTINE UP_MX_DEVICE
!
FUNCTION UP_VY(PSRC, PRVCT) RESULT(PR)
@@ -50,7 +48,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PSRC ! variable on U grid at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRVCT ! contrav. comp. on MASS GRID
!
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PR ! output src term
-!$acc declare present(PSRC,PRVCT,PR)
END SUBROUTINE UP_VY_DEVICE
!
FUNCTION UP_MY(PSRC, PRVCT) RESULT(PR)
@@ -65,7 +62,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PSRC ! variable on U grid at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRVCT ! contrav. comp. on MASS GRID
!
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PR ! output src term
-!$acc declare present(PSRC,PRVCT,PR)
END SUBROUTINE UP_MY_DEVICE
!
FUNCTION UP_WZ(PSRC, PRWCT) RESULT(PR)
@@ -80,7 +76,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PSRC ! variable on U grid at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRWCT ! contrav. comp. on MASS GRID
!
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PR ! output src term
-!$acc declare present(PSRC,PRWCT,PR)
END SUBROUTINE UP_WZ_DEVICE
!
FUNCTION UP_MZ(PSRC, PRWCT) RESULT(PR)
@@ -95,7 +90,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PSRC ! variable on U grid at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRWCT ! contrav. comp. on MASS GRID
!
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PR ! output src term
-!$acc declare present(PSRC,PRWCT,PR)
END SUBROUTINE UP_MZ_DEVICE
!
END INTERFACE
diff --git a/src/MNH/advec_weno_k_2_aux.f90 b/src/MNH/advec_weno_k_2_aux.f90
index d6dfbe12a..7e355f164 100644
--- a/src/MNH/advec_weno_k_2_aux.f90
+++ b/src/MNH/advec_weno_k_2_aux.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2013-2019 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.
@@ -26,27 +26,21 @@ CHARACTER (LEN=4), DIMENSION(2), INTENT(IN) :: HLBCX ! X direction LBC type
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PSRC ! variable on U grid at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRUCT ! contrav. comp. on MASS GRID
-!$acc declare present(PSRC,PRUCT)
!
! output source term
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PR
-!$acc declare present(PR)
#ifndef _OPENACC
TYPE(HALO2_ll), OPTIONAL, POINTER :: TPHALO2 ! halo2 for the field at t
#else
REAL, DIMENSION(:,:), INTENT(IN) :: TWEST,TEAST
-!$acc declare copyin(TWEST,TEAST)
!
! Work arrays
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZFPOS1, ZFPOS2
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZFNEG1, ZFNEG2
-!$acc declare present(ZFPOS1,ZFPOS2,ZFNEG1,ZFNEG2)
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZBPOS1, ZBPOS2
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZBNEG1, ZBNEG2
-!$acc declare present(ZBPOS1,ZBPOS2,ZBNEG1,ZBNEG2)
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZOMP1, ZOMP2
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZOMN1, ZOMN2
-!$acc declare present(ZOMP1,ZOMP2,ZOMN1,ZOMN2)
#endif
!
END SUBROUTINE ADVEC_WENO_K_2_UX
@@ -70,27 +64,21 @@ CHARACTER (LEN=4), DIMENSION(2), INTENT(IN) :: HLBCX ! X direction LBC type
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PSRC ! variable on U grid at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRUCT ! contrav. comp. on MASS GRID
-!$acc declare present(PSRC,PRUCT)
!
! output source term
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PR
-!$acc declare present(PR)
#ifndef _OPENACC
TYPE(HALO2_ll), OPTIONAL, POINTER :: TPHALO2 ! halo2 for the field at t
#else
REAL, DIMENSION(:,:), INTENT(IN) :: TWEST,TEAST
-!$acc declare copyin(TWEST,TEAST)
!
! Work arrays
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZFPOS1, ZFPOS2
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZFNEG1, ZFNEG2
-!$acc declare present(ZFPOS1,ZFPOS2,ZFNEG1,ZFNEG2)
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZBPOS1, ZBPOS2
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZBNEG1, ZBNEG2
-!$acc declare present(ZBPOS1,ZBPOS2,ZBNEG1,ZBNEG2)
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZOMP1, ZOMP2
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZOMN1, ZOMN2
-!$acc declare present(ZOMP1,ZOMP2,ZOMN1,ZOMN2)
#endif
!
END SUBROUTINE ADVEC_WENO_K_2_MX
@@ -114,28 +102,22 @@ CHARACTER (LEN=4), DIMENSION(2), INTENT(IN) :: HLBCY ! Y direction LBC type
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PSRC ! variable on U grid at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRVCT ! contrav. comp. on MASS GRID
-!$acc declare present(PSRC,PRVCT)
!
!
! output source term
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PR
-!$acc declare present(PR)
#ifndef _OPENACC
TYPE(HALO2_ll), OPTIONAL, POINTER :: TPHALO2 ! halo2 for the field at t
#else
REAL, DIMENSION(:,:), INTENT(IN) :: TNORTH,TSOUTH
-!$acc declare copyin(TNORTH,TSOUTH)
!
! Work arrays
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZFPOS1, ZFPOS2
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZFNEG1, ZFNEG2
-!$acc declare present(ZFPOS1,ZFPOS2,ZFNEG1,ZFNEG2)
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZBPOS1, ZBPOS2
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZBNEG1, ZBNEG2
-!$acc declare present(ZBPOS1,ZBPOS2,ZBNEG1,ZBNEG2)
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZOMP1, ZOMP2
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZOMN1, ZOMN2
-!$acc declare present(ZOMP1,ZOMP2,ZOMN1,ZOMN2)
#endif
!
END SUBROUTINE ADVEC_WENO_K_2_VY
@@ -159,27 +141,21 @@ CHARACTER (LEN=4), DIMENSION(2), INTENT(IN) :: HLBCY ! Y direction LBC type
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PSRC ! variable on U grid at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRVCT ! contrav. comp. on MASS GRID
-!$acc declare present(PSRC,PRVCT)
!
! output source term
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PR
-!$acc declare present(PR)
#ifndef _OPENACC
TYPE(HALO2_ll), OPTIONAL, POINTER :: TPHALO2 ! halo2 for the field at t
#else
REAL, DIMENSION(:,:), INTENT(IN) :: TNORTH,TSOUTH
-!$acc declare copyin(TNORTH,TSOUTH)
!
! Work arrays
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZFPOS1, ZFPOS2
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZFNEG1, ZFNEG2
-!$acc declare present(ZFPOS1,ZFPOS2,ZFNEG1,ZFNEG2)
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZBPOS1, ZBPOS2
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZBNEG1, ZBNEG2
-!$acc declare present(ZBPOS1,ZBPOS2,ZBNEG1,ZBNEG2)
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZOMP1, ZOMP2
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZOMN1, ZOMN2
-!$acc declare present(ZOMP1,ZOMP2,ZOMN1,ZOMN2)
#endif
!
END SUBROUTINE ADVEC_WENO_K_2_MY
@@ -191,7 +167,6 @@ FUNCTION WENO_K_2_WZ(PSRC, PRWCT) RESULT(PR)
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PSRC ! variable on W grid at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRWCT ! contrav. comp. on MASS GRID
-!$acc declare present(PSRC,PRWCT)
!
! output source term
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: PR
@@ -204,22 +179,17 @@ SUBROUTINE WENO_K_2_WZ(PSRC, PRWCT, PR, &
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PSRC ! variable on W grid at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRWCT ! contrav. comp. on MASS GRID
-!$acc declare present(PSRC,PRWCT)
!
! output source term
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PR
-!$acc declare present(PR)
!
! Work arrays
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZFPOS1, ZFPOS2
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZFNEG1, ZFNEG2
-!$acc declare present(ZFPOS1,ZFPOS2,ZFNEG1,ZFNEG2)
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZBPOS1, ZBPOS2
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZBNEG1, ZBNEG2
-!$acc declare present(ZBPOS1,ZBPOS2,ZBNEG1,ZBNEG2)
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZOMP1, ZOMP2
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZOMN1, ZOMN2
-!$acc declare present(ZOMP1,ZOMP2,ZOMN1,ZOMN2)
!
END SUBROUTINE WENO_K_2_WZ
#endif
@@ -231,7 +201,6 @@ FUNCTION WENO_K_2_MZ(PSRC, PRWCT) RESULT(PR)
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PSRC ! variable on MASS grid at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRWCT ! contrav. comp. on W grid
-!$acc declare present(PSRC,PRWCT)
!
! output source term
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: PR
@@ -244,22 +213,17 @@ SUBROUTINE WENO_K_2_MZ(PSRC, PRWCT, PR, &
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PSRC ! variable on MASS grid at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRWCT ! contrav. comp. on W grid
-!$acc declare present(PSRC,PRWCT)
!
! output source term
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PR
-!$acc declare present(PR)
!
! Work arrays
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZFPOS1, ZFPOS2
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZFNEG1, ZFNEG2
-!$acc declare present(ZFPOS1,ZFPOS2,ZFNEG1,ZFNEG2)
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZBPOS1, ZBPOS2
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZBNEG1, ZBNEG2
-!$acc declare present(ZBPOS1,ZBPOS2,ZBNEG1,ZBNEG2)
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZOMP1, ZOMP2
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZOMN1, ZOMN2
-!$acc declare present(ZOMP1,ZOMP2,ZOMN1,ZOMN2)
!
END SUBROUTINE WENO_K_2_MZ
#endif
diff --git a/src/MNH/advec_weno_k_3_aux.f90 b/src/MNH/advec_weno_k_3_aux.f90
index d77535512..440a55e43 100644
--- a/src/MNH/advec_weno_k_3_aux.f90
+++ b/src/MNH/advec_weno_k_3_aux.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2013-2019 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.
@@ -29,23 +29,17 @@ CHARACTER (LEN=4), DIMENSION(2), INTENT(IN) :: HLBCX ! X direction LBC type
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PSRC ! variable on U grid at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRUCT ! contrav. comp. on MASS GRID
-!$acc declare present(PSRC,PRUCT)
!
! output source term
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PR
-!$acc declare present(PR)
#ifdef _OPENACC
! Work arrays
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZFPOS1, ZFPOS2, ZFPOS3
-!$acc declare present(ZFPOS1, ZFPOS2, ZFPOS3)
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZFNEG1, ZFNEG2, ZFNEG3
-!$acc declare present(ZFNEG1, ZFNEG2, ZFNEG3)
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZBPOS1, ZBPOS2, ZBPOS3
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZBNEG1, ZBNEG2, ZBNEG3
-!$acc declare present(ZBPOS1, ZBPOS2, ZBPOS3, ZBNEG1, ZBNEG2, ZBNEG3)
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZOMP1, ZOMP2, ZOMP3
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZOMN1, ZOMN2, ZOMN3
-!$acc declare present(ZOMP1, ZOMP2, ZOMP3, ZOMN1, ZOMN2, ZOMN3)
#endif
!
END SUBROUTINE ADVEC_WENO_K_3_UX
@@ -69,23 +63,17 @@ CHARACTER (LEN=4), DIMENSION(2), INTENT(IN) :: HLBCX ! X direction LBC type
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PSRC ! variable on U grid at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRUCT ! contrav. comp. on MASS GRID
-!$acc declare present(PSRC,PRUCT)
!
! output source term
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PR
-!$acc declare present(PR)
#ifdef _OPENACC
! Work arrays
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZFPOS1, ZFPOS2, ZFPOS3
-!$acc declare present(ZFPOS1, ZFPOS2, ZFPOS3)
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZFNEG1, ZFNEG2, ZFNEG3
-!$acc declare present(ZFNEG1, ZFNEG2, ZFNEG3)
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZBPOS1, ZBPOS2, ZBPOS3
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZBNEG1, ZBNEG2, ZBNEG3
-!$acc declare present(ZBPOS1, ZBPOS2, ZBPOS3, ZBNEG1, ZBNEG2, ZBNEG3)
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZOMP1, ZOMP2, ZOMP3
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZOMN1, ZOMN2, ZOMN3
-!$acc declare present(ZOMP1, ZOMP2, ZOMP3, ZOMN1, ZOMN2, ZOMN3)
#endif
!
END SUBROUTINE ADVEC_WENO_K_3_MX
@@ -109,24 +97,18 @@ CHARACTER (LEN=4), DIMENSION(2), INTENT(IN) :: HLBCY ! Y direction LBC type
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PSRC ! variable on U grid at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRVCT ! contrav. comp. on MASS GRID
-!$acc declare present(PSRC,PRVCT)
!
!
! output source term
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PR
-!$acc declare present(PR)
#ifdef _OPENACC
! Work arrays
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZFPOS1, ZFPOS2, ZFPOS3
-!$acc declare present(ZFPOS1, ZFPOS2, ZFPOS3)
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZFNEG1, ZFNEG2, ZFNEG3
-!$acc declare present(ZFNEG1, ZFNEG2, ZFNEG3)
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZBPOS1, ZBPOS2, ZBPOS3
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZBNEG1, ZBNEG2, ZBNEG3
-!$acc declare present(ZBPOS1, ZBPOS2, ZBPOS3, ZBNEG1, ZBNEG2, ZBNEG3)
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZOMP1, ZOMP2, ZOMP3
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZOMN1, ZOMN2, ZOMN3
-!$acc declare present(ZOMP1, ZOMP2, ZOMP3, ZOMN1, ZOMN2, ZOMN3)
#endif
!
END SUBROUTINE ADVEC_WENO_K_3_VY
@@ -150,23 +132,17 @@ CHARACTER (LEN=4), DIMENSION(2), INTENT(IN) :: HLBCY ! Y direction LBC type
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PSRC ! variable on U grid at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRVCT ! contrav. comp. on MASS GRID
-!$acc declare present(PSRC,PRVCT)
!
! output source term
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PR
-!$acc declare present(PR)
#ifdef _OPENACC
! Work arrays
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZFPOS1, ZFPOS2, ZFPOS3
-!$acc declare present(ZFPOS1, ZFPOS2, ZFPOS3)
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZFNEG1, ZFNEG2, ZFNEG3
-!$acc declare present(ZFNEG1, ZFNEG2, ZFNEG3)
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZBPOS1, ZBPOS2, ZBPOS3
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZBNEG1, ZBNEG2, ZBNEG3
-!$acc declare present(ZBPOS1, ZBPOS2, ZBPOS3, ZBNEG1, ZBNEG2, ZBNEG3)
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZOMP1, ZOMP2, ZOMP3
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZOMN1, ZOMN2, ZOMN3
-!$acc declare present(ZOMP1, ZOMP2, ZOMP3, ZOMN1, ZOMN2, ZOMN3)
#endif
!
END SUBROUTINE ADVEC_WENO_K_3_MY
@@ -178,7 +154,6 @@ FUNCTION WENO_K_3_WZ(PSRC, PRWCT) RESULT(PR)
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PSRC ! variable on W grid at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRWCT ! contrav. comp. on MASS GRID
-!$acc declare present(PSRC,PRVCT)
!
! output source term
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: PR
@@ -192,23 +167,17 @@ SUBROUTINE WENO_K_3_WZ(PSRC, PRWCT, PR, &
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PSRC ! variable on W grid at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRWCT ! contrav. comp. on MASS GRID
-!$acc declare present(PSRC,PRVCT)
!
! output source term
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PR
-!$acc declare present(PR)
!
! Work arrays
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZFPOS1, ZFPOS2, ZFPOS3
-!$acc declare present(ZFPOS1, ZFPOS2, ZFPOS3)
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZFNEG1, ZFNEG2, ZFNEG3
-!$acc declare present(ZFNEG1, ZFNEG2, ZFNEG3)
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZBPOS1, ZBPOS2, ZBPOS3
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZBNEG1, ZBNEG2, ZBNEG3
-!$acc declare present(ZBPOS1, ZBPOS2, ZBPOS3, ZBNEG1, ZBNEG2, ZBNEG3)
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZOMP1, ZOMP2, ZOMP3
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZOMN1, ZOMN2, ZOMN3
-!$acc declare present(ZOMP1, ZOMP2, ZOMP3, ZOMN1, ZOMN2, ZOMN3)
!
END SUBROUTINE WENO_K_3_WZ
#endif
@@ -220,7 +189,6 @@ FUNCTION WENO_K_3_MZ(PSRC, PRWCT) RESULT(PR)
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PSRC ! variable on MASS grid at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRWCT ! contrav. comp. on W grid
-!$acc declare present(PSRC,PRWCT)
!
! output source term
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: PR
@@ -234,23 +202,17 @@ SUBROUTINE WENO_K_3_MZ(PSRC, PRWCT, PR, &
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PSRC ! variable on MASS grid at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRWCT ! contrav. comp. on W grid
-!$acc declare present(PSRC,PRWCT)
!
! output source term
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PR
-!$acc declare present(PR)
!
! Work arrays
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZFPOS1, ZFPOS2, ZFPOS3
-!$acc declare present(ZFPOS1, ZFPOS2, ZFPOS3)
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZFNEG1, ZFNEG2, ZFNEG3
-!$acc declare present(ZFNEG1, ZFNEG2, ZFNEG3)
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZBPOS1, ZBPOS2, ZBPOS3
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZBNEG1, ZBNEG2, ZBNEG3
-!$acc declare present(ZBPOS1, ZBPOS2, ZBPOS3, ZBNEG1, ZBNEG2, ZBNEG3)
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZOMP1, ZOMP2, ZOMP3
REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: ZOMN1, ZOMN2, ZOMN3
-!$acc declare present(ZOMP1, ZOMP2, ZOMP3, ZOMN1, ZOMN2, ZOMN3)
!
END SUBROUTINE WENO_K_3_MZ
#endif
diff --git a/src/MNH/advecuvw_4th.f90 b/src/MNH/advecuvw_4th.f90
index 5e14c7844..64f4059b7 100644
--- a/src/MNH/advecuvw_4th.f90
+++ b/src/MNH/advecuvw_4th.f90
@@ -20,13 +20,10 @@ CHARACTER (LEN=4), DIMENSION(2), INTENT(IN) :: HLBCY ! Y direction LBC type
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRUCT ! contravariant
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRVCT ! components
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRWCT ! of momentum
-!$acc declare present(PRUCT,PRVCT,PRWCT)
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PUT, PVT, PWT ! U,V,W at t
-!$acc declare present(PUT,PVT,PWT)
!
REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PRUS, PRVS, PRWS ! Source terms
-!$acc declare present(PRUS, PRVS, PRWS)
!
TYPE(HALO2LIST_ll), POINTER :: TPHALO2LIST ! list for diffusion
!
diff --git a/src/MNH/advecuvw_rk.f90 b/src/MNH/advecuvw_rk.f90
index 9563e0dac..83c97ae54 100644
--- a/src/MNH/advecuvw_rk.f90
+++ b/src/MNH/advecuvw_rk.f90
@@ -34,31 +34,23 @@ CHARACTER(LEN=4),DIMENSION(2),INTENT(IN):: HLBCX, HLBCY ! X- and Y-direc LBC
REAL, INTENT(IN) :: PTSTEP
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PU , PV , PW
-!$acc declare present(PU,PV,PW)
! Variables to advect
REAL, DIMENSION(:,:,:), INTENT(IN) :: PUT, PVT , PWT
-!$acc declare present(PUT,PVT,PWT)
! Variables at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PMXM_RHODJ
REAL, DIMENSION(:,:,:), INTENT(IN) :: PMYM_RHODJ
REAL, DIMENSION(:,:,:), INTENT(IN) :: PMZM_RHODJ
-!$acc declare present(PMXM_RHODJ,PMYM_RHODJ,PMZM_RHODJ)
! metric coefficients
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRUCT , PRVCT, PRWCT
-!$acc declare present(PRUCT,PRVCT,PRWCT)
! Contravariant wind components
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PRUS_ADV , PRVS_ADV, PRWS_ADV
-!$acc declare present(PRUS_ADV,PRVS_ADV,PRWS_ADV)
! Tendency due to advection
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRUS_OTHER , PRVS_OTHER, PRWS_OTHER
-!$acc declare present(PRUS_OTHER,PRVS_OTHER,PRWS_OTHER)
! ! tendencies from other processes
#ifdef _OPENACC
! Work arrays
REAL, DIMENSION(:,:,:) :: ZUT, ZVT, ZWT
-!$acc declare present(ZUT,ZVT,ZWT)
REAL, DIMENSION(:,:,:,:) :: ZRUS,ZRVS,ZRWS
-!$acc declare present(ZRUS,ZRVS,ZRWS)
#endif
!
!
diff --git a/src/MNH/advecuvw_weno_k.f90 b/src/MNH/advecuvw_weno_k.f90
index 298452283..01b66a841 100644
--- a/src/MNH/advecuvw_weno_k.f90
+++ b/src/MNH/advecuvw_weno_k.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2013-2019 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.
@@ -27,20 +27,16 @@ INTEGER, INTENT(IN) :: KWENO_ORDER ! Order of the WENO
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRUCT ! contravariant
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRVCT ! components
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRWCT ! of momentum
-!$acc declare present(PRUCT,PRVCT,PRWCT)
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PUT, PVT, PWT ! U,V,W at t
-!$acc declare present(PUT,PVT,PWT)
!
REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PRUS, PRVS, PRWS ! Source terms
-!$acc declare present(PRUS,PRVS,PRWS)
!
TYPE(HALO2LIST_ll), POINTER :: TPHALO2LIST ! list for diffusion
!
#ifdef _OPENACC
! Work arrays
REAL, DIMENSION(:,:,:) :: ZMEAN, ZWORK
-!$acc declare present(ZMEAN,ZWORK)
#endif
!
END SUBROUTINE ADVECUVW_WENO_K
diff --git a/src/MNH/contrav.f90 b/src/MNH/contrav.f90
index e4556009d..c5d4157f1 100644
--- a/src/MNH/contrav.f90
+++ b/src/MNH/contrav.f90
@@ -40,20 +40,16 @@ CHARACTER (LEN=4), DIMENSION(2), INTENT(IN) :: HLBCY ! Y direction LBC type
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRUT ! Cartesian comp along x
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRVT ! Cartesian comp along y
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRWT ! Cartesian comp along z
-!$acc declare present(PRUT,PRVT,PRWT)
REAL, DIMENSION(:,:,:), INTENT(IN) :: PDXX ! Metric coefficients
REAL, DIMENSION(:,:,:), INTENT(IN) :: PDYY ! Metric coefficients
REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZZ ! Metric coefficients
REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZX ! Metric coefficients
REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZY ! Metric coefficients
-!$acc declare present(PDXX,PDYY,PDZZ,PDZX,PDZY)
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PRUCT ! Contrav comp along x-bar
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PRVCT ! Contrav comp along y-bar
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PRWCT ! Contrav comp along z-bar
-!$acc declare present(PRUCT,PRVCT,PRWCT)
INTEGER, INTENT(IN) :: KADV_ORDER ! Order of the advection scheme
REAL, DIMENSION(:,:,:), INTENT(OUT) :: Z1,Z2 ! Work arrays
-!$acc declare present(Z1,Z2)
LOGICAL, OPTIONAL, INTENT(IN) :: ODATA_ON_DEVICE ! Is some of the data on the accelerator device
!
!
diff --git a/src/MNH/emoist.f90 b/src/MNH/emoist.f90
index becf7b6d9..baebb8a4f 100644
--- a/src/MNH/emoist.f90
+++ b/src/MNH/emoist.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 turb 2006/05/18 13:07:25
-!-----------------------------------------------------------------
!#################
MODULE MODI_EMOIST
!#################
@@ -35,7 +30,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PSRCM ! Normalized 2dn_order
REAL,DIMENSION(SIZE(PTHLM,1),SIZE(PTHLM,2),SIZE(PTHLM,3)):: PEMOIST ! result
#else
REAL,DIMENSION(SIZE(PTHLM,1),SIZE(PTHLM,2),SIZE(PTHLM,3)), INTENT(OUT):: PEMOIST ! result
-!$acc declare present(PTHLM,PRM,PLOCPEXNM,PAMOIST,PSRCM,PEMOIST)
#endif
!
#ifndef _OPENACC
diff --git a/src/MNH/etheta.f90 b/src/MNH/etheta.f90
index 59456b2ad..ac103d668 100644
--- a/src/MNH/etheta.f90
+++ b/src/MNH/etheta.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 turb 2006/05/18 13:07:25
-!-----------------------------------------------------------------
!#################
MODULE MODI_ETHETA
!#################
@@ -36,7 +31,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PSRCM ! Normalized 2dn_order
REAL,DIMENSION(SIZE(PTHLM,1),SIZE(PTHLM,2),SIZE(PTHLM,3)):: PETHETA ! result
#else
REAL,DIMENSION(SIZE(PTHLM,1),SIZE(PTHLM,2),SIZE(PTHLM,3)), INTENT(OUT):: PETHETA ! result
-!$acc declare present(PTHLM,PRM,PLOCPEXNM,PATHETA,PSRCM,PETHETA)
#endif
!
!
diff --git a/src/MNH/get_halo.f90 b/src/MNH/get_halo.f90
index 4d478ad73..b41bc5c05 100644
--- a/src/MNH/get_halo.f90
+++ b/src/MNH/get_halo.f90
@@ -38,7 +38,6 @@ INTERFACE
SUBROUTINE GET_HALO_D(PSRC, HDIR, HNAME)
!
REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PSRC ! variable at t
- !$acc declare present (PSRC)
CHARACTER(len=4), OPTIONAL :: HDIR ! to send only halo on X or Y direction
character(len=*), optional, intent(in) :: HNAME ! Name of the field to be added
!
diff --git a/src/MNH/gradient_m.f90 b/src/MNH/gradient_m.f90
index 7431b5121..79590507a 100644
--- a/src/MNH/gradient_m.f90
+++ b/src/MNH/gradient_m.f90
@@ -33,7 +33,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZZ ! metric coefficient dzz
REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZX ! metric coefficient dzx
!
REAL, DIMENSION(SIZE(PA,1),SIZE(PA,2),SIZE(PA,3)), INTENT(OUT) :: PGX_M_M ! result mass point
-!$acc declare present(PA,PDXX,PDZZ,PDZX,PGX_M_M)
!
END SUBROUTINE GX_M_M_DEVICE
#endif
@@ -62,7 +61,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZZ ! metric coefficient dzz
REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZY ! metric coefficient dzy
!
REAL, DIMENSION(SIZE(PA,1),SIZE(PA,2),SIZE(PA,3)), INTENT(OUT) :: PGY_M_M ! result mass point
-!$acc declare present(PA,PDYY,PDZZ,PDZY,PGY_M_M)
!
END SUBROUTINE GY_M_M_DEVICE
#endif
@@ -88,7 +86,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PA ! variable at the mass point
REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZZ ! metric coefficient dzz
!
REAL, DIMENSION(SIZE(PA,1),SIZE(PA,2),SIZE(PA,3)), INTENT(OUT) :: PGZ_M_M ! result mass point
-!$acc declare present(PA,PDZZ,PGY_M_M)
!
END SUBROUTINE GZ_M_M_DEVICE
#endif
@@ -119,7 +116,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZZ ! d*zz
REAL, DIMENSION(:,:,:), INTENT(IN) :: PY ! variable at mass localization
!
REAL, DIMENSION(SIZE(PY,1),SIZE(PY,2),SIZE(PY,3)),INTENT(OUT) :: PGX_M_U ! result at flux side
-!$acc declare present(PY,PDXX,PDZZ,PDZX,PGX_M_U)
!
END SUBROUTINE GX_M_U_DEVICE
#endif
@@ -149,7 +145,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZZ !d*zz
REAL, DIMENSION(:,:,:), INTENT(IN) :: PY ! variable at mass localization
!
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PGY_M_V ! result at flux side
-!$acc declare present(PY,PDYY,PDZZ,PDZY,PGY_M_V)
!
END SUBROUTINE GY_M_V_DEVICE
#endif
@@ -177,7 +172,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZZ !d*zz
REAL, DIMENSION(:,:,:), INTENT(IN) :: PY ! variable at mass localization
!
REAL, DIMENSION(SIZE(PY,1),SIZE(PY,2),SIZE(PY,3)),INTENT(OUT) :: PGZ_M_W ! result at flux side
-!$acc declare present(PY,PDZZ,PGZ_M_W)
!
END SUBROUTINE GZ_M_W_DEVICE
#endif
diff --git a/src/MNH/gradient_u.f90 b/src/MNH/gradient_u.f90
index 9cd43ea9c..4878e8137 100644
--- a/src/MNH/gradient_u.f90
+++ b/src/MNH/gradient_u.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 operators 2006/05/18 13:07:25
-!-----------------------------------------------------------------
! ######################
MODULE MODI_GRADIENT_U
! ######################
@@ -38,7 +33,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZZ ! metric coefficient dzz
REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZX ! metric coefficient dzx
!
REAL, DIMENSION(SIZE(PA,1),SIZE(PA,2),SIZE(PA,3)), INTENT(OUT) :: PGX_U_M_DEVICE ! result mass point
-!$acc declare present(PA,PDXX,PDZZ,PDZX,PGX_U_M_DEVICE)
!
END SUBROUTINE GX_U_M_DEVICE
#endif
@@ -68,7 +62,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZZ ! metric coefficient dzz
REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZY ! metric coefficient dzy
!
REAL, DIMENSION(SIZE(PA,1),SIZE(PA,2),SIZE(PA,3)), INTENT(OUT) :: PGY_U_UV_DEVICE ! result UV point
-!$acc declare present(PA,PDYY,PDZZ,PDZY,PGY_U_UV_DEVICE)
!
END SUBROUTINE GY_U_UV_DEVICE
#endif
@@ -94,7 +87,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PA ! variable at the U point
REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZZ ! metric coefficient dzz
!
REAL, DIMENSION(SIZE(PA,1),SIZE(PA,2),SIZE(PA,3)), INTENT(OUT) :: PGZ_U_UW_DEVICE ! result UW point
-!$acc declare present(PA,PDZZ,PGZ_U_UW_DEVICE)
!
END SUBROUTINE GZ_U_UW_DEVICE
#endif
diff --git a/src/MNH/gradient_v.f90 b/src/MNH/gradient_v.f90
index be2265b84..19bcf1a37 100644
--- a/src/MNH/gradient_v.f90
+++ b/src/MNH/gradient_v.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 operators 2006/05/18 13:07:25
-!-----------------------------------------------------------------
! ######################
MODULE MODI_GRADIENT_V
! ######################
@@ -40,7 +35,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZZ ! metric coefficient dzz
REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZY ! metric coefficient dzy
!
REAL, DIMENSION(SIZE(PA,1),SIZE(PA,2),SIZE(PA,3)), INTENT(OUT) :: PGY_V_M_DEVICE ! result mass point
-!$acc declare present(PA,PDYY,PDZZ,PDZY,PGY_V_M_DEVICE)
!
END SUBROUTINE GY_V_M_DEVICE
#endif
@@ -71,7 +65,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZZ ! metric coefficient dzz
REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZX ! metric coefficient dzx
!
REAL, DIMENSION(SIZE(PA,1),SIZE(PA,2),SIZE(PA,3)), INTENT(OUT) :: PGX_V_UV_DEVICE ! result UV point
-!$acc declare present(PA,PDXX,PDZZ,PDZX,PGX_V_UV_DEVICE)
!
END SUBROUTINE GX_V_UV_DEVICE
#endif
@@ -98,7 +91,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PA ! variable at the V point
REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZZ ! metric coefficient dzz
!
REAL, DIMENSION(SIZE(PA,1),SIZE(PA,2),SIZE(PA,3)), INTENT(OUT) :: PGZ_V_VW_DEVICE ! result VW point
-!$acc declare present(PA,PDZZ,PGZ_V_VW_DEVICE)
!
END SUBROUTINE GZ_V_VW_DEVICE
#endif
diff --git a/src/MNH/gradient_w.f90 b/src/MNH/gradient_w.f90
index 7d8b2dc6e..d3daba6c4 100644
--- a/src/MNH/gradient_w.f90
+++ b/src/MNH/gradient_w.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 operators 2006/05/18 13:07:25
-!-----------------------------------------------------------------
! ######################
MODULE MODI_GRADIENT_W
! ######################
@@ -36,7 +31,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PA ! variable at the W point
REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZZ ! metric coefficient dzz
!
REAL, DIMENSION(SIZE(PA,1),SIZE(PA,2),SIZE(PA,3)), INTENT(OUT) :: PGZ_W_M_DEVICE ! result mass point
-!$acc declare present(PA,PDZZ,PGZ_W_M_DEVICE)
!
END SUBROUTINE GZ_W_M_DEVICE
#endif
@@ -67,7 +61,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZZ ! metric coefficient dzz
REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZX ! metric coefficient dzx
!
REAL, DIMENSION(SIZE(PA,1),SIZE(PA,2),SIZE(PA,3)), INTENT(OUT) :: PGX_W_UW_DEVICE ! result UW point
-!$acc declare present(PA,PDXX,PDZZ,PDZX,PGX_W_UW_DEVICE)
!
END SUBROUTINE GX_W_UW_DEVICE
#endif
@@ -98,7 +91,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZZ ! metric coefficient dzz
REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZY ! metric coefficient dzy
!
REAL, DIMENSION(SIZE(PA,1),SIZE(PA,2),SIZE(PA,3)), INTENT(OUT) :: PGY_W_VW_DEVICE ! result VW point
-!$acc declare present(PA,PDYY,PDZZ,PDZY,PGY_W_VW_DEVICE)
!
END SUBROUTINE GY_W_VW_DEVICE
#endif
diff --git a/src/MNH/les_mean_subgrid.f90 b/src/MNH/les_mean_subgrid.f90
index 2c07a5c1e..d54880e5b 100644
--- a/src/MNH/les_mean_subgrid.f90
+++ b/src/MNH/les_mean_subgrid.f90
@@ -14,7 +14,6 @@ INTERFACE LES_MEAN_SUBGRID
REAL, DIMENSION(:,:,:), INTENT(IN) :: PA
!
REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PA_MEAN
-!$acc declare present(PA,PA_MEAN)
!
LOGICAL, OPTIONAL, INTENT(IN) :: OSUM
!
@@ -25,7 +24,6 @@ END SUBROUTINE LES_MEAN_SUBGRID_3D
REAL, DIMENSION(:,:), INTENT(IN) :: PA
!
REAL, DIMENSION(:), INTENT(INOUT) :: PA_MEAN
-!$acc declare present(PA,PA_MEAN)
!
LOGICAL, OPTIONAL, INTENT(IN) :: OSUM
!
diff --git a/src/MNH/les_ver_int.f90 b/src/MNH/les_ver_int.f90
index f87e87d15..935bd8711 100644
--- a/src/MNH/les_ver_int.f90
+++ b/src/MNH/les_ver_int.f90
@@ -27,7 +27,6 @@ INTERFACE LES_VER_INT_DEVICE
REAL, DIMENSION(:,:,:), INTENT(IN) :: PA_MNH
!
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PA_LES
-!$acc declare present(PA_MNH,PA_LES)
!
END SUBROUTINE LES_VER_INT_DEVICE
!
diff --git a/src/MNH/ppm.f90 b/src/MNH/ppm.f90
index 2085af4a1..5a9a36593 100644
--- a/src/MNH/ppm.f90
+++ b/src/MNH/ppm.f90
@@ -62,7 +62,6 @@ REAL, INTENT(IN) :: PTSTEP ! Time step
REAL, DIMENSION(SIZE(PCR,1),SIZE(PCR,2),SIZE(PCR,3)) :: PR
#else
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PR
-!$acc declare present(PR)
#endif
!
#ifndef _OPENACC
diff --git a/src/MNH/ppm_met.f90 b/src/MNH/ppm_met.f90
index 54ae39457..c14c37871 100644
--- a/src/MNH/ppm_met.f90
+++ b/src/MNH/ppm_met.f90
@@ -28,36 +28,22 @@ TYPE (DATE_TIME), INTENT(IN) :: TPDTCUR ! current date and time
REAL, DIMENSION(:,:,:), INTENT(IN) :: PCRU ! Courant
REAL, DIMENSION(:,:,:), INTENT(IN) :: PCRV ! numbers
REAL, DIMENSION(:,:,:), INTENT(IN) :: PCRW !
-!$acc declare present(PCRU,PCRV,PCRW)
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHODJ ! density
-!$acc declare present(PRHODJ)
! Temporary advected rhodj
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHOX1,PRHOX2
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHOY1,PRHOY2
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHOZ1,PRHOZ2
-!$acc declare present(PRHOX1,PRHOX2,PRHOY1,PRHOY2,PRHOZ1,PRHOZ2)
!
REAL, INTENT(IN) :: PTSTEP ! Time step model
REAL, INTENT(IN) :: PTSTEP_PPM ! Time Step PPM
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PTHT, PTKET ! Vars at t
REAL, DIMENSION(:,:,:,:), INTENT(IN) :: PRT
-!PW: bug workaround with PGI (tested up to 16.10)
-!PTKET is present but if zero-size => not detected as present
-!!$acc declare present(PTHT,PTKET,PRT)
-!$acc declare present(PTHT,PRT)
-!$acc declare pcopyin(PTKET)
!
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PRTHS, PRTKES! Source terms
-!PW: bug workaround with PGI (tested up to 16.10)
-!PRTKES is present but if zero-size => not detected as present
-!!$acc declare present(PRTHS,PRTKES)
-!$acc declare present(PRTHS)
-!$acc declare pcopyout(PRTKES)
REAL, DIMENSION(:,:,:,:), INTENT(OUT) :: PRRS
-!$acc declare present(PRRS)
!
-END SUBROUTINE PPM_MET
+END SUBROUTINE PPM_MET
!
END INTERFACE
!
diff --git a/src/MNH/ppm_rhodj.f90 b/src/MNH/ppm_rhodj.f90
index d99ef1db9..47e269c1f 100644
--- a/src/MNH/ppm_rhodj.f90
+++ b/src/MNH/ppm_rhodj.f90
@@ -19,18 +19,15 @@ CHARACTER (LEN=4), DIMENSION(2), INTENT(IN) :: HLBCX ! X direction LBC type
CHARACTER (LEN=4), DIMENSION(2), INTENT(IN) :: HLBCY ! Y direction LBC type
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PCRU ! Contravariants compon.
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PCRV !
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PCRW !
-!$acc declare present(PCRU,PCRV,PCRW)
+REAL, DIMENSION(:,:,:), INTENT(IN) :: PCRV !
+REAL, DIMENSION(:,:,:), INTENT(IN) :: PCRW !
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHODJ ! density
-!$acc declare present(PRHODJ)
!
-REAL, INTENT(IN) :: PTSTEP ! Single Time step
+REAL, INTENT(IN) :: PTSTEP ! Single Time step
! Temporary advected rhodj
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PRHOX1,PRHOX2
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PRHOY1,PRHOY2
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PRHOZ1,PRHOZ2
-!$acc declare present(PRHOX1,PRHOX2, PRHOY1,PRHOY2, PRHOZ1,PRHOZ2)
!
END SUBROUTINE PPM_RHODJ
!
diff --git a/src/MNH/prandtl.f90 b/src/MNH/prandtl.f90
index c1565caac..ba6a20502 100644
--- a/src/MNH/prandtl.f90
+++ b/src/MNH/prandtl.f90
@@ -68,11 +68,6 @@ REAL, DIMENSION(:,:,:,:), INTENT(OUT):: PRED2RS3 ! Redelsperger number R*2_qsv
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PBLL_O_E! beta*Lk*Leps/tke
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PETHETA ! coefficient E_theta
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PEMOIST ! coefficient E_moist
-!$acc declare present(PDXX,PDYY,PDZZ,PDZX,PDZY, &
-!$acc & PTHVREF,PLOCPEXNM,PATHETA,PAMOIST,PLM,PLEPS,PTHLM,PTKEM, &
-!$acc & PRM,PSVM,PSRCM, &
-!$acc & PREDTH1,PREDR1,PRED2TH3,PRED2R3,PRED2THR3,PREDS1,PRED2THS3,PRED2RS3, &
-!$acc & PBLL_O_E,PETHETA,PEMOIST)
!
END SUBROUTINE PRANDTL
!
diff --git a/src/MNH/rotate_wind.f90 b/src/MNH/rotate_wind.f90
index c71acc211..0297b6cfd 100644
--- a/src/MNH/rotate_wind.f90
+++ b/src/MNH/rotate_wind.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 turb 2006/05/18 13:07:25
-!-----------------------------------------------------------------
! #######################
MODULE MODI_ROTATE_WIND
! #######################
@@ -36,8 +31,6 @@ REAL, DIMENSION(:,:), INTENT(OUT) :: PUSLOPE ! wind component along
! the maximum slope direction
REAL, DIMENSION(:,:), INTENT(OUT) :: PVSLOPE ! wind component along
! the direction normal to the maximum slope one
-!$acc declare present(PU,PV,PW,PDIRCOSXW, PDIRCOSYW, PDIRCOSZW, &
-!$acc & PCOSSLOPE,PSINSLOPE,PDXX,PDYY,PDZZ,PUSLOPE,PVSLOPE)
!
!-------------------------------------------------------------------------------
!
diff --git a/src/MNH/shuman_device.f90 b/src/MNH/shuman_device.f90
index 46a222780..1d40497fe 100644
--- a/src/MNH/shuman_device.f90
+++ b/src/MNH/shuman_device.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 operators 2006/05/18 13:07:25
-!-----------------------------------------------------------------
#ifdef _OPENACC
! #########################
MODULE MODI_SHUMAN_DEVICE
@@ -18,25 +13,21 @@ INTERFACE
SUBROUTINE DXF_DEVICE(PA,PDXF)
REAL, DIMENSION(:,:,:), INTENT(IN) :: PA ! variable at flux side
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PDXF ! result at mass localization
-!$acc declare present(PA,PDXM)
END SUBROUTINE DXF_DEVICE
!
SUBROUTINE DXM_DEVICE(PA,PDXM)
REAL, DIMENSION(:,:,:), INTENT(IN) :: PA ! variable at mass localization
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PDXM ! result at flux side
-!$acc declare present(PA,PDXM)
END SUBROUTINE DXM_DEVICE
!
SUBROUTINE DYF_DEVICE(PA,PDYF)
REAL, DIMENSION(:,:,:), INTENT(IN) :: PA ! variable at flux side
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PDYF ! result at mass localization
-!$acc declare present(PA,PDYF)
END SUBROUTINE DYF_DEVICE
!
SUBROUTINE DYM_DEVICE(PA,PDYM)
REAL, DIMENSION(:,:,:), INTENT(IN) :: PA ! variable at mass localization
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PDYM ! result at flux side
-!$acc declare present(PA,PDYM)
END SUBROUTINE DYM_DEVICE
!
SUBROUTINE DZF_DEVICE(KKA,KKU,KL,PA,PDZF)
@@ -44,7 +35,6 @@ INTEGER, INTENT(IN) :: KKA, KKU ! near ground and uppest atmosph
INTEGER, INTENT(IN) :: KL ! +1 if grid goes from ground to atmosphere top, -1 otherwise
REAL, DIMENSION(:,:,:), INTENT(IN) :: PA ! variable at flux side
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PDZF ! result at mass localization
-!$acc declare present(PA,PDZF)
END SUBROUTINE DZF_DEVICE
!
SUBROUTINE DZM_DEVICE(KKA,KKU,KL,PA,PDZM)
@@ -52,31 +42,26 @@ INTEGER, INTENT(IN) :: KKA, KKU ! near ground and uppest atmosph
INTEGER, INTENT(IN) :: KL ! +1 if grid goes from ground to atmosphere top, -1 otherwise
REAL, DIMENSION(:,:,:), INTENT(IN) :: PA ! variable at mass localization
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PDZM ! result at flux side
-!$acc declare present(PA,PDZM)
END SUBROUTINE DZM_DEVICE
!
SUBROUTINE MXF_DEVICE(PA,PMXF)
REAL, DIMENSION(:,:,:), INTENT(IN) :: PA ! variable at flux side
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PMXF ! result at mass localization
-!$acc declare present(PA,PMXF)
END SUBROUTINE MXF_DEVICE
!
SUBROUTINE MXM_DEVICE(PA,PMXM)
REAL, DIMENSION(:,:,:), INTENT(IN) :: PA ! variable at mass localization
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PMXM ! result at flux localization
-!$acc declare present(PA,PMXM)
END SUBROUTINE MXM_DEVICE
!
SUBROUTINE MYF_DEVICE(PA,PMYF)
REAL, DIMENSION(:,:,:), INTENT(IN) :: PA ! variable at flux side
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PMYF ! result at mass localization
-!$acc declare present(PA,PMYF)
END SUBROUTINE MYF_DEVICE
!
SUBROUTINE MYM_DEVICE(PA,PMYM)
REAL, DIMENSION(:,:,:), INTENT(IN) :: PA ! variable at mass localization
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PMYM ! result at flux localization
-!$acc declare present(PA,PMYM)
END SUBROUTINE MYM_DEVICE
!
SUBROUTINE MZF_DEVICE(KKA,KKU,KL,PA,PMZF)
@@ -84,13 +69,11 @@ INTEGER, INTENT(IN) :: KKA, KKU ! near ground and uppest atmosph
INTEGER, INTENT(IN) :: KL ! +1 if grid goes from ground to atmosphere top, -1 otherwise
REAL, DIMENSION(:,:,:), INTENT(IN) :: PA ! variable at flux side
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PMZF ! result at mass localization
-!$acc declare present(PA,PMZF)
END SUBROUTINE MZF_DEVICE
!
SUBROUTINE MZM_DEVICE(PA,PMZM)
REAL, DIMENSION(:,:,:), INTENT(IN) :: PA ! variable at mass localization
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PMZM ! result at flux localization
-!$acc declare present(PA,PMZM)
END SUBROUTINE MZM_DEVICE
!
END INTERFACE
diff --git a/src/MNH/tke_eps_sources.f90 b/src/MNH/tke_eps_sources.f90
index 8153adf2d..2960671bd 100644
--- a/src/MNH/tke_eps_sources.f90
+++ b/src/MNH/tke_eps_sources.f90
@@ -48,10 +48,6 @@ REAL, DIMENSION(:,:,:), INTENT(INOUT):: PRTHLS ! Source of Theta_l
REAL, DIMENSION(:,:,:), INTENT(IN) :: PCOEF_DISS ! 1/(Cph*Exner)
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PTR ! Transport prod. of TKE
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PDISS ! Dissipati prod. of TKE
-!$acc declare present(PTKEM,PLM,PLEPS,PDP,PTRH, &
-!$acc & PRHODJ,PDZZ,PDXX,PDYY,PDZX,PDZY,PZZ, &
-!$acc & PTP,PRTKES,PRTKESM, PRTHLS,PCOEF_DISS, &
-!$acc & PTR,PDISS)
!
!
!
diff --git a/src/MNH/tm06_h.f90 b/src/MNH/tm06_h.f90
index 85a368f44..5fb42f617 100644
--- a/src/MNH/tm06_h.f90
+++ b/src/MNH/tm06_h.f90
@@ -20,8 +20,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PZZ ! altitude of flux levels
REAL, DIMENSION(:,:,:), INTENT(IN) :: PFLXZ ! heat flux
REAL, DIMENSION(:,:), INTENT(INOUT) :: PBL_DEPTH ! boundary layer height
!
-!$acc declare present(PZZ,PFLXZ,PBL_DEPTH)
-!
!-------------------------------------------------------------------------------
!
END SUBROUTINE TM06_H
diff --git a/src/MNH/tridiag_thermo.f90 b/src/MNH/tridiag_thermo.f90
index 11888cfd7..34618dfd2 100644
--- a/src/MNH/tridiag_thermo.f90
+++ b/src/MNH/tridiag_thermo.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 newsrc 2006/06/02 17:32:30
-!-----------------------------------------------------------------
! ###################
MODULE MODI_TRIDIAG_THERMO
! ###################
@@ -29,8 +24,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHODJ ! (dry rho)*J at mass poi
!
REAL, DIMENSION(:,:,:), INTENT(OUT):: PVARP ! variable at t+1 at mass point
!
-!$acc declare present(PVARM,PF,PDFDDTDZ,PDZZ,PRHODJ,PVARP)
-!
END SUBROUTINE TRIDIAG_THERMO
!
END INTERFACE
diff --git a/src/MNH/tridiag_tke.f90 b/src/MNH/tridiag_tke.f90
index a91fb9d15..7e9e12808 100644
--- a/src/MNH/tridiag_tke.f90
+++ b/src/MNH/tridiag_tke.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 turb 2006/06/06 10:00:49
-!-----------------------------------------------------------------
! ##########################
MODULE MODI_TRIDIAG_TKE
! ##########################
@@ -30,8 +25,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PDIAG ! diagonal term linked to
!
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PVARP ! variable at t+1
!
-!$acc declare present(PVARM,PA,PRHODJ,PSOURCE,PDIAG,PVARP)
-!
END SUBROUTINE TRIDIAG_TKE
!
END INTERFACE
diff --git a/src/MNH/tridiag_w.f90 b/src/MNH/tridiag_w.f90
index 57eaef202..b3ac682f9 100644
--- a/src/MNH/tridiag_w.f90
+++ b/src/MNH/tridiag_w.f90
@@ -1,7 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
! ###################
MODULE MODI_TRIDIAG_W
! ###################
@@ -19,8 +20,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHODJ ! (dry rho)*J at mass poi
!
REAL, DIMENSION(:,:,:), INTENT(OUT):: PVARP ! variable at t+1 at flux point
!
-!$acc declare present(PVARM,PF,PDFDDWDZ,PMZF_DZZ,PRHODJ,PVARP)
-!
END SUBROUTINE TRIDIAG_W
!
END INTERFACE
diff --git a/src/MNH/tridiag_wind.f90 b/src/MNH/tridiag_wind.f90
index 9f769b152..bda39c933 100644
--- a/src/MNH/tridiag_wind.f90
+++ b/src/MNH/tridiag_wind.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 turb 2006/06/06 09:36:38
-!-----------------------------------------------------------------
! ########################
MODULE MODI_TRIDIAG_WIND
! ########################
@@ -30,8 +25,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PSOURCE ! source term of PVAR
!
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PVARP ! variable at t+1
!
-!$acc declare present(PVARM,PA,PCOEFS,PRHODJA,PSOURCE,PVARP )
-!
END SUBROUTINE TRIDIAG_WIND
!
END INTERFACE
diff --git a/src/MNH/turb_hor.f90 b/src/MNH/turb_hor.f90
index a68194934..121b3ec0e 100644
--- a/src/MNH/turb_hor.f90
+++ b/src/MNH/turb_hor.f90
@@ -102,18 +102,6 @@ REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PSIGS
! IN: Vertical part of Sigma_s at t
! OUT: Total Sigma_s at t
!
-!$acc declare present(PK,PINV_PDXX,PINV_PDYY,PINV_PDZZ,PMZM_PRHODJ, &
-!$acc & PDXX,PDYY,PDZZ,PDZX,PDZY,PZZ, &
-!$acc & PDIRCOSXW,PDIRCOSYW,PDIRCOSZW, &
-!$acc & PCOSSLOPE,PSINSLOPE, &
-!$acc & PRHODJ,PTHVREF,PSFTHM,PSFRM, &
-!$acc & PCDUEFF,PTAU11M,PTAU12M,PTAU22M,PTAU33M, &
-!$acc & PUM,PVM,PWM,PTHLM,PRM,PSVM,PTKEM,PLM,PLEPS, &
-!$acc & PLOCPEXNM,PATHETA,PAMOIST,PSRCM,PFRAC_ICE, &
-!$acc & PUSLOPEM,PVSLOPEM,PSFSVM, &
-!$acc & PDP,PTP,PRTHLS,PRSVS,PRRS, &
-!$acc & PRUS,PRVS,PRWS,PSIGS)
-!
END SUBROUTINE TURB_HOR
!
END INTERFACE
diff --git a/src/MNH/turb_hor_dyn_corr.f90 b/src/MNH/turb_hor_dyn_corr.f90
index cab69003b..5b01a5d14 100644
--- a/src/MNH/turb_hor_dyn_corr.f90
+++ b/src/MNH/turb_hor_dyn_corr.f90
@@ -70,13 +70,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PLM ! Turb. mixing length
REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PRUS, PRVS, PRWS
REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PDP,PTP ! TKE production terms
!
-!$acc declare present(PINV_PDZZ,PDXX,PDYY,PDZZ,PDZX,PDZY,PZZ,PDIRCOSZW, &
-!$acc & PCOSSLOPE,PSINSLOPE,PRHODJ,PCDUEFF, &
-!$acc & PTAU11M,PTAU12M,PTAU22M,PTAU33M, &
-!$acc & PUM,PVM,PWM,PTHLM,PRM,PSVM,PUSLOPEM,PVSLOPEM,PTKEM,PLM, &
-!$acc & PRUS,PRVS,PRWS,PDP,PTP)
-!
-!
END SUBROUTINE TURB_HOR_DYN_CORR
!
END INTERFACE
diff --git a/src/MNH/turb_hor_splt.f90 b/src/MNH/turb_hor_splt.f90
index e74b0c3f8..0b8d32d44 100644
--- a/src/MNH/turb_hor_splt.f90
+++ b/src/MNH/turb_hor_splt.f90
@@ -97,19 +97,6 @@ REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PSIGS
! IN: Vertical part of Sigma_s at t
! OUT: Total Sigma_s at t
!
-!$acc declare present(PDXX,PDYY,PDZZ,PDZX,PDZY,PZZ, &
-!$acc & PDIRCOSXW,PDIRCOSYW,PDIRCOSZW, &
-!$acc & PCOSSLOPE,PSINSLOPE, &
-!$acc & PRHODJ,PTHVREF, &
-!$acc & PSFTHM,PSFRM,PSFSVM, &
-!$acc & PCDUEFF,PTAU11M,PTAU12M,PTAU22M,PTAU33M, &
-!$acc & PUM,PVM,PWM,PUSLOPEM,PVSLOPEM,PTHLM,PRM,PSVM, &
-!$acc & PTKEM,PLM,PLEPS, &
-!$acc & PLOCPEXNM,PATHETA,PAMOIST,PSRCM,PFRAC_ICE, &
-!$acc & PDP,PTP,PSIGS, &
-!$acc & PTRH, &
-!$acc & PRUS,PRVS,PRWS,PRTHLS,PRRS,PRSVS )
-!
END SUBROUTINE TURB_HOR_SPLT
!
END INTERFACE
diff --git a/src/MNH/turb_hor_sv_flux.f90 b/src/MNH/turb_hor_sv_flux.f90
index 4148d7f78..b892fd00b 100644
--- a/src/MNH/turb_hor_sv_flux.f90
+++ b/src/MNH/turb_hor_sv_flux.f90
@@ -50,14 +50,6 @@ REAL, DIMENSION(:,:,:,:), INTENT(IN) :: PSVM ! scalar var. at t-1
!
REAL, DIMENSION(:,:,:,:), INTENT(INOUT) :: PRSVS ! var. at t+1 -split-
!
-!$acc declare present(PK,PINV_PDXX,PINV_PDYY,PINV_PDZZ,PMZM_PRHODJ, &
-!$acc & PDXX,PDYY,PDZZ,PDZX,PDZY, &
-!$acc & PDIRCOSXW,PDIRCOSYW, &
-!$acc & PRHODJ,PWM, &
-!$acc & PSFSVM, &
-!$acc & PSVM, &
-!$acc & PRSVS)
-!
END SUBROUTINE TURB_HOR_SV_FLUX
!
END INTERFACE
diff --git a/src/MNH/turb_hor_thermo_corr.f90 b/src/MNH/turb_hor_thermo_corr.f90
index 551945145..190067757 100644
--- a/src/MNH/turb_hor_thermo_corr.f90
+++ b/src/MNH/turb_hor_thermo_corr.f90
@@ -60,15 +60,6 @@ REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PSIGS
! IN: Vertical part of Sigma_s at t
! OUT: Total Sigma_s at t
!
-!$acc declare present(PINV_PDXX,PINV_PDYY, &
-!$acc & PDXX,PDYY,PDZZ,PDZX,PDZY, &
-!$acc & PTHVREF, &
-!$acc & PWM,PTHLM,PRM, &
-!$acc & PTKEM,PLM,PLEPS, &
-!$acc & PLOCPEXNM,PATHETA,PAMOIST,PSRCM, &
-!$acc & PSIGS)
-!
-!
END SUBROUTINE TURB_HOR_THERMO_CORR
!
END INTERFACE
diff --git a/src/MNH/turb_hor_thermo_flux.f90 b/src/MNH/turb_hor_thermo_flux.f90
index 896d992b5..7af4d30f5 100644
--- a/src/MNH/turb_hor_thermo_flux.f90
+++ b/src/MNH/turb_hor_thermo_flux.f90
@@ -67,15 +67,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PFRAC_ICE ! ri fraction of rc+ri
REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PRTHLS
REAL, DIMENSION(:,:,:,:), INTENT(INOUT) :: PRRS ! var. at t+1 -split-
!
-!$acc declare present(PK,PINV_PDXX,PINV_PDYY,PINV_PDZZ,PMZM_PRHODJ, &
-!$acc & PDXX,PDYY,PDZZ,PDZX,PDZY, &
-!$acc & PDIRCOSXW,PDIRCOSYW, &
-!$acc & PRHODJ, &
-!$acc & PSFTHM,PSFRM, &
-!$acc & PWM,PTHLM,PRM, &
-!$acc & PATHETA,PAMOIST,PSRCM,PFRAC_ICE, &
-!$acc & PRTHLS,PRRS )
-!
END SUBROUTINE TURB_HOR_THERMO_FLUX
!
END INTERFACE
diff --git a/src/MNH/turb_hor_tke.f90 b/src/MNH/turb_hor_tke.f90
index 736392149..355023335 100644
--- a/src/MNH/turb_hor_tke.f90
+++ b/src/MNH/turb_hor_tke.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2019 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 turb 2006/05/18 13:07:25
-!-----------------------------------------------------------------
! ####################
MODULE MODI_TURB_HOR_TKE
! ####################
@@ -37,11 +32,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHODJ ! density * grid volume
REAL, DIMENSION(:,:,:), INTENT(IN) :: PTKEM ! TKE at time t- dt
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PTRH ! horizontal transport of Tke
!
-!$acc declare present(PDXX,PDYY,PDZZ,PDZX,PDZY, &
-!$acc & PINV_PDXX, PINV_PDYY, PINV_PDZZ, PMZM_PRHODJ, &
-!$acc & PK, PRHODJ, PTKEM, &
-!$acc & PTRH )
-!
END SUBROUTINE TURB_HOR_TKE
!
END INTERFACE
diff --git a/src/MNH/turb_hor_uv.f90 b/src/MNH/turb_hor_uv.f90
index fb1481548..abd31ff25 100644
--- a/src/MNH/turb_hor_uv.f90
+++ b/src/MNH/turb_hor_uv.f90
@@ -66,11 +66,6 @@ REAL, DIMENSION(:,:), INTENT(IN) :: PVSLOPEM ! wind component along
REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PRUS, PRVS ! var. at t+1 -split-
REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PDP ! TKE production terms
!
-!$acc declare present(PK,PINV_PDXX,PINV_PDYY,PINV_PDZZ,PMZM_PRHODJ,PDXX,PDYY,PDZZ,PDZX,PDZY, &
-!$acc & PDIRCOSZW,PCOSSLOPE,PSINSLOPE,PRHODJ,PCDUEFF,PTAU11M,PTAU12M,PTAU22M,PTAU33M, &
-!$acc & PUM,PVM,PUSLOPEM,PVSLOPEM, &
-!$acc & PRUS,PRVS,PDP)
-!
END SUBROUTINE TURB_HOR_UV
!
END INTERFACE
diff --git a/src/MNH/turb_hor_uw.f90 b/src/MNH/turb_hor_uw.f90
index 0b43466fa..bfab54511 100644
--- a/src/MNH/turb_hor_uw.f90
+++ b/src/MNH/turb_hor_uw.f90
@@ -52,11 +52,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PLM ! Turb. mixing length
REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PRUS, PRWS
REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PDP ! TKE production terms
!
-!$acc declare present(PK,PINV_PDXX,PINV_PDZZ,PMZM_PRHODJ,PDXX,PDZZ,PDZX, &
-!$acc & PRHODJ,PTHVREF, &
-!$acc & PUM,PWM,PTHLM,PRM,PSVM,PTKEM,PLM, &
-!$acc & PRUS,PRWS,PDP)
-!
END SUBROUTINE TURB_HOR_UW
!
END INTERFACE
diff --git a/src/MNH/turb_hor_vw.f90 b/src/MNH/turb_hor_vw.f90
index 8e8bb8953..9e1b3be38 100644
--- a/src/MNH/turb_hor_vw.f90
+++ b/src/MNH/turb_hor_vw.f90
@@ -37,17 +37,13 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PINV_PDZZ ! 1./PDZZ
REAL, DIMENSION(:,:,:), INTENT(IN) :: PMZM_PRHODJ ! MZM(PRHODJ)
REAL, DIMENSION(:,:,:), INTENT(IN) :: PDYY, PDZZ, PDZY
! Metric coefficients
-!$acc declare present(PDYY,PDZZ,PDZY)
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHODJ ! density * grid volume
REAL, DIMENSION(:,:,:), INTENT(IN) :: PTHVREF ! ref. state VPT
!
! Variables at t-1
REAL, DIMENSION(:,:,:), INTENT(IN) :: PVM,PWM,PTHLM
-!$acc declare copyin(PVM,PTHLM)
REAL, DIMENSION(:,:,:,:), INTENT(IN) :: PRM
-!$acc declare copyin(PRM)
REAL, DIMENSION(:,:,:,:), INTENT(IN) :: PSVM
-!$acc declare copyin(PSVM)
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PTKEM ! TKE at time t- dt
REAL, DIMENSION(:,:,:), INTENT(IN) :: PLM ! Turb. mixing length
@@ -55,11 +51,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PLM ! Turb. mixing length
REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PRVS, PRWS ! var. at t+1 -split-
REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PDP ! TKE production terms
!
-!$acc declare present(PK,PINV_PDYY,PINV_PDZZ,PMZM_PRHODJ,PDYY,PDZZ,PDZY, &
-!$acc & PRHODJ,PTHVREF, &
-!$acc & PVM,PWM,PTHLM,PRM,PSVM,PTKEM,PLM, &
-!$acc & PRVS,PRWS,PDP)
-!
END SUBROUTINE TURB_HOR_VW
!
END INTERFACE
diff --git a/src/MNH/turb_ver.f90 b/src/MNH/turb_ver.f90
index 8c3926d9f..29bcf15f8 100644
--- a/src/MNH/turb_ver.f90
+++ b/src/MNH/turb_ver.f90
@@ -109,19 +109,6 @@ REAL, DIMENSION(:,:,:), INTENT(OUT) :: PWTH ! heat flux
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PWRC ! cloud water flux
REAL, DIMENSION(:,:,:,:),INTENT(OUT) :: PWSV ! scalar flux
!
-!$acc declare present(PDXX,PDYY,PDZZ,PDZX,PDZY,PDIRCOSZW,PZZ, &
-!$acc & PCOSSLOPE,PSINSLOPE, &
-!$acc & PRHODJ,PTHVREF, &
-!$acc & PSFTHM,PSFRM,PSFSVM,PSFTHP,PSFRP,PSFSVP, &
-!$acc & PCDUEFF,PTAU11M,PTAU12M,PTAU33M, &
-!$acc & PUM,PVM,PWM,PUSLOPEM,PVSLOPEM,PTHLM,PRM,PSVM, &
-!$acc & PTKEM,PLM,PLEPS, &
-!$acc & PLOCPEXNM,PATHETA,PAMOIST,PSRCM,PFRAC_ICE, &
-!$acc & PFWTH,PFWR,PFTH2,PFR2,PFTHR,PBL_DEPTH, &
-!$acc & PSBL_DEPTH,PLMO, &
-!$acc & PRUS,PRVS,PRWS,PRTHLS,PRRS,PRSVS, &
-!$acc & PDP,PTP,PSIGS,PWTH,PWRC,PWSV )
-!
END SUBROUTINE TURB_VER
!
END INTERFACE
diff --git a/src/MNH/turb_ver_dyn_flux.f90 b/src/MNH/turb_ver_dyn_flux.f90
index abbc04e77..531fe8781 100644
--- a/src/MNH/turb_ver_dyn_flux.f90
+++ b/src/MNH/turb_ver_dyn_flux.f90
@@ -77,15 +77,6 @@ REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PRUS, PRVS, PRWS
!
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PDP ! Dynamic TKE production term
!
-!$acc declare present(PDXX,PDYY,PDZZ,PDZX,PDZY,PDIRCOSZW,PZZ, &
-!$acc & PCOSSLOPE,PSINSLOPE, &
-!$acc & PRHODJ, &
-!$acc & PCDUEFF,PTAU11M,PTAU12M,PTAU33M, &
-!$acc & PTHLM,PRM,PSVM,PUM,PVM,PWM,PUSLOPEM,PVSLOPEM, &
-!$acc & PTKEM,PLM,PWU,PWV, &
-!$acc & PRUS,PRVS,PRWS, &
-!$acc & PDP )
-!
END SUBROUTINE TURB_VER_DYN_FLUX
!
END INTERFACE
diff --git a/src/MNH/turb_ver_thermo_corr.f90 b/src/MNH/turb_ver_thermo_corr.f90
index 372cc9f32..1d532b081 100644
--- a/src/MNH/turb_ver_thermo_corr.f90
+++ b/src/MNH/turb_ver_thermo_corr.f90
@@ -100,18 +100,6 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PRP ! guess of r at t+ deltat
!
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PSIGS ! Vert. part of Sigma_s at t
!
-!$acc declare present(PDXX,PDYY,PDZZ,PDZX,PDZY,PDIRCOSZW, &
-!$acc & PRHODJ,PTHVREF, &
-!$acc & PSFTHM,PSFRM,PSFTHP,PSFRP, &
-!$acc & PWM,PTHLM,PRM,PSVM, &
-!$acc & PTKEM,PLM,PLEPS, &
-!$acc & PLOCPEXNM,PATHETA,PAMOIST,PSRCM, &
-!$acc & PBETA, PSQRT_TKE, PDTH_DZ, PDR_DZ, PRED2TH3, &
-!$acc & PRED2R3, PRED2THR3, PBLL_O_E, PETHETA, &
-!$acc & PEMOIST, PREDTH1, PREDR1, PPHI3, PPSI3, PD, &
-!$acc & PFWTH,PFWR,PFTH2,PFR2,PFTHR, &
-!$acc & PTHLP,PRP,PSIGS )
-!
END SUBROUTINE TURB_VER_THERMO_CORR
!
END INTERFACE
diff --git a/src/MNH/turb_ver_thermo_flux.f90 b/src/MNH/turb_ver_thermo_flux.f90
index 78e1f44fb..1828d6605 100644
--- a/src/MNH/turb_ver_thermo_flux.f90
+++ b/src/MNH/turb_ver_thermo_flux.f90
@@ -112,18 +112,6 @@ REAL, DIMENSION(:,:,:), INTENT(OUT) :: PTP ! Dynamic and thermal
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PWTH ! heat flux
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PWRC ! cloud water flux
!
-!$acc declare present(PDXX,PDYY,PDZZ,PDZX,PDZY,PDIRCOSZW,PZZ, &
-!$acc & PRHODJ,PTHVREF, &
-!$acc & PSFTHM,PSFRM,PSFTHP,PSFRP, &
-!$acc & PWM,PTHLM,PRM,PSVM, &
-!$acc & PTKEM,PLM,PLEPS, &
-!$acc & PLOCPEXNM,PATHETA,PAMOIST,PSRCM,PFRAC_ICE, &
-!$acc & PBETA, PSQRT_TKE, PDTH_DZ, PDR_DZ, PRED2TH3, &
-!$acc & PRED2R3, PRED2THR3, PBLL_O_E, PETHETA, &
-!$acc & PEMOIST, PREDTH1, PREDR1, PPHI3, PPSI3, PD, &
-!$acc & PFWTH,PFWR,PFTH2,PFR2,PFTHR,PBL_DEPTH, &
-!$acc & PWTHV,PRTHLS,PRRS,PTHLP,PRP,PTP,PWTH,PWRC )
-!
END SUBROUTINE TURB_VER_THERMO_FLUX
!
END INTERFACE
diff --git a/src/MNH/update_lm.f90 b/src/MNH/update_lm.f90
index 9edc121e3..562afddd5 100644
--- a/src/MNH/update_lm.f90
+++ b/src/MNH/update_lm.f90
@@ -15,7 +15,6 @@ CHARACTER(LEN=4), DIMENSION(2), INTENT(IN) :: HLBCY ! Y boundary type
!
REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PLM ! mixing length
REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PLEPS ! dissipative length
-!$acc declare present(PLM,PLEPS)
!
END SUBROUTINE UPDATE_LM
!
--
GitLab