Index: /trunk/MESOSCALE/LMD_MM_MARS/SIMU/MESORUN/launch
===================================================================
--- /trunk/MESOSCALE/LMD_MM_MARS/SIMU/MESORUN/launch	(revision 2876)
+++ /trunk/MESOSCALE/LMD_MM_MARS/SIMU/MESORUN/launch	(revision 2877)
@@ -1,49 +1,41 @@
-#! /bin/bash
+#!/bin/bash
+#SBATCH --partition=zen4
+#SBATCH --ntasks=24
+#SBATCH --time=02:00:00
+
+# job information
+cat << EOF
+------------------------------------------------------------------
+Job submit on $SLURM_SUBMIT_HOST by $SLURM_JOB_USER
+JobID=$SLURM_JOBID Running_Node=$SLURM_NODELIST
+Node=$SLURM_JOB_NUM_NODES Task=$SLURM_NTASKS
+------------------------------------------------------------------
+EOF
+# Begin of section with executable commands
+
 
 ########################################################
-#PBS -S  /bin/bash
-#PBS -j  oe
+## standard run 121x121x61 nodes=1:ppn=4,mem=4gb,vmem=6gb
 ########################################################
-### available queues: 
-### short std h12 day days3 week weeks2 infini
-### 2h    6h  12h 24h 72h   168h 340h   840h
+### large-domain run 321x321x61 (OK but slower) nodes=1:ppn=16,mem=16gb,vmem=24gb
 ########################################################
-#PBS -q  week
-#PBS -N  run
+### large-domain run 321x321x61 nodes=1:ppn=32,mem=32gb,vmem=48gb
 ########################################################
-### single processor (e.g. testing)
-##PBS -l  nodes=1:ppn=1
-########################################################
-## standard run 121x121x61
-#PBS -l  nodes=1:ppn=4,mem=4gb,vmem=6gb
-########################################################
-### large-domain run 321x321x61 (OK but slower)
-##PBS -l  nodes=1:ppn=16,mem=16gb,vmem=24gb
-########################################################
-### large-domain run 321x321x61
-##PBS -l  nodes=1:ppn=32,mem=32gb,vmem=48gb
-########################################################
-### need for large memory
-##PBS -l  mem=120gb
-##PBS -l  vmem=120gb
-########################################################
-#PBS -v  step=1
-## NB: "qsub -v step=XX launch" overrides value above
-########################################################
+
+
+
+step=1
+fold=$PWD
 
 #### PREAMBLE
 ulimit -s unlimited
 
-# This finds out the number of nodes we have
-NP=$(wc -l $PBS_NODEFILE | awk '{print $1}')
-echo "Total CPU count = $NP"
-
 #### STEP 1
 if [[ ${step} -le 1 ]] ; then
-  cd $PBS_O_WORKDIR/gcm
+  cd $fold/gcm
   #
   ./get_startday_from_namelist.sh | ./launch_gcm
   #
-  if [[ $NP -gt 24 ]] ; then
+  if [[ $SLURM_NTASKS -gt 24 ]] ; then
     echo "--- Total CPU count is above 24"
     echo "--- For the standard GCM resolution, this is too much"
@@ -54,16 +46,18 @@
   fi
   #
-  cd $PBS_O_WORKDIR/prep
+  cd $fold/prep
   echo 1 | create_readmeteo.exe
   readmeteo.exe < readmeteo.def
 fi
 
+stop
+
 ##### STEP 2
 if [[ ${step} -le 2 ]] ; then
-  cd $PBS_O_WORKDIR/geogrid
+  cd $fold/geogrid
   \rm geo_em.*
   geogrid.exe
   #
-  cd $PBS_O_WORKDIR/metgrid
+  cd $fold/metgrid
   \rm met_em.*
   metgrid.exe
@@ -72,5 +66,5 @@
 ##### STEP 3
 if [[ ${step} -le 3 ]] ; then
-  cd $PBS_O_WORKDIR/
+  cd $fold/
   \rm wrfi* wrfb*
   real.exe
@@ -79,16 +73,16 @@
 ##### STEP 4
 if [[ ${step} -le 4 ]] ; then
-  rm -rf $PBS_O_WORKDIR/$PBS_JOBNAME
-  mkdir $PBS_O_WORKDIR/$PBS_JOBNAME
-  mv rsl.error.0000 $PBS_O_WORKDIR/$PBS_JOBNAME/real_rsl.error.0000
-  mv rsl.out.0000 $PBS_O_WORKDIR/$PBS_JOBNAME/real_rsl.out.0000
-  cp -rfL  $PBS_O_WORKDIR/*.def           $PBS_O_WORKDIR/$PBS_JOBNAME/
-  cp -rfL  $PBS_O_WORKDIR/wrf.exe*        $PBS_O_WORKDIR/$PBS_JOBNAME/
-  cp -rfL  $PBS_O_WORKDIR/namelist.input  $PBS_O_WORKDIR/$PBS_JOBNAME/
-  cp -rfL  $PBS_O_WORKDIR/namelist.wps    $PBS_O_WORKDIR/$PBS_JOBNAME/
-  cp -rfL  $PBS_O_WORKDIR/wrfi*           $PBS_O_WORKDIR/$PBS_JOBNAME/
-  cp -rfL  $PBS_O_WORKDIR/wrfb*           $PBS_O_WORKDIR/$PBS_JOBNAME/
-  cd $PBS_O_WORKDIR/$PBS_JOBNAME/
-  ln -sf $PBS_O_WORKDIR/data_physics ./
+  rm -rf $fold/run_$SLURM_JOBID
+  mkdir $fold/run_$SLURM_JOBID
+  mv rsl.error.0000 $fold/run_$SLURM_JOBID/real_rsl.error.0000
+  mv rsl.out.0000 $fold/run_$SLURM_JOBID/real_rsl.out.0000
+  cp -rfL  $fold/*.def           $fold/run_$SLURM_JOBID/
+  cp -rfL  $fold/wrf.exe*        $fold/run_$SLURM_JOBID/
+  cp -rfL  $fold/namelist.input  $fold/run_$SLURM_JOBID/
+  cp -rfL  $fold/namelist.wps    $fold/run_$SLURM_JOBID/
+  cp -rfL  $fold/wrfi*           $fold/run_$SLURM_JOBID/
+  cp -rfL  $fold/wrfb*           $fold/run_$SLURM_JOBID/
+  cd $fold/run_$SLURM_JOBID/
+  ln -sf $fold/data_physics ./
   $WHERE_MPI/mpirun wrf.exe
   #gdb wrf.exe -ex=run