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

Timestamp:

Apr 8, 2019 8:25:23 PM (5 years ago)

Author:

knoop

Message:

Moved loop over chem_species into chem_boundary_conds_decycle

File:

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

palm/trunk/SOURCE/time_integration.f90

@@ -38 +38 @@
 ! 
 ! 3833 2019-03-28 15:04:04Z forkel
-! added USE chem_gasphase_mod, replaced nspec by nvar since fixed compounds are not integrated
+! added USE chem_gasphase_mod, replaced nspec by nspec since fixed compounds are not integrated
 ! 
 ! 3820 2019-03-27 11:53:41Z forkel
@@ -506 +506 @@
 
     USE chem_gasphase_mod,                                                                         &
-        ONLY:  nvar
+        ONLY:  nspec
 
     USE chem_modules,                                                                              &
-        ONLY:  bc_cs_t_val, cs_name, emissions_anthropogenic, nspec_out, chem_species
+        ONLY:  bc_cs_t_val, emissions_anthropogenic, nspec_out, chem_species
 
     USE chemistry_model_mod,                                                                       &
-        ONLY:  chem_boundary_conds
+        ONLY:  chem_boundary_conds_decycle
 
     USE control_parameters,                                                                        &
@@ -680 +680 @@
     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
 
@@ -859 +857 @@
            bc_q_t_val  = ( q_init(nzt+1) - q_init(nzt) ) / dzu(nzt+1)
            IF ( air_chemistry )  THEN
-              DO  lsp = 1, nvar
-                 bc_cs_t_val = (  chem_species(lsp)%conc_pr_init(nzt+1)                            &
-                                - chem_species(lsp)%conc_pr_init(nzt) )                            &
+              DO  n = 1, nspec
+                 bc_cs_t_val = (  chem_species(n)%conc_pr_init(nzt+1)                            &
+                                - chem_species(n)%conc_pr_init(nzt) )                            &
                                / dzu(nzt+1)
               ENDDO
@@ -1036 +1034 @@
           ENDIF
           IF ( passive_scalar )  CALL exchange_horiz( s_p, nbgp )
-          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 ( air_chemistry  )  CALL chem_boundary_conds_decycle
 
           IF ( salsa  .AND.  time_since_reference_point >= skip_time_do_salsa )  THEN
@@ -1133 +1117 @@
 
                 IF ( air_chemistry )  THEN
-                   DO  n = 1, nvar     
+                   DO  n = 1, nspec
                       CALL exchange_horiz( chem_species(n)%conc, nbgp ) 
                    ENDDO