Changeset 3467 for palm/trunk/SOURCE/time_integration.f90

Timestamp:

Oct 30, 2018 7:05:21 PM (5 years ago)

Author:

suehring

Message:

Branch salsa @3446 re-integrated into trunk

Location:

palm/trunk/SOURCE

Files:

• . (modified) (1 prop)
• time_integration.f90 (modified) (8 diffs)

palm/trunk/SOURCE/time_integration.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Implementation of a new aerosol module salsa.
+! 
+! 3448 2018-10-29 18:14:31Z kanani
 ! Add biometeorology
 ! 
@@ -549 +552 @@
                stg_adjust, stg_main, time_stg_adjust, time_stg_call,           &
                use_syn_turb_gen
+         
+    USE salsa_mod,                                                             &
+        ONLY: aerosol_number, aerosol_mass, nbins, ncc_tot, ngast, salsa,      &
+              salsa_boundary_conds, salsa_gas, salsa_gases_from_chem,          &
+              skip_time_do_salsa           
 
     USE user_actions_mod,                                                      &
@@ -571 +579 @@
 
     CHARACTER (LEN=9) ::  time_to_string   !<
-
-    INTEGER(iwp)      ::  lsp       !<
+    
+    INTEGER(iwp)      ::  b !< index for aerosol size bins    
+    INTEGER(iwp)      ::  c !< index for chemical compounds in aerosol size bins
+    INTEGER(iwp)      ::  g !< index for gaseous compounds 
+    INTEGER(iwp)      ::  lsp
     INTEGER(iwp)      ::  lsp_usr   !<
     INTEGER(iwp)      ::  n         !< loop counter for chemistry species
@@ -694 +705 @@
           CALL cpu_log( log_point(55), 'wind_turbine', 'stop' )
 
-       ENDIF       
+       ENDIF   
        
 !
@@ -852 +863 @@
           ENDIF
 
+          IF ( salsa  .AND.  time_since_reference_point >= skip_time_do_salsa )&
+          THEN
+             CALL cpu_log( log_point_s(91), 'salsa exch-horiz ', 'start' )
+             DO  b = 1, nbins
+                CALL exchange_horiz( aerosol_number(b)%conc_p, nbgp )
+                CALL cpu_log( log_point_s(93), 'salsa decycle', 'start' )
+                CALL salsa_boundary_conds( aerosol_number(b)%conc_p,           &
+                                           aerosol_number(b)%init )
+                CALL cpu_log( log_point_s(93), 'salsa decycle', 'stop' )
+                DO  c = 1, ncc_tot
+                   CALL exchange_horiz( aerosol_mass((c-1)*nbins+b)%conc_p,    &
+                                        nbgp )
+                   CALL cpu_log( log_point_s(93), 'salsa decycle', 'start' )
+                   CALL salsa_boundary_conds( aerosol_mass((c-1)*nbins+b)%conc_p,&
+                                              aerosol_mass((c-1)*nbins+b)%init )
+                   CALL cpu_log( log_point_s(93), 'salsa decycle', 'stop' )
+                ENDDO
+             ENDDO
+             IF ( .NOT. salsa_gases_from_chem )  THEN
+                DO  g = 1, ngast
+                   CALL exchange_horiz( salsa_gas(g)%conc_p, nbgp ) 
+                   CALL cpu_log( log_point_s(93), 'salsa decycle', 'start' )
+                   CALL salsa_boundary_conds( salsa_gas(g)%conc_p,             &
+                                              salsa_gas(g)%init )
+                   CALL cpu_log( log_point_s(93), 'salsa decycle', 'stop' )
+             ENDDO
+             ENDIF
+             CALL cpu_log( log_point_s(91), 'salsa exch-horiz ', 'stop' )
+          ENDIF         
+
           CALL cpu_log( log_point(26), 'exchange-horiz-progn', 'stop' )
 
@@ -906 +947 @@
                 ENDIF
 
-                IF ( passive_scalar )  CALL exchange_horiz( s, nbgp )
+                IF ( passive_scalar )  CALL exchange_horiz( s, nbgp )  
+               
                 IF ( .NOT. constant_diffusion )  CALL exchange_horiz( e, nbgp )
 
@@ -926 +968 @@
 !--          Correct the w top-BC in nest domains to ensure mass conservation.
 !--          This action must never be done for the root domain. Vertical 
-!--          nesting implies mass conservation.
 !--          Commented out April 18, 2018 as seemingly unnecessary. 
 !--          Will later be completely removed.
@@ -1248 +1289 @@
           time_dopr       = time_dopr        + dt_3d
        ENDIF
-       time_dopr_listing          = time_dopr_listing        + dt_3d
+       time_dopr_listing  = time_dopr_listing + dt_3d
        time_run_control   = time_run_control + dt_3d
 !