Changeset 3665


Ignore:
Timestamp:
2012-11-26T15:14:40+01:00 (8 years ago)
Author:
cbricaud
Message:

correction of Mercator's modifications for prepare_job.sh

Location:
branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/SETTE
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_MERCATOR_CLUSTER

    r3651 r3665  
    44#PBS -e sette.$PBS_JOBID.err 
    55#PBS -o sette.$PBS_JOBID.out 
    6 #PBS -l nodes=NODES:ppn=NPROCSNODE 
     6#PBS -l nodes=NODES:ppn=NPROC_NODE 
    77#PBS -q QUEUE 
    88#PBS -l walltime=03:00:00 
    9 #PBS -l mem=MEMgb 
     9#PBS -l pvmem=5gb 
    1010 
    1111# 
     
    6060# 
    6161  if [ MPI_FLAG == "yes" ]; then 
    62 #cbr     time ${MPIRUN} ./opa 
    6362     mpirun -np $OCEANCORES ./opa 
    64 #cbr     mpirun -np $OCEANCORES ./opa 
    6563  else 
    6664     time ./opa 
  • branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/SETTE/prepare_job.sh

    r3661 r3665  
    217217             -e"s:DEF_CMP_NAM:${CMP_NAM}:" -e"s:DEF_TEST_NAME:${TEST_NAME}:" > run_sette_test.job 
    218218 
    219         if [ ${COMPILER} -eq 'ifort_MERCATOR_CLUSTER' ] ; then 
    220              cat run_sette_test.job | sed -e"s/QUEUE/${QUEUE}/" -e"s/MEM/${mem}/" > run_sette_test1.job 
    221              mv run_sette_test1.job run_sette_test.job 
    222         fi 
     219        case ${COMPILER} in 
     220              ifort_MERCATOR_CLUSTER) 
     221                    #cat run_sette_test.job | sed -e"s:QUEUE:${QUEUE}:" > run_sette_test1.job  
     222                    #cat run_sette_test.job | sed -e"s/NPROC_NODE/${NB_PROC_NODE}/" > run_sette_test1.job  
     223                                                 #-e"s/NPROC_NODE/${NB_PROC_NODE}/" > run_sette_test1.job 
     224                    cat run_sette_test.job | sed -e"s/NPROC_NODE/${NB_PROC_NODE}/" \ 
     225                                                 -e"s:QUEUE:${QUEUE}:" > run_sette_test1.job 
     226                    mv run_sette_test1.job run_sette_test.job 
     227                    ;; 
     228   esac 
    223229# 
    224230# create the unique submission job script 
Note: See TracChangeset for help on using the changeset viewer.