Changeset 3849 for palm/trunk/SOURCE/init_3d_model.f90

Timestamp:

Apr 1, 2019 4:35:16 PM (5 years ago)

Author:

knoop

Message:

Bugfix: added proper OpenACC support to disturb_field

File:

• palm/trunk/SOURCE/init_3d_model.f90 (modified) (3 diffs)

palm/trunk/SOURCE/init_3d_model.f90

@@ -668 +668 @@
         ONLY :  init_surface_arrays, init_surfaces, surf_def_h, surf_lsm_h,    &
                 surf_usm_h, get_topography_top_index_ji
+
+#if defined( _OPENACC )
+    USE surface_mod,                                                           &
+        ONLY :  bc_h
+#endif
 
     USE surface_data_output_mod,                                               &
@@ -2169 +2174 @@
          TRIM( initializing_actions ) /= 'cyclic_fill' )  THEN
 
+!
+!--    Needed for both disturb_field and pres
+!$ACC DATA &
+!$ACC CREATE(tend(nzb:nzt+1,nysg:nyng,nxlg:nxrg)) &
+!$ACC COPY(u(nzb:nzt+1,nysg:nyng,nxlg:nxrg)) &
+!$ACC COPY(v(nzb:nzt+1,nysg:nyng,nxlg:nxrg))
+
        CALL location_message( 'creating initial disturbances', .FALSE. )
        CALL disturb_field( 'u', tend, u )
        CALL disturb_field( 'v', tend, v )
        CALL location_message( 'finished', .TRUE. )
+
+!$ACC DATA &
+!$ACC CREATE(d(nzb+1:nzt,nys:nyn,nxl:nxr)) &
+!$ACC COPY(w(nzb:nzt+1,nysg:nyng,nxlg:nxrg)) &
+!$ACC COPY(p(nzb:nzt+1,nysg:nyng,nxlg:nxrg)) &
+!$ACC COPYIN(rho_air(nzb:nzt+1), rho_air_zw(nzb:nzt+1)) &
+!$ACC COPYIN(ddzu(1:nzt+1), ddzw(1:nzt+1)) &
+!$ACC COPYIN(wall_flags_0(nzb:nzt+1,nysg:nyng,nxlg:nxrg)) &
+!$ACC COPYIN(bc_h(0:1)) &
+!$ACC COPYIN(bc_h(0)%i(1:bc_h(0)%ns)) &
+!$ACC COPYIN(bc_h(0)%j(1:bc_h(0)%ns)) &
+!$ACC COPYIN(bc_h(0)%k(1:bc_h(0)%ns)) &
+!$ACC COPYIN(bc_h(1)%i(1:bc_h(1)%ns)) &
+!$ACC COPYIN(bc_h(1)%j(1:bc_h(1)%ns)) &
+!$ACC COPYIN(bc_h(1)%k(1:bc_h(1)%ns))
 
        CALL location_message( 'calling pressure solver', .FALSE. )
@@ -2179 +2206 @@
        n_sor = nsor
        CALL location_message( 'finished', .TRUE. )
+
+!$ACC END DATA
+!$ACC END DATA
 
     ENDIF