Changeset 3582 for palm/trunk/SOURCE/chem_emissions_mod.f90

Timestamp:

Nov 29, 2018 7:16:36 PM (6 years ago)

Author:

suehring

Message:

Merge branch salsa with trunk

Location:

palm/trunk/SOURCE

Files:

• . (modified) (1 prop)
• chem_emissions_mod.f90 (modified) (3 diffs)

palm/trunk/SOURCE/chem_emissions_mod.f90

@@ -22 +22 @@
 ! Current revisions:
 ! ------------------
-! 
+! - Removed salsa dependency.
+! - Enabled PARAMETRIZED mode for default surfaces when LSM is not applied but 
+!   salsa is (M. Kurppa)
 ! 
 ! Former revisions:
@@ -890 +892 @@
    USE indices,                                                               &
        ONLY: nnx,nny,nnz 
-   USE salsa_mod,                                                             &
-       ONLY:  salsa
    USE surface_mod,                                                           &
        ONLY:  surf_lsm_h,surf_def_h,surf_usm_h
@@ -1462 +1462 @@
 
                 ENDDO
-             ELSEIF ( salsa ) THEN
-                DO  m = 1, surf_def_h(0)%ns
-                   i = surf_def_h(0)%i(m)
-                   j = surf_def_h(0)%j(m)
-                   k = surf_def_h(0)%k(m)
-
-
-                   IF ( street_type_f%var(j,i) >= main_street_id  .AND.        &
-                        street_type_f%var(j,i) < max_street_id )               &
-                   THEN
-
-                      !> Cycle over already matched species
-                      DO  ispec=1,nspec_out
-
-                         !> PMs are already in mass units:micrograms: have to be converted to kilograms 
-                         IF ( TRIM(spc_names(match_spec_model(ispec)))=="PM1"       &
-                              .OR. TRIM(spc_names(match_spec_model(ispec)))=="PM25" &
-                              .OR. TRIM(spc_names(match_spec_model(ispec)))=="PM10")&
-                         THEN
-                                  
-                            surf_def_h(0)%cssws(match_spec_model(ispec),m) =   &
-                                  emiss_factor_main(match_spec_input(ispec)) * &
-                                  emis_distribution(1,j,i,ispec) * rho_air(k) /&
-                                  time_factor(1)
-                         ELSE
-
-                         !> Other Species: inputs are micromoles: have to be converted              
-                            surf_def_h(0)%cssws(match_spec_model(ispec),m) =   &
-                               emiss_factor_main(match_spec_input(ispec)) *    &
-                               emis_distribution(1,j,i,ispec) *                &
-                               conv_to_ratio(k,j,i) *  rho_air(k) / time_factor(1)
-                         ENDIF
-                      ENDDO
-
-                   ELSEIF ( street_type_f%var(j,i) >= side_street_id  .AND.    &
-                            street_type_f%var(j,i) < main_street_id )          &
-                   THEN
-
-                   !> Cycle over already matched species
-                      DO  ispec=1,nspec_out
-
-                         !> PMs are already in mass units: micrograms
-                         IF ( TRIM(spc_names(match_spec_model(ispec)))=="PM1"   &
-                              .OR. TRIM(spc_names(match_spec_model(ispec)))=="PM25" &
-                              .OR. TRIM(spc_names(match_spec_model(ispec)))=="PM10")&
-                         THEN
-
-                            surf_def_h(0)%cssws(match_spec_model(ispec),m) =   &
-                               emiss_factor_side(match_spec_input(ispec)) *    &
-                               emis_distribution(1,j,i,ispec) * rho_air(k) /   &
-                               time_factor(1)  
-                         ELSE
-               
-                            surf_def_h(0)%cssws(match_spec_model(ispec),m) =   &
-                               emiss_factor_side(match_spec_input(ispec)) *    &
-                               emis_distribution(1,j,i,ispec) *                &
-                               conv_to_ratio(k,j,i) * rho_air(k) / time_factor(1)
-                         ENDIF
-
-                      ENDDO
-
-                   ELSE
-
-                   !> If no street type is defined, then assign null emissions to all the species
-                      surf_def_h(0)%cssws(:,m) = 0.0_wp
-
-                   ENDIF
-
-                ENDDO
-
              ENDIF