Changeset 3658 for palm/trunk/SOURCE/time_integration.f90

Timestamp:

Jan 7, 2019 8:28:54 PM (6 years ago)

Author:

knoop

Message:

OpenACC: flow_statistics partly ported to GPU

File:

• palm/trunk/SOURCE/time_integration.f90 (modified) (9 diffs)

palm/trunk/SOURCE/time_integration.f90

@@ -442 +442 @@
                rho_air_zw, rho_ocean, s, s_p, sa_p, te_m, tend, tpt_m, tu_m,   &
                tv_m, tw_m, u, ug, u_init, u_p, u_stokes_zu, v, vg, v_init, vpt,&
-               v_p, v_stokes_zu, w, w_p, zu
+               v_p, v_stokes_zu, w, w_p, zu, heatflux_output_conversion,       &
+               momentumflux_output_conversion
 
     USE biometeorology_mod,                                                    &
@@ -585 +586 @@
     USE statistics,                                                            &
         ONLY:  flow_statistics_called, hom, pr_palm, sums_ls_l,                &
-               rmask, statistic_regions, weight_substep, sums_l_l,             &
+               rmask, statistic_regions, weight_substep, sums_l, sums_l_l,     &
                sums_us2_ws_l, sums_wsus_ws_l, sums_vs2_ws_l, sums_wsvs_ws_l,   &
                sums_ws2_ws_l, sums_wspts_ws_l, sums_wsqs_ws_l, sums_wssas_ws_l,&
@@ -685 +686 @@
 !$ACC COPYIN(ddzu(1:nzt+1), dd2zu(1:nzt)) &
 !$ACC COPYIN(ddzw(1:nzt+1)) &
+!$ACC COPYIN(heatflux_output_conversion(nzb:nzt+1)) &
+!$ACC COPYIN(momentumflux_output_conversion(nzb:nzt+1)) &
 !$ACC COPYIN(rdf(nzb+1:nzt), rdf_sc(nzb+1:nzt)) &
 !$ACC COPYIN(ptdf_x(nxlg:nxrg), ptdf_y(nysg:nyng)) &
@@ -715 +718 @@
 ! Copy data from statistics
 !$ACC DATA &
-!$ACC COPYIN(hom(nzb+1:nzb_max,1,1:3,0)) &
+!$ACC COPYIN(hom(0:nz+1,1:2,1:4,0)) &
 !$ACC COPYIN(rmask(nysg:nyng,nxlg:nxrg,0:statistic_regions)) &
 !$ACC COPYIN(weight_substep(1:intermediate_timestep_count_max)) &
+!$ACC COPY(sums_l(nzb:nzt+1,1:pr_palm,0)) &
 !$ACC COPY(sums_l_l(nzb:nzt+1,0:statistic_regions,0)) &
 !$ACC COPY(sums_us2_ws_l(nzb:nzt+1,0)) &
@@ -734 +738 @@
 !$ACC COPY(sums_salsa_ws_l(nzb:nzt+1,0))
 
+#ifdef _OPENACC
+    CALL enter_surface_arrays
+#endif
+
 !
 !-- At beginning determine the first time step
@@ -849 +857 @@
        ENDIF   
        
-#ifdef _OPENACC
-       CALL enter_surface_arrays
-#endif
-        
 !
 !--    Start of intermediate step loop
@@ -1369 +1373 @@
 !
 !--    Will be used at some point by flow_statistics.
-       !$ACC UPDATE HOST(e, u, v, w, pt) &
-       !$ACC HOST(kh(nzb:nzt+1,nysg:nyng,nxlg:nxrg)) &
-       !$ACC HOST(km(nzb:nzt+1,nysg:nyng,nxlg:nxrg)) &
+       !$ACC UPDATE &
        !$ACC HOST(sums_l_l(nzb:nzt+1,0:statistic_regions,0)) &
        !$ACC HOST(sums_us2_ws_l(nzb:nzt+1,0)) &
@@ -1387 +1389 @@
        !$ACC HOST(sums_wsss_ws_l(nzb:nzt+1,0)) &
        !$ACC HOST(sums_salsa_ws_l(nzb:nzt+1,0))
-#ifdef _OPENACC
-       CALL exit_surface_arrays
-#endif
 
 !
@@ -1810 +1809 @@
     ENDDO   ! time loop
 
+#ifdef _OPENACC
+    CALL exit_surface_arrays
+#endif
 !$ACC END DATA
 !$ACC END DATA