Changeset 3878 for palm/trunk/SOURCE/prognostic_equations.f90

Timestamp:

Apr 8, 2019 7:35:54 PM (5 years ago)

Author:

knoop

Message:

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

File:

• palm/trunk/SOURCE/prognostic_equations.f90 (modified) (3 diffs)

palm/trunk/SOURCE/prognostic_equations.f90

@@ -395 +395 @@
 
     USE chemistry_model_mod,                                                   &
-        ONLY:  chem_boundary_conds, chem_depo, chem_integrate,                 &
-               chem_prognostic_equations
+        ONLY:  chem_boundary_conds, chem_prognostic_equations
 
     USE control_parameters,                                                    &
@@ -528 +527 @@
     CALL cpu_log( log_point(32), 'all progn.equations', 'start' )
 
-!
-!-- Calculation of chemical reactions. This is done outside of main loop,
-!-- since exchange of ghost points is required after this update of the
-!-- concentrations of chemical species                                    
+    !$OMP PARALLEL PRIVATE (i,j)
+    !$OMP DO
+    DO  i = nxlg, nxrg
+       DO  j = nysg, nyng
+!
+!--       Calculate non transport physics for all other modules
+          CALL module_interface_non_transport_physics( i, j )
+       ENDDO
+    ENDDO
+    !$OMP END PARALLEL
+
     IF ( air_chemistry )  THEN
-!
-!--    Chemical reactions and deposition
-       IF ( chem_gasphase_on ) THEN
-
-          IF ( intermediate_timestep_count == 1 .OR.                        &
-             call_chem_at_all_substeps )  THEN
-
-             CALL cpu_log( log_point_s(19), 'chem.reactions', 'start' )
-             !$OMP PARALLEL PRIVATE (i,j)
-             !$OMP DO schedule(static,1)
-             DO  i = nxl, nxr
-                DO  j = nys, nyn
-                   CALL chem_integrate (i,j)
-                ENDDO
-             ENDDO
-             !$OMP END PARALLEL
-             CALL cpu_log( log_point_s(19), 'chem.reactions', 'stop' )
-
-             IF ( deposition_dry )  THEN
-                CALL cpu_log( log_point_s(24), 'chem.deposition', 'start' )
-                DO  i = nxl, nxr
-                   DO  j = nys, nyn
-                      CALL chem_depo(i,j)
-                   ENDDO
-                ENDDO
-                CALL cpu_log( log_point_s(24), 'chem.deposition', 'stop' )
-             ENDIF
-          ENDIF
-       ENDIF
 !
 !--    Loop over chemical species       
@@ -639 +616 @@
 
     ENDIF
-
-    !$OMP PARALLEL PRIVATE (i,j)
-    !$OMP DO
-    DO  i = nxlg, nxrg
-       DO  j = nysg, nyng
-!
-!--       Calculate non transport physics for all other modules
-          CALL module_interface_non_transport_physics( i, j )
-       ENDDO
-    ENDDO
-    !$OMP END PARALLEL
 
 !