Changeset 2192 for palm/trunk

Timestamp:

Mar 22, 2017 4:14:10 AM (8 years ago)

Author:

raasch

Message:

bugfixes for calculating spectra and for misplaced/missing openMP statements

Location:

palm/trunk/SOURCE

Files:

• prognostic_equations.f90 (modified) (3 diffs)
• spectra_mod.f90 (modified) (2 diffs)

palm/trunk/SOURCE/prognostic_equations.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! Bugfix for misplaced and missing openMP directives in r2155
 ! 
 ! Former revisions:
@@ -394 +394 @@
 
 !
-!-- Loop over all prognostic equations
-!$OMP PARALLEL private (i,i_omp_start,j,k,loop_start,tn)
-
-!$  tn = omp_get_thread_num()
-    loop_start = .TRUE.
-!$OMP DO
-
-!
 !-- If required, calculate cloud microphysics
     IF ( cloud_physics  .AND.  .NOT. microphysics_sat_adjust  .AND.            &
          ( intermediate_timestep_count == 1  .OR.                              &
-           call_microphysics_at_all_substeps )                                 &
-       )  THEN
+           call_microphysics_at_all_substeps ) )                               &
+    THEN
+       !$OMP PARALLEL private (i,j)
+       !$OMP DO
        DO  i = nxlg, nxrg
           DO  j = nysg, nyng
              CALL microphysics_control( i, j )
-           END DO
-       END DO
+           ENDDO
+       ENDDO
+       !$OMP END PARALLEL
     ENDIF
 
+!
+!-- Loop over all prognostic equations
+    !$OMP PARALLEL private (i,i_omp_start,j,k,loop_start,tn)
+
+    !$  tn = omp_get_thread_num()
+    loop_start = .TRUE.
+
+    !$OMP DO
     DO  i = nxl, nxr
 
@@ -1057 +1060 @@
        ENDDO
     ENDDO
-!$OMP END PARALLEL
+    !$OMP END PARALLEL
 
     CALL cpu_log( log_point(32), 'all progn.equations', 'stop' )

palm/trunk/SOURCE/spectra_mod.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! bugfix for index bounds of arrays spectrum_x and spectrum_y
 ! 
 ! Former revisions:
@@ -241 +241 @@
 
        IF ( dt_dosp /= 9999999.9_wp )  THEN
-          ALLOCATE( spectrum_x( 1:nx/2, 1:10, 1:10 ),                          &
-                    spectrum_y( 1:ny/2, 1:10, 1:10 ) )
+          ALLOCATE( spectrum_x( 1:nx/2, 1:100, 1:10 ),                         &
+                    spectrum_y( 1:ny/2, 1:100, 1:10 ) )
           spectrum_x = 0.0_wp
           spectrum_y = 0.0_wp