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

Timestamp:

Apr 24, 2019 12:52:08 PM (5 years ago)

Author:

banzhafs

Message:

Correct/complete module_interface introduction for chemistry model and bug fix in chem_depo subroutine

File:

• palm/trunk/SOURCE/time_integration.f90 (modified) (6 diffs)

palm/trunk/SOURCE/time_integration.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Reverse changes back from revision 3878: use chem_boundary_conds instead of
+! chem_boundary_conds_decycle
+! 
+! 
+! 3885 2019-04-11 11:29:34Z kanani
 ! Changes related to global restructuring of location messages and introduction 
 ! of additional debug messages
-! 
+!
 ! 3879 2019-04-08 20:25:23Z knoop
 ! Moved wtm_forces to module_interface_actions
@@ -510 +515 @@
 
     USE chem_gasphase_mod,                                                                         &
-        ONLY:  nspec
+        ONLY:  nvar
 
     USE chem_modules,                                                                              &
-        ONLY:  bc_cs_t_val, emissions_anthropogenic, nspec_out, chem_species
+        ONLY:  bc_cs_t_val, chem_species, cs_name, emissions_anthropogenic, nspec_out
 
     USE chemistry_model_mod,                                                                       &
-        ONLY:  chem_boundary_conds_decycle
+        ONLY:  chem_boundary_conds
 
     USE control_parameters,                                                                        &
@@ -684 +689 @@
     INTEGER(iwp)      ::  icc       !< additional index for aerosol mass bins
     INTEGER(iwp)      ::  ig        !< index for salsa gases
+    INTEGER(iwp)      ::  lsp
+    INTEGER(iwp)      ::  lsp_usr   !<
     INTEGER(iwp)      ::  n         !< loop counter for chemistry species
 
@@ -861 +868 @@
            bc_q_t_val  = ( q_init(nzt+1) - q_init(nzt) ) / dzu(nzt+1)
            IF ( air_chemistry )  THEN
-              DO  n = 1, nspec
-                 bc_cs_t_val = (  chem_species(n)%conc_pr_init(nzt+1)                            &
-                                - chem_species(n)%conc_pr_init(nzt) )                            &
+              DO  lsp = 1, nvar
+                 bc_cs_t_val = (  chem_species(lsp)%conc_pr_init(nzt+1)                            &
+                                - chem_species(lsp)%conc_pr_init(nzt) )                            &
                                / dzu(nzt+1)
               ENDDO
@@ -1038 +1045 @@
           ENDIF
           IF ( passive_scalar )  CALL exchange_horiz( s_p, nbgp )
-          IF ( air_chemistry  )  CALL chem_boundary_conds_decycle
+          IF ( air_chemistry )  THEN
+             DO  lsp = 1, nvar
+                CALL exchange_horiz( chem_species(lsp)%conc_p, nbgp )
+!
+!--             kanani: Push chem_boundary_conds after CALL boundary_conds
+                lsp_usr = 1
+                DO WHILE ( TRIM( cs_name( lsp_usr ) ) /= 'novalue' )
+                   IF ( TRIM(chem_species(lsp)%name) == TRIM(cs_name(lsp_usr)) )  THEN
+                      CALL chem_boundary_conds( chem_species(lsp)%conc_p,                          &
+                                                chem_species(lsp)%conc_pr_init )
+                   ENDIF
+                   lsp_usr = lsp_usr + 1
+                ENDDO
+             ENDDO
+          ENDIF
 
           IF ( salsa  .AND.  time_since_reference_point >= skip_time_do_salsa )  THEN
@@ -1121 +1142 @@
 
                 IF ( air_chemistry )  THEN
-                   DO  n = 1, nspec
+                   DO  n = 1, nvar
                       CALL exchange_horiz( chem_species(n)%conc, nbgp ) 
                    ENDDO