From 5bc1aa73e9d1fc4876001e4f262e542659f65c4e Mon Sep 17 00:00:00 2001 From: ESCOBAR Juan <escj@nuwa.aerologie.net> Date: Tue, 9 Apr 2013 15:27:02 +0200 Subject: [PATCH] Juan 9/04/2013 : change type of XRT for mirror on GPU --- MNH/deallocate_model1.f90 | 3 ++- MNH/modd_fieldn.f90 | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/MNH/deallocate_model1.f90 b/MNH/deallocate_model1.f90 index 8f0fd1049..7e0fb2a86 100644 --- a/MNH/deallocate_model1.f90 +++ b/MNH/deallocate_model1.f90 @@ -134,7 +134,8 @@ IF ( KCALL==3 ) THEN IF (ASSOCIATED(XPABST)) DEALLOCATE(XPABST) ! DEALLOCATE(XRM) - IF (ASSOCIATED(XRT)) DEALLOCATE(XRT) +!!$ IF (ASSOCIATED(XRT)) DEALLOCATE(XRT) + IF (ALLOCATED(XRT)) DEALLOCATE(XRT) END IF ! IF ( KCALL==1 ) THEN diff --git a/MNH/modd_fieldn.f90 b/MNH/modd_fieldn.f90 index 70a11ca24..e992a91bc 100644 --- a/MNH/modd_fieldn.f90 +++ b/MNH/modd_fieldn.f90 @@ -112,7 +112,9 @@ REAL, DIMENSION(:,:,:), POINTER :: XRTKES=>NULL() REAL, DIMENSION(:,:,:), POINTER :: XPABSM=>NULL() REAL, DIMENSION(:,:,:), POINTER :: XPABST=>NULL() REAL, DIMENSION(:,:,:,:), POINTER :: XRM=>NULL() -REAL, DIMENSION(:,:,:,:), POINTER :: XRT=>NULL() +!!$REAL, DIMENSION(:,:,:,:), POINTER :: XRT=>NULL() +REAL, DIMENSION(:,:,:,:), ALLOCATABLE :: XRT +!$acc declare mirror (XRT) REAL, DIMENSION(:,:,:,:), POINTER :: XRRS=>NULL() REAL, DIMENSION(:,:,:,:), POINTER :: XSVM=>NULL() REAL, DIMENSION(:,:,:,:), POINTER :: XSVT=>NULL() @@ -150,7 +152,7 @@ FIELD_MODEL(KFROM)%XRTKES=>XRTKES FIELD_MODEL(KFROM)%XPABSM=>XPABSM FIELD_MODEL(KFROM)%XPABST=>XPABST FIELD_MODEL(KFROM)%XRM=>XRM -FIELD_MODEL(KFROM)%XRT=>XRT +!!$FIELD_MODEL(KFROM)%XRT=>XRT FIELD_MODEL(KFROM)%XRRS=>XRRS FIELD_MODEL(KFROM)%XSVM=>XSVM FIELD_MODEL(KFROM)%XSVT=>XSVT @@ -181,7 +183,7 @@ XRTKES=>FIELD_MODEL(KTO)%XRTKES XPABSM=>FIELD_MODEL(KTO)%XPABSM XPABST=>FIELD_MODEL(KTO)%XPABST XRM=>FIELD_MODEL(KTO)%XRM -XRT=>FIELD_MODEL(KTO)%XRT +!!$XRT=>FIELD_MODEL(KTO)%XRT XRRS=>FIELD_MODEL(KTO)%XRRS XSVM=>FIELD_MODEL(KTO)%XSVM XSVT=>FIELD_MODEL(KTO)%XSVT -- GitLab