From d4b39a20af6c8b68741242503a08730827e84487 Mon Sep 17 00:00:00 2001
From: ESCOBAR Juan <escj@nuwa>
Date: Thu, 7 Nov 2013 20:07:30 +0100
Subject: [PATCH] Juan 7/11/2013: remove PPM_MET variable
---
MNH/mode_mnh_zwork.f90 | 59 +++---------------------------------------
1 file changed, 4 insertions(+), 55 deletions(-)
diff --git a/MNH/mode_mnh_zwork.f90 b/MNH/mode_mnh_zwork.f90
index cc2944349..4cbc8cd33 100644
--- a/MNH/mode_mnh_zwork.f90
+++ b/MNH/mode_mnh_zwork.f90
@@ -16,16 +16,9 @@ MODULE MODE_MNH_ZWORK
!
REAL, SAVE, ALLOCATABLE , DIMENSION(:,:,:) :: &
& ZW3D20,ZW3D21,ZW3D22,ZW3D23,ZW3D24,ZW3D25, &
- & ZPPM, &
- & ZRHOX1_PPM_MET,ZRHOX2_PPM_MET,ZRHOY1_PPM_MET, &
- & ZRHOY2_PPM_MET,ZRHOZ1_PPM_MET,ZRHOZ2_PPM_MET, &
- & ZSRC_PPM_MET
+ & ZPPM
!$acc declare mirror (ZW3D20,ZW3D21,ZW3D22,ZW3D23,ZW3D24,ZW3D25) &
- !$acc & mirror(ZPPM) &
- !$acc & mirror(ZRHOX1_PPM_MET,ZRHOX2_PPM_MET,ZRHOY1_PPM_MET) &
- !$acc & mirror(ZRHOY2_PPM_MET,ZRHOZ1_PPM_MET,ZRHOZ2_PPM_MET) &
- !$acc & mirror(ZSRC_PPM_MET)
-
+ !$acc & mirror(ZPPM)
REAL, SAVE, ALLOCATABLE , DIMENSION(:,:) :: ZPSRC_HALO2_WEST
REAL, SAVE, ALLOCATABLE , DIMENSION(:,:) :: ZPSRC_HALO2_SOUTH
@@ -34,10 +27,6 @@ MODULE MODE_MNH_ZWORK
REAL, SAVE, ALLOCATABLE , DIMENSION(:,:,:) :: ZUNIT3D
!$acc declare mirror(ZUNIT3D)
-!!$ REAL, SAVE, ALLOCATABLE, DIMENSION(:,:,:) :: &
-!!$ ZQL,ZQR,ZDQ,ZQ6,ZDMQ,ZQL0,ZQR0,ZQ60,ZFPOS,ZFNEG
-!!$ !$acc declare mirror(ZQL,ZQR,ZDQ,ZQ6,ZDMQ,ZQL0,ZQR0,ZQ60,ZFPOS,ZFNEG)
-
REAL, SAVE, ALLOCATABLE, DIMENSION(:,:,:) :: &
ZRUT,ZRVT,ZRWT,ZRUCT,ZRVCT,ZRWCT
!$acc declare mirror(ZRUT,ZRVT,ZRWT,ZRUCT,ZRVCT,ZRWCT)
@@ -58,8 +47,6 @@ CONTAINS
USE MODD_PARAMETERS, ONLY : JPVEXT, XUNDEF
USE MODD_DIM_n, ONLY : NKMAX
-
-
IMPLICIT NONE
INTEGER :: IMODEL
@@ -68,13 +55,11 @@ CONTAINS
IF (GFIRST_CALL_MNH_ALLOC_ZWORK) THEN
GFIRST_CALL_MNH_ALLOC_ZWORK = .FALSE.
-
!
! Array dim
!
CALL GET_DIM_EXT_ll('B',IIU,IJU)
IKU=NKMAX + 2* JPVEXT
-
!
! Computation bound
!
@@ -85,8 +70,6 @@ CONTAINS
IIA=IIE
IKB = 1 + JPVEXT
IKE = NKMAX + JPVEXT
-
-
!
! Lateral boundary
!
@@ -108,24 +91,12 @@ CONTAINS
ALLOCATE (ZW3D25(IIU,IJU,IKU))
ALLOCATE (ZPPM(IIU,IJU,IKU))
- ALLOCATE (ZRHOX1_PPM_MET(IIU,IJU,IKU))
- ALLOCATE (ZRHOX2_PPM_MET(IIU,IJU,IKU))
- ALLOCATE (ZRHOY1_PPM_MET(IIU,IJU,IKU))
- ALLOCATE (ZRHOY2_PPM_MET(IIU,IJU,IKU))
- ALLOCATE (ZRHOZ1_PPM_MET(IIU,IJU,IKU))
- ALLOCATE (ZRHOZ2_PPM_MET(IIU,IJU,IKU))
- ALLOCATE (ZSRC_PPM_MET(IIU,IJU,IKU))
ALLOCATE (ZPSRC_HALO2_WEST(IJU,IKU))
ALLOCATE (ZPSRC_HALO2_SOUTH(IIU,IKU))
ALLOCATE (ZUNIT3D(IIU,IJU,IKU))
-!!$ ALLOCATE (ZQL(IIU,IJU,IKU),ZQR(IIU,IJU,IKU),ZDQ(IIU,IJU,IKU))
-!!$ ALLOCATE (ZQ6(IIU,IJU,IKU),ZDMQ(IIU,IJU,IKU),ZQL0(IIU,IJU,IKU))
-!!$ ALLOCATE (ZQR0(IIU,IJU,IKU),ZQ60(IIU,IJU,IKU),ZFPOS(IIU,IJU,IKU))
-!!$ ALLOCATE (ZFNEG(IIU,IJU,IKU))
-
ALLOCATE (ZRUT(IIU,IJU,IKU),ZRVT(IIU,IJU,IKU),ZRWT(IIU,IJU,IKU))
ALLOCATE (ZRUCT(IIU,IJU,IKU),ZRVCT(IIU,IJU,IKU),ZRWCT(IIU,IJU,IKU))
@@ -152,25 +123,6 @@ CONTAINS
ZUNIT3D = 1.0
- ZRHOX1_PPM_MET = XUNDEF
- ZRHOX2_PPM_MET = XUNDEF
- ZRHOY1_PPM_MET = XUNDEF
- ZRHOY2_PPM_MET = XUNDEF
- ZRHOZ1_PPM_MET = XUNDEF
- ZRHOZ2_PPM_MET = XUNDEF
- ZSRC_PPM_MET = XUNDEF
-
-!!$ ZQL = XUNDEF
-!!$ ZQR = XUNDEF
-!!$ ZDQ = XUNDEF
-!!$ ZQ6 = XUNDEF
-!!$ ZDMQ = XUNDEF
-!!$ ZQL0 = XUNDEF
-!!$ ZQR0 = XUNDEF
-!!$ ZQ60 = XUNDEF
-!!$ ZFPOS = XUNDEF
-!!$ ZFNEG = XUNDEF
-
ZRUT = XUNDEF
ZRVT = XUNDEF
ZRWT = XUNDEF
@@ -184,17 +136,14 @@ CONTAINS
!$acc update host (ZW3D20,ZW3D21,ZW3D22,ZW3D23,ZW3D24,ZW3D25)
!$acc update host (ZPPM)
+
!$acc update host (ZPSRC_HALO2_WEST,ZPSRC_HALO2_SOUTH)
!$acc update host (ZUNIT3D)
- !$acc update host (ZRHOX1_PPM_MET,ZRHOX2_PPM_MET,ZRHOY1_PPM_MET)
- !$acc update host (ZRHOY2_PPM_MET,ZRHOZ1_PPM_MET,ZRHOZ2_PPM_MET)
- !$acc update host (ZSRC_PPM_MET)
-!!$ !$acc update host (ZQL,ZQR,ZDQ,ZQ6,ZDMQ,ZQL0,ZQR0,ZQ60,ZFPOS,ZFNEG)
+
!$acc update host (ZRUT,ZRVT,ZRWT,ZRUCT,ZRVCT,ZRWCT)
!$acc update host (ZT3D)
-
END IF
END SUBROUTINE MNH_ALLOC_ZWORK
--
GitLab