[cig-commits] [commit] master: SOLVER/submit.csh: Some improvements (d9174f4)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/axisem

On branch  : master
Link       : https://github.com/geodynamics/axisem/compare/201b2a8c3949bb5acd44c5b1f0eeaba0012815d3...d9174f4e9c01eb069c0079f9a67d155de1997361

>---------------------------------------------------------------

commit d9174f4e9c01eb069c0079f9a67d155de1997361
Author: Simon Stähler <staehler at geophysik.uni-muenchen.de>
Date:   Wed Nov 12 13:39:30 2014 +0100

    SOLVER/submit.csh: Some improvements
    
     - jobname is produced from name of the run + PX,MZZ etc.
     - default walltime is reduced to 10 minutes
     - field for notification adress introduced


>---------------------------------------------------------------

d9174f4e9c01eb069c0079f9a67d155de1997361
 SOLVER/submit.csh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/SOLVER/submit.csh b/SOLVER/submit.csh
index aa567a4..64474c9 100755
--- a/SOLVER/submit.csh
+++ b/SOLVER/submit.csh
@@ -332,6 +332,9 @@ foreach isim (${srcapp})
 
     if ( $newqueue == 'true' ) then 
         
+        set jobname = `echo $1 |sed 's/\//_/g'`"_"`echo $isim |sed 's/\//_/g'`
+
+
         ########## LSF SCHEDULER ######################
         if ( $queue == 'lsf' ) then 
             # for Brutus: http://brutuswiki.ethz.ch/brutus/OpenMPI#Issues_when_Using_Many_Cores
@@ -388,18 +391,21 @@ foreach isim (${srcapp})
             echo "#@ class = general "                                   >> job.cmd
             echo "#@ total_tasks=$nodnum "                               >> job.cmd
             echo "#@ node = $nnodes "                                    >> job.cmd
+            echo "#@ island_count = 1"                                   >> job.cmd
             echo "#@ network.MPI = sn_all,not_shared,us "                >> job.cmd
-            echo "#@ wall_clock_limit = 1:00:00"                         >> job.cmd
-            echo "#@ job_name = $outputname"                             >> job.cmd
+            echo "#@ wall_clock_limit =00:10:00"                         >> job.cmd
+            echo "#@ job_name = $jobname"                                >> job.cmd
             echo "#@ initialdir = $current_dir"                          >> job.cmd
             echo "#@ notification=always"                                >> job.cmd
+            echo "#@ notify_user = MAILADRESS"                           >> job.cmd
             echo "#@ energy_policy_tag = Axisem_Solver  "                >> job.cmd
             echo "#@ minimize_time_to_solution = yes    "                >> job.cmd
             echo "#@ queue "                                             >> job.cmd
             echo ". /etc/profile"                                        >> job.cmd
             echo ". /etc/profile.d/modules.sh"                           >> job.cmd
-            echo "module load netcdf/mpi"                                >> job.cmd
-            echo "module load intel"                                     >> job.cmd
+            echo "module load mpi.ibm"                                   >> job.cmd
+            echo "module load netcdf/mpi/4.3"                            >> job.cmd
+            echo "module load fortran/intel"                             >> job.cmd
             echo "poe ./axisem > $outputname "                           >> job.cmd
 
             llsubmit job.cmd