Index: palm/trunk/SOURCE/check_for_restart.f90
===================================================================
--- palm/trunk/SOURCE/check_for_restart.f90	(revision 3044)
+++ palm/trunk/SOURCE/check_for_restart.f90	(revision 3045)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! Error messages revised
+! 
+! 2718 2018-01-02 08:49:38Z maronga
 ! Corrected "Former revisions" section
 ! 
@@ -141,5 +144,5 @@
     IF ( terminate_run  .AND.  myid == 0 )  THEN
        WRITE( message_string, * ) 'run will be terminated because it is ',     &
-                       'running out of job cpu limit & ',                      &
+                       'running out of job cpu limit, ',                       &
                        'remaining time:         ', remaining_time, ' s',       &
                        'termination time needed:', termination_time_needed, ' s'
@@ -184,6 +187,6 @@
                                   'forced a job finalization using a flag',    &
                                   'file:',                                     &
-                                  '&DO_STOP_NOW: ', do_stop_now,               &
-                                  '&DO_RESTART_NOW: ', do_restart_now 
+                                  ' DO_STOP_NOW: ', do_stop_now,               &
+                                  ' DO_RESTART_NOW: ', do_restart_now 
           CALL message( 'check_for_restart', 'PA0398', 0, 0, 0, 6, 0 )
 
@@ -247,7 +250,7 @@
 
           WRITE( message_string, * ) 'run will be terminated due to user ',    &
-                                  'settings of',                               &
-                                  '&restart_time / dt_restart',                &
-                                  '&new restart time is: ', time_restart, ' s' 
+                                  'settings of ',                              &
+                                  'restart_time / dt_restart, ',               &
+                                  'new restart time is: ', time_restart, ' s' 
           CALL message( 'check_for_restart', 'PA0164', 0, 0, 0, 6, 0 )
  
Index: palm/trunk/SOURCE/check_open.f90
===================================================================
--- palm/trunk/SOURCE/check_open.f90	(revision 3044)
+++ palm/trunk/SOURCE/check_open.f90	(revision 3045)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! Output case 108 disabled
+! 
+! 2964 2018-04-12 16:04:03Z Giersch
 ! Error message moved to radiation_model_mod
 ! 
@@ -971,65 +974,66 @@
           ENDIF
 
-
-       CASE ( 108 )
-
-          IF ( myid_char == '' )  THEN
-             filename = 'DATA_PRT_NETCDF' // TRIM( coupling_char )
-          ELSE
-             filename = 'DATA_PRT_NETCDF' // TRIM( coupling_char ) // '/' //   &
-                        myid_char
-          ENDIF
+!
+!--     Currently disabled
+!       CASE ( 108 )
+
+!          IF ( myid_char == '' )  THEN
+!             filename = 'DATA_PRT_NETCDF' // TRIM( coupling_char )
+!          ELSE
+!             filename = 'DATA_PRT_NETCDF' // TRIM( coupling_char ) // '/' //   &
+!                        myid_char
+!          ENDIF
 !
 !--       Inquire, if there is a netCDF file from a previuos run. This should
 !--       be opened for extension, if its variables match the actual run.
-          INQUIRE( FILE=filename, EXIST=netcdf_extend )
-
-          IF ( netcdf_extend )  THEN
+!          INQUIRE( FILE=filename, EXIST=netcdf_extend )
+
+!          IF ( netcdf_extend )  THEN
 !
 !--          Open an existing netCDF file for output
-             CALL netcdf_open_write_file( filename, id_set_prt, .FALSE., 41 )
+!             CALL netcdf_open_write_file( filename, id_set_prt, .FALSE., 41 )
 !
 !--          Read header information and set all ids. If there is a mismatch
 !--          between the previuos and the actual run, netcdf_extend is returned
 !--          as .FALSE.
-             CALL netcdf_define_header( 'pt', netcdf_extend, 0 )
+!             CALL netcdf_define_header( 'pt', netcdf_extend, 0 )
 
 !
 !--          Remove the local file, if it can not be extended
-             IF ( .NOT. netcdf_extend )  THEN
-                nc_stat = NF90_CLOSE( id_set_prt )
-                CALL netcdf_handle_error( 'check_open', 42 )
-                CALL local_system( 'rm ' // TRIM( filename ) )
-             ENDIF
-
-          ENDIF          
-
-          IF ( .NOT. netcdf_extend )  THEN
+!             IF ( .NOT. netcdf_extend )  THEN
+!                nc_stat = NF90_CLOSE( id_set_prt )
+!                CALL netcdf_handle_error( 'check_open', 42 )
+!                CALL local_system( 'rm ' // TRIM( filename ) )
+!             ENDIF
+
+!          ENDIF          
+
+!          IF ( .NOT. netcdf_extend )  THEN
 
 !
 !--          For runs on multiple processors create the subdirectory
-             IF ( myid_char /= '' )  THEN
-                IF ( myid == 0  .AND. .NOT. openfile(file_id)%opened_before )  &
-                THEN    ! needs modification in case of non-extendable sets
-                   CALL local_system( 'mkdir  DATA_PRT_NETCDF' //              &
-                                       TRIM( coupling_char ) // '/' )
-                ENDIF
+!             IF ( myid_char /= '' )  THEN
+!                IF ( myid == 0  .AND. .NOT. openfile(file_id)%opened_before )  &
+!                THEN    ! needs modification in case of non-extendable sets
+!                   CALL local_system( 'mkdir  DATA_PRT_NETCDF' //              &
+!                                       TRIM( coupling_char ) // '/' )
+!                ENDIF
 #if defined( __parallel )
 ! 
 !--             Set a barrier in order to allow that all other processors in the
 !--             directory created by PE0 can open their file
-                CALL MPI_BARRIER( comm2d, ierr )
+!                CALL MPI_BARRIER( comm2d, ierr )
 #endif
-             ENDIF
+!             ENDIF
 
 !
 !--          Create a new netCDF output file with requested netCDF format
-             CALL netcdf_create_file( filename, id_set_prt, .FALSE., 43 )
+!             CALL netcdf_create_file( filename, id_set_prt, .FALSE., 43 )
 
 !
 !--          Define the header
-             CALL netcdf_define_header( 'pt', netcdf_extend, 0 )
-
-          ENDIF
+!             CALL netcdf_define_header( 'pt', netcdf_extend, 0 )
+
+!          ENDIF
 
        CASE ( 109 )
Index: palm/trunk/SOURCE/check_parameters.f90
===================================================================
--- palm/trunk/SOURCE/check_parameters.f90	(revision 3044)
+++ palm/trunk/SOURCE/check_parameters.f90	(revision 3045)
@@ -25,9 +25,12 @@
 ! -----------------
 ! $Id$
+! Error messages revised
+! 
+! 3035 2018-05-24 09:35:20Z schwenkel
 ! Add option to initialize warm air bubble close to surface
-! 
+!
 ! 3034 2018-05-24 08:41:20Z raasch
 ! bugfix: check that initializing_actions has been set
-! 
+!
 ! 2980 2018-04-17 15:19:27Z suehring
 ! Further improvement for spinup checks.
@@ -751,9 +754,10 @@
 !
 !-- Check the coupling mode
-!> @todo Check if any queries for other coupling modes (e.g. precursor_ocean) are missing
-    IF ( coupling_mode /= 'uncoupled'            .AND.  &
-         coupling_mode /= 'vnested_crse'         .AND.  &
-         coupling_mode /= 'vnested_fine'         .AND.  &
-         coupling_mode /= 'atmosphere_to_ocean'  .AND.  &
+    IF ( coupling_mode /= 'uncoupled'            .AND.                         &
+         coupling_mode /= 'precursor_atmos'      .AND.                         &
+         coupling_mode /= 'precursor_ocean'      .AND.                         &
+         coupling_mode /= 'vnested_crse'         .AND.                         &
+         coupling_mode /= 'vnested_fine'         .AND.                         &
+         coupling_mode /= 'atmosphere_to_ocean'  .AND.                         &
          coupling_mode /= 'ocean_to_atmosphere' )  THEN
        message_string = 'illegal coupling mode: ' // TRIM( coupling_mode )
@@ -764,6 +768,6 @@
 !-- Check if humidity is set to TRUE in case of the atmospheric run (for coupled runs)
     IF ( coupling_mode == 'atmosphere_to_ocean' .AND. .NOT. humidity) THEN
-       message_string = ' Humidity has to be set to .T. in the _p3d file for ' //      &
-                        'coupled runs between ocean and atmosphere.'
+       message_string = ' Humidity has to be set to .T. in the _p3d file ' //  &
+                        'for coupled runs between ocean and atmosphere.'
        CALL message( 'check_parameters', 'PA0476', 1, 2, 0, 6, 0 )
     ENDIF
@@ -771,6 +775,8 @@
 !
 !-- Check dt_coupling, restart_time, dt_restart, end_time, dx, dy, nx and ny
-    IF ( coupling_mode /= 'uncoupled'  .AND.                                   &
-         coupling_mode(1:8) /= 'vnested_' )  THEN
+    IF ( coupling_mode /= 'uncoupled'       .AND.                              &
+         coupling_mode(1:8) /= 'vnested_'   .AND.                              &
+         coupling_mode /= 'precursor_atmos' .AND.                              &
+         coupling_mode /= 'precursor_ocean' )  THEN
 
        IF ( dt_coupling == 9999999.9_wp )  THEN
@@ -914,5 +920,5 @@
              WRITE( message_string, * ) 'coupling mode "',                     &
                    TRIM( coupling_mode ),                                      &
-             '": nx+1 in ocean is not divisible by nx+1 in', &
+             '": nx+1 in ocean is not divisible by nx+1 in',                   &
              ' atmosphere without remainder'
              CALL message( 'check_parameters', 'PA0339', 1, 2, 0, 6, 0 )
@@ -1054,7 +1060,7 @@
 !
 !-- Check approximation
-    IF ( TRIM( approximation ) /= 'boussinesq'   .AND.   &
+    IF ( TRIM( approximation ) /= 'boussinesq'   .AND.                         &
          TRIM( approximation ) /= 'anelastic' )  THEN
-       message_string = 'unknown approximation: approximation = "' //    &
+       message_string = 'unknown approximation: approximation = "' //          &
                         TRIM( approximation ) // '"'
        CALL message( 'check_parameters', 'PA0446', 1, 2, 0, 6, 0 )
@@ -1063,21 +1069,21 @@
 !
 !-- Check approximation requirements
-    IF ( TRIM( approximation ) == 'anelastic'   .AND.   &
+    IF ( TRIM( approximation ) == 'anelastic'   .AND.                          &
          TRIM( momentum_advec ) /= 'ws-scheme' )  THEN
-       message_string = 'Anelastic approximation requires: ' //                &
+       message_string = 'Anelastic approximation requires ' //                 &
                         'momentum_advec = "ws-scheme"'
        CALL message( 'check_parameters', 'PA0447', 1, 2, 0, 6, 0 )
     ENDIF
-    IF ( TRIM( approximation ) == 'anelastic'   .AND.   &
+    IF ( TRIM( approximation ) == 'anelastic'   .AND.                          &
          TRIM( psolver ) == 'multigrid' )  THEN
-       message_string = 'Anelastic approximation currently only supports: ' // &
-                        'psolver = "poisfft", ' // &
-                        'psolver = "sor" and ' // &
+       message_string = 'Anelastic approximation currently only supports ' //  &
+                        'psolver = "poisfft", ' //                             &
+                        'psolver = "sor" and ' //                              &
                         'psolver = "multigrid_noopt"'
        CALL message( 'check_parameters', 'PA0448', 1, 2, 0, 6, 0 )
     ENDIF
-    IF ( TRIM( approximation ) == 'anelastic'   .AND.   &
+    IF ( TRIM( approximation ) == 'anelastic'   .AND.                          &
          conserve_volume_flow )  THEN
-       message_string = 'Anelastic approximation is not allowed with:' //      &
+       message_string = 'Anelastic approximation is not allowed with ' //      &
                         'conserve_volume_flow = .TRUE.'
        CALL message( 'check_parameters', 'PA0449', 1, 2, 0, 6, 0 )
@@ -1086,6 +1092,6 @@
 !
 !-- Check flux input mode
-    IF ( TRIM( flux_input_mode ) /= 'dynamic'    .AND.   &
-         TRIM( flux_input_mode ) /= 'kinematic'  .AND.   &
+    IF ( TRIM( flux_input_mode ) /= 'dynamic'    .AND.                         &
+         TRIM( flux_input_mode ) /= 'kinematic'  .AND.                         &
          TRIM( flux_input_mode ) /= 'approximation-specific' )  THEN
        message_string = 'unknown flux input mode: flux_input_mode = "' //      &
@@ -1104,6 +1110,6 @@
 !
 !-- Check flux output mode
-    IF ( TRIM( flux_output_mode ) /= 'dynamic'    .AND.   &
-         TRIM( flux_output_mode ) /= 'kinematic'  .AND.   &
+    IF ( TRIM( flux_output_mode ) /= 'dynamic'    .AND.                        &
+         TRIM( flux_output_mode ) /= 'kinematic'  .AND.                        &
          TRIM( flux_output_mode ) /= 'approximation-specific' )  THEN
        message_string = 'unknown flux output mode: flux_output_mode = "' //    &
@@ -1248,5 +1254,7 @@
 !
 !-- Advection schemes:
-    IF ( momentum_advec /= 'pw-scheme'  .AND.  momentum_advec /= 'ws-scheme' ) &
+    IF ( momentum_advec /= 'pw-scheme'  .AND.                                  &  
+         momentum_advec /= 'ws-scheme'  .AND.                                  &
+         momentum_advec /= 'up-scheme' )                                       &
     THEN
        message_string = 'unknown advection scheme: momentum_advec = "' //      &
@@ -1259,10 +1267,10 @@
     THEN
        message_string = 'momentum_advec or scalar_advec = "'                   &
-         // TRIM( momentum_advec ) // '" is not allowed with timestep_scheme = "' // &
-         TRIM( timestep_scheme ) // '"'
+         // TRIM( momentum_advec ) // '" is not allowed with ' //              &
+         'timestep_scheme = "' // TRIM( timestep_scheme ) // '"'
        CALL message( 'check_parameters', 'PA0023', 1, 2, 0, 6, 0 )
     ENDIF
     IF ( scalar_advec /= 'pw-scheme'  .AND.  scalar_advec /= 'ws-scheme' .AND. &
-         scalar_advec /= 'bc-scheme' )                                         &
+         scalar_advec /= 'bc-scheme' .AND. scalar_advec /= 'up-scheme' )       &
     THEN
        message_string = 'unknown advection scheme: scalar_advec = "' //        &
@@ -1273,6 +1281,6 @@
     THEN
        message_string = 'advection_scheme scalar_advec = "'                    &
-         // TRIM( scalar_advec ) // '" not implemented for & loop_optimization = "' // &
-         TRIM( loop_optimization ) // '"'
+         // TRIM( scalar_advec ) // '" not implemented for ' //                &
+         'loop_optimization = "' // TRIM( loop_optimization ) // '"'
        CALL message( 'check_parameters', 'PA0026', 1, 2, 0, 6, 0 )
     ENDIF
@@ -1325,5 +1333,5 @@
 !-- Check for proper settings for microphysics
     IF ( cloud_physics  .AND.  cloud_droplets )  THEN
-       message_string = 'cloud_physics = .TRUE. is not allowed with ' //  &
+       message_string = 'cloud_physics = .TRUE. is not allowed with ' //       &
                         'cloud_droplets = .TRUE.'
        CALL message( 'check_parameters', 'PA0442', 1, 2, 0, 6, 0 )
@@ -1355,5 +1363,5 @@
     IF ( TRIM( initializing_actions ) == '' )  THEN
        message_string = 'no value specified for initializing_actions'
-       CALL message( 'check_parameters', 'PA0017', 1, 2, 0, 6, 0 )
+       CALL message( 'check_parameters', 'PA0149', 1, 2, 0, 6, 0 )
     ENDIF
 
@@ -1373,5 +1381,5 @@
 
              CASE DEFAULT
-                message_string = 'initializing_actions = "' //                 &
+                message_string = 'initializing_action = "' //                  &
                                  TRIM( action ) // '" unknown or not allowed'
                 CALL message( 'check_parameters', 'PA0030', 1, 2, 0, 6, 0 )
@@ -1472,14 +1480,4 @@
     IF ( large_scale_forcing  .OR.  nudging )  CALL lsf_nudging_check_parameters
 
-
-
-    IF ( .NOT. ( loop_optimization == 'cache'  .OR.                            &
-                 loop_optimization == 'vector' )                               &
-         .AND.  cloud_physics  .AND.  microphysics_seifert )  THEN
-       message_string = 'cloud_scheme = seifert_beheng requires ' //           &
-                        'loop_optimization = "cache" or "vector"'
-       CALL message( 'check_parameters', 'PA0362', 1, 2, 0, 6, 0 )
-    ENDIF
-
 !
 !-- In case of no model continuation run, check initialising parameters and
@@ -1825,5 +1823,5 @@
 !-- Check time step and cfl_factor
     IF ( dt /= -1.0_wp )  THEN
-       IF ( dt <= 0.0_wp  .AND.  dt /= -1.0_wp )  THEN
+       IF ( dt <= 0.0_wp )  THEN
           WRITE( message_string, * ) 'dt = ', dt , ' <= 0.0'
           CALL message( 'check_parameters', 'PA0044', 1, 2, 0, 6, 0 )
@@ -1844,5 +1842,5 @@
        ELSE
           WRITE( message_string, * ) 'cfl_factor = ', cfl_factor,              &
-                 ' out of range & 0.0 < cfl_factor <= 1.0 is required'
+                 ' out of range 0.0 < cfl_factor <= 1.0 is required'
           CALL message( 'check_parameters', 'PA0045', 1, 2, 0, 6, 0 )
        ENDIF
@@ -1887,6 +1885,6 @@
           CALL message( 'check_parameters', 'PA0047', 1, 2, 0, 6, 0 )
        ELSE
-          message_string = 'variable translation speed used for galilei-' //   &
-             'transformation, which may cause & instabilities in stably ' //   &
+          message_string = 'variable translation speed used for Galilei-' //   &
+             'transformation, which may cause instabilities in stably ' //     &
              'stratified regions'
           CALL message( 'check_parameters', 'PA0048', 0, 1, 0, 6, 0 )
@@ -2064,5 +2062,5 @@
          surface_heatflux /= 0.0_wp )  THEN
        message_string = 'boundary_condition: bc_pt_b = "' // TRIM( bc_pt_b ) //&
-                        '& is not allowed with constant_heatflux = .TRUE.'
+                        'is not allowed with constant_heatflux = .TRUE.'
        CALL message( 'check_parameters', 'PA0065', 1, 2, 0, 6, 0 )
     ENDIF
@@ -2154,7 +2152,7 @@
     IF ( passive_scalar )  THEN
 
-       IF ( ANY( wall_scalarflux /= 0.0_wp )  .AND.                        &
+       IF ( ANY( wall_scalarflux /= 0.0_wp )  .AND.                            &
             surface_scalarflux == 9999999.9_wp )  THEN
-          message_string = 'wall_scalarflux additionally requires ' //     &
+          message_string = 'wall_scalarflux additionally requires ' //         &
                            'setting of surface_scalarflux'
           CALL message( 'check_parameters', 'PA0445', 1, 2, 0, 6, 0 )
@@ -2326,5 +2324,6 @@
     IF ( averaging_interval > dt_data_output_av )  THEN
        WRITE( message_string, * )  'averaging_interval = ',                    &
-             averaging_interval, ' must be <= dt_data_output = ', dt_data_output
+             averaging_interval, ' must be <= dt_data_output_av = ',           &
+             dt_data_output_av
        CALL message( 'check_parameters', 'PA0085', 1, 2, 0, 6, 0 )
     ENDIF
@@ -2549,5 +2548,5 @@
           CASE ( 'sa', '#sa' )
              IF ( .NOT. ocean )  THEN
-                message_string = 'data_output_pr = ' // &
+                message_string = 'data_output_pr = ' //                        &
                                  TRIM( data_output_pr(i) ) // ' is not imp' // &
                                  'lemented for ocean = .FALSE.'
@@ -2622,5 +2621,5 @@
           CASE ( 'q', '#q' )
              IF ( .NOT. humidity )  THEN
-                message_string = 'data_output_pr = ' // &
+                message_string = 'data_output_pr = ' //                        &
                                  TRIM( data_output_pr(i) ) // ' is not imp' // &
                                  'lemented for humidity = .FALSE.'
@@ -2807,5 +2806,5 @@
                 message_string = 'data_output_pr = ' //                        &
                                  TRIM( data_output_pr(i) ) // ' is not imp' // &
-                                 'lemented for cloud_physics = .FALSE. an&' // &
+                                 'lemented for cloud_physics = .FALSE. an'  // &
                                  'd humidity = .FALSE.'
                 CALL message( 'check_parameters', 'PA0095', 1, 2, 0, 6, 0 )
@@ -2825,5 +2824,5 @@
                 message_string = 'data_output_pr = ' //                        &
                                  TRIM( data_output_pr(i) ) // ' is not imp' // &
-                                 'lemented for cloud_physics = .FALSE. an&' // &
+                                 'lemented for cloud_physics = .FALSE. an'  // &
                                  'd humidity = .FALSE.'
                 CALL message( 'check_parameters', 'PA0095', 1, 2, 0, 6, 0 )
@@ -2842,5 +2841,5 @@
                 message_string = 'data_output_pr = ' //                        &
                                  TRIM( data_output_pr(i) ) // ' is not imp' // &
-                                 'lemented for cloud_physics = .FALSE. an&' // &
+                                 'lemented for cloud_physics = .FALSE. an'  // &
                                  'd humidity = .FALSE.'
                 CALL message( 'check_parameters', 'PA0095', 1, 2, 0, 6, 0 )
@@ -2851,6 +2850,6 @@
                 message_string = 'data_output_pr = ' //                        &
                                  TRIM( data_output_pr(i) ) // ' is not imp' // &
-                                 'lemented for cloud_physics = .FALSE. or'  // &
-                                 '&cloud_droplets = .FALSE.'
+                                 'lemented for cloud_physics = .FALSE. and' // &
+                                 'cloud_droplets = .FALSE.'
                 CALL message( 'check_parameters', 'PA0096', 1, 2, 0, 6, 0 )
              ELSE
@@ -3249,5 +3248,5 @@
              ELSEIF ( .NOT.  microphysics_morrison )  THEN
                 message_string = 'output of "' // TRIM( var ) // '" requi' //  &
-                         'res = microphysics morrison '
+                         'res = morrison '
                 CALL message( 'check_parameters', 'PA0359', 1, 2, 0, 6, 0 )
              ENDIF
@@ -3269,5 +3268,6 @@
              IF (  .NOT.  particle_advection )  THEN
                 message_string = 'output of "' // TRIM( var ) // '" requir' // &
-                   'es a "particle_parameters"-NAMELIST in the parameter file (PARIN)'
+                   'es a "particle_parameters"-NAMELIST in the parameter ' //  &
+                   'file (PARIN)'
                 CALL message( 'check_parameters', 'PA0104', 1, 2, 0, 6, 0 )
              ENDIF
@@ -3281,5 +3281,5 @@
                 CALL message( 'check_parameters', 'PA0108', 1, 2, 0, 6, 0 )
              ELSEIF ( microphysics_sat_adjust )  THEN
-                message_string = 'output of "' // TRIM( var ) // '" is ' //  &
+                message_string = 'output of "' // TRIM( var ) // '" is ' //    &
                          'not available for cloud_scheme = saturation_adjust'
                 CALL message( 'check_parameters', 'PA0423', 1, 2, 0, 6, 0 )
@@ -3378,5 +3378,5 @@
              IF ( k == 0  .OR.  data_output(i)(ilen-2:ilen) /= '_xy' )  THEN
                 message_string = 'illegal value for data_output: "' //         &
-                                 TRIM( var ) // '" & only 2d-horizontal ' //   &
+                                 TRIM( var ) // '" only 2d-horizontal ' //     &
                                  'cross sections are allowed for this value'
                 CALL message( 'check_parameters', 'PA0111', 1, 2, 0, 6, 0 )
@@ -3411,9 +3411,9 @@
              ENDIF
 
-          IF ( TRIM( var ) == 'ghf*'  .AND.  .NOT.  land_surface )  THEN
-             message_string = 'output of "' // TRIM( var ) // '" requi' //     &
-                              'res land_surface = .TRUE.'
-             CALL message( 'check_parameters', 'PA0404', 1, 2, 0, 6, 0 )
-          ENDIF
+             IF ( TRIM( var ) == 'ghf*'  .AND.  .NOT.  land_surface )  THEN
+                message_string = 'output of "' // TRIM( var ) // '" requi' //  &
+                                 'res land_surface = .TRUE.'
+                CALL message( 'check_parameters', 'PA0404', 1, 2, 0, 6, 0 )
+             ENDIF
 
              IF ( ( TRIM( var ) == 'r_a*' .OR.  TRIM( var ) == 'ghf*' )        &
@@ -3558,5 +3558,5 @@
        WRITE( message_string, * )  'output of averaged quantity "',            &
                                    TRIM( doav(1) ), '_av" requires to set a ', &
-                                   'non-zero & averaging interval'
+                                   'non-zero averaging interval'
        CALL message( 'check_parameters', 'PA0323', 1, 2, 0, 6, 0 )
     ENDIF
@@ -3579,14 +3579,4 @@
     section(:,2) = section_xz
     section(:,3) = section_yz
-
-!
-!-- Upper plot limit for 2D vertical sections
-    IF ( z_max_do2d == -1.0_wp )  z_max_do2d = zu(nzt)
-    IF ( z_max_do2d < zu(nzb+1)  .OR.  z_max_do2d > zu(nzt) )  THEN
-       WRITE( message_string, * )  'z_max_do2d = ', z_max_do2d,                &
-                    ' must be >= ', zu(nzb+1), '(zu(nzb+1)) and <= ', zu(nzt), &
-                    ' (zu(nzt))'
-       CALL message( 'check_parameters', 'PA0116', 1, 2, 0, 6, 0 )
-    ENDIF
 
 !
@@ -3647,6 +3637,6 @@
                            '5 (parallel netCDF 4) and ' //                     &
                            '6 (parallel netCDF 4 Classic model) '//            &
-                           '&are currently not supported (not yet tested) ' // &
-                           'for masked data.&Using respective non-parallel' // &
+                           ' are currently not supported (not yet tested) ' // &
+                           'for masked data. Using respective non-parallel' // &
                            ' output for masked data.'
           CALL message( 'check_parameters', 'PA0383', 0, 0, 0, 6, 0 )
@@ -3663,5 +3653,5 @@
 #else
        message_string = 'netCDF: netCDF4 format requested but no ' //          &
-                        'cpp-directive __netcdf4 given & switch '  //          &
+                        'cpp-directive __netcdf4 given  switch '  //           &
                         'back to 64-bit offset format'
        CALL message( 'check_parameters', 'PA0171', 0, 1, 0, 6, 0 )
@@ -3674,5 +3664,5 @@
 #else
        message_string = 'netCDF: netCDF4 parallel output requested but no ' // &
-                        'cpp-directive __netcdf4_parallel given & switch '  // &
+                        'cpp-directive __netcdf4_parallel given, switch '   // &
                         'back to netCDF4 non-parallel output'
        CALL message( 'check_parameters', 'PA0099', 0, 1, 0, 6, 0 )
@@ -3865,6 +3855,6 @@
     IF ( disturbance_level_ind_t < disturbance_level_ind_b )  THEN
        WRITE( message_string, * )  'disturbance_level_ind_t = ',               &
-                disturbance_level_ind_t, ' must be >= disturbance_level_ind_b = ', &
-                disturbance_level_ind_b
+                disturbance_level_ind_t, ' must be >= ',                       &
+                'disturbance_level_ind_b = ', disturbance_level_ind_b
        CALL message( 'check_parameters', 'PA0130', 1, 2, 0, 6, 0 )
     ENDIF
@@ -3984,6 +3974,6 @@
     IF ( turbulent_inflow )  THEN
        IF ( recycling_width <= dx  .OR.  recycling_width >= nx * dx )  THEN
-          WRITE( message_string, * )  'illegal value for recycling_width:', &
-                                      ' ', recycling_width
+          WRITE( message_string, * )  'illegal value for recycling_width: ',   &
+                                      recycling_width
           CALL message( 'check_parameters', 'PA0134', 1, 2, 0, 6, 0 )
        ENDIF
@@ -4087,10 +4077,10 @@
        IF ( dp_level_b < zu(nzb)  .OR.  dp_level_b > zu(nzt) )  THEN
           WRITE( message_string, * )  'dp_level_b = ', dp_level_b, ' is out ', &
-               ' of range'
+               ' of range [zu(nzb), zu(nzt)]'
           CALL message( 'check_parameters', 'PA0151', 1, 2, 0, 6, 0 )
        ENDIF
        IF ( .NOT. ANY( dpdxy /= 0.0_wp ) )  THEN
           WRITE( message_string, * )  'dp_external is .TRUE. but dpdxy is ze', &
-               'ro, i.e. the external pressure gradient & will not be applied'
+               'ro, i.e. the external pressure gradient will not be applied'
           CALL message( 'check_parameters', 'PA0152', 0, 1, 0, 6, 0 )
        ENDIF
@@ -4147,5 +4137,5 @@
        IF ( particle_dvrpsize /= 'absw' )  THEN
           message_string = 'illegal value for parameter particle_dvrpsize:' // &
-                           ' ' // TRIM( particle_color)
+                           ' ' // TRIM( particle_dvrpsize)
           CALL message( 'check_parameters', 'PA0314', 1, 2, 0, 6, 0 )
        ELSE
@@ -4183,5 +4173,5 @@
 !-- Check roughness length, which has to be smaller than dz/2
     IF ( ( constant_flux_layer .OR.  &
-           INDEX( initializing_actions, 'set_1d-model_profiles' ) /= 0 ) &
+           INDEX( initializing_actions, 'set_1d-model_profiles' ) /= 0 )       &
          .AND. roughness_length >= 0.5 * dz )  THEN
        message_string = 'roughness_length must be smaller than dz/2'
@@ -4237,7 +4227,7 @@
           IF ( dt_fixed )  THEN
              WRITE( message_string, '(A,F9.4,A)' )  'Output at every '  //     &
-                    'timestep is wanted (' // dt_do_name // ' = 0.0).&'//      &
-                    'Setting the output interval to the fixed timestep '//     &
-                    'dt = ', dt, 's.'
+                    'timestep is wanted (' // dt_do_name // ' = 0.0). '//      &
+                    'The output interval is set to the fixed timestep dt '//   &
+                    '= ', dt, 's.'
              CALL message( 'check_parameters', 'PA0060', 0, 0, 0, 6, 0 )
              dt_do = dt
Index: palm/trunk/SOURCE/chemistry_model_mod.f90
===================================================================
--- palm/trunk/SOURCE/chemistry_model_mod.f90	(revision 3044)
+++ palm/trunk/SOURCE/chemistry_model_mod.f90	(revision 3045)
@@ -27,4 +27,7 @@
 ! -----------------
 ! $Id$
+! error messages revised
+! 
+! 3014 2018-05-09 08:42:38Z maronga
 ! Bugfix: nzb_do and nzt_do were not used for 3d data output
 ! 
@@ -1134,5 +1137,5 @@
                  TRIM( data_output_pr(var_count) ) // ' is not imp' // &
                           'lemented for air_chemistry = .FALSE.'
-!                CALL message( 'check_parameters', 'PA0185', 1, 2, 0, 6, 0 )
+!                CALL message( 'check_parameters', 'PA0XXX', 1, 2, 0, 6, 0 )
           ELSE
              DO lsp = 1, nspec
Index: palm/trunk/SOURCE/close_file.f90
===================================================================
--- palm/trunk/SOURCE/close_file.f90	(revision 3044)
+++ palm/trunk/SOURCE/close_file.f90	(revision 3045)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! z_max_do2d removed and output case 108 disabled
+! 
+! 2718 2018-01-02 08:49:38Z maronga
 ! Corrected "Former revisions" section
 ! 
@@ -88,6 +91,5 @@
 
     USE control_parameters,                                                    &
-        ONLY:  max_masks, mid, nz_do3d, openfile, run_description_header,      &
-               z_max_do2d
+        ONLY:  max_masks, mid, nz_do3d, openfile, run_description_header
                 
     USE grid_variables,                                                        &
@@ -205,8 +207,10 @@
                 ENDIF
 
-             CASE ( 108 )
-
-                nc_stat = NF90_CLOSE( id_set_prt )
-                CALL netcdf_handle_error( 'close_file', 51 )
+!
+!--           Currently disabled
+!             CASE ( 108 )
+
+!                nc_stat = NF90_CLOSE( id_set_prt )
+!                CALL netcdf_handle_error( 'close_file', 51 )
 
              CASE ( 109 ) 
Index: palm/trunk/SOURCE/cpulog_mod.f90
===================================================================
--- palm/trunk/SOURCE/cpulog_mod.f90	(revision 3044)
+++ palm/trunk/SOURCE/cpulog_mod.f90	(revision 3045)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! Error messages revised
+! 
+! 3028 2018-05-23 10:27:23Z knoop
 ! renamed d3par to runtime_parameters
 ! 
@@ -222,6 +225,6 @@
           log_event%place = place
        ELSEIF ( log_event%place /= place )  THEN
-          WRITE( message_string, * ) 'wrong argument & expected: ',            &
-                            TRIM(log_event%place), '  given: ',  TRIM( place )
+          WRITE( message_string, * ) 'wrong argument expected: ',              &
+                            TRIM(log_event%place), ' given: ',  TRIM( place )
           CALL message( 'cpu_log', 'PA0174', 1, 2, 0, 6, 0 )
        ENDIF
@@ -259,5 +262,5 @@
           IF ( ( mtime - log_event%mtime ) < 0.0  .AND.  first )  THEN
              WRITE( message_string, * ) 'negative time interval occured',      &
-                         ' &PE',myid,' L=PAUSE "',TRIM(log_event%place),       &
+                         ' PE',myid,' L=PAUSE "',TRIM(log_event%place),        &
                          '" new=', mtime,' last=',log_event%mtime
              CALL message( 'cpu_log', 'PA0176', 0, 1, -1, 6, 0 )
@@ -270,5 +273,5 @@
                first )  THEN
              WRITE( message_string, * ) 'negative time interval occured',      &
-                       ' &PE',myid,' L=STOP "',TRIM(log_event%place),'" new=', &
+                       ' PE',myid,' L=STOP "',TRIM(log_event%place),'" new=',  &
                        mtime,' last=',log_event%mtime,' isum=',log_event%isum
              CALL message( 'cpu_log', 'PA0177', 0, 1, -1, 6, 0 )
@@ -280,5 +283,5 @@
           IF ( log_event%sum < 0.0  .AND.  first )  THEN
              WRITE( message_string, * ) 'negative time interval occured',      &
-                       ' &PE',myid,' L=STOP "',TRIM(log_event%place),'" sum=', &
+                       ' PE',myid,' L=STOP "',TRIM(log_event%place),'" sum=',  &
                        log_event%sum,' mtime=',log_event%mtime
              CALL message( 'cpu_log', 'PA0178', 0, 1, -1, 6, 0 )
Index: palm/trunk/SOURCE/data_output_2d.f90
===================================================================
--- palm/trunk/SOURCE/data_output_2d.f90	(revision 3044)
+++ palm/trunk/SOURCE/data_output_2d.f90	(revision 3045)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! Error messages revised
+! 
+! 3014 2018-05-09 08:42:38Z maronga
 ! Added nzb_do and nzt_do for some modules for 2d output
 ! 
@@ -462,5 +465,5 @@
             ntdim_2d_xy(av) )  THEN
           WRITE ( message_string, * ) 'Output of xy cross-sections is not ',   &
-                          'given at t=', simulated_time, '&because the',       & 
+                          'given at t=', simulated_time, ' because the',       & 
                           ' maximum number of output time levels is exceeded.'
           CALL message( 'data_output_2d', 'PA0384', 0, 1, 0, 6, 0 )
@@ -471,5 +474,5 @@
             ntdim_2d_xz(av) )  THEN
           WRITE ( message_string, * ) 'Output of xz cross-sections is not ',   &
-                          'given at t=', simulated_time, '&because the',       & 
+                          'given at t=', simulated_time, ' because the',       & 
                           ' maximum number of output time levels is exceeded.'
           CALL message( 'data_output_2d', 'PA0385', 0, 1, 0, 6, 0 )
@@ -480,5 +483,5 @@
             ntdim_2d_yz(av) )  THEN
           WRITE ( message_string, * ) 'Output of yz cross-sections is not ',   &
-                          'given at t=', simulated_time, '&because the',       & 
+                          'given at t=', simulated_time, ' because the',       & 
                           ' maximum number of output time levels is exceeded.'
           CALL message( 'data_output_2d', 'PA0386', 0, 1, 0, 6, 0 )
Index: palm/trunk/SOURCE/data_output_3d.f90
===================================================================
--- palm/trunk/SOURCE/data_output_3d.f90	(revision 3044)
+++ palm/trunk/SOURCE/data_output_3d.f90	(revision 3045)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! Error message revised
+! 
+! 3014 2018-05-09 08:42:38Z maronga
 ! Added nzb_do and nzt_do for some modules for 3d output
 ! 
@@ -309,5 +312,5 @@
        IF ( do3d_time_count(av) + 1 > ntdim_3d(av) )  THEN
           WRITE ( message_string, * ) 'Output of 3d data is not given at t=',  &
-                                      simulated_time, '&because the maximum ', & 
+                                      simulated_time, ' because the maximum ', & 
                                       'number of output time levels is ',      &
                                       'exceeded.'
Index: palm/trunk/SOURCE/data_output_dvrp.f90
===================================================================
--- palm/trunk/SOURCE/data_output_dvrp.f90	(revision 3044)
+++ palm/trunk/SOURCE/data_output_dvrp.f90	(revision 3045)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! Code adjusted according to PALM coding standards
+! 
+! 2718 2018-01-02 08:49:38Z maronga
 ! Corrected "Former revisions" section
 ! 
@@ -255,5 +258,5 @@
 !--    Select the plot mode (in case of isosurface or slicer only if user has
 !--    defined a variable which shall be plotted; otherwise do nothing)
-       IF ( ( mode_dvrp(m)(1:10) == 'isosurface'  .OR.                     &
+       IF ( ( mode_dvrp(m)(1:10) == 'isosurface'  .OR.                         &
                   mode_dvrp(m)(1:6)  == 'slicer'           )                   &
                   .AND.  output_variable /= ' ' )  THEN
@@ -362,5 +365,5 @@
                    ELSE                    
                       message_string = 'if humidity = '    //                  & 
-                            '.FALSE. output of ' // TRIM( output_variable ) //   &
+                            '.FALSE. output of ' // TRIM( output_variable ) // &
                             'is not provided' 
                       CALL message( 'data_output_dvrp', 'PA0183',&
@@ -378,5 +381,5 @@
                       ENDDO
                    ELSE                     
-                      message_string = 'if cloud_physics = .FALSE. and '       //    & 
+                      message_string = 'if cloud_physics = .FALSE. and ' //    & 
                                   'cloud_droplets = .FALSE. '
                                   'output of ' // TRIM( output_variable) //    &
@@ -561,5 +564,5 @@
           CALL cpu_log( log_point_s(31), 'dvrp_pathlines', 'start' )
 
-          CALL DVRP_DATA( m-1, local_pfi, 4, nx_dvrp, ny_dvrp, nz_dvrp, &
+          CALL DVRP_DATA( m-1, local_pfi, 4, nx_dvrp, ny_dvrp, nz_dvrp,        &
                           cyclic_dvrp, cyclic_dvrp, cyclic_dvrp )
           CALL DVRP_VISUALIZE( m-1, 20, dvrp_filecount )
Index: palm/trunk/SOURCE/data_output_mask.f90
===================================================================
--- palm/trunk/SOURCE/data_output_mask.f90	(revision 3044)
+++ palm/trunk/SOURCE/data_output_mask.f90	(revision 3045)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! Error messages revised
+! 
+! 3030 2018-05-23 14:37:00Z raasch
 ! variable if renamed ivar
 ! 
@@ -528,5 +531,5 @@
 
              IF ( .NOT. found )  THEN
-                WRITE ( message_string, * ) 'no output available for: ', &
+                WRITE ( message_string, * ) 'no masked output available for: ',&
                                             TRIM( domask(mid,av,ivar) )
                 CALL message( 'data_output_mask', 'PA0327', 0, 0, 0, 6, 0 )
Index: palm/trunk/SOURCE/fft_xy_mod.f90
===================================================================
--- palm/trunk/SOURCE/fft_xy_mod.f90	(revision 3044)
+++ palm/trunk/SOURCE/fft_xy_mod.f90	(revision 3045)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! Error messages revised
+! 
+! 2718 2018-01-02 08:49:38Z maronga
 ! Corrected "Former revisions" section
 ! 
@@ -723,14 +726,5 @@
           ENDIF
 
-#else
-          message_string = 'no system-specific fft-call available'
-          CALL message( 'fft_x', 'PA0188', 1, 2, 0, 6, 0 )
-#endif
-
-       ELSE
-
-          message_string = 'fft method "' // TRIM( fft_method) // &
-                           '" not available'
-          CALL message( 'fft_x', 'PA0189', 1, 2, 0, 6, 0 )
+#endif
 
        ENDIF
@@ -945,12 +939,5 @@
 
           ENDIF
-#else
-          message_string = 'no system-specific fft-call available'
-          CALL message( 'fft_x_1d', 'PA0188', 1, 2, 0, 6, 0 )
-#endif
-       ELSE
-          message_string = 'fft method "' // TRIM( fft_method) // &
-                           '" not available'
-          CALL message( 'fft_x_1d', 'PA0189', 1, 2, 0, 6, 0 )
+#endif
 
        ENDIF
@@ -1288,14 +1275,5 @@
 
           ENDIF
-#else
-          message_string = 'no system-specific fft-call available'
-          CALL message( 'fft_y', 'PA0188', 1, 2, 0, 6, 0 ) 
-#endif
-
-       ELSE
-
-          message_string = 'fft method "' // TRIM( fft_method) // &
-                           '" not available'
-          CALL message( 'fft_y', 'PA0189', 1, 2, 0, 6, 0 )
+#endif
 
        ENDIF
@@ -1512,15 +1490,5 @@
 
           ENDIF
-#else
-          message_string = 'no system-specific fft-call available'
-          CALL message( 'fft_y_1d', 'PA0188', 1, 2, 0, 6, 0 ) 
-
-#endif
-
-       ELSE
-
-          message_string = 'fft method "' // TRIM( fft_method) // &
-                           '" not available'
-          CALL message( 'fft_y_1d', 'PA0189', 1, 2, 0, 6, 0 )
+#endif
 
        ENDIF
@@ -1653,14 +1621,5 @@
 
           DEALLOCATE( work )
-#else
-          message_string = 'no system-specific fft-call available'
-          CALL message( 'fft_x_m', 'PA0188', 1, 2, 0, 6, 0 ) 
-#endif
-
-       ELSE
-
-          message_string = 'fft method "' // TRIM( fft_method) // &
-                           '" not available'
-          CALL message( 'fft_x_m', 'PA0189', 1, 2, 0, 6, 0 )
+#endif
 
        ENDIF
@@ -1795,14 +1754,5 @@
 
           DEALLOCATE( work )
-#else
-          message_string = 'no system-specific fft-call available'
-          CALL message( 'fft_y_m', 'PA0188', 1, 2, 0, 6, 0 ) 
-#endif
-
-       ELSE
-         
-          message_string = 'fft method "' // TRIM( fft_method) // &
-                           '" not available'
-          CALL message( 'fft_y_m', 'PA0189', 1, 2, 0, 6, 0 )
+#endif
 
        ENDIF
Index: palm/trunk/SOURCE/header.f90
===================================================================
--- palm/trunk/SOURCE/header.f90	(revision 3044)
+++ palm/trunk/SOURCE/header.f90	(revision 3045)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! Error messages revised
+! 
+! 2967 2018-04-13 11:22:08Z raasch
 ! bugfix: missing parallel cpp-directives added
 ! 
@@ -550,4 +553,8 @@
     ELSEIF ( INDEX( initializing_actions, 'by_user' ) /=0 )  THEN
        run_classification = 'run initialized by user'
+    ELSEIF ( INDEX( initializing_actions, 'initialize_vortex' ) /=0 )  THEN
+       run_classification = 'run additionally initialized by a Rankine-vortex'
+    ELSEIF ( INDEX( initializing_actions, 'initialize_ptanom' ) /=0 )  THEN
+       run_classification = 'run additionally initialized by temperature anomaly'
     ELSE
        message_string = ' unknown action(s): ' // TRIM( initializing_actions )
Index: palm/trunk/SOURCE/init_3d_model.f90
===================================================================
--- palm/trunk/SOURCE/init_3d_model.f90	(revision 3044)
+++ palm/trunk/SOURCE/init_3d_model.f90	(revision 3045)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! Error messages revised
+! 
+! 3042 2018-05-25 10:44:37Z schwenkel
 ! Changed the name specific humidity to mixing ratio
 ! 
@@ -2611,5 +2614,5 @@
        WRITE( message_string, * ) 'number of time series quantities exceeds',  &
                                   ' its maximum of dots_max = ', dots_max,     &
-                                  ' &Please increase dots_max in modules.f90.'
+                                  ' Please increase dots_max in modules.f90.'
        CALL message( 'init_3d_model', 'PA0194', 1, 2, 0, 6, 0 )    
     ENDIF
Index: palm/trunk/SOURCE/init_grid.f90
===================================================================
--- palm/trunk/SOURCE/init_grid.f90	(revision 3044)
+++ palm/trunk/SOURCE/init_grid.f90	(revision 3045)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! Error messages revised
+! 
+! 2968 2018-04-13 11:52:24Z suehring
 ! Bugfix in initialization in case of elevated model surface. Introduce
 ! index for minimum topography-top. 
@@ -651,7 +654,7 @@
        IF ( nzb_local_min < 0  .OR.  nzb_local_max  > nz + 1 )  THEN
           WRITE( message_string, * ) 'nzb_local values are outside the',       &
-                                'model domain',                                &
-                                '&MINVAL( nzb_local ) = ', nzb_local_min,      &
-                                '&MAXVAL( nzb_local ) = ', nzb_local_max
+                                ' model domain',                               &
+                                ' MINVAL( nzb_local ) = ', nzb_local_min,      &
+                                ' MAXVAL( nzb_local ) = ', nzb_local_max
           CALL message( 'init_grid', 'PA0210', 1, 2, 0, 6, 0 )
        ENDIF
@@ -1497,5 +1500,5 @@
                ( bys < 1 ) .OR. ( byn > ny-1 ) .OR. ( byn < bys+3 ) )  THEN
              WRITE( message_string, * ) 'inconsistent building parameters:',   &
-                                      '& bxl=', bxl, 'bxr=', bxr, 'bys=', bys, &
+                                      ' bxl=', bxl, 'bxr=', bxr, 'bys=', bys,  &
                                       'byn=', byn, 'nx=', nx, 'ny=', ny
              CALL message( 'init_grid', 'PA0203', 1, 2, 0, 6, 0 )
@@ -1589,7 +1592,7 @@
                   ( ch < 3 ) )  THEN
                 WRITE( message_string, * ) 'inconsistent canyon parameters:',  &
-                                           '&cxl=', cxl, 'cxr=', cxr,          &
-                                           'cwx=', cwx,                        &
-                                           'ch=', ch, 'nx=', nx, 'ny=', ny
+                                           ' cxl=', cxl, ' cxr=', cxr,         &
+                                           ' cwx=', cwx,                       &
+                                           ' ch=', ch, ' nx=', nx, ' ny=', ny
                 CALL message( 'init_grid', 'PA0205', 1, 2, 0, 6, 0 ) 
              ENDIF
@@ -1598,7 +1601,7 @@
                   ( ch < 3 ) )  THEN
                 WRITE( message_string, * ) 'inconsistent canyon parameters:',  &
-                                           '&cys=', cys, 'cyn=', cyn,          &
-                                           'cwy=', cwy,                        &
-                                           'ch=', ch, 'nx=', nx, 'ny=', ny
+                                           ' cys=', cys, ' cyn=', cyn,         &
+                                           ' cwy=', cwy,                       &
+                                           ' ch=', ch, ' nx=', nx, ' ny=', ny
                 CALL message( 'init_grid', 'PA0206', 1, 2, 0, 6, 0 ) 
              ENDIF
@@ -1607,6 +1610,6 @@
                canyon_width_y /= 9999999.9_wp )  THEN
              message_string = 'inconsistent canyon parameters:' //             &   
-                              '&street canyon can only be oriented' //         &
-                              '&either in x- or in y-direction'
+                              ' street canyon can only be oriented' //         &
+                              ' either in x- or in y-direction'
              CALL message( 'init_grid', 'PA0207', 1, 2, 0, 6, 0 )
           ENDIF
@@ -1895,12 +1898,13 @@
                TRIM( topography ) /= 'read_from_file')  THEN
 !--          The default value is not applicable here, because it is only valid
-!--          for the two standard cases 'single_building' and 'read_from_file'
+!--          for the four standard cases 'single_building', 
+!--          'single_street_canyon', 'tunnel' and 'read_from_file'
 !--          defined in init_grid.
              WRITE( message_string, * )                                        &
                'The value for "topography_grid_convention" ',                  &
-               'is not set. Its default value is & only valid for ',           &
-               '"topography" = ''single_building'', ',                         &
-               '''single_street_canyon'' & or ''read_from_file''.',            &
-               ' & Choose ''cell_edge'' or ''cell_center''.'
+               'is not set. Its default value is only valid for ',             &
+               '"topography" = ''single_building'', ''tunnel'' ',              &
+               '''single_street_canyon'' or ''read_from_file''.',              &
+               ' Choose ''cell_edge'' or ''cell_center''.'
              CALL message( 'init_grid', 'PA0239', 1, 2, 0, 6, 0 )
           ELSE
@@ -1919,5 +1923,5 @@
           WRITE( message_string, * )                                           &
             'The value for "topography_grid_convention" is ',                  &
-            'not recognized. & Choose ''cell_edge'' or ''cell_center''.'
+            'not recognized. Choose ''cell_edge'' or ''cell_center''.'
           CALL message( 'init_grid', 'PA0240', 1, 2, 0, 6, 0 )
        ENDIF
Index: palm/trunk/SOURCE/init_masks.f90
===================================================================
--- palm/trunk/SOURCE/init_masks.f90	(revision 3044)
+++ palm/trunk/SOURCE/init_masks.f90	(revision 3045)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! Error messages revised
+! 
+! 2718 2018-01-02 08:49:38Z maronga
 ! Corrected "Former revisions" section
 ! 
@@ -192,9 +195,11 @@
     
 !
-!-- Parallel mask output not yet tested
+!-- Parallel mask output not yet supported. In check_parameters data format 
+!-- is restricted and is switched back to non-parallel output. Therefore the
+!-- following error can not occur at the moment.
     IF ( netcdf_data_format > 4 )  THEN
-       message_string = 'netCDF file formats '//                         &
-                        '3 (netCDF 4) and 4 (netCDF 4 Classic model)'//  &
-                        '&are currently not supported (not yet tested).'
+       message_string = 'netCDF file formats '//                               &
+                        '5 and 6 (with parallel I/O support)'//                &
+                        ' are currently not supported.'
        CALL message( 'init_masks', 'PA0328', 1, 2, 0, 6, 0 )
     ENDIF
@@ -258,6 +263,6 @@
           DO  WHILE ( do_mask_user(mid,j) /= ' '  .AND.  j <= 100 )
              IF ( i > 100 )  THEN
-                WRITE ( message_string, * ) 'number of output quantitities ', &
-                     'given by data_output_mask and data_output_mask_user ', &
+                WRITE ( message_string, * ) 'number of output quantitities ',  &
+                     'given by data_output_mask and data_output_mask_user ',   &
                      'exceeds the limit of 100'
                 CALL message( 'init_masks', 'PA0329', 1, 2, 0, 6, 0 )
@@ -290,5 +295,5 @@
              CASE ( 'e' )
                 IF ( constant_diffusion )  THEN
-                   WRITE ( message_string, * ) 'output of "', TRIM( var ), &
+                   WRITE ( message_string, * ) 'output of "', TRIM( var ),     &
                         '" requires constant_diffusion = .FALSE.'
                    CALL message( 'init_masks', 'PA0103', 1, 2, 0, 6, 0 )
@@ -298,5 +303,5 @@
              CASE ( 'lpt' )
                 IF ( .NOT. cloud_physics )  THEN
-                   WRITE ( message_string, * ) 'output of "', TRIM( var ), &
+                   WRITE ( message_string, * ) 'output of "', TRIM( var ),     &
                         '" requires cloud_physics = .TRUE.'
                    CALL message( 'init_masks', 'PA0108', 1, 2, 0, 6, 0 )
@@ -306,10 +311,10 @@
              CASE ( 'nc' )
                 IF ( .NOT. cloud_physics )  THEN
-                   WRITE ( message_string, * ) 'output of "', TRIM( var ), &
+                   WRITE ( message_string, * ) 'output of "', TRIM( var ),     &
                         '" requires cloud_physics = .TRUE.'
                    CALL message( 'init_masks', 'PA0108', 1, 2, 0, 6, 0 )
                  ELSEIF ( .NOT. microphysics_morrison ) THEN
-                   message_string = 'output of "' // TRIM( var ) // '" requi' //  &
-                         'res  = morrison'
+                   message_string = 'output of "' // TRIM( var ) // '" ' //    &
+                         'requires  = morrison'
                    CALL message( 'check_parameters', 'PA0359', 1, 2, 0, 6, 0 )
                 ENDIF
@@ -318,10 +323,10 @@
              CASE ( 'nr' )
                 IF ( .NOT. cloud_physics )  THEN
-                   WRITE ( message_string, * ) 'output of "', TRIM( var ), &
+                   WRITE ( message_string, * ) 'output of "', TRIM( var ),     &
                         '" requires cloud_physics = .TRUE.'
                    CALL message( 'init_masks', 'PA0108', 1, 2, 0, 6, 0 )
                  ELSEIF ( .NOT. microphysics_seifert ) THEN
-                   message_string = 'output of "' // TRIM( var ) // '" requi' //  &
-                         'res cloud_scheme = seifert_beheng'
+                   message_string = 'output of "' // TRIM( var ) // '"' //     &
+                         'requires cloud_scheme = seifert_beheng'
                    CALL message( 'check_parameters', 'PA0359', 1, 2, 0, 6, 0 )
                 ENDIF
@@ -330,6 +335,6 @@
              CASE ( 'pc', 'pr' )
                 IF ( .NOT. particle_advection )  THEN
-                   WRITE ( message_string, * ) 'output of "', TRIM( var ), &
-                        '" requires a "particles_par"-NAMELIST in the ', &
+                   WRITE ( message_string, * ) 'output of "', TRIM( var ),     &
+                        '" requires a "particles_par"-NAMELIST in the ',       &
                         'parameter file (PARIN)'
                    CALL message( 'init_masks', 'PA0104', 1, 2, 0, 6, 0 )
@@ -340,5 +345,5 @@
              CASE ( 'q', 'vpt' )
                 IF ( .NOT. humidity )  THEN
-                   WRITE ( message_string, * ) 'output of "', TRIM( var ), &
+                   WRITE ( message_string, * ) 'output of "', TRIM( var ),     &
                         '" requires humidity = .TRUE.'
                    CALL message( 'init_masks', 'PA0105', 1, 2, 0, 6, 0 )
@@ -349,6 +354,6 @@
              CASE ( 'qc' )
                 IF ( .NOT. cloud_physics )  THEN
-                   message_string = 'output of "' // TRIM( var ) // '" requi' //  &
-                            'res cloud_physics = .TRUE.'
+                   message_string = 'output of "' // TRIM( var ) // '"' //     &
+                            'requires cloud_physics = .TRUE.'
                    CALL message( 'check_parameters', 'PA0108', 1, 2, 0, 6, 0 )
                 ENDIF
@@ -357,8 +362,8 @@
              CASE ( 'ql' )
                 IF ( .NOT. ( cloud_physics  .OR.  cloud_droplets ) )  THEN
-                   WRITE ( message_string, * ) 'output of "', TRIM( var ), &
+                   WRITE ( message_string, * ) 'output of "', TRIM( var ),     &
                         '" requires cloud_physics = .TRUE. or cloud_droplets', &
                         ' = .TRUE.'
-                   CALL message( 'init_masks', 'PA0108', 1, 2, 0, 6, 0 )
+                   CALL message( 'init_masks', 'PA0106', 1, 2, 0, 6, 0 )
                 ENDIF
                 unit = 'kg/kg'
@@ -366,5 +371,5 @@
              CASE ( 'ql_c', 'ql_v', 'ql_vp' )
                 IF ( .NOT. cloud_droplets )  THEN
-                   WRITE ( message_string, * ) 'output of "', TRIM( var ), &
+                   WRITE ( message_string, * ) 'output of "', TRIM( var ),     &
                         '" requires cloud_droplets = .TRUE.'
                    CALL message( 'init_masks', 'PA0107', 1, 2, 0, 6, 0 )
@@ -376,5 +381,5 @@
              CASE ( 'qv' )
                 IF ( .NOT. cloud_physics )  THEN
-                   WRITE ( message_string, * ) 'output of "', TRIM( var ), &
+                   WRITE ( message_string, * ) 'output of "', TRIM( var ),     &
                         '" requires cloud_physics = .TRUE.'
                    CALL message( 'init_masks', 'PA0108', 1, 2, 0, 6, 0 )
@@ -384,10 +389,10 @@
              CASE ( 'qr' )
                 IF ( .NOT. cloud_physics )  THEN
-                   message_string = 'output of "' // TRIM( var ) // '" requi' //  &
-                            'res cloud_physics = .TRUE.'
+                   message_string = 'output of "' // TRIM( var ) // '" ' //    &
+                            'requires cloud_physics = .TRUE.'
                    CALL message( 'check_parameters', 'PA0108', 1, 2, 0, 6, 0 )
                 ELSEIF ( .NOT. microphysics_seifert ) THEN
-                   message_string = 'output of "' // TRIM( var ) // '" requi' //  &
-                            'res cloud_scheme = seifert_beheng'
+                   message_string = 'output of "' // TRIM( var ) // '" ' //    &
+                            'requires cloud_scheme = seifert_beheng'
                    CALL message( 'check_parameters', 'PA0359', 1, 2, 0, 6, 0 )
                 ENDIF
@@ -396,5 +401,5 @@
              CASE ( 'rho_ocean' )
                 IF ( .NOT. ocean )  THEN
-                   WRITE ( message_string, * ) 'output of "', TRIM( var ), &
+                   WRITE ( message_string, * ) 'output of "', TRIM( var ),     &
                         '" requires ocean = .TRUE.'
                    CALL message( 'init_masks', 'PA0109', 1, 2, 0, 6, 0 )
@@ -404,5 +409,5 @@
              CASE ( 's' )
                 IF ( .NOT. passive_scalar )  THEN
-                   WRITE ( message_string, * ) 'output of "', TRIM( var ), &
+                   WRITE ( message_string, * ) 'output of "', TRIM( var ),     &
                         '" requires passive_scalar = .TRUE.'
                    CALL message( 'init_masks', 'PA0110', 1, 2, 0, 6, 0 )
@@ -412,5 +417,5 @@
              CASE ( 'sa' )
                 IF ( .NOT. ocean )  THEN
-                   WRITE ( message_string, * ) 'output of "', TRIM( var ), &
+                   WRITE ( message_string, * ) 'output of "', TRIM( var ),     &
                         '" requires ocean = .TRUE.'
                    CALL message( 'init_masks', 'PA0109', 1, 2, 0, 6, 0 )
@@ -419,6 +424,6 @@
 
              CASE ( 'u*', 't*', 'lwp*', 'pra*', 'prr*', 'z0*', 'z0h*' )
-                WRITE ( message_string, * ) 'illegal value for data_',&
-                     'output: "', TRIM( var ), '" is only allowed', &
+                WRITE ( message_string, * ) 'illegal value for data_',         &
+                     'output: "', TRIM( var ), '" is only allowed',            &
                      'for horizontal cross section'
                 CALL message( 'init_masks', 'PA0111', 1, 2, 0, 6, 0 )
@@ -437,11 +442,11 @@
                 IF ( unit == 'illegal' )  THEN
                    IF ( do_mask_user(mid,1) /= ' ' )  THEN
-                      WRITE ( message_string, * ) 'illegal value for data_',&
-                           'output or data_output_user: "', &
+                      WRITE ( message_string, * ) 'illegal value for data_',   &
+                           'output_masks or data_output_masks_user: "',        &
                            TRIM( do_mask(mid,i) ), '"'
-                      CALL message( 'init_masks', 'PA0114', 1, 2, 0, 6, 0 )
+                      CALL message( 'init_masks', 'PA0018', 1, 2, 0, 6, 0 )
                    ELSE
-                      WRITE ( message_string, * ) 'illegal value for data_',&
-                           'output: "', TRIM( do_mask(mid,i) ), '"'
+                      WRITE ( message_string, * ) 'illegal value for data_',   &
+                           ' output_masks : "', TRIM( do_mask(mid,i) ), '"'
                       CALL message( 'init_masks', 'PA0330', 1, 2, 0, 6, 0 )
                    ENDIF
@@ -643,6 +648,6 @@
              ENDIF
              IF ( m > (nxyz+1) )  THEN
-                WRITE ( message_string, '(I3,A,I3,A,I1,3A,I3)' )  &
-                     m,' in mask ',mid,' along dimension ',dim,  &
+                WRITE ( message_string, '(I3,A,I3,A,I1,3A,I3)' )               &
+                     m,' in mask ',mid,' along dimension ',dim,                &
                      ' exceeds (',nxyz_string,'+1) = ',nxyz+1
                 CALL message( 'init_masks', 'PA0331', 1, 2, 0, 6, 0 )
@@ -681,16 +686,16 @@
                   > (nxyz+1) * dxyz / mask_scale(dim) )  THEN
                 WRITE ( message_string, '(2(A,I3,A,I1,A,F9.3),5A,I1,A,F9.3)' ) &
-                     'mask_loop(',mid,',',dim,',1)=',mask_loop(mid,dim,1), &
+                     'mask_loop(',mid,',',dim,',1)=',mask_loop(mid,dim,1),     &
                      ' and/or mask_loop(',mid,',',dim,',2)=', &
-                     mask_loop(mid,dim,2),'&exceed (', &
-                     nxyz_string,'+1)*',dxyz_string,'/mask_scale(',dim,')=', &
+                     mask_loop(mid,dim,2),' exceed (', &
+                     nxyz_string,'+1)*',dxyz_string,'/mask_scale(',dim,')=',   &
                      (nxyz+1)*dxyz/mask_scale(dim)
                 CALL message( 'init_masks', 'PA0332', 1, 2, 0, 6, 0 )
              ENDIF
-             loop_begin  = NINT( mask_loop(mid,dim,1) * mask_scale(dim) &
+             loop_begin  = NINT( mask_loop(mid,dim,1) * mask_scale(dim)        &
                   * ddxyz - 0.5_wp )
-             loop_end    = NINT( mask_loop(mid,dim,2) * mask_scale(dim) &
+             loop_end    = NINT( mask_loop(mid,dim,2) * mask_scale(dim)        &
                   * ddxyz - 0.5_wp )
-             loop_stride = NINT( mask_loop(mid,dim,3) * mask_scale(dim) &
+             loop_stride = NINT( mask_loop(mid,dim,3) * mask_scale(dim)        &
                   * ddxyz )
              IF ( loop_begin == -1 )  loop_begin = 0  ! avoid negative values
@@ -702,8 +707,8 @@
              IF ( MAXVAL( mask_loop(mid,dim,1:2) )  &
                   > zu(nz+1) / mask_scale(dim) )  THEN
-                WRITE ( message_string, '(2(A,I3,A,I1,A,F9.3),A,I1,A,F9.3)' ) &
-                     'mask_loop(',mid,',',dim,',1)=',mask_loop(mid,dim,1), &
+                WRITE ( message_string, '(2(A,I3,A,I1,A,F9.3),A,I1,A,F9.3)' )  &
+                     'mask_loop(',mid,',',dim,',1)=',mask_loop(mid,dim,1),     &
                      ' and/or mask_loop(',mid,',',dim,',2)=', &
-                     mask_loop(mid,dim,2),'&exceed zu(nz+1)/mask_scale(',dim, &
+                     mask_loop(mid,dim,2),' exceed zu(nz+1)/mask_scale(',dim,  &
                      ')=',zu(nz+1)/mask_scale(dim)
                 CALL message( 'init_masks', 'PA0333', 1, 2, 0, 6, 0 )
@@ -724,9 +729,9 @@
              IF ( mask_loop(mid,dim,2) * mask_scale(dim) > dz_stretch_level )  &
                   THEN
-                WRITE ( message_string, '(A,I3,A,I1,A,F9.3,A,F8.2,3A)' ) &
-                     'mask_loop(',mid,',',dim,',2)=', mask_loop(mid,dim,2),&
-                     ' exceeds dz_stretch_level=',dz_stretch_level, &
-                     '.&Vertical mask locations will not ', &
-                     'match the desired heights&within the stretching ', &
+                WRITE ( message_string, '(A,I3,A,I1,A,F9.3,A,F8.2,3A)' )       &
+                     'mask_loop(',mid,',',dim,',2)=', mask_loop(mid,dim,2),    &
+                     ' exceeds dz_stretch_level=',dz_stretch_level,            &
+                     '. Vertical mask locations will not ',                    &
+                     'match the desired heights within the stretching ',       &
                      'region.'
                 CALL message( 'init_masks', 'PA0334', 0, 1, 0, 6, 0 )
Index: palm/trunk/SOURCE/init_pegrid.f90
===================================================================
--- palm/trunk/SOURCE/init_pegrid.f90	(revision 3044)
+++ palm/trunk/SOURCE/init_pegrid.f90	(revision 3045)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! Error messages revised
+! 
+! 2938 2018-03-27 15:52:42Z suehring
 ! - No checks for domain decomposition in case of turbulence generator 
 !  (is done in stg module)
@@ -341,6 +344,6 @@
 !--    must be equal to the number of PEs available to the job
        IF ( ( npex * npey ) /= numprocs )  THEN
-          WRITE( message_string, * ) 'number of PEs of the prescribed ',   &
-              'topology (', npex*npey,') does not match & the number of ', &
+          WRITE( message_string, * ) 'number of PEs of the prescribed ',       &
+              'topology (', npex*npey,') does not match the number of ',       &
               'PEs available to the job (', numprocs, ')'
           CALL message( 'init_pegrid', 'PA0221', 1, 2, 0, 6, 0 )
@@ -353,6 +356,6 @@
 !--    If the processor topology is prescribed by the user, the number of
 !--    PEs must be given in both directions
-       message_string = 'if the processor topology is prescribed by th' //  &
-                'e user& both values of "npex" and "npey" must be given' // &
+       message_string = 'if the processor topology is prescribed by th' //     &
+                'e user both values of "npex" and "npey" must be given' //     &
                 ' in the &NAMELIST-parameter file'
        CALL message( 'init_pegrid', 'PA0222', 1, 2, 0, 6, 0 )
@@ -450,21 +453,14 @@
 !
 !-- Calculate array bounds along x-direction for every PE.
-    ALLOCATE( nxlf(0:pdims(1)-1), nxrf(0:pdims(1)-1), nynf(0:pdims(2)-1), &
+    ALLOCATE( nxlf(0:pdims(1)-1), nxrf(0:pdims(1)-1), nynf(0:pdims(2)-1),      &
               nysf(0:pdims(2)-1) )
 
     IF ( MOD( nx+1 , pdims(1) ) /= 0 )  THEN
-       WRITE( message_string, * ) 'x-direction: gridpoint number (',nx+1,') ',&
-                               'is not an& integral divisor of the number ',  &
-                               'processors (', pdims(1),')'
+       WRITE( message_string, * ) 'x-direction: gridpoint number (',nx+1,') ', &
+                               'is not an integral divisor of the number ',    &
+                               'of processors (', pdims(1),')'
        CALL message( 'init_pegrid', 'PA0225', 1, 2, 0, 6, 0 )
     ELSE
        nnx  = ( nx + 1 ) / pdims(1)
-       IF ( nnx*pdims(1) - ( nx + 1) > nnx )  THEN
-          WRITE( message_string, * ) 'x-direction: nx does not match the',    & 
-                       'requirements given by the number of PEs &used',       &
-                       '& please use nx = ', nx - ( pdims(1) - ( nnx*pdims(1) &
-                                      - ( nx + 1 ) ) ), ' instead of nx =', nx
-          CALL message( 'init_pegrid', 'PA0226', 1, 2, 0, 6, 0 )
-       ENDIF
     ENDIF    
 
@@ -480,16 +476,9 @@
     IF ( MOD( ny+1 , pdims(2) ) /= 0 )  THEN
        WRITE( message_string, * ) 'y-direction: gridpoint number (',ny+1,') ', &
-                           'is not an& integral divisor of the number of',     &
+                           'is not an integral divisor of the number of',      &
                            'processors (', pdims(2),')'
        CALL message( 'init_pegrid', 'PA0227', 1, 2, 0, 6, 0 )
     ELSE
        nny  = ( ny + 1 ) / pdims(2)
-       IF ( nny*pdims(2) - ( ny + 1) > nny )  THEN
-          WRITE( message_string, * ) 'y-direction: ny does not match the',    &
-                       'requirements given by the number of PEs &used ',      &
-                       '& please use ny = ', ny - ( pdims(2) - ( nnx*pdims(2) &
-                                     - ( ny + 1 ) ) ), ' instead of ny =', ny
-          CALL message( 'init_pegrid', 'PA0228', 1, 2, 0, 6, 0 )
-       ENDIF
     ENDIF    
 
@@ -533,5 +522,5 @@
           IF ( MOD( nz , pdims(1) ) /= 0 )  THEN
              WRITE( message_string, * ) 'transposition z --> x:',              &
-                       '&nz=',nz,' is not an integral divisior of pdims(1)=',  &
+                       ' nz=',nz,' is not an integral divisior of pdims(1)=',  &
                                                                    pdims(1)
              CALL message( 'init_pegrid', 'PA0230', 1, 2, 0, 6, 0 )
@@ -555,5 +544,5 @@
        IF ( MOD( nx+1 , pdims(2) ) /= 0 )  THEN
           WRITE( message_string, * ) 'transposition x --> y:',                 &
-                            '&nx+1=',nx+1,' is not an integral divisor of ',   &
+                            ' nx+1=',nx+1,' is not an integral divisor of ',   &
                             'pdims(2)=',pdims(2)
           CALL message( 'init_pegrid', 'PA0231', 1, 2, 0, 6, 0 )
@@ -584,5 +573,5 @@
           IF ( MOD( ny+1 , pdims(1) ) /= 0 )  THEN
              WRITE( message_string, * ) 'transposition y --> z:',              &
-                               '& ny+1=',ny+1,' is not an integral divisor of',&
+                               ' ny+1=',ny+1,' is not an integral divisor of', &
                                ' pdims(1)=',pdims(1)
              CALL message( 'init_pegrid', 'PA0232', 1, 2, 0, 6, 0 )
@@ -595,5 +584,5 @@
           IF ( MOD( ny+1 , pdims(1) ) /= 0 )  THEN
              WRITE( message_string, * ) 'transposition x --> y:',              &
-                               '& ny+1=',ny+1,' is not an integral divisor of',&
+                               ' ny+1=',ny+1,' is not an integral divisor of', &
                                ' pdims(1)=',pdims(1)
              CALL message( 'init_pegrid', 'PA0233', 1, 2, 0, 6, 0 )
@@ -609,5 +598,5 @@
        IF ( MOD( nz, pdims(2) ) /= 0 )  THEN
           WRITE( message_string, * ) 'direct transposition z --> y (needed ',  &
-                    'for spectra):& nz=',nz,' is not an integral divisor of ', &
+                    'for spectra): nz=',nz,' is not an integral divisor of ',  &
                     'pdims(2)=',pdims(2)
           CALL message( 'init_pegrid', 'PA0234', 1, 2, 0, 6, 0 )
@@ -974,7 +963,7 @@
 !
 !--          Check pre-defined value and reset to default, if neccessary
-             IF ( mg_switch_to_pe0_level < mg_switch_to_pe0_level_l  .OR.  &
+             IF ( mg_switch_to_pe0_level < mg_switch_to_pe0_level_l  .OR.      &
                   mg_switch_to_pe0_level >= maximum_grid_level_l )  THEN
-                message_string = 'mg_switch_to_pe0_level ' // &
+                message_string = 'mg_switch_to_pe0_level ' //                  &
                                  'out of range and reset to 0'
                 CALL message( 'init_pegrid', 'PA0235', 0, 1, 0, 6, 0 )
@@ -1038,9 +1027,9 @@
              subdomain_size = ( nxr - nxl + 2 * nbgp + 1 ) * &
                               ( nyn - nys + 2 * nbgp + 1 ) * ( nzt - nzb + 2 )
-             gathered_size  = ( nxr_l - nxl_l + 3 ) * ( nyn_l - nys_l + 3 ) * &
+             gathered_size  = ( nxr_l - nxl_l + 3 ) * ( nyn_l - nys_l + 3 ) *  &
                               ( nzt_l - nzb + 2 )
 
 #else
-             message_string = 'multigrid gather/scatter impossible ' // &
+             message_string = 'multigrid gather/scatter impossible ' //        &
                           'in non parallel mode'
              CALL message( 'init_pegrid', 'PA0237', 1, 2, 0, 6, 0 )
@@ -1063,5 +1052,5 @@
 
 !
-!--    Temporary problem: Currently calculation of maxerror iin routine poismg crashes
+!--    Temporary problem: Currently calculation of maxerror in routine poismg crashes
 !--    if grid data are collected on PE0 already on the finest grid level.
 !--    To be solved later.
Index: palm/trunk/SOURCE/land_surface_model_mod.f90
===================================================================
--- palm/trunk/SOURCE/land_surface_model_mod.f90	(revision 3044)
+++ palm/trunk/SOURCE/land_surface_model_mod.f90	(revision 3045)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! Error messages revised and added
+! 
+! 3026 2018-05-22 10:30:53Z schwenkel
 ! Changed the name specific humidity to mixing ratio, since we are computing
 ! mixing ratios.
@@ -431,5 +434,5 @@
     USE radiation_model_mod,                                                   &
         ONLY:  albedo, albedo_type, emissivity, force_radiation_call,          &
-               radiation_scheme, unscheduled_radiation_calls
+               radiation, radiation_scheme, unscheduled_radiation_calls
         
     USE statistics,                                                            &
@@ -1274,5 +1277,5 @@
          TRIM( surface_type ) /= 'water'       .AND.                           &
          TRIM( surface_type ) /= 'netcdf' )  THEN  
-       message_string = 'unknown surface type surface_type = "' //             &
+       message_string = 'unknown surface type: surface_type = "' //            &
                         TRIM( surface_type ) // '"'
        CALL message( 'lsm_check_parameters', 'PA0019', 1, 2, 0, 6, 0 )
@@ -1295,4 +1298,10 @@
        CALL message( 'lsm_check_parameters', 'PA0400', 1, 2, 0, 6, 0 )
     ENDIF
+    
+    IF (  .NOT.  radiation )  THEN
+       message_string = 'lsm requires '//                                      &
+                        'the radiation model to be switched on'
+       CALL message( 'lsm_check_parameters', 'PA0400', 1, 2, 0, 6, 0 )
+    ENDIF
 
     IF ( TRIM( surface_type ) == 'vegetation' )  THEN
@@ -1380,5 +1389,5 @@
                                      ' is not allowed in combination with ',   &
                                      'most_method = ', most_method
-          CALL message( 'lsm_check_parameters', 'PA0417', 1, 2, 0, 6, 0 )
+          CALL message( 'lsm_check_parameters', 'PA0414', 1, 2, 0, 6, 0 )
        ENDIF
 
@@ -1426,5 +1435,5 @@
              CALL message( 'lsm_check_parameters', 'PA0352', 1, 2, 0, 6, 0 )
           ENDIF
-
+          
           IF ( z0h_pavement == 9999999.9_wp )  THEN
              message_string = 'pavement_type = 0 (user_defined)'//             &
@@ -1630,7 +1639,7 @@
     DO  k = nzb_soil, nzt_soil-1
        dz_soil_center(k) = zs(k+1) - zs(k)
-       IF ( dz_soil_center(k) == 0.0_wp )  THEN
+       IF ( dz_soil_center(k) <= 0.0_wp )  THEN
           message_string = 'invalid soil layer configuration found ' //        &
-                           '(dz_soil_center(k) = 0.0)'
+                           '(dz_soil_center(k) <= 0.0)'
           CALL message( 'lsm_rrd_local', 'PA0140', 1, 2, 0, 6, 0 )
        ENDIF  
Index: palm/trunk/SOURCE/large_scale_forcing_nudging_mod.f90
===================================================================
--- palm/trunk/SOURCE/large_scale_forcing_nudging_mod.f90	(revision 3044)
+++ palm/trunk/SOURCE/large_scale_forcing_nudging_mod.f90	(revision 3045)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! Error messages revised 
+! 
+! 3026 2018-05-22 10:30:53Z schwenkel
 ! Changed the name specific humidity to mixing ratio, since we are computing
 ! mixing ratios.
@@ -732,6 +735,6 @@
 !--    Check nudging and large scale forcing from external file
        IF ( nudging  .AND.  (  .NOT.  large_scale_forcing ) )  THEN
-          message_string = 'Nudging requires large_scale_forcing = .T.. &'//   &
-                        'Surface fluxes and geostrophic wind should be &'//    &
+          message_string = 'Nudging requires large_scale_forcing = .T.. '//    &
+                        'Surface fluxes and geostrophic wind should be '//     &
                         'prescribed in file LSF_DATA'
           CALL message( 'check_parameters', 'PA0374', 1, 2, 0, 6, 0 )
@@ -740,5 +743,5 @@
        IF ( large_scale_forcing  .AND.  ( bc_lr /= 'cyclic'  .OR.              &
                                           bc_ns /= 'cyclic' ) )  THEN
-          message_string = 'Non-cyclic lateral boundaries do not allow for &'//&
+          message_string = 'Non-cyclic lateral boundaries do not allow for  '//&
                         'the usage of large scale forcing from external file.'
           CALL message( 'check_parameters', 'PA0375', 1, 2, 0, 6, 0 )
@@ -746,5 +749,5 @@
 
        IF ( large_scale_forcing  .AND.  (  .NOT.  humidity ) )  THEN
-          message_string = 'The usage of large scale forcing from external &'//&
+          message_string = 'The usage of large scale forcing from external  '//&
                         'file LSF_DATA requires humidity = .T..'
           CALL message( 'check_parameters', 'PA0376', 1, 2, 0, 6, 0 )
@@ -752,5 +755,5 @@
 
        IF ( large_scale_forcing  .AND.  passive_scalar )  THEN
-          message_string = 'The usage of large scale forcing from external &'//&
+          message_string = 'The usage of large scale forcing from external '// &
                         'file LSF_DATA is not implemented for passive scalars'
           CALL message( 'check_parameters', 'PA0440', 1, 2, 0, 6, 0 )
@@ -759,5 +762,5 @@
        IF ( large_scale_forcing  .AND.  topography /= 'flat'                   &
                               .AND.  .NOT.  lsf_exception )  THEN
-          message_string = 'The usage of large scale forcing from external &'//&
+          message_string = 'The usage of large scale forcing from external  '//&
                         'file LSF_DATA is not implemented for non-flat topography'
           CALL message( 'check_parameters', 'PA0377', 1, 2, 0, 6, 0 )
@@ -765,5 +768,5 @@
 
        IF ( large_scale_forcing  .AND.  ocean )  THEN
-          message_string = 'The usage of large scale forcing from external &'//&
+          message_string = 'The usage of large scale forcing from external '// &
                         'file LSF_DATA is not implemented for ocean runs'
           CALL message( 'check_parameters', 'PA0378', 1, 2, 0, 6, 0 )
@@ -858,6 +861,6 @@
                                  TRIM( data_output_pr(var_count) ) //          &
                                  ' is not implemented for ' //                 &
-                                 'large_scale_forcing = .FALSE.'
-                CALL message( 'lsf_nudging_check_data_output_pr', 'PA0393',    &
+                                 'nudging = .FALSE.'
+                CALL message( 'lsf_nudging_check_data_output_pr', 'PA0394',    &
                                1, 2, 0, 6, 0 )
              ELSE
@@ -873,6 +876,6 @@
                                  TRIM( data_output_pr(var_count) ) //          &
                                  ' is not implemented for ' //                 &
-                                 'large_scale_forcing = .FALSE.'
-                CALL message( 'lsf_nudging_check_data_output_pr', 'PA0393',    &
+                                 'nudging = .FALSE.'
+                CALL message( 'lsf_nudging_check_data_output_pr', 'PA0394',    &
                                1, 2, 0, 6, 0 )
              ELSE
@@ -888,6 +891,6 @@
                                  TRIM( data_output_pr(var_count) ) //          &
                                  ' is not implemented for ' //                 &
-                                 'large_scale_forcing = .FALSE.'
-                CALL message( 'lsf_nudging_check_data_output_pr', 'PA0393',    &
+                                 'nudging = .FALSE.'
+                CALL message( 'lsf_nudging_check_data_output_pr', 'PA0394',    &
                                1, 2, 0, 6, 0 )
              ELSE
@@ -903,6 +906,6 @@
                                  TRIM( data_output_pr(var_count) ) //          &
                                  ' is not implemented for ' //                 &
-                                 'large_scale_forcing = .FALSE.'
-                CALL message( 'lsf_nudging_check_data_output_pr', 'PA0393',    &
+                                 'nudging = .FALSE.'
+                CALL message( 'lsf_nudging_check_data_output_pr', 'PA0394',    &
                                1, 2, 0, 6, 0 )
              ELSE
@@ -1280,6 +1283,6 @@
 
              IF ( ierrn /= 0 )  THEN
-               WRITE ( message_string, * ) 'No time dependent surface variables ' //&
-                                 'in&LSF_DATA for end of run found'
+               WRITE ( message_string, * ) 'No time dependent surface ' //     &
+                                 'variables in LSF_DATA for end of run found'
 
                 CALL message( 'ls_forcing', 'PA0363', 1, 2, 0, 6, 0 )
@@ -1289,5 +1292,5 @@
           IF ( time_surf(1) > end_time )  THEN
              WRITE ( message_string, * ) 'Time dependent surface variables in ' // &
-                                         '&LSF_DATA set in after end of ' ,        &
+                                         'LSF_DATA set in after end of ' ,         &
                                          'simulation - lsf_surf is set to FALSE'
              CALL message( 'ls_forcing', 'PA0371', 0, 0, 0, 6, 0 )
@@ -1316,5 +1319,5 @@
                 IF ( ierrn < 0 )  THEN 
                    WRITE( message_string, * ) 'No time dependent vertical profiles',&
-                                    ' in&LSF_DATA for end of run found'
+                                    ' in LSF_DATA for end of run found'
                    CALL message( 'ls_forcing', 'PA0372', 1, 2, 0, 6, 0 )
                 ENDIF
@@ -1362,7 +1365,7 @@
 
                    IF ( ierrn /= 0 )  THEN
-                      WRITE( message_string, * ) 'zu(',k,') = ', zu(k), 'm ', &
-                           'is higher than the maximum height in LSF_DATA which ',&
-                           'is ', lowheight, 'm. Interpolation on PALM ',         &
+                      WRITE( message_string, * ) 'zu(',k,') = ', zu(k), 'm ',  &
+                           'is higher than the maximum height in LSF_DATA ',   &
+                           'which is ', lowheight, 'm. Interpolation on PALM ',&
                            'grid is not possible.'
                       CALL message( 'ls_forcing', 'PA0395', 1, 2, 0, 6, 0 )
@@ -1832,12 +1835,12 @@
  
                 ierrn = 0
-                READ ( finput, *, IOSTAT=ierrn )  highheight , hightnudge , &
-                                                  highunudge , highvnudge , &
-                                                  highwnudge , highptnudge, &
+                READ ( finput, *, IOSTAT=ierrn )  highheight , hightnudge ,    &
+                                                  highunudge , highvnudge ,    &
+                                                  highwnudge , highptnudge,    &
                                                   highqnudge
                 IF (ierrn /= 0 )  THEN
-                   WRITE( message_string, * ) 'zu(',k,') = ', zu(k), 'm is ',&
-                        'higher than the maximum height in NUDING_DATA which ',  &
-                        'is ', lowheight, 'm. Interpolation on PALM ',           &
+                   WRITE( message_string, * ) 'zu(',k,') = ', zu(k), 'm is ',  &
+                        'higher than the maximum height in NUDING_DATA which ',&
+                        'is ', lowheight, 'm. Interpolation on PALM ',         &
                         'grid is not possible.'
                    CALL message( 'nudging', 'PA0364', 1, 2, 0, 6, 0 )
@@ -1872,6 +1875,6 @@
           ENDIF
 
-          WRITE( message_string, * ) 'Initial profiles of u, v and ',          &
-                                     'scalars from NUDGING_DATA are used.'
+          WRITE( message_string, * ) 'Initial profiles of u, v, pt and q ',    &
+                                     'from NUDGING_DATA are used.'
           CALL message( 'large_scale_forcing_nudging', 'PA0370', 0, 0, 0, 6, 0 )
        ENDIF
Index: palm/trunk/SOURCE/lpm_droplet_condensation.f90
===================================================================
--- palm/trunk/SOURCE/lpm_droplet_condensation.f90	(revision 3044)
+++ palm/trunk/SOURCE/lpm_droplet_condensation.f90	(revision 3045)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! Error messages revised
+! 
+! 3039 2018-05-24 13:13:11Z schwenkel
 ! bugfix for lcm with grid stretching
 ! 
@@ -380,6 +383,6 @@
 !--    the model timestep might be too long.
        IF ( ql_c(kp,jp,ip) > 100.0_wp )  THEN
-          WRITE( message_string, * ) 'k=',kp,' j=',jp,' i=',ip,      &
-                       ' ql_c=',ql_c(kp,jp,ip), ' &part(',n,')%wf=', &
+          WRITE( message_string, * ) 'k=',kp,' j=',jp,' i=',ip,                &
+                       ' ql_c=',ql_c(kp,jp,ip), ' part(',n,')%wf=',            &
                        particles(n)%weight_factor,' delta_r=',delta_r
           CALL message( 'lpm_droplet_condensation', 'PA0143', 2, 2, -1, 6, 1 )
@@ -390,7 +393,7 @@
        delta_r = new_r(n) - particles(n)%radius
        IF ( delta_r < 0.0_wp  .AND. new_r(n) < 0.0_wp )  THEN
-          WRITE( message_string, * ) '#1 k=',kp,' j=',jp,' i=',ip,    &
-                       ' e_s=',e_s, ' e_a=',e_a,' t_int=',t_int,      &
-                       ' &delta_r=',delta_r,                          &
+          WRITE( message_string, * ) '#1 k=',kp,' j=',jp,' i=',ip,             &
+                       ' e_s=',e_s, ' e_a=',e_a,' t_int=',t_int,               &
+                       ' delta_r=',delta_r,                                    &
                        ' particle_radius=',particles(n)%radius
           CALL message( 'lpm_droplet_condensation', 'PA0144', 2, 2, -1, 6, 1 )
Index: palm/trunk/SOURCE/lpm_init.f90
===================================================================
--- palm/trunk/SOURCE/lpm_init.f90	(revision 3044)
+++ palm/trunk/SOURCE/lpm_init.f90	(revision 3045)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! Error message revised
+! 
+! 3039 2018-05-24 13:13:11Z schwenkel
 ! bugfix for lcm with grid stretching
 ! 
@@ -333,7 +336,7 @@
 !-- Check the number of particle groups.
     IF ( number_of_particle_groups > max_number_of_particle_groups )  THEN
-       WRITE( message_string, * ) 'max_number_of_particle_groups =',      &
-                                  max_number_of_particle_groups ,         &
-                                  '&number_of_particle_groups reset to ', &
+       WRITE( message_string, * ) 'max_number_of_particle_groups =',           &
+                                  max_number_of_particle_groups ,              &
+                                  ' number_of_particle_groups reset to ',      &
                                   max_number_of_particle_groups
        CALL message( 'lpm_init', 'PA0213', 0, 1, 0, 6, 0 )
@@ -345,5 +348,5 @@
 !-- propably (not realized so far).
     IF ( surf_def_h(1)%ns >= 1 )  THEN
-       WRITE( message_string, * ) 'Overhanging topography do not work '// &
+       WRITE( message_string, * ) 'Overhanging topography do not work '//      &
                                   'with particles'
        CALL message( 'lpm_init', 'PA0212', 0, 1, 0, 6, 0 )
@@ -466,5 +469,5 @@
 
        CASE DEFAULT
-          WRITE( message_string, * )  'unknown boundary condition ',   &
+          WRITE( message_string, * )  'unknown boundary condition ',           &
                                        'bc_par_b = "', TRIM( bc_par_b ), '"'
           CALL message( 'lpm_init', 'PA0217', 1, 2, 0, 6, 0 )
@@ -483,5 +486,5 @@
 
        CASE DEFAULT
-          WRITE( message_string, * ) 'unknown boundary condition ',   &
+          WRITE( message_string, * ) 'unknown boundary condition ',            &
                                      'bc_par_t = "', TRIM( bc_par_t ), '"'
           CALL message( 'lpm_init', 'PA0218', 1, 2, 0, 6, 0 )
@@ -540,6 +543,6 @@
 
        CASE DEFAULT
-          WRITE( message_string, * )  'unknown splitting condition ',   &
-                                       'splitting_mode = "', TRIM( splitting_mode ), '"'
+          WRITE( message_string, * )  'unknown splitting_mode = "',            &
+                                      TRIM( splitting_mode ), '"'
           CALL message( 'lpm_init', 'PA0146', 1, 2, 0, 6, 0 )
 
@@ -557,6 +560,6 @@
 
        CASE DEFAULT
-          WRITE( message_string, * )  'unknown splitting function ',   &
-                                       'splitting_function = "', TRIM( splitting_function ), '"'
+          WRITE( message_string, * )  'unknown splitting function = "',        &
+                                       TRIM( splitting_function ), '"'
           CALL message( 'lpm_init', 'PA0147', 1, 2, 0, 6, 0 )
 
@@ -619,5 +622,5 @@
        DO  i = 1, number_of_particle_groups
           IF ( density_ratio(i) /= 0.0_wp  .AND.  radius(i) == 0 )  THEN
-             WRITE( message_string, * ) 'particle group #', i, 'has a', &
+             WRITE( message_string, * ) 'particle group #', i, ' has a',       &
                                         'density ratio /= 0 but radius = 0'
              CALL message( 'lpm_init', 'PA0215', 1, 2, 0, 6, 0 )
Index: palm/trunk/SOURCE/lpm_read_restart_file.f90
===================================================================
--- palm/trunk/SOURCE/lpm_read_restart_file.f90	(revision 3044)
+++ palm/trunk/SOURCE/lpm_read_restart_file.f90	(revision 3045)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! Error messages revised, code adjusted according to PALMs coding standard
+! 
+! 2718 2018-01-02 08:49:38Z maronga
 ! Corrected "Former revisions" section
 ! 
@@ -114,8 +117,8 @@
 !-- First open the input unit.
     IF ( myid_char == '' )  THEN
-       OPEN ( 90, FILE='PARTICLE_RESTART_DATA_IN'//myid_char, &
+       OPEN ( 90, FILE='PARTICLE_RESTART_DATA_IN'//myid_char,                  &
                   FORM='UNFORMATTED' )
     ELSE
-       OPEN ( 90, FILE='PARTICLE_RESTART_DATA_IN/'//myid_char, &
+       OPEN ( 90, FILE='PARTICLE_RESTART_DATA_IN/'//myid_char,                 &
                   FORM='UNFORMATTED' )
     ENDIF
@@ -126,8 +129,8 @@
     particle_binary_version = '4.0'
     IF ( TRIM( version_on_file ) /= TRIM( particle_binary_version ) )  THEN
-       message_string = 'version mismatch concerning data from prior ' // &
-                        'run &version on file    = "' //                  &
-                                      TRIM( version_on_file ) //          &
-                        '&version in program = "' //                      &
+       message_string = 'version mismatch concerning data from prior ' //      &
+                        'run version on file = "' //                           &
+                                      TRIM( version_on_file ) //               &
+                        ' version in program = "' //                           &
                                       TRIM( particle_binary_version ) // '"'
        CALL message( 'lpm_read_restart_file', 'PA0214', 1, 2, 0, 6, 0 )
@@ -138,17 +141,17 @@
 !-- min_nr_particle, the remainder is initialized by zero_particle to avoid
 !-- errors.
-    zero_particle = particle_type( 0.0_wp, 0.0_wp, 0.0_wp, 0.0_wp, 0.0_wp,  &
-                                   0.0_wp, 0.0_wp, 0.0_wp, 0.0_wp, 0.0_wp,  &
-                                   0.0_wp, 0.0_wp, 0.0_wp, 0.0_wp, 0.0_wp,  &
-                                   0.0_wp, 0.0_wp, 0.0_wp, 0.0_wp, 0.0_wp,  &
+    zero_particle = particle_type( 0.0_wp, 0.0_wp, 0.0_wp, 0.0_wp, 0.0_wp,     &
+                                   0.0_wp, 0.0_wp, 0.0_wp, 0.0_wp, 0.0_wp,     &
+                                   0.0_wp, 0.0_wp, 0.0_wp, 0.0_wp, 0.0_wp,     &
+                                   0.0_wp, 0.0_wp, 0.0_wp, 0.0_wp, 0.0_wp,     &
                                    0, 0, 0_idp, .FALSE., -1 )
 !
 !-- Read some particle parameters and the size of the particle arrays,
 !-- allocate them and read their contents.
-    READ ( 90 )  bc_par_b, bc_par_lr, bc_par_ns, bc_par_t,                  &
-                 number_of_particle_groups, particle_groups, time_prel,     &
+    READ ( 90 )  bc_par_b, bc_par_lr, bc_par_ns, bc_par_t,                     &
+                 number_of_particle_groups, particle_groups, time_prel,        &
                  time_write_particle_data
 
-    ALLOCATE( prt_count(nzb:nzt+1,nysg:nyng,nxlg:nxrg),                     &
+    ALLOCATE( prt_count(nzb:nzt+1,nysg:nyng,nxlg:nxrg),                        &
               grid_particles(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
 
Index: palm/trunk/SOURCE/model_1d_mod.f90
===================================================================
--- palm/trunk/SOURCE/model_1d_mod.f90	(revision 3044)
+++ palm/trunk/SOURCE/model_1d_mod.f90	(revision 3045)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! Error message revised
+! 
+! 2965 2018-04-13 07:37:25Z scharf
 ! adjusted format string for 1D run control output
 ! 
@@ -1032,5 +1035,5 @@
        stop_dt_1d = .TRUE.
 
-       WRITE( message_string, * ) 'timestep has exceeded the lower limit &', &
+       WRITE( message_string, * ) 'timestep has exceeded the lower limit ',    &
                                   'dt_1d = ',dt_1d,' s   simulation stopped!'
        CALL message( 'timestep_1d', 'PA0192', 1, 2, 0, 6, 0 )
Index: palm/trunk/SOURCE/modules.f90
===================================================================
--- palm/trunk/SOURCE/modules.f90	(revision 3044)
+++ palm/trunk/SOURCE/modules.f90	(revision 3045)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! z_max_do2d removed
+! 
+! 3026 2018-05-22 10:30:53Z schwenkel
 ! Changed the name specific humidity to mixing ratio, since we are computing
 ! mixing ratios.
@@ -1519,5 +1522,4 @@
     REAL(wp) ::  zeta_max = 20.0_wp                            !< namelist parameter
     REAL(wp) ::  zeta_min = -20.0_wp                           !< namelist parameter
-    REAL(wp) ::  z_max_do2d = -1.0_wp                          !< namelist parameter
     REAL(wp) ::  z0h_factor = 1.0_wp                           !< namelist parameter
 
Index: palm/trunk/SOURCE/netcdf_data_input_mod.f90
===================================================================
--- palm/trunk/SOURCE/netcdf_data_input_mod.f90	(revision 3044)
+++ palm/trunk/SOURCE/netcdf_data_input_mod.f90	(revision 3045)
@@ -20,9 +20,12 @@
 ! Current revisions:
 ! -----------------
-!
-!
+! 
+! 
 ! Former revisions:
 ! -----------------
 ! $Id$
+! Error message revised
+! 
+! 3041 2018-05-25 10:39:54Z gronemeier
 ! Add data type for global file attributes
 ! Add read of global attributes of static driver
@@ -2003,6 +2006,6 @@
                 GOTO 12
 
- 10             message_string = 'file TOPOGRAPHY'//TRIM( coupling_char )//    &
-                                 ' does not exist'
+ 10             message_string = 'file TOPOGRAPHY_DATA'//                      &
+                                 TRIM( coupling_char )// ' does not exist'
                 CALL message( 'netcdf_data_input_mod', 'PA0208', 1, 2, 0, 6, 0 )
 
Index: palm/trunk/SOURCE/netcdf_interface_mod.f90
===================================================================
--- palm/trunk/SOURCE/netcdf_interface_mod.f90	(revision 3044)
+++ palm/trunk/SOURCE/netcdf_interface_mod.f90	(revision 3045)
@@ -25,4 +25,8 @@
 ! -----------------
 ! $Id$
+! Error messages revised, code adjusted to PALMs coding standards, CASE pt_ext
+! pt_new disabled, comment revised
+! 
+! 3004 2018-04-27 12:33:25Z Giersch
 ! .NOT. found in if-query added to account for variables found in tcm
 ! 
@@ -708,5 +712,5 @@
        IF ( netcdf_deflate < 0  .OR.  netcdf_deflate > 9 )  THEN
           WRITE ( message_string, '(A,I3,A)' ) 'netcdf_deflate out of ' //     &
-                                      'range & given value: ', netcdf_deflate, &
+                                      'range given value: ', netcdf_deflate,   &
                                       ', allowed range: 0-9'
           CALL message( 'netcdf_define_header', 'PA0355', 2, 2, 0, 6, 0 )
@@ -734,6 +738,7 @@
 
 !
-!-- Select the mode to be processed. Possibilities are 3d, mask, xy, xz, yz, 
-!-- pr and ts.
+!-- Select the mode to be processed. Possibilities are 3d, ma (mask), xy, xz, 
+!-- yz, pr (profiles), ps (particle timeseries), fl (flight data), ts 
+!-- (timeseries) or sp (spectra)
     SELECT CASE ( mode )
 
@@ -1185,8 +1190,8 @@
 
           IF ( TRIM( var_list ) /= TRIM( var_list_old ) )  THEN
-             WRITE ( message_string, * ) 'netCDF file for ', TRIM( var ), &
-                  ' data for mask', mid, ' from previous run found,', &
-                  '&but this file cannot be extended due to variable ', &
-                  'mismatch.&New file is created instead.'
+             WRITE ( message_string, * ) 'netCDF file for ', TRIM( var ),       &
+                  ' data for mask', mid, ' from previous run found,',           &
+                  ' but this file cannot be extended due to variable ',         &
+                  'mismatch. New file is created instead.'
              CALL message( 'define_netcdf_header', 'PA0335', 0, 1, 0, 6, 0 )
              extend = .FALSE.
@@ -1206,15 +1211,15 @@
           id_dim_zu_mask(mid,av) = id_dim_zu_mask_old(1)
 
-          nc_stat = NF90_INQUIRE_DIMENSION( id_set_mask(mid,av),    &
-                                            id_dim_zu_mask(mid,av), &
+          nc_stat = NF90_INQUIRE_DIMENSION( id_set_mask(mid,av),               &
+                                            id_dim_zu_mask(mid,av),            &
                                             len = nz_old )
           CALL netcdf_handle_error( 'netcdf_define_header', 510 )
 
           IF ( mask_size(mid,3) /= nz_old )  THEN
-             WRITE ( message_string, * ) 'netCDF file for ', TRIM( var ), &
-                  ' data for mask', mid, ' from previous run found,', &
-                  '&but this file cannot be extended due to mismatch in ', &
-                  ' number of&vertical grid points.', &
-                  '&New file is created instead.'
+             WRITE ( message_string, * ) 'netCDF file for ', TRIM( var ),      &
+                  ' data for mask', mid, ' from previous run found,',          &
+                  ' but this file cannot be extended due to mismatch in ',     &
+                  ' number of vertical grid points.',                          &
+                  ' New file is created instead.'
              CALL message( 'define_netcdf_header', 'PA0336', 0, 1, 0, 6, 0 )
              extend = .FALSE.
@@ -1227,32 +1232,32 @@
 !--       The current time must be larger than the last output time
 !--       on the file.
-          nc_stat = NF90_INQ_VARID( id_set_mask(mid,av), 'time', &
+          nc_stat = NF90_INQ_VARID( id_set_mask(mid,av), 'time',               &
                                     id_var_time_mask(mid,av) )
           CALL netcdf_handle_error( 'netcdf_define_header', 511 )
 
-          nc_stat = NF90_INQUIRE_VARIABLE( id_set_mask(mid,av), &
-                                           id_var_time_mask(mid,av), &
+          nc_stat = NF90_INQUIRE_VARIABLE( id_set_mask(mid,av),                &
+                                           id_var_time_mask(mid,av),           &
                                            dimids = id_dim_time_old )
           CALL netcdf_handle_error( 'netcdf_define_header', 512 )
           id_dim_time_mask(mid,av) = id_dim_time_old(1)
 
-          nc_stat = NF90_INQUIRE_DIMENSION( id_set_mask(mid,av), &
-                                            id_dim_time_mask(mid,av), &
+          nc_stat = NF90_INQUIRE_DIMENSION( id_set_mask(mid,av),               &
+                                            id_dim_time_mask(mid,av),          &
                                             len = domask_time_count(mid,av) )
           CALL netcdf_handle_error( 'netcdf_define_header', 513 )
 
-          nc_stat = NF90_GET_VAR( id_set_mask(mid,av), &
-                                  id_var_time_mask(mid,av), &
-                                  last_time_coordinate,              &
-                                  start = (/ domask_time_count(mid,av) /), &
+          nc_stat = NF90_GET_VAR( id_set_mask(mid,av),                         &
+                                  id_var_time_mask(mid,av),                    &
+                                  last_time_coordinate,                        &
+                                  start = (/ domask_time_count(mid,av) /),     &
                                   count = (/ 1 /) )
           CALL netcdf_handle_error( 'netcdf_define_header', 514 )
 
           IF ( last_time_coordinate(1) >= simulated_time )  THEN
-             WRITE ( message_string, * ) 'netCDF file for ', TRIM( var ), &
-                  ' data for mask', mid, ' from previous run found,', &
-                  '&but this file cannot be extended because the current ', &
-                  'output time&is less or equal than the last output time ', &
-                  'on this file.&New file is created instead.'
+             WRITE ( message_string, * ) 'netCDF file for ', TRIM( var ),      &
+                  ' data for mask', mid, ' from previous run found,',          &
+                  ' but this file cannot be extended because the current ',    &
+                  'output time is less or equal than the last output time ',   &
+                  'on this file. New file is created instead.'
              CALL message( 'define_netcdf_header', 'PA0337', 0, 1, 0, 6, 0 )
              domask_time_count(mid,av) = 0
@@ -1283,18 +1288,18 @@
              time_average_text = ' '
           ELSE
-             WRITE (time_average_text, '('', '',F7.1,'' s average'')') &
+             WRITE (time_average_text, '('', '',F7.1,'' s average'')')         &
                                                             averaging_interval
           ENDIF
           nc_stat = NF90_REDEF( id_set_mask(mid,av) )
           CALL netcdf_handle_error( 'netcdf_define_header', 516 )
-          nc_stat = NF90_PUT_ATT( id_set_mask(mid,av), NF90_GLOBAL, 'title', &
-                                  TRIM( run_description_header ) //    &
+          nc_stat = NF90_PUT_ATT( id_set_mask(mid,av), NF90_GLOBAL, 'title',   &
+                                  TRIM( run_description_header ) //            &
                                   TRIM( time_average_text ) )
           CALL netcdf_handle_error( 'netcdf_define_header', 517 )
           nc_stat = NF90_ENDDEF( id_set_mask(mid,av) )
           CALL netcdf_handle_error( 'netcdf_define_header', 518 )
-          WRITE ( message_string, * ) 'netCDF file for ', TRIM( var ), &
-               ' data for mask', mid, ' from previous run found.', &
-               '&This file will be extended.'
+          WRITE ( message_string, * ) 'netCDF file for ', TRIM( var ),         &
+               ' data for mask', mid, ' from previous run found.',             &
+               ' This file will be extended.'
           CALL message( 'define_netcdf_header', 'PA0338', 0, 0, 0, 6, 0 )
 !
@@ -1307,5 +1312,5 @@
 !
 !--       Define some global attributes of the dataset
-          nc_stat = NF90_PUT_ATT( id_set_3d(av), NF90_GLOBAL, 'Conventions', &
+          nc_stat = NF90_PUT_ATT( id_set_3d(av), NF90_GLOBAL, 'Conventions',   &
                                   'COARDS' )
           CALL netcdf_handle_error( 'netcdf_define_header', 62 )
@@ -1756,7 +1761,7 @@
              message_string = 'netCDF file for volume data ' //             &
                               TRIM( var ) // ' from previous run found,' // &
-                              '&but this file cannot be extended due to' // &
+                              ' but this file cannot be extended due to' // &
                               ' variable mismatch.' //                      &
-                              '&New file is created instead.'
+                              ' New file is created instead.'
              CALL message( 'define_netcdf_header', 'PA0245', 0, 1, 0, 6, 0 )
              extend = .FALSE.
@@ -1781,8 +1786,8 @@
               message_string = 'netCDF file for volume data ' //             &
                                TRIM( var ) // ' from previous run found,' // &
-                               '&but this file cannot be extended due to' // &
+                               ' but this file cannot be extended due to' // &
                                ' mismatch in number of' //                   &
-                               '&vertical grid points (nz_do3d).' //         &
-                               '&New file is created instead.'
+                               ' vertical grid points (nz_do3d).' //         &
+                               ' New file is created instead.'
              CALL message( 'define_netcdf_header', 'PA0246', 0, 1, 0, 6, 0 )
              extend = .FALSE.
@@ -1822,11 +1827,11 @@
 
           IF ( last_time_coordinate(1) >= simulated_time )  THEN
-             message_string = 'netCDF file for volume data ' // &
+             message_string = 'netCDF file for volume data ' //             &
                               TRIM( var ) // ' from previous run found,' // &
-                              '&but this file cannot be extended becaus' // &
+                              ' but this file cannot be extended becaus' // &
                               'e the current output time' //                &
-                              '&is less or equal than the last output t' // &
+                              ' is less or equal than the last output t' // &
                               'ime on this file.' //                        &
-                              '&New file is created instead.'
+                              ' New file is created instead.'
              CALL message( 'define_netcdf_header', 'PA0247', 0, 1, 0, 6, 0 )
              do3d_time_count(av) = 0
@@ -1842,9 +1847,9 @@
                 message_string = 'netCDF file for volume data ' // &
                                  TRIM( var ) // ' from previous run found,' // &
-                                 '&but this file cannot be extended becaus' // &
-                                 'e the number of output time levels&has b' // &
+                                 ' but this file cannot be extended becaus' // &
+                                 'e the number of output time levels has b' // &
                                  'een increased compared to the previous s' // &
                                  'imulation.' //                               &
-                                 '&New file is created instead.'
+                                 ' New file is created instead.'
                 CALL message( 'define_netcdf_header', 'PA0388', 0, 1, 0, 6, 0 )
                 do3d_time_count(av) = 0
@@ -1912,5 +1917,5 @@
           message_string = 'netCDF file for volume data ' //             &
                            TRIM( var ) // ' from previous run found.' // &
-                           '&This file will be extended.'
+                           ' This file will be extended.'
           CALL message( 'define_netcdf_header', 'PA0248', 0, 0, 0, 6, 0 )
 
@@ -2470,7 +2475,7 @@
              message_string = 'netCDF file for cross-sections ' //           &
                               TRIM( var ) // ' from previous run found,' //  &
-                              '& but this file cannot be extended due to' // &
+                              ' but this file cannot be extended due to' //  &
                               ' variable mismatch.' //                       &
-                              '&New file is created instead.'
+                              ' New file is created instead.'
              CALL message( 'define_netcdf_header', 'PA0249', 0, 1, 0, 6, 0 )
              extend = .FALSE.
@@ -2503,8 +2508,8 @@
              message_string = 'netCDF file for cross-sections ' //          &
                               TRIM( var ) // ' from previous run found,' // &
-                              '&but this file cannot be extended due to' // &
+                              ' but this file cannot be extended due to' // &
                               ' mismatch in number of' //                   &
-                              '&cross sections.' //                         &
-                              '&New file is created instead.'
+                              ' cross sections.' //                         &
+                              ' New file is created instead.'
              CALL message( 'define_netcdf_header', 'PA0250', 0, 1, 0, 6, 0 )
              extend = .FALSE.
@@ -2522,11 +2527,11 @@
              IF ( section(i,1) /= -1 )  THEN
                 IF ( zu(section(i,1)) /= netcdf_data(i) )  THEN
-                   message_string = 'netCDF file for cross-sections ' //     &
-                               TRIM( var ) // ' from previous run found,' // &
-                               '&but this file cannot be extended' //        &
-                               ' due to mismatch in cross' //                &
-                               '&section levels.' //                         &
-                               '&New file is created instead.'
-                   CALL message( 'define_netcdf_header', 'PA0251', &
+                   message_string = 'netCDF file for cross-sections ' //       &
+                               TRIM( var ) // ' from previous run found,' //   &
+                               ' but this file cannot be extended' //          &
+                               ' due to mismatch in cross' //                  &
+                               ' section levels.' //                           &
+                               ' New file is created instead.'
+                   CALL message( 'define_netcdf_header', 'PA0251',             &
                                                                  0, 1, 0, 6, 0 )
                    extend = .FALSE.
@@ -2535,11 +2540,11 @@
              ELSE
                 IF ( -1.0_wp /= netcdf_data(i) )  THEN
-                   message_string = 'netCDF file for cross-sections ' //     &
-                               TRIM( var ) // ' from previous run found,' // &
-                               '&but this file cannot be extended' //        &
-                               ' due to mismatch in cross' //                &
-                               '&section levels.' //                         &
-                               '&New file is created instead.'
-                   CALL message( 'define_netcdf_header', 'PA0251',&
+                   message_string = 'netCDF file for cross-sections ' //       &
+                               TRIM( var ) // ' from previous run found,' //   &
+                               ' but this file cannot be extended' //          &
+                               ' due to mismatch in cross' //                  &
+                               ' section levels.' //                           &
+                               ' New file is created instead.'
+                   CALL message( 'define_netcdf_header', 'PA0251',             &
                                                                  0, 1, 0, 6, 0 )
                    extend = .FALSE.
@@ -2575,18 +2580,18 @@
           IF ( netcdf_data_format < 5 ) do2d_xy_time_count(av) = ntime_count
 
-          nc_stat = NF90_GET_VAR( id_set_xy(av), id_var_time_xy(av),    &
-                                  last_time_coordinate,                 &
-                                  start = (/ do2d_xy_time_count(av) /), &
+          nc_stat = NF90_GET_VAR( id_set_xy(av), id_var_time_xy(av),           &
+                                  last_time_coordinate,                        &
+                                  start = (/ do2d_xy_time_count(av) /),        &
                                   count = (/ 1 /) )
           CALL netcdf_handle_error( 'netcdf_define_header', 137 )
 
           IF ( last_time_coordinate(1) >= simulated_time )  THEN
-             message_string = 'netCDF file for cross sections ' //          &
-                              TRIM( var ) // ' from previous run found,' // &
-                              '&but this file cannot be extended becaus' // &
-                              'e the current output time' //                &
-                              '&is less or equal than the last output t' // &
-                              'ime on this file.' //                        &
-                              '&New file is created instead.'
+             message_string = 'netCDF file for cross sections ' //             &
+                              TRIM( var ) // ' from previous run found,' //    &
+                              ' but this file cannot be extended becaus' //    &
+                              'e the current output time' //                   &
+                              ' is less or equal than the last output t' //    &
+                              'ime on this file.' //                           &
+                              ' New file is created instead.'
              CALL message( 'define_netcdf_header', 'PA0252', 0, 1, 0, 6, 0 )
              do2d_xy_time_count(av) = 0
@@ -2602,9 +2607,9 @@
                 message_string = 'netCDF file for cross sections ' //          &
                                  TRIM( var ) // ' from previous run found,' // &
-                                 '&but this file cannot be extended becaus' // &
-                                 'e the number of output time levels&has b' // &
+                                 ' but this file cannot be extended becaus' // &
+                                 'e the number of output time levels has b' // &
                                  'een increased compared to the previous s' // &
                                  'imulation.' //                               &
-                                 '&New file is created instead.'
+                                 ' New file is created instead.'
                 CALL message( 'define_netcdf_header', 'PA0389', 0, 1, 0, 6, 0 )
                 do2d_xy_time_count(av) = 0
@@ -2666,13 +2671,13 @@
           nc_stat = NF90_REDEF( id_set_xy(av) )
           CALL netcdf_handle_error( 'netcdf_define_header', 431 )
-          nc_stat = NF90_PUT_ATT( id_set_xy(av), NF90_GLOBAL, 'title', &
-                                  TRIM( run_description_header ) //    &
+          nc_stat = NF90_PUT_ATT( id_set_xy(av), NF90_GLOBAL, 'title',         &
+                                  TRIM( run_description_header ) //            &
                                   TRIM( time_average_text ) )
           CALL netcdf_handle_error( 'netcdf_define_header', 139 )
           nc_stat = NF90_ENDDEF( id_set_xy(av) )
           CALL netcdf_handle_error( 'netcdf_define_header', 432 )
-          message_string = 'netCDF file for cross-sections ' //           &
-                            TRIM( var ) // ' from previous run found.' // &
-                           '&This file will be extended.'
+          message_string = 'netCDF file for cross-sections ' //                &
+                            TRIM( var ) // ' from previous run found.' //      &
+                           ' This file will be extended.'
           CALL message( 'define_netcdf_header', 'PA0253', 0, 0, 0, 6, 0 )
           
@@ -2682,5 +2687,5 @@
 !
 !--       Define some global attributes of the dataset
-          nc_stat = NF90_PUT_ATT( id_set_xz(av), NF90_GLOBAL, 'Conventions', &
+          nc_stat = NF90_PUT_ATT( id_set_xz(av), NF90_GLOBAL, 'Conventions',   &
                                   'COARDS' )
           CALL netcdf_handle_error( 'netcdf_define_header', 140 )
@@ -2689,9 +2694,9 @@
              time_average_text = ' '
           ELSE
-             WRITE (time_average_text, '('', '',F7.1,'' s average'')') &
+             WRITE (time_average_text, '('', '',F7.1,'' s average'')')         &
                                                             averaging_interval
           ENDIF
-          nc_stat = NF90_PUT_ATT( id_set_xz(av), NF90_GLOBAL, 'title', &
-                                  TRIM( run_description_header )  //   &
+          nc_stat = NF90_PUT_ATT( id_set_xz(av), NF90_GLOBAL, 'title',         &
+                                  TRIM( run_description_header )  //           &
                                   TRIM( time_average_text ) )
           CALL netcdf_handle_error( 'netcdf_define_header', 141 )
@@ -2879,7 +2884,7 @@
 
                       IF ( .NOT. found )  THEN
-                         WRITE ( message_string, * ) 'no grid defined for', &
+                         WRITE ( message_string, * ) 'no grid defined for',    &
                                                 ' variable ', TRIM( do2d(av,i) )
-                         CALL message( 'define_netcdf_header', 'PA0244', &
+                         CALL message( 'define_netcdf_header', 'PA0244',       &
                                        0, 1, 0, 6, 0 )
                       ENDIF
@@ -3113,7 +3118,7 @@
              message_string = 'netCDF file for cross-sections ' //           &
                               TRIM( var ) // ' from previous run found,' //  &
-                              '& but this file cannot be extended due to' // &
+                              ' but this file cannot be extended due to' //  &
                               ' variable mismatch.' //                       &
-                              '&New file is created instead.'
+                              ' New file is created instead.'
              CALL message( 'define_netcdf_header', 'PA0249', 0, 1, 0, 6, 0 )
              extend = .FALSE.
@@ -3146,8 +3151,8 @@
              message_string = 'netCDF file for cross-sections ' //          &
                               TRIM( var ) // ' from previous run found,' // &
-                              '&but this file cannot be extended due to' // &
+                              ' but this file cannot be extended due to' // &
                               ' mismatch in number of' //                   & 
-                              '&cross sections.' //                         &
-                              '&New file is created instead.'
+                              ' cross sections.' //                         &
+                              ' New file is created instead.'
              CALL message( 'define_netcdf_header', 'PA0250', 0, 1, 0, 6, 0 )
              extend = .FALSE.
@@ -3165,11 +3170,11 @@
              IF ( section(i,2) /= -1 )  THEN
                 IF ( ( ( section(i,2) + 0.5 ) * dy ) /= netcdf_data(i) )  THEN
-                   message_string = 'netCDF file for cross-sections ' //     &
-                               TRIM( var ) // ' from previous run found,' // &
-                               '&but this file cannot be extended' //        &
-                               ' due to mismatch in cross' //                &
-                               '&section levels.' //                         &
-                                '&New file is created instead.'
-                   CALL message( 'define_netcdf_header', 'PA0251', &
+                   message_string = 'netCDF file for cross-sections ' //       &
+                               TRIM( var ) // ' from previous run found,' //   &
+                               ' but this file cannot be extended' //          &
+                               ' due to mismatch in cross' //                  &
+                               ' section levels.' //                           &
+                               ' New file is created instead.'
+                   CALL message( 'define_netcdf_header', 'PA0251',             &
                                                                  0, 1, 0, 6, 0 )
                    extend = .FALSE.
@@ -3178,11 +3183,11 @@
              ELSE
                 IF ( -1.0_wp /= netcdf_data(i) )  THEN
-                   message_string = 'netCDF file for cross-sections ' //     &
-                               TRIM( var ) // ' from previous run found,' // &
-                               '&but this file cannot be extended' //        &
-                               ' due to mismatch in cross' //                &
-                               '&section levels.' //                         &
-                               '&New file is created instead.'
-                   CALL message( 'define_netcdf_header', 'PA0251', &
+                   message_string = 'netCDF file for cross-sections ' //       &
+                               TRIM( var ) // ' from previous run found,' //   &
+                               ' but this file cannot be extended' //          &
+                               ' due to mismatch in cross' //                  &
+                               ' section levels.' //                           &
+                               ' New file is created instead.'
+                   CALL message( 'define_netcdf_header', 'PA0251',             &
                                                                  0, 1, 0, 6, 0 )
                    extend = .FALSE.
@@ -3218,18 +3223,18 @@
           IF ( netcdf_data_format < 5 ) do2d_xz_time_count(av) = ntime_count
 
-          nc_stat = NF90_GET_VAR( id_set_xz(av), id_var_time_xz(av),    &
-                                  last_time_coordinate,                 &
-                                  start = (/ do2d_xz_time_count(av) /), &
+          nc_stat = NF90_GET_VAR( id_set_xz(av), id_var_time_xz(av),           &
+                                  last_time_coordinate,                        &
+                                  start = (/ do2d_xz_time_count(av) /),        &
                                   count = (/ 1 /) )
           CALL netcdf_handle_error( 'netcdf_define_header', 176 )
 
           IF ( last_time_coordinate(1) >= simulated_time )  THEN
-             message_string = 'netCDF file for cross sections ' //          &
-                              TRIM( var ) // ' from previous run found,' // &
-                              '&but this file cannot be extended becaus' // &
-                              'e the current output time' //                &
-                              '&is less or equal than the last output t' // &
-                              'ime on this file.' //                        &
-                              '&New file is created instead.'
+             message_string = 'netCDF file for cross sections ' //             &
+                              TRIM( var ) // ' from previous run found,' //    &
+                              ' but this file cannot be extended becaus' //    &
+                              'e the current output time' //                   &
+                              ' is less or equal than the last output t' //    &
+                              'ime on this file.' //                           &
+                              ' New file is created instead.'
              CALL message( 'define_netcdf_header', 'PA0252', 0, 1, 0, 6, 0 )
              do2d_xz_time_count(av) = 0
@@ -3245,9 +3250,9 @@
                 message_string = 'netCDF file for cross sections ' // &
                                  TRIM( var ) // ' from previous run found,' // &
-                                 '&but this file cannot be extended becaus' // &
-                                 'e the number of output time levels&has b' // &
+                                 ' but this file cannot be extended becaus' // &
+                                 'e the number of output time levels has b' // &
                                  'een increased compared to the previous s' // &
                                  'imulation.' //                               &
-                                 '&New file is created instead.'
+                                 ' New file is created instead.'
                 CALL message( 'define_netcdf_header', 'PA0390', 0, 1, 0, 6, 0 )
                 do2d_xz_time_count(av) = 0
@@ -3325,13 +3330,13 @@
           nc_stat = NF90_REDEF( id_set_xz(av) )
           CALL netcdf_handle_error( 'netcdf_define_header', 433 )
-          nc_stat = NF90_PUT_ATT( id_set_xz(av), NF90_GLOBAL, 'title', &
-                                  TRIM( run_description_header ) //    &
+          nc_stat = NF90_PUT_ATT( id_set_xz(av), NF90_GLOBAL, 'title',         &
+                                  TRIM( run_description_header ) //            &
                                   TRIM( time_average_text ) )
           CALL netcdf_handle_error( 'netcdf_define_header', 178 )
           nc_stat = NF90_ENDDEF( id_set_xz(av) )
           CALL netcdf_handle_error( 'netcdf_define_header', 434 )
-          message_string = 'netCDF file for cross-sections ' //           &
-                            TRIM( var ) // ' from previous run found.' // &
-                           '&This file will be extended.'
+          message_string = 'netCDF file for cross-sections ' //                &
+                            TRIM( var ) // ' from previous run found.' //      &
+                           ' This file will be extended.'
           CALL message( 'define_netcdf_header', 'PA0253', 0, 0, 0, 6, 0 )
 
@@ -3341,5 +3346,5 @@
 !
 !--       Define some global attributes of the dataset
-          nc_stat = NF90_PUT_ATT( id_set_yz(av), NF90_GLOBAL, 'Conventions', &
+          nc_stat = NF90_PUT_ATT( id_set_yz(av), NF90_GLOBAL, 'Conventions',   &
                                   'COARDS' )
           CALL netcdf_handle_error( 'netcdf_define_header', 179 )
@@ -3348,14 +3353,14 @@
              time_average_text = ' '
           ELSE
-             WRITE (time_average_text, '('', '',F7.1,'' s average'')') &
+             WRITE (time_average_text, '('', '',F7.1,'' s average'')')         &
                                                             averaging_interval
           ENDIF
-          nc_stat = NF90_PUT_ATT( id_set_yz(av), NF90_GLOBAL, 'title', &
-                                  TRIM( run_description_header ) //    &
+          nc_stat = NF90_PUT_ATT( id_set_yz(av), NF90_GLOBAL, 'title',         &
+                                  TRIM( run_description_header ) //            &
                                   TRIM( time_average_text ) )
           CALL netcdf_handle_error( 'netcdf_define_header', 180 )
           IF ( av == 1 )  THEN
              WRITE ( time_average_text,'(F7.1,'' s avg'')' )  averaging_interval
-             nc_stat = NF90_PUT_ATT( id_set_yz(av), NF90_GLOBAL, 'time_avg', &
+             nc_stat = NF90_PUT_ATT( id_set_yz(av), NF90_GLOBAL, 'time_avg',   &
                                      TRIM( time_average_text ) )
              CALL netcdf_handle_error( 'netcdf_define_header', 180 )
@@ -3759,7 +3764,7 @@
              message_string = 'netCDF file for cross-sections ' //           &
                               TRIM( var ) // ' from previous run found,' //  &
-                              '& but this file cannot be extended due to' // &
+                              ' but this file cannot be extended due to' //  &
                               ' variable mismatch.' //                       & 
-                              '&New file is created instead.'
+                              ' New file is created instead.'
              CALL message( 'define_netcdf_header', 'PA0249', 0, 1, 0, 6, 0 )
              extend = .FALSE.
@@ -3792,8 +3797,8 @@
              message_string = 'netCDF file for cross-sections ' //          &
                               TRIM( var ) // ' from previous run found,' // &
-                              '&but this file cannot be extended due to' // &
+                              ' but this file cannot be extended due to' // &
                               ' mismatch in number of' //                   &
-                              '&cross sections.' //                         &
-                              '&New file is created instead.'
+                              ' cross sections.' //                         &
+                              ' New file is created instead.'
              CALL message( 'define_netcdf_header', 'PA0250', 0, 1, 0, 6, 0 )
              extend = .FALSE.
@@ -3811,11 +3816,11 @@
              IF ( section(i,3) /= -1 )  THEN
                 IF ( ( ( section(i,3) + 0.5 ) * dx ) /= netcdf_data(i) )  THEN
-                   message_string = 'netCDF file for cross-sections ' //    &
-                              TRIM( var ) // ' from previous run found,' // &
-                              '&but this file cannot be extended' //        &
-                              ' due to mismatch in cross' //                &
-                              '&section levels.' //                         &
-                             '&New file is created instead.'
-                   CALL message( 'define_netcdf_header', 'PA0251', &
+                   message_string = 'netCDF file for cross-sections ' //       &
+                              TRIM( var ) // ' from previous run found,' //    &
+                              ' but this file cannot be extended' //           &
+                              ' due to mismatch in cross' //                   &
+                              ' section levels.' //                            &
+                              ' New file is created instead.'
+                   CALL message( 'define_netcdf_header', 'PA0251',             &
                                                                  0, 1, 0, 6, 0 )
                    extend = .FALSE.
@@ -3824,11 +3829,11 @@
              ELSE
                 IF ( -1.0_wp /= netcdf_data(i) )  THEN
-                   message_string = 'netCDF file for cross-sections ' //    &
-                              TRIM( var ) // ' from previous run found,' // &
-                              '&but this file cannot be extended' //        &
-                              ' due to mismatch in cross' //                &
-                              '&section levels.' //                         &
-                              '&New file is created instead.'
-                   CALL message( 'define_netcdf_header', 'PA0251', &
+                   message_string = 'netCDF file for cross-sections ' //       &
+                              TRIM( var ) // ' from previous run found,' //    &
+                              ' but this file cannot be extended' //           &
+                              ' due to mismatch in cross' //                   &
+                              ' section levels.' //                            &
+                              ' New file is created instead.'
+                   CALL message( 'define_netcdf_header', 'PA0251',             &
                                                                  0, 1, 0, 6, 0 )
                    extend = .FALSE.
@@ -3864,18 +3869,18 @@
           IF ( netcdf_data_format < 5 ) do2d_yz_time_count(av) = ntime_count
 
-          nc_stat = NF90_GET_VAR( id_set_yz(av), id_var_time_yz(av),    &
-                                  last_time_coordinate,                 &
-                                  start = (/ do2d_yz_time_count(av) /), &
+          nc_stat = NF90_GET_VAR( id_set_yz(av), id_var_time_yz(av),           &
+                                  last_time_coordinate,                        &
+                                  start = (/ do2d_yz_time_count(av) /),        &
                                   count = (/ 1 /) )
           CALL netcdf_handle_error( 'netcdf_define_header', 215 )
 
           IF ( last_time_coordinate(1) >= simulated_time )  THEN
-             message_string = 'netCDF file for cross sections ' //          &
-                              TRIM( var ) // ' from previous run found,' // &
-                              '&but this file cannot be extended becaus' // &
-                              'e the current output time' //                &
-                              '&is less or equal than the last output t' // &
-                              'ime on this file.' //                        &
-                              '&New file is created instead.'
+             message_string = 'netCDF file for cross sections ' //             &
+                              TRIM( var ) // ' from previous run found,' //    &
+                              ' but this file cannot be extended becaus' //    &
+                              'e the current output time' //                   &
+                              ' is less or equal than the last output t' //    &
+                              'ime on this file.' //                           &
+                              ' New file is created instead.'
              CALL message( 'define_netcdf_header', 'PA0252', 0, 1, 0, 6, 0 )
              do2d_yz_time_count(av) = 0
@@ -3891,9 +3896,9 @@
                 message_string = 'netCDF file for cross sections ' //          &
                                  TRIM( var ) // ' from previous run found,' // &
-                                 '&but this file cannot be extended becaus' // &
-                                 'e the number of output time levels&has b' // &
+                                 ' but this file cannot be extended becaus' // &
+                                 'e the number of output time levels has b' // &
                                  'een increased compared to the previous s' // &
                                  'imulation.' //                               &
-                                 '&New file is created instead.'
+                                 ' New file is created instead.'
                 CALL message( 'define_netcdf_header', 'PA0391', 0, 1, 0, 6, 0 )
                 do2d_yz_time_count(av) = 0
@@ -3971,13 +3976,13 @@
           nc_stat = NF90_REDEF( id_set_yz(av) )
           CALL netcdf_handle_error( 'netcdf_define_header', 435 )
-          nc_stat = NF90_PUT_ATT( id_set_yz(av), NF90_GLOBAL, 'title', &
-                                  TRIM( run_description_header ) //    &
+          nc_stat = NF90_PUT_ATT( id_set_yz(av), NF90_GLOBAL, 'title',         &
+                                  TRIM( run_description_header ) //            &
                                   TRIM( time_average_text ) )
           CALL netcdf_handle_error( 'netcdf_define_header', 217 )
           nc_stat = NF90_ENDDEF( id_set_yz(av) )
           CALL netcdf_handle_error( 'netcdf_define_header', 436 )
-          message_string = 'netCDF file for cross-sections ' //           &
-                            TRIM( var ) // ' from previous run found.' // &
-                           '&This file will be extended.'
+          message_string = 'netCDF file for cross-sections ' //                &
+                            TRIM( var ) // ' from previous run found.' //      &
+                           ' This file will be extended.'
           CALL message( 'define_netcdf_header', 'PA0253', 0, 0, 0, 6, 0 )
 
@@ -3988,16 +3993,16 @@
 !--       Define some global attributes of the dataset
           IF ( averaging_interval_pr /= 0.0_wp )  THEN
-             WRITE (time_average_text,'('', '',F7.1,'' s average'')') &
+             WRITE (time_average_text,'('', '',F7.1,'' s average'')')          &
                                                             averaging_interval_pr
-             nc_stat = NF90_PUT_ATT( id_set_pr, NF90_GLOBAL, 'title',   &
-                                     TRIM( run_description_header ) //  &
+             nc_stat = NF90_PUT_ATT( id_set_pr, NF90_GLOBAL, 'title',          &
+                                     TRIM( run_description_header ) //         &
                                      TRIM( time_average_text ) )
              CALL netcdf_handle_error( 'netcdf_define_header', 218 )
 
              WRITE ( time_average_text,'(F7.1,'' s avg'')' ) averaging_interval_pr
-             nc_stat = NF90_PUT_ATT( id_set_pr, NF90_GLOBAL, 'time_avg', &
+             nc_stat = NF90_PUT_ATT( id_set_pr, NF90_GLOBAL, 'time_avg',       &
                                      TRIM( time_average_text ) )
           ELSE
-             nc_stat = NF90_PUT_ATT( id_set_pr, NF90_GLOBAL, 'title', &
+             nc_stat = NF90_PUT_ATT( id_set_pr, NF90_GLOBAL, 'title',          &
                                      TRIM( run_description_header ) )
           ENDIF
@@ -4092,5 +4097,5 @@
              DO  j = 1, cross_profiles_count
 
-                IF ( TRIM(cross_profiles_char(j)) == TRIM(data_output_pr(i))) &
+                IF ( TRIM(cross_profiles_char(j)) == TRIM(data_output_pr(i)))  &
                 THEN
                    EXIT
@@ -4101,7 +4106,7 @@
                    cross_profiles_count = cross_profiles_count + 1
                    cross_profiles_maxi  = cross_profiles_maxi  + 1
-                   cross_profiles_char(MIN( crmax, cross_profiles_count )) =  &
+                   cross_profiles_char(MIN( crmax, cross_profiles_count )) =   &
                                                       TRIM( data_output_pr(i) )
-                   cross_profiles_numb(MIN( crmax, cross_profiles_count )) =  &
+                   cross_profiles_numb(MIN( crmax, cross_profiles_count )) =   &
                                                       cross_profiles_maxi
                 ENDIF
@@ -4111,7 +4116,7 @@
 
           IF ( cross_profiles_count >= crmax )  THEN
-             message_string = 'It is not allowed to arrange more than '     &
-                              // '100 profiles with & cross_profiles. Apart'&
-                              // ' from that, all profiles are saved & to ' &
+             message_string = 'It is not allowed to arrange more than '        &
+                              // '100 profiles with cross_profiles. Apart'     &
+                              // ' from that, all profiles are saved to '      &
                               // 'the netCDF file.'
              CALL message( 'define_netcdf_header', 'PA0354', 0, 0, 0, 6, 0 )
@@ -4285,9 +4290,9 @@
 
           IF ( TRIM( var_list ) /= TRIM( var_list_old ) )  THEN
-             message_string = 'netCDF file for vertical profiles ' //        &
-                              'from previous run found,' //                  &
-                              '& but this file cannot be extended due to' // &
-                              ' variable mismatch.' //                       &
-                              '&New file is created instead.'
+             message_string = 'netCDF file for vertical profiles ' //          &
+                              'from previous run found,' //                    &
+                              ' but this file cannot be extended due to' //    &
+                              ' variable mismatch.' //                         &
+                              ' New file is created instead.'
              CALL message( 'define_netcdf_header', 'PA0254', 0, 1, 0, 6, 0 )
              extend = .FALSE.
@@ -4319,11 +4324,11 @@
 
           IF ( last_time_coordinate(1) >= simulated_time )  THEN
-             message_string = 'netCDF file for vertical profiles ' //       &
-                              'from previous run found,' //                 &
-                              '&but this file cannot be extended becaus' // &
-                              'e the current output time' //                &
-                              '&is less or equal than the last output t' // &
-                              'ime on this file.' //                        &
-                              '&New file is created instead.'
+             message_string = 'netCDF file for vertical profiles ' //          &
+                              'from previous run found,' //                    &
+                              ' but this file cannot be extended becaus' //    &
+                              'e the current output time' //                   &
+                              ' is less or equal than the last output t' //    &
+                              'ime on this file.' //                           &
+                              ' New file is created instead.'
              CALL message( 'define_netcdf_header', 'PA0255', 0, 1, 0, 6, 0 )
              dopr_time_count = 0
@@ -4339,5 +4344,5 @@
  
              IF ( statistic_regions == 0 )  THEN
-                nc_stat = NF90_INQ_VARID( id_set_pr, data_output_pr(i), &
+                nc_stat = NF90_INQ_VARID( id_set_pr, data_output_pr(i),        &
                                           id_var_dopr(i,0) )
                 CALL netcdf_handle_error( 'netcdf_define_header', 245 )
@@ -4346,5 +4351,5 @@
                    WRITE ( suffix, '(''_'',I2.2)' )  j
                    netcdf_var_name = TRIM( data_output_pr(i) ) // suffix
-                   nc_stat = NF90_INQ_VARID( id_set_pr, netcdf_var_name, &
+                   nc_stat = NF90_INQ_VARID( id_set_pr, netcdf_var_name,       &
                                              id_var_dopr(i,j) )
                    CALL netcdf_handle_error( 'netcdf_define_header', 246 )
@@ -4378,6 +4383,6 @@
           nc_stat = NF90_REDEF( id_set_pr )
           CALL netcdf_handle_error( 'netcdf_define_header', 437 )
-          nc_stat = NF90_PUT_ATT( id_set_pr, NF90_GLOBAL, 'title', &
-                                  TRIM( run_description_header ) //    &
+          nc_stat = NF90_PUT_ATT( id_set_pr, NF90_GLOBAL, 'title',             &
+                                  TRIM( run_description_header ) //            &
                                   TRIM( time_average_text ) )
           CALL netcdf_handle_error( 'netcdf_define_header', 248 )
@@ -4385,7 +4390,7 @@
           nc_stat = NF90_ENDDEF( id_set_pr )
           CALL netcdf_handle_error( 'netcdf_define_header', 438 )
-          message_string = 'netCDF file for vertical profiles ' // &
-                           'from previous run found.' //           &
-                           '&This file will be extended.'
+          message_string = 'netCDF file for vertical profiles ' //             &
+                           'from previous run found.' //                       &
+                           ' This file will be extended.'
           CALL message( 'define_netcdf_header', 'PA0256', 0, 0, 0, 6, 0 )
 
@@ -4395,5 +4400,5 @@
 !
 !--       Define some global attributes of the dataset
-          nc_stat = NF90_PUT_ATT( id_set_ts, NF90_GLOBAL, 'title', &
+          nc_stat = NF90_PUT_ATT( id_set_ts, NF90_GLOBAL, 'title',             &
                                   TRIM( run_description_header ) )
           CALL netcdf_handle_error( 'netcdf_define_header', 249 )
@@ -4476,5 +4481,5 @@
                 DO  j = 0, statistic_regions
                    WRITE ( suffix, '(''_'',I2.2)' )  j
-                   var_list = TRIM( var_list ) // TRIM( dots_label(i) ) // &
+                   var_list = TRIM( var_list ) // TRIM( dots_label(i) ) //     &
                               suffix // ';'
                 ENDDO
@@ -4484,9 +4489,9 @@
 
           IF ( TRIM( var_list ) /= TRIM( var_list_old ) )  THEN
-             message_string = 'netCDF file for time series ' //              &
-                              'from previous run found,' //                  &
-                              '& but this file cannot be extended due to' // &
-                              ' variable mismatch.' //                       &
-                              '&New file is created instead.'
+             message_string = 'netCDF file for time series ' //                &
+                              'from previous run found,' //                    &
+                              ' but this file cannot be extended due to' //    &
+                              ' variable mismatch.' //                         &
+                              ' New file is created instead.'
              CALL message( 'define_netcdf_header', 'PA0257', 0, 1, 0, 6, 0 )
              extend = .FALSE.
@@ -4502,27 +4507,27 @@
           CALL netcdf_handle_error( 'netcdf_define_header', 261 )
 
-          nc_stat = NF90_INQUIRE_VARIABLE( id_set_ts, id_var_time_ts, &
+          nc_stat = NF90_INQUIRE_VARIABLE( id_set_ts, id_var_time_ts,          &
                                            dimids = id_dim_time_old )
           CALL netcdf_handle_error( 'netcdf_define_header', 262 )
           id_dim_time_ts = id_dim_time_old(1)
 
-          nc_stat = NF90_INQUIRE_DIMENSION( id_set_ts, id_dim_time_ts, &
+          nc_stat = NF90_INQUIRE_DIMENSION( id_set_ts, id_dim_time_ts,         &
                                             len = dots_time_count )
           CALL netcdf_handle_error( 'netcdf_define_header', 263 )
 
-          nc_stat = NF90_GET_VAR( id_set_ts, id_var_time_ts,        &
-                                  last_time_coordinate,             &
-                                  start = (/ dots_time_count /), &
+          nc_stat = NF90_GET_VAR( id_set_ts, id_var_time_ts,                   &
+                                  last_time_coordinate,                        &
+                                  start = (/ dots_time_count /),               &
                                   count = (/ 1 /) )
           CALL netcdf_handle_error( 'netcdf_define_header', 264 )
 
           IF ( last_time_coordinate(1) >= simulated_time )  THEN
-             message_string = 'netCDF file for time series ' //             &
-                              'from previous run found,' //                 &
-                              '&but this file cannot be extended becaus' // &
-                              'e the current output time' //                &
-                              '&is less or equal than the last output t' // &
-                              'ime on this file.' //                        &
-                              '&New file is created instead.'
+             message_string = 'netCDF file for time series ' //                &
+                              'from previous run found,' //                    &
+                              ' but this file cannot be extended becaus' //    &
+                              'e the current output time' //                   &
+                              ' is less or equal than the last output t' //    &
+                              'ime on this file.' //                           &
+                              ' New file is created instead.'
              CALL message( 'define_netcdf_header', 'PA0258', 0, 1, 0, 6, 0 )
              dots_time_count = 0
@@ -4562,12 +4567,12 @@
           nc_stat = NF90_REDEF( id_set_ts )
           CALL netcdf_handle_error( 'netcdf_define_header', 439 )
-          nc_stat = NF90_PUT_ATT( id_set_ts, NF90_GLOBAL, 'title', &
+          nc_stat = NF90_PUT_ATT( id_set_ts, NF90_GLOBAL, 'title',             &
                                   TRIM( run_description_header ) )
           CALL netcdf_handle_error( 'netcdf_define_header', 267 )
           nc_stat = NF90_ENDDEF( id_set_ts )
           CALL netcdf_handle_error( 'netcdf_define_header', 440 )
-          message_string = 'netCDF file for time series ' // &
-                           'from previous run found.' //     &
-                           '&This file will be extended.'
+          message_string = 'netCDF file for time series ' //                   &
+                           'from previous run found.' //                       &
+                           ' This file will be extended.'
           CALL message( 'define_netcdf_header', 'PA0259', 0, 0, 0, 6, 0 )
 
@@ -4578,8 +4583,8 @@
 !--       Define some global attributes of the dataset
           IF ( averaging_interval_sp /= 0.0_wp )  THEN
-             WRITE (time_average_text,'('', '',F7.1,'' s average'')') &
+             WRITE (time_average_text,'('', '',F7.1,'' s average'')')          &
                                                             averaging_interval_sp
-             nc_stat = NF90_PUT_ATT( id_set_sp, NF90_GLOBAL, 'title',  &
-                                     TRIM( run_description_header ) // &
+             nc_stat = NF90_PUT_ATT( id_set_sp, NF90_GLOBAL, 'title',          &
+                                     TRIM( run_description_header ) //         &
                                      TRIM( time_average_text ) )
              CALL netcdf_handle_error( 'netcdf_define_header', 268 )
@@ -4801,9 +4806,9 @@
 
           IF ( TRIM( var_list ) /= TRIM( var_list_old ) )  THEN
-             message_string = 'netCDF file for spectra  ' //                 &
-                              'from previous run found,' //                  &
-                              '& but this file cannot be extended due to' // &
-                              ' variable mismatch.' //                       &
-                              '&New file is created instead.'
+             message_string = 'netCDF file for spectra  ' //                   &
+                              'from previous run found,' //                    &
+                              ' but this file cannot be extended due to' //    &
+                              ' variable mismatch.' //                         &
+                              ' New file is created instead.'
              CALL message( 'define_netcdf_header', 'PA0260', 0, 1, 0, 6, 0 )
              extend = .FALSE.
@@ -4835,10 +4840,10 @@
 
           IF ( ns /= ns_old )  THEN
-             message_string = 'netCDF file for spectra ' //                 &
-                              ' from previous run found,' //                &
-                              '&but this file cannot be extended due to' // &
-                              ' mismatch in number of' //                   &
-                              '&vertical levels.' //                        &
-                              '&New file is created instead.'
+             message_string = 'netCDF file for spectra ' //                    &
+                              ' from previous run found,' //                   &
+                              ' but this file cannot be extended due to' //    &
+                              ' mismatch in number of' //                      &
+                              ' vertical levels.' //                           &
+                              ' New file is created instead.'
              CALL message( 'define_netcdf_header', 'PA0261', 0, 1, 0, 6, 0 )
              extend = .FALSE.
@@ -4857,8 +4862,8 @@
                 message_string = 'netCDF file for spectra ' //                 &
                                  ' from previous run found,' //                &
-                                 '&but this file cannot be extended due to' // &
+                                 ' but this file cannot be extended due to' // &
                                  ' mismatch in heights of' //                  &
-                                 '&vertical levels.' //                        &
-                                 '&New file is created instead.'
+                                 ' vertical levels.' //                        &
+                                 ' New file is created instead.'
                 CALL message( 'define_netcdf_header', 'PA0262', 0, 1, 0, 6, 0 )
                 extend = .FALSE.
@@ -4893,11 +4898,11 @@
 
           IF ( last_time_coordinate(1) >= simulated_time )  THEN
-             message_string = 'netCDF file for spectra ' //                 &
-                              'from previous run found,' //                 &
-                              '&but this file cannot be extended becaus' // &
-                              'e the current output time' //                & 
-                              '&is less or equal than the last output t' // &
-                              'ime on this file.' //                        &
-                              '&New file is created instead.'
+             message_string = 'netCDF file for spectra ' //                    &
+                              'from previous run found,' //                    &
+                              ' but this file cannot be extended becaus' //    &
+                              'e the current output time' //                   &  
+                              ' is less or equal than the last output t' //    &
+                              'ime on this file.' //                           &
+                              ' New file is created instead.'
              CALL message( 'define_netcdf_header', 'PA0263', 0, 1, 0, 6, 0 )
              dosp_time_count = 0
@@ -4948,8 +4953,8 @@
 
              WRITE ( time_average_text,'(F7.1,'' s avg'')' )  averaging_interval_sp
-             nc_stat = NF90_PUT_ATT( id_set_sp, NF90_GLOBAL, 'time_avg', &
+             nc_stat = NF90_PUT_ATT( id_set_sp, NF90_GLOBAL, 'time_avg',       &
                                      TRIM( time_average_text ) )
           ELSE
-             nc_stat = NF90_PUT_ATT( id_set_sp, NF90_GLOBAL, 'title', &
+             nc_stat = NF90_PUT_ATT( id_set_sp, NF90_GLOBAL, 'title',          &
                                      TRIM( run_description_header ) )
           ENDIF
@@ -4957,59 +4962,61 @@
           nc_stat = NF90_ENDDEF( id_set_sp )
           CALL netcdf_handle_error( 'netcdf_define_header', 442 )
-          message_string = 'netCDF file for spectra ' //     &
-                           'from previous run found.' //     &
-                           '&This file will be extended.'
+          message_string = 'netCDF file for spectra ' //                       &
+                           'from previous run found.' //                       &
+                           ' This file will be extended.'
           CALL message( 'define_netcdf_header', 'PA0264', 0, 0, 0, 6, 0 )
 
-
-       CASE ( 'pt_new' )
+!
+!--     Currently disabled (DATA_PRT_NETCDF)
+!       CASE ( 'pt_new' )
 
 !
 !--       Define some global attributes of the dataset
-          nc_stat = NF90_PUT_ATT( id_set_prt, NF90_GLOBAL, 'title', &
-                                  TRIM( run_description_header ) )
-          CALL netcdf_handle_error( 'netcdf_define_header', 310 )
+!          nc_stat = NF90_PUT_ATT( id_set_prt, NF90_GLOBAL, 'title',            &
+!                                  TRIM( run_description_header ) )
+!          CALL netcdf_handle_error( 'netcdf_define_header', 310 )
 
 !
 !--       Define time coordinate for particles (unlimited dimension)
-          CALL netcdf_create_dim( id_set_prt, 'time', NF90_UNLIMITED,          &
-                                  id_dim_time_prt, 311 )
-          CALL netcdf_create_var( id_set_prt, (/ id_dim_time_prt /), 'time',   &
-                                  NF90_DOUBLE, id_var_time_prt, 'seconds', '', &
-                                  312, 313, 000 )
+!          CALL netcdf_create_dim( id_set_prt, 'time', NF90_UNLIMITED,          &
+!                                  id_dim_time_prt, 311 )
+!          CALL netcdf_create_var( id_set_prt, (/ id_dim_time_prt /), 'time',   &
+!                                  NF90_DOUBLE, id_var_time_prt, 'seconds', '', &
+!                                  312, 313, 000 )
 !
 !--       netCDF4 allows more than one unlimited dimension
-          CALL netcdf_create_dim( id_set_prt, 'particle_number',            &
-                                  NF90_UNLIMITED, id_dim_prtnum, 314 )
-
-          CALL netcdf_create_var( id_set_prt, (/ id_dim_prtnum /),             &
-                                  'particle_number', NF90_DOUBLE,              &
-                                  id_var_prtnum, 'particle number', '', 315,   &
-                                  316, 000 )
+!          CALL netcdf_create_dim( id_set_prt, 'particle_number',            &
+!                                  NF90_UNLIMITED, id_dim_prtnum, 314 )
+
+!          CALL netcdf_create_var( id_set_prt, (/ id_dim_prtnum /),             &
+!                                  'particle_number', NF90_DOUBLE,              &
+!                                  id_var_prtnum, 'particle number', '', 315,   &
+!                                  316, 000 )
 !
 !--       Define variable which contains the real number of particles in use
-          CALL netcdf_create_var( id_set_prt, (/ id_dim_time_prt /),           &
-                                  'real_num_of_prt', NF90_DOUBLE,              &
-                                  id_var_rnop_prt, 'particle number', '', 317, &
-                                  318, 000 )
+!          CALL netcdf_create_var( id_set_prt, (/ id_dim_time_prt /),           &
+!                                  'real_num_of_prt', NF90_DOUBLE,              &
+!                                  id_var_rnop_prt, 'particle number', '', 317, &
+!                                  318, 000 )
 !
 !--       Define the variables
-          DO  i = 1, 17
-
-             CALL netcdf_create_var( id_set_prt, (/ id_dim_prtnum,             &
-                                     id_dim_time_prt /), prt_var_names(i),     &
-                                     nc_precision(8), id_var_prt(i),           &
-                                     TRIM( prt_var_units(i) ),                 &
-                                     TRIM( prt_var_names(i) ), 319, 320, 321 )
-
-          ENDDO
+!          DO  i = 1, 17
+
+!             CALL netcdf_create_var( id_set_prt, (/ id_dim_prtnum,             &
+!                                     id_dim_time_prt /), prt_var_names(i),     &
+!                                     nc_precision(8), id_var_prt(i),           &
+!                                     TRIM( prt_var_units(i) ),                 &
+!                                     TRIM( prt_var_names(i) ), 319, 320, 321 )
+
+!          ENDDO
 
 !
 !--       Leave netCDF define mode
-          nc_stat = NF90_ENDDEF( id_set_prt )
-          CALL netcdf_handle_error( 'netcdf_define_header', 322 )
-
-
-       CASE ( 'pt_ext' )
+!          nc_stat = NF90_ENDDEF( id_set_prt )
+!          CALL netcdf_handle_error( 'netcdf_define_header', 322 )
+
+!
+!--     Currently disabled (DATA_PRT_NETCDF)
+!       CASE ( 'pt_ext' )
 
 !
@@ -5018,55 +5025,55 @@
 !--       The current time must be larger than the last output time
 !--       on the file.
-          nc_stat = NF90_INQ_VARID( id_set_prt, 'time', id_var_time_prt )
-          CALL netcdf_handle_error( 'netcdf_define_header', 323 )
-
-          nc_stat = NF90_INQUIRE_VARIABLE( id_set_prt, id_var_time_prt, &
-                                           dimids = id_dim_time_old )
-          CALL netcdf_handle_error( 'netcdf_define_header', 324 )
-          id_dim_time_prt = id_dim_time_old(1)
-
-          nc_stat = NF90_INQUIRE_DIMENSION( id_set_prt, id_dim_time_prt, &
-                                            len = prt_time_count )
-          CALL netcdf_handle_error( 'netcdf_define_header', 325 )
-
-          nc_stat = NF90_GET_VAR( id_set_prt, id_var_time_prt,  &
-                                  last_time_coordinate,         &
-                                  start = (/ prt_time_count /), &
-                                  count = (/ 1 /) )
-          CALL netcdf_handle_error( 'netcdf_define_header', 326 )
-
-          IF ( last_time_coordinate(1) >= simulated_time )  THEN
-             message_string = 'netCDF file for particles ' //               &
-                              'from previous run found,' //                 &
-                              '&but this file cannot be extended becaus' // &
-                              'e the current output time' //                &
-                              '&is less or equal than the last output t' // &
-                              'ime on this file.' //                        &
-                              '&New file is created instead.'
-             CALL message( 'define_netcdf_header', 'PA0265', 0, 1, 0, 6, 0 )
-             prt_time_count = 0
-             extend = .FALSE.
-             RETURN
-          ENDIF
+!          nc_stat = NF90_INQ_VARID( id_set_prt, 'time', id_var_time_prt )
+!          CALL netcdf_handle_error( 'netcdf_define_header', 323 )
+
+!          nc_stat = NF90_INQUIRE_VARIABLE( id_set_prt, id_var_time_prt, &
+!                                           dimids = id_dim_time_old )
+!          CALL netcdf_handle_error( 'netcdf_define_header', 324 )
+!          id_dim_time_prt = id_dim_time_old(1)
+
+!          nc_stat = NF90_INQUIRE_DIMENSION( id_set_prt, id_dim_time_prt, &
+!                                            len = prt_time_count )
+!          CALL netcdf_handle_error( 'netcdf_define_header', 325 )
+
+!          nc_stat = NF90_GET_VAR( id_set_prt, id_var_time_prt,  &
+!                                  last_time_coordinate,         &
+!                                  start = (/ prt_time_count /), &
+!                                  count = (/ 1 /) )
+!          CALL netcdf_handle_error( 'netcdf_define_header', 326 )
+
+!          IF ( last_time_coordinate(1) >= simulated_time )  THEN
+!             message_string = 'netCDF file for particles ' //                  &
+!                              'from previous run found,' //                    &
+!                              ' but this file cannot be extended becaus' //    &
+!                              'e the current output time' //                   &
+!                              ' is less or equal than the last output t' //    &
+!                              'ime on this file.' //                           &
+!                              ' New file is created instead.'
+!             CALL message( 'define_netcdf_header', 'PA0265', 0, 1, 0, 6, 0 )
+!             prt_time_count = 0
+!             extend = .FALSE.
+!             RETURN
+!          ENDIF
 
 !
 !--       Dataset seems to be extendable.
 !--       Now get the variable ids.
-          nc_stat = NF90_INQ_VARID( id_set_prt, 'real_num_of_prt', &
-                                    id_var_rnop_prt )
-          CALL netcdf_handle_error( 'netcdf_define_header', 327 )
-
-          DO  i = 1, 17
-
-             nc_stat = NF90_INQ_VARID( id_set_prt, prt_var_names(i), &
-                                       id_var_prt(i) )
-             CALL netcdf_handle_error( 'netcdf_define_header', 328 )
-
-          ENDDO
-
-          message_string = 'netCDF file for particles ' // &
-                           'from previous run found.' //   &
-                           '&This file will be extended.'
-          CALL message( 'define_netcdf_header', 'PA0266', 0, 0, 0, 6, 0 )
+!         nc_stat = NF90_INQ_VARID( id_set_prt, 'real_num_of_prt',             &
+!                                   id_var_rnop_prt )
+!         CALL netcdf_handle_error( 'netcdf_define_header', 327 )
+
+!          DO  i = 1, 17
+
+!             nc_stat = NF90_INQ_VARID( id_set_prt, prt_var_names(i),           &
+!                                       id_var_prt(i) )
+!             CALL netcdf_handle_error( 'netcdf_define_header', 328 )
+
+!          ENDDO
+
+!          message_string = 'netCDF file for particles ' //                     &
+!                           'from previous run found.' //                       &
+!                           ' This file will be extended.'
+!          CALL message( 'define_netcdf_header', 'PA0266', 0, 0, 0, 6, 0 )
         
 
@@ -5076,5 +5083,5 @@
 !
 !--       Define some global attributes of the dataset
-          nc_stat = NF90_PUT_ATT( id_set_pts, NF90_GLOBAL, 'title', &
+          nc_stat = NF90_PUT_ATT( id_set_pts, NF90_GLOBAL, 'title',            &
                                   TRIM( run_description_header ) )
           CALL netcdf_handle_error( 'netcdf_define_header', 396 )
@@ -5173,9 +5180,9 @@
 
           IF ( TRIM( var_list ) /= TRIM( var_list_old ) )  THEN
-             message_string = 'netCDF file for particle time series ' //     &
-                              'from previous run found,' //                  &
-                              '& but this file cannot be extended due to' // &
-                              ' variable mismatch.' //                       &
-                              '&New file is created instead.'
+             message_string = 'netCDF file for particle time series ' //       &
+                              'from previous run found,' //                    &
+                              ' but this file cannot be extended due to' //    &
+                              ' variable mismatch.' //                         &
+                              ' New file is created instead.'
              CALL message( 'define_netcdf_header', 'PA0267', 0, 1, 0, 6, 0 )
              extend = .FALSE.
@@ -5207,11 +5214,11 @@
 
           IF ( last_time_coordinate(1) >= simulated_time )  THEN
-             message_string = 'netCDF file for particle time series ' //    &
-                              'from previous run found,' //                 &
-                              '&but this file cannot be extended becaus' // &
-                              'e the current output time' //                &
-                              '&is less or equal than the last output t' // &
-                              'ime on this file.' //                        &
-                              '&New file is created instead.'
+             message_string = 'netCDF file for particle time series ' //       &
+                              'from previous run found,' //                    &
+                              ' but this file cannot be extended becaus' //    &
+                              'e the current output time' //                   &
+                              ' is less or equal than the last output t' //    &
+                              'ime on this file.' //                           &
+                              ' New file is created instead.'
              CALL message( 'define_netcdf_header', 'PA0268', 0, 1, 0, 6, 0 )
              dopts_time_count = 0
@@ -5255,12 +5262,12 @@
           nc_stat = NF90_REDEF( id_set_pts )
           CALL netcdf_handle_error( 'netcdf_define_header', 443 )
-          nc_stat = NF90_PUT_ATT( id_set_pts, NF90_GLOBAL, 'title', &
+          nc_stat = NF90_PUT_ATT( id_set_pts, NF90_GLOBAL, 'title',            &
                                   TRIM( run_description_header ) )
           CALL netcdf_handle_error( 'netcdf_define_header', 411 )
           nc_stat = NF90_ENDDEF( id_set_pts )
           CALL netcdf_handle_error( 'netcdf_define_header', 444 )
-          message_string = 'netCDF file for particle time series ' // &
-                           'from previous run found.' //              &
-                           '&This file will be extended.'
+          message_string = 'netCDF file for particle time series ' //          &
+                           'from previous run found.' //                       &
+                           ' This file will be extended.'
           CALL message( 'netcdf_define_header', 'PA0269', 0, 0, 0, 6, 0 )
 
@@ -5355,7 +5362,7 @@
              message_string = 'netCDF file for flight time series ' //         &
                               'from previous run found,' //                    &
-                              '& but this file cannot be extended due to' //   &
+                              ' but this file cannot be extended due to' //    &
                               ' variable mismatch.' //                         &
-                              '&New file is created instead.'
+                              ' New file is created instead.'
              CALL message( 'define_netcdf_header', 'PA0257', 0, 1, 0, 6, 0 )
              extend = .FALSE.
@@ -5371,10 +5378,10 @@
           CALL netcdf_handle_error( 'netcdf_define_header', 261 )
 
-          nc_stat = NF90_INQUIRE_VARIABLE( id_set_fl, id_var_time_fl, &
+          nc_stat = NF90_INQUIRE_VARIABLE( id_set_fl, id_var_time_fl,          &
                                            dimids = id_dim_time_old )
           CALL netcdf_handle_error( 'netcdf_define_header', 262 )
           id_dim_time_fl = id_dim_time_old(1)
 
-          nc_stat = NF90_INQUIRE_DIMENSION( id_set_fl, id_dim_time_fl, &
+          nc_stat = NF90_INQUIRE_DIMENSION( id_set_fl, id_dim_time_fl,         &
                                             len = dofl_time_count )
           CALL netcdf_handle_error( 'netcdf_define_header', 263 )
@@ -5387,11 +5394,11 @@
 
           IF ( last_time_coordinate(1) >= simulated_time )  THEN
-             message_string = 'netCDF file for flight-time series ' //      &
-                              'from previous run found,' //                 &
-                              '&but this file cannot be extended becaus' // &
-                              'e the current output time' //                &
-                              '&is less or equal than the last output t' // &
-                              'ime on this file.' //                        &
-                              '&New file is created instead.'
+             message_string = 'netCDF file for flight-time series ' //         &
+                              'from previous run found,' //                    &
+                              ' but this file cannot be extended becaus' //    &
+                              'e the current output time' //                   &
+                              ' is less or equal than the last output t' //    &
+                              'ime on this file.' //                           &
+                              ' New file is created instead.'
              CALL message( 'define_netcdf_header', 'PA0258', 0, 1, 0, 6, 0 )
              dofl_time_count = 0
@@ -5441,5 +5448,5 @@
           message_string = 'netCDF file for flight-time series ' //            &
                            'from previous run found.' //                       &
-                           '&This file will be extended.'
+                           ' This file will be extended.'
           CALL message( 'define_netcdf_header', 'PA0259', 0, 0, 0, 6, 0 )
 
Index: palm/trunk/SOURCE/parin.f90
===================================================================
--- palm/trunk/SOURCE/parin.f90	(revision 3044)
+++ palm/trunk/SOURCE/parin.f90	(revision 3045)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! z_max_do2d removed, error messages revised
+! 
+! 2995 2018-04-19 12:13:16Z Giersch
 ! time_since_reference_point must be calculated/initialized before the first  
 ! call of functions related to the radiation model which occur in 
@@ -639,5 +642,5 @@
              skip_time_do2d_xy, skip_time_do2d_xz, skip_time_do2d_yz,          &
              skip_time_do3d, skip_time_domask, synchronous_exchange,           &
-             termination_time_needed, vnest_start_time, z_max_do2d
+             termination_time_needed, vnest_start_time
 
     NAMELIST /runtime_parameters/  averaging_interval, averaging_interval_pr,  &
@@ -660,5 +663,5 @@
              skip_time_do2d_xy, skip_time_do2d_xz, skip_time_do2d_yz,          &
              skip_time_do3d, skip_time_domask, synchronous_exchange,           &
-             termination_time_needed, vnest_start_time, z_max_do2d
+             termination_time_needed, vnest_start_time
 
     NAMELIST /envpar/  batch_job, host, local_dvrserver_running,               &
@@ -669,5 +672,5 @@
 !
 !-- First read values of environment variables (this NAMELIST file is
-!-- generated by mrun)
+!-- generated by palmrun)
     CALL location_message( 'reading environment parameters from ENVPAR', .FALSE. )
 
@@ -676,5 +679,5 @@
     IF ( ioerr /= 0 )  THEN
        message_string = 'local file ENVPAR not found' //                       &
-                        '&some variables for steering may not be properly set'
+                        ' some variables for steering may not be properly set'
        CALL message( 'parin', 'PA0276', 0, 1, 0, 6, 0 )
     ELSE
@@ -682,10 +685,10 @@
        IF ( ioerr < 0 )  THEN
           message_string = 'no envpar-NAMELIST found in local file '  //       &
-                           'ENVPAR&some variables for steering may '  //       &
+                           'ENVPAR or some variables for steering may '  //    &
                            'not be properly set'
           CALL message( 'parin', 'PA0278', 0, 1, 0, 6, 0 )
        ELSEIF ( ioerr > 0 )  THEN
           message_string = 'errors in local file ENVPAR' //                    &
-                           '&some variables for steering may not be properly set'
+                           ' some variables for steering may not be properly set'
           CALL message( 'parin', 'PA0277', 0, 1, 0, 6, 0 )
        ENDIF
@@ -742,6 +745,6 @@
           GOTO 12
 
- 10       message_string = 'errors in initialization_parameters &or no ' //    &
-                           'initialization_parameters-namelist ' //            &
+ 10       message_string = 'errors in &initialization_parameters or no ' //    &
+                           '&initialization_parameters-namelist ' //           &
                            'found (CRAY-machines only)'
           CALL message( 'parin', 'PA0271', 1, 2, 0, 6, 0 )
@@ -750,16 +753,16 @@
           READ ( 11, inipar, ERR=13, END=14 )
  
-          message_string = 'namelist inipar is deprecated and will be ' //     &
-                          'removed in near future. Please &use namelist ' //   &
-                          'initialization_parameters instead'
-          CALL message( 'parin', 'PA0272', 0, 1, 0, 6, 0 )
+          message_string = 'namelist &inipar is deprecated and will be ' //    &
+                          'removed in near future. Please use namelist ' //    &
+                          '&initialization_parameters instead'
+          CALL message( 'parin', 'PA0017', 0, 1, 0, 6, 0 )
  
           GOTO 12
  
- 13       message_string = 'errors in inipar &or no inipar-namelist ' //       &
+ 13       message_string = 'errors in inipar  or no inipar-namelist ' //       &
                            'found (CRAY-machines only)'
           CALL message( 'parin', 'PA0271', 1, 2, 0, 6, 0 )
           
- 14       message_string = 'no initialization_parameters-namelist found'
+ 14       message_string = 'no &initialization_parameters-namelist found'
           CALL message( 'parin', 'PA0272', 1, 2, 0, 6, 0 )
 
Index: palm/trunk/SOURCE/plant_canopy_model_mod.f90
===================================================================
--- palm/trunk/SOURCE/plant_canopy_model_mod.f90	(revision 3044)
+++ palm/trunk/SOURCE/plant_canopy_model_mod.f90	(revision 3045)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! Error message revised
+! 
+! 3022 2018-05-18 11:12:35Z suehring
 ! Bugfix in allocation of transpiration rate
 ! 
@@ -359,9 +362,9 @@
        IF ( canopy_drag_coeff == 0.0_wp )  THEN
           message_string = 'plant_canopy = .TRUE. requires a non-zero drag '// &
-                           'coefficient & given value is canopy_drag_coeff = 0.0'
+                           'coefficient, given value is canopy_drag_coeff = 0.0'
           CALL message( 'pcm_check_parameters', 'PA0041', 1, 2, 0, 6, 0 )
        ENDIF
     
-       IF ( ( alpha_lad /= 9999999.9_wp  .AND.  beta_lad == 9999999.9_wp )  .OR.&
+       IF ( ( alpha_lad /= 9999999.9_wp  .AND.  beta_lad == 9999999.9_wp ) .OR.&
               beta_lad /= 9999999.9_wp   .AND.  alpha_lad == 9999999.9_wp )  THEN
           message_string = 'using the beta function for the construction ' //  &
Index: palm/trunk/SOURCE/pmc_interface_mod.f90
===================================================================
--- palm/trunk/SOURCE/pmc_interface_mod.f90	(revision 3044)
+++ palm/trunk/SOURCE/pmc_interface_mod.f90	(revision 3045)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! Error messages revised
+! 
+! 3022 2018-05-18 11:12:35Z suehring
 ! Minor fix - working precision added to real number
 ! 
@@ -4107,6 +4110,6 @@
        IF ( end_time /= end_time_root )  THEN
           WRITE( message_string, * )  'mismatch between root model and ',      &
-               'child settings &   end_time(root) = ', end_time_root,          &
-               ' &   end_time(child) = ', end_time, ' & child value is set',   &
+               'child settings: end_time(root) = ', end_time_root,             &
+               ' end_time(child) = ', end_time, ' child value is set',         &
                ' to root value'
           CALL message( 'pmci_check_setting_mismatches', 'PA0419', 0, 1, 0, 6, &
@@ -4123,6 +4126,6 @@
        IF ( restart_time /= restart_time_root )  THEN
           WRITE( message_string, * )  'mismatch between root model and ',      &
-               'child settings &   restart_time(root) = ', restart_time_root,  &
-               ' &   restart_time(child) = ', restart_time, ' & child ',       &
+               'child settings: restart_time(root) = ', restart_time_root,     &
+               ' restart_time(child) = ', restart_time, ' child ',             &
                'value is set to root value'
           CALL message( 'pmci_check_setting_mismatches', 'PA0419', 0, 1, 0, 6, &
@@ -4139,6 +4142,6 @@
        IF ( dt_restart /= dt_restart_root )  THEN
           WRITE( message_string, * )  'mismatch between root model and ',      &
-               'child settings &   dt_restart(root) = ', dt_restart_root,      &
-               ' &   dt_restart(child) = ', dt_restart, ' & child ',           &
+               'child settings: dt_restart(root) = ', dt_restart_root,          &
+               ' dt_restart(child) = ', dt_restart, ' child ',                 &
                'value is set to root value'
           CALL message( 'pmci_check_setting_mismatches', 'PA0419', 0, 1, 0, 6, &
@@ -4155,6 +4158,6 @@
        IF ( time_restart /= time_restart_root )  THEN
           WRITE( message_string, * )  'mismatch between root model and ',      &
-               'child settings &   time_restart(root) = ', time_restart_root,  &
-               ' &   time_restart(child) = ', time_restart, ' & child ',       &
+               'child settings: time_restart(root) = ', time_restart_root,  &
+               ' time_restart(child) = ', time_restart, ' child ',             &
                'value is set to root value'
           CALL message( 'pmci_check_setting_mismatches', 'PA0419', 0, 1, 0, 6, &
Index: palm/trunk/SOURCE/radiation_model_mod.f90
===================================================================
--- palm/trunk/SOURCE/radiation_model_mod.f90	(revision 3044)
+++ palm/trunk/SOURCE/radiation_model_mod.f90	(revision 3045)
@@ -28,4 +28,7 @@
 ! -----------------
 ! $Id$
+! Error message revised
+! 
+! 3026 2018-05-22 10:30:53Z schwenkel
 ! Changed the name specific humidity to mixing ratio, since we are computing
 ! mixing ratios.
@@ -1332,7 +1335,7 @@
           IF ( albedo_type == 0  .AND.  albedo == 9999999.9_wp  .AND.          &
                radiation_scheme == 'clear-sky')  THEN
-             message_string = 'radiation_scheme = "clear-sky" in combination' //& 
-                              'with albedo_type = 0 requires setting of albedo'//&
-                              ' /= 9999999.9'
+             message_string = 'radiation_scheme = "clear-sky" in combination'//& 
+                              'with albedo_type = 0 requires setting of'//     &
+                              'albedo /= 9999999.9'
              CALL message( 'check_parameters', 'PA0410', 1, 2, 0, 6, 0 )
           ENDIF
Index: palm/trunk/SOURCE/read_restart_data_mod.f90
===================================================================
--- palm/trunk/SOURCE/read_restart_data_mod.f90	(revision 3044)
+++ palm/trunk/SOURCE/read_restart_data_mod.f90	(revision 3045)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! Error messages revised
+! 
+! 3004 2018-04-27 12:33:25Z Giersch
 ! precipitation_rate_av removed
 ! 
@@ -164,9 +167,9 @@
        binary_version_global = '4.7'
        IF ( TRIM( version_on_file ) /= TRIM( binary_version_global ) )  THEN
-          WRITE( message_string, * ) 'version mismatch concerning control ',   &
-                                     'variables',                              &
-                                     '&version on file    = "',                &
+          WRITE( message_string, * ) 'version mismatch concerning ',           &
+                                     'binary_version_global:',                 &
+                                     ' version on file    = "',                &
                                      TRIM( version_on_file ), '"',             &
-                                     '&version on program = "',                &
+                                     ' version on program = "',                &
                                      TRIM( binary_version_global ), '"'
           CALL message( 'rrd_global', 'PA0296', 1, 2, 0, 6, 0 )
@@ -887,7 +890,7 @@
        IF ( nz_on_file /= nz )  THEN
           WRITE( message_string, * ) 'mismatch concerning number of ',         &
-                                     'gridpoints along z',                     &
-                                     '&nz on file    = "', nz_on_file, '"',    &
-                                     '&nz from run   = "', nz, '"'
+                                     'gridpoints along z:',                    &
+                                     ' nz on file    = "', nz_on_file, '"',    &
+                                     ' nz from run   = "', nz, '"'
           CALL message( 'rrd_read_parts_of_global', 'PA0304', 1, 2, 0, 6, 0 )
        ENDIF
@@ -904,7 +907,7 @@
           WRITE( message_string, * ) 'number of user profiles on res',         &
                                      'tart data file differs from the ',       &
-                                     'current run&max_pr_user on file    = "', &
+                                     'current run: max_pr_user on file    = "',&
                                      max_pr_user_on_file, '"',                 &
-                                     '&max_pr_user from run   = "',            &
+                                     ' max_pr_user from run   = "',            &
                                      max_pr_user, '"'
           CALL message( 'rrd_read_parts_of_global', 'PA0306', 0, 0, 0, 6, 0 )
@@ -924,10 +927,10 @@
        IF ( statistic_regions_on_file /= statistic_regions )  THEN
           WRITE( message_string, * ) 'statistic regions on restart data file ',&
-                                     'differ from the current run',            &
-                                     '&statistic regions on file    = "',      &
+                                     'differ from the current run:',           &
+                                     ' statistic regions on file    = "',      &
                                      statistic_regions_on_file, '"',           &
-                                     '&statistic regions from run   = "',      &
+                                     ' statistic regions from run   = "',      &
                                       statistic_regions, '"',                  &
-                                     '&statistic data may be lost!'
+                                     ' statistic data may be lost!'
           CALL message( 'rrd_read_parts_of_global', 'PA0308', 0, 1, 0, 6, 0 )
           tmp_sr = MIN( statistic_regions_on_file, statistic_regions )
@@ -949,5 +952,5 @@
                 IF ( average_count_pr /= 0 )  THEN
                    WRITE( message_string, * ) 'inflow profiles not ',          &
-                                  'temporally averaged. &Averaging will be ',  &
+                                  'temporally averaged.  Averaging will be ',  &
                                   'done now using', average_count_pr,          & 
                                   ' samples.'
@@ -1242,5 +1245,5 @@
     THEN
        WRITE( message_string, * ) 'number of PEs or virtual PE-grid changed ', &
-                        'in restart run&  PE', myid, ' will read from files ', &
+                        'in restart run  PE', myid, ' will read from files ', &
                          file_list(1:files_to_be_opened)
        CALL message( 'rrd_local', 'PA0285', 0, 0, 0, 6, 0 )
@@ -1271,8 +1274,8 @@
        binary_version_local = '4.7'
        IF ( TRIM( version_on_file ) /= TRIM( binary_version_local ) )  THEN
-          WRITE( message_string, * ) 'version mismatch concerning data ',      &
-                      'from prior run',                                        &
-                      '&version on file    = "', TRIM( version_on_file ), '"', &
-                      '&version in program = "', TRIM( binary_version_local ), '"'
+          WRITE( message_string, * ) 'version mismatch concerning ',           &
+                      'binary_version_local:',                                 &
+                      ' version on file    = "', TRIM( version_on_file ), '"', &
+                      ' version in program = "', TRIM( binary_version_local ), '"'
           CALL message( 'rrd_local', 'PA0286', 1, 2, 0, 6, 0 )
        ENDIF
@@ -1287,7 +1290,7 @@
           WRITE( message_string, * ) 'problem with index bound nxl on ',       &
                             'restart file "', myid_char, '"',                  &
-                            '&nxl = ', nxl_on_file, ' but it should be',       &
-                            '&= ', hor_index_bounds_previous_run(1,j),         &
-                            '&from the index bound information array'
+                            ' nxl = ', nxl_on_file, ' but it should be',       &
+                            ' = ', hor_index_bounds_previous_run(1,j),         &
+                            ' from the index bound information array'
           CALL message( 'rrd_local', 'PA0287', 2, 2, -1, 6, 1 )
        ENDIF
@@ -1296,7 +1299,7 @@
            WRITE( message_string, * ) 'problem with index bound nxr on ',      &
                                'restart file "', myid_char, '"'  ,             &
-                               '&nxr = ', nxr_on_file, ' but it should be',    &
-                               '&= ', hor_index_bounds_previous_run(2,j),      &
-                               '&from the index bound information array' 
+                               ' nxr = ', nxr_on_file, ' but it should be',    &
+                               ' = ', hor_index_bounds_previous_run(2,j),      &
+                               ' from the index bound information array' 
           CALL message( 'rrd_local', 'PA0288', 2, 2, -1, 6, 1 )
 
@@ -1306,7 +1309,7 @@
           WRITE( message_string, * ) 'problem with index bound nys on ',       &
                                  'restart file "', myid_char, '"',             &
-                                 '&nys = ', nys_on_file, ' but it should be',  &
-                                 '&= ', hor_index_bounds_previous_run(3,j),    &
-                                     '&from the index bound information array'
+                                 ' nys = ', nys_on_file, ' but it should be',  &
+                                 ' = ', hor_index_bounds_previous_run(3,j),    &
+                                 ' from the index bound information array'
           CALL message( 'rrd_local', 'PA0289', 2, 2, -1, 6, 1 ) 
        ENDIF
@@ -1315,7 +1318,7 @@
           WRITE( message_string, * ) 'problem with index bound nyn on ',       &
                                'restart file "', myid_char, '"',               &
-                               '&nyn = ', nyn_on_file, ' but it should be',    &
-                               '&= ', hor_index_bounds_previous_run(4,j),      &
-                               '&from the index bound information array'
+                               ' nyn = ', nyn_on_file, ' but it should be',    &
+                               ' = ', hor_index_bounds_previous_run(4,j),      &
+                               ' from the index bound information array'
           CALL message( 'rrd_local', 'PA0290', 2, 2, -1, 6, 1 ) 
        ENDIF
@@ -1323,7 +1326,7 @@
        IF ( nzb_on_file /= nzb )  THEN
           WRITE( message_string, * ) 'mismatch between actual data and data ', &
-                                     '&from prior run on PE ', myid,           &
-                                     '&nzb on file = ', nzb_on_file,           &
-                                     '&nzb         = ', nzb
+                                     'from prior run on PE ', myid,            &
+                                     ' nzb on file = ', nzb_on_file,           &
+                                     ' nzb         = ', nzb
           CALL message( 'rrd_local', 'PA0291', 1, 2, 0, 6, 0 )  
        ENDIF
@@ -1331,7 +1334,7 @@
        IF ( nzt_on_file /= nzt )  THEN
           WRITE( message_string, * ) 'mismatch between actual data and data ', &
-                                     '&from prior run on PE ', myid,           &
-                                     '&nzt on file = ', nzt_on_file,           &
-                                     '&nzt         = ', nzt
+                                     'from prior run on PE ', myid,            &
+                                     ' nzt on file = ', nzt_on_file,           &
+                                     ' nzt         = ', nzt
           CALL message( 'rrd_local', 'PA0292', 1, 2, 0, 6, 0 )  
        ENDIF
Index: palm/trunk/SOURCE/spectra_mod.f90
===================================================================
--- palm/trunk/SOURCE/spectra_mod.f90	(revision 3044)
+++ palm/trunk/SOURCE/spectra_mod.f90	(revision 3045)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! Error message revised
+! 
+! 2956 2018-04-10 11:01:03Z Giersch
 ! spectrum_x and spectrum_y will only be allocated if they are not allocated 
 ! before (e.g. in case of restart runs) 
@@ -472,5 +475,5 @@
 
                 message_string = 'non-cyclic lateral boundaries along x do'//  &
-                                 ' not & allow calculation of spectra along x'
+                                 ' not allow calculation of spectra along x'
                 CALL message( 'calc_spectra', 'PA0160', 1, 2, 0, 6, 0 )
              ENDIF
@@ -488,5 +491,5 @@
 #else
              message_string = 'sorry, calculation of spectra in non paral' //  &
-                              'lel mode& is still not realized'
+                              'lel mode is still not realized'
              CALL message( 'calc_spectra', 'PA0161', 1, 2, 0, 6, 0 )
 #endif
@@ -504,6 +507,6 @@
                 IF ( myid == 0 )  THEN
                    message_string = 'non-cyclic lateral boundaries along y' // &
-                                    ' do not & allow calculation of spectr' // &
-                                    'a along y'
+                                    ' do not allow calculation of spectra' //  &
+                                    ' along y'
                    CALL message( 'calc_spectra', 'PA0162', 1, 2, 0, 6, 0 )
                 ENDIF
@@ -518,5 +521,5 @@
 #else
              message_string = 'sorry, calculation of spectra in non paral' //  &
-                              'lel mode& is still not realized'
+                              'lel mode is still not realized'
              CALL message( 'calc_spectra', 'PA0161', 1, 2, 0, 6, 0 )
 #endif
Index: palm/trunk/SOURCE/subsidence_mod.f90
===================================================================
--- palm/trunk/SOURCE/subsidence_mod.f90	(revision 3044)
+++ palm/trunk/SOURCE/subsidence_mod.f90	(revision 3045)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! Error message revised
+! 
+! 2718 2018-01-02 08:49:38Z maronga
 ! Corrected "Former revisions" section
 ! 
@@ -145,5 +148,5 @@
 
        IF ( ocean )  THEN
-          message_string = 'Applying large scale vertical motion is not ' // &
+          message_string = 'Applying large scale vertical motion is not ' //   &
                            'allowed for ocean runs'
           CALL message( 'init_w_subsidence', 'PA0324', 2, 2, 0, 6, 0 )
Index: palm/trunk/SOURCE/surface_coupler.f90
===================================================================
--- palm/trunk/SOURCE/surface_coupler.f90	(revision 3044)
+++ palm/trunk/SOURCE/surface_coupler.f90	(revision 3045)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! Error message revised
+! 
+! 2718 2018-01-02 08:49:38Z maronga
 ! Corrected "Former revisions" section
 ! 
@@ -167,12 +170,12 @@
 
     IF ( terminate_coupled_remote > 0 )  THEN
-       WRITE( message_string, * ) 'remote model "',                         &
-                                  TRIM( coupling_mode_remote ),             &
-                                  '" terminated',                           &
-                                  '&with terminate_coupled_remote = ',      &
-                                  terminate_coupled_remote,                 &
-                                  '&local model  "', TRIM( coupling_mode ), &
-                                  '" has',                                  &
-                                  '&terminate_coupled = ',                  &
+       WRITE( message_string, * ) 'remote model "',                            &
+                                  TRIM( coupling_mode_remote ),                &
+                                  '" terminated',                              &
+                                  ' with terminate_coupled_remote = ',         &
+                                  terminate_coupled_remote,                    &
+                                  ' local model  "', TRIM( coupling_mode ),    &
+                                  '" has',                                     &
+                                  ' terminate_coupled = ',                     &
                                    terminate_coupled
        CALL message( 'surface_coupler', 'PA0310', 1, 2, 0, 6, 0 )
Index: palm/trunk/SOURCE/surface_layer_fluxes_mod.f90
===================================================================
--- palm/trunk/SOURCE/surface_layer_fluxes_mod.f90	(revision 3044)
+++ palm/trunk/SOURCE/surface_layer_fluxes_mod.f90	(revision 3045)
@@ -26,4 +26,7 @@
 ! -----------------
 ! $Id$
+! Error message revised
+! 
+! 2766 2018-01-22 17:17:47Z kanani
 ! Removed preprocessor directive __chem
 ! 
@@ -833,5 +836,5 @@
                               'combination with a prescribed roughness '  //   &
                               'heterogeneity'
-             CALL message( 'surface_layer_fluxes', 'PA0417', 1, 2, 0, 6, 0 )
+             CALL message( 'surface_layer_fluxes', 'PA0116', 1, 2, 0, 6, 0 )
           ENDIF
 
Index: palm/trunk/SOURCE/synthetic_turbulence_generator_mod.f90
===================================================================
--- palm/trunk/SOURCE/synthetic_turbulence_generator_mod.f90	(revision 3044)
+++ palm/trunk/SOURCE/synthetic_turbulence_generator_mod.f90	(revision 3045)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! Error message revised
+! 
+! 3044 2018-05-25 10:59:41Z gronemeier
 ! Add missing variable descriptions
 !
@@ -343,10 +346,10 @@
           IF ( bc_lr /= 'dirichlet/radiation' )  THEN
              message_string = 'Using synthetic turbulence generator ' //       &
-                              'requires &bc_lr = "dirichlet/radiation"'
+                              'requires bc_lr = "dirichlet/radiation"'
              CALL message( 'stg_check_parameters', 'PA0035', 1, 2, 0, 6, 0 )
           ENDIF
           IF ( bc_ns /= 'cyclic' )  THEN
              message_string = 'Using synthetic turbulence generator ' //       &
-                              'requires &bc_ns = "cyclic"'
+                              'requires bc_ns = "cyclic"'
              CALL message( 'stg_check_parameters', 'PA0037', 1, 2, 0, 6, 0 )
           ENDIF
Index: palm/trunk/SOURCE/temperton_fft_mod.f90
===================================================================
--- palm/trunk/SOURCE/temperton_fft_mod.f90	(revision 3044)
+++ palm/trunk/SOURCE/temperton_fft_mod.f90	(revision 3045)
@@ -9,4 +9,7 @@
 ! -----------------
 ! $Id$
+! Error message revised
+! 
+! 2300 2017-06-29 13:31:14Z raasch
 ! NEC related CPP directives removed
 ! 
@@ -2161,7 +2164,7 @@
 
 !    WRITE (nout,'(A,I4,A)') ' n =',n,' - Contains illegal factors'
-    message_string = 'number of gridpoints along x or/and y ' // &
-                     'contain illegal  factors' //               &
-                     '&only factors 8,6,5,4,3,2 are allowed' 
+    message_string = 'number of gridpoints along x or/and y ' //               &
+                     'contain illegal  factors' //                             &
+                     ' only factors 2, 3, 5 are allowed' 
     CALL message( 'temperton_fft', 'PA0311', 1, 2, 0, 6, 0 )
 
Index: palm/trunk/SOURCE/timestep.f90
===================================================================
--- palm/trunk/SOURCE/timestep.f90	(revision 3044)
+++ palm/trunk/SOURCE/timestep.f90	(revision 3045)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! Error message revised
+! 
+! 2718 2018-01-02 08:49:38Z maronga
 ! Corrected "Former revisions" section
 ! 
@@ -330,15 +333,15 @@
 
           WRITE( message_string, * ) 'Time step has reached minimum limit.',   &
-               '&dt              = ', dt_3d, ' s  Simulation is terminated.',  &
-               '&old_dt          = ', old_dt, ' s',                            &
-               '&dt_u            = ', dt_u, ' s',                              &
-               '&dt_v            = ', dt_v, ' s',                              &
-               '&dt_w            = ', dt_w, ' s',                              &
-               '&dt_diff         = ', dt_diff, ' s',                           &
-               '&u_max           = ', u_max, ' m/s   k=', u_max_ijk(1),        &
+               ' dt              = ', dt_3d, ' s  Simulation is terminated.',  &
+               ' old_dt          = ', old_dt, ' s',                            &
+               ' dt_u            = ', dt_u, ' s',                              &
+               ' dt_v            = ', dt_v, ' s',                              &
+               ' dt_w            = ', dt_w, ' s',                              &
+               ' dt_diff         = ', dt_diff, ' s',                           &
+               ' u_max           = ', u_max, ' m/s   k=', u_max_ijk(1),        &
                '  j=', u_max_ijk(2), '  i=', u_max_ijk(3),                     &
-               '&v_max           = ', v_max, ' m/s   k=', v_max_ijk(1),        &
+               ' v_max           = ', v_max, ' m/s   k=', v_max_ijk(1),        &
                '  j=', v_max_ijk(2), '  i=', v_max_ijk(3),                     &
-               '&w_max           = ', w_max, ' m/s   k=', w_max_ijk(1),        &
+               ' w_max           = ', w_max, ' m/s   k=', w_max_ijk(1),        &
                '  j=', w_max_ijk(2), '  i=', w_max_ijk(3)
           CALL message( 'timestep', 'PA0312', 0, 1, 0, 6, 0 )
Index: palm/trunk/SOURCE/turbulence_closure_mod.f90
===================================================================
--- palm/trunk/SOURCE/turbulence_closure_mod.f90	(revision 3044)
+++ palm/trunk/SOURCE/turbulence_closure_mod.f90	(revision 3045)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! Error message revised
+! 
+! 3014 2018-05-09 08:42:38Z maronga
 ! Bugfix: nzb_do and nzt_do were not used for 3d data output
 ! 
@@ -1212,11 +1215,12 @@
 
        DO  k = 1, nzt
-          IF ( l_grid(k) > 1.5_wp * dx * wall_adjustment_factor .OR.  &
+          IF ( l_grid(k) > 1.5_wp * dx * wall_adjustment_factor .OR.           &
                l_grid(k) > 1.5_wp * dy * wall_adjustment_factor )  THEN
-             WRITE( message_string, * ) 'grid anisotropy exceeds ', &
-                                        'threshold given by only local', &
-                                        ' &horizontal reduction of near_wall ', &
-                                        'mixing length l_wall', &
-                                        ' &starting from height level k = ', k, '.'
+             WRITE( message_string, * ) 'grid anisotropy exceeds ',            &
+                                        'threshold given by only local',       &
+                                        ' horizontal reduction of near_wall ', &
+                                        'mixing length l_wall',                &
+                                        ' starting from height level k = ', k, &
+                                        '.'
              CALL message( 'init_grid', 'PA0202', 0, 1, 0, 6, 0 )
              EXIT
Index: palm/trunk/SOURCE/urban_surface_mod.f90
===================================================================
--- palm/trunk/SOURCE/urban_surface_mod.f90	(revision 3044)
+++ palm/trunk/SOURCE/urban_surface_mod.f90	(revision 3045)
@@ -28,4 +28,7 @@
 ! -----------------
 ! $Id$
+! Error message added
+! 
+! 3029 2018-05-23 12:19:17Z raasch
 ! bugfix: close unit 151 instead of 90
 ! 
@@ -320,5 +323,5 @@
     USE radiation_model_mod,                                                   &
         ONLY:  albedo_type, radiation_interaction, calc_zenith, zenith,        &
-               rad_sw_in, rad_lw_in, rad_sw_out, rad_lw_out,                   &
+               radiation, rad_sw_in, rad_lw_in, rad_sw_out, rad_lw_out,        &
                sigma_sb, solar_constant, sun_direction, sun_dir_lat,           &
                sun_dir_lon,                                                    &
@@ -2303,5 +2306,5 @@
                            'bc_pt_b = "dirichlet" and '//                      &
                            'bc_q_b  = "dirichlet"'
-          CALL message( 'check_parameters', 'PA0590', 1, 2, 0, 6, 0 )
+          CALL message( 'usm_check_parameters', 'PA0590', 1, 2, 0, 6, 0 )
        ENDIF
 
@@ -2309,5 +2312,11 @@
           message_string = 'urban surface model requires '//                   &
                            'constant_flux_layer = .T.'
-          CALL message( 'check_parameters', 'PA0591', 1, 2, 0, 6, 0 )
+          CALL message( 'usm_check_parameters', 'PA0084', 1, 2, 0, 6, 0 )
+       ENDIF
+
+       IF (  .NOT.  radiation )  THEN
+          message_string = 'urban surface model requires '//                   &
+                           'the radiation model to be switched on'
+          CALL message( 'usm_check_parameters', 'PA0084', 1, 2, 0, 6, 0 )
        ENDIF
 !        
Index: palm/trunk/SOURCE/vertical_nesting_mod.f90
===================================================================
--- palm/trunk/SOURCE/vertical_nesting_mod.f90	(revision 3044)
+++ palm/trunk/SOURCE/vertical_nesting_mod.f90	(revision 3045)
@@ -26,4 +26,7 @@
 ! -----------------
 ! $Id$
+! Error message revised
+! 
+! 2718 2018-01-02 08:49:38Z maronga
 ! Corrected "Former revisions" section
 ! 
@@ -267,8 +270,8 @@
    
         IF ( myid == 0) THEN
-            CALL MPI_SENDRECV( terminate_coupled,        1, MPI_INTEGER, &
-                target_id, 0,                             &
-                terminate_coupled_remote, 1, MPI_INTEGER, &
-                target_id, 0,                             &
+            CALL MPI_SENDRECV( terminate_coupled,        1, MPI_INTEGER,       &
+                target_id, 0,                                                  &
+                terminate_coupled_remote, 1, MPI_INTEGER,                      &
+                target_id, 0,                                                  &
                 comm_inter, status, ierr )
         ENDIF
@@ -277,12 +280,12 @@
    
         IF ( terminate_coupled_remote > 0 )  THEN
-            WRITE( message_string, * ) 'remote model "',                         &
-                TRIM( coupling_mode_remote ),             &
-                '" terminated',                           &
-                '&with terminate_coupled_remote = ',      &
-                terminate_coupled_remote,                 &
-                '&local model  "', TRIM( coupling_mode ), &
-                '" has',                                  &
-                '&terminate_coupled = ',                  &
+            WRITE( message_string, * ) 'remote model "',                       &
+                TRIM( coupling_mode_remote ),                                  &
+                '" terminated',                                                &
+                ' with terminate_coupled_remote = ',                           &
+                terminate_coupled_remote,                                      &
+                ' local model  "', TRIM( coupling_mode ),                      &
+                '" has',                                                       &
+                ' terminate_coupled = ',                                       &
                 terminate_coupled
             CALL message( 'vnest_init_fine', 'PA0310', 1, 2, 0, 6, 0 )
@@ -2777,12 +2780,12 @@
    
         IF ( terminate_coupled_remote > 0 )  THEN
-            WRITE( message_string, * ) 'remote model "',                         &
-                TRIM( coupling_mode_remote ),             &
-                '" terminated',                           &
-                '&with terminate_coupled_remote = ',      &
-                terminate_coupled_remote,                 &
-                '&local model  "', TRIM( coupling_mode ), &
-                '" has',                                  &
-                '&terminate_coupled = ',                  &
+            WRITE( message_string, * ) 'remote model "',                       &
+                TRIM( coupling_mode_remote ),                                  &
+                '" terminated',                                                &
+                ' with terminate_coupled_remote = ',                           &
+                terminate_coupled_remote,                                      &
+                ' local model  "', TRIM( coupling_mode ),                      &
+                '" has',                                                       &
+                ' terminate_coupled = ',                                       &
                 terminate_coupled
             CALL message( 'vnest_anterpolate', 'PA0310', 1, 2, 0, 6, 0 )
@@ -3315,22 +3318,22 @@
    
         IF ( myid == 0) THEN
-            CALL MPI_SENDRECV( terminate_coupled,        1, MPI_INTEGER, &
-                target_id, 0,                             &
-                terminate_coupled_remote, 1, MPI_INTEGER, &
-                target_id, 0,                             &
+            CALL MPI_SENDRECV( terminate_coupled,        1, MPI_INTEGER,       &
+                target_id, 0,                                                  &
+                terminate_coupled_remote, 1, MPI_INTEGER,                      &
+                target_id, 0,                                                  &
                 comm_inter, status, ierr )
         ENDIF
-        CALL MPI_BCAST( terminate_coupled_remote, 1, MPI_INTEGER, 0, comm2d, &
+        CALL MPI_BCAST( terminate_coupled_remote, 1, MPI_INTEGER, 0, comm2d,   &
             ierr )
    
         IF ( terminate_coupled_remote > 0 )  THEN
-            WRITE( message_string, * ) 'remote model "',                         &
-                TRIM( coupling_mode_remote ),             &
-                '" terminated',                           &
-                '&with terminate_coupled_remote = ',      &
-                terminate_coupled_remote,                 &
-                '&local model  "', TRIM( coupling_mode ), &
-                '" has',                                  &
-                '&terminate_coupled = ',                  &
+            WRITE( message_string, * ) 'remote model "',                       &
+                TRIM( coupling_mode_remote ),                                  &
+                '" terminated',                                                &
+                ' with terminate_coupled_remote = ',                           &
+                terminate_coupled_remote,                                      &
+                ' local model  "', TRIM( coupling_mode ),                      & 
+                '" has',                                                       &
+                ' terminate_coupled = ',                                       &
                 terminate_coupled
             CALL message( 'vnest_anterpolate_e', 'PA0310', 1, 2, 0, 6, 0 )
