Changeset 4651 for palm/trunk/SOURCE/pres.f90

Timestamp:

Aug 27, 2020 7:17:45 AM (4 years ago)

Author:

raasch

Message:

preprocessor branch for ibm removed

File:

• palm/trunk/SOURCE/pres.f90 (modified) (5 diffs)

palm/trunk/SOURCE/pres.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! preprocessor branch for ibm removed
+!
+! 4649 2020-08-25 12:11:17Z raasch
 ! File re-formatted to follow the PALM coding standard
 !
@@ -384 +387 @@
     threadsum = 0.0_wp
 
-#if defined( __ibm )
-    !$OMP PARALLEL PRIVATE (i,j,k) FIRSTPRIVATE(threadsum) REDUCTION(+:localsum)
-    !$OMP DO SCHEDULE( STATIC )
-    DO  i = nxl, nxr
-       DO  j = nys, nyn
-          DO  k = nzb+1, nzt
-             d(k,j,i) = ( ( u(k,j,i+1) - u(k,j,i) ) * rho_air(k) * ddx +                           &
-                          ( v(k,j+1,i) - v(k,j,i) ) * rho_air(k) * ddy +                           &
-                          ( w(k,j,i)   * rho_air_zw(k) - w(k-1,j,i) * rho_air_zw(k-1) )            &
-                          * ddzw(k) )  * ddt_3d * d_weight_pres                                    &
-                        * MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_total_0(k,j,i), 0 ) )
-          ENDDO
-!
-!--       Compute possible PE-sum of divergences for flow_statistics
-          DO  k = nzb+1, nzt
-             threadsum = threadsum + ABS( d(k,j,i) )                                               &
-                         * MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_total_0(k,j,i), 0 ) )
-          ENDDO
-
-       ENDDO
-    ENDDO
-
-    IF ( intermediate_timestep_count == intermediate_timestep_count_max  .OR.                      &
-         intermediate_timestep_count == 0 )  THEN
-       localsum = localsum + threadsum * dt_3d * weight_pres_l
-    ENDIF
-    !$OMP END PARALLEL
-#else
-
     !$OMP PARALLEL PRIVATE (i,j,k)
     !$OMP DO SCHEDULE( STATIC )
@@ -451 +425 @@
        !$OMP END PARALLEL
     ENDIF
-#endif
 
 !
@@ -788 +761 @@
 
        !$OMP PARALLEL PRIVATE (i,j,k) FIRSTPRIVATE(threadsum) REDUCTION(+:localsum)
-#if defined( __ibm )
-       !$OMP DO SCHEDULE( STATIC )
-       DO  i = nxl, nxr
-          DO  j = nys, nyn
-             DO  k = nzb+1, nzt
-             d(k,j,i) = ( ( u(k,j,i+1) - u(k,j,i) ) * rho_air(k) * ddx +                           &
-                          ( v(k,j+1,i) - v(k,j,i) ) * rho_air(k) * ddy +                           &
-                          ( w(k,j,i)   * rho_air_zw(k) - w(k-1,j,i) * rho_air_zw(k-1) )            &
-                          * ddzw(k) )                                                              &
-                        * MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_total_0(k,j,i), 0 ) )
-             ENDDO
-             DO  k = nzb+1, nzt
-                threadsum = threadsum + ABS( d(k,j,i) )
-             ENDDO
-          ENDDO
-       ENDDO
-#else
        !$OMP DO SCHEDULE( STATIC )
        !$ACC PARALLEL LOOP COLLAPSE(3) PRIVATE(i, j, k) &
@@ -833 +789 @@
           ENDDO
        ENDDO
-#endif
 
        localsum = localsum + threadsum