Index: /palm/trunk/SCRIPTS/.mrun.config.hlrnIII
===================================================================
--- /palm/trunk/SCRIPTS/.mrun.config.hlrnIII	(revision 1326)
+++ /palm/trunk/SCRIPTS/.mrun.config.hlrnIII	(revision 1327)
@@ -39,6 +39,6 @@
 %cpp_options         -e:Z:-DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf:-D__netcdf4:-D__netcdf4_parallel:-D__fftw   lccrayb parallel
 %mopts               -j:4                        lccrayb parallel
-%fopts               -em:-s:real64:-O3:-hnoomp:-hfp3:-hdynamic          lccrayb parallel
-%lopts               -em:-s:real64:-O3:-hnoomp:-hfp3:-hdynamic:-dynamic lccrayb parallel
+%fopts               -em:-O3:-hnoomp:-hfp3:-hdynamic          lccrayb parallel
+%lopts               -em:-O3:-hnoomp:-hfp3:-hdynamic:-dynamic lccrayb parallel
 %remote_username     <replace by your HLRN-III username>                lccrayb parallel
 %memory              1500                                               lccrayb parallel
@@ -52,6 +52,6 @@
 %cpp_options         -e:Z:-DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf:-D__netcdf4:-D__netcdf4_parallel:-D__fftw   lccrayh parallel
 %mopts               -j:4                        lccrayh parallel
-%fopts               -em:-s:real64:-O3:-hnoomp:-hfp3:-hdynamic          lccrayh parallel
-%lopts               -em:-s:real64:-O3:-hnoomp:-hfp3:-hdynamic:-dynamic lccrayh parallel
+%fopts               -em:-O3:-hnoomp:-hfp3:-hdynamic          lccrayh parallel
+%lopts               -em:-O3:-hnoomp:-hfp3:-hdynamic:-dynamic lccrayh parallel
 %remote_username     <replace by your HLRN-III username>                lccrayh parallel
 %memory              1500                                               lccrayh parallel
Index: /palm/trunk/SCRIPTS/.mrun.config.imuk
===================================================================
--- /palm/trunk/SCRIPTS/.mrun.config.imuk	(revision 1326)
+++ /palm/trunk/SCRIPTS/.mrun.config.imuk	(revision 1327)
@@ -27,6 +27,6 @@
 %netcdf_lib        -L/muksoft/packages/netcdf/3.6.3/lib:-lnetcdf               lcmuk
 %mopts             -j:4                                                        lcmuk
-%fopts             -fltconsistency:-O3:-cpp:-r8:-nbs:-convert:little_endian:-diag-disable:8290,8291    lcmuk
-%lopts             -fltconsistency:-O3:-cpp:-r8:-nbs:-lmf:-lm:-Vaxlib          lcmuk
+%fopts             -fltconsistency:-O3:-cpp:-nbs:-convert:little_endian:-diag-disable:8290,8291    lcmuk
+%lopts             -fltconsistency:-O3:-cpp:-nbs:-lmf:-lm:-Vaxlib          lcmuk
 #
 # version 03/02/2013
@@ -39,6 +39,6 @@
 %netcdf_lib        -L/muksoft/packages/netcdf/3.6.3/lib:-lnetcdf               lcmuk parallel
 %mopts             -j:4                                                        lcmuk parallel
-%fopts             -O3:-cpp:-r8:-fp-model:precise:-ftz:-fno-alias:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-convert:little_endian:-diag-disable:8290,8291  lcmuk parallel
-%lopts             -O3:-cpp:-r8:-fp-model:precise:-ftz:-fno-alias:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-limf:-lm:-Vaxlib       lcmuk parallel
+%fopts             -O3:-cpp:-fp-model:precise:-ftz:-fno-alias:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-convert:little_endian:-diag-disable:8290,8291  lcmuk parallel
+%lopts             -O3:-cpp:-fp-model:precise:-ftz:-fno-alias:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-limf:-lm:-Vaxlib       lcmuk parallel
 #%hostfile          $base_directory/.hostfile                                  lcmuk parallel
 #
@@ -51,6 +51,6 @@
 %netcdf_inc        -I:/muksoft/packages/netcdf/3.6.3/include            lcmuk parallel trace
 %netcdf_lib        -L/muksoft/packages/netcdf/3.6.3/lib:-lnetcdf        lcmuk parallel trace
-%fopts             -C:-check:nooutput_conversion:-fpe0:-debug:-traceback:-g:-w:-xT:-O0:-cpp:-r8:-ftz:-fno-alias:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-convert:little_endian:-diag-disable:8290,8291  lcmuk parallel trace
-%lopts             -C:-check:nooutput_conversion:-fpe0:-debug:-traceback:-g:-w:-xT:-O0:-cpp:-r8:-ftz:-fno-alias:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-limf:-lm:-Vaxlib       lcmuk parallel trace
+%fopts             -C:-check:nooutput_conversion:-fpe0:-debug:-traceback:-g:-w:-xT:-O0:-cpp:-ftz:-fno-alias:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-convert:little_endian:-diag-disable:8290,8291  lcmuk parallel trace
+%lopts             -C:-check:nooutput_conversion:-fpe0:-debug:-traceback:-g:-w:-xT:-O0:-cpp:-ftz:-fno-alias:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-limf:-lm:-Vaxlib       lcmuk parallel trace
 
 %write_binary                true                             restart
Index: lm/trunk/SCRIPTS/.mrun.config.imuk_hlrn
===================================================================
--- /palm/trunk/SCRIPTS/.mrun.config.imuk_hlrn	(revision 1326)
+++ 	(revision )
@@ -1,199 +1,0 @@
-#$Id$
-#column 1          column 2                                   column 3
-#name of variable  value of variable (~ must not be used)     scope
-#----------------------------------------------------------------------------
-%mainprog          palm.f90
-%base_directory    $HOME/palm/current_version
-%base_data         ~/palm/current_version/JOBS
-%source_path       $base_directory/trunk/SOURCE
-%add_source_path   $base_directory/USER_CODE/$fname
-%depository_path   $base_directory/MAKE_DEPOSITORY
-%use_makefile      true
-#
-# Enter your own host below by adding another line containing in the second
-# column your hostname (as provided by the unix command "hostname") and in the
-# third column the host identifier. Depending on your operating system, the
-# first characters of the host identifier should be "lc" (Linux cluster), "ibm"
-# (IBM-AIX), or "nec" (NEC-SX), respectively.
-%host_identifier   service100  lcsgih
-%host_identifier   r1*         lcsgih
-%host_identifier   h01*        lcsgih
-%host_identifier   r2*         lcsgib
-%host_identifier   b01*        lcsgib
-%host_identifier   inferno     lcmuk
-#
-# The following blocks contain all information for compiling the PALM code
-# and for generating and running the PALM executable using MPI. Replace all
-# required paths (given in <>) by the respective paths valid on your host.
-# Please adjust compilernames, cpp-options, compiler-options etc.
-# appropriately for your own system(s), and please delete or comment out
-# blocks for unused systems.
-#
-# The following 'lcmuk parallel' block assumes PALM compilation and execution
-# on host inferno. Please note that other hosts within the IMUK linux cluster,
-# e.g. bora, may require different settings.
-#
-#%remote_username   <replace by your IMUK username>               lcmuk parallel
-#%tmp_user_catalog  /home/<replace by your IMUK username>/palm/tmp/  lcmuk parallel
-%compiler_name     mpif90                                        lcmuk parallel
-%compiler_name_ser ifort                                         lcmuk parallel
-%cpp_options       -cpp:-DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf   lcmuk parallel
-%netcdf_inc        -I:/muksoft/packages/netcdf/3.6.3/include     lcmuk parallel
-%netcdf_lib        -L/muksoft/packages/netcdf/3.6.3/lib:-lnetcdf lcmuk parallel
-%mopts             -j:4                                          lcmuk parallel
-%fopts             -fpe0:-O3:-r8:-fp-model:precise:-ftz:-fno-alias:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-diag-disable:8290,8291     lcmuk parallel
-%lopts             -fpe0:-O3:-r8:-fp-model:precise:-ftz:-fno-alias:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-diag-disable:8290,8291:-limf:-lm     lcmuk parallel
-#%hostfile          $base_directory/.hostfile                    lcmuk parallel
-#
-#
-%sgi_feature       ice2                                       lcsgih parallel
-%modules           intel.compiler/11.1.072:mpt:phdf5/1.8.5-mpt-intel-11.1:pnetcdf/4.1.1-mpt-intel-11.1  lcsgih parallel
-%login_init_cmd    .:/usr/share/modules/init/bash           lcsgih parallel
-#%remote_username    <replace by your HLRN username>          lcsgih parallel
-%compiler_name     ifort                                      lcsgih parallel
-%compiler_name_ser ifort                                      lcsgih parallel
-%cpp_options       -DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf:-D__netcdf4:-D__mpi2   lcsgih parallel
-%netcdf_inc        -I:/sw/dataformats/pnetcdf/netcdf-4.1.1-mpt-intel-11.1/include:-I:/sw/dataformats/phdf5/hdf5-1.8.5-mpt-intel-11.1/include    lcsgih parallel
-%netcdf_lib        -L/sw/dataformats/pnetcdf/netcdf-4.1.1-mpt-intel-11.1/lib:-lnetcdf:-lnetcdff:-L/sw/dataformats/phdf5/hdf5-1.8.5-mpt-intel-11.1/lib:-lhdf5:-lhdf5_hl:-lz      lcsgih parallel
-%mopts             -j:4                                       lcsgih parallel
-%fopts             -fpe0:-O3:-cpp:-r8:-fp-model:precise:-align:all:-ftz:-fno-alias:-no-scalar-rep:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-convert:little_endian:-diag-disable:8290,8291  lcsgih parallel
-%lopts             -fpe0:-O3:-cpp:-r8:-fp-model:precise:-align:all:-ftz:-fno-alias:-no-scalar-rep:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-Vaxlib:-lmpi:-limf:-lm           lcsgih parallel
-%memory            1500                                       lcsgih parallel
-#%tmp_data_catalog  /gfs2/work/<replace by your HLRN username>/palm_restart_data      lcsgih parallel
-#%tmp_user_catalog  /gfs2/tmp/<replace by your HLRN username>                         lcsgih parallel
-#
-#
-#
-%sgi_feature       ice2                                       lcsgih parallel trace
-%modules           intel.compiler/11.1.072:mpt:phdf5/1.8.5-mpt-intel-11.1:pnetcdf/4.1.1-mpt-intel-11.1  lcsgih parallel trace
-%login_init_cmd    .:/usr/share/modules/init/bash           lcsgih parallel trace
-#%remote_username    <replace by your HLRN username>          lcsgih parallel trace
-%compiler_name     ifort                                      lcsgih parallel trace
-%compiler_name_ser ifort                                      lcsgih parallel trace
-%cpp_options       -DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf:-D__netcdf4:-D__mpi2   lcsgih parallel trace
-%netcdf_inc        -I:/sw/dataformats/pnetcdf/netcdf-4.1.1-mpt-intel-11.1/include:-I:/sw/dataformats/phdf5/hdf5-1.8.5-mpt-intel-11.1/include    lcsgih parallel trace
-%netcdf_lib        -L/sw/dataformats/pnetcdf/netcdf-4.1.1-mpt-intel-11.1/lib:-lnetcdf:-lnetcdff:-L/sw/dataformats/phdf5/hdf5-1.8.5-mpt-intel-11.1/lib:-lhdf5:-lhdf5_hl:-lz      lcsgih parallel trace
-%mopts             -j:4                                       lcsgih parallel trace
-%fopts             -override-limits:-C:-ftrapuv:-xS:-debug:extended:-check:nooutput_conversion:-O0:-fpe0:-g:-traceback:-cpp:-r8:-fp-model:precise:-align:all:-ftz:-fno-alias:-no-scalar-rep:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-convert:little_endian:-diag-disable:8290,8291  lcsgih parallel trace
-%lopts             -C:-ftrapuv:-xS:-debug:extended:-check:nooutput_conversion:-O0:-fpe0:-g:-traceback:-cpp:-r8:-fp-model:precise:-align:all:-ftz:-fno-alias:-no-scalar-rep:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-Vaxlib:-lmpi:-limf:-lm           lcsgih parallel trace
-%memory            1500                                       lcsgih parallel trace
-#%tmp_data_catalog  /gfs2/work/<replace by your HLRN username>/palm_restart_data      lcsgih parallel trace
-#%tmp_user_catalog  /gfs2/tmp/<replace by your HLRN username>                         lcsgih parallel trace
-#
-#
-#
-%sgi_feature       ice2                                       lcsgib parallel
-%modules           intel.compiler/11.1.072:mpt:phdf5/1.8.5-mpt-intel-11.1:pnetcdf/4.1.1-mpt-intel-11.1  lcsgib parallel
-%login_init_cmd    .:/usr/share/modules/init/bash           lcsgib parallel
-#%remote_username    <replace by your HLRN username>          lcsgib parallel
-%compiler_name     ifort                                      lcsgib parallel
-%compiler_name_ser ifort                                      lcsgib parallel
-%cpp_options       -DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf:-D__netcdf4:-D__mpi2   lcsgib parallel
-%netcdf_inc        -I:/sw/dataformats/pnetcdf/netcdf-4.1.1-mpt-intel-11.1/include:-I:/sw/dataformats/phdf5/hdf5-1.8.5-mpt-intel-11.1/include    lcsgib parallel
-%netcdf_lib        -L/sw/dataformats/pnetcdf/netcdf-4.1.1-mpt-intel-11.1/lib:-lnetcdf:-lnetcdff:-L/sw/dataformats/phdf5/hdf5-1.8.5-mpt-intel-11.1/lib:-lhdf5:-lhdf5_hl:-lz      lcsgib parallel
-%mopts             -j:4                                       lcsgib parallel
-%fopts             -fpe0:-O3:-cpp:-r8:-fp-model:precise:-align:all:-ftz:-fno-alias:-no-scalar-rep:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-convert:little_endian:-diag-disable:8290,8291  lcsgib parallel
-%lopts             -fpe0:-O3:-cpp:-r8:-fp-model:precise:-align:all:-ftz:-fno-alias:-no-scalar-rep:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-Vaxlib:-lmpi:-limf:-lm           lcsgib parallel
-%memory            1500                                       lcsgib parallel
-#%tmp_data_catalog  /gfs2/work/<replace by your HLRN username>/palm_restart_data      lcsgib parallel
-#%tmp_user_catalog  /gfs2/tmp/<replace by your HLRN username>                         lcsgib parallel
-#
-#
-#
-%sgi_feature       ice2                                       lcsgib parallel trace
-%modules           intel.compiler/11.1.072:mpt:phdf5/1.8.5-mpt-intel-11.1:pnetcdf/4.1.1-mpt-intel-11.1  lcsgib parallel trace
-%login_init_cmd    .:/usr/share/modules/init/bash           lcsgib parallel trace
-#%remote_username    <replace by your HLRN username>          lcsgib parallel trace
-%compiler_name     ifort                                      lcsgib parallel trace
-%compiler_name_ser ifort                                      lcsgib parallel trace
-%cpp_options       -DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf:-D__netcdf4:-D__mpi2   lcsgib parallel trace
-%netcdf_inc        -I:/sw/dataformats/pnetcdf/netcdf-4.1.1-mpt-intel-11.1/include:-I:/sw/dataformats/phdf5/hdf5-1.8.5-mpt-intel-11.1/include    lcsgib parallel trace
-%netcdf_lib        -L/sw/dataformats/pnetcdf/netcdf-4.1.1-mpt-intel-11.1/lib:-lnetcdf:-lnetcdff:-L/sw/dataformats/phdf5/hdf5-1.8.5-mpt-intel-11.1/lib:-lhdf5:-lhdf5_hl:-lz      lcsgib parallel trace
-%mopts             -j:4                                       lcsgib parallel trace
-%fopts             -override-limits:-C:-ftrapuv:-xS:-debug:extended:-check:nooutput_conversion:-O0:-fpe0:-g:-traceback:-cpp:-r8:-fp-model:precise:-align:all:-ftz:-fno-alias:-no-scalar-rep:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-convert:little_endian:-diag-disable:8290,8291  lcsgib parallel trace
-%lopts             -C:-ftrapuv:-xS:-debug:extended:-check:nooutput_conversion:-O0:-fpe0:-g:-traceback:-cpp:-r8:-fp-model:precise:-align:all:-ftz:-fno-alias:-no-scalar-rep:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-Vaxlib:-lmpi:-limf:-lm           lcsgib parallel trace
-%memory            1500                                       lcsgib parallel trace
-#%tmp_data_catalog  /gfs2/work/<replace by your HLRN username>/palm_restart_data      lcsgib parallel trace
-#%tmp_user_catalog  /gfs2/tmp/<replace by your HLRN username>                         lcsgib parallel trace
-#
-#
-%write_binary                true                             restart
-#
-#----------------------------------------------------------------------------
-# INPUT-commands, executed before running PALM - lines must start with "IC:"
-#----------------------------------------------------------------------------
-#IC:
-#
-#----------------------------------------------------------------------------
-# ERROR-commands - executed when program terminates abnormally
-#----------------------------------------------------------------------------
-EC:[[ \$locat = execution ]]  &&  cat  RUN_CONTROL
-EC:pwd; ls -al
-#
-#----------------------------------------------------------------------------
-# OUTPUT-commands - executed when program terminates normally
-#----------------------------------------------------------------------------
-#
-# Combine 1D- and 3D-profile output (these files are not usable for plotting)
-OC:[[ -f LIST_PROFIL_1D     ]]  &&  cat  LIST_PROFIL_1D  >>  LIST_PROFILE
-OC:[[ -f LIST_PROFIL        ]]  &&  cat  LIST_PROFIL     >>  LIST_PROFILE
-#
-# Combine all particle information files
-OC:[[ -f PARTICLE_INFOS/_0000 ]]  &&  cat  PARTICLE_INFOS/* >> PARTICLE_INFO
-#
-#----------------------------------------------------------------------------
-# List of input-files
-#----------------------------------------------------------------------------
-PARIN                    in:job        d3#      $base_data/$fname/INPUT    _p3d
-PARIN                    in:job        d3f      $base_data/$fname/INPUT    _p3df
-TOPOGRAPHY_DATA          in:locopt     d3#:d3f  $base_data/$fname/INPUT    _topo
-NUDGING_DATA             in:locopt     d3#:d3f  $base_data/$fname/INPUT    _nudge
-LSF_DATA                 in:locopt     d3#:d3f  $base_data/$fname/INPUT    _lsf
-BININ                    in:loc:flpe   d3f      $base_data/$fname/RESTART  _d3d
-PARTICLE_RESTART_DATA_IN in:loc:flpe   prtf     $base_data/$fname/RESTART  _rprt
-DATA_1D_PR_NETCDF        in:locopt     prf      $base_data/$fname/OUTPUT   _pr     nc
-DATA_1D_SP_NETCDF        in:locopt     spf      $base_data/$fname/OUTPUT   _sp     nc
-DATA_1D_TS_NETCDF        in:locopt     tsf      $base_data/$fname/OUTPUT   _ts     nc
-DATA_1D_PTS_NETCDF       in:locopt     ptsf     $base_data/$fname/OUTPUT   _pts    nc
-DATA_2D_XY_NETCDF        in:locopt     xyf      $base_data/$fname/OUTPUT   _xy     nc
-DATA_2D_XY_AV_NETCDF     in:locopt     xyf      $base_data/$fname/OUTPUT   _xy_av  nc
-DATA_2D_XZ_NETCDF        in:locopt     xzf      $base_data/$fname/OUTPUT   _xz     nc
-DATA_2D_YZ_NETCDF        in:locopt     yzf      $base_data/$fname/OUTPUT   _yz     nc
-DATA_3D_NETCDF           in:locopt     3df      $base_data/$fname/OUTPUT   _3d     nc
-DATA_PRT_NETCDF          in:locopt:pe  prtf     $base_data/$fname/OUTPUT   _prt
-#
-#----------------------------------------------------------------------------
-# List of output-files
-#----------------------------------------------------------------------------
-BINOUT                    out:loc:flpe restart   $base_data/$fname/RESTART  _d3d
-PARTICLE_RESTART_DATA_OUT out:loc:flpe prt#:prtf $base_data/$fname/RESTART  _rprt
-#
-RUN_CONTROL       out:loc:tr   d3#     $base_data/$fname/MONITORING  _rc
-RUN_CONTROL       out:loc:tra  d3f     $base_data/$fname/MONITORING  _rc
-HEADER            out:loc:tr   d3#     $base_data/$fname/MONITORING  _header
-HEADER            out:loc:tra  d3f     $base_data/$fname/MONITORING  _header
-CPU_MEASURES      out:loc:tr   d3#     $base_data/$fname/MONITORING  _cpu
-CPU_MEASURES      out:loc:tra  d3f     $base_data/$fname/MONITORING  _cpu
-#
-DATA_1D_PR_NETCDF    out:loc:tr   pr#:prf   $base_data/$fname/OUTPUT  _pr     nc
-DATA_1D_SP_NETCDF    out:loc:tr   sp#:spf   $base_data/$fname/OUTPUT  _sp     nc
-DATA_1D_TS_NETCDF    out:loc:tr   ts#:tsf   $base_data/$fname/OUTPUT  _ts     nc
-DATA_1D_PTS_NETCDF   out:loc:tr   pts#:ptsf $base_data/$fname/OUTPUT  _pts    nc
-DATA_2D_XY_NETCDF    out:loc:tr   xy#:xyf   $base_data/$fname/OUTPUT  _xy     nc
-DATA_2D_XY_AV_NETCDF out:loc:tr   xy#:xyf   $base_data/$fname/OUTPUT  _xy_av  nc
-DATA_2D_XZ_NETCDF    out:loc:tr   xz#:xzf   $base_data/$fname/OUTPUT  _xz     nc
-DATA_2D_XZ_AV_NETCDF out:loc:tr   xz#:xzf   $base_data/$fname/OUTPUT  _xz_av  nc
-DATA_2D_YZ_NETCDF    out:loc:tr   yz#:yzf   $base_data/$fname/OUTPUT  _yz     nc
-DATA_2D_YZ_AV_NETCDF out:loc:tr   yz#:yzf   $base_data/$fname/OUTPUT  _yz_av  nc
-DATA_3D_NETCDF       out:loc:tr   3d#:3df   $base_data/$fname/OUTPUT  _3d     nc
-DATA_3D_AV_NETCDF    out:loc:tr   3d#:3df   $base_data/$fname/OUTPUT  _3d_av  nc
-DATA_PRT_NETCDF      out:loc:pe   prt#:prtf $base_data/$fname/OUTPUT  _prt    nc
-DATA_PRT_NETCDF      out:loc:trpe prt#:prtf $base_data/$fname/OUTPUT  _prt    nc
-DATA_DVR             out:loc:trpe dvr       $base_data/$fname/OUTPUT  _dvr
-#
-DVRP_LOG          out:loc:tr   dv#       $base_data/$fname/MONITORING  _dvrp_log
-DVRP_LOG          out:loc:tra  dvf       $base_data/$fname/MONITORING  _dvrp_log
-PARTICLE_INFO     out:loc:tr   pt#       $base_data/$fname/MONITORING  _prt_info
-PARTICLE_INFO     out:loc:tra  ptf       $base_data/$fname/MONITORING  _prt_info
-PARTICLE_DATA     out:loc:flpe prt#:prtf $base_data/$fname/OUTPUT      _prt_dat
-# A BLANK LINE MUST FOLLOW
Index: lm/trunk/SCRIPTS/.mrun.config.imuk_ice2_netcdf4
===================================================================
--- /palm/trunk/SCRIPTS/.mrun.config.imuk_ice2_netcdf4	(revision 1326)
+++ 	(revision )
@@ -1,144 +1,0 @@
-#$Id$
-#column 1          column 2                                   column 3
-#name of variable  value of variable (~ must not be used)     scope
-#----------------------------------------------------------------------------
-%mainprog          palm.f90
-%base_directory    $HOME/palm/current_version
-%base_data         ~/palm/current_version/JOBS
-%source_path       $base_directory/trunk/SOURCE
-%add_source_path   $base_directory/USER_CODE/$fname
-%depository_path   $base_directory/MAKE_DEPOSITORY
-%use_makefile      true
-#
-# Enter your own host below by adding another line containing in the second
-# column your hostname (as provided by the unix command "hostname") and in the
-# third column the host identifier. Depending on your operating system, the
-# first characters of the host identifier should be "lc" (Linux cluster), "ibm"
-# (IBM-AIX), or "nec" (NEC-SX), respectively.
-%host_identifier   service100  lcsgih
-%host_identifier   r1*         lcsgih
-%host_identifier   h01*        lcsgih
-%host_identifier   r2*         lcsgib
-%host_identifier   b01*        lcsgib
-%host_identifier   gallego     lcmuk
-#
-# The following blocks contain all information for compiling the PALM code
-# and for generating and running the PALM executable using MPI. Replace all
-# required paths (given in <>) by the respective paths valid on your host.
-# Please adjust compilernames, cpp-options, compiler-options etc. 
-# appropriately for your own system(s), and please delete or comment out
-# blocks for unused systems.
-#
-# The following 'lcmuk parallel' block assumes PALM compilation and execution
-# on host gallego. Please note that other hosts within the IMUK linux cluster,
-# e.g. maestro or bora, may have require different settings.
-#
-#%remote_username   <replace by your IMUK username>              lcmuk parallel
-%tmp_user_catalog  /tmp                                          lcmuk parallel
-%compiler_name     mpif90                                        lcmuk parallel
-%compiler_name_ser ifort                                         lcmuk parallel
-%cpp_options       -cpp:-D__mpi2:-DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf   lcmuk parallel
-%netcdf_inc        -I:/muksoft_64/packages/netcdf/3.6.3/include            lcmuk parallel
-%netcdf_lib        -L/muksoft_64/packages/netcdf/3.6.3/lib:-lnetcdf        lcmuk parallel
-%mopts             -j:4                                          lcmuk parallel
-%fopts             -axW:-r8:-nbs:-convert:little_endian:-I:/muksoft_64/packages/mpich2/2.1.0.5/include     lcmuk parallel
-%lopts             -axW:-r8:-nbs:-Vaxlib:-L:/muksoft_64/packages/mpich2/2.1.0.5/lib:-limf:-lm              lcmuk parallel
-#%hostfile          $base_directory/.hostfile                    lcmuk parallel
-#
-%sgi_feature       ice2                                       lcsgih parallel ice2
-%modules           intel.compiler:mvapich2:phdf5:pnetcdf      lcsgih parallel ice2
-%login_init_cmd    .:/usr/share/modules/init/bash           lcsgih parallel ice2
-#%remote_username  <replace by your HLRN username>            lcsgih parallel
-%compiler_name     mpif90                                     lcsgih parallel ice2
-%compiler_name_ser ifort                                      lcsgih parallel ice2
-%cpp_options       -DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf:-D__netcdf4:-D__mpi2   lcsgih parallel ice2
-%netcdf_inc        -I:/sw/dataformats/pnetcdf/netcdf-4.0.1-mvapich2-intel/include:-I:/sw/dataformats/phdf5/hdf5-1.8.2-mvapich2-intel/include    lcsgih parallel ice2
-%netcdf_lib        -L/sw/dataformats/pnetcdf/netcdf-4.0.1-mvapich2-intel/lib:-lnetcdf:-lnetcdff:-L/sw/dataformats/phdf5/hdf5-1.8.2-mvapich2-intel/lib:-lhdf5:-lhdf5_hl:-lz      lcsgih parallel ice2
-%mopts             -j:4                                       lcsgih parallel ice2
-%fopts             -xSSE4.2:-fp-model:precise:-O3:-cpp:-r8:-align:all:-ftz:-fno-alias:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-convert:little_endian  lcsgih parallel ice2
-%lopts             -xSSE4.2:-fp-model:precise:-O3:-cpp:-r8:-align:all:-ftz:-fno-alias:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-Vaxlib:-limf:-lm       lcsgih parallel ice2
-%memory            1500                                       lcsgih parallel ice2
-#%tmp_data_catalog  /gfs2/work/<replace by your HLRN username>/palm_restart_data      lcsgih parallel
-#%tmp_user_catalog  /gfs2/tmp/<replace by your HLRN username>                         lcsgih parallel
-#
-#
-%write_binary                true                             restart
-#
-#----------------------------------------------------------------------------
-# INPUT-commands, executed before running PALM - lines must start with "IC:" 
-#----------------------------------------------------------------------------
-#IC:
-#
-#----------------------------------------------------------------------------
-# ERROR-commands - executed when program terminates abnormally
-#----------------------------------------------------------------------------
-EC:[[ \$locat = execution ]]  &&  cat  RUN_CONTROL
-EC:pwd; ls -al
-#
-#----------------------------------------------------------------------------
-# OUTPUT-commands - executed when program terminates normally
-#----------------------------------------------------------------------------
-#
-# Combine 1D- and 3D-profile output (these files are not usable for plotting)
-OC:[[ -f LIST_PROFIL_1D     ]]  &&  cat  LIST_PROFIL_1D  >>  LIST_PROFILE
-OC:[[ -f LIST_PROFIL        ]]  &&  cat  LIST_PROFIL     >>  LIST_PROFILE
-#
-# Combine all particle information files
-OC:[[ -f PARTICLE_INFOS/_0000 ]]  &&  cat  PARTICLE_INFOS/* >> PARTICLE_INFO
-#
-#----------------------------------------------------------------------------
-# List of input-files
-#----------------------------------------------------------------------------
-PARIN                    in:job        d3#      $base_data/$fname/INPUT    _p3d
-PARIN                    in:job        d3f      $base_data/$fname/INPUT    _p3df
-TOPOGRAPHY_DATA          in:locopt     d3#:d3f  $base_data/$fname/INPUT    _topo
-NUDGING_DATA             in:locopt     d3#:d3f  $base_data/$fname/INPUT    _nudge
-LSF_DATA                 in:locopt     d3#:d3f  $base_data/$fname/INPUT    _lsf
-BININ                    in:loc:flpe   d3f      $base_data/$fname/RESTART  _d3d
-PARTICLE_RESTART_DATA_IN in:loc:flpe   prtf     $base_data/$fname/RESTART  _rprt
-DATA_1D_PR_NETCDF        in:locopt     prf      $base_data/$fname/OUTPUT   _pr     nc
-DATA_1D_SP_NETCDF        in:locopt     spf      $base_data/$fname/OUTPUT   _sp     nc
-DATA_1D_TS_NETCDF        in:locopt     tsf      $base_data/$fname/OUTPUT   _ts     nc
-DATA_1D_PTS_NETCDF       in:locopt     ptsf     $base_data/$fname/OUTPUT   _pts    nc
-DATA_2D_XY_NETCDF        in:locopt     xyf      $base_data/$fname/OUTPUT   _xy     nc
-DATA_2D_XY_AV_NETCDF     in:locopt     xyf      $base_data/$fname/OUTPUT   _xy_av  nc
-DATA_2D_XZ_NETCDF        in:locopt     xzf      $base_data/$fname/OUTPUT   _xz     nc
-DATA_2D_YZ_NETCDF        in:locopt     yzf      $base_data/$fname/OUTPUT   _yz     nc
-DATA_3D_NETCDF           in:locopt     3df      $base_data/$fname/OUTPUT   _3d     nc
-DATA_PRT_NETCDF          in:locopt:pe  prtf     $base_data/$fname/OUTPUT   _prt
-#
-#----------------------------------------------------------------------------
-# List of output-files
-#----------------------------------------------------------------------------
-BINOUT                    out:loc:flpe restart   $base_data/$fname/RESTART  _d3d
-PARTICLE_RESTART_DATA_OUT out:loc:flpe prt#:prtf $base_data/$fname/RESTART  _rprt
-#
-RUN_CONTROL       out:loc:tr   d3#     $base_data/$fname/MONITORING  _rc
-RUN_CONTROL       out:loc:tra  d3f     $base_data/$fname/MONITORING  _rc
-HEADER            out:loc:tr   d3#     $base_data/$fname/MONITORING  _header
-HEADER            out:loc:tra  d3f     $base_data/$fname/MONITORING  _header
-CPU_MEASURES      out:loc:tr   d3#     $base_data/$fname/MONITORING  _cpu
-CPU_MEASURES      out:loc:tra  d3f     $base_data/$fname/MONITORING  _cpu
-#
-DATA_1D_PR_NETCDF    out:loc:tr   pr#:prf   $base_data/$fname/OUTPUT  _pr     nc
-DATA_1D_SP_NETCDF    out:loc:tr   sp#:spf   $base_data/$fname/OUTPUT  _sp     nc
-DATA_1D_TS_NETCDF    out:loc:tr   ts#:tsf   $base_data/$fname/OUTPUT  _ts     nc
-DATA_1D_PTS_NETCDF   out:loc:tr   pts#:ptsf $base_data/$fname/OUTPUT  _pts    nc
-DATA_2D_XY_NETCDF    out:loc:tr   xy#:xyf   $base_data/$fname/OUTPUT  _xy     nc
-DATA_2D_XY_AV_NETCDF out:loc:tr   xy#:xyf   $base_data/$fname/OUTPUT  _xy_av  nc
-DATA_2D_XZ_NETCDF    out:loc:tr   xz#:xzf   $base_data/$fname/OUTPUT  _xz     nc
-DATA_2D_XZ_AV_NETCDF out:loc:tr   xz#:xzf   $base_data/$fname/OUTPUT  _xz_av  nc
-DATA_2D_YZ_NETCDF    out:loc:tr   yz#:yzf   $base_data/$fname/OUTPUT  _yz     nc
-DATA_2D_YZ_AV_NETCDF out:loc:tr   yz#:yzf   $base_data/$fname/OUTPUT  _yz_av  nc
-DATA_3D_NETCDF       out:loc:tr   3d#:3df   $base_data/$fname/OUTPUT  _3d     nc
-DATA_3D_AV_NETCDF    out:loc:tr   3d#:3df   $base_data/$fname/OUTPUT  _3d_av  nc
-DATA_PRT_NETCDF      out:loc:pe   prt#:prtf $base_data/$fname/OUTPUT  _prt    nc
-DATA_PRT_NETCDF      out:loc:trpe prt#:prtf $base_data/$fname/OUTPUT  _prt    nc
-DATA_DVR             out:loc:trpe dvr       $base_data/$fname/OUTPUT  _dvr 
-#
-DVRP_LOG          out:loc:tr   dv#       $base_data/$fname/MONITORING  _dvrp_log
-DVRP_LOG          out:loc:tra  dvf       $base_data/$fname/MONITORING  _dvrp_log
-PARTICLE_INFO     out:loc:tr   pt#       $base_data/$fname/MONITORING  _prt_info
-PARTICLE_INFO     out:loc:tra  ptf       $base_data/$fname/MONITORING  _prt_info
-PARTICLE_DATA     out:loc:flpe prt#:prtf $base_data/$fname/OUTPUT      _prt_dat
-# A BLANK LINE MUST FOLLOW
Index: /palm/trunk/SOURCE/check_open.f90
===================================================================
--- /palm/trunk/SOURCE/check_open.f90	(revision 1326)
+++ /palm/trunk/SOURCE/check_open.f90	(revision 1327)
@@ -20,5 +20,5 @@
 ! Current revisions:
 ! -----------------
-!
+! parts concerning iso2d and avs output removed
 !
 ! Former revisions:
@@ -76,6 +76,5 @@
 
     USE control_parameters,                                                    &
-        ONLY:  avs_data_file, avs_output, coupling_char,                       &
-               data_output_2d_on_each_pe, do3d_compress, host, iso2d_output,   &
+        ONLY:  avs_data_file, coupling_char, data_output_2d_on_each_pe, host,  &
                message_string, mid, netcdf_data_format, nz_do3d, openfile,     &
                return_addres, return_username, run_description_header, runnr
@@ -231,5 +230,5 @@
           ENDIF
 
-       CASE ( 27, 28, 29, 31, 32, 33, 71:73, 90:99 )
+       CASE ( 27, 28, 29, 31, 33, 71:73, 90:99 )
 
 !
@@ -372,12 +371,4 @@
              DEALLOCATE( eta, ho, hu )
 
-!
-!--          Create output file for local parameters
-             IF ( iso2d_output )  THEN
-                OPEN ( 27, FILE='PLOT2D_XY_LOCAL'//coupling_char,              &
-                           FORM='FORMATTED', DELIM='APOSTROPHE' )
-                openfile(27)%opened = .TRUE.
-             ENDIF
-
           ENDIF
 
@@ -400,5 +391,5 @@
              ENDIF
 !
-!--          Determine and write ISO2D coordiante header
+!--          Determine and write ISO2D coordinate header
              ALLOCATE( eta(0:nz+1), ho(0:nx+1), hu(0:nx+1) )
              hu = 0.0
@@ -412,9 +403,4 @@
              WRITE (22)  dx,eta,hu,ho
              DEALLOCATE( eta, ho, hu )
-!
-!--          Create output file for local parameters
-             OPEN ( 28, FILE='PLOT2D_XZ_LOCAL'//coupling_char,                 &
-                        FORM='FORMATTED', DELIM='APOSTROPHE' )
-             openfile(28)%opened = .TRUE.
 
           ENDIF
@@ -450,9 +436,4 @@
              WRITE (23)  dx,eta,hu,ho
              DEALLOCATE( eta, ho, hu )
-!
-!--          Create output file for local parameters
-             OPEN ( 29, FILE='PLOT2D_YZ_LOCAL'//coupling_char,                 &
-                        FORM='FORMATTED', DELIM='APOSTROPHE' )
-             openfile(29)%opened = .TRUE.
 
           ENDIF
@@ -468,162 +449,7 @@
 !
 !--          Specifications for combine_plot_fields
-             IF ( .NOT. do3d_compress )  THEN
-                WRITE ( 30 )  -nbgp,nx+nbgp,-nbgp,ny+nbgp, 0 ,nz_do3d
-                WRITE ( 30 )  0,nx+1,0,ny+1,0,nz_do3d
-             ENDIF
+             WRITE ( 30 )  -nbgp,nx+nbgp,-nbgp,ny+nbgp, 0 ,nz_do3d
+             WRITE ( 30 )  0,nx+1,0,ny+1,0,nz_do3d
 #endif
-!
-!--          Write coordinate file for AVS:
-!--          First determine file names (including cyle numbers) of AVS files on
-!--          target machine (to which the files are to be transferred).
-!--          Therefore path information has to be obtained first.
-             IF ( avs_output )  THEN
-                iaddres = LEN_TRIM( return_addres )
-                iusern  = LEN_TRIM( return_username )
-
-                OPEN ( 3, FILE='OUTPUT_FILE_CONNECTIONS', FORM='FORMATTED' )
-                DO  WHILE ( .NOT. avs_coor_file_found  .OR.                    &
-                            .NOT. avs_data_file_found )
-
-                   READ ( 3, '(A)', END=1 )  line
-
-                   SELECT CASE ( line(1:11) )
-
-                      CASE ( 'PLOT3D_COOR' )
-                         READ ( 3, '(A/A)' )  avs_coor_file_catalog,           &
-                                              avs_coor_file_localname
-                         avs_coor_file_found = .TRUE.
-
-                      CASE ( 'PLOT3D_DATA' )
-                         READ ( 3, '(A/A)' )  avs_data_file_catalog,           &
-                                              avs_data_file_localname
-                         avs_data_file_found = .TRUE.
-
-                      CASE DEFAULT
-                         READ ( 3, '(A/A)' )  line, line
-
-                   END SELECT
-
-                ENDDO
-!
-!--             Now the cycle numbers on the remote machine must be obtained
-!--             using batch_scp
-       1        CLOSE ( 3 )
-                IF ( .NOT. avs_coor_file_found  .OR.                           &
-                     .NOT. avs_data_file_found )  THEN
-                   message_string= 'no filename for AVS-data-file ' //         &
-                                   'found in MRUN-config-file' //              &
-                                   ' &filename in FLD-file set to "unknown"'
-                   CALL message( 'check_open', 'PA0169', 0, 1, 0, 6, 0 )
-
-                   avs_coor_file = 'unknown'
-                   avs_data_file = 'unknown'
-                ELSE
-                   get_filenames = .TRUE.
-                   IF ( TRIM( host ) == 'hpmuk'  .OR.                          &
-                        TRIM( host ) == 'lcmuk' )  THEN
-                      batch_scp = '/home/raasch/pub/batch_scp'
-                   ELSEIF ( TRIM( host ) == 'nech' )  THEN
-                      batch_scp = '/ipf/b/b323011/pub/batch_scp'
-                   ELSEIF ( TRIM( host ) == 'ibmh'  .OR.                       &
-                            TRIM( host ) == 'ibmb' )  THEN
-                      batch_scp = '/home/h/niksiraa/pub/batch_scp'
-                   ELSEIF ( TRIM( host ) == 't3eb' )  THEN
-                      batch_scp = '/home/nhbksira/pub/batch_scp'
-                   ELSE
-                      message_string= 'no path for batch_scp on host "' //     &
-                                       TRIM( host ) // '"'
-                      CALL message( 'check_open', 'PA0170', 0, 1, 0, 6, 0 )
-                      get_filenames = .FALSE.
-                   ENDIF
-
-                   IF ( get_filenames )  THEN
-!
-!--                   Determine the coordinate file name.
-!--                   /etc/passwd serves as Dummy-Datei, because it is not 
-!--                   really transferred.
-                      command = TRIM( batch_scp ) // ' -n -u ' //              &
-                         return_username(1:iusern) // ' ' //                   &
-                         return_addres(1:iaddres) // ' /etc/passwd "' //       &
-                         TRIM( avs_coor_file_catalog ) // '" ' //              &
-                         TRIM( avs_coor_file_localname ) // ' > REMOTE_FILENAME'
-
-                      CALL local_system( command )
-                      OPEN ( 3, FILE='REMOTE_FILENAME', FORM='FORMATTED' )
-                      READ ( 3, '(A)' )  avs_coor_file
-                      CLOSE ( 3 )
-!
-!--                   Determine the data file name
-                      command = TRIM( batch_scp ) // ' -n -u ' //              &
-                         return_username(1:iusern) // ' ' //                   &
-                         return_addres(1:iaddres) // ' /etc/passwd "' //       &
-                         TRIM( avs_data_file_catalog ) // '" ' //              &
-                         TRIM( avs_data_file_localname ) // ' > REMOTE_FILENAME'
-
-                      CALL local_system( command )
-                      OPEN ( 3, FILE='REMOTE_FILENAME', FORM='FORMATTED' )
-                      READ ( 3, '(A)' )  avs_data_file
-                      CLOSE ( 3 )
-
-                   ELSE
-
-                      avs_coor_file = 'unknown'
-                      avs_data_file = 'unknown'
-
-                   ENDIF
-
-                ENDIF
-
-!
-!--             Output of the coordinate file description for FLD-file
-                OPEN ( 33, FILE='PLOT3D_FLD_COOR', FORM='FORMATTED' )
-                openfile(33)%opened = .TRUE.
-                WRITE ( 33, 3300 )  TRIM( avs_coor_file ),                     &
-                                    TRIM( avs_coor_file ), (nx+2*nbgp)*4,      &
-                                    TRIM( avs_coor_file ), (nx+2*nbgp)*4+(ny+2*nbgp)*4
-            
-
-                ALLOCATE( xkoor(0:nx+1), ykoor(0:ny+1), zkoor(0:nz_do3d) )
-                DO  i = 0, nx+1
-                   xkoor(i) = i * dx
-                ENDDO
-                DO  j = 0, ny+1
-                   ykoor(j) = j * dy
-                ENDDO
-                DO  k = 0, nz_do3d
-                   zkoor(k) = zu(k)
-                ENDDO
-
-!
-!--             Create and write on AVS coordinate file
-                OPEN ( 31, FILE='PLOT3D_COOR', FORM='UNFORMATTED' )
-                openfile(31)%opened = .TRUE.
-
-                WRITE (31)  xkoor, ykoor, zkoor
-                DEALLOCATE( xkoor, ykoor, zkoor )
-
-!
-!--             Create FLD file (being written on in close_file)
-                OPEN ( 32, FILE='PLOT3D_FLD', FORM='FORMATTED' )
-                openfile(32)%opened = .TRUE.
-
-!
-!--             Create flag file for compressed 3D output,
-!--             influences output commands in mrun
-                IF ( do3d_compress )  THEN
-                   OPEN ( 3, FILE='PLOT3D_COMPRESSED', FORM='FORMATTED' )
-                   WRITE ( 3, '(1X)' )
-                   CLOSE ( 3 )
-                ENDIF 
-
-             ENDIF
-
-          ENDIF
-
-!
-!--       In case of data compression output of the coordinates of the
-!--       corresponding partial array of a PE only once at the top of the file
-          IF ( avs_output  .AND.  do3d_compress )  THEN
-             WRITE ( 30 )  nxlg, nxrg, nysg, nyng, nzb, nz_do3d
           ENDIF
 
Index: /palm/trunk/SOURCE/check_parameters.f90
===================================================================
--- /palm/trunk/SOURCE/check_parameters.f90	(revision 1326)
+++ /palm/trunk/SOURCE/check_parameters.f90	(revision 1327)
@@ -20,5 +20,7 @@
 ! Current revisions:
 ! -----------------
-!
+! "baroclinicity" renamed "baroclinity", "ocean version" replaced by "ocean mode"
+! bugfix: duplicate error message 56 removed,
+! check of data_output_format and do3d_compress removed
 !
 ! Former revisions:
@@ -1309,5 +1311,5 @@
 !-- Ocean version must use flux boundary conditions at the top
     IF ( ocean .AND. .NOT. use_top_fluxes )  THEN
-       message_string = 'use_top_fluxes must be .TRUE. in ocean version'
+       message_string = 'use_top_fluxes must be .TRUE. in ocean mode'
        CALL message( 'check_parameters', 'PA0042', 1, 2, 0, 6, 0 )
     ENDIF
@@ -1381,5 +1383,5 @@
                 ( ug_vertical_gradient_level(1) /= 0.0  .OR.  &
                 ug_vertical_gradient(1) /= 0.0 ) )  THEN
-          message_string = 'baroclinicity (ug) not allowed simultaneously' // &
+          message_string = 'baroclinity (ug) not allowed simultaneously' // &
                            ' with galilei transformation'
           CALL message( 'check_parameters', 'PA0046', 1, 2, 0, 6, 0 )
@@ -1387,5 +1389,5 @@
                 ( vg_vertical_gradient_level(1) /= 0.0  .OR.  &
                 vg_vertical_gradient(1) /= 0.0 ) )  THEN
-          message_string = 'baroclinicity (vg) not allowed simultaneously' // &
+          message_string = 'baroclinity (vg) not allowed simultaneously' // &
                            ' with galilei transformation'
           CALL message( 'check_parameters', 'PA0047', 1, 2, 0, 6, 0 )
@@ -1463,9 +1465,4 @@
     ELSEIF ( bc_e_b == '(u*)**2+neumann' )  THEN
        ibc_e_b = 2
-       IF ( prandtl_layer )  THEN
-          message_string = 'adjust mixing length = FALSE and bc_e_b = "' // &
-                           TRIM( bc_e_b ) // '"'
-          CALL message( 'check_parameters', 'PA0056', 0, 1, 0, 6, 0 )
-       ENDIF
        IF ( .NOT. prandtl_layer )  THEN
           bc_e_b = 'neumann'
@@ -3011,108 +3008,20 @@
 
 !
-!-- Determine and check accuracy for compressed 3D plot output
-    IF ( do3d_compress )  THEN
-!
-!--    Compression only permissible on T3E machines
-       IF ( host(1:3) /= 't3e' )  THEN
-          message_string = 'do3d_compress = .TRUE. not allowed on host "' // &
-                           TRIM( host ) // '"'
-          CALL message( 'check_parameters', 'PA0117', 1, 2, 0, 6, 0 )
-       ENDIF
-
-       i = 1
-       DO  WHILE ( do3d_comp_prec(i) /= ' ' )
-
-          ilen = LEN_TRIM( do3d_comp_prec(i) )
-          IF ( LLT( do3d_comp_prec(i)(ilen:ilen), '0' ) .OR. &
-               LGT( do3d_comp_prec(i)(ilen:ilen), '9' ) )  THEN
-             WRITE( message_string, * )  'illegal precision: do3d_comp_prec', &
-                                   '(', i, ') = "', TRIM(do3d_comp_prec(i)),'"'
-             CALL message( 'check_parameters', 'PA0118', 1, 2, 0, 6, 0 )
-          ENDIF
-
-          prec = IACHAR( do3d_comp_prec(i)(ilen:ilen) ) - IACHAR( '0' )
-          var = do3d_comp_prec(i)(1:ilen-1)
-
-          SELECT CASE ( var )
-
-             CASE ( 'u' )
-                j = 1
-             CASE ( 'v' )
-                j = 2
-             CASE ( 'w' )
-                j = 3
-             CASE ( 'p' )
-                j = 4
-             CASE ( 'pt' )
-                j = 5
-
-             CASE DEFAULT
-                WRITE( message_string, * )  'unknown variable "', &
-                     TRIM( do3d_comp_prec(i) ), '" given for do3d_comp_prec(', &
-                     i, ')'
-                CALL message( 'check_parameters', 'PA0119', 1, 2, 0, 6, 0 )
-
-          END SELECT
-
-          plot_3d_precision(j)%precision = prec
-          i = i + 1
-
-       ENDDO
-    ENDIF
-
-!
-!-- Check the data output format(s)
-    IF ( data_output_format(1) == ' ' )  THEN
-!
-!--    Default value
-       netcdf_output = .TRUE.
-    ELSE
-       i = 1
-       DO  WHILE ( data_output_format(i) /= ' ' )
-
-          SELECT CASE ( data_output_format(i) )
-
-             CASE ( 'netcdf' )
-                netcdf_output = .TRUE.
-             CASE ( 'iso2d' )
-                iso2d_output  = .TRUE.
-             CASE ( 'avs' )
-                avs_output    = .TRUE.
-
-             CASE DEFAULT
-                message_string = 'unknown value for data_output_format "' // &
-                                 TRIM( data_output_format(i) ) // '"'
-                CALL message( 'check_parameters', 'PA0120', 1, 2, 0, 6, 0 )
-
-          END SELECT
-
-          i = i + 1
-          IF ( i > 10 )  EXIT
-
-       ENDDO
-    ENDIF
-
-!
 !-- Set output format string (used in header)
-    IF ( netcdf_output )  THEN
-
-       SELECT CASE ( netcdf_data_format )
-          CASE ( 1 )
-             output_format_netcdf = 'netCDF classic'
-          CASE ( 2 )
-             output_format_netcdf = 'netCDF 64bit offset'
-          CASE ( 3 )
-             output_format_netcdf = 'netCDF4/HDF5'
-          CASE ( 4 )
-             output_format_netcdf = 'netCDF4/HDF5 classic'
-          CASE ( 5 )
-             output_format_netcdf = 'parallel netCDF4/HDF5'
-          CASE ( 6 )
-             output_format_netcdf = 'parallel netCDF4/HDF5 classic'
-
-       END SELECT
-
-    ENDIF
+    SELECT CASE ( netcdf_data_format )
+       CASE ( 1 )
+          output_format_netcdf = 'netCDF classic'
+       CASE ( 2 )
+          output_format_netcdf = 'netCDF 64bit offset'
+       CASE ( 3 )
+          output_format_netcdf = 'netCDF4/HDF5'
+       CASE ( 4 )
+          output_format_netcdf = 'netCDF4/HDF5 classic'
+       CASE ( 5 )
+          output_format_netcdf = 'parallel netCDF4/HDF5'
+       CASE ( 6 )
+          output_format_netcdf = 'parallel netCDF4/HDF5 classic'
+
+    END SELECT
 
 #if defined( __spectra )
@@ -3203,24 +3112,24 @@
 !
 !-- Calculate fixed number of output time levels for parallel netcdf output.
-!-- The time dimension has to be limited for paralell output, otherwise the
-!-- performance drops significantly.
-    IF ( netcdf_output )  THEN
-       IF ( netcdf_data_format > 4 )  THEN
-          ntdim_3d(0) = INT( ( end_time - skip_time_do3d ) / dt_do3d )
-          IF ( do3d_at_begin ) ntdim_3d(0) = ntdim_3d(0) + 1
-          ntdim_3d(1) = INT( ( end_time - skip_time_data_output_av ) &
-                              / dt_data_output_av )
-          ntdim_2d_xy(0) = INT( ( end_time - skip_time_do2d_xy ) / dt_do2d_xy )
-          ntdim_2d_xz(0) = INT( ( end_time - skip_time_do2d_xz ) / dt_do2d_xz )
-          ntdim_2d_yz(0) = INT( ( end_time - skip_time_do2d_yz ) / dt_do2d_yz )
-          IF ( do2d_at_begin )  THEN
-             ntdim_2d_xy(0) = ntdim_2d_xy(0) + 1
-             ntdim_2d_xz(0) = ntdim_2d_xz(0) + 1
-             ntdim_2d_yz(0) = ntdim_2d_yz(0) + 1
-          ENDIF
-          ntdim_2d_xy(1) = ntdim_3d(1)
-          ntdim_2d_xz(1) = ntdim_3d(1)
-          ntdim_2d_yz(1) = ntdim_3d(1)
-       ENDIF
+!-- The time dimension has to be defined as limited for parallel output,
+!-- because otherwise the I/O performance drops significantly.
+    IF ( netcdf_data_format > 4 )  THEN
+
+       ntdim_3d(0)    = INT( ( end_time - skip_time_do3d ) / dt_do3d )
+       IF ( do3d_at_begin ) ntdim_3d(0) = ntdim_3d(0) + 1
+       ntdim_3d(1)    = INT( ( end_time - skip_time_data_output_av ) &
+                             / dt_data_output_av )
+       ntdim_2d_xy(0) = INT( ( end_time - skip_time_do2d_xy ) / dt_do2d_xy )
+       ntdim_2d_xz(0) = INT( ( end_time - skip_time_do2d_xz ) / dt_do2d_xz )
+       ntdim_2d_yz(0) = INT( ( end_time - skip_time_do2d_yz ) / dt_do2d_yz )
+       IF ( do2d_at_begin )  THEN
+          ntdim_2d_xy(0) = ntdim_2d_xy(0) + 1
+          ntdim_2d_xz(0) = ntdim_2d_xz(0) + 1
+          ntdim_2d_yz(0) = ntdim_2d_yz(0) + 1
+       ENDIF
+       ntdim_2d_xy(1) = ntdim_3d(1)
+       ntdim_2d_xz(1) = ntdim_3d(1)
+       ntdim_2d_yz(1) = ntdim_3d(1)
+
     ENDIF
 
Index: /palm/trunk/SOURCE/close_file.f90
===================================================================
--- /palm/trunk/SOURCE/close_file.f90	(revision 1326)
+++ /palm/trunk/SOURCE/close_file.f90	(revision 1327)
@@ -20,5 +20,5 @@
 ! Current revisions:
 ! -----------------
-! 
+! parts concerning iso2d and avs output removed
 !
 ! Former revisions:
@@ -58,7 +58,7 @@
 
     USE control_parameters,                                                    &
-        ONLY:  do2d_xz_n, do2d_xy_n, do2d_yz_n, do3d_avs_n, do3d_compress,     &
-               host, iso2d_output, max_masks, mid, netcdf_data_format,         &
-               netcdf_output, nz_do3d, openfile, run_description_header,       &
+        ONLY:  do2d_xz_n, do2d_xy_n, do2d_yz_n, do3d_avs_n,                    &
+               host, max_masks, mid, netcdf_data_format,                       &
+               nz_do3d, openfile, run_description_header,       &
                z_max_do2d
                 
@@ -120,90 +120,8 @@
           SELECT CASE ( fid )
 
-             CASE ( 21 )
-!
-!--             Write ISO2D global parameters
-                IF ( myid == 0  .AND.  iso2d_output )  THEN
-                   planz  = do2d_xy_n
-                   dimx   = nx + 2
-                   dimy   = ny + 2
-                   sizex  = 100.0
-                   sizey  = 100.0
-                   title  = run_description_header
-                   yright = ( ny + 1.0 ) * dy
-                   IF ( host(1:3) == 'ibm'  .OR.  host(1:3) == 't3e' )  THEN
-                      checkuf = .FALSE.; dbp = .TRUE.
-                   ENDIF
-                   IF ( host(1:3) == 'ibm'  .OR.  host(1:3) == 'nec' )  THEN
-                      datform = 'big_endian'
-                   ENDIF
-                   OPEN ( 90, FILE='PLOT2D_XY_GLOBAL', FORM='FORMATTED',       &
-                              DELIM='APOSTROPHE' )
-                   WRITE ( 90, GLOBAL )
-                   CLOSE ( 90 )
-                ENDIF
-
-             CASE ( 22 )
-!
-!--             Write ISO2D global parameters
-                IF ( myid == 0 )  THEN
-                   planz  = do2d_xz_n
-                   dimx   = nx + 2
-                   dimy   = nz + 2
-                   sizex  = 100.0
-                   sizey  =  65.0
-                   title  = run_description_header
-                   yright = z_max_do2d
-                   IF ( host(1:3) == 'ibm'  .OR.  host(1:3) == 't3e' )  THEN
-                      checkuf = .FALSE.; dbp = .TRUE.
-                   ENDIF
-                   IF ( host(1:3) == 'ibm'  .OR.  host(1:3) == 'nec' )  THEN
-                      datform = 'big_endian'
-                   ENDIF
-                   OPEN ( 90, FILE='PLOT2D_XZ_GLOBAL', FORM='FORMATTED',       &
-                              DELIM='APOSTROPHE' )
-                   WRITE ( 90, GLOBAL )
-                   CLOSE ( 90 )
-                ENDIF
-
-             CASE ( 23 )
-!
-!--             Write ISO2D global parameters
-                IF ( myid == 0 )  THEN
-                   planz  = do2d_yz_n
-                   dimx   = ny + 2
-                   dimy   = nz + 2
-                   sizex  = 100.0
-                   sizey  =  65.0
-                   title  = run_description_header
-                   yright = z_max_do2d
-                   IF ( host(1:3) == 'ibm'  .OR.  host(1:3) == 't3e' )  THEN
-                      checkuf = .FALSE.; dbp = .TRUE.
-                   ENDIF
-                   IF ( host(1:3) == 'ibm'  .OR.  host(1:3) == 'nec' )  THEN
-                      datform = 'big_endian'
-                   ENDIF
-                   OPEN ( 90, FILE='PLOT2D_YZ_GLOBAL', FORM='FORMATTED',       &
-                              DELIM='APOSTROPHE' )
-                   WRITE ( 90, GLOBAL )
-                   CLOSE ( 90 )
-                ENDIF
-
-             CASE ( 32 )
-!
-!--             Write header for FLD-file
-                IF ( do3d_compress )  THEN
-                   WRITE ( 32, 3200)  ' compressed ',                          &
-                                      TRIM( run_description_header ), nx+2,    &
-                                      ny+2, nz_do3d+1, do3d_avs_n
-                ELSE
-                   WRITE ( 32, 3200)  ' ', TRIM( run_description_header ),     &
-                                      nx+2, ny+2, nz_do3d+1, do3d_avs_n
-                ENDIF
-
 #if defined( __netcdf )
              CASE ( 101 )
 
-                IF ( netcdf_output  .AND.                                      &
-                     ( myid == 0  .OR.  netcdf_data_format > 4 ) )  THEN
+                IF ( myid == 0  .OR.  netcdf_data_format > 4 )  THEN
                    nc_stat = NF90_CLOSE( id_set_xy(0) )
                    CALL handle_netcdf_error( 'close_file', 44 )
@@ -212,6 +130,5 @@
              CASE ( 102 )
 
-                IF ( netcdf_output  .AND.                                      &
-                     ( myid == 0  .OR.  netcdf_data_format > 4 ) )  THEN
+                IF ( myid == 0  .OR.  netcdf_data_format > 4 )  THEN
                    nc_stat = NF90_CLOSE( id_set_xz(0) )
                    CALL handle_netcdf_error( 'close_file', 45 )
@@ -220,6 +137,5 @@
              CASE ( 103 )
 
-                IF ( netcdf_output  .AND.                                      &
-                     ( myid == 0  .OR.  netcdf_data_format > 4 ) )  THEN
+                IF ( myid == 0  .OR.  netcdf_data_format > 4 )  THEN
                    nc_stat = NF90_CLOSE( id_set_yz(0) )
                    CALL handle_netcdf_error( 'close_file', 46 )
@@ -228,5 +144,5 @@
              CASE ( 104 )
 
-                IF ( myid == 0  .AND.  netcdf_output )  THEN
+                IF ( myid == 0 )  THEN
                    nc_stat = NF90_CLOSE( id_set_pr )
                    CALL handle_netcdf_error( 'close_file', 47 )
@@ -235,5 +151,5 @@
              CASE ( 105 )
 
-                IF ( myid == 0  .AND.  netcdf_output )  THEN
+                IF ( myid == 0 )  THEN
                    nc_stat = NF90_CLOSE( id_set_ts )
                    CALL handle_netcdf_error( 'close_file', 48 )
@@ -242,6 +158,5 @@
              CASE ( 106 )
 
-                IF ( netcdf_output  .AND.  &
-                     ( myid == 0  .OR.  netcdf_data_format > 4 ) )  THEN
+                IF ( myid == 0  .OR.  netcdf_data_format > 4 )  THEN
                    nc_stat = NF90_CLOSE( id_set_3d(0) )
                    CALL handle_netcdf_error( 'close_file', 49 )
@@ -250,5 +165,5 @@
              CASE ( 107 )
 
-                IF ( myid == 0  .AND.  netcdf_output )  THEN
+                IF ( myid == 0 )  THEN
                    nc_stat = NF90_CLOSE( id_set_sp )
                    CALL handle_netcdf_error( 'close_file', 50 )
@@ -257,20 +172,15 @@
              CASE ( 108 )
 
-                IF (  netcdf_output )  THEN
-                   nc_stat = NF90_CLOSE( id_set_prt )
-                   CALL handle_netcdf_error( 'close_file', 51 )
-                ENDIF
+                nc_stat = NF90_CLOSE( id_set_prt )
+                CALL handle_netcdf_error( 'close_file', 51 )
 
              CASE ( 109 ) 
 
-                IF (  netcdf_output )  THEN
-                   nc_stat = NF90_CLOSE( id_set_pts )
-                   CALL handle_netcdf_error( 'close_file', 412 )
-                ENDIF
+                nc_stat = NF90_CLOSE( id_set_pts )
+                CALL handle_netcdf_error( 'close_file', 412 )
 
              CASE ( 111 )
 
-                IF ( netcdf_output  .AND.                                      &
-                     ( myid == 0  .OR.  netcdf_data_format > 4 ) )  THEN
+                IF ( myid == 0  .OR.  netcdf_data_format > 4 )  THEN
                    nc_stat = NF90_CLOSE( id_set_xy(1) )
                    CALL handle_netcdf_error( 'close_file', 52 )
@@ -279,6 +189,5 @@
              CASE ( 112 )
 
-                IF ( netcdf_output  .AND.                                      &
-                     ( myid == 0  .OR.  netcdf_data_format > 4 ) )  THEN
+                IF ( myid == 0  .OR.  netcdf_data_format > 4 )  THEN
                    nc_stat = NF90_CLOSE( id_set_xz(1) )
                    CALL handle_netcdf_error( 'close_file', 352 )
@@ -287,6 +196,5 @@
              CASE ( 113 )
 
-                IF ( netcdf_output  .AND.                                      &
-                     ( myid == 0  .OR.  netcdf_data_format > 4 ) )  THEN
+                IF ( myid == 0  .OR.  netcdf_data_format > 4 )  THEN
                    nc_stat = NF90_CLOSE( id_set_yz(1) )
                    CALL handle_netcdf_error( 'close_file', 353 )
@@ -295,6 +203,5 @@
              CASE ( 116 )
 
-                IF ( netcdf_output  .AND.                                      &
-                     ( myid == 0  .OR.  netcdf_data_format > 4 ) )  THEN
+                IF ( myid == 0  .OR.  netcdf_data_format > 4 )  THEN
                    nc_stat = NF90_CLOSE( id_set_3d(1) )
                    CALL handle_netcdf_error( 'close_file', 353 )
@@ -303,6 +210,5 @@
              CASE ( 201:200+2*max_masks )
 	     
-                IF ( netcdf_output  .AND.                                      &
-                     ( myid == 0  .OR.  netcdf_data_format > 4 ) )  THEN
+                IF ( myid == 0  .OR.  netcdf_data_format > 4 )  THEN
 !
 !--                decompose fid into mid and av
Index: /palm/trunk/SOURCE/data_output_2d.f90
===================================================================
--- /palm/trunk/SOURCE/data_output_2d.f90	(revision 1326)
+++ /palm/trunk/SOURCE/data_output_2d.f90	(revision 1327)
@@ -20,5 +20,6 @@
 ! Current revisions:
 ! -----------------
-! 
+! parts concerning iso2d output removed,
+! -netcdf output queries
 !
 ! Former revisions:
@@ -101,6 +102,6 @@
                do2d_xz_last_time, do2d_xz_n, do2d_xz_time_count,               &
                do2d_yz_last_time, do2d_yz_n, do2d_yz_time_count,               &
-               ibc_uv_b, icloud_scheme, io_blocks, io_group, iso2d_output,     &
-               message_string, netcdf_data_format, netcdf_output,              &
+               ibc_uv_b, icloud_scheme, io_blocks, io_group,                   &
+               message_string, netcdf_data_format,                             &
                ntdim_2d_xy, ntdim_2d_xz, ntdim_2d_yz, psolver, section,        &
                simulated_time,  simulated_time_chr, time_since_reference_point
@@ -236,6 +237,5 @@
 !
 !--       Parallel netCDF4/HDF5 output is done on all PEs, all other on PE0 only
-          IF ( netcdf_output .AND. ( myid == 0 .OR. netcdf_data_format > 4 ) ) &
-          THEN
+          IF ( myid == 0  .OR.  netcdf_data_format > 4 )  THEN
              CALL check_open( 101+av*10 )
           ENDIF
@@ -245,5 +245,4 @@
           ELSE
              IF ( myid == 0 )  THEN
-                IF ( iso2d_output )  CALL check_open( 21 )
 #if defined( __parallel )
                 ALLOCATE( total_2d(-nbgp:nx+nbgp,-nbgp:ny+nbgp) )
@@ -269,6 +268,5 @@
 !
 !--       Parallel netCDF4/HDF5 output is done on all PEs, all other on PE0 only
-          IF ( netcdf_output .AND. ( myid == 0 .OR. netcdf_data_format > 4 ) ) &
-          THEN
+          IF ( myid == 0 .OR. netcdf_data_format > 4 )  THEN
              CALL check_open( 102+av*10 )
           ENDIF
@@ -278,5 +276,4 @@
           ELSE
              IF ( myid == 0 )  THEN
-                IF ( iso2d_output )  CALL check_open( 22 )
 #if defined( __parallel )
                 ALLOCATE( total_2d(-nbgp:nx+nbgp,nzb:nzt+1) )
@@ -302,6 +299,5 @@
 !
 !--       Parallel netCDF4/HDF5 output is done on all PEs, all other on PE0 only
-          IF ( netcdf_output .AND. ( myid == 0 .OR. netcdf_data_format > 4 ) ) &
-          THEN
+          IF ( myid == 0 .OR. netcdf_data_format > 4 )  THEN
              CALL check_open( 103+av*10 )
           ENDIF
@@ -311,5 +307,4 @@
           ELSE
              IF ( myid == 0 )  THEN
-                IF ( iso2d_output )  CALL check_open( 23 )
 #if defined( __parallel )
                 ALLOCATE( total_2d(-nbgp:ny+nbgp,nzb:nzt+1) )
@@ -882,6 +877,6 @@
                       do2d_xy_last_time(av)  = simulated_time
                       IF ( myid == 0 )  THEN
-                         IF ( ( .NOT. data_output_2d_on_each_pe  .AND.         &
-                              netcdf_output )  .OR.  netcdf_data_format > 4 )  &
+                         IF ( .NOT. data_output_2d_on_each_pe  &
+                              .OR.  netcdf_data_format > 4 )   &
                          THEN
 #if defined( __netcdf )
@@ -921,5 +916,5 @@
 
 #if defined( __parallel )
-                   IF ( netcdf_output  .AND.  netcdf_data_format > 4 )  THEN
+                   IF ( netcdf_data_format > 4 )  THEN
 !
 !--                   Parallel output in netCDF4/HDF5 format.
@@ -947,5 +942,5 @@
 !--                      Output of partial arrays on each PE
 #if defined( __netcdf )
-                         IF ( netcdf_output  .AND.  myid == 0 )  THEN
+                         IF ( myid == 0 )  THEN
                             WRITE ( 21 )  time_since_reference_point,          &
                                           do2d_xy_time_count(av), av
@@ -994,9 +989,4 @@
                             ENDDO
 !
-!--                         Output of the total cross-section.
-                            IF ( iso2d_output )  THEN
-                               WRITE (21)  total_2d(-nbgp:nx+nbgp,-nbgp:ny+nbgp)
-                            ENDIF
-!
 !--                         Relocate the local array for the next loop increment
                             DEALLOCATE( local_2d )
@@ -1004,20 +994,18 @@
 
 #if defined( __netcdf )
-                            IF ( netcdf_output )  THEN
-                               IF ( two_d ) THEN
-                                  nc_stat = NF90_PUT_VAR( id_set_xy(av),       &
-                                                          id_var_do2d(av,if),  &
-                                                      total_2d(0:nx+1,0:ny+1), &
-                                start = (/ 1, 1, 1, do2d_xy_time_count(av) /), &
-                                                count = (/ nx+2, ny+2, 1, 1 /) )
-                               ELSE
-                                  nc_stat = NF90_PUT_VAR( id_set_xy(av),       &
-                                                          id_var_do2d(av,if),  &
-                                                      total_2d(0:nx+1,0:ny+1), &
-                               start = (/ 1, 1, is, do2d_xy_time_count(av) /), &
-                                                count = (/ nx+2, ny+2, 1, 1 /) )
-                               ENDIF
-                               CALL handle_netcdf_error( 'data_output_2d', 54 )
+                            IF ( two_d ) THEN
+                               nc_stat = NF90_PUT_VAR( id_set_xy(av),       &
+                                                       id_var_do2d(av,if),  &
+                                                   total_2d(0:nx+1,0:ny+1), &
+                             start = (/ 1, 1, 1, do2d_xy_time_count(av) /), &
+                                             count = (/ nx+2, ny+2, 1, 1 /) )
+                            ELSE
+                               nc_stat = NF90_PUT_VAR( id_set_xy(av),       &
+                                                       id_var_do2d(av,if),  &
+                                                   total_2d(0:nx+1,0:ny+1), &
+                            start = (/ 1, 1, is, do2d_xy_time_count(av) /), &
+                                             count = (/ nx+2, ny+2, 1, 1 /) )
                             ENDIF
+                            CALL handle_netcdf_error( 'data_output_2d', 54 )
 #endif
 
@@ -1043,48 +1031,22 @@
                    ENDIF
 #else
-                   IF ( iso2d_output )  THEN
-                      WRITE (21)  local_2d(nxl:nxr+1,nys:nyn+1)
+#if defined( __netcdf )
+                   IF ( two_d ) THEN
+                      nc_stat = NF90_PUT_VAR( id_set_xy(av),                &
+                                              id_var_do2d(av,if),           &
+                                             local_2d(nxl:nxr+1,nys:nyn+1), &
+                             start = (/ 1, 1, 1, do2d_xy_time_count(av) /), &
+                                           count = (/ nx+2, ny+2, 1, 1 /) )
+                   ELSE
+                      nc_stat = NF90_PUT_VAR( id_set_xy(av),                &
+                                              id_var_do2d(av,if),           &
+                                             local_2d(nxl:nxr+1,nys:nyn+1), &
+                            start = (/ 1, 1, is, do2d_xy_time_count(av) /), &
+                                           count = (/ nx+2, ny+2, 1, 1 /) )
                    ENDIF
-#if defined( __netcdf )
-                   IF ( netcdf_output )  THEN
-                      IF ( two_d ) THEN
-                         nc_stat = NF90_PUT_VAR( id_set_xy(av),                &
-                                                 id_var_do2d(av,if),           &
-                                                local_2d(nxl:nxr+1,nys:nyn+1), &
-                                start = (/ 1, 1, 1, do2d_xy_time_count(av) /), &
-                                              count = (/ nx+2, ny+2, 1, 1 /) )
-                      ELSE
-                         nc_stat = NF90_PUT_VAR( id_set_xy(av),                &
-                                                 id_var_do2d(av,if),           &
-                                                local_2d(nxl:nxr+1,nys:nyn+1), &
-                               start = (/ 1, 1, is, do2d_xy_time_count(av) /), &
-                                              count = (/ nx+2, ny+2, 1, 1 /) )
-                      ENDIF
-                      CALL handle_netcdf_error( 'data_output_2d', 447 )
-                   ENDIF
+                   CALL handle_netcdf_error( 'data_output_2d', 447 )
 #endif
 #endif
                    do2d_xy_n = do2d_xy_n + 1
-!
-!--                Write LOCAL parameter set for ISO2D.
-                   IF ( myid == 0  .AND.  iso2d_output )  THEN
-                      IF ( section(is,s) /= -1 )  THEN
-                         WRITE ( section_chr, '(''z = '',F7.2,'' m  (GP '',I3, &
-                                               &'')'')'                        &
-                               )  level_z(layer_xy), layer_xy
-                      ELSE
-                         section_chr = 'averaged along z'
-                      ENDIF
-                      IF ( av == 0 )  THEN
-                         rtext = TRIM( do2d(av,if) ) // '  t = ' //            &
-                                 TRIM( simulated_time_chr ) // '  ' //         &
-                                 TRIM( section_chr )
-                      ELSE
-                         rtext = TRIM( do2d(av,if) ) // '  averaged t = ' //   &
-                                 TRIM( simulated_time_chr ) // '  ' //         &
-                                 TRIM( section_chr )
-                      ENDIF
-                      WRITE (27,LOCAL)
-                   ENDIF
 !
 !--                For 2D-arrays (e.g. u*) only one cross-section is available.
@@ -1104,6 +1066,6 @@
                       do2d_xz_last_time(av)  = simulated_time
                       IF ( myid == 0 )  THEN
-                         IF ( ( .NOT. data_output_2d_on_each_pe  .AND.         &
-                              netcdf_output )  .OR.  netcdf_data_format > 4 )  &
+                         IF ( .NOT. data_output_2d_on_each_pe  &
+                              .OR.  netcdf_data_format > 4 )   &
                          THEN
 #if defined( __netcdf )
@@ -1162,5 +1124,5 @@
 
 #if defined( __parallel )
-                   IF ( netcdf_output  .AND.  netcdf_data_format > 4 )  THEN
+                   IF ( netcdf_data_format > 4 )  THEN
 !
 !--                   Output in netCDF4/HDF5 format.
@@ -1192,5 +1154,5 @@
 !--                      index values.
 #if defined( __netcdf )
-                         IF ( netcdf_output  .AND.  myid == 0 )  THEN
+                         IF ( myid == 0 )  THEN
                             WRITE ( 22 )  time_since_reference_point,          &
                                           do2d_xz_time_count(av), av
@@ -1258,9 +1220,4 @@
                             ENDDO
 !
-!--                         Output of the total cross-section.
-                            IF ( iso2d_output )  THEN
-                               WRITE (22)  total_2d(-nbgp:nx+nbgp,nzb:nzt+1)
-                            ENDIF
-!
 !--                         Relocate the local array for the next loop increment
                             DEALLOCATE( local_2d )
@@ -1268,12 +1225,10 @@
 
 #if defined( __netcdf )
-                            IF ( netcdf_output )  THEN
-                               nc_stat = NF90_PUT_VAR( id_set_xz(av),          &
-                                                    id_var_do2d(av,if),        &
-                                                    total_2d(0:nx+1,nzb:nzt+1),&
-                               start = (/ 1, is, 1, do2d_xz_time_count(av) /), &
-                                                count = (/ nx+2, 1, nz+2, 1 /) )
-                               CALL handle_netcdf_error( 'data_output_2d', 58 )
-                            ENDIF
+                            nc_stat = NF90_PUT_VAR( id_set_xz(av),          &
+                                                 id_var_do2d(av,if),        &
+                                                 total_2d(0:nx+1,nzb:nzt+1),&
+                            start = (/ 1, is, 1, do2d_xz_time_count(av) /), &
+                                             count = (/ nx+2, 1, nz+2, 1 /) )
+                            CALL handle_netcdf_error( 'data_output_2d', 58 )
 #endif
 
@@ -1310,40 +1265,14 @@
                    ENDIF
 #else
-                   IF ( iso2d_output )  THEN
-                      WRITE (22)  local_2d(nxl:nxr+1,nzb:nzt+1)
-                   ENDIF
 #if defined( __netcdf )
-                   IF ( netcdf_output )  THEN
-                      nc_stat = NF90_PUT_VAR( id_set_xz(av),                   &
-                                              id_var_do2d(av,if),              &
-                                              local_2d(nxl:nxr+1,nzb:nzt+1),   &
-                               start = (/ 1, is, 1, do2d_xz_time_count(av) /), &
-                                              count = (/ nx+2, 1, nz+2, 1 /) )
-                      CALL handle_netcdf_error( 'data_output_2d', 451 )
-                   ENDIF
+                   nc_stat = NF90_PUT_VAR( id_set_xz(av),                   &
+                                           id_var_do2d(av,if),              &
+                                           local_2d(nxl:nxr+1,nzb:nzt+1),   &
+                            start = (/ 1, is, 1, do2d_xz_time_count(av) /), &
+                                           count = (/ nx+2, 1, nz+2, 1 /) )
+                   CALL handle_netcdf_error( 'data_output_2d', 451 )
 #endif
 #endif
                    do2d_xz_n = do2d_xz_n + 1
-!
-!--                Write LOCAL-parameter set for ISO2D.
-                   IF ( myid == 0  .AND.  iso2d_output )  THEN
-                      IF ( section(is,s) /= -1 )  THEN
-                         WRITE ( section_chr, '(''y = '',F8.2,'' m  (GP '',I3, &
-                                               &'')'')'                        &
-                               )  section(is,s)*dy, section(is,s)
-                      ELSE
-                         section_chr = 'averaged along y'
-                      ENDIF
-                      IF ( av == 0 )  THEN
-                         rtext = TRIM( do2d(av,if) ) // '  t = ' //            &
-                                 TRIM( simulated_time_chr ) // '  ' //         &
-                                 TRIM( section_chr )
-                      ELSE
-                         rtext = TRIM( do2d(av,if) ) // '  averaged t = ' //   &
-                                 TRIM( simulated_time_chr ) // '  ' //         &
-                                 TRIM( section_chr )
-                      ENDIF
-                      WRITE (28,LOCAL)
-                   ENDIF
 
                 CASE ( 'yz' )
@@ -1356,6 +1285,6 @@
                       do2d_yz_last_time(av)  = simulated_time
                       IF ( myid == 0 )  THEN
-                         IF ( ( .NOT. data_output_2d_on_each_pe  .AND.         &
-                              netcdf_output )  .OR.  netcdf_data_format > 4 )  &
+                         IF ( .NOT. data_output_2d_on_each_pe  &
+                              .OR.  netcdf_data_format > 4 )   &
                          THEN
 #if defined( __netcdf )
@@ -1414,5 +1343,5 @@
 
 #if defined( __parallel )
-                   IF ( netcdf_output  .AND.  netcdf_data_format > 4 )  THEN
+                   IF ( netcdf_data_format > 4 )  THEN
 !
 !--                   Output in netCDF4/HDF5 format.
@@ -1444,5 +1373,5 @@
 !--                      index values.
 #if defined( __netcdf )
-                         IF ( netcdf_output  .AND.  myid == 0 )  THEN
+                         IF ( myid == 0 )  THEN
                             WRITE ( 23 )  time_since_reference_point,          &
                                           do2d_yz_time_count(av), av
@@ -1510,9 +1439,4 @@
                             ENDDO
 !
-!--                         Output of the total cross-section.
-                            IF ( iso2d_output )  THEN
-                               WRITE (23)  total_2d(0:ny+1,nzb:nzt+1)
-                            ENDIF
-!
 !--                         Relocate the local array for the next loop increment
                             DEALLOCATE( local_2d )
@@ -1520,12 +1444,10 @@
 
 #if defined( __netcdf )
-                            IF ( netcdf_output )  THEN
-                               nc_stat = NF90_PUT_VAR( id_set_yz(av),          &
-                                                    id_var_do2d(av,if),        &
-                                                    total_2d(0:ny+1,nzb:nzt+1),&
-                               start = (/ is, 1, 1, do2d_yz_time_count(av) /), &
-                                                count = (/ 1, ny+2, nz+2, 1 /) )
-                               CALL handle_netcdf_error( 'data_output_2d', 61 )
-                            ENDIF
+                            nc_stat = NF90_PUT_VAR( id_set_yz(av),          &
+                                                 id_var_do2d(av,if),        &
+                                                 total_2d(0:ny+1,nzb:nzt+1),&
+                            start = (/ is, 1, 1, do2d_yz_time_count(av) /), &
+                                             count = (/ 1, ny+2, nz+2, 1 /) )
+                            CALL handle_netcdf_error( 'data_output_2d', 61 )
 #endif
 
@@ -1562,40 +1484,14 @@
                    ENDIF
 #else
-                   IF ( iso2d_output )  THEN
-                      WRITE (23)  local_2d(nys:nyn+1,nzb:nzt+1)
-                   ENDIF
 #if defined( __netcdf )
-                   IF ( netcdf_output )  THEN
-                      nc_stat = NF90_PUT_VAR( id_set_yz(av),                   &
-                                              id_var_do2d(av,if),              &
-                                              local_2d(nys:nyn+1,nzb:nzt+1),   &
-                               start = (/ is, 1, 1, do2d_xz_time_count(av) /), &
-                                              count = (/ 1, ny+2, nz+2, 1 /) )
-                      CALL handle_netcdf_error( 'data_output_2d', 452 )
-                   ENDIF
+                   nc_stat = NF90_PUT_VAR( id_set_yz(av),                   &
+                                           id_var_do2d(av,if),              &
+                                           local_2d(nys:nyn+1,nzb:nzt+1),   &
+                            start = (/ is, 1, 1, do2d_xz_time_count(av) /), &
+                                           count = (/ 1, ny+2, nz+2, 1 /) )
+                   CALL handle_netcdf_error( 'data_output_2d', 452 )
 #endif
 #endif
                    do2d_yz_n = do2d_yz_n + 1
-!
-!--                Write LOCAL-parameter set for ISO2D.
-                   IF ( myid == 0  .AND.  iso2d_output )  THEN
-                      IF ( section(is,s) /= -1 )  THEN
-                         WRITE ( section_chr, '(''x = '',F8.2,'' m  (GP '',I3, &
-                                               &'')'')'                        &
-                               )  section(is,s)*dx, section(is,s)
-                      ELSE
-                         section_chr = 'averaged along x'
-                      ENDIF
-                      IF ( av == 0 )  THEN
-                         rtext = TRIM( do2d(av,if) ) // '  t = ' //            &
-                                 TRIM( simulated_time_chr ) // '  ' //         &
-                                 TRIM( section_chr )
-                      ELSE
-                         rtext = TRIM( do2d(av,if) ) // '  averaged t = ' //   &
-                                 TRIM( simulated_time_chr ) // '  ' //         &
-                                 TRIM( section_chr )
-                      ENDIF
-                      WRITE (29,LOCAL)
-                   ENDIF
 
              END SELECT
@@ -1609,5 +1505,5 @@
 !--       the performance of the parallel output.
 #if defined( __netcdf )
-          IF ( netcdf_output .AND. netcdf_data_format > 4 )  THEN
+          IF ( netcdf_data_format > 4 )  THEN
 
                 SELECT CASE ( mode )
Index: /palm/trunk/SOURCE/data_output_3d.f90
===================================================================
--- /palm/trunk/SOURCE/data_output_3d.f90	(revision 1326)
+++ /palm/trunk/SOURCE/data_output_3d.f90	(revision 1327)
@@ -20,5 +20,6 @@
 ! Current revisions:
 ! ------------------
-! 
+! parts concerning avs output removed,
+! -netcdf output queries
 !
 ! Former revisions:
@@ -87,7 +88,7 @@
         
     USE control_parameters,                                                    &
-        ONLY:  avs_data_file,avs_output, cloud_physics, do3d, do3d_avs_n,      &
-               do3d_compress, do3d_no, do3d_time_count, io_blocks, io_group,   &
-               message_string, netcdf_output, netcdf_data_format, ntdim_3d,    &
+        ONLY:  avs_data_file, cloud_physics, do3d, do3d_avs_n,                 &
+               do3d_no, do3d_time_count, io_blocks, io_group,                  &
+               message_string, netcdf_data_format, ntdim_3d,                   &
                nz_do3d, plot_3d_precision, psolver, simulated_time,            &
                simulated_time_chr, skip_do_avs, time_since_reference_point
@@ -164,13 +165,9 @@
 !-- and/or avs).
 !-- For netCDF4/HDF5 output, data is written in parallel into one file.
-    IF ( netcdf_output )  THEN
-       IF ( netcdf_data_format < 5 )  THEN
-          CALL check_open( 30 )
-          IF ( myid == 0 )  CALL check_open( 106+av*10 )
-       ELSE
-          CALL check_open( 106+av*10 )
-       ENDIF
+    IF ( netcdf_data_format < 5 )  THEN
+       CALL check_open( 30 )
+       IF ( myid == 0 )  CALL check_open( 106+av*10 )
     ELSE
-       IF ( avs_output  .OR.  ( numprocs > 1 ) )  CALL check_open( 30 )
+       CALL check_open( 106+av*10 )
     ENDIF
 
@@ -186,11 +183,9 @@
     do3d_time_count(av) = do3d_time_count(av) + 1
     IF ( myid == 0 )  THEN
-       IF ( netcdf_output )  THEN
-          nc_stat = NF90_PUT_VAR( id_set_3d(av), id_var_time_3d(av),           &
-                                  (/ time_since_reference_point /),            &
-                                  start = (/ do3d_time_count(av) /),           &
-                                  count = (/ 1 /) )
-          CALL handle_netcdf_error( 'data_output_3d', 376 )
-       ENDIF
+       nc_stat = NF90_PUT_VAR( id_set_3d(av), id_var_time_3d(av),           &
+                               (/ time_since_reference_point /),            &
+                               start = (/ do3d_time_count(av) /),           &
+                               count = (/ 1 /) )
+       CALL handle_netcdf_error( 'data_output_3d', 376 )
     ENDIF
 #endif
@@ -201,15 +196,4 @@
 
     DO  WHILE ( do3d(av,if)(1:1) /= ' ' )
-!
-!--    Set the precision for data compression.
-       IF ( do3d_compress )  THEN
-          DO  i = 1, 100
-             IF ( plot_3d_precision(i)%variable == do3d(av,if) )  THEN
-                prec = plot_3d_precision(i)%precision
-                EXIT
-             ENDIF
-          ENDDO
-       ENDIF
-
 !
 !--    Store the array chosen on the temporary array.
@@ -504,112 +488,64 @@
 
 !
-!--    Output of the volume data information for the AVS-FLD-file.
-       do3d_avs_n = do3d_avs_n + 1
-       IF ( myid == 0  .AND.  avs_output )  THEN
-!
-!--       AVS-labels must not contain any colons. Hence they must be removed
-!--       from the time character string.
-          simulated_time_mod = simulated_time_chr
-          DO  WHILE ( SCAN( simulated_time_mod, ':' ) /= 0 )
-             pos = SCAN( simulated_time_mod, ':' )
-             simulated_time_mod(pos:pos) = '/'
+!--    Output of the 3D-array
+#if defined( __parallel )
+       IF ( netcdf_data_format < 5 )  THEN
+!
+!--       Non-parallel netCDF output. Data is output in parallel in
+!--       FORTRAN binary format here, and later collected into one file by
+!--       combine_plot_fields
+          IF ( myid == 0 )  THEN
+             WRITE ( 30 )  time_since_reference_point,                   &
+                           do3d_time_count(av), av
+          ENDIF
+          DO  i = 0, io_blocks-1
+             IF ( i == io_group )  THEN
+                WRITE ( 30 )  nxlg, nxrg, nysg, nyng, nzb, nz_do3d
+                WRITE ( 30 )  local_pf
+             ENDIF
+#if defined( __parallel )
+             CALL MPI_BARRIER( comm2d, ierr )
+#endif
           ENDDO
 
-          IF ( av == 0 )  THEN
-             WRITE ( 33, 3300 )  do3d_avs_n, TRIM( avs_data_file ),            &
-                                 skip_do_avs, TRIM( do3d(av,if) ),             &
-                                 TRIM( simulated_time_mod )
+       ELSE
+#if defined( __netcdf )
+!
+!--       Parallel output in netCDF4/HDF5 format.
+!--       Do not output redundant ghost point data except for the
+!--       boundaries of the total domain.
+          IF ( nxr == nx  .AND.  nyn /= ny )  THEN
+             nc_stat = NF90_PUT_VAR( id_set_3d(av), id_var_do3d(av,if),  &
+                               local_pf(nxl:nxr+1,nys:nyn,nzb:nz_do3d),  &
+                start = (/ nxl+1, nys+1, nzb+1, do3d_time_count(av) /),  &
+                count = (/ nxr-nxl+2, nyn-nys+1, nz_do3d-nzb+1, 1 /) )
+          ELSEIF ( nxr /= nx  .AND.  nyn == ny )  THEN
+             nc_stat = NF90_PUT_VAR( id_set_3d(av), id_var_do3d(av,if),  &
+                               local_pf(nxl:nxr,nys:nyn+1,nzb:nz_do3d),  &
+                start = (/ nxl+1, nys+1, nzb+1, do3d_time_count(av) /),  &
+                count = (/ nxr-nxl+1, nyn-nys+2, nz_do3d-nzb+1, 1 /) )
+          ELSEIF ( nxr == nx  .AND.  nyn == ny )  THEN
+             nc_stat = NF90_PUT_VAR( id_set_3d(av), id_var_do3d(av,if),  &
+                             local_pf(nxl:nxr+1,nys:nyn+1,nzb:nz_do3d),  &
+                start = (/ nxl+1, nys+1, nzb+1, do3d_time_count(av) /),  &
+                count = (/ nxr-nxl+2, nyn-nys+2, nz_do3d-nzb+1, 1 /) )
           ELSE
-             WRITE ( 33, 3300 )  do3d_avs_n, TRIM( avs_data_file ),            &
-                                 skip_do_avs, TRIM( do3d(av,if) ) //           &
-                                 ' averaged', TRIM( simulated_time_mod )
+             nc_stat = NF90_PUT_VAR( id_set_3d(av), id_var_do3d(av,if),  &
+                                 local_pf(nxl:nxr,nys:nyn,nzb:nz_do3d),  &
+                start = (/ nxl+1, nys+1, nzb+1, do3d_time_count(av) /),  &
+                count = (/ nxr-nxl+1, nyn-nys+1, nz_do3d-nzb+1, 1 /) )
           ENDIF
-!
-!--       Determine the Skip-value for the next array. Record end and start 
-!--       require 4 byte each.
-          skip_do_avs = skip_do_avs + ( ( ( nx+2*nbgp ) * ( ny+2*nbgp ) *      &
-                                          ( nz_do3d+1 ) ) * 4 + 8 )
+          CALL handle_netcdf_error( 'data_output_3d', 386 )
+#endif
        ENDIF
-
-!
-!--    Output of the 3D-array. (compressed/uncompressed)
-       IF ( do3d_compress )  THEN
-!
-!--       Compression, output of compression information on FLD-file and output
-!--       of compressed data.
-          CALL write_compressed( local_pf, 30, 33, myid, nxl, nxr, nyn, nys,   &
-                                 nzb, nz_do3d, prec, nbgp )
-       ELSE
-!
-!--       Uncompressed output.
-#if defined( __parallel )
-          IF ( netcdf_output )  THEN
-             IF ( netcdf_data_format < 5 )  THEN
-!
-!--             Non-parallel netCDF output. Data is output in parallel in
-!--             FORTRAN binary format here, and later collected into one file by
-!--             combine_plot_fields
-                IF ( myid == 0 )  THEN
-                   WRITE ( 30 )  time_since_reference_point,                   &
-                                 do3d_time_count(av), av
-                ENDIF
-                DO  i = 0, io_blocks-1
-                   IF ( i == io_group )  THEN
-                      WRITE ( 30 )  nxlg, nxrg, nysg, nyng, nzb, nz_do3d
-                      WRITE ( 30 )  local_pf
-                   ENDIF
-#if defined( __parallel )
-                   CALL MPI_BARRIER( comm2d, ierr )
-#endif
-                ENDDO
-
-             ELSE
+#else
 #if defined( __netcdf )
-!
-!--             Parallel output in netCDF4/HDF5 format.
-!--             Do not output redundant ghost point data except for the
-!--             boundaries of the total domain.
-                IF ( nxr == nx  .AND.  nyn /= ny )  THEN
-                   nc_stat = NF90_PUT_VAR( id_set_3d(av), id_var_do3d(av,if),  &
-                                     local_pf(nxl:nxr+1,nys:nyn,nzb:nz_do3d),  &
-                      start = (/ nxl+1, nys+1, nzb+1, do3d_time_count(av) /),  &
-                      count = (/ nxr-nxl+2, nyn-nys+1, nz_do3d-nzb+1, 1 /) )
-                ELSEIF ( nxr /= nx  .AND.  nyn == ny )  THEN
-                   nc_stat = NF90_PUT_VAR( id_set_3d(av), id_var_do3d(av,if),  &
-                                     local_pf(nxl:nxr,nys:nyn+1,nzb:nz_do3d),  &
-                      start = (/ nxl+1, nys+1, nzb+1, do3d_time_count(av) /),  &
-                      count = (/ nxr-nxl+1, nyn-nys+2, nz_do3d-nzb+1, 1 /) )
-                ELSEIF ( nxr == nx  .AND.  nyn == ny )  THEN
-                   nc_stat = NF90_PUT_VAR( id_set_3d(av), id_var_do3d(av,if),  &
-                                   local_pf(nxl:nxr+1,nys:nyn+1,nzb:nz_do3d),  &
-                      start = (/ nxl+1, nys+1, nzb+1, do3d_time_count(av) /),  &
-                      count = (/ nxr-nxl+2, nyn-nys+2, nz_do3d-nzb+1, 1 /) )
-                ELSE
-                   nc_stat = NF90_PUT_VAR( id_set_3d(av), id_var_do3d(av,if),  &
-                                       local_pf(nxl:nxr,nys:nyn,nzb:nz_do3d),  &
-                      start = (/ nxl+1, nys+1, nzb+1, do3d_time_count(av) /),  &
-                      count = (/ nxr-nxl+1, nyn-nys+1, nz_do3d-nzb+1, 1 /) )
-                ENDIF
-                CALL handle_netcdf_error( 'data_output_3d', 386 )
-#endif
-             ENDIF
-          ENDIF
-#else
-          IF ( avs_output )  THEN
-             WRITE ( 30 )  local_pf(nxl:nxr+1,nys:nyn+1,:)
-          ENDIF
-#if defined( __netcdf )
-          IF ( netcdf_output )  THEN
-
-             nc_stat = NF90_PUT_VAR( id_set_3d(av), id_var_do3d(av,if),        &
-                               local_pf(nxl:nxr+1,nys:nyn+1,nzb:nz_do3d),      &
-                               start = (/ 1, 1, 1, do3d_time_count(av) /),     &
-                               count = (/ nx+2, ny+2, nz_do3d-nzb+1, 1 /) )
-             CALL handle_netcdf_error( 'data_output_3d', 446 )
-
-          ENDIF
+       nc_stat = NF90_PUT_VAR( id_set_3d(av), id_var_do3d(av,if),        &
+                         local_pf(nxl:nxr+1,nys:nyn+1,nzb:nz_do3d),      &
+                         start = (/ 1, 1, 1, do3d_time_count(av) /),     &
+                         count = (/ nx+2, ny+2, nz_do3d-nzb+1, 1 /) )
+       CALL handle_netcdf_error( 'data_output_3d', 446 )
 #endif
 #endif
-       ENDIF
 
        if = if + 1
Index: /palm/trunk/SOURCE/data_output_mask.f90
===================================================================
--- /palm/trunk/SOURCE/data_output_mask.f90	(revision 1326)
+++ /palm/trunk/SOURCE/data_output_mask.f90	(revision 1327)
@@ -75,5 +75,5 @@
                mask_j, mask_k, mask_size, mask_size_l, mask_start_l,           &
                max_masks, message_string, mid, netcdf_data_format,             &
-               netcdf_output, nz_do3d, simulated_time
+               nz_do3d, simulated_time
     
     USE cpulog,                                                                &
@@ -128,6 +128,5 @@
 !
 !-- Open output file.
-    IF ( netcdf_output  .AND.  ( myid == 0  .OR.  netcdf_data_format > 4 ) ) &
-    THEN
+    IF ( myid == 0  .OR.  netcdf_data_format > 4 )  THEN
        CALL check_open( 200+mid+av*max_masks )
     ENDIF 
@@ -146,6 +145,5 @@
 !-- Update the netCDF time axis.
     domask_time_count(mid,av) = domask_time_count(mid,av) + 1
-    IF ( netcdf_output  .AND.  ( myid == 0  .OR.  netcdf_data_format > 4 ) ) &
-    THEN
+    IF ( myid == 0  .OR.  netcdf_data_format > 4 )  THEN
        nc_stat = NF90_PUT_VAR( id_set_mask(mid,av), id_var_time_mask(mid,av), &
                                (/ simulated_time /),                          &
Index: /palm/trunk/SOURCE/data_output_profiles.f90
===================================================================
--- /palm/trunk/SOURCE/data_output_profiles.f90	(revision 1326)
+++ /palm/trunk/SOURCE/data_output_profiles.f90	(revision 1327)
@@ -20,5 +20,5 @@
 ! Current revisions:
 ! -----------------
-!
+! -netcdf output queries
 !
 ! Former revisions:
@@ -65,5 +65,5 @@
     USE control_parameters,                                                    &
         ONLY:  average_count_pr, averaging_interval_pr, coupling_start_time,   &
-               dopr_n, dopr_time_count, netcdf_output, normalizing_region,     &
+               dopr_n, dopr_time_count, normalizing_region,                    &
                time_since_reference_point
 
@@ -122,7 +122,5 @@
 !
 !--    Open file for profile output in NetCDF format
-       IF ( netcdf_output )  THEN
-          CALL check_open( 104 )
-       ENDIF
+       CALL check_open( 104 )
 
 !
@@ -136,61 +134,59 @@
           IF ( .NOT. output_for_t0 ) THEN 
 
-             IF ( netcdf_output )  THEN
 #if defined( __netcdf )          
 !
-!--             Store initial time to time axis, but only if an output
-!--             is required for at least one of the profiles. The initial time
-!--             is either 0, or, in case of a prerun for coupled atmosphere-ocean
-!--             runs, has a negative value
-                DO  i = 1, dopr_n
-                IF ( dopr_initial_index(i) /= 0 )  THEN
-                   nc_stat = NF90_PUT_VAR( id_set_pr, id_var_time_pr,  &
-                                           (/ -coupling_start_time /), &
-                                           start = (/ 1 /), count = (/ 1 /) )
-                      CALL handle_netcdf_error( 'data_output_profiles', 329 )
-                      output_for_t0 = .TRUE.
-                      EXIT
-                   ENDIF
-                ENDDO
-
-!
-!--             Store normalization factors
-                nc_stat = NF90_PUT_VAR( id_set_pr, id_var_norm_dopr(1), & ! wpt0
-                                     (/ hom_sum(nzb,18,normalizing_region) /), &
+!--          Store initial time to time axis, but only if an output
+!--          is required for at least one of the profiles. The initial time
+!--          is either 0, or, in case of a prerun for coupled atmosphere-ocean
+!--          runs, has a negative value
+             DO  i = 1, dopr_n
+             IF ( dopr_initial_index(i) /= 0 )  THEN
+                nc_stat = NF90_PUT_VAR( id_set_pr, id_var_time_pr,  &
+                                        (/ -coupling_start_time /), &
                                         start = (/ 1 /), count = (/ 1 /) )
-                CALL handle_netcdf_error( 'data_output_profiles', 330 )
-
-                nc_stat = NF90_PUT_VAR( id_set_pr, id_var_norm_dopr(2), & ! ws2
-                           (/ hom_sum(nzb+8,pr_palm,normalizing_region)**2 /), &
-                                        start = (/ 1 /), count = (/ 1 /) )
-                CALL handle_netcdf_error( 'data_output_profiles', 331 )
-                nc_stat = NF90_PUT_VAR( id_set_pr, id_var_norm_dopr(3), & ! tsw2
-                           (/ hom_sum(nzb+3,pr_palm,normalizing_region)**2 /), &
-                                     start = (/ 1 /), count = (/ 1 /) )
-                CALL handle_netcdf_error( 'data_output_profiles', 332 )
-                nc_stat = NF90_PUT_VAR( id_set_pr, id_var_norm_dopr(4), & ! ws3
-                           (/ hom_sum(nzb+8,pr_palm,normalizing_region)**3 /), &
-                                        start = (/ 1 /), count = (/ 1 /) )
-                CALL handle_netcdf_error( 'data_output_profiles', 333 )
-
-                nc_stat = NF90_PUT_VAR( id_set_pr, id_var_norm_dopr(5), &!ws2tsw
-                           (/ hom_sum(nzb+8,pr_palm,normalizing_region)**3 *   &
-                              hom_sum(nzb+3,pr_palm,normalizing_region)    /), &
-                                        start = (/ 1 /), count = (/ 1 /) )
-                CALL handle_netcdf_error( 'data_output_profiles', 334 )
-
-                nc_stat = NF90_PUT_VAR( id_set_pr, id_var_norm_dopr(6), &!wstsw2
-                           (/ hom_sum(nzb+8,pr_palm,normalizing_region) *      &
-                              hom_sum(nzb+3,pr_palm,normalizing_region)**2 /), &
-                                        start = (/ 1 /), count = (/ 1 /) )
-                CALL handle_netcdf_error( 'data_output_profiles', 335 )
-
-                nc_stat = NF90_PUT_VAR( id_set_pr, id_var_norm_dopr(7), & ! z_i
-                              (/ hom_sum(nzb+6,pr_palm,normalizing_region) /), &
-                                        start = (/ 1 /), count = (/ 1 /) )
-                CALL handle_netcdf_error( 'data_output_profiles', 336 )
+                   CALL handle_netcdf_error( 'data_output_profiles', 329 )
+                   output_for_t0 = .TRUE.
+                   EXIT
+                ENDIF
+             ENDDO
+
+!
+!--          Store normalization factors
+             nc_stat = NF90_PUT_VAR( id_set_pr, id_var_norm_dopr(1), & ! wpt0
+                                  (/ hom_sum(nzb,18,normalizing_region) /), &
+                                     start = (/ 1 /), count = (/ 1 /) )
+             CALL handle_netcdf_error( 'data_output_profiles', 330 )
+
+             nc_stat = NF90_PUT_VAR( id_set_pr, id_var_norm_dopr(2), & ! ws2
+                        (/ hom_sum(nzb+8,pr_palm,normalizing_region)**2 /), &
+                                     start = (/ 1 /), count = (/ 1 /) )
+             CALL handle_netcdf_error( 'data_output_profiles', 331 )
+             nc_stat = NF90_PUT_VAR( id_set_pr, id_var_norm_dopr(3), & ! tsw2
+                        (/ hom_sum(nzb+3,pr_palm,normalizing_region)**2 /), &
+                                  start = (/ 1 /), count = (/ 1 /) )
+             CALL handle_netcdf_error( 'data_output_profiles', 332 )
+             nc_stat = NF90_PUT_VAR( id_set_pr, id_var_norm_dopr(4), & ! ws3
+                        (/ hom_sum(nzb+8,pr_palm,normalizing_region)**3 /), &
+                                     start = (/ 1 /), count = (/ 1 /) )
+             CALL handle_netcdf_error( 'data_output_profiles', 333 )
+
+             nc_stat = NF90_PUT_VAR( id_set_pr, id_var_norm_dopr(5), &!ws2tsw
+                        (/ hom_sum(nzb+8,pr_palm,normalizing_region)**3 *   &
+                           hom_sum(nzb+3,pr_palm,normalizing_region)    /), &
+                                     start = (/ 1 /), count = (/ 1 /) )
+             CALL handle_netcdf_error( 'data_output_profiles', 334 )
+
+             nc_stat = NF90_PUT_VAR( id_set_pr, id_var_norm_dopr(6), &!wstsw2
+                        (/ hom_sum(nzb+8,pr_palm,normalizing_region) *      &
+                           hom_sum(nzb+3,pr_palm,normalizing_region)**2 /), &
+                                     start = (/ 1 /), count = (/ 1 /) )
+             CALL handle_netcdf_error( 'data_output_profiles', 335 )
+
+             nc_stat = NF90_PUT_VAR( id_set_pr, id_var_norm_dopr(7), & ! z_i
+                           (/ hom_sum(nzb+6,pr_palm,normalizing_region) /), &
+                                     start = (/ 1 /), count = (/ 1 /) )
+             CALL handle_netcdf_error( 'data_output_profiles', 336 )
              
 #endif
-             ENDIF
 !
 !--          Loop over all 1D variables
@@ -203,15 +199,13 @@
                    DO  sr = 0, statistic_regions
 
-                      IF ( netcdf_output )  THEN
 #if defined( __netcdf )
 !
-!--                      Write data to netcdf file
-                         nc_stat = NF90_PUT_VAR( id_set_pr, id_var_dopr(i,sr),    &
-                                       hom(nzb:nzt+1,1,dopr_initial_index(i),sr), &
-                                                 start = (/ 1, 1 /),              &
-                                                 count = (/ nzt-nzb+2, 1 /) )
-                         CALL handle_netcdf_error( 'data_output_profiles', 337 )
+!--                   Write data to netcdf file
+                      nc_stat = NF90_PUT_VAR( id_set_pr, id_var_dopr(i,sr),    &
+                                    hom(nzb:nzt+1,1,dopr_initial_index(i),sr), &
+                                              start = (/ 1, 1 /),              &
+                                              count = (/ nzt-nzb+2, 1 /) )
+                      CALL handle_netcdf_error( 'data_output_profiles', 337 )
 #endif
-                      ENDIF
 
                    ENDDO
@@ -221,5 +215,5 @@
              ENDDO   ! Loop over dopr_n for initial profiles
 
-             IF ( netcdf_output  .AND.  output_for_t0 )  THEN
+             IF ( output_for_t0 )  THEN
                 dopr_time_count = dopr_time_count + 1
              ENDIF
@@ -228,62 +222,60 @@
        ENDIF   ! Initial profiles
 
-       IF ( netcdf_output )  THEN
 #if defined( __netcdf )
 
 !
-!--       Store time to time axis          
-          nc_stat = NF90_PUT_VAR( id_set_pr, id_var_time_pr,        &
-                                  (/ time_since_reference_point /), &
-                                  start = (/ dopr_time_count /),    &
-                                  count = (/ 1 /) )
-          CALL handle_netcdf_error( 'data_output_profiles', 338 )
-
-!
-!--       Store normalization factors
-          nc_stat = NF90_PUT_VAR( id_set_pr, id_var_norm_dopr(1), &  ! wpt0
-                                  (/ hom_sum(nzb,18,normalizing_region) /), &
-                                  start = (/ dopr_time_count /),               &
-                                  count = (/ 1 /) )
-          CALL handle_netcdf_error( 'data_output_profiles', 339 )
-
-          nc_stat = NF90_PUT_VAR( id_set_pr, id_var_norm_dopr(2), &  ! ws2
-                        (/ hom_sum(nzb+8,pr_palm,normalizing_region)**2 /), &
-                                  start = (/ dopr_time_count /),               &
-                                  count = (/ 1 /) )
-          CALL handle_netcdf_error( 'data_output_profiles', 340 )
-
-          nc_stat = NF90_PUT_VAR( id_set_pr, id_var_norm_dopr(3), &  ! tsw2
-                        (/ hom_sum(nzb+3,pr_palm,normalizing_region)**2 /), &
-                                  start = (/ dopr_time_count /),               &
-                                  count = (/ 1 /) )
-          CALL handle_netcdf_error( 'data_output_profiles', 341 )
-
-          nc_stat = NF90_PUT_VAR( id_set_pr, id_var_norm_dopr(4), &  ! ws3
-                        (/ hom_sum(nzb+8,pr_palm,normalizing_region)**3 /), &
-                                  start = (/ dopr_time_count /),               &
-                                  count = (/ 1 /) )
-          CALL handle_netcdf_error( 'data_output_profiles', 342 )
-
-          nc_stat = NF90_PUT_VAR( id_set_pr, id_var_norm_dopr(5), &  ! ws2tsw
-                        (/ hom_sum(nzb+8,pr_palm,normalizing_region)**3 *   &
-                           hom_sum(nzb+3,pr_palm,normalizing_region)    /), &
-                                  start = (/ dopr_time_count /),               &
-                                  count = (/ 1 /) )
-          CALL handle_netcdf_error( 'data_output_profiles', 343 )
-         
-          nc_stat = NF90_PUT_VAR( id_set_pr, id_var_norm_dopr(6), &  ! wstsw2
-                        (/ hom_sum(nzb+8,pr_palm,normalizing_region) *      &
-                           hom_sum(nzb+3,pr_palm,normalizing_region)**2 /), &
-                                  start = (/ dopr_time_count /),               &
-                                  count = (/ 1 /) )
-          CALL handle_netcdf_error( 'data_output_profiles', 344 )
-
-          nc_stat = NF90_PUT_VAR( id_set_pr, id_var_norm_dopr(7), &  ! z_i
-                           (/ hom_sum(nzb+6,pr_palm,normalizing_region) /), &
-                                  start = (/ dopr_time_count /),               &
-                                  count = (/ 1 /) )
-          CALL handle_netcdf_error( 'data_output_profiles', 345 )
+!--    Store time to time axis
+       nc_stat = NF90_PUT_VAR( id_set_pr, id_var_time_pr,        &
+                               (/ time_since_reference_point /), &
+                               start = (/ dopr_time_count /),    &
+                               count = (/ 1 /) )
+       CALL handle_netcdf_error( 'data_output_profiles', 338 )
+
+!
+!--    Store normalization factors
+       nc_stat = NF90_PUT_VAR( id_set_pr, id_var_norm_dopr(1), &  ! wpt0
+                               (/ hom_sum(nzb,18,normalizing_region) /), &
+                               start = (/ dopr_time_count /),               &
+                               count = (/ 1 /) )
+       CALL handle_netcdf_error( 'data_output_profiles', 339 )
+
+       nc_stat = NF90_PUT_VAR( id_set_pr, id_var_norm_dopr(2), &  ! ws2
+                     (/ hom_sum(nzb+8,pr_palm,normalizing_region)**2 /), &
+                               start = (/ dopr_time_count /),               &
+                               count = (/ 1 /) )
+       CALL handle_netcdf_error( 'data_output_profiles', 340 )
+
+       nc_stat = NF90_PUT_VAR( id_set_pr, id_var_norm_dopr(3), &  ! tsw2
+                     (/ hom_sum(nzb+3,pr_palm,normalizing_region)**2 /), &
+                               start = (/ dopr_time_count /),               &
+                               count = (/ 1 /) )
+       CALL handle_netcdf_error( 'data_output_profiles', 341 )
+
+       nc_stat = NF90_PUT_VAR( id_set_pr, id_var_norm_dopr(4), &  ! ws3
+                     (/ hom_sum(nzb+8,pr_palm,normalizing_region)**3 /), &
+                               start = (/ dopr_time_count /),               &
+                               count = (/ 1 /) )
+       CALL handle_netcdf_error( 'data_output_profiles', 342 )
+
+       nc_stat = NF90_PUT_VAR( id_set_pr, id_var_norm_dopr(5), &  ! ws2tsw
+                     (/ hom_sum(nzb+8,pr_palm,normalizing_region)**3 *   &
+                        hom_sum(nzb+3,pr_palm,normalizing_region)    /), &
+                               start = (/ dopr_time_count /),               &
+                               count = (/ 1 /) )
+       CALL handle_netcdf_error( 'data_output_profiles', 343 )
+
+       nc_stat = NF90_PUT_VAR( id_set_pr, id_var_norm_dopr(6), &  ! wstsw2
+                     (/ hom_sum(nzb+8,pr_palm,normalizing_region) *      &
+                        hom_sum(nzb+3,pr_palm,normalizing_region)**2 /), &
+                               start = (/ dopr_time_count /),               &
+                               count = (/ 1 /) )
+       CALL handle_netcdf_error( 'data_output_profiles', 344 )
+
+       nc_stat = NF90_PUT_VAR( id_set_pr, id_var_norm_dopr(7), &  ! z_i
+                        (/ hom_sum(nzb+6,pr_palm,normalizing_region) /), &
+                               start = (/ dopr_time_count /),               &
+                               count = (/ 1 /) )
+       CALL handle_netcdf_error( 'data_output_profiles', 345 )
 #endif
-       ENDIF
 
 !
@@ -295,15 +287,13 @@
           DO  sr = 0, statistic_regions
 
-             IF ( netcdf_output )  THEN
 #if defined( __netcdf )
 !
-!--             Write data to netcdf file
-                nc_stat = NF90_PUT_VAR( id_set_pr, id_var_dopr(i,sr),          &
-                                        hom_sum(nzb:nzt+1,dopr_index(i),sr),&
-                                        start = (/ 1, dopr_time_count /),      &
-                                        count = (/ nzt-nzb+2, 1 /) )
-                CALL handle_netcdf_error( 'data_output_profiles', 346 )
+!--          Write data to netcdf file
+             nc_stat = NF90_PUT_VAR( id_set_pr, id_var_dopr(i,sr),          &
+                                     hom_sum(nzb:nzt+1,dopr_index(i),sr),&
+                                     start = (/ 1, dopr_time_count /),      &
+                                     count = (/ nzt-nzb+2, 1 /) )
+             CALL handle_netcdf_error( 'data_output_profiles', 346 )
 #endif
-             ENDIF
 
           ENDDO
Index: /palm/trunk/SOURCE/data_output_ptseries.f90
===================================================================
--- /palm/trunk/SOURCE/data_output_ptseries.f90	(revision 1326)
+++ /palm/trunk/SOURCE/data_output_ptseries.f90	(revision 1327)
@@ -20,5 +20,5 @@
 ! Current revisions:
 ! -----------------
-! 
+! -netcdf output queries
 !
 ! Former revisions:
@@ -58,5 +58,5 @@
 
     USE control_parameters,                                                    &
-        ONLY:  dopts_time_count, netcdf_output, time_since_reference_point
+        ONLY:  dopts_time_count, time_since_reference_point
 
     USE cpulog,                                                                &
@@ -89,5 +89,5 @@
     CALL cpu_log( log_point(36), 'data_output_ptseries', 'start' )
 
-    IF ( myid == 0  .AND.  netcdf_output )  THEN
+    IF ( myid == 0 )  THEN
 !
 !--    Open file for time series output in NetCDF format
@@ -330,5 +330,5 @@
 !
 !-- Output particle time series quantities in NetCDF format
-    IF ( myid == 0  .AND.  netcdf_output )  THEN
+    IF ( myid == 0 )  THEN
        DO  j = 0, inum
           DO  i = 1, dopts_num
Index: /palm/trunk/SOURCE/data_output_spectra.f90
===================================================================
--- /palm/trunk/SOURCE/data_output_spectra.f90	(revision 1326)
+++ /palm/trunk/SOURCE/data_output_spectra.f90	(revision 1327)
@@ -19,5 +19,6 @@
 !
 ! Current revisions:
-! -----------------
+! ------------------
+! -netcdf output queries
 !
 ! Former revisions:
@@ -62,5 +63,5 @@
     USE control_parameters,                                                    &
         ONLY:  average_count_sp, averaging_interval_sp, dosp_time_count,       &
-               message_string, netcdf_output, run_description_header,          &
+               message_string, run_description_header,                         &
                time_since_reference_point
 
@@ -99,5 +100,5 @@
 !
 !--    Open file for spectra output in NetCDF format
-       IF ( netcdf_output )  CALL check_open( 107 )
+       CALL check_open( 107 )
 
 !
@@ -161,15 +162,12 @@
 !
 !--       Output of spectra in NetCDF format
-          IF ( netcdf_output )  THEN
-!
-!--          Output of x-spectra
-             IF ( INDEX( spectra_direction(m), 'x' ) /= 0 ) THEN
-                CALL output_spectra_netcdf( m, 'x' )
-             ENDIF
-!
-!--          Output of y-spectra
-             IF ( INDEX( spectra_direction(m), 'y' ) /= 0 ) THEN
-                CALL output_spectra_netcdf( m, 'y' )
-             ENDIF
+!--       Output of x-spectra
+          IF ( INDEX( spectra_direction(m), 'x' ) /= 0 ) THEN
+             CALL output_spectra_netcdf( m, 'x' )
+          ENDIF
+!
+!--       Output of y-spectra
+          IF ( INDEX( spectra_direction(m), 'y' ) /= 0 ) THEN
+             CALL output_spectra_netcdf( m, 'y' )
           ENDIF
 
Index: /palm/trunk/SOURCE/data_output_tseries.f90
===================================================================
--- /palm/trunk/SOURCE/data_output_tseries.f90	(revision 1326)
+++ /palm/trunk/SOURCE/data_output_tseries.f90	(revision 1327)
@@ -20,5 +20,5 @@
 ! Current revisions:
 ! -----------------
-! 
+! -netcdf output queries
 !
 ! Former revisions:
@@ -55,5 +55,5 @@
 
     USE control_parameters,                                                    &
-        ONLY:  dots_time_count, netcdf_output, time_since_reference_point
+        ONLY:  dots_time_count, time_since_reference_point
 
     USE cpulog,                                                                &
@@ -90,17 +90,15 @@
 !
 !--    Open file for time series output in NetCDF format
-       IF ( netcdf_output )  THEN
-          dots_time_count = dots_time_count + 1
-          CALL check_open( 105 )
+       dots_time_count = dots_time_count + 1
+       CALL check_open( 105 )
 #if defined( __netcdf )
 !
-!--       Update the time series time axis
-          nc_stat = NF90_PUT_VAR( id_set_ts, id_var_time_ts,        &
-                                  (/ time_since_reference_point /), &
-                                  start = (/ dots_time_count /),    &
-                                  count = (/ 1 /) )
-          CALL handle_netcdf_error( 'data_output_tseries', 350 )
+!--    Update the time series time axis
+       nc_stat = NF90_PUT_VAR( id_set_ts, id_var_time_ts,        &
+                               (/ time_since_reference_point /), &
+                               start = (/ dots_time_count /),    &
+                               count = (/ 1 /) )
+       CALL handle_netcdf_error( 'data_output_tseries', 350 )
 #endif
-       ENDIF
 
 !
@@ -110,13 +108,11 @@
 
 #if defined( __netcdf )
-          IF ( netcdf_output )  THEN
-             DO  i = 1, dots_num
-                nc_stat = NF90_PUT_VAR( id_set_ts, id_var_dots(i,sr),  &
-                                        (/ ts_value(i,sr) /),          &
-                                        start = (/ dots_time_count /), &
-                                        count = (/ 1 /) )
-                CALL handle_netcdf_error( 'data_output_tseries', 351 )
-             ENDDO
-          ENDIF
+          DO  i = 1, dots_num
+             nc_stat = NF90_PUT_VAR( id_set_ts, id_var_dots(i,sr),  &
+                                     (/ ts_value(i,sr) /),          &
+                                     start = (/ dots_time_count /), &
+                                     count = (/ 1 /) )
+             CALL handle_netcdf_error( 'data_output_tseries', 351 )
+          ENDDO
 #endif
 
Index: /palm/trunk/SOURCE/header.f90
===================================================================
--- /palm/trunk/SOURCE/header.f90	(revision 1326)
+++ /palm/trunk/SOURCE/header.f90	(revision 1327)
@@ -20,4 +20,6 @@
 ! Current revisions:
 ! -----------------
+! parts concerning iso2d and avs output removed,
+! -netcdf output queries
 !
 ! Former revisions:
@@ -815,7 +817,5 @@
 
        output_format = ''
-       IF ( netcdf_output )  THEN
-          output_format = output_format_netcdf
-       ENDIF
+       output_format = output_format_netcdf
        WRITE ( io, 344 )  output_format
 
@@ -866,6 +866,5 @@
        IF ( ( ( do2d_xy /= ''  .AND.  section(1,1) /= -9999 )  .OR.    &
               ( do2d_xz /= ''  .AND.  section(1,2) /= -9999 )  .OR.    &
-              ( do2d_yz /= ''  .AND.  section(1,3) /= -9999 ) )  .AND. &
-            ( netcdf_output  .OR.  iso2d_output ) )  THEN
+              ( do2d_yz /= ''  .AND.  section(1,3) /= -9999 ) ) )  THEN
 
           IF (  av == 0 )  THEN
@@ -882,14 +881,5 @@
 
           output_format = ''
-          IF ( netcdf_output )  THEN
-             output_format = output_format_netcdf
-          ENDIF
-          IF ( iso2d_output )  THEN
-             IF ( netcdf_output )  THEN
-                output_format = TRIM( output_format_netcdf ) // ' and iso2d'
-             ELSE
-                output_format = 'iso2d'
-             ENDIF
-          ENDIF
+          output_format = output_format_netcdf
           WRITE ( io, 344 )  output_format
 
@@ -1048,15 +1038,5 @@
           ENDIF
 
-          output_format = ''
-          IF ( netcdf_output )  THEN
-             output_format = output_format_netcdf
-          ENDIF
-          IF ( avs_output )  THEN
-             IF ( netcdf_output )  THEN
-                output_format = TRIM( output_format_netcdf ) // ' and avs'
-             ELSE
-                output_format = 'avs'
-             ENDIF
-          ENDIF
+          output_format = output_format_netcdf
           WRITE ( io, 344 )  output_format
 
@@ -1079,31 +1059,4 @@
           ELSE
              WRITE ( io, 353 )
-          ENDIF
-
-          IF ( do3d_compress )  THEN
-             do3d_chr = ''
-             i = 1
-             DO WHILE ( do3d(av,i) /= ' ' )
-
-                SELECT CASE ( do3d(av,i) )
-                   CASE ( 'u' )
-                      j = 1
-                   CASE ( 'v' )
-                      j = 2
-                   CASE ( 'w' )
-                      j = 3
-                   CASE ( 'p' )
-                      j = 4
-                   CASE ( 'pt' )
-                      j = 5
-                END SELECT
-                WRITE ( prec, '(I1)' )  plot_3d_precision(j)%precision
-                do3d_chr = TRIM( do3d_chr ) // ' ' // TRIM( do3d(av,i) ) // &
-                           ':' // prec // ','
-                i = i + 1
-
-             ENDDO
-             WRITE ( io, 338 )  do3d_chr
-
           ENDIF
 
@@ -1144,8 +1097,5 @@
              ENDIF
 
-             output_format = ' '
-             IF ( netcdf_output )  THEN
-                output_format = output_format_netcdf
-             ENDIF
+             output_format = output_format_netcdf
 !--          Parallel output not implemented for mask data, hence
 !--          output_format must be adjusted.
@@ -1202,8 +1152,5 @@
        WRITE ( io, 340 )
 
-       output_format = ''
-       IF ( netcdf_output )  THEN
-          output_format = output_format_netcdf
-       ENDIF
+       output_format = output_format_netcdf
        WRITE ( io, 344 )  output_format
        WRITE ( io, 341 )  dt_dots
@@ -1268,8 +1215,5 @@
        WRITE ( io, 370 )
 
-       output_format = ' '
-       IF ( netcdf_output )  THEN
-          output_format = output_format_netcdf
-       ENDIF
+       output_format = output_format_netcdf
        WRITE ( io, 344 )  output_format
        WRITE ( io, 371 )  dt_dosp
@@ -1640,13 +1584,8 @@
        IF ( dt_write_particle_data /= 9999999.9_wp )  THEN
           WRITE ( io, 485 )  dt_write_particle_data
-          output_format = ' '
-          IF ( netcdf_output )  THEN
-             IF ( netcdf_data_format > 1 )  THEN
-                output_format = 'netcdf (64 bit offset) and binary'
-             ELSE
-                output_format = 'netcdf and binary'
-             ENDIF
+          IF ( netcdf_data_format > 1 )  THEN
+             output_format = 'netcdf (64 bit offset) and binary'
           ELSE
-             output_format = 'binary'
+             output_format = 'netcdf and binary'
           ENDIF
           WRITE ( io, 344 )  output_format
@@ -1905,6 +1844,4 @@
             '       Output every             ',F8.2,' s  ',A/ &
             '       Upper output limit at    ',F8.2,' m  (GP ',I4,')'/)
-338 FORMAT ('       Compressed data output'/ &
-            '       Decimal precision: ',A/)
 339 FORMAT ('       No output during initial ',F8.2,' s')
 340 FORMAT (/'    Time series:')
Index: /palm/trunk/SOURCE/lpm_data_output_particles.f90
===================================================================
--- /palm/trunk/SOURCE/lpm_data_output_particles.f90	(revision 1326)
+++ /palm/trunk/SOURCE/lpm_data_output_particles.f90	(revision 1327)
@@ -20,4 +20,5 @@
 ! Current revisions:
 ! ------------------
+! -netcdf output queries
 !
 ! Former revisions:
@@ -43,5 +44,5 @@
 
     USE control_parameters,                                                    &
-        ONLY:  netcdf_output, prt_time_count, simulated_time
+        ONLY:  prt_time_count, simulated_time
 
     USE cpulog,                                                                &
@@ -80,114 +81,110 @@
 !
 !-- Output in netCDF format
-    IF ( netcdf_output )  THEN
-
-       CALL check_open( 108 )
+    CALL check_open( 108 )
 
 !
-!--    Update the NetCDF time axis
-       prt_time_count = prt_time_count + 1
+!-- Update the NetCDF time axis
+    prt_time_count = prt_time_count + 1
 
-       nc_stat = NF90_PUT_VAR( id_set_prt, id_var_time_prt, &
-                               (/ simulated_time /),        &
-                               start = (/ prt_time_count /), count = (/ 1 /) )
-       CALL handle_netcdf_error( 'lpm_data_output_particles', 1 )
+    nc_stat = NF90_PUT_VAR( id_set_prt, id_var_time_prt, &
+                            (/ simulated_time /),        &
+                            start = (/ prt_time_count /), count = (/ 1 /) )
+    CALL handle_netcdf_error( 'lpm_data_output_particles', 1 )
 
 !
-!--    Output the real number of particles used
-       nc_stat = NF90_PUT_VAR( id_set_prt, id_var_rnop_prt, &
-                               (/ number_of_particles /),   &
-                               start = (/ prt_time_count /), count = (/ 1 /) )
-       CALL handle_netcdf_error( 'lpm_data_output_particles', 2 )
+!-- Output the real number of particles used
+    nc_stat = NF90_PUT_VAR( id_set_prt, id_var_rnop_prt, &
+                            (/ number_of_particles /),   &
+                            start = (/ prt_time_count /), count = (/ 1 /) )
+    CALL handle_netcdf_error( 'lpm_data_output_particles', 2 )
 
 !
-!--    Output all particle attributes
-       nc_stat = NF90_PUT_VAR( id_set_prt, id_var_prt(1), particles%age,      &
-                               start = (/ 1, prt_time_count /),               &
-                               count = (/ maximum_number_of_particles /) )
-       CALL handle_netcdf_error( 'lpm_data_output_particles', 3 )
+!-- Output all particle attributes
+    nc_stat = NF90_PUT_VAR( id_set_prt, id_var_prt(1), particles%age,      &
+                            start = (/ 1, prt_time_count /),               &
+                            count = (/ maximum_number_of_particles /) )
+    CALL handle_netcdf_error( 'lpm_data_output_particles', 3 )
 
-       nc_stat = NF90_PUT_VAR( id_set_prt, id_var_prt(2), particles%dvrp_psize,&
-                               start = (/ 1, prt_time_count /),                &
-                               count = (/ maximum_number_of_particles /) )
-       CALL handle_netcdf_error( 'lpm_data_output_particles', 4 )
+    nc_stat = NF90_PUT_VAR( id_set_prt, id_var_prt(2), particles%dvrp_psize,&
+                            start = (/ 1, prt_time_count /),                &
+                            count = (/ maximum_number_of_particles /) )
+    CALL handle_netcdf_error( 'lpm_data_output_particles', 4 )
 
-       nc_stat = NF90_PUT_VAR( id_set_prt, id_var_prt(3), particles%origin_x, &
-                               start = (/ 1, prt_time_count /),               &
-                               count = (/ maximum_number_of_particles /) )
-       CALL handle_netcdf_error( 'lpm_data_output_particles', 5 )
+    nc_stat = NF90_PUT_VAR( id_set_prt, id_var_prt(3), particles%origin_x, &
+                            start = (/ 1, prt_time_count /),               &
+                            count = (/ maximum_number_of_particles /) )
+    CALL handle_netcdf_error( 'lpm_data_output_particles', 5 )
 
-       nc_stat = NF90_PUT_VAR( id_set_prt, id_var_prt(4), particles%origin_y, &
-                               start = (/ 1, prt_time_count /),               &
-                               count = (/ maximum_number_of_particles /) )
-       CALL handle_netcdf_error( 'lpm_data_output_particles', 6 )
+    nc_stat = NF90_PUT_VAR( id_set_prt, id_var_prt(4), particles%origin_y, &
+                            start = (/ 1, prt_time_count /),               &
+                            count = (/ maximum_number_of_particles /) )
+    CALL handle_netcdf_error( 'lpm_data_output_particles', 6 )
 
-       nc_stat = NF90_PUT_VAR( id_set_prt, id_var_prt(5), particles%origin_z, &
-                               start = (/ 1, prt_time_count /),               &
-                               count = (/ maximum_number_of_particles /) )
-       CALL handle_netcdf_error( 'lpm_data_output_particles', 7 )
+    nc_stat = NF90_PUT_VAR( id_set_prt, id_var_prt(5), particles%origin_z, &
+                            start = (/ 1, prt_time_count /),               &
+                            count = (/ maximum_number_of_particles /) )
+    CALL handle_netcdf_error( 'lpm_data_output_particles', 7 )
 
-       nc_stat = NF90_PUT_VAR( id_set_prt, id_var_prt(6), particles%radius,   &
-                               start = (/ 1, prt_time_count /),               &
-                               count = (/ maximum_number_of_particles /) )
-       CALL handle_netcdf_error( 'lpm_data_output_particles', 8 )
+    nc_stat = NF90_PUT_VAR( id_set_prt, id_var_prt(6), particles%radius,   &
+                            start = (/ 1, prt_time_count /),               &
+                            count = (/ maximum_number_of_particles /) )
+    CALL handle_netcdf_error( 'lpm_data_output_particles', 8 )
 
-       nc_stat = NF90_PUT_VAR( id_set_prt, id_var_prt(7), particles%speed_x,  &
-                               start = (/ 1, prt_time_count /),               &
-                               count = (/ maximum_number_of_particles /) )
-       CALL handle_netcdf_error( 'lpm_data_output_particles', 9 )
+    nc_stat = NF90_PUT_VAR( id_set_prt, id_var_prt(7), particles%speed_x,  &
+                            start = (/ 1, prt_time_count /),               &
+                            count = (/ maximum_number_of_particles /) )
+    CALL handle_netcdf_error( 'lpm_data_output_particles', 9 )
 
-       nc_stat = NF90_PUT_VAR( id_set_prt, id_var_prt(8), particles%speed_y,  &
-                               start = (/ 1, prt_time_count /),               &
-                               count = (/ maximum_number_of_particles /) )
-       CALL handle_netcdf_error( 'lpm_data_output_particles', 10 )
+    nc_stat = NF90_PUT_VAR( id_set_prt, id_var_prt(8), particles%speed_y,  &
+                            start = (/ 1, prt_time_count /),               &
+                            count = (/ maximum_number_of_particles /) )
+    CALL handle_netcdf_error( 'lpm_data_output_particles', 10 )
 
-       nc_stat = NF90_PUT_VAR( id_set_prt, id_var_prt(9), particles%speed_z,  &
-                               start = (/ 1, prt_time_count /),               &
-                               count = (/ maximum_number_of_particles /) )
-       CALL handle_netcdf_error( 'lpm_data_output_particles', 11 )
+    nc_stat = NF90_PUT_VAR( id_set_prt, id_var_prt(9), particles%speed_z,  &
+                            start = (/ 1, prt_time_count /),               &
+                            count = (/ maximum_number_of_particles /) )
+    CALL handle_netcdf_error( 'lpm_data_output_particles', 11 )
 
-       nc_stat = NF90_PUT_VAR( id_set_prt,id_var_prt(10),                     &
-                               particles%weight_factor,                       &
-                               start = (/ 1, prt_time_count /),               &
-                               count = (/ maximum_number_of_particles /) )
-       CALL handle_netcdf_error( 'lpm_data_output_particles', 12 )
+    nc_stat = NF90_PUT_VAR( id_set_prt,id_var_prt(10),                     &
+                            particles%weight_factor,                       &
+                            start = (/ 1, prt_time_count /),               &
+                            count = (/ maximum_number_of_particles /) )
+    CALL handle_netcdf_error( 'lpm_data_output_particles', 12 )
 
-       nc_stat = NF90_PUT_VAR( id_set_prt, id_var_prt(11), particles%x,       &
-                               start = (/ 1, prt_time_count /),               &
-                               count = (/ maximum_number_of_particles /) )
-       CALL handle_netcdf_error( 'lpm_data_output_particles', 13 )
+    nc_stat = NF90_PUT_VAR( id_set_prt, id_var_prt(11), particles%x,       &
+                            start = (/ 1, prt_time_count /),               &
+                            count = (/ maximum_number_of_particles /) )
+    CALL handle_netcdf_error( 'lpm_data_output_particles', 13 )
 
-       nc_stat = NF90_PUT_VAR( id_set_prt, id_var_prt(12), particles%y,       & 
-                               start = (/ 1, prt_time_count /),               &
-                               count = (/ maximum_number_of_particles /) )
-       CALL handle_netcdf_error( 'lpm_data_output_particles', 14 )
+    nc_stat = NF90_PUT_VAR( id_set_prt, id_var_prt(12), particles%y,       &
+                            start = (/ 1, prt_time_count /),               &
+                            count = (/ maximum_number_of_particles /) )
+    CALL handle_netcdf_error( 'lpm_data_output_particles', 14 )
 
-       nc_stat = NF90_PUT_VAR( id_set_prt, id_var_prt(13), particles%z,       &
-                               start = (/ 1, prt_time_count /),               &
-                               count = (/ maximum_number_of_particles /) )
-       CALL handle_netcdf_error( 'lpm_data_output_particles', 15 )
+    nc_stat = NF90_PUT_VAR( id_set_prt, id_var_prt(13), particles%z,       &
+                            start = (/ 1, prt_time_count /),               &
+                            count = (/ maximum_number_of_particles /) )
+    CALL handle_netcdf_error( 'lpm_data_output_particles', 15 )
 
-       nc_stat = NF90_PUT_VAR( id_set_prt, id_var_prt(14), particles%class,   &
-                               start = (/ 1, prt_time_count /),               &
-                               count = (/ maximum_number_of_particles /) )
-       CALL handle_netcdf_error( 'lpm_data_output_particles', 16 )
+    nc_stat = NF90_PUT_VAR( id_set_prt, id_var_prt(14), particles%class,   &
+                            start = (/ 1, prt_time_count /),               &
+                            count = (/ maximum_number_of_particles /) )
+    CALL handle_netcdf_error( 'lpm_data_output_particles', 16 )
 
-       nc_stat = NF90_PUT_VAR( id_set_prt, id_var_prt(15), particles%group,   &
-                               start = (/ 1, prt_time_count /),               &
-                               count = (/ maximum_number_of_particles /) )
-       CALL handle_netcdf_error( 'lpm_data_output_particles', 17 )
+    nc_stat = NF90_PUT_VAR( id_set_prt, id_var_prt(15), particles%group,   &
+                            start = (/ 1, prt_time_count /),               &
+                            count = (/ maximum_number_of_particles /) )
+    CALL handle_netcdf_error( 'lpm_data_output_particles', 17 )
 
-       nc_stat = NF90_PUT_VAR( id_set_prt, id_var_prt(16),                    &
-                               particles%tailpoints,                          &
-                               start = (/ 1, prt_time_count /),               &
-                               count = (/ maximum_number_of_particles /) )
-       CALL handle_netcdf_error( 'lpm_data_output_particles', 18 )
+    nc_stat = NF90_PUT_VAR( id_set_prt, id_var_prt(16),                    &
+                            particles%tailpoints,                          &
+                            start = (/ 1, prt_time_count /),               &
+                            count = (/ maximum_number_of_particles /) )
+    CALL handle_netcdf_error( 'lpm_data_output_particles', 18 )
 
-       nc_stat = NF90_PUT_VAR( id_set_prt, id_var_prt(17), particles%tail_id, &
-                               start = (/ 1, prt_time_count /),               &
-                               count = (/ maximum_number_of_particles /) )
-       CALL handle_netcdf_error( 'lpm_data_output_particles', 19 )
-
-    ENDIF
+    nc_stat = NF90_PUT_VAR( id_set_prt, id_var_prt(17), particles%tail_id, &
+                            start = (/ 1, prt_time_count /),               &
+                            count = (/ maximum_number_of_particles /) )
+    CALL handle_netcdf_error( 'lpm_data_output_particles', 19 )
 
 #endif
Index: /palm/trunk/SOURCE/lpm_exchange_horiz.f90
===================================================================
--- /palm/trunk/SOURCE/lpm_exchange_horiz.f90	(revision 1326)
+++ /palm/trunk/SOURCE/lpm_exchange_horiz.f90	(revision 1327)
@@ -20,5 +20,5 @@
 ! Current revisions:
 ! ------------------
-!
+! -netcdf output queries
 !
 ! Former revisions:
@@ -53,5 +53,5 @@
 
     USE control_parameters,                                                    &
-        ONLY:  message_string, netcdf_output, netcdf_data_format
+        ONLY:  message_string, netcdf_data_format
 
     USE cpulog,                                                                &
@@ -350,5 +350,5 @@
             maximum_number_of_particles )           &
        THEN
-          IF ( netcdf_output  .AND.  netcdf_data_format < 3 )  THEN
+          IF ( netcdf_data_format < 3 )  THEN
               message_string = 'maximum_number_of_particles ' //    &
                                'needs to be increased ' //          &
@@ -374,5 +374,5 @@
           IF ( number_of_tails+trrpt_count_recv > maximum_number_of_tails ) &
           THEN
-             IF ( netcdf_output  .AND.  netcdf_data_format < 3 )  THEN
+             IF ( netcdf_data_format < 3 )  THEN
                 message_string = 'maximum_number_of_tails ' //   &
                                  'needs to be increased ' //     &
@@ -414,5 +414,5 @@
             maximum_number_of_particles )           &
        THEN
-          IF ( netcdf_output  .AND.  netcdf_data_format < 3 )  THEN
+          IF ( netcdf_data_format < 3 )  THEN
              message_string = 'maximum_number_of_particles ' //  &
                               'needs to be increased ' //        &
@@ -438,5 +438,5 @@
           IF ( number_of_tails+trlpt_count_recv > maximum_number_of_tails ) &
           THEN
-             IF ( netcdf_output  .AND.  netcdf_data_format < 3 )  THEN
+             IF ( netcdf_data_format < 3 )  THEN
                 message_string = 'maximum_number_of_tails ' //   &
                                  'needs to be increased ' //     &
@@ -723,5 +723,5 @@
             maximum_number_of_particles )           &
        THEN
-          IF ( netcdf_output  .AND.  netcdf_data_format < 3 )  THEN
+          IF ( netcdf_data_format < 3 )  THEN
              message_string = 'maximum_number_of_particles ' //  &
                               'needs to be increased ' //        &
@@ -747,5 +747,5 @@
           IF ( number_of_tails+trnpt_count_recv > maximum_number_of_tails ) &
           THEN
-             IF ( netcdf_output  .AND.  netcdf_data_format < 3 )  THEN
+             IF ( netcdf_data_format < 3 )  THEN
                 message_string = 'maximum_number_of_tails ' //    &
                                  'needs to be increased ' //      &
@@ -788,5 +788,5 @@
             maximum_number_of_particles )           &
        THEN
-          IF ( netcdf_output  .AND.  netcdf_data_format < 3 )  THEN
+          IF ( netcdf_data_format < 3 )  THEN
              message_string = 'maximum_number_of_particles ' //   &
                               'needs to be increased ' //         &
@@ -812,5 +812,5 @@
           IF ( number_of_tails+trspt_count_recv > maximum_number_of_tails ) &
           THEN
-             IF ( netcdf_output  .AND.  netcdf_data_format < 3 )  THEN
+             IF ( netcdf_data_format < 3 )  THEN
                 message_string = 'maximum_number_of_tails ' //   &
                                  'needs to be increased ' //     &
Index: /palm/trunk/SOURCE/lpm_init.f90
===================================================================
--- /palm/trunk/SOURCE/lpm_init.f90	(revision 1326)
+++ /palm/trunk/SOURCE/lpm_init.f90	(revision 1327)
@@ -20,5 +20,5 @@
 ! Current revisions:
 ! -----------------
-!
+! -netcdf_output
 !
 ! Former revisions:
@@ -83,5 +83,5 @@
     USE control_parameters,                                                    &
         ONLY:  cloud_droplets, current_timestep_number, initializing_actions,  &
-               message_string, netcdf_output,netcdf_data_format, ocean,        &
+               message_string, netcdf_data_format, ocean,                      &
                prandtl_layer, simulated_time
 
Index: /palm/trunk/SOURCE/lpm_release_set.f90
===================================================================
--- /palm/trunk/SOURCE/lpm_release_set.f90	(revision 1326)
+++ /palm/trunk/SOURCE/lpm_release_set.f90	(revision 1327)
@@ -20,5 +20,5 @@
 ! Current revisions:
 ! ------------------
-!
+! -netcdf output queries
 !
 ! Former revisions:
@@ -48,5 +48,5 @@
 
     USE control_parameters,                                                    &
-        ONLY:  iran, message_string, netcdf_data_format, netcdf_output
+        ONLY:  iran, message_string, netcdf_data_format
 
     USE grid_variables,                                                        &
@@ -81,5 +81,5 @@
     IF ( number_of_particles + number_of_initial_particles > &
          maximum_number_of_particles  )  THEN
-       IF ( netcdf_output  .AND.  netcdf_data_format < 3 )  THEN
+       IF ( netcdf_data_format < 3 )  THEN
           message_string = 'maximum_number_of_particles needs to be increa' // &
                            'sed &but this is not allowed with netcdf_data_' // &
@@ -96,5 +96,5 @@
        IF ( number_of_tails + number_of_initial_tails > &
             maximum_number_of_tails  )  THEN
-          IF ( netcdf_output  .AND.  netcdf_data_format < 3 )  THEN
+          IF ( netcdf_data_format < 3 )  THEN
              message_string = 'maximum_number_of_tails needs to be increas' // &
                               'ed &but this is not allowed with netcdf_dat' // &
Index: /palm/trunk/SOURCE/modules.f90
===================================================================
--- /palm/trunk/SOURCE/modules.f90	(revision 1326)
+++ /palm/trunk/SOURCE/modules.f90	(revision 1327)
@@ -20,5 +20,6 @@
 ! Current revisions:
 ! ------------------
-!
+! REAL constants defined as wp-kind
+! -avs_output, data_output_format, do3d_compress, iso2d_output, netcdf_output
 !
 ! Former revisions:
@@ -347,64 +348,64 @@
                 
 
-    REAL(wp) ::  a_1 = 8.69E-4,     & !: coef. in turb. parametrization (cm-2 s3)
-                 a_2 = -7.38E-5,    & !: coef. in turb. parametrization (cm-2 s3)
-                 a_3 = -1.40E-2,    & !: coef. in turb. parametrization
-                 a_term = 9.65,     & !: coef. for terminal velocity (m s-1)
-                 a_vent = 0.78,     & !: coef. for ventilation effect
-                 b_1 = 11.45E-6,    & !: coef. in turb. parametrization (m)
-                 b_2 = 9.68E-6,     & !: coef. in turb. parametrization (m)
-                 b_3 = 0.62,        & !: coef. in turb. parametrization
-                 b_term = 9.8,      & !: coef. for terminal velocity (m s-1)
-                 b_vent = 0.308,    & !: coef. for ventilation effect
-                 beta_cc = 3.09E-4, & !: coef. in turb. parametrization (cm-2 s3)
+    REAL(wp) ::  a_1 = 8.69E-4_wp,     & !: coef. in turb. parametrization (cm-2 s3)
+                 a_2 = -7.38E-5_wp,    & !: coef. in turb. parametrization (cm-2 s3)
+                 a_3 = -1.40E-2_wp,    & !: coef. in turb. parametrization
+                 a_term = 9.65_wp,     & !: coef. for terminal velocity (m s-1)
+                 a_vent = 0.78_wp,     & !: coef. for ventilation effect
+                 b_1 = 11.45E-6_wp,    & !: coef. in turb. parametrization (m)
+                 b_2 = 9.68E-6_wp,     & !: coef. in turb. parametrization (m)
+                 b_3 = 0.62_wp,        & !: coef. in turb. parametrization
+                 b_term = 9.8_wp,      & !: coef. for terminal velocity (m s-1)
+                 b_vent = 0.308_wp,    & !: coef. for ventilation effect
+                 beta_cc = 3.09E-4_wp, & !: coef. in turb. parametrization (cm-2 s3)
                  bfactor,           &
-                 c_1 = 4.82E-6,     & !: coef. in turb. parametrization (m)
-                 c_2 = 4.8E-6,      & !: coef. in turb. parametrization (m)
-                 c_3 = 0.76,        & !: coef. in turb. parametrization
-                 c_const = 0.93,    & !: const. in Taylor-microscale Reynolds number
-                 c_evap = 0.7,      & !: constant in evaporation
-                 c_sedimentation = 2.0, & !: Courant number of sedimentation process
-                 c_term = 600.0,    & !: coef. for terminal velocity (m-1)
-                 cof(6) = (/ 76.18009172947146,      & !: coefficients in the 
-                             -86.50532032941677,     & !: numerical
-                             24.01409824083091,      & !: calculation of the
-                             -1.231739572450155,     & !: gamma function
-                             0.1208650973866179E-2,  &
-                             -0.5395239384953E-5 /), &
-                cp = 1005.0,       & !: heat capacity of dry air (J kg-1 K-1) 
-                diff_coeff_l = 0.23E-4, & !: diffusivity of water vapor (m2 s-1)
+                 c_1 = 4.82E-6_wp,     & !: coef. in turb. parametrization (m)
+                 c_2 = 4.8E-6_wp,      & !: coef. in turb. parametrization (m)
+                 c_3 = 0.76_wp,        & !: coef. in turb. parametrization
+                 c_const = 0.93_wp,    & !: const. in Taylor-microscale Reynolds number
+                 c_evap = 0.7_wp,      & !: constant in evaporation
+                 c_sedimentation = 2.0_wp, & !: Courant number of sedimentation process
+                 c_term = 600.0_wp,    & !: coef. for terminal velocity (m-1)
+                 cof(6) = (/ 76.18009172947146_wp,      & !: coefficients in the 
+                             -86.50532032941677_wp,     & !: numerical
+                             24.01409824083091_wp,      & !: calculation of the
+                             -1.231739572450155_wp,     & !: gamma function
+                             0.1208650973866179E-2_wp,  &
+                             -0.5395239384953E-5_wp /), &
+                cp = 1005.0_wp,       & !: heat capacity of dry air (J kg-1 K-1) 
+                diff_coeff_l = 0.23E-4_wp, & !: diffusivity of water vapor (m2 s-1)
                 effective_coll_efficiency, & !:
-                eps_ros = 1.0E-4,  & !: accuracy of Rosenbrock method
-                eps_sb = 1.0E-20,  & !: threshold in two-moments scheme
-                k_cc = 9.44E09,    & !: const. cloud-cloud kernel (m3 kg-2 s-1) 
-                k_cr0 = 4.33,      & !: const. cloud-rain kernel (m3 kg-1 s-1) 
-                k_rr = 7.12,       & !: const. rain-rain kernel (m3 kg-1 s-1) 
-                k_br = 1000.,      & !: const. in breakup parametrization (m-1)
-                k_st = 1.2E8,      & !: const. in drizzle parametrization (m-1 s-1)
-                kappa_rr = 60.7,   & !: const. in collision kernel (kg-1/3)
-                kin_vis_air = 1.4086E-5, & !: kin. viscosity of air (m2 s-1)
-                l_v = 2.5E+06,     & !: latent heat of vaporization (J kg-1)
+                eps_ros = 1.0E-4_wp,  & !: accuracy of Rosenbrock method
+                eps_sb = 1.0E-20_wp,  & !: threshold in two-moments scheme
+                k_cc = 9.44E09_wp,    & !: const. cloud-cloud kernel (m3 kg-2 s-1) 
+                k_cr0 = 4.33_wp,      & !: const. cloud-rain kernel (m3 kg-1 s-1) 
+                k_rr = 7.12_wp,       & !: const. rain-rain kernel (m3 kg-1 s-1) 
+                k_br = 1000._wp,      & !: const. in breakup parametrization (m-1)
+                k_st = 1.2E8_wp,      & !: const. in drizzle parametrization (m-1 s-1)
+                kappa_rr = 60.7_wp,   & !: const. in collision kernel (kg-1/3)
+                kin_vis_air = 1.4086E-5_wp, & !: kin. viscosity of air (m2 s-1)
+                l_v = 2.5E+06_wp,     & !: latent heat of vaporization (J kg-1)
                 l_d_cp, l_d_r, l_d_rv, & !: l_v / cp, l_v / r_d, l_v / r_v
-                mass_of_solute = 1.0E-17, & !: soluted NaCl (kg)
-                molecular_weight_of_solute = 0.05844, & !: mol. m. NaCl (kg mol-1)
-                molecular_weight_of_water = 0.01801528, & !: mol. m. H2O (kg mol-1)
-                nc_const = 70.0E6, & !: cloud droplet concentration
-                prec_time_const = 0.001, & !: coef. in Kessler scheme
+                mass_of_solute = 1.0E-17_wp, & !: soluted NaCl (kg)
+                molecular_weight_of_solute = 0.05844_wp, & !: mol. m. NaCl (kg mol-1)
+                molecular_weight_of_water = 0.01801528_wp, & !: mol. m. H2O (kg mol-1)
+                nc_const = 70.0E6_wp, & !: cloud droplet concentration
+                prec_time_const = 0.001_wp, & !: coef. in Kessler scheme
                 pirho_l, dpirho_l, & !: pi * rho_l / 6.0; 6.0 / ( pi * rho_l )
-                rho_l = 1.0E3,     & !: density of water (kg m-3)
-                ql_crit = 0.0005,  & !: coef. in Kessler scheme
-                r_d = 287.0,       & !: sp. gas const. dry air (J kg-1 K-1)
-                r_v = 461.51,      & !: sp. gas const. water vapor (J kg-1 K-1)
-                schmidt = 0.71,    & !: Schmidt number
-                schmidt_p_1d3,     & !: schmidt**( 1.0 / 3.0 )
-                sigma_gc = 1.3,    & !: log-normal geometric standard deviation
-                stp = 2.5066282746310005, & !: parameter in gamma function
-                thermal_conductivity_l = 2.43E-2, & !: therm. cond. air (J m-1 s-1 K-1)
-                vanthoff = 2.0,    & !: van't Hoff factor for NaCl
-                x0 = 2.6E-10,      & !: separating drop mass (kg)
-                xrmin = 2.6E-10,   & !: minimum rain drop size (kg)
-                xrmax = 5.0E-6,    & !: maximum rain drop site (kg)
-                dt_precipitation = 100.0, & !: timestep precipitation (s)
-                w_precipitation = 9.65      !: maximum terminal velocity (m s-1)
+                rho_l = 1.0E3_wp,     & !: density of water (kg m-3)
+                ql_crit = 0.0005_wp,  & !: coef. in Kessler scheme
+                r_d = 287.0_wp,       & !: sp. gas const. dry air (J kg-1 K-1)
+                r_v = 461.51_wp,      & !: sp. gas const. water vapor (J kg-1 K-1)
+                schmidt = 0.71_wp,    & !: Schmidt number
+                schmidt_p_1d3,        & !: schmidt**( 1.0 / 3.0 )
+                sigma_gc = 1.3_wp,    & !: log-normal geometric standard deviation
+                stp = 2.5066282746310005_wp, & !: parameter in gamma function
+                thermal_conductivity_l = 2.43E-2_wp, & !: therm. cond. air (J m-1 s-1 K-1)
+                vanthoff = 2.0_wp,    & !: van't Hoff factor for NaCl
+                x0 = 2.6E-10_wp,      & !: separating drop mass (kg)
+                xrmin = 2.6E-10_wp,   & !: minimum rain drop size (kg)
+                xrmax = 5.0E-6_wp,    & !: maximum rain drop site (kg)
+                dt_precipitation = 100.0_wp, & !: timestep precipitation (s)
+                w_precipitation = 9.65_wp      !: maximum terminal velocity (m s-1)
 
     REAL(wp), DIMENSION(:), ALLOCATABLE     ::  hyrho, pt_d_t, t_d_pt  
@@ -511,6 +512,4 @@
     CHARACTER (LEN=1000) ::  message_string = ' '
 
-    CHARACTER (LEN=7),  DIMENSION(100) ::  do3d_comp_prec = ' '
-    CHARACTER (LEN=10), DIMENSION(10)  ::  data_output_format = ' '
     CHARACTER (LEN=11), DIMENSION(100) ::  data_output = ' ',    &
                                            data_output_user = ' ', doav = ' '
@@ -581,6 +580,5 @@
                     mask_i_global, mask_j_global, mask_k_global
 
-    LOGICAL ::  avs_output = .FALSE., &
-                bc_lr_cyc =.TRUE., bc_lr_dirrad = .FALSE., &
+    LOGICAL ::  bc_lr_cyc =.TRUE., bc_lr_dirrad = .FALSE., &
                 bc_lr_raddir = .FALSE., bc_ns_cyc = .TRUE., &
                 bc_ns_dirrad = .FALSE., bc_ns_raddir = .FALSE.,&
@@ -595,5 +593,5 @@
                 dissipation_control = .FALSE., disturbance_created = .FALSE., &
                 do2d_at_begin = .FALSE., do3d_at_begin = .FALSE., &
-                do3d_compress = .FALSE., do_sum = .FALSE., &
+                do_sum = .FALSE., &
                 dp_external = .FALSE., dp_smooth = .FALSE., &
                 drizzle = .FALSE., dt_fixed = .FALSE., &
@@ -604,10 +602,10 @@
                 inflow_l = .FALSE., inflow_n = .FALSE., &
                 inflow_r = .FALSE., inflow_s = .FALSE., &
-                iso2d_output = .FALSE., large_scale_forcing = .FALSE., &
+                large_scale_forcing = .FALSE., &
                 large_scale_subsidence = .FALSE., lsf_surf = .TRUE., &
                 lsf_vert = .TRUE., lptnudge = .FALSE., lqnudge = .FALSE., &
                 lunudge = .FALSE., lvnudge = .FALSE., lwnudge = .FALSE., &
                 masking_method = .FALSE., mg_switch_to_pe0 = .FALSE., &
-                netcdf_output = .FALSE., neutral = .FALSE., nudging = .FALSE., &
+                neutral = .FALSE., nudging = .FALSE., &
                 ocean = .FALSE., on_device = .FALSE., &
                 outflow_l = .FALSE., outflow_n = .FALSE., outflow_r = .FALSE., &
@@ -632,111 +630,111 @@
                 data_output_yz(0:1) = .FALSE.
 
-    REAL(wp) ::  advected_distance_x = 0.0, advected_distance_y = 0.0, &
-                 alpha_surface = 0.0, atmos_ocean_sign = 1.0, &
-                 averaging_interval = 0.0, averaging_interval_pr = 9999999.9, &
-                 averaging_interval_sp = 9999999.9, bc_pt_t_val, bc_q_t_val, &
-                 bottom_salinityflux = 0.0, &
-                 building_height = 50.0, building_length_x = 50.0, &
-                 building_length_y = 50.0, building_wall_left = 9999999.9, &
-                 building_wall_south = 9999999.9, canyon_height = 50.0, &
-                 canyon_width_x = 9999999.9, canyon_width_y = 9999999.9, &
-                 canyon_wall_left = 9999999.9, canyon_wall_south = 9999999.9, &
-                 cthf = 0.0, cfl_factor = -1.0, cos_alpha_surface, &
-                 coupling_start_time = 0.0, disturbance_amplitude = 0.25, &
-                 disturbance_energy_limit = 0.01, &
-                 disturbance_level_b = -9999999.9, &
-                 disturbance_level_t = -9999999.9, &
-                 dp_level_b = 0.0, drag_coefficient = 0.0, &
-                 dt = -1.0, dt_averaging_input = 0.0, &
-                 dt_averaging_input_pr = 9999999.9, dt_coupling = 9999999.9, &
-                 dt_data_output = 9999999.9, &
-                 dt_data_output_av = 9999999.9, dt_disturb = 9999999.9, &
-                 dt_dopr = 9999999.9, dt_dopr_listing = 9999999.9, &
-                 dt_dopts = 9999999.9, dt_dosp = 9999999.9, dt_dots = 9999999.9, &
-                 dt_do2d_xy = 9999999.9, dt_do2d_xz = 9999999.9, &
-                 dt_do2d_yz = 9999999.9, dt_do3d = 9999999.9, dt_dvrp = 9999999.9, &
-                 dt_max = 20.0, dt_micro = -1.0, dt_restart = 9999999.9, &
-                 dt_run_control = 60.0, dt_3d = -1.0, dz = -1.0, &
-                 dz_max = 9999999.9, dz_stretch_factor = 1.08, &
-                 dz_stretch_level = 100000.0, e_init = 0.0, e_min = 0.0, &
-                 end_time = 0.0, &
-                 f = 0.0, fs = 0.0, g = 9.81, inflow_damping_height = 9999999.9, &
-                 inflow_damping_width = 9999999.9, kappa = 0.4, km_constant = -1.0,&
-                 lad_surface = 0.0, leaf_surface_concentration = 0.0, &
-                 mask_scale_x = 1.0, mask_scale_y = 1.0, mask_scale_z = 1.0, &
-                 maximum_cpu_time_allowed = 0.0,  &
-                 molecular_viscosity = 1.461E-5, &
-                 old_dt = 1.0E-10, omega = 7.29212E-5, omega_sor = 1.8, &
-                 particle_maximum_age = 9999999.9, &
-                 phi = 55.0, prandtl_number = 1.0, &
-                 precipitation_amount_interval = 9999999.9, prho_reference, &
-                 pt_damping_factor = 0.0, pt_damping_width = 0.0, &
-                 pt_reference = 9999999.9, pt_slope_offset = 0.0, &
-                 pt_surface = 300.0, pt_surface_initial_change = 0.0, &
-                 q_surface = 0.0, q_surface_initial_change = 0.0, &
-                 rayleigh_damping_factor = -1.0, rayleigh_damping_height = -1.0, &
-                 recycling_width = 9999999.9, residual_limit = 1.0E-4, &
-                 restart_time = 9999999.9, rho_reference, rho_surface, &
-                 rif_max = 1.0, rif_min = -5.0, roughness_length = 0.1, &
-                 sa_surface = 35.0, scalar_exchange_coefficient = 0.0, &
-                 simulated_time = 0.0, simulated_time_at_begin, sin_alpha_surface, &
-                 skip_time_data_output = 0.0, skip_time_data_output_av = 9999999.9,&
-                 skip_time_dopr = 9999999.9, skip_time_dosp = 9999999.9, &
-                 skip_time_do2d_xy = 9999999.9, skip_time_do2d_xz = 9999999.9, &
-                 skip_time_do2d_yz = 9999999.9, skip_time_do3d = 9999999.9, &
-                 surface_heatflux = 9999999.9, surface_pressure = 1013.25, &
-                 surface_scalarflux = 9999999.9, surface_waterflux = 9999999.9, &
-                 s_surface = 0.0, s_surface_initial_change = 0.0, &
-                 termination_time_needed = -1.0, time_coupling = 0.0, &
-                 time_disturb = 0.0, time_dopr = 0.0, time_dopr_av = 0.0, &
-                 time_dopr_listing = 0.0, time_dopts = 0.0, time_dosp = 0.0, &
-                 time_dosp_av = 0.0, time_dots = 0.0, time_do2d_xy = 0.0, &
-                 time_do2d_xz = 0.0, time_do2d_yz = 0.0, time_do3d = 0.0, &
-                 time_do_av = 0.0, time_do_sla = 0.0, time_dvrp = 0.0, &
-                 time_restart = 9999999.9, time_run_control = 0.0,&
-                 time_since_reference_point, top_heatflux = 9999999.9, &
-                 top_momentumflux_u = 9999999.9, &
-                 top_momentumflux_v = 9999999.9, top_salinityflux = 9999999.9, &
-                 ug_surface = 0.0, u_bulk = 0.0, u_gtrans = 0.0, &
-                 vg_surface = 0.0, vpt_reference = 9999999.9, &
-                 v_bulk = 0.0, v_gtrans = 0.0, wall_adjustment_factor = 1.8, &
-                 z_max_do2d = -1.0, z0h_factor = 1.0
-
-    REAL(wp) ::  do2d_xy_last_time(0:1) = -1.0, do2d_xz_last_time(0:1) = -1.0, &
-                 do2d_yz_last_time(0:1) = -1.0, dpdxy(1:2) = 0.0, &
-                 dt_domask(max_masks) = 9999999.9, lad_vertical_gradient(10) = 0.0,&
-                 lad_vertical_gradient_level(10) = -9999999.9, &
+    REAL(wp) ::  advected_distance_x = 0.0_wp, advected_distance_y = 0.0_wp, &
+                 alpha_surface = 0.0_wp, atmos_ocean_sign = 1.0_wp, &
+                 averaging_interval = 0.0_wp, averaging_interval_pr = 9999999.9_wp, &
+                 averaging_interval_sp = 9999999.9_wp, bc_pt_t_val, bc_q_t_val, &
+                 bottom_salinityflux = 0.0_wp, &
+                 building_height = 50.0_wp, building_length_x = 50.0_wp, &
+                 building_length_y = 50.0_wp, building_wall_left = 9999999.9_wp, &
+                 building_wall_south = 9999999.9_wp, canyon_height = 50.0_wp, &
+                 canyon_width_x = 9999999.9_wp, canyon_width_y = 9999999.9_wp, &
+                 canyon_wall_left = 9999999.9_wp, canyon_wall_south = 9999999.9_wp, &
+                 cthf = 0.0_wp, cfl_factor = -1.0_wp, cos_alpha_surface, &
+                 coupling_start_time = 0.0_wp, disturbance_amplitude = 0.25_wp, &
+                 disturbance_energy_limit = 0.01_wp, &
+                 disturbance_level_b = -9999999.9_wp, &
+                 disturbance_level_t = -9999999.9_wp, &
+                 dp_level_b = 0.0_wp, drag_coefficient = 0.0_wp, &
+                 dt = -1.0_wp, dt_averaging_input = 0.0_wp, &
+                 dt_averaging_input_pr = 9999999.9_wp, dt_coupling = 9999999.9_wp, &
+                 dt_data_output = 9999999.9_wp, &
+                 dt_data_output_av = 9999999.9_wp, dt_disturb = 9999999.9_wp, &
+                 dt_dopr = 9999999.9_wp, dt_dopr_listing = 9999999.9_wp, &
+                 dt_dopts = 9999999.9_wp, dt_dosp = 9999999.9_wp, dt_dots = 9999999.9_wp, &
+                 dt_do2d_xy = 9999999.9_wp, dt_do2d_xz = 9999999.9_wp, &
+                 dt_do2d_yz = 9999999.9_wp, dt_do3d = 9999999.9_wp, dt_dvrp = 9999999.9_wp, &
+                 dt_max = 20.0_wp, dt_micro = -1.0_wp, dt_restart = 9999999.9_wp, &
+                 dt_run_control = 60.0_wp, dt_3d = -1.0_wp, dz = -1.0_wp, &
+                 dz_max = 9999999.9_wp, dz_stretch_factor = 1.08_wp, &
+                 dz_stretch_level = 100000.0_wp, e_init = 0.0_wp, e_min = 0.0_wp, &
+                 end_time = 0.0_wp, &
+                 f = 0.0_wp, fs = 0.0_wp, g = 9.81_wp, inflow_damping_height = 9999999.9_wp, &
+                 inflow_damping_width = 9999999.9_wp, kappa = 0.4_wp, km_constant = -1.0_wp,&
+                 lad_surface = 0.0_wp, leaf_surface_concentration = 0.0_wp, &
+                 mask_scale_x = 1.0_wp, mask_scale_y = 1.0_wp, mask_scale_z = 1.0_wp, &
+                 maximum_cpu_time_allowed = 0.0_wp,  &
+                 molecular_viscosity = 1.461E-5_wp, &
+                 old_dt = 1.0E-10_wp, omega = 7.29212E-5_wp, omega_sor = 1.8_wp, &
+                 particle_maximum_age = 9999999.9_wp, &
+                 phi = 55.0_wp, prandtl_number = 1.0_wp, &
+                 precipitation_amount_interval = 9999999.9_wp, prho_reference, &
+                 pt_damping_factor = 0.0_wp, pt_damping_width = 0.0_wp, &
+                 pt_reference = 9999999.9_wp, pt_slope_offset = 0.0_wp, &
+                 pt_surface = 300.0_wp, pt_surface_initial_change = 0.0_wp, &
+                 q_surface = 0.0_wp, q_surface_initial_change = 0.0_wp, &
+                 rayleigh_damping_factor = -1.0_wp, rayleigh_damping_height = -1.0_wp, &
+                 recycling_width = 9999999.9_wp, residual_limit = 1.0E-4_wp, &
+                 restart_time = 9999999.9_wp, rho_reference, rho_surface, &
+                 rif_max = 1.0_wp, rif_min = -5.0_wp, roughness_length = 0.1_wp, &
+                 sa_surface = 35.0_wp, scalar_exchange_coefficient = 0.0_wp, &
+                 simulated_time = 0.0_wp, simulated_time_at_begin, sin_alpha_surface, &
+                 skip_time_data_output = 0.0_wp, skip_time_data_output_av = 9999999.9_wp,&
+                 skip_time_dopr = 9999999.9_wp, skip_time_dosp = 9999999.9_wp, &
+                 skip_time_do2d_xy = 9999999.9_wp, skip_time_do2d_xz = 9999999.9_wp, &
+                 skip_time_do2d_yz = 9999999.9_wp, skip_time_do3d = 9999999.9_wp, &
+                 surface_heatflux = 9999999.9_wp, surface_pressure = 1013.25_wp, &
+                 surface_scalarflux = 9999999.9_wp, surface_waterflux = 9999999.9_wp, &
+                 s_surface = 0.0_wp, s_surface_initial_change = 0.0_wp, &
+                 termination_time_needed = -1.0_wp, time_coupling = 0.0_wp, &
+                 time_disturb = 0.0_wp, time_dopr = 0.0_wp, time_dopr_av = 0.0_wp, &
+                 time_dopr_listing = 0.0_wp, time_dopts = 0.0_wp, time_dosp = 0.0_wp, &
+                 time_dosp_av = 0.0_wp, time_dots = 0.0_wp, time_do2d_xy = 0.0_wp, &
+                 time_do2d_xz = 0.0_wp, time_do2d_yz = 0.0_wp, time_do3d = 0.0_wp, &
+                 time_do_av = 0.0_wp, time_do_sla = 0.0_wp, time_dvrp = 0.0_wp, &
+                 time_restart = 9999999.9_wp, time_run_control = 0.0_wp,&
+                 time_since_reference_point, top_heatflux = 9999999.9_wp, &
+                 top_momentumflux_u = 9999999.9_wp, &
+                 top_momentumflux_v = 9999999.9_wp, top_salinityflux = 9999999.9_wp, &
+                 ug_surface = 0.0_wp, u_bulk = 0.0_wp, u_gtrans = 0.0_wp, &
+                 vg_surface = 0.0_wp, vpt_reference = 9999999.9_wp, &
+                 v_bulk = 0.0_wp, v_gtrans = 0.0_wp, wall_adjustment_factor = 1.8_wp, &
+                 z_max_do2d = -1.0_wp, z0h_factor = 1.0_wp
+
+    REAL(wp) ::  do2d_xy_last_time(0:1) = -1.0_wp, do2d_xz_last_time(0:1) = -1.0_wp, &
+                 do2d_yz_last_time(0:1) = -1.0_wp, dpdxy(1:2) = 0.0_wp, &
+                 dt_domask(max_masks) = 9999999.9_wp, lad_vertical_gradient(10) = 0.0_wp,&
+                 lad_vertical_gradient_level(10) = -9999999.9_wp, &
                  mask_scale(3), &
-                 pt_vertical_gradient(10) = 0.0, &
-                 pt_vertical_gradient_level(10) = -9999999.9, &
-                 q_vertical_gradient(10) = 0.0, &
-                 q_vertical_gradient_level(10) = -1.0, &
-                 s_vertical_gradient(10) = 0.0, &
-                 s_vertical_gradient_level(10) = -1.0, &
-                 sa_vertical_gradient(10) = 0.0, &
-                 sa_vertical_gradient_level(10) = -9999999.9, &
-                 skip_time_domask(max_masks) = 9999999.9, threshold(20) = 0.0, &
-                 time_domask(max_masks) = 0.0, &
-                 tsc(10) = (/ 1.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 /), &
-                 u_profile(100) = 9999999.9, uv_heights(100) = 9999999.9, &
-                 v_profile(100) = 9999999.9, &
-                 ug_vertical_gradient(10) = 0.0, &
-                 ug_vertical_gradient_level(10) = -9999999.9, &
-                 vg_vertical_gradient(10) = 0.0, &
-                 vg_vertical_gradient_level(10) = -9999999.9, &
-                 volume_flow(1:2) = 0.0, volume_flow_area(1:2) = 0.0, &
-                 volume_flow_initial(1:2) = 0.0, wall_heatflux(0:4) = 0.0, &
-                 wall_humidityflux(0:4) = 0.0, wall_nrflux(0:4) = 0.0, &
-                 wall_qflux(0:4) = 0.0, wall_qrflux(0:4) = 0.0, &
-                 wall_salinityflux(0:4) = 0.0, wall_scalarflux(0:4) = 0.0, &
-                 subs_vertical_gradient(10) = 0.0, &
-                 subs_vertical_gradient_level(10) = -9999999.9
+                 pt_vertical_gradient(10) = 0.0_wp, &
+                 pt_vertical_gradient_level(10) = -9999999.9_wp, &
+                 q_vertical_gradient(10) = 0.0_wp, &
+                 q_vertical_gradient_level(10) = -1.0_wp, &
+                 s_vertical_gradient(10) = 0.0_wp, &
+                 s_vertical_gradient_level(10) = -1.0_wp, &
+                 sa_vertical_gradient(10) = 0.0_wp, &
+                 sa_vertical_gradient_level(10) = -9999999.9_wp, &
+                 skip_time_domask(max_masks) = 9999999.9_wp, threshold(20) = 0.0_wp, &
+                 time_domask(max_masks) = 0.0_wp, &
+                 tsc(10) = (/ 1.0_wp, 1.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 /), &
+                 u_profile(100) = 9999999.9_wp, uv_heights(100) = 9999999.9_wp, &
+                 v_profile(100) = 9999999.9_wp, &
+                 ug_vertical_gradient(10) = 0.0_wp, &
+                 ug_vertical_gradient_level(10) = -9999999.9_wp, &
+                 vg_vertical_gradient(10) = 0.0_wp, &
+                 vg_vertical_gradient_level(10) = -9999999.9_wp, &
+                 volume_flow(1:2) = 0.0_wp, volume_flow_area(1:2) = 0.0_wp, &
+                 volume_flow_initial(1:2) = 0.0_wp, wall_heatflux(0:4) = 0.0_wp, &
+                 wall_humidityflux(0:4) = 0.0_wp, wall_nrflux(0:4) = 0.0_wp, &
+                 wall_qflux(0:4) = 0.0_wp, wall_qrflux(0:4) = 0.0_wp, &
+                 wall_salinityflux(0:4) = 0.0_wp, wall_scalarflux(0:4) = 0.0_wp, &
+                 subs_vertical_gradient(10) = 0.0_wp, &
+                 subs_vertical_gradient_level(10) = -9999999.9_wp
 
     REAL(wp), DIMENSION(:), ALLOCATABLE ::  dp_smooth_factor
 
     REAL(wp), DIMENSION(max_masks,mask_xyz_dimension) :: &
-            mask_x = -1.0, mask_y = -1.0, mask_z = -1.0
+            mask_x = -1.0_wp, mask_y = -1.0_wp, mask_z = -1.0_wp
     REAL(wp), DIMENSION(max_masks,3) ::                  &
-            mask_x_loop = -1.0, mask_y_loop = -1.0, mask_z_loop = -1.0
+            mask_x_loop = -1.0_wp, mask_y_loop = -1.0_wp, mask_z_loop = -1.0_wp
     
 !
@@ -787,42 +785,42 @@
                 use_seperate_pe_for_dvrp_output = .FALSE.
 
-    REAL(wp)    ::  clip_dvrp_l = 9999999.9, clip_dvrp_n = 9999999.9, &
-                    clip_dvrp_r = 9999999.9, clip_dvrp_s = 9999999.9, &
-                    superelevation = 1.0, superelevation_x = 1.0,     &
-                    superelevation_y = 1.0, vc_alpha = 38.0
-
-    REAL(wp), DIMENSION(2) ::  color_interval = (/ 0.0, 1.0 /), &
-                               dvrpsize_interval = (/ 0.0, 1.0 /)
-
-    REAL(wp), DIMENSION(3) ::  groundplate_color = (/ 0.0, 0.6, 0.0 /), &
-                               topography_color = (/ 0.8, 0.7, 0.6 /)
+    REAL(wp)    ::  clip_dvrp_l = 9999999.9_wp, clip_dvrp_n = 9999999.9_wp, &
+                    clip_dvrp_r = 9999999.9_wp, clip_dvrp_s = 9999999.9_wp, &
+                    superelevation = 1.0_wp, superelevation_x = 1.0_wp,     &
+                    superelevation_y = 1.0_wp, vc_alpha = 38.0_wp
+
+    REAL(wp), DIMENSION(2) ::  color_interval = (/ 0.0_wp, 1.0_wp /), &
+                               dvrpsize_interval = (/ 0.0_wp, 1.0_wp /)
+
+    REAL(wp), DIMENSION(3) ::  groundplate_color = (/ 0.0_wp, 0.6_wp, 0.0_wp /), &
+                               topography_color = (/ 0.8_wp, 0.7_wp, 0.6_wp /)
 
 #if defined( __decalpha )
     REAL(wp), DIMENSION(2,10)  ::  slicer_range_limits_dvrp = RESHAPE( (/      &
-                                   -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, &
-                                   -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, &
-                                   -1.0, 1.0, -1.0, 1.0 /), (/ 2, 10 /) )
+                                   -1.0_wp, 1.0_wp, -1.0_wp, 1.0_wp, -1.0_wp, 1.0_wp, -1.0_wp, 1.0_wp, &
+                                   -1.0_wp, 1.0_wp, -1.0_wp, 1.0_wp, -1.0_wp, 1.0_wp, -1.0_wp, 1.0_wp, &
+                                   -1.0_wp, 1.0_wp, -1.0_wp, 1.0_wp /), (/ 2, 10 /) )
 
     REAL(wp), DIMENSION(3,10)  ::  isosurface_color = RESHAPE( (/                 &
-                                   0.9, 0.9, 0.9,  0.8, 0.1, 0.1,  0.1, 0.1, 0.8, &
-                                   0.1, 0.8, 0.1,  0.6, 0.1, 0.1,  0.1, 0.1, 0.6, &
-                                   0.1, 0.6, 0.1,  0.4, 0.1, 0.1,  0.1, 0.1, 0.4, &
-                                   0.1, 0.4, 0.1 /), (/ 3, 10 /) )
+                                   0.9_wp, 0.9_wp, 0.9_wp,  0.8_wp, 0.1_wp, 0.1_wp,  0.1_wp, 0.1_wp, 0.8_wp, &
+                                   0.1_wp, 0.8_wp, 0.1_wp,  0.6_wp, 0.1_wp, 0.1_wp,  0.1_wp, 0.1_wp, 0.6_wp, &
+                                   0.1_wp, 0.6_wp, 0.1_wp,  0.4_wp, 0.1_wp, 0.1_wp,  0.1_wp, 0.1_wp, 0.4_wp, &
+                                   0.1_wp, 0.4_wp, 0.1_wp /), (/ 3, 10 /) )
 
     REAL(sp), DIMENSION(2,100) ::  interval_values_dvrp, interval_h_dvrp =      &
-                                   RESHAPE( (/ 270.0, 225.0, 225.0, 180.0,      &
-                                                70.0,  25.0,  25.0, -25.0,      &
-                                               ( 0.0, i9 = 1, 192 ) /),         &
+                                   RESHAPE( (/ 270.0_sp, 225.0_sp, 225.0_sp, 180.0_sp,      &
+                                                70.0_sp,  25.0_sp,  25.0_sp, -25.0_sp,      &
+                                               ( 0.0_sp, i9 = 1, 192 ) /),         &
                                             (/ 2, 100 /) ),                     &
-                                   interval_l_dvrp = 0.5, interval_s_dvrp = 1.0,&
-                                   interval_a_dvrp = 0.0,                       &
+                                   interval_l_dvrp = 0.5_sp, interval_s_dvrp = 1.0_sp,&
+                                   interval_a_dvrp = 0.0_sp,                       &
                                    interval_values_dvrp_prt,                    &
                                    interval_h_dvrp_prt = RESHAPE(               &
-                                   (/ 270.0, 225.0, 225.0, 180.0, 70.0, 25.0,   &
-                                      25.0, -25.0, ( 0.0, i9 = 1, 192 ) /),     &
+                                   (/ 270.0_sp, 225.0_sp, 225.0_sp, 180.0_sp, 70.0_sp, 25.0_sp,   &
+                                      25.0_sp, -25.0_sp, ( 0.0_sp, i9 = 1, 192 ) /),     &
                                                    (/ 2, 100 /) ),              &
-                                   interval_l_dvrp_prt = 0.5,                   &
-                                   interval_s_dvrp_prt = 1.0,                   &
-                                   interval_a_dvrp_prt = 0.0
+                                   interval_l_dvrp_prt = 0.5_sp,                   &
+                                   interval_s_dvrp_prt = 1.0_sp,                   &
+                                   interval_a_dvrp_prt = 0.0_sp
 #else
     REAL(wp), DIMENSION(2,10)     ::  slicer_range_limits_dvrp
@@ -832,24 +830,24 @@
     REAL(sp), DIMENSION(2,100) ::  interval_values_dvrp,                       &
                                    interval_values_dvrp_prt, interval_h_dvrp,  &
-                                   interval_h_dvrp_prt, interval_l_dvrp = 0.5, &
-                                   interval_l_dvrp_prt = 0.5, interval_s_dvrp = 1.0, &
-                                   interval_s_dvrp_prt = 1.0, interval_a_dvrp = 0.0, &
-                                   interval_a_dvrp_prt = 0.0
-
-    DATA  slicer_range_limits_dvrp / -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, &
-                                     -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, &
-                                     -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, &
-                                     -1.0, 1.0 /
-
-    DATA  isosurface_color / 0.9, 0.9, 0.9,  0.8, 0.1, 0.1,  0.1, 0.1, 0.8, &
-                             0.1, 0.8, 0.1,  0.6, 0.1, 0.1,  0.1, 0.1, 0.6, &
-                             0.1, 0.6, 0.1,  0.4, 0.1, 0.1,  0.1, 0.1, 0.4, &
-                             0.1, 0.4, 0.1 /
-
-    DATA  interval_h_dvrp / 270.0, 225.0, 225.0, 180.0, 70.0, 25.0, &
-                            25.0, -25.0, 192 * 0.0 /
-
-    DATA  interval_h_dvrp_prt / 270.0, 225.0, 225.0, 180.0, 70.0, 25.0, &
-                                25.0, -25.0, 192 * 0.0 /
+                                   interval_h_dvrp_prt, interval_l_dvrp = 0.5_sp, &
+                                   interval_l_dvrp_prt = 0.5_sp, interval_s_dvrp = 1.0_sp, &
+                                   interval_s_dvrp_prt = 1.0_sp, interval_a_dvrp = 0.0_sp, &
+                                   interval_a_dvrp_prt = 0.0_sp
+
+    DATA  slicer_range_limits_dvrp / -1.0_wp, 1.0_wp, -1.0_wp, 1.0_wp, -1.0_wp, 1.0_wp, &
+                                     -1.0_wp, 1.0_wp, -1.0_wp, 1.0_wp, -1.0_wp, 1.0_wp, &
+                                     -1.0_wp, 1.0_wp, -1.0_wp, 1.0_wp, -1.0_wp, 1.0_wp, &
+                                     -1.0_wp, 1.0_wp /
+
+    DATA  isosurface_color / 0.9_wp, 0.9_wp, 0.9_wp,  0.8_wp, 0.1_wp, 0.1_wp,  0.1_wp, 0.1_wp, 0.8_wp, &
+                             0.1_wp, 0.8_wp, 0.1_wp,  0.6_wp, 0.1_wp, 0.1_wp,  0.1_wp, 0.1_wp, 0.6_wp, &
+                             0.1_wp, 0.6_wp, 0.1_wp,  0.4_wp, 0.1_wp, 0.1_wp,  0.1_wp, 0.1_wp, 0.4_wp, &
+                             0.1_wp, 0.4_wp, 0.1_wp /
+
+    DATA  interval_h_dvrp / 270.0_wp, 225.0_wp, 225.0_wp, 180.0_wp, 70.0_wp, 25.0_wp, &
+                            25.0_wp, -25.0_wp, 192 * 0.0_wp /
+
+    DATA  interval_h_dvrp_prt / 270.0_wp, 225.0_wp, 225.0_wp, 180.0_wp, 70.0_wp, 25.0_wp, &
+                                25.0_wp, -25.0_wp, 192 * 0.0_wp /
 #endif
 
@@ -1024,9 +1022,9 @@
     LOGICAL ::  run_control_header_1d = .FALSE., stop_dt_1d = .FALSE. 
 
-    REAL(wp) ::     damp_level_1d = -1.0, dt_1d = 60.0, dt_max_1d = 300.0, &
-                    dt_pr_1d = 9999999.9, dt_run_control_1d = 60.0, &
-                    end_time_1d = 864000.0, old_dt_1d = 1.0E-10, &
-                    qs1d, simulated_time_1d = 0.0, time_pr_1d = 0.0, &
-                    time_run_control_1d = 0.0, ts1d, us1d, usws1d, &
+    REAL(wp) ::     damp_level_1d = -1.0_wp, dt_1d = 60.0_wp, dt_max_1d = 300.0_wp, &
+                    dt_pr_1d = 9999999.9_wp, dt_run_control_1d = 60.0_wp, &
+                    end_time_1d = 864000.0_wp, old_dt_1d = 1.0E-10_wp, &
+                    qs1d, simulated_time_1d = 0.0_wp, time_pr_1d = 0.0_wp, &
+                    time_run_control_1d = 0.0_wp, ts1d, us1d, usws1d, &
                     vsws1d, z01d, z0h1d
 
@@ -1233,20 +1231,20 @@
     LOGICAL, DIMENSION(:), ALLOCATABLE ::  particle_mask, tail_mask
 
-    REAL(wp)    ::  c_0 = 3.0, dt_min_part = 0.0002, dt_prel = 9999999.9,          &
-                    dt_sort_particles = 0.0, dt_write_particle_data = 9999999.9,   &
-                    dvrp_psize = 9999999.9, end_time_prel = 9999999.9,             &
-                    initial_weighting_factor = 1.0,                                &
-                    maximum_tailpoint_age = 100000.0,                              &
-                    minimum_tailpoint_distance = 0.0,                              &
-                    particle_advection_start = 0.0, sgs_wfu_part = 0.3333333,      &
-                    sgs_wfv_part = 0.3333333, sgs_wfw_part = 0.3333333,            &
-                    time_prel = 0.0, time_sort_particles = 0.0,                    &
-                    time_write_particle_data = 0.0, z0_av_global
+    REAL(wp)    ::  c_0 = 3.0_wp, dt_min_part = 0.0002_wp, dt_prel = 9999999.9_wp,          &
+                    dt_sort_particles = 0.0_wp, dt_write_particle_data = 9999999.9_wp,   &
+                    dvrp_psize = 9999999.9_wp, end_time_prel = 9999999.9_wp,             &
+                    initial_weighting_factor = 1.0_wp,                                &
+                    maximum_tailpoint_age = 100000.0_wp,                              &
+                    minimum_tailpoint_distance = 0.0_wp,                              &
+                    particle_advection_start = 0.0_wp, sgs_wfu_part = 0.3333333_wp,      &
+                    sgs_wfv_part = 0.3333333_wp, sgs_wfw_part = 0.3333333_wp,            &
+                    time_prel = 0.0_wp, time_sort_particles = 0.0_wp,                    &
+                    time_write_particle_data = 0.0_wp, z0_av_global
 
     REAL(wp), DIMENSION(max_number_of_particle_groups) ::  &
-                    density_ratio = 9999999.9, pdx = 9999999.9, pdy = 9999999.9, &
-                    pdz = 9999999.9, psb = 9999999.9, psl = 9999999.9,           &
-                    psn = 9999999.9, psr = 9999999.9, pss = 9999999.9,           &
-                    pst = 9999999.9, radius = 9999999.9
+                    density_ratio = 9999999.9_wp, pdx = 9999999.9_wp, pdy = 9999999.9_wp, &
+                    pdz = 9999999.9_wp, psb = 9999999.9_wp, psl = 9999999.9_wp,           &
+                    psn = 9999999.9_wp, psr = 9999999.9_wp, pss = 9999999.9_wp,           &
+                    pst = 9999999.9_wp, radius = 9999999.9_wp
 
     REAL(wp), DIMENSION(:), ALLOCATABLE     ::  log_z_z0 
@@ -1393,15 +1391,15 @@
 
     REAL(wp) ::  cross_ts_uymax(20) = &
-                             (/ 999.999, 999.999, 999.999, 999.999, 999.999,   &
-                                999.999, 999.999, 999.999, 999.999, 999.999,   &
-                                999.999, 999.999, 999.999, 999.999, 999.999,   &
-                                999.999, 999.999, 999.999, 999.999, 999.999 /),&
-                 cross_ts_uymax_computed(20) = 999.999, &
+                             (/ 999.999_wp, 999.999_wp, 999.999_wp, 999.999_wp, 999.999_wp,   &
+                                999.999_wp, 999.999_wp, 999.999_wp, 999.999_wp, 999.999_wp,   &
+                                999.999_wp, 999.999_wp, 999.999_wp, 999.999_wp, 999.999_wp,   &
+                                999.999_wp, 999.999_wp, 999.999_wp, 999.999_wp, 999.999_wp /),&
+                 cross_ts_uymax_computed(20) = 999.999_wp, &
                  cross_ts_uymin(20) = &
-                             (/ 999.999, 999.999, 999.999,  -5.000, 999.999,   &
-                                999.999,   0.000, 999.999, 999.999, 999.999,   &
-                                999.999, 999.999, 999.999, 999.999, 999.999,   &
-                                999.999, 999.999, 999.999, 999.999, 999.999 /),&
-                 cross_ts_uymin_computed(20) = 999.999
+                             (/ 999.999_wp, 999.999_wp, 999.999_wp,  -5.000_wp, 999.999_wp,   &
+                                999.999_wp,   0.000_wp, 999.999_wp, 999.999_wp, 999.999_wp,   &
+                                999.999_wp, 999.999_wp, 999.999_wp, 999.999_wp, 999.999_wp,   &
+                                999.999_wp, 999.999_wp, 999.999_wp, 999.999_wp, 999.999_wp /),&
+                 cross_ts_uymin_computed(20) = 999.999_wp
 
     SAVE
@@ -1454,5 +1452,5 @@
                      plot_spectra_level(100) = 999999
 
-    REAL(wp)    ::  time_to_start_sp = 0.0
+    REAL(wp)    ::  time_to_start_sp = 0.0_wp
 
     SAVE
Index: /palm/trunk/SOURCE/parin.f90
===================================================================
--- /palm/trunk/SOURCE/parin.f90	(revision 1326)
+++ /palm/trunk/SOURCE/parin.f90	(revision 1327)
@@ -20,5 +20,5 @@
 ! Current revisions:
 ! -----------------
-!
+! -data_output_format, do3d_compress, do3d_comp_prec
 !
 ! Former revisions:
@@ -145,9 +145,9 @@
                conserve_volume_flow, conserve_volume_flow_mode,                &
                coupling_start_time, create_disturbances, cthf, cycle_mg,       &
-               data_output, data_output_format, data_output_masks,             &
+               data_output, data_output_masks,                                 &
                data_output_pr, data_output_2d_on_each_pe,                      &
                disturbance_amplitude, disturbance_energy_limit,                &
                disturbance_level_b, disturbance_level_t, dissipation_1d,       &
-               do2d_at_begin, do3d_at_begin, do3d_compress, do3d_comp_prec,    &
+               do2d_at_begin, do3d_at_begin,                                   &
                dp_external, dp_level_b, dp_smooth, dpdxy, drag_coefficient,    &
                drizzle, dt, dz, dt_averaging_input, dt_averaging_input_pr,     &
@@ -292,9 +292,9 @@
              cpu_log_barrierwait, create_disturbances, &
              cross_profiles, cross_ts_uymax, cross_ts_uymin, &
-             data_output, data_output_format, data_output_masks, &
+             data_output, data_output_masks,                                   &
              data_output_pr, data_output_2d_on_each_pe, disturbance_amplitude, &
              disturbance_energy_limit, disturbance_level_b, &
-             disturbance_level_t, do2d_at_begin, do3d_at_begin, do3d_compress, &
-             do3d_comp_prec, dt, dt_averaging_input, dt_averaging_input_pr, &
+             disturbance_level_t, do2d_at_begin, do3d_at_begin,                &
+             dt, dt_averaging_input, dt_averaging_input_pr, &
              dt_coupling, dt_data_output, dt_data_output_av, dt_disturb, &
              dt_domask, dt_dopr, dt_dopr_listing, dt_dots, dt_do2d_xy, &
Index: /palm/trunk/SOURCE/write_compressed.f90
===================================================================
--- /palm/trunk/SOURCE/write_compressed.f90	(revision 1326)
+++ /palm/trunk/SOURCE/write_compressed.f90	(revision 1327)
@@ -25,5 +25,5 @@
 ! Former revisions:
 ! -----------------
-! $Id$
+! $Id: write_compressed.f90 1321 2014-03-20 09:40:40Z raasch $
 !
 ! 1320 2014-03-20 08:40:49Z raasch
