Index: palm/trunk/SOURCE/Makefile
===================================================================
--- palm/trunk/SOURCE/Makefile	(revision 4011)
+++ palm/trunk/SOURCE/Makefile	(revision 4012)
@@ -686,5 +686,4 @@
 	run_control.f90 \
 	salsa_mod.f90 \
-	salsa_util_mod.f90 \
 	set_slicer_attributes_dvrp.f90 \
 	singleton_mod.f90 \
@@ -1607,10 +1606,6 @@
 	netcdf_data_input_mod.o \
 	plant_canopy_model_mod.o \
-	salsa_util_mod.o \
 	surface_mod.o \
 	netcdf_data_input_mod.o
-salsa_util_mod.o: \
-	mod_kinds.o \
-	modules.o
 set_slicer_attributes_dvrp.o: \
 	mod_kinds.o \
Index: palm/trunk/SOURCE/netcdf_data_input_mod.f90
===================================================================
--- palm/trunk/SOURCE/netcdf_data_input_mod.f90	(revision 4011)
+++ palm/trunk/SOURCE/netcdf_data_input_mod.f90	(revision 4012)
@@ -968,5 +968,6 @@
            netcdf_data_input_surface_data, netcdf_data_input_topo,             &
            netcdf_data_input_var, get_attribute, get_variable, open_read_file, &
-           check_existence, inquire_num_variables, inquire_variable_names
+           check_existence, inquire_num_variables, inquire_variable_names,     &
+           close_input_file
 
 
Index: palm/trunk/SOURCE/salsa_mod.f90
===================================================================
--- palm/trunk/SOURCE/salsa_mod.f90	(revision 4011)
+++ palm/trunk/SOURCE/salsa_mod.f90	(revision 4012)
@@ -26,4 +26,16 @@
 ! -----------------
 ! $Id$
+! Merge salsa branch to trunk. List of changes:
+! - Error corrected in distr_update that resulted in the aerosol number size
+!   distribution not converging if the concentration was nclim.
+! - Added a separate output for aerosol liquid water (s_H2O)
+! - aerosol processes for a size bin are now calculated only if the aerosol
+!   number of concentration of that bin is > 2*nclim
+! - An initialisation error in the subroutine "deposition" corrected and the
+!   subroutine reformatted.
+! - stuff from salsa_util_mod.f90 moved into salsa_mod.f90
+! - calls for closing the netcdf input files added
+! 
+! 3956 2019-05-07 12:32:52Z monakurppa
 ! - Conceptual bug in depo_surf correct for urban and land surface model
 ! - Subroutine salsa_tendency_ij optimized.
@@ -147,30 +159,30 @@
 !> @todo emission mode "parameterized", i.e. based on street type
 !> @todo Allow insoluble emissions
-!> @todo two-way nesting is not working properly
+!> @todo Apply flux limiter in prognostic equations
 !------------------------------------------------------------------------------!
  MODULE salsa_mod
 
-    USE basic_constants_and_equations_mod,                                     &
+    USE basic_constants_and_equations_mod,                                                         &
         ONLY:  c_p, g, p_0, pi, r_d
 
-    USE chem_gasphase_mod,                                                     &
+    USE chem_gasphase_mod,                                                                         &
         ONLY:  nspec, nvar, spc_names
 
-    USE chem_modules,                                                          &
+    USE chem_modules,                                                                              &
         ONLY:  call_chem_at_all_substeps, chem_gasphase_on, chem_species
 
     USE control_parameters
 
-    USE indices,                                                               &
-        ONLY:  nbgp, nx, nxl, nxlg, nxr, nxrg, ny, nyn, nyng, nys, nysg, nzb,  &
-               nzb_s_inner, nz, nzt, wall_flags_0
+    USE indices,                                                                                   &
+        ONLY:  nbgp, nx, nxl, nxlg, nxr, nxrg, ny, nyn, nyng, nys, nysg, nzb, nz, nzt, wall_flags_0
 
     USE kinds
 
+    USE netcdf_data_input_mod,                                                                     &
+        ONLY:  chem_emis_att_type, chem_emis_val_type
+
     USE pegrid
 
-    USE salsa_util_mod
-
-    USE statistics,                                                            &
+    USE statistics,                                                                                &
         ONLY:  sums_salsa_ws_l
 
@@ -452,5 +464,5 @@
                                                                (/0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0/)
     REAL(wp), DIMENSION(nmod) ::  surface_aerosol_flux = &
-                             (/1.04e+11_wp, 3.23E+10_wp, 5.4E+6_wp, 0.0_wp, 0.0_wp, 0.0_wp, 0.0_wp/)
+                                 (/1.0E+8_wp, 1.0E+9_wp, 1.0E+5_wp, 0.0_wp, 0.0_wp, 0.0_wp, 0.0_wp/)
 
     REAL(wp), DIMENSION(:), ALLOCATABLE ::  bin_low_limits     !< to deliver information about
@@ -464,4 +476,11 @@
 !
 !-- SALSA derived datatypes:
+!
+!-- Component index
+    TYPE component_index
+       CHARACTER(len=3), ALLOCATABLE ::  comp(:)  !< Component name
+       INTEGER(iwp) ::  ncomp  !< Number of components
+       INTEGER(iwp), ALLOCATABLE ::  ind(:)  !< Component index
+    END TYPE component_index
 !
 !-- For matching LSM and USM surface types and the deposition module surface types
@@ -607,4 +626,7 @@
     TYPE(salsa_emission_value_type)     ::  aero_emission      !< emission values
     TYPE(salsa_emission_mode_type)      ::  def_modes          !< default emission modes
+
+    TYPE(chem_emis_att_type) ::  chem_emission_att  !< chemistry emission attributes
+    TYPE(chem_emis_val_type) ::  chem_emission      !< chemistry emission values
 
     TYPE(t_section), DIMENSION(:), ALLOCATABLE ::  aero  !< local aerosol properties
@@ -979,4 +1001,7 @@
  SUBROUTINE salsa_header( io )
 
+    USE indices,                                                                                   &
+        ONLY:  nx, ny, nz
+
     IMPLICIT NONE
  
@@ -987,7 +1012,7 @@
     WRITE( io, 2 ) skip_time_do_salsa
     WRITE( io, 3 ) dt_salsa
-    WRITE( io, 4 )  SHAPE( aerosol_number(1)%conc ), nbins_aerosol
+    WRITE( io, 4 )  nz, ny, nx, nbins_aerosol
     IF ( advect_particle_water )  THEN
-       WRITE( io, 5 )  SHAPE( aerosol_mass(1)%conc ), ncomponents_mass*nbins_aerosol,             &
+       WRITE( io, 5 )  SHAPE( aerosol_mass(1)%conc ), ncomponents_mass*nbins_aerosol,              &
                         advect_particle_water
     ELSE
@@ -1154,4 +1179,5 @@
                  aerosol_number(i)%init(nzb:nzt+1),                                                &
                  aerosol_number(i)%sums_ws_l(nzb:nzt+1,0:threads_per_task-1) )
+       aerosol_number(i)%init = nclim
        IF ( include_emission  .OR.  ( nldepo  .AND.  nldepo_surf ) )  THEN
           ALLOCATE( aerosol_number(i)%source(nys:nyn,nxl:nxr) )
@@ -1179,4 +1205,5 @@
                  aerosol_mass(i)%init(nzb:nzt+1),                                                  &
                  aerosol_mass(i)%sums_ws_l(nzb:nzt+1,0:threads_per_task-1)  )
+       aerosol_mass(i)%init = mclim
        IF ( include_emission  .OR.  ( nldepo  .AND.  nldepo_surf ) )  THEN
           ALLOCATE( aerosol_mass(i)%source(nys:nyn,nxl:nxr) )
@@ -1283,4 +1310,5 @@
                     salsa_gas(i)%init(nzb:nzt+1),                              &
                     salsa_gas(i)%sums_ws_l(nzb:nzt+1,0:threads_per_task-1) )
+          salsa_gas(i)%init = nclim
           IF ( include_emission )  ALLOCATE( salsa_gas(i)%source(nys:nys,nxl:nxr) )
        ENDDO
@@ -1402,28 +1430,12 @@
     IF ( nldepo )  sedim_vd = 0.0_wp
 
-    DO  ib = 1, nbins_aerosol
-       IF ( .NOT. read_restart_data_salsa )  aerosol_number(ib)%conc = nclim
-       aerosol_number(ib)%conc_p    = 0.0_wp
-       aerosol_number(ib)%tconc_m   = 0.0_wp
-       aerosol_number(ib)%flux_s    = 0.0_wp
-       aerosol_number(ib)%diss_s    = 0.0_wp
-       aerosol_number(ib)%flux_l    = 0.0_wp
-       aerosol_number(ib)%diss_l    = 0.0_wp
-       aerosol_number(ib)%init      = nclim
-       aerosol_number(ib)%sums_ws_l = 0.0_wp
-    ENDDO
-    DO  ic = 1, ncomponents_mass*nbins_aerosol
-       IF ( .NOT. read_restart_data_salsa )  aerosol_mass(ic)%conc = mclim
-       aerosol_mass(ic)%conc_p    = 0.0_wp
-       aerosol_mass(ic)%tconc_m   = 0.0_wp
-       aerosol_mass(ic)%flux_s    = 0.0_wp
-       aerosol_mass(ic)%diss_s    = 0.0_wp
-       aerosol_mass(ic)%flux_l    = 0.0_wp
-       aerosol_mass(ic)%diss_l    = 0.0_wp
-       aerosol_mass(ic)%init      = mclim
-       aerosol_mass(ic)%sums_ws_l = 0.0_wp
-    ENDDO
-
     IF ( .NOT. salsa_gases_from_chem )  THEN
+       IF ( .NOT. read_restart_data_salsa )  THEN
+          salsa_gas(1)%conc = h2so4_init
+          salsa_gas(2)%conc = hno3_init
+          salsa_gas(3)%conc = nh3_init
+          salsa_gas(4)%conc = ocnv_init
+          salsa_gas(5)%conc = ocsv_init
+       ENDIF
        DO  ig = 1, ngases_salsa
           salsa_gas(ig)%conc_p    = 0.0_wp
@@ -1434,14 +1446,8 @@
           salsa_gas(ig)%diss_l    = 0.0_wp
           salsa_gas(ig)%sums_ws_l = 0.0_wp
+          salsa_gas(ig)%conc_p    = salsa_gas(ig)%conc
        ENDDO
-       IF ( .NOT. read_restart_data_salsa )  THEN
-          salsa_gas(1)%conc = h2so4_init
-          salsa_gas(2)%conc = hno3_init
-          salsa_gas(3)%conc = nh3_init
-          salsa_gas(4)%conc = ocnv_init
-          salsa_gas(5)%conc = ocsv_init 
-       ENDIF
-!
-!--    Set initial value for gas compound tracers and initial values
+!
+!--    Set initial value for gas compound tracer
        salsa_gas(1)%init = h2so4_init
        salsa_gas(2)%init = hno3_init
@@ -1466,5 +1472,5 @@
 !-- Initialise location-dependent aerosol size distributions and chemical compositions:
     CALL aerosol_init
-!
+
 !-- Initalisation run of SALSA + calculate the vertical top index of the topography
     DO  i = nxl, nxr
@@ -1477,4 +1483,24 @@
        ENDDO
     ENDDO
+
+    DO  ib = 1, nbins_aerosol
+       aerosol_number(ib)%conc_p    = aerosol_number(ib)%conc
+       aerosol_number(ib)%tconc_m   = 0.0_wp
+       aerosol_number(ib)%flux_s    = 0.0_wp
+       aerosol_number(ib)%diss_s    = 0.0_wp
+       aerosol_number(ib)%flux_l    = 0.0_wp
+       aerosol_number(ib)%diss_l    = 0.0_wp
+       aerosol_number(ib)%sums_ws_l = 0.0_wp
+    ENDDO
+    DO  ic = 1, ncomponents_mass*nbins_aerosol
+       aerosol_mass(ic)%conc_p    = aerosol_mass(ic)%conc
+       aerosol_mass(ic)%tconc_m   = 0.0_wp
+       aerosol_mass(ic)%flux_s    = 0.0_wp
+       aerosol_mass(ic)%diss_s    = 0.0_wp
+       aerosol_mass(ic)%flux_l    = 0.0_wp
+       aerosol_mass(ic)%diss_l    = 0.0_wp
+       aerosol_mass(ic)%sums_ws_l = 0.0_wp
+    ENDDO
+!
 !
 !-- Initialise the deposition scheme and surface types
@@ -1587,5 +1613,6 @@
 
     USE netcdf_data_input_mod,                                                                     &
-        ONLY:  get_attribute, get_variable, netcdf_data_input_get_dimension_length, open_read_file
+        ONLY:  close_input_file, get_attribute, get_variable,                                      &
+               netcdf_data_input_get_dimension_length, open_read_file
 
     IMPLICIT NONE
@@ -1615,5 +1642,4 @@
 
     REAL(wp), DIMENSION(nbins_aerosol) ::  core   !< size of the bin mid aerosol particle
-    REAL(wp), DIMENSION(nbins_aerosol) ::  nsect  !< size distribution (#/m3)
 
     REAL(wp), DIMENSION(0:nz+1) ::  pnf2a   !< number fraction in 2a
@@ -1638,5 +1664,4 @@
 !
 !-- Set concentrations to zero
-    nsect(:)     = 0.0_wp
     pndist(:,:)  = 0.0_wp
     pnf2a(:)     = nf2a
@@ -1667,5 +1692,5 @@
 !
 !--       Allocate memory
-          ALLOCATE( pr_z(1:pr_nz), pr_mass_fracs_a(nzb:nzt+1,pr_ncc),                            &
+          ALLOCATE( pr_z(1:pr_nz), pr_mass_fracs_a(nzb:nzt+1,pr_ncc),                              &
                     pr_mass_fracs_b(nzb:nzt+1,pr_ncc) )
           pr_mass_fracs_a = 0.0_wp
@@ -1806,5 +1831,7 @@
                            ' for SALSA missing!'
           CALL message( 'salsa_mod: aerosol_init', 'PA0607', 1, 2, 0, 6, 0 )
-
+!
+!--       Close input file
+          CALL close_input_file( id_dyn )
        ENDIF   ! netcdf_extend
 
@@ -1892,7 +1919,9 @@
              salsa_gas(ig)%init(nzb)   =  salsa_gas(ig)%init(nzb+1)
              salsa_gas(ig)%init(nzt+1) =  salsa_gas(ig)%init(nzt)
-             DO  k = nzb, nzt+1
-                salsa_gas(ig)%conc(k,:,:) = salsa_gas(ig)%init(k)
-             ENDDO
+             IF ( .NOT. read_restart_data_salsa )  THEN
+                DO  k = nzb, nzt+1
+                   salsa_gas(ig)%conc(k,:,:) = salsa_gas(ig)%init(k)
+                ENDDO
+             ENDIF
           ENDDO
 
@@ -1901,4 +1930,7 @@
                            ' for SALSA missing!'
           CALL message( 'salsa_mod: aerosol_init', 'PA0610', 1, 2, 0, 6, 0 )
+!
+!--       Close input file
+          CALL close_input_file( id_dyn )
        ENDIF   ! netcdf_extend
 #else
@@ -1940,5 +1972,7 @@
 !--          Region 1:
              DO  ib = start_subrange_1a, end_subrange_1a
-                aerosol_number(ib)%conc(k,j,i) = pndist(k,ib) * flag
+                IF ( .NOT. read_restart_data_salsa )  THEN
+                   aerosol_number(ib)%conc(k,j,i) = pndist(k,ib) * flag
+                ENDIF
                 IF ( prunmode == 1 )  THEN
                    aerosol_number(ib)%init = pndist(:,ib)
@@ -1949,5 +1983,7 @@
              IF ( nreg > 1 )  THEN
                 DO  ib = start_subrange_2a, end_subrange_2a
-                   aerosol_number(ib)%conc(k,j,i) = MAX( 0.0_wp, pnf2a(k) ) * pndist(k,ib) * flag
+                   IF ( .NOT. read_restart_data_salsa )  THEN
+                      aerosol_number(ib)%conc(k,j,i) = MAX( 0.0_wp, pnf2a(k) ) * pndist(k,ib) * flag
+                   ENDIF
                    IF ( prunmode == 1 )  THEN
                       aerosol_number(ib)%init = MAX( 0.0_wp, nf2a ) * pndist(:,ib)
@@ -1957,6 +1993,8 @@
                    DO  ib = start_subrange_2b, end_subrange_2b
                       IF ( pnf2a(k) < 1.0_wp )  THEN
-                         aerosol_number(ib)%conc(k,j,i) = MAX( 0.0_wp, 1.0_wp - pnf2a(k) ) *       &
-                                                          pndist(k,ib) * flag
+                         IF ( .NOT. read_restart_data_salsa )  THEN
+                            aerosol_number(ib)%conc(k,j,i) = MAX( 0.0_wp, 1.0_wp - pnf2a(k) ) *    &
+                                                             pndist(k,ib) * flag
+                         ENDIF
                          IF ( prunmode == 1 )  THEN
                             aerosol_number(ib)%init = MAX( 0.0_wp, 1.0_wp - nf2a ) * pndist(:,ib)
@@ -1976,6 +2014,8 @@
                 ib = start_subrange_1a
                 DO  ic = ss, ee
-                   aerosol_mass(ic)%conc(k,j,i) = MAX( 0.0_wp, 1.0_wp - pmfoc1a(k) ) * pndist(k,ib)&
-                                                  * core(ib) * arhoh2so4 * flag
+                   IF ( .NOT. read_restart_data_salsa )  THEN
+                      aerosol_mass(ic)%conc(k,j,i) = MAX( 0.0_wp, 1.0_wp - pmfoc1a(k) ) *          &
+                                                     pndist(k,ib) * core(ib) * arhoh2so4 * flag
+                   ENDIF
                    IF ( prunmode == 1 )  THEN
                       aerosol_mass(ic)%init(k) = MAX( 0.0_wp, 1.0_wp - pmfoc1a(k) ) * pndist(k,ib) &
@@ -1991,7 +2031,9 @@
                 ee = ( index_oc - 1 ) * nbins_aerosol + end_subrange_1a !< end
                 ib = start_subrange_1a
-                DO  ic = ss, ee 
-                   aerosol_mass(ic)%conc(k,j,i) = MAX( 0.0_wp, pmfoc1a(k) ) * pndist(k,ib) *       &
-                                                  core(ib) * arhooc * flag
+                DO  ic = ss, ee
+                   IF ( .NOT. read_restart_data_salsa )  THEN
+                      aerosol_mass(ic)%conc(k,j,i) = MAX( 0.0_wp, pmfoc1a(k) ) * pndist(k,ib) *    &
+                                                     core(ib) * arhooc * flag
+                   ENDIF
                    IF ( prunmode == 1 )  THEN
                       aerosol_mass(ic)%init(k) = MAX( 0.0_wp, pmfoc1a(k) ) * pndist(k,ib) *        &
@@ -2143,6 +2185,8 @@
              ib = start_subrange_2a
              DO ic = ss, ee
-                aerosol_mass(ic)%conc(k,j,i) = MAX( 0.0_wp, pmf2a(k) ) * pnf2a(k) * pndist(k,ib) * &
-                                              pcore(ib) * prho * flag
+                IF ( .NOT. read_restart_data_salsa )  THEN
+                   aerosol_mass(ic)%conc(k,j,i) = MAX( 0.0_wp, pmf2a(k) ) * pnf2a(k) * pndist(k,ib)&
+                                                  * pcore(ib) * prho * flag
+                ENDIF
                 IF ( prunmode == 1 )  THEN
                    aerosol_mass(ic)%init(k) = MAX( 0.0_wp, pmf2a(k) ) * pnf2a(k) * pndist(k,ib) *  &
@@ -2158,6 +2202,8 @@
                 ib = start_subrange_2a
                 DO ic = ss, ee
-                   aerosol_mass(ic)%conc(k,j,i) = MAX( 0.0_wp, pmf2b(k) ) * ( 1.0_wp - pnf2a(k) ) *&
-                                                  pndist(k,ib) * pcore(ib) * prho * flag
+                   IF ( .NOT. read_restart_data_salsa )  THEN
+                      aerosol_mass(ic)%conc(k,j,i) = MAX( 0.0_wp, pmf2b(k) ) * ( 1.0_wp - pnf2a(k))&
+                                                     * pndist(k,ib) * pcore(ib) * prho * flag
+                   ENDIF
                    IF ( prunmode == 1 )  THEN
                       aerosol_mass(ic)%init(k) = MAX( 0.0_wp, pmf2b(k) ) * ( 1.0_wp - pnf2a(k) ) * &
@@ -2810,7 +2856,6 @@
        ENDDO
 !
-!--    On EACH call of salsa_driver, calculate the ambient sizes of 
-!--    particles by equilibrating soluble fraction of particles with water
-!--    using the ZSR method.
+!--    Calculate the ambient sizes of particles by equilibrating soluble fraction of particles with
+!--    water using the ZSR method.
        in_rh = in_cw(k) / in_cs(k)
        IF ( prunmode==1  .OR.  .NOT. advect_particle_water )  THEN
@@ -2865,5 +2910,5 @@
 !--    Calculate changes in concentrations
        DO ib = 1, nbins_aerosol
-          aerosol_number(ib)%conc(k,j,i) = aerosol_number(ib)%conc(k,j,i) + ( lo_aero(ib)%numc -      &
+          aerosol_number(ib)%conc(k,j,i) = aerosol_number(ib)%conc(k,j,i) + ( lo_aero(ib)%numc -   &
                                            aero_old(ib)%numc ) * flag
        ENDDO
@@ -2875,5 +2920,5 @@
           ic = 1
           DO ss = str, endi
-             aerosol_mass(ss)%conc(k,j,i) = aerosol_mass(ss)%conc(k,j,i) + ( lo_aero(ic)%volc(vc) -   &
+             aerosol_mass(ss)%conc(k,j,i) = aerosol_mass(ss)%conc(k,j,i) + ( lo_aero(ic)%volc(vc) -&
                                             aero_old(ic)%volc(vc) ) * arhoh2so4 * flag
              ic = ic+1
@@ -2887,5 +2932,5 @@
           ic = 1
           DO ss = str, endi
-             aerosol_mass(ss)%conc(k,j,i) = aerosol_mass(ss)%conc(k,j,i) + ( lo_aero(ic)%volc(vc) -   &
+             aerosol_mass(ss)%conc(k,j,i) = aerosol_mass(ss)%conc(k,j,i) + ( lo_aero(ic)%volc(vc) -&
                                             aero_old(ic)%volc(vc) ) * arhooc * flag
              ic = ic+1
@@ -2899,5 +2944,5 @@
           ic = 1 + end_subrange_1a
           DO ss = str, endi
-             aerosol_mass(ss)%conc(k,j,i) = aerosol_mass(ss)%conc(k,j,i) + ( lo_aero(ic)%volc(vc) -   &
+             aerosol_mass(ss)%conc(k,j,i) = aerosol_mass(ss)%conc(k,j,i) + ( lo_aero(ic)%volc(vc) -&
                                             aero_old(ic)%volc(vc) ) * arhobc * flag
              ic = ic+1
@@ -2911,5 +2956,5 @@
           ic = 1 + end_subrange_1a
           DO ss = str, endi
-             aerosol_mass(ss)%conc(k,j,i) = aerosol_mass(ss)%conc(k,j,i) + ( lo_aero(ic)%volc(vc) -   &
+             aerosol_mass(ss)%conc(k,j,i) = aerosol_mass(ss)%conc(k,j,i) + ( lo_aero(ic)%volc(vc) -&
                                             aero_old(ic)%volc(vc) ) * arhodu * flag
              ic = ic+1
@@ -2923,5 +2968,5 @@
           ic = 1 + end_subrange_1a
           DO ss = str, endi
-             aerosol_mass(ss)%conc(k,j,i) = aerosol_mass(ss)%conc(k,j,i) + ( lo_aero(ic)%volc(vc) -   &
+             aerosol_mass(ss)%conc(k,j,i) = aerosol_mass(ss)%conc(k,j,i) + ( lo_aero(ic)%volc(vc) -&
                                             aero_old(ic)%volc(vc) ) * arhoss * flag
              ic = ic+1
@@ -2935,5 +2980,5 @@
           ic = 1
           DO ss = str, endi
-             aerosol_mass(ss)%conc(k,j,i) = aerosol_mass(ss)%conc(k,j,i) + ( lo_aero(ic)%volc(vc) -   &
+             aerosol_mass(ss)%conc(k,j,i) = aerosol_mass(ss)%conc(k,j,i) + ( lo_aero(ic)%volc(vc) -&
                                             aero_old(ic)%volc(vc) ) * arhohno3 * flag
              ic = ic+1
@@ -2947,5 +2992,5 @@
           ic = 1
           DO ss = str, endi
-             aerosol_mass(ss)%conc(k,j,i) = aerosol_mass(ss)%conc(k,j,i) + ( lo_aero(ic)%volc(vc) -   &
+             aerosol_mass(ss)%conc(k,j,i) = aerosol_mass(ss)%conc(k,j,i) + ( lo_aero(ic)%volc(vc) -&
                                             aero_old(ic)%volc(vc) ) * arhonh3 * flag
              ic = ic+1
@@ -2960,14 +3005,23 @@
           ic = 1
           DO ss = str, endi
-             aerosol_mass(ss)%conc(k,j,i) = aerosol_mass(ss)%conc(k,j,i) + ( lo_aero(ic)%volc(vc) -   &
+             aerosol_mass(ss)%conc(k,j,i) = aerosol_mass(ss)%conc(k,j,i) + ( lo_aero(ic)%volc(vc) -&
                                             aero_old(ic)%volc(vc) ) * arhoh2o * flag
-             IF ( prunmode == 1 )  THEN
-                aerosol_mass(ss)%init(k) = MAX( aerosol_mass(ss)%init(k),                          &
-                                                aerosol_mass(ss)%conc(k,j,i) )
-                IF ( k == nzb+1 )  THEN
-                   aerosol_mass(ss)%init(k-1) = 0.0_wp
-                ELSEIF ( k == nzt  )  THEN
-                   aerosol_mass(ss)%init(k+1) = aerosol_mass(ss)%init(k)
-                ENDIF
+             ic = ic+1
+          ENDDO
+       ENDIF
+       IF ( prunmode == 1 )  THEN
+          nc_h2o = get_index( prtcl,'H2O' )
+          vc = 8
+          str = ( nc_h2o-1 ) * nbins_aerosol + 1
+          endi = nc_h2o * nbins_aerosol
+          ic = 1
+          DO ss = str, endi
+             aerosol_mass(ss)%init(k) = MAX( aerosol_mass(ss)%init(k), ( lo_aero(ic)%volc(vc) - &
+                                             aero_old(ic)%volc(vc) ) * arhoh2o )
+             IF ( k == nzb+1 )  THEN
+                aerosol_mass(ss)%init(k-1) = aerosol_mass(ss)%init(k)
+             ELSEIF ( k == nzt  )  THEN
+                aerosol_mass(ss)%init(k+1) = aerosol_mass(ss)%init(k)
+                aerosol_mass(ss)%conc(k+1,j,i) = aerosol_mass(ss)%init(k)
              ENDIF
              ic = ic+1
@@ -3446,5 +3500,4 @@
     REAL(wp) ::  avis              !< molecular viscocity of air (kg/(m*s))
     REAL(wp) ::  beta_im           !< parameter for turbulent impaction
-    REAL(wp) ::  beta              !< Cunningham slip-flow correction factor
     REAL(wp) ::  c_brownian_diff   !< coefficient for Brownian diffusion
     REAL(wp) ::  c_impaction       !< coefficient for inertial impaction
@@ -3453,5 +3506,4 @@
     REAL(wp) ::  depo              !< deposition velocity (m/s)
     REAL(wp) ::  gamma             !< parameter, Table 3 in Z01
-    REAL(wp) ::  Kn                !< Knudsen number
     REAL(wp) ::  lambda            !< molecular mean free path (m)
     REAL(wp) ::  mdiff             !< particle diffusivity coefficient
@@ -3461,6 +3513,5 @@
     REAL(wp) ::  pdn               !< particle density (kg/m3)
     REAL(wp) ::  ustar             !< friction velocity (m/s)
-    REAL(wp) ::  va                !< thermal speed of an air molecule (m/s) 
-    REAL(wp) ::  zdwet             !< wet diameter (m)
+    REAL(wp) ::  va                !< thermal speed of an air molecule (m/s)
 
     REAL(wp), INTENT(in) ::  adn    !< air density (kg/m3)
@@ -3471,4 +3522,8 @@
     REAL(wp), INTENT(inout) ::  kvis   !< kinematic viscosity of air (m2/s)
 
+    REAL(wp), DIMENSION(nbins_aerosol) ::  beta   !< Cunningham slip-flow correction factor
+    REAL(wp), DIMENSION(nbins_aerosol) ::  Kn     !< Knudsen number
+    REAL(wp), DIMENSION(nbins_aerosol) ::  zdwet  !< wet diameter (m)
+
     REAL(wp), DIMENSION(:), INTENT(inout) ::  schmidt_num  !< particle Schmidt number
     REAL(wp), DIMENSION(:), INTENT(inout) ::  vc  !< critical fall speed i.e. settling velocity of
@@ -3494,39 +3549,43 @@
     lambda = 2.0_wp * avis / ( adn * va )
 !
-!-- Parameters for the land use category 'deciduous broadleaf trees'(Table 3)
-    alpha   = alpha_z01(depo_pcm_type_num)
-    gamma   = gamma_z01(depo_pcm_type_num)
-    par_a   = A_z01(depo_pcm_type_num, season) * 1.0E-3_wp
-!
-!-- Deposition efficiencies from Table 1. Constants from Table 2.
-    par_l            = l_p10(depo_pcm_type_num) * 0.01_wp
-    c_brownian_diff  = c_b_p10(depo_pcm_type_num)
-    c_interception   = c_in_p10(depo_pcm_type_num)
-    c_impaction      = c_im_p10(depo_pcm_type_num)
-    beta_im          = beta_im_p10(depo_pcm_type_num)
-    c_turb_impaction = c_it_p10(depo_pcm_type_num)
-
-    DO  ib = 1, nbins_aerosol
-
-       IF ( paero(ib)%numc < nclim )  CYCLE
-       zdwet = paero(ib)%dwet
-!
-!--    Knudsen number (Eq. 15.23)
-       Kn = MAX( 1.0E-2_wp, lambda / ( zdwet * 0.5_wp ) ) ! To avoid underflow
-!
-!--    Cunningham slip-flow correction (Eq. 15.30)
-       beta = 1.0_wp + Kn * ( 1.249_wp + 0.42_wp * EXP( -0.87_wp / Kn ) )
-
-!--    Particle diffusivity coefficient (Eq. 15.29)
-       mdiff = ( abo * tk * beta ) / ( 3.0_wp * pi * avis * zdwet )
-!
-!--    Particle Schmidt number (Eq. 15.36)
-       schmidt_num(ib) = kvis / mdiff
-!
-!--    Critical fall speed i.e. settling velocity  (Eq. 20.4)
-       vc(ib) = MIN( 1.0_wp, terminal_vel( 0.5_wp * zdwet, pdn, adn, avis, beta) )
-!
-!--    Friction velocity for deposition on vegetation. Calculated following Prandtl (1925):
-       IF ( lsdepo_pcm  .AND.  plant_canopy  .AND.  lad > 0.0_wp )  THEN
+!-- Particle wet diameter (m)
+    zdwet = paero(:)%dwet
+!
+!-- Knudsen number (Eq. 15.23)
+    Kn = MAX( 1.0E-2_wp, lambda / ( zdwet * 0.5_wp ) ) ! To avoid underflow
+!
+!-- Cunningham slip-flow correction (Eq. 15.30)
+    beta = 1.0_wp + Kn * ( 1.249_wp + 0.42_wp * EXP( -0.87_wp / Kn ) )
+!
+!-- Critical fall speed i.e. settling velocity  (Eq. 20.4)
+    vc = MIN( 1.0_wp, zdwet**2 * ( pdn - adn ) * g * beta / ( 18.0_wp * avis ) )
+!
+!-- Deposition on vegetation
+    IF ( lsdepo_pcm  .AND.  plant_canopy  .AND.  lad > 0.0_wp )  THEN
+!
+!--    Parameters for the land use category 'deciduous broadleaf trees'(Table 3)
+       alpha   = alpha_z01(depo_pcm_type_num)
+       gamma   = gamma_z01(depo_pcm_type_num)
+       par_a   = A_z01(depo_pcm_type_num, season) * 1.0E-3_wp
+!
+!--    Deposition efficiencies from Table 1. Constants from Table 2.
+       par_l            = l_p10(depo_pcm_type_num) * 0.01_wp
+       c_brownian_diff  = c_b_p10(depo_pcm_type_num)
+       c_interception   = c_in_p10(depo_pcm_type_num)
+       c_impaction      = c_im_p10(depo_pcm_type_num)
+       beta_im          = beta_im_p10(depo_pcm_type_num)
+       c_turb_impaction = c_it_p10(depo_pcm_type_num)
+
+       DO  ib = 1, nbins_aerosol
+
+          IF ( paero(ib)%numc < ( 2.0_wp * nclim ) )  CYCLE
+
+!--       Particle diffusivity coefficient (Eq. 15.29)
+          mdiff = ( abo * tk * beta(ib) ) / ( 3.0_wp * pi * avis * zdwet(ib) )
+!
+!--       Particle Schmidt number (Eq. 15.36)
+          schmidt_num(ib) = kvis / mdiff
+!
+!--       Friction velocity for deposition on vegetation. Calculated following Prandtl (1925):
           ustar = SQRT( cdc ) * mag_u
           SELECT CASE ( depo_pcm_par_num )
@@ -3546,6 +3605,7 @@
              paero(ib)%volc(ic) = paero(ib)%volc(ic) - depo * lad * paero(ib)%volc(ic) * dt_salsa
           ENDDO
-       ENDIF
-    ENDDO
+       ENDDO
+
+    ENDIF
 
  END SUBROUTINE deposition
@@ -3779,6 +3839,6 @@
 
              DO  ib = 1, nbins_aerosol
-                IF ( aerosol_number(ib)%conc(k,j,i) <= nclim  .OR.  schmidt_num(k+1,ib) < 1.0_wp ) &
-                   CYCLE
+                IF ( aerosol_number(ib)%conc(k,j,i) < ( 2.0_wp * nclim )  .OR.                     &
+                     schmidt_num(k+1,ib) < 1.0_wp )  CYCLE
 
                 SELECT CASE ( depo_surf_par_num )
@@ -3810,6 +3870,6 @@
 
              DO  ib = 1, nbins_aerosol
-                IF ( aerosol_number(ib)%conc(k,j,i) <= nclim  .OR.  schmidt_num(k+1,ib) < 1.0_wp ) &
-                   CYCLE
+                IF ( aerosol_number(ib)%conc(k,j,i) < ( 2.0_wp * nclim )  .OR.                     &
+                     schmidt_num(k+1,ib) < 1.0_wp )  CYCLE
 
                 SELECT CASE ( depo_surf_par_num )
@@ -3841,6 +3901,6 @@
 
              DO  ib = 1, nbins_aerosol
-                IF ( aerosol_number(ib)%conc(k,j,i) <= nclim  .OR.  schmidt_num(k+1,ib) < 1.0_wp ) &
-                   CYCLE
+                IF ( aerosol_number(ib)%conc(k,j,i) < ( 2.0_wp * nclim )  .OR.                     &
+                     schmidt_num(k+1,ib) < 1.0_wp )  CYCLE
 
                 SELECT CASE ( depo_surf_par_num )
@@ -3860,4 +3920,5 @@
 
           DO  ib = 1, nbins_aerosol
+             IF ( aerosol_number(ib)%conc(k,j,i) < ( 2.0_wp * nclim ) )  CYCLE
 !
 !--          Calculate changes in surface fluxes due to dry deposition
@@ -3891,6 +3952,6 @@
 
           DO  ib = 1, nbins_aerosol
-             IF ( aerosol_number(ib)%conc(k,j,i) <= nclim  .OR.  schmidt_num(k+1,ib) < 1.0_wp )    &
-                CYCLE
+             IF ( aerosol_number(ib)%conc(k,j,i) < ( 2.0_wp * nclim )  .OR.                        &
+                  schmidt_num(k+1,ib) < 1.0_wp )  CYCLE
 
              SELECT CASE ( depo_surf_par_num )
@@ -3932,25 +3993,4 @@
 ! Description:
 ! ------------
-! Function for calculating terminal velocities for different particles sizes.
-!------------------------------------------------------------------------------!
- REAL(wp) FUNCTION terminal_vel( radius, rhop, rhoa, visc, beta )
-
-    IMPLICIT NONE
-
-    REAL(wp), INTENT(in) ::  beta    !< Cunningham correction factor
-    REAL(wp), INTENT(in) ::  radius  !< particle radius (m)
-    REAL(wp), INTENT(in) ::  rhop    !< particle density (kg/m3)
-    REAL(wp), INTENT(in) ::  rhoa    !< air density (kg/m3)
-    REAL(wp), INTENT(in) ::  visc    !< molecular viscosity of air (kg/(m*s))
-
-!
-!-- Stokes law with Cunningham slip correction factor
-    terminal_vel = 4.0_wp * radius**2 * ( rhop - rhoa ) * g * beta / ( 18.0_wp * visc ) ! (m/s)
-
- END FUNCTION terminal_vel
-
-!------------------------------------------------------------------------------!
-! Description:
-! ------------
 !> Calculates particle loss and change in size distribution due to (Brownian)
 !> coagulation. Only for particles with dwet < 30 micrometres. 
@@ -4034,7 +4074,7 @@
 !-- Aero-aero coagulation
     DO  mm = 1, end_subrange_2b   ! smaller colliding particle
-       IF ( paero(mm)%numc < nclim )  CYCLE
+       IF ( paero(mm)%numc < ( 2.0_wp * nclim ) )  CYCLE
        DO  nn = mm, end_subrange_2b   ! larger colliding particle
-          IF ( paero(nn)%numc < nclim )  CYCLE
+          IF ( paero(nn)%numc < ( 2.0_wp * nclim ) )  CYCLE
 
           zdpart_mm = MIN( paero(mm)%dwet, 30.0E-6_wp )     ! Limit to 30 um
@@ -4053,5 +4093,5 @@
 !-- Aerosols in subrange 1a:
     DO  ib = start_subrange_1a, end_subrange_1a
-       IF ( paero(ib)%numc < nclim )  CYCLE
+       IF ( paero(ib)%numc < ( 2.0_wp * nclim ) )  CYCLE
        zminusterm   = 0.0_wp
        zplusterm(:) = 0.0_wp
@@ -4080,5 +4120,5 @@
 !-- Aerosols in subrange 2a:
     DO  ib = start_subrange_2a, end_subrange_2a
-       IF ( paero(ib)%numc < nclim )  CYCLE
+       IF ( paero(ib)%numc < ( 2.0_wp * nclim ) )  CYCLE
        zminusterm   = 0.0_wp
        zplusterm(:) = 0.0_wp
@@ -4128,5 +4168,5 @@
     IF ( .NOT. no_insoluble )  THEN
        DO  ib = start_subrange_2b, end_subrange_2b
-          IF ( paero(ib)%numc < nclim )  CYCLE
+          IF ( paero(ib)%numc < ( 2.0_wp * nclim ) )  CYCLE
           zminusterm   = 0.0_wp
           zplusterm(:) = 0.0_wp
@@ -4337,14 +4377,14 @@
     REAL(wp), INTENT(inout) ::  pcw      !< Water vapor concentration (kg/m3)
 
-    REAL(wp), DIMENSION(nbins_aerosol)               ::  zbeta          !< transitional correction factor
-    REAL(wp), DIMENSION(nbins_aerosol)               ::  zcolrate       !< collision rate (1/s)
-    REAL(wp), DIMENSION(nbins_aerosol)               ::  zcolrate_ocnv  !< collision rate of non-vol. OC (1/s)
-    REAL(wp), DIMENSION(start_subrange_1a+1) ::  zdfpart        !< particle diffusion coefficient (m2/s)
-    REAL(wp), DIMENSION(nbins_aerosol)               ::  zdvoloc        !< change of organics volume
-    REAL(wp), DIMENSION(nbins_aerosol)               ::  zdvolsa        !< change of sulphate volume
+    REAL(wp), DIMENSION(nbins_aerosol)       ::  zbeta          !< transitional correction factor
+    REAL(wp), DIMENSION(nbins_aerosol)       ::  zcolrate       !< collision rate (1/s)
+    REAL(wp), DIMENSION(nbins_aerosol)       ::  zcolrate_ocnv  !< collision rate of OCNV (1/s)
+    REAL(wp), DIMENSION(start_subrange_1a+1) ::  zdfpart        !< particle diffusion coef. (m2/s)
+    REAL(wp), DIMENSION(nbins_aerosol)       ::  zdvoloc        !< change of organics volume
+    REAL(wp), DIMENSION(nbins_aerosol)       ::  zdvolsa        !< change of sulphate volume
     REAL(wp), DIMENSION(2)                   ::  zj3n3          !< Formation massrate of molecules
                                                                 !< in nucleation, (molec/m3s),
                                                                 !< 1: H2SO4 and 2: organic vapor
-    REAL(wp), DIMENSION(nbins_aerosol)   ::  zknud          !< particle Knudsen number
+    REAL(wp), DIMENSION(nbins_aerosol)       ::  zknud          !< particle Knudsen number
 
     TYPE(component_index), INTENT(in) :: prtcl  !< Keeps track which substances are used
@@ -7095,9 +7135,11 @@
     REAL(wp) ::  znfrac  !< number fraction to be moved to the larger bin
     REAL(wp) ::  zvfrac  !< volume fraction to be moved to the larger bin
-    REAL(wp) ::  zVexc   !< Volume in the grown bin which exceeds the bin upper limit
-    REAL(wp) ::  zVihi   !< particle volume at the high end of the bin
-    REAL(wp) ::  zVilo   !< particle volume at the low end of the bin
+    REAL(wp) ::  zvexc   !< Volume in the grown bin which exceeds the bin upper limit
+    REAL(wp) ::  zvihi   !< particle volume at the high end of the bin
+    REAL(wp) ::  zvilo   !< particle volume at the low end of the bin
     REAL(wp) ::  zvpart  !< particle volume (m3)
-    REAL(wp) ::  zVrat   !< volume ratio of a size bin
+    REAL(wp) ::  zvrat   !< volume ratio of a size bin
+
+    real(wp), dimension(nbins_aerosol) ::  dummy
 
     TYPE(t_section), DIMENSION(nbins_aerosol), INTENT(inout) ::  paero !< aerosol properties
@@ -7106,4 +7148,6 @@
     zvfrac      = 0.0_wp
     within_bins = .FALSE.
+
+    dummy = paero(:)%numc
 !
 !-- Check if the volume of the bin is within bin limits after update
@@ -7150,20 +7194,20 @@
 !
 !--          Volume ratio of the size bin
-             zVrat = paero(ib)%vhilim / paero(ib)%vlolim
+             zvrat = paero(ib)%vhilim / paero(ib)%vlolim
 !
 !--          Particle volume at the low end of the bin
-             zVilo = 2.0_wp * zvpart / ( 1.0_wp + zVrat )
+             zvilo = 2.0_wp * zvpart / ( 1.0_wp + zvrat )
 !
 !--          Particle volume at the high end of the bin
-             zVihi = zVrat * zVilo
+             zvihi = zvrat * zvilo
 !
 !--          Volume in the grown bin which exceeds the bin upper limit
-             zVexc = 0.5_wp * ( zVihi + paero(ib)%vhilim )
+             zvexc = 0.5_wp * ( zvihi + paero(ib)%vhilim )
 !
 !--          Number fraction to be moved to the larger bin
-             znfrac = MIN( 1.0_wp, ( zVihi - paero(ib)%vhilim) / ( zVihi - zVilo ) )
+             znfrac = MIN( 1.0_wp, ( zvihi - paero(ib)%vhilim) / ( zvihi - zvilo ) )
 !
 !--          Volume fraction to be moved to the larger bin
-             zvfrac = MIN( 0.99_wp, znfrac * zVexc / zvpart )
+             zvfrac = MIN( 0.99_wp, znfrac * zvexc / zvpart )
              IF ( zvfrac < 0.0_wp )  THEN
                 message_string = 'Error: zvfrac < 0'
@@ -7175,8 +7219,8 @@
 !
 !--          Volume (cm3/cm3)
-             paero(mm)%volc(:) = paero(mm)%volc(:) + znfrac * paero(ib)%numc * zVexc *             &
-                                 paero(ib)%volc(:) / SUM( paero(ib)%volc(:) )
-             paero(ib)%volc(:) = paero(ib)%volc(:) - znfrac * paero(ib)%numc * zVexc *             &
-                                 paero(ib)%volc(:) / SUM( paero(ib)%volc(:) )
+             paero(mm)%volc(:) = paero(mm)%volc(:) + znfrac * paero(ib)%numc * zvexc *             &
+                                 paero(ib)%volc(:) / SUM( paero(ib)%volc(1:7) )
+             paero(ib)%volc(:) = paero(ib)%volc(:) - znfrac * paero(ib)%numc * zvexc *             &
+                                 paero(ib)%volc(:) / SUM( paero(ib)%volc(1:7) )
 
 !--          Number concentration (#/m3)
@@ -7266,11 +7310,12 @@
 !--    Calculate total mass concentration per bin
        mcsum = 0.0_wp
-       DO  ic = 1, ncc
+       DO  ic = 1, ncomponents_mass
           icc = ( ic - 1 ) * nbins_aerosol + ib
           mcsum = mcsum + aerosol_mass(icc)%conc(:,j,i) * flag
+          aerosol_mass(icc)%conc(:,j,i) = MAX( mclim, aerosol_mass(icc)%conc(:,j,i) ) * flag
        ENDDO
 !
 !--    Check that number and mass concentration match qualitatively
-       IF ( ANY ( aerosol_number(ib)%conc(:,j,i) >= nclim  .AND. mcsum <= 0.0_wp ) )  THEN
+       IF ( ANY( aerosol_number(ib)%conc(:,j,i) > nclim  .AND. mcsum <= 0.0_wp ) )  THEN
           DO  k = nzb+1, nzt
              IF ( aerosol_number(ib)%conc(k,j,i) >= nclim  .AND. mcsum(k) <= 0.0_wp )  THEN
@@ -7349,5 +7394,5 @@
                                                  flag_zddry > 0.0_wp )
        ENDDO
-       aerosol_number(ib)%conc(:,j,i) = MERGE( nclim, aerosol_number(ib)%conc(:,j,i),              &
+       aerosol_number(ib)%conc(:,j,i) = MERGE( nclim * flag, aerosol_number(ib)%conc(:,j,i),       &
                                                flag_zddry > 0.0_wp )
        ra_dry(:,j,i,ib) = MAX( 1.0E-10_wp, 0.5_wp * zddry )
@@ -8387,6 +8432,7 @@
 
     USE netcdf_data_input_mod,                                                                     &
-        ONLY:  check_existence, get_attribute, get_variable, inquire_num_variables,                &
-               inquire_variable_names, netcdf_data_input_get_dimension_length, open_read_file
+        ONLY:  check_existence, close_input_file, get_attribute, get_variable,                     &
+               inquire_num_variables, inquire_variable_names,                                      &
+               netcdf_data_input_get_dimension_length, open_read_file
 
     USE surface_mod,                                                                               &
@@ -8482,17 +8528,17 @@
 
 #if defined( __netcdf )
+!
+!--       Check existence of PIDS_SALSA file
+          INQUIRE( FILE = TRIM( input_file_salsa ) // TRIM( coupling_char ), EXIST = netcdf_extend )
+          IF ( .NOT. netcdf_extend )  THEN
+             message_string = 'Input file '// TRIM( input_file_salsa ) //  TRIM( coupling_char )&
+                              // ' missing!'
+             CALL message( 'salsa_emission_setup', 'PA0629', 1, 2, 0, 6, 0 )
+          ENDIF
+!
+!--       Open file in read-only mode
+          CALL open_read_file( TRIM( input_file_salsa ) // TRIM( coupling_char ), id_salsa )
+
           IF ( init )  THEN
-!
-!--          Check existence of PIDS_SALSA file
-             INQUIRE( FILE = TRIM( input_file_salsa ) // TRIM( coupling_char ),                    &
-                      EXIST = netcdf_extend )
-             IF ( .NOT. netcdf_extend )  THEN
-                message_string = 'Input file '// TRIM( input_file_salsa ) //  TRIM( coupling_char )&
-                                 // ' missing!'
-                CALL message( 'salsa_emission_setup', 'PA0629', 1, 2, 0, 6, 0 )
-             ENDIF
-!
-!--          Open file in read-only mode
-             CALL open_read_file( TRIM( input_file_salsa ) // TRIM( coupling_char ), id_salsa )
 !
 !--          Read the index and name of chemical components
@@ -8822,5 +8868,5 @@
 
 
-             DEALLOCATE( source_array )
+             DEALLOCATE( nsect_emission, source_array )
 !
 !--       Pre-processed:
@@ -8857,5 +8903,7 @@
 
           ENDIF
-
+!
+!--       Close input file
+          CALL close_input_file( id_salsa )
 #else
           message_string = 'salsa_emission_mode = "read_from_file", but preprocessor directive ' //&
@@ -9073,6 +9121,6 @@
 
     USE netcdf_data_input_mod,                                                                     &
-        ONLY:  check_existence, chem_emis_att_type, chem_emis_val_type, get_attribute,             &
-               get_variable, inquire_num_variables, inquire_variable_names,                        &
+        ONLY:  check_existence, close_input_file, get_attribute, get_variable,                     &
+               inquire_num_variables, inquire_variable_names,                                      &
                netcdf_data_input_get_dimension_length, open_read_file
 
@@ -9098,7 +9146,4 @@
     REAL(wp), DIMENSION(:), ALLOCATABLE ::  time_factor  !< emission time factor
 
-    TYPE(chem_emis_att_type) ::  chem_emission_att  !< chemistry emission attributes
-    TYPE(chem_emis_val_type) ::  chem_emission      !< chemistry emission values
-
 !
 !-- Reset surface fluxes
@@ -9108,15 +9153,16 @@
 
 #if defined( __netcdf )
+!
+!-- Check existence of PIDS_CHEM file
+    INQUIRE( FILE = 'PIDS_CHEM' // TRIM( coupling_char ), EXIST = netcdf_extend )
+    IF ( .NOT. netcdf_extend )  THEN
+       message_string = 'Input file PIDS_CHEM' //  TRIM( coupling_char ) // ' missing!'
+       CALL message( 'salsa_gas_emission_setup', 'PA0640', 1, 2, 0, 6, 0 )
+    ENDIF
+!
+!-- Open file in read-only mode
+    CALL open_read_file( 'PIDS_CHEM' // TRIM( coupling_char ), id_chem )
+
     IF ( init )  THEN
-!
-!--    Check existence of PIDS_CHEM file
-       INQUIRE( FILE = 'PIDS_CHEM' // TRIM( coupling_char ), EXIST = netcdf_extend )
-       IF ( .NOT. netcdf_extend )  THEN
-          message_string = 'Input file PIDS_CHEM' //  TRIM( coupling_char ) // ' missing!'
-          CALL message( 'salsa_gas_emission_setup', 'PA0640', 1, 2, 0, 6, 0 )
-       ENDIF
-!
-!--    Open file in read-only mode
-       CALL open_read_file( 'PIDS_CHEM' // TRIM( coupling_char ), id_chem )
 !
 !--    Read the index and name of chemical components
@@ -9301,4 +9347,8 @@
        DEALLOCATE( chem_emission%default_emission_data )
     ENDIF
+!
+!-- Close input file
+    CALL close_input_file( id_chem )
+
 #else
     message_string = 'salsa_emission_mode = "read_from_file", but preprocessor directive ' //   &
@@ -9347,4 +9397,5 @@
        TYPE(surf_type), INTENT(inout) :: surface  !< respective surface type
 
+       conv = 1.0_wp
        use_time_fac = PRESENT( time_fac )
 
@@ -9765,5 +9816,5 @@
              ENDDO
 
-          CASE ( 's_BC', 's_DU', 's_H2O', 's_NH', 's_NO', 's_OC', 's_SO4', 's_SS' )
+          CASE ( 's_BC', 's_DU', 's_NH', 's_NO', 's_OC', 's_SO4', 's_SS' )
              IF ( is_used( prtcl, TRIM( variable(3:) ) ) )  THEN
                 found_index = get_index( prtcl, TRIM( variable(3:) ) )
@@ -9786,4 +9837,17 @@
                 ENDDO
              ENDIF
+
+          CASE ( 's_H2O' )
+             found_index = get_index( prtcl,'H2O' )
+             DO  i = nxlg, nxrg
+                DO  j = nysg, nyng
+                   DO  k = nzb, nzt+1
+                      DO  ic = ( found_index-1 ) * nbins_aerosol + 1, found_index * nbins_aerosol
+                         to_be_resorted(k,j,i) = to_be_resorted(k,j,i) +                           &
+                                                 aerosol_mass(ic)%conc(k,j,i)
+                      ENDDO
+                   ENDDO
+                ENDDO
+             ENDDO
 
           CASE DEFAULT
@@ -9885,7 +9949,6 @@
              ENDDO
 
-          CASE ( 's_BC', 's_DU', 's_H2O', 's_NH', 's_NO', 's_OC', 's_SO4', 's_SS' )
+          CASE ( 's_BC', 's_DU', 's_NH', 's_NO', 's_OC', 's_SO4', 's_SS' )
              IF ( is_used( prtcl, TRIM( variable(3:) ) ) )  THEN
-                found_index = get_index( prtcl, TRIM( variable(3:) ) )
                 IF ( TRIM( variable(3:) ) == 'BC' )   to_be_resorted => s_bc_av
                 IF ( TRIM( variable(3:) ) == 'DU' )   to_be_resorted => s_du_av
@@ -9904,4 +9967,15 @@
                 ENDDO
              ENDIF
+
+          CASE ( 's_H2O' )
+             to_be_resorted => s_h2o_av
+             DO  i = nxlg, nxrg
+                DO  j = nysg, nyng
+                   DO  k = nzb, nzt+1
+                      to_be_resorted(k,j,i) = to_be_resorted(k,j,i) /                              &
+                                              REAL( average_count_3d, KIND=wp )
+                   ENDDO
+                ENDDO
+             ENDDO
 
        END SELECT
@@ -10212,5 +10286,5 @@
           IF ( mode == 'xy' )  grid = 'zu'
 
-       CASE ( 's_BC', 's_DU', 's_H2O', 's_NH', 's_NO', 's_OC', 's_SO4', 's_SS' )
+       CASE ( 's_BC', 's_DU', 's_NH', 's_NO', 's_OC', 's_SO4', 's_SS' )
           vari = TRIM( variable( 3:LEN( TRIM( variable ) ) - 3 ) )
           IF ( is_used( prtcl, vari ) )  THEN
@@ -10252,4 +10326,33 @@
           IF ( mode == 'xy' )  grid = 'zu'
 
+       CASE ( 's_H2O' )
+          found_index = get_index( prtcl, 'H2O' )
+          IF ( av == 0 )  THEN
+             DO  i = nxl, nxr
+                DO  j = nys, nyn
+                   DO  k = nzb_do, nzt_do
+                      temp_bin = 0.0_wp
+                      DO  ic = ( found_index-1 ) * nbins_aerosol+1, found_index * nbins_aerosol
+                         temp_bin = temp_bin + aerosol_mass(ic)%conc(k,j,i)
+                      ENDDO
+                      local_pf(i,j,k) = MERGE( temp_bin, REAL( fill_value, KIND = wp ),         &
+                                               BTEST( wall_flags_0(k,j,i), 0 ) )
+                   ENDDO
+                ENDDO
+             ENDDO
+          ELSE
+             to_be_resorted => s_h2o_av
+             DO  i = nxl, nxr
+                DO  j = nys, nyn
+                   DO  k = nzb_do, nzt_do
+                      local_pf(i,j,k) = MERGE( to_be_resorted(k,j,i), REAL( fill_value,         &
+                                               KIND = wp ), BTEST( wall_flags_0(k,j,i), 0 ) )
+                   ENDDO
+                ENDDO
+             ENDDO
+          ENDIF
+
+          IF ( mode == 'xy' )  grid = 'zu'
+
        CASE DEFAULT
           found = .FALSE.
@@ -10534,5 +10637,5 @@
           ENDIF
 
-       CASE ( 's_BC', 's_DU', 's_H2O', 's_NH', 's_NO', 's_OC', 's_SO4', 's_SS' )
+       CASE ( 's_BC', 's_DU', 's_NH', 's_NO', 's_OC', 's_SO4', 's_SS' )
           IF ( is_used( prtcl, TRIM( variable(3:) ) ) )  THEN
              found_index = get_index( prtcl, TRIM( variable(3:) ) )
@@ -10567,4 +10670,31 @@
                 ENDDO
              ENDIF
+          ENDIF
+
+       CASE ( 's_H2O' )
+          found_index = get_index( prtcl, 'H2O' )
+          IF ( av == 0 )  THEN
+             DO  i = nxl, nxr
+                DO  j = nys, nyn
+                   DO  k = nzb_do, nzt_do
+                      temp_bin = 0.0_wp
+                      DO  ic = ( found_index-1 ) * nbins_aerosol + 1, found_index * nbins_aerosol
+                         temp_bin = temp_bin + aerosol_mass(ic)%conc(k,j,i)
+                      ENDDO
+                      local_pf(i,j,k) = MERGE( temp_bin, REAL( fill_value, KIND = wp ),            &
+                                               BTEST( wall_flags_0(k,j,i), 0 ) ) 
+                   ENDDO
+                ENDDO
+             ENDDO
+          ELSE
+             to_be_resorted => s_h2o_av
+             DO  i = nxl, nxr
+                DO  j = nys, nyn
+                   DO  k = nzb_do, nzt_do
+                      local_pf(i,j,k) = MERGE( to_be_resorted(k,j,i), REAL( fill_value,            &
+                                               KIND = wp ), BTEST( wall_flags_0(k,j,i), 0 ) )
+                   ENDDO
+                ENDDO
+             ENDDO
           ENDIF
 
@@ -10962,4 +11092,43 @@
           ENDIF
 
+       CASE ( 's_H2O' )
+          IF ( av == 0 )  THEN
+             found_index = get_index( prtcl, 'H2O' )
+             DO  i = nxl, nxr
+                DO  j = nys, nyn
+                   DO  k = nzb, nz_do3d
+                      temp_bin = 0.0_wp
+                      DO  ic = ( found_index-1 ) * nbins_aerosol + 1, found_index * nbins_aerosol
+                         temp_bin = temp_bin + aerosol_mass(ic)%conc(k,j,i)
+                      ENDDO
+                      tend(k,j,i) = temp_bin
+                   ENDDO
+                ENDDO
+             ENDDO
+             IF ( .NOT. mask_surface(mid) )  THEN
+                DO  i = 1, mask_size_l(mid,1)
+                   DO  j = 1, mask_size_l(mid,2)
+                      DO  k = 1, mask_size_l(mid,3)
+                         local_pf(i,j,k) = tend( mask_k(mid,k), mask_j(mid,j), mask_i(mid,i) )
+                      ENDDO
+                   ENDDO
+                ENDDO
+             ELSE
+                DO  i = 1, mask_size_l(mid,1)
+                   DO  j = 1, mask_size_l(mid,2)
+                      topo_top_ind = get_topography_top_index_ji( mask_j(mid,j), mask_i(mid,i),    &
+                                                                  grid )
+                      DO  k = 1, mask_size_l(mid,3)
+                         local_pf(i,j,k) = tend( MIN( topo_top_ind+mask_k(mid,k), nzt+1 ),         &
+                                                 mask_j(mid,j), mask_i(mid,i) )
+                      ENDDO
+                   ENDDO
+                ENDDO
+             ENDIF
+             resorted = .TRUE.
+          ELSE
+             to_be_resorted => s_h2o_av
+          ENDIF
+
        CASE DEFAULT
           found = .FALSE.
@@ -10999,3 +11168,98 @@
  END SUBROUTINE salsa_data_output_mask
 
+!------------------------------------------------------------------------------!
+! Description:
+! ------------
+!> Creates index tables for different (aerosol) components 
+!------------------------------------------------------------------------------!
+ SUBROUTINE component_index_constructor( self, ncomp, nlist, listcomp )
+
+    IMPLICIT NONE
+
+    INTEGER(iwp) ::  ii  !<
+    INTEGER(iwp) ::  jj  !<
+
+    INTEGER(iwp), INTENT(in) ::  nlist ! < Maximum number of components
+
+    INTEGER(iwp), INTENT(inout) ::  ncomp  !< Number of components
+
+    CHARACTER(len=3), INTENT(in) ::  listcomp(nlist)  !< List cof component names
+
+    TYPE(component_index), INTENT(inout) ::  self  !< Object containing the indices of different
+                                                   !< aerosol components
+
+    ncomp = 0
+
+    DO WHILE ( listcomp(ncomp+1) /= '  ' .AND. ncomp < nlist )
+       ncomp = ncomp + 1
+    ENDDO
+
+    self%ncomp = ncomp
+    ALLOCATE( self%ind(ncomp), self%comp(ncomp) )
+
+    DO  ii = 1, ncomp
+       self%ind(ii) = ii
+    ENDDO
+
+    jj = 1
+    DO  ii = 1, nlist
+       IF ( listcomp(ii) == '') CYCLE
+       self%comp(jj) = listcomp(ii)
+       jj = jj + 1
+    ENDDO
+
+ END SUBROUTINE component_index_constructor
+
+!------------------------------------------------------------------------------!
+! Description:
+! ------------
+!> Gives the index of a component in the component list
+!------------------------------------------------------------------------------!
+ INTEGER FUNCTION get_index( self, incomp )
+
+    IMPLICIT NONE
+
+    CHARACTER(len=*), INTENT(in) ::  incomp !< Component name
+
+    INTEGER(iwp) ::  ii  !< index
+
+    TYPE(component_index), INTENT(in) ::  self  !< Object containing the indices of different
+                                                !< aerosol components
+    IF ( ANY( self%comp == incomp ) )  THEN
+       ii = 1
+       DO WHILE ( (self%comp(ii) /= incomp) )
+          ii = ii + 1
+       ENDDO
+       get_index = ii
+    ELSEIF ( incomp == 'H2O' )  THEN
+       get_index = self%ncomp + 1
+    ELSE
+       WRITE( message_string, * ) 'Incorrect component name given!'
+       CALL message( 'get_index', 'PA0591', 1, 2, 0, 6, 0 )
+    ENDIF
+
+ END FUNCTION get_index
+
+!------------------------------------------------------------------------------!
+! Description:
+! ------------
+!> Tells if the (aerosol) component is being used in the simulation
+!------------------------------------------------------------------------------!
+ LOGICAL FUNCTION is_used( self, icomp )
+
+    IMPLICIT NONE
+
+    CHARACTER(len=*), INTENT(in) ::  icomp !< Component name
+
+    TYPE(component_index), INTENT(in) ::  self  !< Object containing the indices of different
+                                                !< aerosol components
+
+    IF ( ANY(self%comp == icomp) ) THEN
+       is_used = .TRUE.
+    ELSE
+       is_used = .FALSE.
+    ENDIF
+
+ END FUNCTION
+
  END MODULE salsa_mod
Index: palm/trunk/TESTS/cases/urban_environment_salsa/INPUT/urban_environment_salsa_p3d
===================================================================
--- palm/trunk/TESTS/cases/urban_environment_salsa/INPUT/urban_environment_salsa_p3d	(revision 4011)
+++ palm/trunk/TESTS/cases/urban_environment_salsa/INPUT/urban_environment_salsa_p3d	(revision 4012)
@@ -19,8 +19,5 @@
 !-- Numerics
 !------------------------------------------------------------------------------
-    psolver              = 'multigrid',
-    momentum_advec       = 'ws-scheme',  ! default advection scheme
-    scalar_advec         = 'ws-scheme', 
-    conserve_volume_flow = .T.,
+    fft_method           = 'fftw',
 
 !
@@ -28,27 +25,27 @@
 !------------------------------------------------------------------------------     
     humidity             = .T.,
-    q_surface            = 0.008,
+    q_surface            = 0.001,
 
 !
 !-- Initialization
 !------------------------------------------------------------------------------
-    initializing_actions = 'set_constant_profiles',
-
-    pt_surface           = 293.15,
+    initializing_actions = 'set_constant_profiles',   !'set_constant_profiles', or 'inifor', 
+                                                      ! or both (met. from inifor, chem constant profiles)
+
+    pt_surface           = 277.15,
     ug_surface           = 1.0,
     vg_surface           = 0.0,
 
-    roughness_length     = 0.05,
-    neutral              = .T.,
-    
-    day_of_year_init     =  65,          ! March 06, to avoid extreme temperatures
-    time_utc_init        = 71700.0,      !(19:55, UTC in seconds)
-
-!
-!-- Boundary conditions
-!------------------------------------------------------------------------------ 
-    bc_lr                = 'cyclic', 
-    bc_ns                = 'cyclic',
-    bc_uv_t              = 'dirichlet',  ! channel flow boundary condition
+    day_of_year_init     = 65,             ! march 06, to avoid extreme temperatures
+    time_utc_init        = 36000.0,        ! (0.0 s = 00 UTC midnight),
+
+!
+!-- Wall/soil spinup
+!------------------------------------------------------------------------------    
+    spinup_time         = 1200.0,
+    spinup_pt_mean      = 284.15,
+    spinup_pt_amplitude = 10.0,             ! give a dirunal cycle from 6 - 16 Â°C
+    dt_spinup           = 120.0,
+    data_output_during_spinup = .F.,
 
 !
@@ -60,7 +57,7 @@
 !-- Physics
 !------------------------------------------------------------------------------
-    longitude            = 13.4,         ! Berlin longitude
-    latitude             = 52.5,         ! Berlin latitude
-      
+    longitude            = 13.4,
+    latitude             = 52.5,
+
  / ! end of inipar namelist
 
@@ -79,29 +76,97 @@
 
 !
-!-- General output settings
-!------------------------------------------------------------------------------
-    netcdf_data_format    = 4,           ! use NetCDF4
-
-!
 !-- Run-control/timeseries output settings
 !------------------------------------------------------------------------------
     dt_run_control        =  0.0,
-    dt_dots               =  0.0,
-
+    dt_dots               =  10.0,
+
+!
+!-- Profile output settings
+!------------------------------------------------------------------------------
+    skip_time_dopr        =  0.0,
+    dt_dopr               = 60.0,
+    averaging_interval_pr = 60.0,
+    dt_averaging_input_pr =  0.0,
+
+    data_output_pr        = '#u',  'u*2',  'wu',  'w*u*',  'w"u"',
+                            '#v',  'v*2',  'wv',  'w*v*',  'w"v"',
+!                            'w',   'w*2',
+                            '#theta', 'theta*2', 'wtheta', 'w*theta*', 'w"theta"',
+                            '#q',  'q*2', 
 !
 !-- 2D/3D output settings
 !------------------------------------------------------------------------------
     do3d_at_begin      = .T., 
-
-    dt_data_output     = 10.0,
-
+    do2d_at_begin      = .T.,
+
+    dt_data_output     = 10.0, 
+    dt_data_output_av  = 10.0,
+    averaging_interval = 10.0,
+    dt_averaging_input =  0.0,
+
+    section_xy         = 0,
 
     data_output = 'u', 'v', 'w',
-                  'Ntot', 'LDSA', 'PM2.5', 's_OC', 's_NH', 's_NO', 
-                  'g_H2SO4','g_HNO3','g_NH3','g_OCNV','g_OCSV',
+                  'Ntot', 'PM2.5', 'LDSA',
+                  's_OC','g_OCNV','g_OCSV',
                   'N_bin3', 'm_bin4', 
 
+
  / ! end of d3par namelist
 
+
+!-------------------------------------------------------------------------------
+!-- RADIATION MODEL PARAMETER NAMELIST
+!   Documentation: https://palm.muk.uni-hannover.de/trac/wiki/doc/app/radpar
+!-------------------------------------------------------------------------------
+  &radiation_parameters
+
+     radiation_scheme =  'clear-sky',    !'clear-sky' or 'rrtmg',
+     albedo_type = 5,
+     constant_albedo = .F.,
+
+     dt_radiation = 60.0,
+
+     surface_reflections = .T.,
+     nrefsteps = 3,
+
+     rad_angular_discretization = .F.,
+     raytrace_mpi_rma = .F.,
+
+  /
+
+
+!-------------------------------------------------------------------------------
+!-- LAND SURFACE MODEL PARAMETER NAMELIST
+!   Documentation: https://palm.muk.uni-hannover.de/trac/wiki/doc/app/lsmpar
+!------------------------------------------------------------------------------- 
+ &land_surface_parameters 
+
+    constant_roughness     = .T.,
+    aero_resist_kray       = .T.,
+
+    vegetation_type        = 2,
+    soil_type              = 3,
+    conserve_water_content = .T.,
+
+    root_fraction          = 0.49, 0.26, 0.25, 0.0, 0.0, 0.0, 0.0, 0.0,
+    soil_temperature       = 277.15, 277.0, 277.0, 277.0, 277.0, 277.0, 277.0, 277.0, 
+    soil_moisture          = 0.30,   0.30,  0.30,  0.30,  0.30, 0.30,  0.30,  0.30,
+    deep_soil_temperature  = 277.0,
+    
+ / ! end of lsm_par namelist
+
+
+!-------------------------------------------------------------------------------
+!-- URBAN SURFACE MODEL PARAMETER NAMELIST
+!   Documentation: https://palm.muk.uni-hannover.de/trac/wiki/doc/app/usmpar
+!-------------------------------------------------------------------------------
+ &urban_surface_parameters
+
+    usm_material_model     = .T.,
+    usm_wall_mod = .T.,
+
+ / ! end of urban_surface_par namelist
+ 
 
 !-------------------------------------------------------------------------------
@@ -112,5 +177,5 @@
  
     canopy_mode       = 'read_from_file_3d',
-    canopy_drag_coeff = 0.5,
+    canopy_drag_coeff = 0.3,
       
  / ! end of canopy_par namelist
Index: palm/trunk/TESTS/cases/urban_environment_salsa/MONITORING/urban_environment_salsa_rc
===================================================================
--- palm/trunk/TESTS/cases/urban_environment_salsa/MONITORING/urban_environment_salsa_rc	(revision 4011)
+++ palm/trunk/TESTS/cases/urban_environment_salsa/MONITORING/urban_environment_salsa_rc	(revision 4012)
@@ -1,12 +1,11 @@
 
  ******************************    --------------------------------------------
- * PALM 6.0  Rev: 3895M       *    atmosphere - run without 1D - prerun
+ * PALM 6.0  Rev: 4008M       *    atmosphere - run without 1D - prerun
  ******************************    --------------------------------------------
 
- Date:               2019-04-16    Run:       urban_environment_salsa           
- Time:                 16:50:40    Run-No.:   00
- Run on host:             salsa
- Number of PEs:               1    Processor grid (x,y): (   1,   1) calculated
-                                   A 1d-decomposition along x is used
+ Date:               2019-05-31    Run:       urban_environment_salsa           
+ Time:                 17:23:03    Run-No.:   00
+ Run on host:           default
+ Number of PEs:               4    Processor grid (x,y): (   2,   2) calculated
  ------------------------------------------------------------------------------
 
@@ -16,8 +15,5 @@
  --> Use the Moeng_Wyngaard turbulence closure (LES mode).
  --> Use the boussinesq approximation for the model equations.
- --> Solve perturbation pressure via multigrid method (w-cycle)
-     number of grid levels:                    1
-     Gauss-Seidel red/black iterations:        2
-     fixed number of multigrid cycles:           4
+ --> Solve perturbation pressure via FFT using fftw routines
      perturbation pressure is calculated at every Runge-Kutta step
  --> Momentum advection via Wicker-Skamarock-Scheme 5th order
@@ -25,8 +21,5 @@
  --> Loop optimization method: cache
  --> Time differencing scheme: runge-kutta-3       
- --> No pt-equation solved. Neutral stratification with pt = 293.15 K assumed
  --> Additional prognostic equation for the specific humidity
- --> Volume flow at the right and north boundary will be conserved
-     using the initial_profiles mode
  ------------------------------------------------------------------------------
 
@@ -37,5 +30,6 @@
  Timestep:             variable     maximum value: 20.000 s    CFL-factor: 0.90
  Start time:              0.000 s
- End time:               70.000 s
+ End time:             1270.000 s
+ Coupling start time:  1200.000 s
 
 
@@ -51,5 +45,5 @@
 
  Number of gridpoints (x,y,z):  (0:  19, 0:  19, 0:  23)
- Subdomain size (x,y,z):        (    20,     20,     24)
+ Subdomain size (x,y,z):        (    10,     10,     24)
 
 
@@ -83,5 +77,5 @@
                      p                    uv                                  pt
 
- B. bound.: p(0)     = p(1)   | uv(0)     = -uv(1)                | pt(0)     = pt_surface       
+ B. bound.: p(0)     = p(1)   | uv(0)     = -uv(1)                | pt(0)     = from soil model  
  T. bound.: p(nzt+1) = 0      | uv(nzt+1) = ug(nzt+1), vg(nzt+1)  | pt(nzt+1) = pt(nzt) + dpt/dz_
 
@@ -93,5 +87,5 @@
                      q
 
- B. bound.: q(0)     = q_surface                                                                 
+ B. bound.: q(0)     = from soil model                                                           
  T. bound.: q(nzt+1) = q(nzt) + dq/dz                                                            
 
@@ -101,5 +95,5 @@
     Constant flux layer between bottom surface and first computational u,v-level:
 
-       z_mo =   1.00 m   z0 = 0.0500 m   z0h = 0.05000 m   kappa = 0.40
+       z_mo =   1.00 m   z0 = 0.1000 m   z0h = 0.10000 m   kappa = 0.40
        Rif value range:     -20.00 <= rif <= 20.00
        Predefined surface temperature
@@ -117,13 +111,13 @@
     Characteristic levels of the initial temperature profile:
 
-       Height:           0.0  m
-       Temperature:   293.15  K
-       Gradient:      ------  K/100m
-       Gridpoint:          0
+       Height:           0.0     0.0  m
+       Temperature:   277.15  277.15  K
+       Gradient:      ------    0.00  K/100m
+       Gridpoint:          0       0
 
     Characteristic levels of the initial humidity profile:
 
        Height:           0.0       0.0  m
-       Humidity:     0.8E-02   0.8E-02  kg/kg
+       Humidity:     0.1E-02   0.1E-02  kg/kg
        Gradient:    --------   0.0E+00  (kg/kg)/100m
        Gridpoint:          0         0
@@ -135,4 +129,6 @@
     1D-Profiles:
        Output every             9999999.90 s
+       Time averaged over          60.00 s
+       Averaging input every        0.00 s
 
 
@@ -140,10 +136,23 @@
  -----------
 
+       Time averaged over          60.00 s
+       Averaging input every        0.00 s
+
+    1D-Profiles:
+       Output format: netCDF 64bit offset                     
+
+
+       Profile: u, u*2, wu, w*u*, w"u", v, v*2, wv, w*v*, w"v", theta,       
+
+              : theta*2, wtheta, w*theta*, w"theta", q, q*2,                 
+       Output every                60.00 s
+       Time averaged over          60.00 s
+       Averaging input every        0.00 s
 
     3D-Arrays:
-       Output format: netCDF4/HDF5 classic                    
-
-
-       Arrays:  u, v, w, Ntot, LDSA, PM2.5, s_OC, s_NH, s_NO, g_H2SO4, g_HNO3, g_NH3,
+       Output format: netCDF 64bit offset                     
+
+
+       Arrays:  u, v, w, Ntot, PM2.5, LDSA, s_OC, g_OCNV, g_OCSV, N_bin3, m_bin4,    
        Output every                10.00 s  and at the start
        Upper output limit at       45.00 m  (GP   23)
@@ -154,7 +163,7 @@
 
     Time series:
-       Output format: netCDF4/HDF5 classic                    
-
-       Output every                 0.00 s
+       Output format: netCDF 64bit offset                     
+
+       Output every                10.00 s
 
  ------------------------------------------------------------------------------
@@ -171,5 +180,5 @@
 
     Day of the year at model start :   day_init      =      65
-    UTC time at model start        :   time_utc_init = 71700.0 s
+    UTC time at model start        :   time_utc_init = 36000.0 s
 
     Gravity             :   g      =  9.8 m/s**2
@@ -202,4 +211,20 @@
 
 
+ Land surface model information:
+ ------------------------------
+
+    --> Soil bottom is closed (water content is conserved, default)
+    --> Land surface type  : read from file
+    --> Soil porosity type : read from file
+
+    Initial soil temperature and moisture profile:
+
+       Height:              -0.01      -0.02      -0.05      -0.10      -0.20      -0.40      -0.80      -2.  m
+       Temperature:        277.15     277.00     277.00     277.00     277.00     277.00     277.00     277.  K
+       Moisture:             0.30       0.30       0.30       0.30       0.30       0.30       0.30       0.  m**3/m**3
+       Root fraction:        0.49       0.26       0.25       0.00       0.00       0.00       0.00       0.  
+       Grid point:              0          1          2          3          4          5          6
+
+
  Vegetation canopy (drag) model:
  ------------------------------
@@ -207,5 +232,5 @@
  Canopy mode: read_from_file_3d             
  Canopy height:  10.00m (   5 grid points)
- Leaf drag coefficient:   0.50
+ Leaf drag coefficient:   0.30
 
  Predefined constant heatflux at the top of the vegetation:   0.00 K m/s
@@ -219,4 +244,13 @@
 
 
+ Radiation model information:
+ ----------------------------
+
+    --> Simple radiation scheme for clear sky is used (no clouds, default)
+
+    Albedo is set individually for each xy-location, according to given surface type.
+    Timestep: dt_radiation =  60.00  s
+
+
  SALSA information:
  ------------------------------
@@ -227,9 +261,9 @@
 
     Array shape (z,y,x,bins):
-       aerosol_number:   24 26 26  8
-
-       aerosol_mass:     24 26 26 32
+       aerosol_number:   22 19 19  8
+
+       aerosol_mass:     24 16 16 32
        (advect_particle_water = T)
-       salsa_gas:  24 26 26  5
+       salsa_gas:  24 16 16  5
        (salsa_gases_from_chem = F)
 
@@ -245,5 +279,5 @@
     Number of size bins for each aerosol subrange:   1  7
     Aerosol bin limits (in metres):  3.00E-009 1.00E-008 2.20E-008 4.84E-008 1.07E-007 2.35E-007 5.16E-007 1.14E-006
-    Initial number concentration in bins at the lowest level (#/m**3): 0.00E+000 0.00E+000 0.00E+000 0.00E+000 0.00E+000 0.00E+000 0.00E+000 0.00E+000
+    Initial number concentration in bins at the lowest level (#/m**3): 1.19E+008 9.63E+008 5.30E+008 1.96E+008 6.13E+007 6.01E+006 1.95E+005 1.25E+004
 
     Number of chemical components used: 3
@@ -275,4 +309,22 @@
 
 
+Spinup control output:
+--------------------------------
+
+ITER.  HH:MM:SS    DT   PT(z_MO)
+--------------------------------
+    1  00:02:00  120.00   288.14
+    2  00:04:00  120.00   288.17
+    3  00:06:00  120.00   288.21
+    4  00:08:00  120.00   288.24
+    5  00:10:00  120.00   288.27
+    6  00:12:00  120.00   288.30
+    7  00:14:00  120.00   288.33
+    8  00:16:00  120.00   288.35
+    9  00:18:00  120.00   288.38
+   10  00:20:00  120.00   288.41
+
+
+
 Run-control output:
 ------------------
@@ -280,67 +332,67 @@
 RUN  ITER. HH:MM:SS.SS    DT(E)     UMAX     VMAX     WMAX     U*    W*      THETA*     Z_I     ENERG.   DISTENERG    DIVOLD     DIVNEW     UMAX(KJI)    VMAX(KJI)    WMAX(KJI)   ADVECX   ADVECY   MGCYC
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-  0      0 00:00:00.00   1.5300A   1.1740D  0.5958D  0.4479  0.000  0.00   0.000E+00      0.  0.328E+00  0.265E-01  0.357E-01  0.219E-01   17   0  19    6  15   5   21  17  14    0.000    0.000       4
-  0      1 00:00:01.53   0.3070A  -5.8637   3.1112   2.2106  0.313  0.00   0.000E+00      0.  0.227E+01  0.128E+01  0.564E+00  0.262E+00    3  16  10    7   0   5   15   1  14    0.000    0.000       4
-  0      2 00:00:01.83   0.7360A   2.4450   2.4206   1.7519  0.095  0.00   0.000E+00      0.  0.395E+00  0.121E+00  0.549E-01  0.442E-01   22   0   1    7   0   5   11  18   5    0.000    0.000       4
-  0      3 00:00:02.57   0.5210A   3.4548   2.2340   1.2457  0.148  0.00   0.000E+00      0.  0.106E+01  0.198E+00  0.179E+00  0.996E-01    7   1   8    4   0   9    6   0   9    0.000    0.000       4
-  0      4 00:00:03.09   0.8660A   1.9783   2.0780  -1.1874  0.043  0.00   0.000E+00      0.  0.224E+00  0.901E-01  0.244E-01  0.251E-01   22   0   3    3   0   9    5  19  11    0.000    0.000       4
-  0      5 00:00:03.96   0.9460A   1.9019   1.8854  -1.1006  0.050  0.00   0.000E+00      0.  0.198E+00  0.812E-01  0.443E-01  0.228E-01   22   0   3    3   1   9    5  19  11    0.000    0.000       4
-  0      6 00:00:04.90   0.8600A   2.0940   1.7943  -1.0036  0.054  0.00   0.000E+00      0.  0.295E+00  0.662E-01  0.147E-01  0.101E-01   22   0   4    3   1   9    5  19  11    0.000    0.000       4
-  0      7 00:00:05.76   0.9230A   1.9509  -1.5875  -0.9754  0.047  0.00   0.000E+00      0.  0.271E+00  0.668E-01  0.118E-01  0.375E-02   22   0   4    6   0   9    6   0   9    0.000    0.000       4
-  0      8 00:00:06.68   0.9620A   1.8702   1.4274  -0.8663  0.045  0.00   0.000E+00      0.  0.254E+00  0.653E-01  0.999E-02  0.363E-02   21  17   7    3   2   9    6   0   9    0.000    0.000       4
-  0      9 00:00:07.65   0.9660A   1.8635   1.3192  -0.7929  0.047  0.00   0.000E+00      0.  0.259E+00  0.625E-01  0.881E-02  0.300E-02   21  17   7    3   2   9    7  19   9    0.000    0.000       4
-  0     10 00:00:08.61   0.9860A   1.8258   1.1186  -0.7396  0.047  0.00   0.000E+00      0.  0.258E+00  0.611E-01  0.710E-02  0.223E-02   21  17   7    3   2   9    7  19   9    0.000    0.000       4
-  0     11 00:00:09.60   1.0100A   1.7786   0.9043   0.7158  0.048  0.00   0.000E+00      0.  0.256E+00  0.604E-01  0.554E-02  0.155E-02   21  17   8    3   2   9   15   2  14    0.000    0.000       4
-  0     12 00:00:10.61   1.0200A   1.7661  -0.8828   0.7411  0.048  0.00   0.000E+00      0.  0.257E+00  0.603E-01  0.446E-02  0.118E-02   21  17   8    5  19   9   15   2  14    0.000    0.000       4
-  0     13 00:00:11.63   1.0400A   1.7228  -0.8455   0.7552  0.049  0.00   0.000E+00      0.  0.257E+00  0.607E-01  0.428E-02  0.133E-02   21  17   8    6  19  10   15   2  14    0.000    0.000       4
-  0     14 00:00:12.67   1.0400A   1.7294  -0.7885   0.7577  0.050  0.00   0.000E+00      0.  0.258E+00  0.612E-01  0.452E-02  0.148E-02   22  18   8    4  16  12   15   2  14    0.000    0.000       4
-  0     15 00:00:13.71   1.0500A   1.7096  -0.7602   0.7511  0.050  0.00   0.000E+00      0.  0.258E+00  0.617E-01  0.464E-02  0.153E-02   22  18   9    4  16  12   15   2  14    0.000    0.000       4
-  0     16 00:00:14.76   1.0400A   1.7372  -0.7573   0.7380  0.051  0.00   0.000E+00      0.  0.259E+00  0.622E-01  0.460E-02  0.148E-02   22  17   9   18  15  14   15   2  14    0.000    0.000       4
-  0     17 00:00:15.80   1.0400A   1.7254   0.7851   0.7227  0.052  0.00   0.000E+00      0.  0.260E+00  0.627E-01  0.435E-02  0.134E-02   22  17  10   19   0  14   15   2  14    0.000    0.000       4
-  0     18 00:00:16.84   1.0400A   1.7244   0.8312   0.7068  0.053  0.00   0.000E+00      0.  0.261E+00  0.633E-01  0.407E-02  0.118E-02   22  17  10   19   0  14   15   2  14    0.000    0.000       4
-  0     19 00:00:17.88   1.0400A   1.7324  -0.8733   0.6927  0.053  0.00   0.000E+00      0.  0.261E+00  0.640E-01  0.384E-02  0.102E-02   22  17  11   19  15  14   15   2  14    0.000    0.000       4
-  0     20 00:00:18.92   1.0600A   1.6937  -0.9065   0.6819  0.054  0.00   0.000E+00      0.  0.262E+00  0.647E-01  0.375E-02  0.924E-03   22  17  11   19  15  14   15   2  14    0.000    0.000       4
-  0     21 00:00:19.98   1.0600A   1.7039  -0.9074   0.6744  0.055  0.00   0.000E+00      0.  0.263E+00  0.655E-01  0.381E-02  0.943E-03   22  17  12   19  15  14   15   2  14    0.000    0.000       4
-  0     22 00:00:21.04   1.0600A   1.6992  -0.8659   0.6718  0.056  0.00   0.000E+00      0.  0.264E+00  0.662E-01  0.382E-02  0.957E-03   22  17  13   19  15  14   15   2  14    0.000    0.000       4
-  0     23 00:00:22.10   1.0700A   1.6753  -0.8488   0.6735  0.056  0.00   0.000E+00      0.  0.265E+00  0.669E-01  0.379E-02  0.950E-03   22  17  13   18  15  14   15   2  14    0.000    0.000       4
-  0     24 00:00:23.17   1.0700A   1.6882  -0.8114   0.6784  0.057  0.00   0.000E+00      0.  0.266E+00  0.677E-01  0.378E-02  0.929E-03   22  17  15   18  15  14   15   2  14    0.000    0.000       4
-  0     25 00:00:24.24   1.0400A   1.7302  -0.7613   0.6861  0.057  0.00   0.000E+00      0.  0.267E+00  0.684E-01  0.373E-02  0.895E-03   22  17  15   18  15  14   15   2  14    0.000    0.000       4
-  0     26 00:00:25.28   1.0300A   1.7398   0.7503   0.6961  0.057  0.00   0.000E+00      0.  0.268E+00  0.691E-01  0.361E-02  0.843E-03   22  17  16    6   6  14   15   2  14    0.000    0.000       4
-  0     27 00:00:26.31   1.0400A   1.7364   0.7431   0.7062  0.057  0.00   0.000E+00      0.  0.269E+00  0.699E-01  0.354E-02  0.803E-03   22  17  16    6   6  14   15   2  14    0.000    0.000       4
-  0     28 00:00:27.35   1.0400A   1.7321   0.7332   0.7154  0.056  0.00   0.000E+00      0.  0.270E+00  0.707E-01  0.355E-02  0.801E-03   22  17  17    5   5  14   15   2  14    0.000    0.000       4
-  0     29 00:00:28.39   1.0500A   1.7180   0.7321   0.7240  0.056  0.00   0.000E+00      0.  0.272E+00  0.714E-01  0.354E-02  0.810E-03   22  17  18    5   5  14   15   2  14    0.000    0.000       4
-  0     30 00:00:29.44   1.0600A   1.7017   0.7261   0.7313  0.056  0.00   0.000E+00      0.  0.273E+00  0.723E-01  0.355E-02  0.823E-03   22  17  19    5   5  14   15   2  14    0.000    0.000       4
-  0     31 00:00:30.50   1.0600A   1.6921   0.7156   0.7372  0.056  0.00   0.000E+00      0.  0.274E+00  0.731E-01  0.356E-02  0.835E-03   22  17  19    5   5  14   15   2  14    0.000    0.000       4
-  0     32 00:00:31.56   1.0700A   1.6853   0.7010   0.7417  0.056  0.00   0.000E+00      0.  0.276E+00  0.739E-01  0.355E-02  0.834E-03   22  17   0    5   5  14   15   2  14    0.000    0.000       4
-  0     33 00:00:32.63   1.0800A   1.6729   0.6848   0.7440  0.056  0.00   0.000E+00      0.  0.277E+00  0.747E-01  0.355E-02  0.831E-03   22  17   1   12   5  14   15   2  14    0.000    0.000       4
-  0     34 00:00:33.71   1.0900A   1.6581   0.6828   0.7556  0.056  0.00   0.000E+00      0.  0.278E+00  0.756E-01  0.353E-02  0.825E-03   22  17   1   12   5  14   20  17  14    0.000    0.000       4
-  0     35 00:00:34.80   1.1000A   1.6323   0.6806   0.7734  0.056  0.00   0.000E+00      0.  0.280E+00  0.763E-01  0.351E-02  0.816E-03   22   1   1   12   5  14   20  17  14    0.000    0.000       4
-  0     36 00:00:35.90   1.1200A   1.6130   0.6775   0.7848  0.055  0.00   0.000E+00      0.  0.281E+00  0.771E-01  0.348E-02  0.805E-03   22  17   2   12   5  14   20  17  14    0.000    0.000       4
-  0     37 00:00:37.02   1.1300A   1.5964   0.6742   0.7896  0.055  0.00   0.000E+00      0.  0.282E+00  0.778E-01  0.347E-02  0.798E-03   22   1   2   13   5  14   20  17  14    0.000    0.000       4
-  0     38 00:00:38.15   1.1400A   1.5736   0.6686   0.7887  0.055  0.00   0.000E+00      0.  0.283E+00  0.785E-01  0.344E-02  0.785E-03   22   1   3   13   5  14   20  17  14    0.000    0.000       4
-  0     39 00:00:39.29   1.1700A   1.5441   0.6594   0.7832  0.055  0.00   0.000E+00      0.  0.284E+00  0.792E-01  0.340E-02  0.768E-03   22   1   3   13   5  14   20  17  14    0.000    0.000       4
-  0     40 00:00:40.46   1.1800A   1.5311   0.6450   0.7741  0.055  0.00   0.000E+00      0.  0.285E+00  0.798E-01  0.341E-02  0.760E-03   22   2   4   13   5  14   20  17  14    0.000    0.000       4
-  0     41 00:00:41.64   1.1900A   1.5096   0.6266   0.7645  0.055  0.00   0.000E+00      0.  0.286E+00  0.804E-01  0.337E-02  0.740E-03   22   2   5   13   5  14   20  17  14    0.000    0.000       4
-  0     42 00:00:42.83   1.2200A   1.4789   0.6041   0.7554  0.055  0.00   0.000E+00      0.  0.287E+00  0.809E-01  0.331E-02  0.717E-03   22   3   6   13   5  14   20  17  14    0.000    0.000       4
-  0     43 00:00:44.05   1.2300A   1.4646   0.5901   0.7454  0.055  0.00   0.000E+00      0.  0.288E+00  0.814E-01  0.330E-02  0.702E-03   22   2   6   17   0  14   20  17  14    0.000    0.000       4
-  0     44 00:00:45.28   1.2400A   1.4541   0.5896   0.7318  0.055  0.00   0.000E+00      0.  0.289E+00  0.818E-01  0.325E-02  0.680E-03   22   4   7   17   0  14   20  17  14    0.000    0.000       4
-  0     45 00:00:46.52   1.2500A   1.4347   0.5929   0.7147  0.054  0.00   0.000E+00      0.  0.289E+00  0.821E-01  0.320E-02  0.659E-03   22   4   8   17   0  14   20  18  14    0.000    0.000       4
-  0     46 00:00:47.77   1.2800A   1.4108   0.6001   0.6921  0.054  0.00   0.000E+00      0.  0.290E+00  0.824E-01  0.316E-02  0.643E-03   22   4   8   17   0  14   20  18  14    0.000    0.000       4
-  0     47 00:00:49.05   1.2800A   1.4102   0.6101   0.6891  0.054  0.00   0.000E+00      0.  0.291E+00  0.827E-01  0.317E-02  0.641E-03   22   5   9   17   0  14   15   2  14    0.000    0.000       4
-  0     48 00:00:50.33   1.2800A   1.4050   0.6237   0.6888  0.054  0.00   0.000E+00      0.  0.291E+00  0.829E-01  0.313E-02  0.633E-03   22   6  10   17   0  14   15   2  14    0.000    0.000       4
-  0     49 00:00:51.61   1.2900A   1.3931   0.6395   0.6860  0.054  0.00   0.000E+00      0.  0.292E+00  0.831E-01  0.309E-02  0.624E-03   22   6  11   17   0  14   15   2  14    0.000    0.000       4
-  0     50 00:00:52.90   1.2400A   1.4539   0.6571   0.6785  0.054  0.00   0.000E+00      0.  0.292E+00  0.832E-01  0.307E-02  0.619E-03   21  16  15   17   0  14   15   2  14    0.000    0.000       4
-  0     51 00:00:54.14   1.2000A   1.4975   0.6780   0.6746  0.055  0.00   0.000E+00      0.  0.292E+00  0.833E-01  0.294E-02  0.593E-03   21  16  15   17   0  14   15   1  14    0.000    0.000       4
-  0     52 00:00:55.34   1.1900A   1.5071   0.7016   0.6762  0.055  0.00   0.000E+00      0.  0.293E+00  0.834E-01  0.282E-02  0.568E-03   21  16  15   19   0  14   15   1  14    0.000    0.000       4
-  0     53 00:00:56.53   1.2000A   1.4971   0.7327   0.6751  0.055  0.00   0.000E+00      0.  0.293E+00  0.834E-01  0.276E-02  0.556E-03   21  17  15   18   0  14   15   1  14    0.000    0.000       4
-  0     54 00:00:57.73   1.2100A   1.4911   0.7633   0.6715  0.055  0.00   0.000E+00      0.  0.293E+00  0.834E-01  0.276E-02  0.556E-03   21  17  15   18   0  14   15   1  14    0.000    0.000       4
-  0     55 00:00:58.94   1.2200A   1.4800   0.7830   0.6657  0.055  0.00   0.000E+00      0.  0.293E+00  0.834E-01  0.276E-02  0.559E-03   21  17  15   18   0  14   15   1  14    0.000    0.000       4
-  0     56 00:01:00.16   1.2300A   1.4611   0.8074  -0.6734  0.055  0.00   0.000E+00      0.  0.294E+00  0.834E-01  0.277E-02  0.562E-03   21  17  15   17   0  14    5   4  14    0.000    0.000       4
-  0     57 00:01:01.39   1.2600A   1.4332   0.8173  -0.6852  0.055  0.00   0.000E+00      0.  0.294E+00  0.834E-01  0.278E-02  0.564E-03   21  17  15   17   0  14    5   4  14    0.000    0.000       4
-  0     58 00:01:02.65   1.2600A   1.4301   0.7946  -0.6800  0.055  0.00   0.000E+00      0.  0.294E+00  0.834E-01  0.283E-02  0.572E-03   22   3  17   17   0  14    5   4  14    0.000    0.000       4
-  0     59 00:01:03.91   1.2600A   1.4332   0.7555  -0.7051  0.054  0.00   0.000E+00      0.  0.294E+00  0.834E-01  0.282E-02  0.569E-03   22  15  18   16   0  14   16  17  14    0.000    0.000       4
-  0     60 00:01:05.17   1.2600A   1.4341   0.7391  -0.7543  0.054  0.00   0.000E+00      0.  0.295E+00  0.834E-01  0.280E-02  0.560E-03   22  15  19   16   0  14   16  18  14    0.000    0.000       4
-  0     61 00:01:06.43   1.2500A   1.4393   0.6918  -0.7598  0.053  0.00   0.000E+00      0.  0.295E+00  0.834E-01  0.277E-02  0.547E-03   22   3  19   16   0  14   16  18  14    0.000    0.000       4
-  0     62 00:01:07.68   1.2500A   1.4381   0.6393  -0.7650  0.053  0.00   0.000E+00      0.  0.295E+00  0.834E-01  0.271E-02  0.529E-03   22   3   0   16   1  14   15  18  14    0.000    0.000       4
-  0     63 00:01:08.93   1.2600A   1.4296   0.6196  -0.7827  0.052  0.00   0.000E+00      0.  0.295E+00  0.834E-01  0.268E-02  0.512E-03   22   4   1   16   1  14   15  18  14    0.000    0.000       4
-  0     64 00:01:10.19   1.2600A   1.4308   0.5760  -0.7698  0.051  0.00   0.000E+00      0.  0.296E+00  0.833E-01  0.266E-02  0.499E-03   22   2   1   16   1  14   15  18  14    0.000    0.000       4
+  0      0 00:00:00.00   1.3300A   1.3569D  0.6524D  0.4803  0.070  0.00   0.858E-01      0.  0.366E+00  0.309E-01  0.378E-01  0.160E-01   16   0  18    6  15   5   20  17  14    0.000    0.000       0
+  0      1 00:00:01.32   1.0500A   1.7173  -0.9918   0.9157  0.099  0.00  -0.441E+00      2.  0.349E+00  0.513E-01  0.145E-01  0.400E-02   16   0   0    6  15  14   15   1  14    0.000    0.000       0
+  0      2 00:00:02.37   1.0700A   1.6851  -1.0411   1.0211  0.097  0.00  -0.448E+00      2.  0.345E+00  0.558E-01  0.603E-02  0.190E-02   16   0   0    6  15  14   15   1  14    0.000    0.000       0
+  0      3 00:00:03.44   1.0900A   1.6547   1.0546   1.0394  0.094  0.29  -0.453E+00     30.  0.341E+00  0.575E-01  0.535E-02  0.156E-02   16   0   1    6   5  14   15   1  14    0.000    0.000       0
+  0      4 00:00:04.53   1.1200A   1.6140   1.0496   1.0340  0.092  0.06  -0.463E+00     12.  0.338E+00  0.586E-01  0.518E-02  0.147E-02   16   0   1    6   5  14   15   1  14    0.000    0.000       0
+  0      5 00:00:05.65   1.1400A   1.5789   1.0339   1.0181  0.091  0.00  -0.481E+00     10.  0.335E+00  0.596E-01  0.520E-02  0.146E-02   16   0   2    6   5  14   15   1  14    0.000    0.000       0
+  0      6 00:00:06.79   1.1900A   1.5170   1.0139   0.9994  0.089  0.00  -0.508E+00     10.  0.332E+00  0.608E-01  0.519E-02  0.144E-02   16   0   2    6   5  14   15   1  14    0.000    0.000       0
+  0      7 00:00:07.98   1.2200A   1.4727   0.9885   0.9788  0.088  0.00  -0.530E+00     10.  0.329E+00  0.620E-01  0.532E-02  0.146E-02   16   1  15    6   5  14   15   1  14    0.000    0.000       0
+  0      8 00:00:09.20   1.2400A   1.4508   0.9616   0.9617  0.087  0.00  -0.514E+00     10.  0.327E+00  0.633E-01  0.539E-02  0.147E-02   16   1  15    6   5  14   15   2  14    0.000    0.000       0
+  0      9 00:00:10.44   1.2600A   1.4296   0.9388   0.9481  0.086  0.00  -0.483E+00     10.  0.324E+00  0.647E-01  0.543E-02  0.147E-02   16   1  15    3   5  14   15   2  14    0.000    0.000       0
+  0     10 00:00:11.70   1.2800A   1.4101   0.9328   0.9359  0.086  0.00  -0.472E+00     10.  0.322E+00  0.662E-01  0.549E-02  0.148E-02   16   1  15    3   5  14   15   2  14    0.000    0.000       0
+  0     11 00:00:12.98   1.2900A   1.3924   0.9216   0.9243  0.085  0.00  -0.470E+00     10.  0.320E+00  0.678E-01  0.557E-02  0.148E-02   16   1  15    3   5  14   15   2  14    0.000    0.000       0
+  0     12 00:00:14.27   1.3100A   1.3770   0.9054   0.9134  0.085  0.12  -0.462E+00     10.  0.317E+00  0.695E-01  0.561E-02  0.147E-02   16   1  15    3   5  14   15   2  14    0.000    0.000       0
+  0     13 00:00:15.58   1.3200A   1.3616   0.8829   0.9022  0.084  0.18  -0.464E+00     10.  0.316E+00  0.713E-01  0.568E-02  0.146E-02   16   1  15    3   5  14   15   2  14    0.000    0.000       0
+  0     14 00:00:16.90   1.3400A   1.3472   0.8706   0.8911  0.084  0.23  -0.458E+00     10.  0.314E+00  0.732E-01  0.573E-02  0.145E-02   16   1  15    8   5  14   15   2  14    0.000    0.000       0
+  0     15 00:00:18.24   1.3500A   1.3323   0.8590   0.8791  0.084  0.27  -0.453E+00     10.  0.312E+00  0.752E-01  0.583E-02  0.144E-02   16   1  15    7   5  14   15   2  14    0.000    0.000       0
+  0     16 00:00:19.59   1.3700A   1.3180  -0.8591   0.8670  0.083  0.47  -0.453E+00     20.  0.311E+00  0.773E-01  0.588E-02  0.142E-02   16   1  15    7   3   5   15   2  14    0.000    0.000       0
+  0     17 00:00:20.96   1.3800A   1.3032  -0.8662   0.8703  0.083  0.52  -0.457E+00     20.  0.309E+00  0.795E-01  0.598E-02  0.140E-02   16   1  15    7   3   5    5  14   8    0.000    0.000       0
+  0     18 00:00:22.34   1.4000A   1.2889  -0.8501   0.8915  0.083  0.55  -0.452E+00     20.  0.308E+00  0.818E-01  0.603E-02  0.137E-02   16   1  15    7   3   5    4  15   9    0.000    0.000       0
+  0     19 00:00:23.74   1.4100A   1.2740   0.8103   0.9470  0.083  0.57  -0.447E+00     20.  0.307E+00  0.842E-01  0.610E-02  0.134E-02   16   1  15    7   5  14    4   5   2    0.000    0.000       0
+  0     20 00:00:25.15   1.4300A   1.2597   0.7952   1.0311  0.083  0.57  -0.447E+00     20.  0.306E+00  0.867E-01  0.615E-02  0.130E-02   16   1  15    7   5  14    5   5   3    0.000    0.000       0
+  0     21 00:00:26.58   1.4500A   1.2454  -0.7948   1.1459  0.082  0.55  -0.448E+00     20.  0.305E+00  0.893E-01  0.624E-02  0.128E-02    2   6  19    1   4   8    5   5   3    0.000    0.000       0
+  0     22 00:00:28.03   1.4600A   1.2368  -0.8277   1.1916  0.082  0.52  -0.450E+00     20.  0.305E+00  0.921E-01  0.630E-02  0.126E-02   16  12   2    1   4   8    5   5   3    0.000    0.000       0
+  0     23 00:00:29.49   1.4500A   1.2319  -0.8561   1.2445  0.082  0.57  -0.455E+00     30.  0.305E+00  0.949E-01  0.633E-02  0.123E-02   15  12   3    1   4   8    6  14   2    0.000    0.000       0
+  0     24 00:00:30.94   1.3600A   1.2277  -0.8797   1.3252  0.081  0.53  -0.453E+00     30.  0.304E+00  0.978E-01  0.628E-02  0.118E-02   18   2   4    1   4   8    6  14   3    0.000    0.000       0
+  0     25 00:00:32.30   1.3000A   1.2274  -0.8967   1.3886  0.081  0.51  -0.460E+00     30.  0.304E+00  0.101E+00  0.592E-02  0.109E-02   18   2   4    1   4   8    7  14   3    0.000    0.000       0
+  0     26 00:00:33.60   1.2500A   1.2324  -0.9076   1.4376  0.081  0.50  -0.449E+00     30.  0.304E+00  0.103E+00  0.567E-02  0.101E-02   18   2   5    1   4   8    7  14   4    0.000    0.000       0
+  0     27 00:00:34.85   1.1900A   1.2384  -0.9131   1.5085  0.081  0.49  -0.449E+00     30.  0.305E+00  0.106E+00  0.547E-02  0.949E-03   18   2   5    1   4   8    8  14   4    0.000    0.000       0
+  0     28 00:00:36.04   1.1500A   1.2426  -0.9143   1.5702  0.081  0.49  -0.451E+00     30.  0.305E+00  0.108E+00  0.525E-02  0.885E-03   18   2   5    1   4   8    8  14   4    0.000    0.000       0
+  0     29 00:00:37.19   1.0900A   1.2446  -0.9127   1.6493  0.080  0.49  -0.458E+00     30.  0.305E+00  0.111E+00  0.509E-02  0.829E-03   18   2   5    1   4   8    9  14   4    0.000    0.000       0
+  0     30 00:00:38.28   1.0500A   1.2439  -0.9096   1.7166  0.080  0.49  -0.469E+00     30.  0.305E+00  0.113E+00  0.485E-02  0.762E-03   18   2   5    1   4   8   10  14   4    0.000    0.000       0
+  0     31 00:00:39.33   1.0400A   1.2443  -0.9117   1.7371  0.080  0.49  -0.465E+00     30.  0.306E+00  0.116E+00  0.469E-02  0.708E-03   18   2   6    2   4   9   11  14   4    0.000    0.000       0
+  0     32 00:00:40.37   1.0200A   1.2445  -0.9219   1.7590  0.080  0.49  -0.457E+00     30.  0.306E+00  0.118E+00  0.465E-02  0.676E-03   18   2   6    2   4   9   11  14   5    0.000    0.000       0
+  0     33 00:00:41.39   1.0000A   1.2383  -0.9310   1.7984  0.080  0.49  -0.453E+00     30.  0.307E+00  0.120E+00  0.459E-02  0.643E-03   18   2   6    2   4   9   12  14   5    0.000    0.000       0
+  0     34 00:00:42.39   0.9950A   1.2248  -0.9394   1.8082  0.080  0.55  -0.451E+00     40.  0.307E+00  0.122E+00  0.453E-02  0.609E-03   18   2   6    2   4   9   13  14   5    0.000    0.000       0
+  0     35 00:00:43.39   0.9980A   1.2032  -0.9475   1.8041  0.080  0.56  -0.450E+00     40.  0.308E+00  0.125E+00  0.452E-02  0.581E-03   18   2   6    2   4   9   13  14   5    0.000    0.000       0
+  0     36 00:00:44.39   0.9900A   1.2052  -0.9556   1.8180  0.080  0.56  -0.450E+00     40.  0.308E+00  0.127E+00  0.454E-02  0.560E-03   11  11   3    2   4   9   14  14   5    0.000    0.000       0
+  0     37 00:00:45.38   0.9960A   1.2116  -0.9640   1.8066  0.080  0.56  -0.450E+00     40.  0.309E+00  0.129E+00  0.453E-02  0.535E-03   11  11   4    2   4   9   15  14   5    0.000    0.000       0
+  0     38 00:00:46.37   1.0000A   1.2209  -0.9735   1.7967  0.080  0.56  -0.452E+00     40.  0.310E+00  0.131E+00  0.458E-02  0.516E-03   11  11   4    2   4   9   14  13   6    0.000    0.000       0
+  0     39 00:00:47.37   0.9950A   1.2258  -0.9846   1.8086  0.080  0.00  -0.454E+00      0.  0.310E+00  0.134E+00  0.462E-02  0.498E-03   11  11   4    2   4   9   15  13   6    0.000    0.000       0
+  0     40 00:00:48.37   1.0100A   1.2268  -0.9977   1.7803  0.080  0.00  -0.457E+00      0.  0.311E+00  0.136E+00  0.462E-02  0.474E-03   11  11   5    2   4   9   15  13   6    0.000    0.000       0
+  0     41 00:00:49.38   0.9960A   1.2322  -1.0129   1.8073  0.080  0.00  -0.461E+00      0.  0.312E+00  0.138E+00  0.471E-02  0.457E-03   12  11   5    2   4   9   16  13   6    0.000    0.000       0
+  0     42 00:00:50.37   1.0000A   1.2400  -1.0295   1.7922  0.080  0.00  -0.464E+00      0.  0.313E+00  0.141E+00  0.468E-02  0.433E-03    9  12   0    2   4   9   16  13   7    0.000    0.000       0
+  0     43 00:00:51.37   0.9890A   1.2521  -1.0469   1.8195  0.080  0.00  -0.466E+00      0.  0.314E+00  0.143E+00  0.473E-02  0.415E-03    9  12   1    2   4   9   17  13   7    0.000    0.000       0
+  0     44 00:00:52.36   0.9760A   1.2736  -1.0640   1.8443  0.080  0.00  -0.469E+00      0.  0.315E+00  0.145E+00  0.473E-02  0.394E-03    9  12   1    2   4   9   12  14   6    0.000    0.000       0
+  0     45 00:00:53.34   0.9450A   1.2931  -1.0800   1.9044  0.080  0.00  -0.471E+00      0.  0.316E+00  0.148E+00  0.471E-02  0.374E-03    9  12   2    2   4   9   12  14   6    0.000    0.000       0
+  0     46 00:00:54.28   0.9310A   1.3097  -1.0985   1.9338  0.080  0.00  -0.473E+00      0.  0.317E+00  0.150E+00  0.464E-02  0.350E-03    9  12   2    1   4   9   13  14   6    0.000    0.000       0
+  0     47 00:00:55.22   0.9240A   1.3392  -1.1155   1.9490  0.080  0.00  -0.478E+00      0.  0.318E+00  0.152E+00  0.465E-02  0.333E-03   22  13  10    1   4   9   12  14   6    0.000    0.000       0
+  0     48 00:00:56.14   0.9120A   1.4107  -1.1305   1.9734  0.080  0.00  -0.487E+00      0.  0.318E+00  0.154E+00  0.471E-02  0.323E-03   22  13  10    1   4   9   11  14   6    0.000    0.000       0
+  0     49 00:00:57.05   0.9090A   1.4767  -1.1438   1.9801  0.080  0.00  -0.503E+00      0.  0.319E+00  0.156E+00  0.476E-02  0.316E-03   22  13  11    1   4   9   11  14   6    0.000    0.000       0
+  0     50 00:00:57.96   0.8970A   1.5351  -1.1556   2.0071  0.080  0.00  -0.528E+00      0.  0.320E+00  0.157E+00  0.486E-02  0.310E-03   22  13  11    1   4   9   13  14   7    0.000    0.000       0
+  0     51 00:00:58.86   0.8810A   1.5595  -1.1661   2.0428  0.080  0.00  -0.560E+00      0.  0.321E+00  0.159E+00  0.492E-02  0.304E-03   22  13  12    1   4   9   13  14   7    0.000    0.000       0
+  0     52 00:00:59.74   0.8730A   1.6094  -1.1754   2.0610  0.081  0.00  -0.656E+00      0.  0.321E+00  0.160E+00  0.496E-02  0.297E-03   22  13  12    1   4   9   13  14   7    0.000    0.000       0
+  0     53 00:01:00.61   0.8770A   1.5828  -1.1989   2.0515  0.081  0.00  -0.543E+00      0.  0.322E+00  0.162E+00  0.504E-02  0.294E-03   22  13  12   22  12   9   13  14   7    0.000    0.000       0
+  0     54 00:01:01.49   0.9010A   1.6302  -1.2169   1.9986  0.081  0.00  -0.534E+00      0.  0.322E+00  0.163E+00  0.516E-02  0.295E-03   22  13  13   22  12   9   13  14   7    0.000    0.000       0
+  0     55 00:01:02.39   0.8910A   1.6136  -1.2216   2.0192  0.081  0.00  -0.544E+00      0.  0.323E+00  0.164E+00  0.540E-02  0.305E-03   22  13  13   22  12   9   16  14   8    0.000    0.000       0
+  0     56 00:01:03.28   0.8880A   1.5998  -1.2697   2.0259  0.081  0.00  -0.557E+00      0.  0.323E+00  0.166E+00  0.544E-02  0.308E-03   22  12  14   22  11  10   16  14   8    0.000    0.000       0
+  0     57 00:01:04.17   0.9020A   1.6004  -1.3246   1.9952  0.082  0.00  -0.550E+00      0.  0.323E+00  0.167E+00  0.550E-02  0.316E-03   22  12  14   22  11  10   16  14   8    0.000    0.000       0
+  0     58 00:01:05.07   0.9230A   1.5472  -1.3623   1.9508  0.082  0.00  -0.526E+00      0.  0.323E+00  0.168E+00  0.564E-02  0.330E-03   22  12  15   22  11  10   17  14   8    0.000    0.000       0
+  0     59 00:01:05.99   0.9100A   1.5298  -1.3925   1.9777  0.082  0.00  -0.516E+00      0.  0.323E+00  0.169E+00  0.582E-02  0.348E-03   22  12  15   22  11  10   18  14   9    0.000    0.000       0
+  0     60 00:01:06.90   0.9190A   1.5183  -1.4203   1.9589  0.082  0.00  -0.513E+00      0.  0.323E+00  0.170E+00  0.579E-02  0.356E-03   11  12   8   22  11  10   18  14   9    0.000    0.000       0
+  0     61 00:01:07.82   0.9340A   1.5000  -1.4438   1.9279  0.083  0.00  -0.514E+00      0.  0.324E+00  0.171E+00  0.590E-02  0.371E-03   11  12   9   22  11  10   19  14   9    0.000    0.000       0
+  0     62 00:01:08.76   0.9610A   1.5125  -1.4584   1.8737  0.083  0.00  -0.516E+00      0.  0.323E+00  0.171E+00  0.605E-02  0.389E-03   11  12   9   22  11  10   19  14   9    0.000    0.000       0
+  0     63 00:01:09.72   0.9980A   1.4967  -1.4600   1.8035  0.084  0.00  -0.520E+00      0.  0.323E+00  0.172E+00  0.627E-02  0.410E-03   11  12   9   22  11  10   19  14   9    0.000    0.000       0
+  0     64 00:01:10.72   1.0400A   1.4784  -1.4473   1.7332  0.084  0.00  -0.526E+00      0.  0.323E+00  0.173E+00  0.657E-02  0.434E-03   12  12  10   22  11  10   19  14   9    0.000    0.000       0
Index: palm/trunk/TESTS/cases/urban_environment_salsa/case_config.yml
===================================================================
--- palm/trunk/TESTS/cases/urban_environment_salsa/case_config.yml	(revision 4012)
+++ palm/trunk/TESTS/cases/urban_environment_salsa/case_config.yml	(revision 4012)
@@ -0,0 +1,18 @@
+---
+# this is a palmtest job configuration file
+
+allowed_builds:
+  - gfortran_default
+  - intel_default
+
+allowed_number_of_cores:
+  - 2
+  - 4
+
+activation_strings:
+  - "d3#"
+
+significant_digits_for_netcdf_checks:
+  timeseries: 4
+  profiles: 3
+  other: 2
