Ignore:
Timestamp:
2015-07-15T17:46:12+02:00 (5 years ago)
Author:
andrewryan
Message:

merged in latest version of trunk alongside changes to SAO_SRC to be compatible with latest OBS

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2014/dev_r4650_UKMO14.12_STAND_ALONE_OBSOPER/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-IBM_EKMAN_INGV

    r4277 r5600  
    22#! 
    33#BSUB -q long 
    4 #BSUB -n NPROCS 
     4#BSUB -n TOTAL_NPROCS 
    55#BSUB -J MPI_config 
    66#BSUB -o stdout.%J 
     
    1414# 
    1515  OCEANCORES=NPROCS 
     16  XIOS_NUMPROCS=NXIOPROCS 
    1617  export SETTE_DIR=DEF_SETTE_DIR 
    1718 
     
    2324# 
    2425 
     26 MPIPROGINF=detail 
     27 export MPIPROGINF 
     28 export LSF_PJL_TYPE="intelmpi" 
     29 export MP_PGMMODEL=mpmd 
     30 export MP_SHARED_MEMORY=yes 
    2531 export MPIRUN="mpirun -n $OCEANCORES" 
    26  
    27 #export MPIRUN="mpirun -np" 
     32 export MPIRUN_MPMD="mpirun -np $OCEANCORES ./opa : -np $XIOS_NUMPROCS /home/delrosso/XIOS_1.0/xios-1.0/bin/xios_server.exe" 
    2833 
    2934# 
     
    6772 
    6873  if [ MPI_FLAG == "yes" ]; then 
    69      time ${MPIRUN} ./opa 
     74     if [ $XIOS_NUMPROCS -eq 0 ]; then 
     75       time ${MPIRUN} ./opa 
     76     else 
     77       time ${MPIRUN_MPMD} 
     78     fi 
    7079  else 
    71      time ./opa 
     80       time ./opa 
    7281  fi 
    7382# 
Note: See TracChangeset for help on using the changeset viewer.