Changeset 2118 for palm/trunk/SOURCE/palm.f90

Timestamp:

Jan 17, 2017 4:38:49 PM (7 years ago)

Author:

raasch

Message:

all OpenACC directives and related parts removed from the code

File:

• palm/trunk/SOURCE/palm.f90 (modified) (6 diffs)

palm/trunk/SOURCE/palm.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! OpenACC directives and related code removed
 ! 
 ! Former revisions:
@@ -213 +213 @@
         ONLY:  usm_write_restart_data        
 
-#if defined( __openacc )
-    USE OPENACC
-#endif
-
     IMPLICIT NONE
 
@@ -226 +222 @@
     INTEGER(iwp)      ::  i               !<
     INTEGER(iwp)      ::  myid_openmpi    !< OpenMPI local rank for CUDA aware MPI
-#if defined( __openacc )
-    REAL(wp), DIMENSION(100) ::  acc_dum     !<
-#endif
 
     version = 'PALM 4.0'
@@ -265 +258 @@
     ENDIF
 #endif
-
-#if defined( __openacc )
-!
-!-- Get the local MPI rank in case of CUDA aware OpenMPI. Important, if there
-!-- is more than one accelerator board on the node
-    CALL GET_ENVIRONMENT_VARIABLE('OMPI_COMM_WORLD_LOCAL_RANK',                &
-         VALUE=env_string, STATUS=env_stat )
-    READ( env_string, '(I1)' )  myid_openmpi
-    PRINT*, '### local_rank = ', myid_openmpi, '  status=',env_stat
-!
-!-- Get the number of accelerator boards per node and assign the MPI processes
-!-- to these boards
-    PRINT*, '*** ACC_DEVICE_NVIDIA = ', ACC_DEVICE_NVIDIA
-    num_acc_per_node  = ACC_GET_NUM_DEVICES( ACC_DEVICE_NVIDIA )
-    IF ( numprocs == 1  .AND.  num_acc_per_node > 0 )  num_acc_per_node = 1
-    PRINT*, '*** myid = ', myid_openmpi, ' num_acc_per_node = ', num_acc_per_node
-    acc_rank = MOD( myid_openmpi, num_acc_per_node )
-    CALL ACC_SET_DEVICE_NUM ( acc_rank, ACC_DEVICE_NVIDIA )
-!
-!-- Test output (to be removed later)
-    WRITE (*,'(A,I6,A,I3,A,I3,A,I3)') '*** Connect MPI-Task ', myid_openmpi,   &
-                                      ' to CPU ', acc_rank, ' Devices: ',      &
-                                      num_acc_per_node, ' connected to:',      &
-                                      ACC_GET_DEVICE_NUM( ACC_DEVICE_NVIDIA )
-#endif
-
-!
-!-- Ensure that OpenACC first attaches the GPU devices by copying a dummy data
-!-- region
-    !$acc data copyin( acc_dum )
 
 !
@@ -422 +385 @@
     ENDIF
 
-!
-!-- Declare and initialize variables in the accelerator memory with their
-!-- host values
-    !$acc  data copyin( d, diss, e, e_p, kh, km, p, pt, pt_p, q, ql, tend, te_m, tpt_m, tu_m, tv_m, tw_m, u, u_p, v, vpt, v_p, w, w_p )          &
-    !$acc       copyin( tri, tric, dzu, ddzu, ddzw, dd2zu, l_grid, l_wall, ptdf_x, ptdf_y, pt_init, rdf, rdf_sc, ref_state, ug, u_init, vg, v_init, zu, zw )   &
-    !$acc       copyin( hom, ol, pt1, qs, qsws, qswst, qv1, rif_wall, shf, ts, tswst, us, usws, uswst, uv_total, vsws, vswst, z0, z0h )      &
-    !$acc       copyin( fxm, fxp, fym, fyp, fwxm, fwxp, fwym, fwyp, nzb_diff_s_inner, nzb_diff_s_outer, nzb_diff_u )       &
-    !$acc       copyin( nzb_diff_v, nzb_s_inner, nzb_s_outer, nzb_u_inner )    &
-    !$acc       copyin( nzb_u_outer, nzb_v_inner, nzb_v_outer, nzb_w_inner )   &
-    !$acc       copyin( nzb_w_outer, rflags_invers, rflags_s_inner, rmask, wall_heatflux, wall_e_x, wall_e_y, wall_u, wall_v, wall_w_x, wall_w_y, wall_flags_0, wall_flags_00 )  &
-    !$acc       copyin( ngp_2dh, ngp_2dh_s_inner )  &
-    !$acc       copyin( weight_pres, weight_substep )
 !
 !-- Integration of the model equations using timestep-scheme
@@ -513 +464 @@
 
 !
-!-- Close the OpenACC dummy data region
-    !$acc end data
-    !$acc end data
-
-!
 !-- Take final CPU-time for CPU-time analysis
     CALL cpu_log( log_point(1), 'total', 'stop' )