Ignore:
Timestamp:
Mar 22, 2017 4:14:10 AM (5 years ago)
Author:
raasch
Message:

bugfixes for calculating spectra and for misplaced/missing openMP statements

File:
1 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/prognostic_equations.f90

    r2156 r2192  
    2020! Current revisions:
    2121! ------------------
    22 !
     22! Bugfix for misplaced and missing openMP directives in r2155
    2323!
    2424! Former revisions:
     
    394394
    395395!
    396 !-- Loop over all prognostic equations
    397 !$OMP PARALLEL private (i,i_omp_start,j,k,loop_start,tn)
    398 
    399 !$  tn = omp_get_thread_num()
    400     loop_start = .TRUE.
    401 !$OMP DO
    402 
    403 !
    404396!-- If required, calculate cloud microphysics
    405397    IF ( cloud_physics  .AND.  .NOT. microphysics_sat_adjust  .AND.            &
    406398         ( intermediate_timestep_count == 1  .OR.                              &
    407            call_microphysics_at_all_substeps )                                 &
    408        )  THEN
     399           call_microphysics_at_all_substeps ) )                               &
     400    THEN
     401       !$OMP PARALLEL private (i,j)
     402       !$OMP DO
    409403       DO  i = nxlg, nxrg
    410404          DO  j = nysg, nyng
    411405             CALL microphysics_control( i, j )
    412            END DO
    413        END DO
     406           ENDDO
     407       ENDDO
     408       !$OMP END PARALLEL
    414409    ENDIF
    415410
     411!
     412!-- Loop over all prognostic equations
     413    !$OMP PARALLEL private (i,i_omp_start,j,k,loop_start,tn)
     414
     415    !$  tn = omp_get_thread_num()
     416    loop_start = .TRUE.
     417
     418    !$OMP DO
    416419    DO  i = nxl, nxr
    417420
     
    10571060       ENDDO
    10581061    ENDDO
    1059 !$OMP END PARALLEL
     1062    !$OMP END PARALLEL
    10601063
    10611064    CALL cpu_log( log_point(32), 'all progn.equations', 'stop' )
Note: See TracChangeset for help on using the changeset viewer.