From 8119fc3b91ef3146c97df59bb0f484dd62a7b8d4 Mon Sep 17 00:00:00 2001 From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr> Date: Mon, 16 Jan 2017 13:12:48 +0100 Subject: [PATCH] Philippe 16/01/2017: minor corrections --- src/MNH/advec_4th_order_aux.f90 | 2 +- src/MNH/advec_weno_k_3_aux.f90 | 4 ---- src/MNH/advecuvw_weno_k.f90 | 2 +- src/MNH/turb.f90 | 1 - src/MNH/turb_ver.f90 | 2 +- 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/MNH/advec_4th_order_aux.f90 b/src/MNH/advec_4th_order_aux.f90 index aad9489c5..dcdcbb190 100644 --- a/src/MNH/advec_4th_order_aux.f90 +++ b/src/MNH/advec_4th_order_aux.f90 @@ -25,7 +25,7 @@ USE MODD_ARGSLIST_ll, ONLY : HALO2LIST_ll 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(INOUT) :: PMEANX, PMEANY ! fluxes +REAL, DIMENSION(:,:,:), INTENT(OUT) :: PMEANX, PMEANY ! fluxes !$acc declare present(PMEANX,PMEANY) REAL, DIMENSION(:,:,:), INTENT(IN) :: PFIELDT ! variable at t !$acc declare present(PFIELDT) diff --git a/src/MNH/advec_weno_k_3_aux.f90 b/src/MNH/advec_weno_k_3_aux.f90 index ae27d5b9f..c290158db 100644 --- a/src/MNH/advec_weno_k_3_aux.f90 +++ b/src/MNH/advec_weno_k_3_aux.f90 @@ -1683,8 +1683,6 @@ REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)):: 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 - -REAL, DIMENSION(SIZE(PSRC,1),SIZE(PSRC,2),SIZE(PSRC,3)) :: ZWORK !$acc declare present(ZOMP1, ZOMP2, ZOMP3, ZOMN1, ZOMN2, ZOMN3) ! ! EPSILON for weno weights calculation @@ -1724,8 +1722,6 @@ ZOMP3 = 0.0 ZOMN1 = 0.0 ZOMN2 = 0.0 ZOMN3 = 0.0 - -ZWORK = 0.0 ! !------------------------------------------------------------------------------- !* 1.1. Interior Fluxes diff --git a/src/MNH/advecuvw_weno_k.f90 b/src/MNH/advecuvw_weno_k.f90 index 84cf572f4..d005b7b95 100644 --- a/src/MNH/advecuvw_weno_k.f90 +++ b/src/MNH/advecuvw_weno_k.f90 @@ -127,7 +127,7 @@ TYPE(HALO2LIST_ll), POINTER :: TZHALO2_UT,TZHALO2_VT,TZHALO2_WT TYPE(LIST_ll), POINTER :: TZHALO2_ZMEAN INTEGER :: IINFO_ll ! return code of parallel routine ! -REAL, DIMENSION(SIZE(PUT,1), SIZE(PUT,2), SIZE(PUT,3)) :: ZMEAN, ZWORK, DYM_ZMEAN +REAL, DIMENSION(SIZE(PUT,1), SIZE(PUT,2), SIZE(PUT,3)) :: ZMEAN, ZWORK !$acc declare present(ZMEAN,ZWORK) ! INTEGER :: K_SCHEME diff --git a/src/MNH/turb.f90 b/src/MNH/turb.f90 index d4a9d0b42..3d4fd8de1 100644 --- a/src/MNH/turb.f90 +++ b/src/MNH/turb.f90 @@ -1297,7 +1297,6 @@ IF (LLES_CALL) THEN END DO CALL LES_MEAN_SUBGRID(PSFU,X_LES_UW0) CALL LES_MEAN_SUBGRID(PSFV,X_LES_VW0) - CALL LES_MEAN_SUBGRID((PSFU*PSFU+PSFV*PSFV)**0.25,X_LES_USTAR) #ifndef _OPENACC CALL LES_MEAN_SUBGRID((PSFU*PSFU+PSFV*PSFV)**0.25,X_LES_USTAR) #else diff --git a/src/MNH/turb_ver.f90 b/src/MNH/turb_ver.f90 index 4e420062e..339fc13ad 100644 --- a/src/MNH/turb_ver.f90 +++ b/src/MNH/turb_ver.f90 @@ -1,4 +1,4 @@ -! !MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2014 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. -- GitLab