Index: palm/trunk/SCRIPTS/.mrun.config.default
===================================================================
--- palm/trunk/SCRIPTS/.mrun.config.default	(revision 1391)
+++ palm/trunk/SCRIPTS/.mrun.config.default	(revision 1402)
@@ -33,10 +33,10 @@
 %compiler_name     mpif90                                        <hi> parallel
 %compiler_name_ser ifort                                         <hi> parallel
-%cpp_options       -cpp:-D__mpi2:-DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf   <hi> parallel
+%cpp_options       -cpp:-D__mpi2:-DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf:-D__intel_compiler   <hi> parallel
 %netcdf_inc        -I:<replace by netcdf include path>           <hi> parallel
 %netcdf_lib        -L<replace by netcdf library path>:-lnetcdf   <hi> parallel
 %mopts             -j:4                                          <hi> parallel
-%fopts             -xS:-r8:-nbs:-convert:little_endian:-I:<replace by mpi include path>   <hi> parallel
-%lopts             -xS:-r8:-nbs:-Vaxlib:-L:<replace by mpi library path>                  <hi> parallel
+%fopts             -xS:-nbs:-convert:little_endian:-I:<replace by mpi include path>   <hi> parallel
+%lopts             -xS:-nbs:-Vaxlib:-L:<replace by mpi library path>                  <hi> parallel
 # if you want to use your own hostfile, uncomment next line
 #%hostfile          $base_directory/.hostfile                    <hi> parallel
@@ -52,10 +52,10 @@
 %compiler_name     mpif90                                        <hi> parallel trace
 %compiler_name_ser ifort                                         <hi> parallel trace
-%cpp_options       -cpp:-DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf   <hi> parallel trace
+%cpp_options       -cpp:-DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf:-D__intel_compiler   <hi> parallel trace
 %netcdf_inc        -I:<replace by netcdf include path>           <hi> parallel trace
 %netcdf_lib        -L<replace by netcdf library path>:-lnetcdf   <hi> parallel trace
 %mopts             -j:4                                          <hi> 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  <hi> 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:-Vaxlib  <hi> 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  <hi> 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:-Vaxlib  <hi> parallel trace
 # if you want to use your own hostfile, uncomment next line
 #%hostfile          $base_directory/.hostfile                    <hi> parallel trace
Index: palm/trunk/SCRIPTS/.mrun.config.imuk
===================================================================
--- palm/trunk/SCRIPTS/.mrun.config.imuk	(revision 1391)
+++ palm/trunk/SCRIPTS/.mrun.config.imuk	(revision 1402)
@@ -23,5 +23,5 @@
 %compiler_name     ifort                                                       lcmuk
 %compiler_name_ser ifort                                                       lcmuk
-%cpp_options       -cpp:-D__netcdf                                             lcmuk
+%cpp_options       -cpp:-D__netcdf:-D__intel_compiler                          lcmuk
 %netcdf_inc        -I:/muksoft/packages/netcdf/3.6.3/include                   lcmuk
 %netcdf_lib        -L/muksoft/packages/netcdf/3.6.3/lib:-lnetcdf               lcmuk
@@ -35,5 +35,5 @@
 %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
+%cpp_options       -cpp:-DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf:-D__intel_compiler  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
@@ -48,5 +48,5 @@
 %compiler_name     mpif90                                                      lcmuk parallel trace
 %compiler_name_ser ifort                                                       lcmuk parallel trace
-%cpp_options       -DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf   lcmuk parallel trace
+%cpp_options       -DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf:-D__intel_compiler   lcmuk parallel trace
 %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
Index: palm/trunk/SCRIPTS/.mrun.config.kiaps
===================================================================
--- palm/trunk/SCRIPTS/.mrun.config.kiaps	(revision 1391)
+++ palm/trunk/SCRIPTS/.mrun.config.kiaps	(revision 1402)
@@ -35,6 +35,6 @@
 %netcdf_lib          -L/opt/kiaps/apps/netcdf/4.1.3/pgi/11.10/lib:-lnetcdf:-lnetcdff  lckiaps parallel
 %mopts               -j:4                              lckiaps parallel
-%fopts               -fastsse:-r8                      lckiaps parallel
-%lopts               -fastsse:-r8                      lckiaps parallel
+%fopts               -fastsse                          lckiaps parallel
+%lopts               -fastsse                          lckiaps parallel
 %remote_username     <replace by your kiaps username>  lckiaps parallel
 %memory              1500                              lckiaps parallel
Index: palm/trunk/SCRIPTS/mrun
===================================================================
--- palm/trunk/SCRIPTS/mrun	(revision 1391)
+++ palm/trunk/SCRIPTS/mrun	(revision 1402)
@@ -22,5 +22,5 @@
 # Current revisions:
 # ------------------
-# 
+# batch_job added to envpar-NAMELIST
 # 
 # Former revisions:
@@ -1758,6 +1758,8 @@
  if [[ "$ENVIRONMENT" = BATCH ]]
  then
+    batch_job=.TRUE.
     jobmo=BATCH
  else
+    batch_job=.FALSE.
     jobmo=INTERACTIVE
  fi
@@ -3180,5 +3182,6 @@
           maximum_cpu_time_allowed = ${cpumax}.,
           revision = '$global_revision',
-          local_dvrserver_running = $local_dvrserver_running /
+          local_dvrserver_running = $local_dvrserver_running,
+          batch_job = $batch_job /
 
 %%END%%
