Philippe 20/06/2019: OpenACC: use again pointers for modd_* variables (now supported by standard)

src/MNH/modd_metricsn.f90

-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1999-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 modd 2006/06/27 14:20:29
-!-----------------------------------------------------------------
 !     #####################
       MODULE MODD_METRICS_n
 !     #####################
@@ -34,7 +29,7 @@
 !!
 !!    MODIFICATIONS
 !!    -------------
-!!      Original    05/04/99                      
+!!      Original    05/04/99
 !-------------------------------------------------------------------------------
 !
 !*       0.   DECLARATIONS
@@ -51,13 +46,9 @@ END TYPE METRICS_t
 
 TYPE(METRICS_t), DIMENSION(JPMODELMAX), TARGET, SAVE :: METRICS_MODEL
 
-#ifndef _OPENACC
 REAL, DIMENSION(:,:,:), POINTER :: XDXX=>NULL(),XDZX=>NULL(), &
                                   XDYY=>NULL(),XDZY=>NULL(),XDZZ=>NULL()
-#else
-REAL, DIMENSION(:,:,:), ALLOCATABLE , TARGET :: XDXX,XDYY,XDZZ,XDZX,XDZY
 !$acc declare create(XDXX,XDYY,XDZZ,XDZX,XDZY)
-#endif
 
 CONTAINS
 
@@ -72,13 +63,11 @@ METRICS_MODEL(KFROM)%XDZY=>XDZY
 METRICS_MODEL(KFROM)%XDZZ=>XDZZ
 !
 ! Current model is set to model KTO
-#ifndef _OPENACC
 XDXX=>METRICS_MODEL(KTO)%XDXX
 XDZX=>METRICS_MODEL(KTO)%XDZX
 XDYY=>METRICS_MODEL(KTO)%XDYY
 XDZY=>METRICS_MODEL(KTO)%XDZY
 XDZZ=>METRICS_MODEL(KTO)%XDZZ
-#endif
 
 END SUBROUTINE METRICS_GOTO_MODEL
 

src/MNH/modd_refn.f90

-!MNH_LIC Copyright 1994-2018 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.
 !-----------------------------------------------------------------
 !     #################
@@ -68,12 +68,8 @@ REAL, DIMENSION(:,:,:), POINTER :: XRHODREF=>NULL()
 REAL, DIMENSION(:,:,:), POINTER :: XTHVREF=>NULL()
 REAL, DIMENSION(:,:,:), POINTER :: XRVREF=>NULL()
 REAL, DIMENSION(:,:,:), POINTER :: XEXNREF=>NULL()
-#ifndef _OPENACC
 REAL, DIMENSION(:,:,:), POINTER :: XRHODJ=>NULL()
-#else
-REAL, DIMENSION(:,:,:), ALLOCATABLE, TARGET :: XRHODJ
 !$acc declare create (XRHODJ)
-#endif
 REAL, POINTER :: XREFMASS=>NULL()
 REAL, POINTER :: XMASS_O_PHI0=>NULL()
 REAL, POINTER :: XLINMASS=>NULL()
@@ -95,9 +91,7 @@ REF_MODEL(KFROM)%XRHODJ=>XRHODJ
 !XTHVREF=>REF_MODEL(KTO)%XTHVREF !Done in FIELDLIST_GOTO_MODEL
 XRVREF=>REF_MODEL(KTO)%XRVREF
 XEXNREF=>REF_MODEL(KTO)%XEXNREF
-#ifndef _OPENACC
 XRHODJ=>REF_MODEL(KTO)%XRHODJ
-#endif
 XREFMASS=>REF_MODEL(KTO)%XREFMASS
 XMASS_O_PHI0=>REF_MODEL(KTO)%XMASS_O_PHI0
 XLINMASS=>REF_MODEL(KTO)%XLINMASS