New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 3608 – NEMO

Changeset 3608


Ignore:
Timestamp:
2012-11-19T16:40:55+01:00 (12 years ago)
Author:
acc
Message:

Branch dev_NOC_2012_r3555. #1006. Step 3: Merge in trunk changes between revision 3322 and 3337

Location:
branches/2012/dev_NOC_2012_rev3555
Files:
11 edited
2 copied

Legend:

Unmodified
Added
Removed

  • branches/2012/dev_NOC_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90

    r3294 r3608  
    118118      IF( PRESENT(tab2d_1) )   ztab2d_1(:,:)        = tab2d_1(:,:) 
    119119      IF( PRESENT(tab2d_2) )   ztab2d_2(:,:)        = tab2d_2(:,:) 
    120       IF( PRESENT(tab3d_1) )   ztab3d_1(:,:,1:kdir) = tab3d_1(:,:,:) 
    121       IF( PRESENT(tab3d_2) )   ztab3d_2(:,:,1:kdir) = tab3d_2(:,:,:) 
     120      IF( PRESENT(tab3d_1) )   ztab3d_1(:,:,1:kdir) = tab3d_1(:,:,1:kdir) 
     121      IF( PRESENT(tab3d_2) )   ztab3d_2(:,:,1:kdir) = tab3d_2(:,:,1:kdir) 
    122122      IF( PRESENT(mask1)   )   zmask1  (:,:,:)      = mask1  (:,:,:) 
    123123      IF( PRESENT(mask2)   )   zmask2  (:,:,:)      = mask2  (:,:,:) 

  • branches/2012/dev_NOC_2012_rev3555/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-PW6_VARGAS

    r3294 r3608  
    6060  echo Directory is `pwd` 
    6161#  
    62 #  Run the parallel MPI executable  
    63 # 
    64   echo "Running time ${MPIRUN} ./opa" 
     62#  Run the executable  
    6563# 
    6664  if [ MPI_FLAG == "yes" ]; then 
     65  echo "Running time ${MPIRUN} ./opa" 
    6766     time ${MPIRUN} ./opa 
    6867  else 
     68  echo "Running time ./opa" 
    6969     time ./opa 
    7070  fi 

  • branches/2012/dev_NOC_2012_rev3555/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_TITANE

    r3294 r3608  
    5454#  Run the parallel MPI executable  
    5555# 
     56  if [ MPI_FLAG == "yes" ]; then 
    5657  echo "Running time ${MPIRUN} ./opa" 
    57 # 
    58   if [ MPI_FLAG == "yes" ]; then 
    5958     time ${MPIRUN} ./opa 
    6059  else 
     60  echo "Running time ./opa" 
    6161     time ./opa 
    6262  fi 

  • branches/2012/dev_NOC_2012_rev3555/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_MERCATOR_CLUSTER

    r3294 r3608  
    5757#  Run the parallel MPI executable  
    5858# 
     59  if [ MPI_FLAG == "yes" ]; then 
    5960  echo "Running time ${MPIRUN} ./opa" 
    60 # 
    61   if [ MPI_FLAG == "yes" ]; then 
    6261     time ${MPIRUN} ./opa 
    6362  else 
     63  echo "Running time ./opa" 
    6464     time ./opa 
    6565  fi 

  • branches/2012/dev_NOC_2012_rev3555/NEMOGCM/SETTE/BATCH_TEMPLATE/sette_batch_template

    r3294 r3608  
    6464#  Run the parallel MPI executable  
    6565# 
     66  if [ MPI_FLAG == "yes" ]; then 
    6667  echo "Running time ${MPIRUN} ./opa" 
    67 # 
    68  
    69   if [ MPI_FLAG == "yes" ]; then 
    7068     time ${MPIRUN} ./opa 
    7169  else 
     70  echo "Running time./opa" 
    7271     time ./opa 
    7372  fi 

  • branches/2012/dev_NOC_2012_rev3555/NEMOGCM/SETTE/README

    r3294 r3608  
    3232                IT is mandatory to have different TEST_NAME for each job run if not existing files are re-written (for example namelist) 
    3333 
    34                fcm_job.sh needs input: input_CONFIG_NAME TOTAL_NUMBER_OF_PROCS_used TEST_NAME 
     34               prepare_job.sh generates the script to be executed  
     35         input: INPUT_FILE_CONFIG_NAME NB_PROCS TEST_NAME MPI_FLAG JOB_FILE_NAME 
     36 
     37               fcm_job.sh needs input: TOTAL_NUMBER_OF_PROCS_used JOB_FILE_NAME INTERACT_FLAG MPI_FLAG  
    3538         (for example if you compile ORCA2_LIM with key_mpp_mpi  
    3639         and only run short test ===> ./fcm_job input_ORCA2_LIM.cfg 4 SHORT) 

  • branches/2012/dev_NOC_2012_rev3555/NEMOGCM/SETTE/fcm_job.sh

    r3294 r3608  
    66# fcm_job.sh   : simple job to run NEMO with fcm  
    77###################################################### 
    8 #set -x 
     8#set -vx 
    99set -o posix 
    1010#set -u 
    … …  
    2323# ======== 
    2424# 
    25 # :: 
     25# :: lauches the script $JOB_FILE interactive or batch, one task or MPI 
    2626# 
    27 #  $ ./fcm_job.sh INPUT_FILE_CONFIG_NAME NUMBER_PROC TEST_NAME MPI_INTERACT MPI_FLAG 
     27#  $ ./fcm_job.sh NUMBER_OF_PROCS JOB_FILE INTERACT MPI_FLAG 
    2828# 
    2929# 
    … …  
    3333# Simple job for SET TESTS for NEMO (SETTE) 
    3434#  
    35 #   get input files (if needed) : tar file   
    36 #  (note this job needs to have an input_CONFIG.cfg in which can be found input tar file name) 
    37 # 
    38 #   runs job in interactive or batch mode : all jobs using 1 process are run interactive, and all MPP jobs are 
    39 # 
    40 #   run in batch (MPI_INTERACT="no") or interactive (MPI_INTERACT="yes") see sette.sh and BATCH_TEMPLATE directory 
    41 # 
    42 #   and call post_test_tidyup function (that moves in NEMO_VALIDATION_DIR solver.stat, tracer.stat (for LOBSTER & PISCES) & ocean.output) 
     35#   
    4336# 
    4437# EXAMPLES 
    … …  
    4740# :: 
    4841# 
    49 #  $ ./fcm_job.sh INPUT_FILE_CONFIG_NAME NUMBER_PROC TEST_NAME MPI_INTERACT MPI_FLAG 
     42#  $ ./fcm_job.sh NUMBER_OF_PROCS JOB_FILE INTERACT MPI_FLAG 
    5043# 
    51 #  run a job of config GYRE with 1 processor SHORT test ( 5 days ) using an interactive run without mpirun 
    52 #  $ ./fcm_job.sh input_GYRE.cfg 1 SHORT yes no 
    53 # 
    54 #  run a job of config ORCA2_LIM_PISCES   with 8 processors test RESTARTABILITY submitting the job to the batch queue system and using mpirun 
    55 #  $ ./fcm_job.sh input_ORCA2_LIM_PISCES.cfg 8 LONG no yes 
     44#  run a  
    5645# 
    5746# 
    … …  
    7463# 
    7564 
    76 usage=" Usage : ./fcm_job.sh input_CONFIG_NAME.cfg  NUMBER_OF_PROCS TEST_NAME INTERACT MPI_FLAG" 
    77 usage=" example : ./fcm_job.sh input_ORCA2_LIM_PISCES.cfg 8 SHORT no/yes no/yes" 
     65usage=" Usage : ./fcm_job.sh  NUMBER_OF_PROCS JOB_FILE INTERACT MPI_FLAG" 
     66usage=" example : ./fcm_job.sh 8 SHORT no/yes no/yes" 
    7867 
    7968 
    80 minargcount=2 
     69minargcount=4 
    8170        if [ ${#} -lt ${minargcount} ] 
    8271        then 
    83                 echo "not enought arguments for fcm_job.sh script" 
     72                echo "not enough arguments for fcm_job.sh script" 
    8473                echo "control number of argument of fcm_job.sh in sette.sh" 
    8574                echo "${usage}" 
    … …  
    9483export NB_PROCS=$1 
    9584export JOB_FILE=$2 
     85export INTERACT=$3 
     86export MPI_FLAG=$4 
    9687################################################################ 
    9788# RUN OPA 
    9889cd ${EXE_DIR} 
    99  
     90if [ "$INTERACT" == "yes" ]; then 
     91        eval $JOB_FILE 
     92else if [ "$INTERACT" == "no" ]; then 
    10093# submit job to batch system  
    101         if [ ${NB_PROC} -eq 1 ]; then 
    102       eval ${BATCH_COMMAND_SEQ} $JOB_FILE  
     94        if [ "$NB_PROC" == "1" ]; then 
     95      eval ${BATCH_COMMAND_SEQ} $JOB_FILE ; echo  ${BATCH_COMMAND_SEQ} $JOB_FILE 
    10396        else 
    104       eval ${BATCH_COMMAND_PAR} $JOB_FILE 
     97      eval ${BATCH_COMMAND_PAR} $JOB_FILE ; echo ${BATCH_COMMAND_PAR} $JOB_FILE 
    10598        fi 
    106  
     99fi 
     100fi 

  • branches/2012/dev_NOC_2012_rev3555/NEMOGCM/SETTE/prepare_job.sh

    r3294 r3608  
    66# prepare_job.sh   : create the job script for running job  
    77###################################################### 
    8 #set -x 
     8#set -vx 
    99set -o posix 
    1010#set -u 
    1111#set -e 
    12 # 
     12#+ 
    1313# 
    1414# ================ 
    … …  
    2525# :: 
    2626# 
    27 #  $ ./prepare_job.sh INPUT_FILE_CONFIG_NAME NUMBER_PROC TEST_NAME MPI_INTERACT MPI_FLAG 
     27#  $ ./prepare_job.sh INPUT_FILE_CONFIG_NAME NUMBER_PROC TEST_NAME MPI_FLAG JOB_FILE 
    2828# 
    2929# 
    … …  
    3131# =========== 
    3232# 
    33 # Simple job for SET TESTS for NEMO (SETTE) 
     33# Part of the SETTE package to run tests for NEMO 
    3434#  
    35 #   get input files (if needed) : tar file   
    36 #  (note this job needs to have an input_CONFIG.cfg in which can be found input tar file name) 
    37 # 
    38 #   runs job in interactive or batch mode : all jobs using 1 process are run interactive, and all MPP jobs are 
    39 # 
    40 #   run in batch (MPI_INTERACT="no") or interactive (MPI_INTERACT="yes") see sette.sh and BATCH_TEMPLATE directory 
    41 # 
    42 #   and call post_test_tidyup function (that moves in NEMO_VALIDATION_DIR solver.stat, tracer.stat (for LOBSTER & PISCES) & ocean.output) 
     35# prepare the script $JOB_FILE to run the tests  
    4336# 
    4437# EXAMPLES 
    … …  
    4740# :: 
    4841# 
    49 #  $ ./fcm_job.sh INPUT_FILE_CONFIG_NAME NUMBER_PROC TEST_NAME MPI_INTERACT MPI_FLAG 
    50 # 
    51 #  run a job of config GYRE with 1 processor SHORT test ( 5 days ) using an interactive run without mpirun 
    52 #  $ ./fcm_job.sh input_GYRE.cfg 1 SHORT yes no 
    53 # 
    54 #  run a job of config ORCA2_LIM_PISCES   with 8 processors test RESTARTABILITY submitting the job to the batch queue system and using mpirun 
    55 #  $ ./fcm_job.sh input_ORCA2_LIM_PISCES.cfg 8 LONG no yes 
     42#  $ ./prepare_job.sh INPUT_FILE_CONFIG_NAME NUMBER_PROC TEST_NAME MPI_FLAG $JOB_FILE 
     43# 
     44# prepare the $JOB_FILE for execution  
    5645# 
    5746# 
    … …  
    6554# ========== 
    6655# 
    67 # $Id: fcm_job.sh 3050 2011-11-07 14:11:34Z acc $ 
     56# $Id: prepare_job.sh 3050 2011-11-07 14:11:34Z acc $ 
    6857# 
    6958# 
    … …  
    7463# 
    7564 
    76 usage=" Usage : ./fcm_job.sh input_CONFIG_NAME.cfg  NUMBER_OF_PROCS TEST_NAME INTERACT MPI_FLAG" 
    77 usage=" example : ./fcm_job.sh input_ORCA2_LIM_PISCES.cfg 8 SHORT no/yes no/yes" 
     65usage=" Usage : ./prepare_job.sh INPUT_FILE_CONFIG_NAME NUMBER_PROC TEST_NAME MPI_FLAG JOB_FILE" 
     66usage=" example : ./prepare_job.sh input_ORCA2_LIM_PISCES.cfg 8 SHORT no/yes $JOB_FILE" 
    7867 
    7968 
    … …  
    8170        if [ ${#} -lt ${minargcount} ] 
    8271        then 
    83                 echo "not enought arguments for fcm_job.sh script" 
    84                 echo "control number of argument of fcm_job.sh in sette.sh" 
     72                echo "not enough arguments for prepare_job.sh script" 
     73                echo "control number of argument of prepare_job.sh in sette.sh" 
    8574                echo "${usage}" 
    8675        exit 1 
    … …  
    165154    exit 1 
    166155fi 
    167 #if [ ${NB_PROC} == 1 ] ; then 
    168 #    echo "running opa" >> ${SETTE_DIR}/output.sette 
    169 #    echo "            " >> ${SETTE_DIR}/output.sette 
    170 #    ./opa 
    171 # 
    172 # Tidy out output from this test and populate the NEMO_VALIDATION_DIR tree 
    173 # 
    174 #    post_test_tidyup 
    175 #else 
    176 #    echo "running opa in MPI" >> ${SETTE_DIR}/output.sette 
    177 #    echo "            " >> ${SETTE_DIR}/output.sette 
    178  
    179 #    if [ ${MPI_INTERACT} == "yes" ] ; then 
    180 #  # 
    181 #  # example for brodie (NEC SX8) machine 
    182 #  #  mpirun -np ${NB_PROC} opa 
    183 #  # example for dedale machine 
    184 #  #  mpirun --mca btl self,tcp -np ${NB_PROC} opa 
    185 #  # example for vargas (IBM Power6) machine 
    186 #  mpiexec -n ${NB_PROC} opa 
    187 #  # 
    188 #  post_test_tidyup 
    189 #    fi 
    190 # 
     156 
    191157# example for NOCS Altix system using PBS batch submission (requires ${SETTE_DIR}/sette_batch_template file) 
    192158# 
    193   #  if [ ${MPI_INTERACT} == "no" ] ; then 
     159  #  if [ ${MPI_FLAG} == "no" ] ; then 
    194160      case ${COMPILER} in  
    195161         ALTIX_NAUTILUS_MPT) 
    … …  
    239205   fi 
    240206    
    241    chmod a+x $JOB_FILE 
     207   chmod a+x $JOB_FILE ; echo "$JOB_FILE is ready" 
    242208 
    243209#fi 

  • branches/2012/dev_NOC_2012_rev3555/NEMOGCM/SETTE/sette.sh

    r3294 r3608  
    8484# 
    8585# 
     86#  prepare_job.sh 
     87# 
     88#  to generate the script run_job.sh 
     89# 
    8690#  fcm_job.sh  
    8791# 
    … …  
    129133#- 
    130134# Compiler among those in NEMOGCM/ARCH 
    131 COMPILER=PW6_CALYPSO 
    132 export BATCH_COMMAND_PAR="bsub < " 
     135COMPILER=PW6_VARGAS 
     136export BATCH_COMMAND_PAR="llsubmit" 
    133137export BATCH_COMMAND_SEQ=$BATCH_COMMAND_PAR 
     138export INTERACT_FLAG="no" 
     139export MPIRUN_FLAG="yes" 
    134140 
    135141 
    … …  
    160166    . prepare_exe_dir.sh 
    161167    JOB_FILE=${EXE_DIR}/run_job.sh 
    162     MPIRUN_FLAG="yes" 
    163168    NPROC=1 
    164     rm $JOB_FILE 
     169    \rm $JOB_FILE 
    165170    cd ${EXE_DIR} 
    166171    set_namelist namelist cn_exp \"GYRELOB_LONG\" 
    … …  
    172177    set_namelist namelist_top ln_diatrc .false. 
    173178    cd ${SETTE_DIR} 
     179    cp BATCH_TEMPLATE/batch-${COMPILER} job_batch_template || exit 
    174180    . ./prepare_job.sh input_GYRE.cfg $NPROC ${TEST_NAME} $MPIRUN_FLAG $JOB_FILE 
     181    cd ${SETTE_DIR} 
     182    . ./fcm_job.sh $NPROC $JOB_FILE $INTERACT_FLAG $MPIRUN_FLAG 
    175183 
    176184    cd ${SETTE_DIR} 
    … …  
    194202    set_namelist namelist_top cn_trcrst_in \"GYRELOB_LONG_00000060_restart_trc\" 
    195203    cd ${SETTE_DIR} 
     204    cp BATCH_TEMPLATE/batch-${COMPILER} job_batch_template || exit 
    196205    . ./prepare_job.sh input_GYRE.cfg $NPROC ${TEST_NAME} $MPIRUN_FLAG $JOB_FILE 
    197206    cd ${SETTE_DIR} 
    198     . ./fcm_job.sh $NPROC $JOB_FILE 
     207    . ./fcm_job.sh $NPROC $JOB_FILE  $INTERACT_FLAG $MPIRUN_FLAG 
    199208fi 
    200209 
    … …  
    209218    . prepare_exe_dir.sh 
    210219    JOB_FILE=${EXE_DIR}/run_job.sh 
    211     MPIRUN_FLAG="yes" 
    212220    NPROC=4 
    213     rm $JOB_FILE 
     221    \rm $JOB_FILE 
    214222    cd ${EXE_DIR} 
    215223    set_namelist namelist cn_exp \"GYRELOB_14\" 
    … …  
    227235    set_namelist namelist jpnij 4 
    228236    cd ${SETTE_DIR} 
     237    cp BATCH_TEMPLATE/batch-${COMPILER} job_batch_template || exit 
    229238    . ./prepare_job.sh input_GYRE.cfg $NPROC ${TEST_NAME} $MPIRUN_FLAG $JOB_FILE 
    230239    cd ${SETTE_DIR} 
    231     . ./fcm_job.sh $NPROC $JOB_FILE 
     240    . ./fcm_job.sh $NPROC $JOB_FILE  $INTERACT_FLAG $MPIRUN_FLAG 
    232241 
    233242    cd ${SETTE_DIR} 
    … …  
    235244    . prepare_exe_dir.sh 
    236245    JOB_FILE=${EXE_DIR}/run_job.sh 
    237     MPIRUN_FLAG="yes" 
    238246    NPROC=4 
    239     rm $JOB_FILE 
     247    \rm $JOB_FILE 
    240248    cd ${EXE_DIR} 
    241249    set_namelist namelist cn_exp \"GYRELOB_22\" 
    … …  
    252260    set_namelist namelist jpnij 4 
    253261    cd ${SETTE_DIR} 
     262    cp BATCH_TEMPLATE/batch-${COMPILER} job_batch_template || exit 
    254263    . ./prepare_job.sh input_GYRE.cfg $NPROC ${TEST_NAME} $MPIRUN_FLAG $JOB_FILE 
    255264    cd ${SETTE_DIR} 
    256     . ./fcm_job.sh $NPROC $JOB_FILE 
     265    . ./fcm_job.sh $NPROC $JOB_FILE  $INTERACT_FLAG $MPIRUN_FLAG 
    257266fi 
    258267 
    … …  
    268277    . prepare_exe_dir.sh 
    269278    JOB_FILE=${EXE_DIR}/run_job.sh 
    270     MPIRUN_FLAG="yes" 
    271279    NPROC=1 
    272     rm $JOB_FILE 
     280    \rm $JOB_FILE 
    273281    cd ${EXE_DIR} 
    274282    set_namelist namelist cn_exp \"O2LP_LONG\" 
    … …  
    288296    set_namelist namelist_pisces ln_presatm .false. 
    289297    cd ${SETTE_DIR} 
    290     . ./prepare_job.sh input_ORCA2_LIM_PISCES.cfg $NPROC ${TEST_NAME} $MPIRUN_FLAG $JOB_FILE 
    291      
    292     cd ${SETTE_DIR} 
     298    cp BATCH_TEMPLATE/batch-${COMPILER} job_batch_template || exit 
     299    . ./prepare_job.sh input_ORCA2_LIM_PISCES.cfg $NPROC ${TEST_NAME} $MPIRUN_FLAG $JOB_FILE     
     300    cd ${SETTE_DIR} 
     301    . ./fcm_job.sh $NPROC $JOB_FILE  $INTERACT_FLAG $MPIRUN_FLAG 
     302# 
    293303    export TEST_NAME="SHORT" 
     304    cd ${SETTE_DIR} 
    294305    . prepare_exe_dir.sh 
    295306    cd ${EXE_DIR} 
    … …  
    319330    set_namelist namelist_pisces ln_presatm .false. 
    320331    cd ${SETTE_DIR} 
     332    cp BATCH_TEMPLATE/batch-${COMPILER} job_batch_template || exit 
    321333    . ./prepare_job.sh input_ORCA2_LIM_PISCES.cfg $NPROC ${TEST_NAME} $MPIRUN_FLAG $JOB_FILE 
    322334    cd ${SETTE_DIR} 
    323     . ./fcm_job.sh $NPROC $JOB_FILE 
     335    . ./fcm_job.sh $NPROC $JOB_FILE $INTERACT_FLAG $MPIRUN_FLAG  
    324336fi 
    325337 
    … …  
    334346    . prepare_exe_dir.sh 
    335347    JOB_FILE=${EXE_DIR}/run_job.sh 
    336     MPIRUN_FLAG="yes" 
    337348    NPROC=16 
    338     rm $JOB_FILE 
     349    \rm $JOB_FILE 
    339350    cd ${EXE_DIR} 
    340351    set_namelist namelist nn_it000 1 
    … …  
    356367    set_namelist namelist_pisces ln_presatm .false. 
    357368    cd ${SETTE_DIR} 
     369    cp BATCH_TEMPLATE/batch-${COMPILER} job_batch_template || exit 
    358370    . ./prepare_job.sh input_ORCA2_LIM_PISCES.cfg $NPROC ${TEST_NAME} $MPIRUN_FLAG $JOB_FILE 
    359371    cd ${SETTE_DIR} 
    360     . ./fcm_job.sh $NPROC $JOB_FILE 
     372    . ./fcm_job.sh $NPROC $JOB_FILE  $INTERACT_FLAG $MPIRUN_FLAG 
    361373 
    362374    cd ${SETTE_DIR} 
    … …  
    364376    . prepare_exe_dir.sh 
    365377    JOB_FILE=${EXE_DIR}/run_job.sh 
    366     MPIRUN_FLAG="yes" 
    367378    NPROC=16 
    368     rm $JOB_FILE 
     379    \rm $JOB_FILE 
    369380    cd ${EXE_DIR} 
    370381    set_namelist namelist nn_it000 1 
    … …  
    386397    set_namelist namelist_pisces ln_presatm .false. 
    387398    cd ${SETTE_DIR} 
     399    cp BATCH_TEMPLATE/batch-${COMPILER} job_batch_template || exit 
    388400    . ./prepare_job.sh input_ORCA2_LIM_PISCES.cfg $NPROC ${TEST_NAME} $MPIRUN_FLAG $JOB_FILE 
    389401    cd ${SETTE_DIR} 
    390     . ./fcm_job.sh $NPROC $JOB_FILE 
     402    . ./fcm_job.sh $NPROC $JOB_FILE $INTERACT_FLAG $MPIRUN_FLAG 
    391403fi 
    392404 
    … …  
    402414    . prepare_exe_dir.sh 
    403415    JOB_FILE=${EXE_DIR}/run_job.sh 
    404     MPIRUN_FLAG="yes" 
    405416    NPROC=1 
    406     rm $JOB_FILE 
     417    \rm $JOB_FILE 
    407418    cd ${EXE_DIR} 
    408419    set_namelist namelist cn_exp \"OFFP_LONG\" 
    … …  
    421432    set_namelist namelist_pisces ln_presatm .false. 
    422433    cd ${SETTE_DIR} 
     434   cp BATCH_TEMPLATE/batch-${COMPILER} job_batch_template || exit 
    423435    . ./prepare_job.sh input_ORCA2_OFF_PISCES.cfg $NPROC ${TEST_NAME} $MPIRUN_FLAG $JOB_FILE 
    424436     
    … …  
    445457    set_namelist namelist_pisces ln_presatm .false. 
    446458    cd ${SETTE_DIR} 
     459   cp BATCH_TEMPLATE/batch-${COMPILER} job_batch_template || exit 
    447460    . ./prepare_job.sh input_ORCA2_OFF_PISCES.cfg $NPROC ${TEST_NAME} $MPIRUN_FLAG $JOB_FILE 
    448461    cd ${SETTE_DIR} 
    449     . ./fcm_job.sh $NPROC $JOB_FILE 
     462    . ./fcm_job.sh $NPROC $JOB_FILE  $INTERACT_FLAG $MPIRUN_FLAG 
    450463fi 
    451464 
    … …  
    460473    . prepare_exe_dir.sh 
    461474    JOB_FILE=${EXE_DIR}/run_job.sh 
    462     MPIRUN_FLAG="yes" 
    463475    NPROC=16 
    464     rm $JOB_FILE 
     476    \rm $JOB_FILE 
    465477    cd ${EXE_DIR} 
    466478    set_namelist namelist nn_it000 1 
    … …  
    480492    set_namelist namelist_pisces ln_presatm .false. 
    481493    cd ${SETTE_DIR} 
     494   cp BATCH_TEMPLATE/batch-${COMPILER} job_batch_template || exit 
    482495    . ./prepare_job.sh input_ORCA2_OFF_PISCES.cfg $NPROC ${TEST_NAME} $MPIRUN_FLAG $JOB_FILE 
    483496    cd ${SETTE_DIR} 
    484     . ./fcm_job.sh $NPROC $JOB_FILE 
     497    . ./fcm_job.sh $NPROC $JOB_FILE  $INTERACT_FLAG $MPIRUN_FLAG 
    485498 
    486499    cd ${SETTE_DIR} 
    … …  
    488501    . prepare_exe_dir.sh 
    489502    JOB_FILE=${EXE_DIR}/run_job.sh 
    490     MPIRUN_FLAG="yes" 
    491503    NPROC=16 
    492     rm $JOB_FILE 
     504    \rm $JOB_FILE 
    493505    cd ${EXE_DIR} 
    494506    set_namelist namelist nn_it000 1 
    … …  
    508520    set_namelist namelist_pisces ln_presatm .false. 
    509521    cd ${SETTE_DIR} 
     522   cp BATCH_TEMPLATE/batch-${COMPILER} job_batch_template || exit 
    510523    . ./prepare_job.sh input_ORCA2_OFF_PISCES.cfg $NPROC ${TEST_NAME} $MPIRUN_FLAG $JOB_FILE 
    511524    cd ${SETTE_DIR} 
    512     . ./fcm_job.sh $NPROC $JOB_FILE 
     525    . ./fcm_job.sh $NPROC $JOB_FILE  $INTERACT_FLAG $MPIRUN_FLAG 
    513526fi 
    514527 
    … …  
    524537    . prepare_exe_dir.sh 
    525538    JOB_FILE=${EXE_DIR}/run_job.sh 
    526     MPIRUN_FLAG="yes" 
    527539    NPROC=32 
    528     rm $JOB_FILE 
     540    \rm $JOB_FILE 
    529541    cd ${EXE_DIR} 
    530542    set_namelist namelist nn_it000 1 
    … …  
    539551    set_namelist namelist jpnij 32 
    540552    cd ${SETTE_DIR} 
     553   cp BATCH_TEMPLATE/batch-${COMPILER} job_batch_template || exit 
    541554    . ./prepare_job.sh input_AMM12.cfg $NPROC ${TEST_NAME} $MPIRUN_FLAG $JOB_FILE 
    542555    cd ${SETTE_DIR} 
    543     . ./fcm_job.sh $NPROC $JOB_FILE 
     556    . ./fcm_job.sh $NPROC $JOB_FILE $INTERACT_FLAG $MPIRUN_FLAG  
    544557 
    545558    cd ${SETTE_DIR} 
    … …  
    547560    . prepare_exe_dir.sh 
    548561    JOB_FILE=${EXE_DIR}/run_job.sh 
    549     MPIRUN_FLAG="yes" 
    550562    NPROC=32 
    551     rm $JOB_FILE 
     563    \rm $JOB_FILE 
    552564    cd ${EXE_DIR} 
    553565    set_namelist namelist nn_it000 1 
    … …  
    562574    set_namelist namelist jpnij 32 
    563575    cd ${SETTE_DIR} 
     576   cp BATCH_TEMPLATE/batch-${COMPILER} job_batch_template || exit 
    564577    . ./prepare_job.sh input_AMM12.cfg $NPROC ${TEST_NAME} $MPIRUN_FLAG $JOB_FILE 
    565578    cd ${SETTE_DIR} 
    566     . ./fcm_job.sh $NPROC $JOB_FILE 
     579    . ./fcm_job.sh $NPROC $JOB_FILE $INTERACT_FLAG $MPIRUN_FLAG 
    567580fi 
    568581 
    … …  
    577590    . prepare_exe_dir.sh 
    578591    JOB_FILE=${EXE_DIR}/run_job.sh 
    579     MPIRUN_FLAG="yes" 
    580592    NPROC=32 
    581     rm $JOB_FILE 
     593    \rm $JOB_FILE 
    582594    cd ${EXE_DIR} 
    583595    set_namelist namelist nn_it000 1 
    … …  
    593605    set_namelist namelist jpnij 32 
    594606    cd ${SETTE_DIR} 
     607   cp BATCH_TEMPLATE/batch-${COMPILER} job_batch_template || exit 
    595608    . ./prepare_job.sh input_AMM12.cfg $NPROC ${TEST_NAME} $MPIRUN_FLAG $JOB_FILE 
     609    cd ${SETTE_DIR} 
     610    . ./fcm_job.sh $NPROC $JOB_FILE  $INTERACT_FLAG $MPIRUN_FLAG 
    596611 
    597612    cd ${SETTE_DIR} 
    … …  
    613628    set_namelist namelist cn_ocerst_in \"../LONG/AMM12_00000006_restart\" 
    614629    cd ${SETTE_DIR} 
     630   cp BATCH_TEMPLATE/batch-${COMPILER} job_batch_template || exit 
    615631    . ./prepare_job.sh input_AMM12.cfg $NPROC ${TEST_NAME} $MPIRUN_FLAG $JOB_FILE 
    616632    cd ${SETTE_DIR} 
    617     . ./fcm_job.sh $NPROC $JOB_FILE 
     633    . ./fcm_job.sh $NPROC $JOB_FILE $INTERACT_FLAG $MPIRUN_FLAG  
    618634fi 
    619635 
    … …  
    629645    . prepare_exe_dir.sh 
    630646    JOB_FILE=${EXE_DIR}/run_job.sh 
    631     MPIRUN_FLAG="yes" 
    632647    NPROC=2 
    633     rm $JOB_FILE 
     648    \rm $JOB_FILE 
    634649    cd ${EXE_DIR} 
    635650    set_namelist namelist nn_it000 1 
    … …  
    645660    set_namelist 1_namelist ln_clobber .true. 
    646661    cd ${SETTE_DIR} 
     662   cp BATCH_TEMPLATE/batch-${COMPILER} job_batch_template || exit 
    647663    . ./prepare_job.sh input_ORCA2_LIM_AGRIF.cfg $NPROC ${TEST_NAME} $MPIRUN_FLAG $JOB_FILE 
    648664    cd ${SETTE_DIR} 
    649     . ./fcm_job.sh $NPROC $JOB_FILE 
     665    . ./fcm_job.sh $NPROC $JOB_FILE  $INTERACT_FLAG $MPIRUN_FLAG 
    650666fi 
    651667 

  • branches/2012/dev_NOC_2012_rev3555/NEMOGCM/SETTE/sette_beginner.sh

    r3294 r3608  
    1111# 
    1212############################################################# 
    13 #set -x 
     13#set -vx 
    1414set -o posix 
    1515#set -u 
    … …  
    3939# Compiler among those in NEMOGCM/ARCH 
    4040COMPILER=PW6_VARGAS 
    41 export BATCH_COMMAND=llsubmit 
    42 export MPI_INTERACT="no" 
     41export BATCH_COMMAND_PAR="llsubmit" 
     42export BATCH_COMMAND_SEQ=$BATCH_COMMAND_PAR 
     43# export MPI_INTERACT="no" 
    4344 
    4445# Directory to run the tests 
    … …  
    5758# small test to start 
    5859# compile GYRE configuration with gfortran_osx compiler run with 1 proc, by default in cpp_GYRE.fcm file :  
    59 export TEST_NAME="TEST01" 
     60export TEST_NAME="TEST02" 
    6061cd ${SETTE_DIR} 
    6162. ../CONFIG/makenemo -m ${CMP_NAM} -n GYRE_SHORT -r GYRE 
    … …  
    6566# creation of execution directory 
    6667. prepare_exe_dir.sh 
     68JOB_FILE=${EXE_DIR}/run_job.sh 
    6769cd ${EXE_DIR} 
    6870# setting namelist parameters 
    … …  
    7577# frequency of creation of a restart file 
    7678set_namelist namelist nn_stock 60 
     79 
    7780cd ${SETTE_DIR} 
     81# . ./prepare_job.sh input_file_config_name NB_PROCS TEST_NAME MPI_FLAG JOB_FILE 
     82. ./prepare_job.sh input_GYRE.cfg 1 SHORT no $JOB_FILE 
    7883# run job, with 1 processor, test named SHORT (= 60 time steps) 
    79 . ./fcm_job.sh input_GYRE.cfg 1 ${TEST_NAME} 
     84#. ./fcm_job.sh NB_PROCS JOB_FILE INTERACT_FLAG MPI_FLAG 
     85    cd ${SETTE_DIR}    
     86. ./fcm_job.sh 1 $JOB_FILE no no 
     87 
Note: See TracChangeset for help on using the changeset viewer.