Ignore:
Timestamp:
2012-01-28T17:44:18+01:00 (9 years ago)
Author:
rblod
Message:

Merge of 3.4beta into the trunk

Location:
trunk/NEMOGCM/SETTE/BATCH_TEMPLATE
Files:
4 edited
3 copied

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ALTIX_NAUTILUS_MPT

    r3050 r3294  
    88#PBS -W group_list=nemo 
    99#PBS -j oe 
    10  
     10# 
     11  OCEANCORES=NPROCS 
     12  export SETTE_DIR=DEF_SETTE_DIR 
     13# 
     14# load sette functions (only post_test_tidyup needed) 
     15# 
     16  . ${SETTE_DIR}/all_functions.sh 
    1117############################################################### 
    1218# 
     
    2733  export SVN_HOME=/fibre/acc/UTILS/svn/v1.5/svn 
    2834# 
    29 # 
    30 # Test specific settings. Do not hand edit these lines; the fcm_job.sh script will set these 
    31 # (via sed operating on this template job file). Note that the number of compute nodes required 
    32 # (half-populated on the NOCS ALTIX system) is also set by the fcm_job.sh on the PBS select 
    33 # header line above. 
    34 # 
    35   OCEANCORES=NPROCS 
    36   export SETTE_DIR=DEF_SETTE_DIR 
    37 # 
    38 # These variables are needed by post_test_tidyup function in all_functions.sh 
    39 # 
    40   export INPUT_DIR=DEF_INPUT_DIR 
    41   export OUTPUT_DIR=DEF_OUTPUT_DIR 
    42   export CONFIG_DIR=DEF_CONFIG_DIR 
    43   export NEMO_VALIDATION_DIR=DEF_NEMO_VALIDATION 
    44   export NEW_CONF=DEF_NEW_CONF 
    45   export CMP_NAM=DEF_CMP_NAM 
    46   export TEST_NAME=DEF_TEST_NAME 
    47   export EXE_DIR=DEF_EXE_DIR 
    48 # 
    49 # end of set up 
    50 ############################################################### 
    51 # 
    52 # change to the working directory  
    53 # 
    54   cd $PBS_O_WORKDIR 
    55 # 
    56 # load sette functions (only post_test_tidyup needed) 
    57 # 
    58   . ${SETTE_DIR}/all_functions.sh 
    59 # 
    6035  echo Running on host `hostname` 
    6136  echo Time is `date` 
    62   echo Directory is `pwd` 
    6337  echo PBS job ID is $PBS_JOBID 
    6438  echo This jobs runs on the following machines: 
     
    7953  echo export OMP_NUM_THREADS=1  
    8054# 
     55# Don't remove neither change the following line 
     56# BODY 
     57# 
     58# Test specific settings. Do not hand edit these lines; the fcm_job.sh script will set these 
     59# (via sed operating on this template job file). Note that the number of compute nodes required 
     60# (half-populated on the NOCS ALTIX system) is also set by the fcm_job.sh on the PBS select 
     61# header line above. 
     62# 
     63# These variables are needed by post_test_tidyup function in all_functions.sh 
     64# 
     65  export INPUT_DIR=DEF_INPUT_DIR 
     66  export CONFIG_DIR=DEF_CONFIG_DIR 
     67  export NEMO_VALIDATION_DIR=DEF_NEMO_VALIDATION 
     68  export NEW_CONF=DEF_NEW_CONF 
     69  export CMP_NAM=DEF_CMP_NAM 
     70  export TEST_NAME=DEF_TEST_NAME 
     71  export EXE_DIR=DEF_EXE_DIR 
     72# 
     73# end of set up 
     74############################################################### 
     75# 
     76# change to the working directory  
     77# 
     78# cd $PBS_O_WORKDIR 
     79  cd $EXE_DIR 
     80  echo Directory is `pwd` 
     81# 
     82# 
    8183#  Run the parallel MPI executable  
    8284# 
     
    8688# 
    8789  post_test_tidyup 
     90# END_BODY 
     91# Don't remove neither change the previous line 
    8892  exit 
  • trunk/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-PW6_VARGAS

    r2890 r3294  
    1414# @ queue 
    1515 
     16# 
     17# Test specific settings. Do not hand edit these lines; the fcm_job.sh script will set these 
     18# (via sed operating on this template job file).  
     19# 
     20  OCEANCORES=NPROCS 
     21  export SETTE_DIR=DEF_SETTE_DIR 
     22 
    1623############################################################### 
    1724# 
     
    2027# Local settings for machine IBM Power6 (VARGAS at IDRIS France) 
    2128# 
    22 export MPIRUN="mpiexec -n" 
     29export MPIRUN="mpiexec -n $OCEANCORES" 
     30 
    2331# 
    24 # Test specific settings. Do not hand edit these lines; the fcm_job.sh script will set these 
    25 # (via sed operating on this template job file).  
     32# load sette functions (only post_test_tidyup needed) 
    2633# 
    27   OCEANCORES=NPROCS 
    28   export SETTE_DIR=DEF_SETTE_DIR 
     34  . ${SETTE_DIR}/all_functions.sh 
     35# 
     36 
     37# Don't remove neither change the following line 
     38# BODY 
     39 
    2940# 
    3041# These variables are needed by post_test_tidyup function in all_functions.sh 
     
    4556cd ${EXE_DIR} 
    4657 
    47 # 
    48 # load sette functions (only post_test_tidyup needed) 
    49 # 
    50   . ${SETTE_DIR}/all_functions.sh 
    51 # 
    5258  echo Running on host `hostname` 
    5359  echo Time is `date` 
     
    5662#  Run the parallel MPI executable  
    5763# 
    58   echo "Running time ${MPIRUN} " $OCEANCORES " ./opa" 
     64  echo "Running time ${MPIRUN} ./opa" 
    5965# 
    60   time ${MPIRUN} " $OCEANCORES" ./opa 
     66  if [ MPI_FLAG == "yes" ]; then 
     67     time ${MPIRUN} ./opa 
     68  else 
     69     time ./opa 
     70  fi 
     71 
    6172# 
    6273  post_test_tidyup 
     74 
     75# END_BODY 
     76# Don't remove neither change the previous line 
     77 
     78 
    6379  exit 
  • trunk/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_TITANE

    r3029 r3294  
    66########################################################################## 
    77# 
    8 # set up mpp computing environment 
    9 # 
    10 # Local settings for machine BULL (TITANE at CCRT France) 
    11 # 
    12 export MPIRUN="mpirun -np" 
    13 # 
    148# Test specific settings. Do not hand edit these lines; the fcm_job.sh script will set these 
    159# (via sed operating on this template job file).  
     
    1711  OCEANCORES=NPROCS 
    1812  export SETTE_DIR=DEF_SETTE_DIR 
     13# 
     14# set up mpp computing environment 
     15# 
     16# Local settings for machine BULL (TITANE at CCRT France) 
     17# 
     18export MPIRUN="mpirun -np $OCEANCORES" 
     19 
     20# 
     21# load sette functions (only post_test_tidyup needed) 
     22# 
     23  . ${SETTE_DIR}/all_functions.sh 
     24# 
     25 
     26# modules to load 
     27module load netcdf 
     28 
     29# Don't remove neither change the following line 
     30# BODY 
     31 
    1932# 
    2033# These variables are needed by post_test_tidyup function in all_functions.sh 
     
    2740  export CMP_NAM=DEF_CMP_NAM 
    2841  export TEST_NAME=DEF_TEST_NAME 
    29 # modules to load 
    30 module load netcdf 
    3142# 
    3243# end of set up 
     
    3748cd ${EXE_DIR} 
    3849 
    39 # 
    40 # load sette functions (only post_test_tidyup needed) 
    41 # 
    42   . ${SETTE_DIR}/all_functions.sh 
    43 # 
    4450  echo Running on host `hostname` 
    4551  echo Time is `date` 
     
    4854#  Run the parallel MPI executable  
    4955# 
    50   echo "Running time ${MPIRUN} " $OCEANCORES " ./opa" 
     56  echo "Running time ${MPIRUN} ./opa" 
    5157# 
    52   time ${MPIRUN} " $OCEANCORES" ./opa 
     58  if [ MPI_FLAG == "yes" ]; then 
     59     time ${MPIRUN} ./opa 
     60  else 
     61     time ./opa 
     62  fi 
     63 
    5364# 
    5465  post_test_tidyup 
     66 
     67# END_BODY 
     68# Don't remove neither change the previous line 
     69 
     70 
    5571  exit 
    5672 
  • trunk/NEMOGCM/SETTE/BATCH_TEMPLATE/sette_batch_template

    r2890 r3294  
    1414# @ queue 
    1515 
     16# 
     17# Test specific settings. Do not hand edit these lines; the fcm_job.sh script will set these 
     18# (via sed operating on this template job file).  
     19# 
     20  OCEANCORES=NPROCS 
     21  export SETTE_DIR=DEF_SETTE_DIR 
     22 
    1623############################################################### 
    1724# 
     
    2027# Local settings for machine IBM Power6 (VARGAS at IDRIS France) 
    2128# 
    22 export MPIRUN="mpiexec -n" 
     29export MPIRUN="mpiexec -n $OCEANCORES" 
     30 
    2331# 
    24 # Test specific settings. Do not hand edit these lines; the fcm_job.sh script will set these 
    25 # (via sed operating on this template job file).  
     32# load sette functions (only post_test_tidyup needed) 
    2633# 
    27   OCEANCORES=NPROCS 
    28   export SETTE_DIR=DEF_SETTE_DIR 
     34  . ${SETTE_DIR}/all_functions.sh 
     35 
     36# Don't remove neither change the following comment line 
     37# BODY 
     38 
     39 
    2940# 
    3041# These variables are needed by post_test_tidyup function in all_functions.sh 
     
    3950# 
    4051# end of set up 
     52 
     53 
    4154############################################################### 
    4255# 
     
    4558cd ${EXE_DIR} 
    4659 
    47 # 
    48 # load sette functions (only post_test_tidyup needed) 
    49 # 
    50   . ${SETTE_DIR}/all_functions.sh 
    51 # 
    5260  echo Running on host `hostname` 
    5361  echo Time is `date` 
     
    5664#  Run the parallel MPI executable  
    5765# 
    58   echo "Running time ${MPIRUN} " $OCEANCORES " ./opa" 
     66  echo "Running time ${MPIRUN} ./opa" 
    5967# 
    60   time ${MPIRUN} " $OCEANCORES" ./opa 
     68 
     69  if [ MPI_FLAG == "yes" ]; then 
     70     time ${MPIRUN} ./opa 
     71  else 
     72     time ./opa 
     73  fi 
     74 
     75 
    6176# 
    6277  post_test_tidyup 
     78 
     79# END_BODY 
     80# Don't remove neither change the previous comment line 
     81 
    6382  exit 
Note: See TracChangeset for help on using the changeset viewer.