Index: BOL/LMDZ_Setup/lmdz_env.sh
===================================================================
--- BOL/LMDZ_Setup/lmdz_env.sh	(revision 5421)
+++ BOL/LMDZ_Setup/lmdz_env.sh	(revision 5422)
@@ -12,5 +12,5 @@
 
 function get_hostname {
-  if grep -q "Adastra" /etc/motd; then
+  if grep -q "Adastra" /etc/motd 2>/dev/null ; then
     hostname="adastra"
   elif which idrquota &> /dev/null; then
@@ -23,5 +23,7 @@
 function set_env {  # Platform-specific
   case ${hostname:0:5} in
-    jean-)
+#-------------------------------------------------------------------------
+    jean-) # Jean-zay, Idris-CNRS super computer
+#-------------------------------------------------------------------------
       module purge
       compilo=19.0.4 # available 2013.0, 2017.2
@@ -51,7 +53,12 @@
       MPICMD="srun -n"
       RUNBASHCMD="srun -A $account@cpu --label -n 1 -c"
-      SUBMITCMD="sbatch -A $account@cpu"
+      #SUBMITCMD="sbatch -A $account@cpu"
+      submitcmd() {
+         sbatch -A $account@cpu $1
+      }
       ;;
-    spiri)
+#-------------------------------------------------------------------------
+    spiri) # Spirit : IPSL cluster
+#-------------------------------------------------------------------------
       module purge
       module load subversion/1.13.0
@@ -70,7 +77,12 @@
       MPICMD="mpirun -np"  # on spirit, we can't run MPI using srun from within sbatch
       RUNBASHCMD="bash"
-      SUBMITCMD="sbatch"
+      #SUBMITCMD="sbatch"
+      submitcmd() {
+         sbatch $1
+      }
       ;;
-    adast)
+#-------------------------------------------------------------------------
+    adast) # Adastra, Cines computing center
+#-------------------------------------------------------------------------
       module purge
       module load PrgEnv-gnu  # we need to load the env because lmdz links some shared libraries
@@ -108,7 +120,12 @@
 #      RUNBASHCMD="srun --label --account=$account --constraint=GENOA --ntasks-per-node=1 -n 1 --time=00:15:00 -c"
       RUNBASHCMD="bash"  # On Adastra the docs says we can use login nodes for compilation
-      SUBMITCMD="env $(env | grep -E "SLURM_|SBATCH_|SRUN_" | cut -d= -f1 | awk '{print "-u " $0}' | tr '\n' ' ' ) sbatch --constraint=GENOA --account=$account"  # we need to remove the existing SLURM variables otherwise they may be unexpectedly inherited by the submitted script
+      #SUBMITCMD="env $(env | grep -E "SLURM_|SBATCH_|SRUN_" | cut -d= -f1 | awk '{print "-u " $0}' | tr '\n' ' ' ) sbatch --constraint=GENOA --account=$account"  # we need to remove the existing SLURM variables otherwise they may be unexpectedly inherited by the submitted script
+      submitcmd() {
+        env $(env | grep -E "SLURM_|SBATCH_|SRUN_" | cut -d= -f1 | awk '{print "-u " $0}' | tr '\n' ' ' ) sbatch --constraint=GENOA --account=$account
+      }  # we need to remove the existing SLURM variables otherwise they may be unexpectedly inherited by the submitted script
       ;;
-    *) echo "WARNING: RUNNING THIS SCRIPT ON A LOCAL COMPUTER IS DISCOURAGED (lackluster cpus and memory)"
+#-------------------------------------------------------------------------
+    *)  # Local machine.
+#-------------------------------------------------------------------------
       ARCH="local-gfortran-parallel"  # The arch file to use
       SIMRUNBASEDIR="$root_dir/SCRATCH/"  # Where the simulations will be executed ($SIMRUNBASEDIR/LMDZ_Setup/...)
@@ -121,5 +138,8 @@
       MPICMD="mpirun -np" # command to run an mpi executable, as $MPICMD <nprocs> <script>
       RUNBASHCMD="bash" # command to run a bash job, as $runbashcmd (nthreads) <script> [nthreads only supplied if =/="bash"]
-      SUBMITCMD="."  # command to sumbit a job, as $submitcmd <script>
+      #SUBMITCMD="."  # command to sumbit a job, as $submitcmd <script>
+      submitcmd() {
+         nohup bash $1 > out.$$ 2>err.$$ &
+      }
       ;;
   esac
Index: BOL/LMDZ_Setup/reb.sh
===================================================================
--- BOL/LMDZ_Setup/reb.sh	(revision 5421)
+++ BOL/LMDZ_Setup/reb.sh	(revision 5422)
@@ -54,5 +54,5 @@
 ulimit -s unlimited
 if [[ -f ${type}_0000.nc ]]; then
-  $rebuild -o ${type}.$ym.nc ${type}_[0-9][0-9][0-9][0-9].nc
+  $RUNBASHCMD $rebuild -o ${type}.$ym.nc ${type}_[0-9][0-9][0-9][0-9].nc
 else
   echo "${type}_0000.nc absent"
@@ -66,5 +66,7 @@
 eod
 
-  echo "Submitting the rebuild job $job using <$SUBMITCMD \"$job\">"
-  $SUBMITCMD "$job"
+  #echo "Submitting the rebuild job $job using <$SUBMITCMD \"$job\">"
+  #$SUBMITCMD "$job"
+  echo "Submitting the rebuild job $job using <submitcmd \"$job\">"
+  submitcmd "$job"
 done
Index: BOL/LMDZ_Setup/script_SIMU
===================================================================
--- BOL/LMDZ_Setup/script_SIMU	(revision 5421)
+++ BOL/LMDZ_Setup/script_SIMU	(revision 5422)
@@ -172,4 +172,5 @@
    else
       nday=360 ; ndayh=30
+      # nday=3 ; ndayh=1 # Pratique pour des tests rapides
    fi
 fi
@@ -403,5 +404,5 @@
       if [ $num -le 250 ] ; then
          sed -e 's/^simul=.*.$/simul='$simul_new'/' -e 's/^\# @ job_nam.*.=.*.$/\# @ job_name = '$simul_new'/' tmp_$simul >| tmp_$simul_new
-         $SUBMITCMD tmp_$simul_new
+         submitcmd tmp_$simul_new
       fi
    fi
@@ -417,3 +418,4 @@
 
 cd $SCRIPTDIR
-$SUBMITCMD tmp_$simul
+submitcmd tmp_$simul
+#$SUBMITCMD tmp_$simul
Index: BOL/LMDZ_Setup/setup.sh
===================================================================
--- BOL/LMDZ_Setup/setup.sh	(revision 5421)
+++ BOL/LMDZ_Setup/setup.sh	(revision 5422)
@@ -17,4 +17,5 @@
   # Radiative code: "oldrad" / "rrtm" / "ecrad"
   rad="rrtm"
+  rad="oldrad"
 
   #   !!! STRONG recommendation : experiments with DIFFERENT Orchidee or aerosol options should be performed in DIFFERENT LMDZ_Setup folders
@@ -26,4 +27,5 @@
   #   in order to re-run the initialisation job, which downloads the aerosol files and interpolates them)
   aerosols="clim"
+  aerosols="n"
 
   # SURFACE/VEGETATION SCHEME
@@ -38,4 +40,5 @@
   # netcdf: 0 (use existing library) / 1 (recompile netcdf, slow)
   netcdf=0
+  netcdf=1
 
   # --->>> ALSO PAY ATTENTION TO OUTPUT files, frequency, level -------------
@@ -692,6 +695,8 @@
       cat << ...eod >> tmp
       echo "Submitting job tmp_$SIM"
-      echo "\$SUBMITCMD tmp_$SIM"
-      \$SUBMITCMD tmp_$SIM
+      #echo "\$SUBMITCMD tmp_$SIM"
+      #\$SUBMITCMD tmp_$SIM
+      echo submitcmd tmp_$SIM"
+      submitcmd tmp_$SIM
 ...eod
     fi
@@ -701,7 +706,9 @@
     enable_platform tmp
     echo "###############################################################################"
-    echo "Submitting initialisation job <$SUBMITCMD tmp> from $(pwd)"
+    #echo "Submitting initialisation job <$SUBMITCMD tmp> from $(pwd)"
+    echo "Submitting initialisation job <submitcmd tmp> from $(pwd)"
     chmod +x tmp
-    $SUBMITCMD tmp
+    #$SUBMITCMD tmp
+    submitcmd tmp
     echo "###############################################################################"
 
@@ -710,6 +717,8 @@
      echo "###############################################################################"
      echo "Submitting job tmp_$SIM"
-     echo "$SUBMITCMD tmp_$SIM"
-     $SUBMITCMD "tmp_$SIM"
+     #echo "$SUBMITCMD tmp_$SIM"
+     #$SUBMITCMD "tmp_$SIM"
+     echo "submitcmd tmp_$SIM"
+     submitcmd "tmp_$SIM"
      echo '###############################################################################'
   fi