Ignore:
Timestamp:
Apr 8, 2019 7:35:54 PM (2 years ago)
Author:
knoop
Message:

Added chem_non_transport_physics module interface to chemistry_model_mod and moved respective calls into it

File:
1 edited

Legend:

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

    r3877 r3878  
    395395
    396396    USE chemistry_model_mod,                                                   &
    397         ONLY:  chem_boundary_conds, chem_depo, chem_integrate,                 &
    398                chem_prognostic_equations
     397        ONLY:  chem_boundary_conds, chem_prognostic_equations
    399398
    400399    USE control_parameters,                                                    &
     
    528527    CALL cpu_log( log_point(32), 'all progn.equations', 'start' )
    529528
    530 !
    531 !-- Calculation of chemical reactions. This is done outside of main loop,
    532 !-- since exchange of ghost points is required after this update of the
    533 !-- concentrations of chemical species                                   
     529    !$OMP PARALLEL PRIVATE (i,j)
     530    !$OMP DO
     531    DO  i = nxlg, nxrg
     532       DO  j = nysg, nyng
     533!
     534!--       Calculate non transport physics for all other modules
     535          CALL module_interface_non_transport_physics( i, j )
     536       ENDDO
     537    ENDDO
     538    !$OMP END PARALLEL
     539
    534540    IF ( air_chemistry )  THEN
    535 !
    536 !--    Chemical reactions and deposition
    537        IF ( chem_gasphase_on ) THEN
    538 
    539           IF ( intermediate_timestep_count == 1 .OR.                        &
    540              call_chem_at_all_substeps )  THEN
    541 
    542              CALL cpu_log( log_point_s(19), 'chem.reactions', 'start' )
    543              !$OMP PARALLEL PRIVATE (i,j)
    544              !$OMP DO schedule(static,1)
    545              DO  i = nxl, nxr
    546                 DO  j = nys, nyn
    547                    CALL chem_integrate (i,j)
    548                 ENDDO
    549              ENDDO
    550              !$OMP END PARALLEL
    551              CALL cpu_log( log_point_s(19), 'chem.reactions', 'stop' )
    552 
    553              IF ( deposition_dry )  THEN
    554                 CALL cpu_log( log_point_s(24), 'chem.deposition', 'start' )
    555                 DO  i = nxl, nxr
    556                    DO  j = nys, nyn
    557                       CALL chem_depo(i,j)
    558                    ENDDO
    559                 ENDDO
    560                 CALL cpu_log( log_point_s(24), 'chem.deposition', 'stop' )
    561              ENDIF
    562           ENDIF
    563        ENDIF
    564541!
    565542!--    Loop over chemical species       
     
    639616
    640617    ENDIF
    641 
    642     !$OMP PARALLEL PRIVATE (i,j)
    643     !$OMP DO
    644     DO  i = nxlg, nxrg
    645        DO  j = nysg, nyng
    646 !
    647 !--       Calculate non transport physics for all other modules
    648           CALL module_interface_non_transport_physics( i, j )
    649        ENDDO
    650     ENDDO
    651     !$OMP END PARALLEL
    652618
    653619!
Note: See TracChangeset for help on using the changeset viewer.