Changeset 3634 for palm/trunk/SOURCE/prognostic_equations.f90

Timestamp:

Dec 18, 2018 12:31:28 PM (5 years ago)

Author:

knoop

Message:

OpenACC port for SPEC

File:

• palm/trunk/SOURCE/prognostic_equations.f90 (modified) (17 diffs)

palm/trunk/SOURCE/prognostic_equations.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! OpenACC port for SPEC
+! 
+! 3589 2018-11-30 15:09:51Z suehring
 ! Move the control parameter "salsa" from salsa_mod to control_parameters 
 ! (M. Kurppa)
@@ -1566 +1569 @@
     CALL cpu_log( log_point(5), 'u-equation', 'start' )
 
+    !$ACC KERNELS PRESENT(tend)
     tend = 0.0_wp
+    !$ACC END KERNELS
     IF ( timestep_scheme(1:5) == 'runge' )  THEN
        IF ( ws_scheme_mom )  THEN
@@ -1614 +1619 @@
 !
 !-- Prognostic equation for u-velocity component
+    !$ACC PARALLEL LOOP COLLAPSE(3) PRIVATE(i, j, k) &
+    !$ACC PRESENT(u, tend, tu_m, u_init, rdf, wall_flags_0) &
+    !$ACC PRESENT(tsc(2:5)) &
+    !$ACC PRESENT(u_p)
     DO  i = nxlu, nxr
        DO  j = nys, nyn
@@ -1640 +1649 @@
     IF ( timestep_scheme(1:5) == 'runge' )  THEN
        IF ( intermediate_timestep_count == 1 )  THEN
+          !$ACC PARALLEL LOOP COLLAPSE(3) PRIVATE(i, j, k) &
+          !$ACC PRESENT(tend, tu_m)
           DO  i = nxlu, nxr
              DO  j = nys, nyn
@@ -1649 +1660 @@
        ELSEIF ( intermediate_timestep_count < &
                 intermediate_timestep_count_max )  THEN
+          !$ACC PARALLEL LOOP COLLAPSE(3) PRIVATE(i, j, k) &
+          !$ACC PRESENT(tend, tu_m)
           DO  i = nxlu, nxr
              DO  j = nys, nyn
@@ -1666 +1679 @@
     CALL cpu_log( log_point(6), 'v-equation', 'start' )
 
+    !$ACC KERNELS PRESENT(tend)
     tend = 0.0_wp
+    !$ACC END KERNELS
     IF ( timestep_scheme(1:5) == 'runge' )  THEN
        IF ( ws_scheme_mom )  THEN
@@ -1711 +1726 @@
 !
 !-- Prognostic equation for v-velocity component
+    !$ACC PARALLEL LOOP COLLAPSE(3) PRIVATE(i, j, k) &
+    !$ACC PRESENT(v, tend, tv_m, v_init, rdf, wall_flags_0) &
+    !$ACC PRESENT(tsc(2:5)) &
+    !$ACC PRESENT(v_p)
     DO  i = nxl, nxr
        DO  j = nysv, nyn
@@ -1737 +1756 @@
     IF ( timestep_scheme(1:5) == 'runge' )  THEN
        IF ( intermediate_timestep_count == 1 )  THEN
+          !$ACC PARALLEL LOOP COLLAPSE(3) PRIVATE(i, j, k) &
+          !$ACC PRESENT(tend, tv_m)
           DO  i = nxl, nxr
              DO  j = nysv, nyn
@@ -1746 +1767 @@
        ELSEIF ( intermediate_timestep_count < &
                 intermediate_timestep_count_max )  THEN
+          !$ACC PARALLEL LOOP COLLAPSE(3) PRIVATE(i, j, k) &
+          !$ACC PRESENT(tend, tv_m)
           DO  i = nxl, nxr
              DO  j = nysv, nyn
@@ -1763 +1786 @@
     CALL cpu_log( log_point(7), 'w-equation', 'start' )
 
+    !$ACC KERNELS PRESENT(tend)
     tend = 0.0_wp
+    !$ACC END KERNELS
     IF ( timestep_scheme(1:5) == 'runge' )  THEN
        IF ( ws_scheme_mom )  THEN
@@ -1804 +1829 @@
 !
 !-- Prognostic equation for w-velocity component
+    !$ACC PARALLEL LOOP COLLAPSE(3) PRIVATE(i, j, k) &
+    !$ACC PRESENT(w, tend, tw_m, v_init, rdf, wall_flags_0) &
+    !$ACC PRESENT(tsc(2:5)) &
+    !$ACC PRESENT(w_p)
     DO  i = nxl, nxr
        DO  j = nys, nyn
@@ -1821 +1850 @@
     IF ( timestep_scheme(1:5) == 'runge' )  THEN
        IF ( intermediate_timestep_count == 1 )  THEN
+          !$ACC PARALLEL LOOP COLLAPSE(3) PRIVATE(i, j, k) &
+          !$ACC PRESENT(tend, tw_m)
           DO  i = nxl, nxr
              DO  j = nys, nyn
@@ -1830 +1861 @@
        ELSEIF ( intermediate_timestep_count < &
                 intermediate_timestep_count_max )  THEN
+          !$ACC PARALLEL LOOP COLLAPSE(3) PRIVATE(i, j, k) &
+          !$ACC PRESENT(tend, tw_m)
           DO  i = nxl, nxr
              DO  j = nys, nyn
@@ -1868 +1901 @@
 !--    pt-tendency terms with no communication
        IF ( scalar_advec /= 'bc-scheme' )  THEN
+          !$ACC KERNELS PRESENT(tend)
           tend = 0.0_wp
+          !$ACC END KERNELS
           IF ( timestep_scheme(1:5) == 'runge' )  THEN
              IF ( ws_scheme_sca )  THEN
@@ -1926 +1961 @@
 !
 !--    Prognostic equation for potential temperature
+       !$ACC PARALLEL LOOP COLLAPSE(3) PRIVATE(i, j, k) &
+       !$ACC PRESENT(pt, tend, tpt_m, wall_flags_0) &
+       !$ACC PRESENT(pt_init, rdf_sc, ptdf_x, ptdf_y) &
+       !$ACC PRESENT(tsc(3:5)) &
+       !$ACC PRESENT(pt_p)
        DO  i = nxl, nxr
           DO  j = nys, nyn
@@ -1945 +1985 @@
        IF ( timestep_scheme(1:5) == 'runge' )  THEN
           IF ( intermediate_timestep_count == 1 )  THEN
+             !$ACC PARALLEL LOOP COLLAPSE(3) PRIVATE(i, j, k) &
+             !$ACC PRESENT(tend, tpt_m)
              DO  i = nxl, nxr
                 DO  j = nys, nyn
@@ -1954 +1996 @@
           ELSEIF ( intermediate_timestep_count < &
                    intermediate_timestep_count_max )  THEN
+             !$ACC PARALLEL LOOP COLLAPSE(3) PRIVATE(i, j, k) &
+             !$ACC PRESENT(tend, tpt_m)
              DO  i = nxl, nxr
                 DO  j = nys, nyn