Changeset 12135


Ignore:
Timestamp:
2019-12-10T11:49:36+01:00 (6 months ago)
Author:
acc
Message:

Undo errneous commit to sette branch

Location:
utils/CI/sette
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • utils/CI/sette/param.cfg

    r12133 r12135  
    11# Computer/user dependant variable needed to run sette 
    2 # 
    3 # Compiler among those in NEMOGCM/ARCH 
    4 COMPILER=X64_MOBILIS 
    52# 
    63# REFERENCE run.stat tracer.stat you want to compare with 
    74# (if no change to the default, no check on result change will be done) 
    8 NEMO_VALIDATION_REF=/home/acc/NEMO/IMMERSE/trunk/sette/NEMO_VALIDATION 
    9 NEMO_REV_REF=20190314 
     5NEMO_VALIDATION_REF=/path/to/reference/sette/results 
     6NEMO_REV_REF=0000 
    107# 
    118# ------------------------------------------------------------------------------------------ 
     
    1613# otherwise, you need to update the default initialisation 
    1714# 
    18 # ADVISE: setup the default value in your startup file if it doesn't fit your need. 
     15# ADVISE: setup the default value in your startup file if it doesn't fit your need for at least 
     16# SETTE_COMPILER, SETTE_BATCH_CMD, SETTE_BATCH_STAT, SETTE_BATCH_NAME, SETTE_FORCING_DIR,  
     17# 
     18# ------------------------------------------------------------------------------------------ 
     19# COMPILER setting 
     20# Compiler among those in NEMOGCM/ARCH 
     21COMPILER=${SETTE_COMPILER:-XXXXXXXX} 
     22# ------------------------------------------------------------------------------------------ 
    1923# 
    2024# BATCH command 
    2125# command to submit a job 
    22 BATCH_CMD="sbatch" 
     26BATCH_CMD=${SETTE_BATCH_CMD:-llsubmit} 
    2327# command to check job status 
    24 BATCH_STAT="squeue" 
     28BATCH_STAT=${SETTE_BATCH_STAT:-llq} 
    2529# generic sette job name (as it appears with $BATCH_STAT command) 
    2630BATCH_NAME=${SETTE_BATCH_NAME:-sette} 
    2731# ------------------------------------------------------------------------------------------ 
    2832# 
    29 # 
    30 # FILES STORING 
     33# FILES STORING paths 
    3134# forcing files storing 
    32 FORCING_DIR=/hpcdata/scratch/omfman/shared/V3.7_INPUTS 
     35FORCING_DIR=${SETTE_FORCING_DIR:-$WORKDIR/FORCING} 
    3336# validation files storing 
    34 NEMO_VALIDATION_DIR=/home/acc/NEMO/IMMERSE/dev_r11613_ENHANCE-04_namelists_as_internalfiles/sette/NEMO_VALIDATION 
     37NEMO_VALIDATION_DIR=${SETTE_NEMO_VALIDATION_DIR:-$MAIN_DIR}/NEMO_VALIDATION 
    3538# input files storing (namelist, iodef ...) (DO NOT CHANGE) 
    3639INPUT_DIR=${CONFIG_DIR}/${NEW_CONF}/EXP00 
     
    4750#                      "no"  to run in SPMD (attached) mode without separate IO servers  
    4851# MPMD 
    49 USING_MPMD=${SETTE_MPMD:-"yes"} 
     52USING_MPMD=${SETTE_MPMD:-"no"} 
    5053# generique batch scrip prefix name if MPMD set to true/false 
    51 JOB_PREFIX_MPMD=${SETTE_JOB_PREFIX_MPMD:-batch} 
     54JOB_PREFIX_MPMD=${SETTE_JOB_PREFIX_MPMD:-batch-mpmd} 
    5255JOB_PREFIX_NOMPMD=${SETTE_JOB_PREFIX_NOMPMD:-batch} 
    5356# ------------------------------------------------------------------------------------------ 
  • utils/CI/sette/sette.sh

    r12133 r12135  
    5757while [[ $NRUN -ne 0 && $nit -le 1080 ]]; do 
    5858   nit=$((nit+1)) 
    59    NRUN=$( ${BATCH_STAT} | grep run_job | wc -l )  
     59   NRUN=$( ${BATCH_STAT} | grep nemo_sette | wc -l )  
    6060   if [[ $NRUN -ne 0 ]]; then  
    61       printf "%-3d %s\r" $NRUN 'run_job run still in queue or running ...'; 
     61      printf "%-3d %s\r" $NRUN 'nemo_sette run still in queue or running ...'; 
    6262   else 
    6363      printf "%-50s\n" " " 
Note: See TracChangeset for help on using the changeset viewer.