Changeset 1484 for trunk

Timestamp:

06/17/19 11:01:17 (5 years ago)

Author:

jgipsl

Message:

Change submission at default host for case when launching only 1proc. Now done as at obelix in commit [1480].

File:

• trunk/libIGCM/libIGCM_sys/libIGCM_sys_default.ksh (modified) (3 diffs)

trunk/libIGCM/libIGCM_sys/libIGCM_sys_default.ksh

@@ -116 +116 @@
 #====================================================
 #- IN
-typeset -r R_IN=${R_IN:=/home/${LOGIN}/IGCM}
+typeset -r R_IN=${R_IN:=/home_local/${LOGIN}/IGCM}
 
 #====================================================
 #- RUN_DIR_PATH : Temporary working directory (=> TMP)
-typeset -r RUN_DIR_PATH=${RUN_DIR_PATH:=/home/${LOGIN}/RUN_DIR/tmp$$}
+typeset -r RUN_DIR_PATH=${RUN_DIR_PATH:=/home_local/${LOGIN}/RUN_DIR/tmp$$}
 
 #====================================================
@@ -167 +167 @@
     #====================================================
     #- ARCHIVE (dedicated to large files)
-    ARCHIVE=${ARCHIVE:=/home/${LOGIN}}
+    ARCHIVE=${ARCHIVE:=/home_local/${LOGIN}}
   fi
 
@@ -1017 +1017 @@
           echo "export OMP_NUM_THREADS=${comp_proc_omp_loc}" >> script_${ExeNameOut}.ksh
         fi
-        if  ( ${OK_PARA_MPI} ) ; then
+        
+        if [ ${mpiTasks} -eq 1 ] && [ ${openMPthreads} -eq 1 ] ; then
+          # Case with only one proc
+          # mpirun should not be used at obelix for only one proc
+          # Output text per process
+          echo "./${ExeNameOut} > out_${ExeNameOut}.out 2>out_${ExeNameOut}.err" >> script_${ExeNameOut}.ksh
+          IGCM_sys_Chmod u+x script_${ExeNameOut}.ksh
+          EXECUTION="time ./script_${ExeNameOut}.ksh"
+        elif  ( ${OK_PARA_MPI} ) ; then
           # Default : mpirun used if nb_proc gt 1
-          # pour sortie out/err par process
+          # Output text per process
           echo "./${ExeNameOut} > out_${ExeNameOut}.out.\${OMPI_COMM_WORLD_RANK} 2>out_${ExeNameOut}.err.\${OMPI_COMM_WORLD_RANK}"  >> script_${ExeNameOut}.ksh
-          #echo "./${ExeNameOut}" >> script_${ExeNameOut}.ksh
           IGCM_sys_Chmod u+x script_${ExeNameOut}.ksh
           EXECUTION="${HOST_MPIRUN_COMMAND} ./script_${ExeNameOut}.ksh"
-        else
-          # Default : mpirun is NOT used if nb_proc eq 1
-          # pour sortie out/err par process
+        elif [ ${executionType} -eq 6 ] ; then
+          # Sequentiel case: this is the same as the first case.
           echo "./${ExeNameOut} > out_${ExeNameOut}.out 2>out_${ExeNameOut}.err" >> script_${ExeNameOut}.ksh
-          #echo "./${ExeNameOut}" >> script_${ExeNameOut}.ksh
           IGCM_sys_Chmod u+x script_${ExeNameOut}.ksh
           EXECUTION="time ./script_${ExeNameOut}.ksh"
+        else
+          # Strange case. 
+          IGCM_debug_Exit "ERROR with OK_PARA_MPI"
+          IGCM_debug_Print 2 "sys Obelix : OK_PARA_MPI=False and mpiTask/openMPthreds different from 1"
+          IGCM_debug_Verif_Exit
         fi
+
 
         IGCM_debug_Print 1 "sys $( hostname ) : script_${ExeNameOut}.ksh contains"