Changeset 2549 for trunk

Timestamp:

2011-01-12T10:27:30+01:00 (13 years ago)

Author:

flavoni

Message:

small bug: forget to remove bad test in fcm_job.sh, see ticket #752

File:

• trunk/NEMOGCM/SETTE/fcm_job.sh (modified) (2 diffs)

trunk/NEMOGCM/SETTE/fcm_job.sh

@@ -2 +2 @@
 # Author : Simona Flavoni for NEMO
 # Contact : sflod@locean-ipsl.upmc.fr
-#
-# ----------------------------------------------------------------------
-# NEMO/SETTE , NEMO Consortium (2010)
-# Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
-# ----------------------------------------------------------------------
 #
 # Some scripts called by sette.sh 
@@ -127 +122 @@
 cd ${INPUT_DIR}
 NB_PROC=$2
-if [! -r ${INPUT_DIR}/opa ]
-   then
-   echo "executable opa does not exist"
-   exit 1
+if [ ! -r ${INPUT_DIR}/opa ]
+    then
+    echo "executable opa does not exist"
+    exit 1
 fi
 if [ ${NB_PROC} == 1 ] ; then
- opa_command='./opa'  # !! to test if executable is created
-          type ${opa_command}
-          status_type=${?}
-          if [ ${status_type} -ne 0 ]
-          then
-              echo "opa not found"
-              exit 1
-          fi
-   echo "running opa" >> ${SETTE_DIR}/output.sette
-   echo "            " >> ${SETTE_DIR}/output.sette
-   ./opa
+    echo "running opa" >> ${SETTE_DIR}/output.sette
+    echo "            " >> ${SETTE_DIR}/output.sette
+    ./opa
 else
-opa_command='mpirun'  # !! to test if executable is created
-          type ${opa_command}
-          status_type=${?}
-          if [ ${status_type} -ne 0 ]
-          then
-              echo "mpi opa not found"
-              exit 1
-          fi
+    echo "running opa in MPI" >> ${SETTE_DIR}/output.sette
+    echo "            " >> ${SETTE_DIR}/output.sette
 # example for brodie (NEC SX8) machine
-   echo "running opa in MPI" >> ${SETTE_DIR}/output.sette
-   echo "            " >> ${SETTE_DIR}/output.sette
-   mpirun -np ${NB_PROC} opa
+#  mpirun -np ${NB_PROC} opa
 # example for dedale machine
 #  mpirun --mca btl self,tcp -np ${NB_PROC} opa
 # example for vargas (IBM Power6) machine
-#  mpiexec -n ${NB_PROC} opa
+    mpiexec -n ${NB_PROC} opa
 fi
 ################################################################