From 2242823c652ddbe29eec9bb1a773f52fc0fb80de Mon Sep 17 00:00:00 2001 From: ESCOBAR Juan <escj@nuwa> Date: Sun, 24 Nov 2013 00:41:09 +0100 Subject: [PATCH] Juan 23/11/2013: metric on OpenAcc for contrav --- MNH/modd_metricsn.f90 | 16 +++++++++------- MNH/update_metrics.f90 | 1 + 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/MNH/modd_metricsn.f90 b/MNH/modd_metricsn.f90 index 4d7d03bf9..d89188ded 100644 --- a/MNH/modd_metricsn.f90 +++ b/MNH/modd_metricsn.f90 @@ -47,8 +47,10 @@ END TYPE METRICS_t TYPE(METRICS_t), DIMENSION(JPMODELMAX), TARGET, SAVE :: METRICS_MODEL -REAL, DIMENSION(:,:,:), POINTER :: XDXX=>NULL(),XDZX=>NULL(), & - XDYY=>NULL(),XDZY=>NULL(),XDZZ=>NULL() +!REAL, DIMENSION(:,:,:), POINTER :: XDXX=>NULL(),XDZX=>NULL(), & +! XDYY=>NULL(),XDZY=>NULL(),XDZZ=>NULL() +REAL, DIMENSION(:,:,:), ALLOCATABLE , TARGET :: XDXX,XDYY,XDZZ,XDZX,XDZY +!$acc declare mirror(XDXX,XDYY,XDZZ,XDZX,XDZY) CONTAINS @@ -63,11 +65,11 @@ METRICS_MODEL(KFROM)%XDZY=>XDZY METRICS_MODEL(KFROM)%XDZZ=>XDZZ ! ! Current model is set to model KTO -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 +!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 END SUBROUTINE METRICS_GOTO_MODEL diff --git a/MNH/update_metrics.f90 b/MNH/update_metrics.f90 index 961dd3e6f..8b663bb14 100644 --- a/MNH/update_metrics.f90 +++ b/MNH/update_metrics.f90 @@ -129,5 +129,6 @@ IF ( HLBCY(1) /= "CYCL" .AND. LSOUTH_ll()) THEN PDZY(JI,IJB-1,:) = PDZY(JI,IJB,:) END DO END IF +!$acc update device (PDXX,PDYY,PDZZ,PDZX,PDZY) !----------------------------------------------------------------------------- END SUBROUTINE UPDATE_METRICS -- GitLab