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

Timestamp:

Jun 9, 2016 4:25:25 PM (8 years ago)

Author:

suehring

Message:

several bugfixes in particle model and serial mode

File:

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

palm/trunk/SOURCE/pres.f90

@@ -19 +19 @@
 ! Current revisions:
 ! ------------------
-!
+! Bugfix: weight_substep for initial call, replace by local variable
 !
 ! Former revisions:
@@ -162 +162 @@
     REAL(wp)     ::  threadsum      !<
     REAL(wp)     ::  weight_pres_l  !<
+    REAL(wp)     ::  weight_substep_l !<
 
     REAL(wp), DIMENSION(1:3)   ::  volume_flow_l       !<
@@ -178 +179 @@
 !
 !--    If pres is called before initial time step
-       weight_pres_l = 1.0_wp
-       d_weight_pres = 1.0_wp
+       weight_pres_l    = 1.0_wp
+       d_weight_pres    = 1.0_wp
+       weight_substep_l = 1.0_wp
     ELSE
-       weight_pres_l = weight_pres(intermediate_timestep_count)
-       d_weight_pres = 1.0_wp / weight_pres(intermediate_timestep_count)
+       weight_pres_l    = weight_pres(intermediate_timestep_count)
+       d_weight_pres    = 1.0_wp / weight_pres(intermediate_timestep_count)
+       weight_substep_l = weight_substep(intermediate_timestep_count)
     ENDIF
 
@@ -591 +594 @@
        !$OMP PARALLEL PRIVATE (i,j,k)
        !$OMP DO
-       !$acc kernels present( p, tend, weight_substep )
+       !$acc kernels present( p, tend, weight_substep_l )
        !$acc loop independent
        DO  i = nxl-1, nxr+1
@@ -599 +602 @@
              DO  k = nzb, nzt+1
                 p(k,j,i) = tend(k,j,i) * &
-                           weight_substep(intermediate_timestep_count)
+                           weight_substep_l
              ENDDO
           ENDDO
@@ -609 +612 @@
        !$OMP PARALLEL PRIVATE (i,j,k)
        !$OMP DO
-       !$acc kernels present( p, tend, weight_substep )
+       !$acc kernels present( p, tend, weight_substep_l )
        !$acc loop independent
        DO  i = nxl-1, nxr+1
@@ -617 +620 @@
              DO  k = nzb, nzt+1
                 p(k,j,i) = p(k,j,i) + tend(k,j,i) * &
-                           weight_substep(intermediate_timestep_count)
+                           weight_substep_l
              ENDDO
           ENDDO