Index: palm/trunk/SCRIPTS/.palm.config.aurora
===================================================================
--- palm/trunk/SCRIPTS/.palm.config.aurora	(revision 4759)
+++ palm/trunk/SCRIPTS/.palm.config.aurora	(revision 4814)
@@ -3,13 +3,18 @@
 #name of variable  value of variable (~ must not be used)
 #----------------------------------------------------------------------------
-%base_data         ~/palm/current_version/JOBS
-%base_directory    $HOME/palm/current_version
-%fast_io_catalog   /scratch/<replace by LUIS username>
-%source_path       $HOME/palm/current_version/trunk/SOURCE
-%user_source_path  $base_directory/JOBS/$run_identifier/USER_CODE
-%local_jobcatalog  $HOME/job_queue
-#
+%base_directory      $HOME/palm/current_version
+%base_data           ~/palm/current_version/JOBS
+%source_path         $HOME/palm/current_version/trunk/SOURCE
+%user_source_path    $base_data/$run_identifier/USER_CODE
+%fast_io_catalog     /scratch/<replace by LUIS username>
+%restart_data_path   /scratch/<replace by LUIS username>
+%output_data_path    $base_data
+%local_jobcatalog    $base_data/$run_identifier/LOG_FILES
+
 %local_ip            130.75.7.130
 %local_username      <replace by LUIS username>
+%defaultqueue        all
+%submit_command      /usr/bin/qsub
+
 %compiler_name       mpinfort
 %compiler_name_ser   mpinfort
@@ -18,37 +23,13 @@
 %compiler_options    -O3 -traceback -finline-functions -g -report-all -Werror -I /home/nhbkklau/opt/NetCDF_parallel_nec/include -I /home/nhbkklau/opt/fftw3_nec/include
 %linker_options      -L/home/nhbkklau/opt/NetCDF_parallel_nec/lib -lnetcdff -lnetcdf -Wl,-rpath=/home/nhbkklau/opt/NetCDF_parallel_nec/lib -L/home/nhbkklau/opt/hdf5_parallel_nec/lib -lhdf5 -lhdf5_hl -Wl,-rpath=/home/nhbkklau/opt/hdf5_parallel_nec/lib -L/home/nhbkklau/opt/fftw3_nec/lib -lfftw3 -lmpi
-#%hostfile            auto
-%defaultqueue        all
-%submit_command      /usr/bin/qsub
+%execute_command     mpirun -v -ve 0-3  -np {{mpi_tasks}}  ./palm
 %memory              2000
 %login_init_cmd      source /opt/nec/ve/mpi/2.2.0/bin/necmpivars.sh
-%execute_command     mpirun -v -ve 0-3  -np {{mpi_tasks}}  ./palm
-#
-#----------------------------------------------------------------------------
-# INPUT-commands, executed before running PALM - lines must start with "IC:" 
-#----------------------------------------------------------------------------
-#IC:ulimit -s unlimited
-#
-#----------------------------------------------------------------------------
-# ERROR-commands - executed when program terminates abnormally
-#----------------------------------------------------------------------------
-EC:[[ \$locat = execution ]]  &&  cat  RUN_CONTROL
-EC:[[ \$locat = execution ]]  &&  cat  PARTICLE_INFOS/*
-#
-#----------------------------------------------------------------------------
-# 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
-#
+
 # BATCH-directives to be used for batch jobs.
-# ATTENTION: The batch following batch directives still need to be adjusted for the
+# ATTENTION: The following batch directives still need to be adjusted for the
 #            NEC Aurora system!!!!!!!!!!!!!!
 BD:#!/bin/bash
+#BD:#PBS -A {{project_account}}
 BD:#PBS -N {{run_id}}
 BD:#PBS -l walltime={{cpu_hours}}:{{cpu_minutes}}:{{cpu_seconds}}
@@ -60,2 +41,23 @@
 BD:#PBS -j oe
 BD:#PBS -q {{queue}}
+
+#----------------------------------------------------------------------------
+# INPUT-commands, executed before running PALM - lines must start with "IC:"
+#----------------------------------------------------------------------------
+#IC:ulimit -s unlimited
+
+#----------------------------------------------------------------------------
+# ERROR-commands - executed when program terminates abnormally
+#----------------------------------------------------------------------------
+EC:[[ \$locat = execution ]]  &&  cat  RUN_CONTROL
+EC:[[ \$locat = execution ]]  &&  cat  PARTICLE_INFOS/*
+
+#----------------------------------------------------------------------------
+# 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
