Changeset 4731 for palm/trunk/SOURCE/salsa_mod.f90

Timestamp:

Oct 7, 2020 1:25:11 PM (4 years ago)

Author:

schwenkel

Message:

Move exchange_horiz from time_integration to modules

File:

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

palm/trunk/SOURCE/salsa_mod.f90

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! Move exchange_horiz from time_integration to modules
+!
+! 4671 2020-09-09 20:27:58Z pavelkrc
 ! Implementation of downward facing USM and LSM surfaces
 ! 
@@ -8332 +8335 @@
 !> Routine for exchange horiz of salsa variables.
 !------------------------------------------------------------------------------!
- SUBROUTINE salsa_exchange_horiz_bounds
+ SUBROUTINE salsa_exchange_horiz_bounds ( location )
 
     USE cpulog,                                                                &
@@ -8347 +8350 @@
     INTEGER(iwp) ::  ig   !<
 
-    IF ( time_since_reference_point >= skip_time_do_salsa )  THEN
-       IF ( ( time_since_reference_point - last_salsa_time ) >= dt_salsa )  THEN
-
-          CALL cpu_log( log_point_s(91), 'salsa exch-horiz ', 'start' )
-!
-!--       Exchange ghost points
-          DO  ib = 1, nbins_aerosol
-             CALL exchange_horiz( aerosol_number(ib)%conc, nbgp,                                   &
-                                  alternative_communicator = communicator_salsa )
-             DO  ic = 1, ncomponents_mass
-                icc = ( ic - 1 ) * nbins_aerosol + ib
-                CALL exchange_horiz( aerosol_mass(icc)%conc, nbgp,                                 &
+    CHARACTER (LEN=*), INTENT(IN) ::  location !< call location string
+
+    SELECT CASE ( location )
+
+       CASE ( 'before_prognostic_equation' )
+
+          IF ( time_since_reference_point >= skip_time_do_salsa )  THEN
+             IF ( ( time_since_reference_point - last_salsa_time ) >= dt_salsa )  THEN
+
+                CALL cpu_log( log_point_s(91), 'salsa exch-horiz ', 'start' )
+!
+!--             Exchange ghost points
+                DO  ib = 1, nbins_aerosol
+                   CALL exchange_horiz( aerosol_number(ib)%conc, nbgp,                             &
+                                        alternative_communicator = communicator_salsa )
+                   DO  ic = 1, ncomponents_mass
+                      icc = ( ic - 1 ) * nbins_aerosol + ib
+                      CALL exchange_horiz( aerosol_mass(icc)%conc, nbgp,                           &
+                                           alternative_communicator = communicator_salsa )
+                   ENDDO
+                ENDDO
+                IF ( .NOT. salsa_gases_from_chem )  THEN
+                   DO  ig = 1, ngases_salsa
+                      CALL exchange_horiz( salsa_gas(ig)%conc, nbgp,                               &
+                                           alternative_communicator = communicator_salsa )
+                   ENDDO
+                ENDIF
+!
+!--             Apply only horizontal boundary conditions
+                CALL salsa_boundary_conditions( horizontal_conditions_only = .TRUE. )
+                CALL cpu_log( log_point_s(91), 'salsa exch-horiz ', 'stop' )
+!
+!--             Update last_salsa_time
+                last_salsa_time = time_since_reference_point
+             ENDIF
+          ENDIF
+
+       CASE ( 'after_prognostic_equation' )
+
+          IF ( salsa  .AND.  time_since_reference_point >= skip_time_do_salsa )  THEN
+             DO  ib = 1, nbins_aerosol
+                CALL exchange_horiz( aerosol_number(ib)%conc_p, nbgp,                              &
                                      alternative_communicator = communicator_salsa )
+                DO  ic = 1, ncomponents_mass
+                   icc = ( ic - 1 ) * nbins_aerosol + ib
+                   CALL exchange_horiz( aerosol_mass(icc)%conc_p, nbgp,                            &
+                                        alternative_communicator = communicator_salsa )
+                ENDDO
              ENDDO
-          ENDDO
-          IF ( .NOT. salsa_gases_from_chem )  THEN
-             DO  ig = 1, ngases_salsa
-                CALL exchange_horiz( salsa_gas(ig)%conc, nbgp,                                     &
+             IF ( .NOT. salsa_gases_from_chem )  THEN
+                DO  ig = 1, ngases_salsa
+                   CALL exchange_horiz( salsa_gas(ig)%conc_p, nbgp,                                &
+                                        alternative_communicator = communicator_salsa )
+                ENDDO
+             ENDIF
+          ENDIF
+
+       CASE ( 'after_anterpolation' )
+
+          IF ( salsa  .AND. time_since_reference_point >= skip_time_do_salsa )  THEN
+             DO  ib = 1, nbins_aerosol
+                CALL exchange_horiz( aerosol_number(ib)%conc, nbgp,                                &
                                      alternative_communicator = communicator_salsa )
+                DO  ic = 1, ncomponents_mass
+                   icc = ( ic - 1 ) * nbins_aerosol + ib
+                   CALL exchange_horiz( aerosol_mass(icc)%conc, nbgp,                              &
+                                        alternative_communicator = communicator_salsa )
+                ENDDO
              ENDDO
+             IF ( .NOT. salsa_gases_from_chem )  THEN
+                DO  ig = 1, ngases_salsa
+                   CALL exchange_horiz( salsa_gas(ig)%conc, nbgp,                                  &
+                                        alternative_communicator = communicator_salsa )
+                ENDDO
+             ENDIF
           ENDIF
-!
-!--       Apply only horizontal boundary conditions
-          CALL salsa_boundary_conditions( horizontal_conditions_only = .TRUE. )
-          CALL cpu_log( log_point_s(91), 'salsa exch-horiz ', 'stop' )
-!
-!--       Update last_salsa_time
-          last_salsa_time = time_since_reference_point
-       ENDIF
-    ENDIF
+
+    END SELECT
 
  END SUBROUTINE salsa_exchange_horiz_bounds
+
 
 !------------------------------------------------------------------------------!