Changeset 777 for trunk/libIGCM/libIGCM_sys

Timestamp:

01/28/13 16:30:59 (11 years ago)

Author:

sdipsl

Message:

Bugfix building execution file run_file
OpenMP not yet in. Only MPI.
time command not available from ksh batch environment

File:

• trunk/libIGCM/libIGCM_sys/libIGCM_sys_ada.ksh (modified) (6 diffs)

trunk/libIGCM/libIGCM_sys/libIGCM_sys_ada.ksh

@@ -95 +95 @@
 if [ X${TaskType} = Xcomputing ] ; then
   echo
+  #source /smplocal/pub/Modules/default/init/ksh
   #. /smphome/rech/psl/rpsl035/.atlas_env_ada_bash
-  #export PATH=${PATH}://smphome/rech/psl/rpsl035/AddNoise/src_X64/bin
+  #export PATH=${PATH}:/smphome/rech/psl/rpsl035/AddNoise/src_X64/bin
 else
   source /smplocal/pub/Modules/default/init/ksh
@@ -161 +162 @@
 #====================================================
 #- HOST_MPIRUN_COMMAND
-typeset -r HOST_MPIRUN_COMMAND=${HOST_MPIRUN_COMMAND:="time poe"}
+typeset -r HOST_MPIRUN_COMMAND=${HOST_MPIRUN_COMMAND:="poe"}
 
 #====================================================
@@ -1712 +1713 @@
   fi
 
-    # Verification with MSUB parameter
   EXECUTION=${HOST_MPIRUN_COMMAND}
 
@@ -1737 +1737 @@
         eval comp_proc_mpi_loc=\${${comp}_PROC_MPI}
         eval comp_proc_omp_loc=\${${comp}_PROC_OMP}
-        echo "${comp_proc_mpi_loc} ./${ExeNameOut}" >> run_file
+
+        if ( ${OK_PARA_MPI} ) ; then
+          (( mpi_count = 1 ))
+          until [ ${mpi_count} -gt ${comp_proc_mpi_loc} ] ; do
+            echo "./${ExeNameOut}" >> run_file
+            (( mpi_count = mpi_count + 1 ))
+          done
+        else
+          echo "./${ExeNameOut} " >> run_file
+        fi
       fi
     done
@@ -1753 +1762 @@
         eval comp_proc_mpi_loc=\${${comp}_PROC_MPI}
         eval comp_proc_omp_loc=\${${comp}_PROC_OMP}
-        echo "${comp_proc_mpi_loc} ./${ExeNameOut}" >> run_file
+
+        if ( ${OK_PARA_MPI} ) ; then
+          (( mpi_count = 1 ))
+          until [ ${mpi_count} -gt ${comp_proc_mpi_loc} ] ; do
+            echo "./${ExeNameOut}" >> run_file
+            (( mpi_count = mpi_count + 1 ))
+          done
+        else
+            echo "./${ExeNameOut} " >> run_file
+        fi
       fi
     done
@@ -1773 +1791 @@
       eval ExeNameOut=\${config_Executable_${comp}[1]}
       if ( [ "X${ExeNameOut}" != X\"\" ] && [ "X${ExeNameOut}" != "Xinca.dat" ] ) ; then
-        EXECUTION="time ./${ExeNameOut}"
+        EXECUTION="./${ExeNameOut}"
       fi