Changeset 3665

Timestamp:

2012-11-26T15:14:40+01:00 (11 years ago)

Author:

cbricaud

Message:

correction of Mercator's modifications for prepare_job.sh

Location:

branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/SETTE

Files:

• BATCH_TEMPLATE/batch-ifort_MERCATOR_CLUSTER (modified) (2 diffs)
• prepare_job.sh (modified) (1 diff)

branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_MERCATOR_CLUSTER

@@ -4 +4 @@
 #PBS -e sette.$PBS_JOBID.err
 #PBS -o sette.$PBS_JOBID.out
-#PBS -l nodes=NODES:ppn=NPROCSNODE
+#PBS -l nodes=NODES:ppn=NPROC_NODE
 #PBS -q QUEUE
 #PBS -l walltime=03:00:00
-#PBS -l mem=MEMgb
+#PBS -l pvmem=5gb
 
 #
@@ -60 +60 @@
 #
   if [ MPI_FLAG == "yes" ]; then
-#cbr     time ${MPIRUN} ./opa
      mpirun -np $OCEANCORES ./opa
-#cbr     mpirun -np $OCEANCORES ./opa
   else
      time ./opa

branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/SETTE/prepare_job.sh

@@ -217 +217 @@
              -e"s:DEF_CMP_NAM:${CMP_NAM}:" -e"s:DEF_TEST_NAME:${TEST_NAME}:" > run_sette_test.job
 
-        if [ ${COMPILER} -eq 'ifort_MERCATOR_CLUSTER' ] ; then
-             cat run_sette_test.job | sed -e"s/QUEUE/${QUEUE}/" -e"s/MEM/${mem}/" > run_sette_test1.job
-             mv run_sette_test1.job run_sette_test.job
-        fi
+        case ${COMPILER} in
+              ifort_MERCATOR_CLUSTER)
+                    #cat run_sette_test.job | sed -e"s:QUEUE:${QUEUE}:" > run_sette_test1.job 
+                    #cat run_sette_test.job | sed -e"s/NPROC_NODE/${NB_PROC_NODE}/" > run_sette_test1.job 
+                                                 #-e"s/NPROC_NODE/${NB_PROC_NODE}/" > run_sette_test1.job
+                    cat run_sette_test.job | sed -e"s/NPROC_NODE/${NB_PROC_NODE}/" \
+                                                 -e"s:QUEUE:${QUEUE}:" > run_sette_test1.job
+                    mv run_sette_test1.job run_sette_test.job
+                    ;;
+   esac
 #
 # create the unique submission job script