Changeset 557

Timestamp:

02/22/12 10:43:38 (12 years ago)

Author:

mafoipsl

Message:

on vargas : simplification of executable name detection.

File:

• branches/libIGCM_MPI_OpenMP/libIGCM_sys/libIGCM_sys_vargas.ksh (modified) (5 diffs)

branches/libIGCM_MPI_OpenMP/libIGCM_sys/libIGCM_sys_vargas.ksh

@@ -1142 +1142 @@
     fi
 
-    if [ -f run_file ] ; then
-        IGCM_sys_Rm -f run_file
-    fi
-    touch run_file
-
     if ( ${OK_PARA_MPMD} ) ; then
+
+        if [ -f run_file ] ; then
+            IGCM_sys_Rm -f run_file
+        fi
+        touch run_file
 
         if ( ${OK_PARA_OMP} ) ; then
@@ -1195 +1195 @@
         eval ExeNameOut=\${config_Executable_${comp}[1]}
             
-        # Only if we really have an executable for the component :
+        # for CPL component only
         if [ "X${comp}" = "XCPL" ] ; then
 
@@ -1230 +1230 @@
             
         # Only if we really have an executable for the component and not the coupler ie oasis:
-        if ( [ "X${ExeNameOut}" != X ] && [ "X${comp}" != "XCPL" ] ) ; then
+        if ( [ "X${ExeNameOut}" != X\"\" ] && [ "X${comp}" != "XCPL" ] ) ; then
 
             eval comp_proc_mpi_loc=\${${comp}_PROC_MPI}
@@ -1259 +1259 @@
     EXECUTION="${HOST_MPIRUN_COMMAND} -pgmmodel mpmd -cmdfile ./run_file"
 
+    IGCM_sys_Chmod u+x run_file
+    if ( $DEBUG_sys ) ; then
+      echo "run_file contains : "
+      cat run_file
+    fi
+
 else # Only one executable. launch it.
 
@@ -1265 +1271 @@
         eval ExeNameIn=\${config_Executable_${comp}[0]}
         eval ExeNameOut=\${config_Executable_${comp}[1]}
-        # to suppress "" coming from config.card
-        eval ExeNameToLaunch=${ExeNameOut}
-
-        [ "X${ExeNameToLaunch}" != X ] &&  EXECUTION="time ./${ExeNameToLaunch}"
+
+        [ "X${ExeNameOut}" != X\"\" ] &&  EXECUTION="time ./${ExeNameOut}"
 
     done
 
 fi
-
-    IGCM_sys_Chmod u+x run_file
-    if ( $DEBUG_sys ) ; then
-      echo "run_file contains : "
-      cat run_file
-    fi
 
     IGCM_debug_Print 1 "sys vargas : execution command is "