Changeset 12133


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

Branch 2019/dev_r11613_ENHANCE-04_namelists_as_internalfiles. Merge in trunk changes from 11943 to 12072 in preparation for 2019 merge. Sette tested GYRE_PISCES only. Full SETTE to follow

Location:
utils/CI/sette
Files:
2 edited

Legend:

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

    r11161 r12133  
    11# Computer/user dependant variable needed to run sette 
     2# 
     3# Compiler among those in NEMOGCM/ARCH 
     4COMPILER=X64_MOBILIS 
    25# 
    36# REFERENCE run.stat tracer.stat you want to compare with 
    47# (if no change to the default, no check on result change will be done) 
    5 NEMO_VALIDATION_REF=/path/to/reference/sette/results 
    6 NEMO_REV_REF=0000 
     8NEMO_VALIDATION_REF=/home/acc/NEMO/IMMERSE/trunk/sette/NEMO_VALIDATION 
     9NEMO_REV_REF=20190314 
    710# 
    811# ------------------------------------------------------------------------------------------ 
     
    1316# otherwise, you need to update the default initialisation 
    1417# 
    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 
    21 COMPILER=${SETTE_COMPILER:-XXXXXXXX} 
    22 # ------------------------------------------------------------------------------------------ 
     18# ADVISE: setup the default value in your startup file if it doesn't fit your need. 
    2319# 
    2420# BATCH command 
    2521# command to submit a job 
    26 BATCH_CMD=${SETTE_BATCH_CMD:-llsubmit} 
     22BATCH_CMD="sbatch" 
    2723# command to check job status 
    28 BATCH_STAT=${SETTE_BATCH_STAT:-llq} 
     24BATCH_STAT="squeue" 
    2925# generic sette job name (as it appears with $BATCH_STAT command) 
    3026BATCH_NAME=${SETTE_BATCH_NAME:-sette} 
    3127# ------------------------------------------------------------------------------------------ 
    3228# 
    33 # FILES STORING paths 
     29# 
     30# FILES STORING 
    3431# forcing files storing 
    35 FORCING_DIR=${SETTE_FORCING_DIR:-$WORKDIR/FORCING} 
     32FORCING_DIR=/hpcdata/scratch/omfman/shared/V3.7_INPUTS 
    3633# validation files storing 
    37 NEMO_VALIDATION_DIR=${SETTE_NEMO_VALIDATION_DIR:-$MAIN_DIR}/NEMO_VALIDATION 
     34NEMO_VALIDATION_DIR=/home/acc/NEMO/IMMERSE/dev_r11613_ENHANCE-04_namelists_as_internalfiles/sette/NEMO_VALIDATION 
    3835# input files storing (namelist, iodef ...) (DO NOT CHANGE) 
    3936INPUT_DIR=${CONFIG_DIR}/${NEW_CONF}/EXP00 
     
    5047#                      "no"  to run in SPMD (attached) mode without separate IO servers  
    5148# MPMD 
    52 USING_MPMD=${SETTE_MPMD:-"no"} 
     49USING_MPMD=${SETTE_MPMD:-"yes"} 
    5350# generique batch scrip prefix name if MPMD set to true/false 
    54 JOB_PREFIX_MPMD=${SETTE_JOB_PREFIX_MPMD:-batch-mpmd} 
     51JOB_PREFIX_MPMD=${SETTE_JOB_PREFIX_MPMD:-batch} 
    5552JOB_PREFIX_NOMPMD=${SETTE_JOB_PREFIX_NOMPMD:-batch} 
    5653# ------------------------------------------------------------------------------------------ 
  • utils/CI/sette/sette.sh

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