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

Timestamp:

Mar 10, 2013 2:48:14 AM (11 years ago)

Author:

raasch

Message:

GPU porting of boundary conditions and routine pres; index bug removec from radiation boundary condition

File:

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

palm/trunk/SOURCE/time_integration.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! GPU-porting of boundary conditions,
+! openACC directives updated
+! formal parameter removed from routine boundary_conds
 !
 ! Former revisions:
@@ -242 +244 @@
 !--       Exchange of ghost points (lateral boundary conditions)
           CALL cpu_log( log_point(26), 'exchange-horiz-progn', 'start' )
-          !$acc update host( e_p, pt_p, u_p, v_p, w_p )
+
+          IF ( numprocs == 1 )  THEN    ! workaround for single-core GPU runs
+             on_device = .TRUE.         ! to be removed after complete porting
+          ELSE                          ! of ghost point exchange
+             !$acc update host( e_p, pt_p, u_p, v_p, w_p )
+          ENDIF
+
           CALL exchange_horiz( u_p, nbgp )
           CALL exchange_horiz( v_p, nbgp )
@@ -268 +276 @@
           IF ( wang_kernel  .OR.  turbulence )  CALL exchange_horiz( diss, nbgp )
 
+          IF ( numprocs == 1 )  THEN    ! workaround for single-core GPU runs
+             on_device = .FALSE.        ! to be removed after complete porting
+          ELSE                          ! of ghost point exchange
+             !$acc update device( e_p, pt_p, u_p, v_p, w_p )
+          ENDIF
+
           CALL cpu_log( log_point(26), 'exchange-horiz-progn', 'stop' )
 
@@ -273 +287 @@
 !--       Boundary conditions for the prognostic quantities (except of the
 !--       velocities at the outflow in case of a non-cyclic lateral wall)
-          CALL boundary_conds( 'main' )
+          CALL boundary_conds
 
 !
 !--       Swap the time levels in preparation for the next time step.
-          !$acc update device( e_p, pt_p, u_p, v_p, w_p )
           CALL swap_timelevel
 
@@ -305 +318 @@
              IF ( time_disturb >= dt_disturb )  THEN
                 !$acc update host( u, v )
+                IF ( numprocs == 1 )  on_device = .FALSE.  ! workaround, remove later
                 IF ( hom(nzb+5,1,pr_palm,0) < disturbance_energy_limit )  THEN
                    CALL disturb_field( nzb_u_inner, tend, u )
@@ -317 +331 @@
                    dist_range = 0
                 ENDIF
+                IF ( numprocs == 1 )  on_device = .TRUE.  ! workaround, remove later
                 !$acc update device( u, v )
                 time_disturb = time_disturb - dt_disturb