Changeset 10632


Ignore:
Timestamp:
2019-02-04T17:40:20+01:00 (22 months ago)
Author:
smueller
Message:

Reversal of the modifications that have been inadvertently included in changeset [10631] when addressing ticket #2226

Location:
utils/CI/sette
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • utils/CI/sette/BATCH_TEMPLATE/batch-X64_MOBILIS

    r10631 r10632  
    11#!/bin/bash 
    22#SBATCH -N NODES 
    3 #SBATCH --time=03:59:00  
     3#SBATCH --time=00:59:00  
    44 
    55module purge 
    66module load shared 
    7 module load gcc 
    8 module load noc/intel/17.0.4 
    9 module load openmpi/intel/64/1.6.5 
    10 module load slurm/16.05.8 
    11 module load noc/subversion/1.7.16 
     7module use /home/acc/MyMods 
     8# set programming environment and XIO_HOME  
     9module load nemo-PrgEnv/4.0  
    1210 
    1311# 
     
    1614  export XCORES=NXIOPROCS 
    1715  export SETTE_DIR=DEF_SETTE_DIR 
    18   export XIO_HOME=/hpcdata/working/smueller/xios-2.5 
    1916# 
    2017# load sette functions (only post_test_tidyup needed) 
  • utils/CI/sette/all_functions.sh

    r10631 r10632  
    196196# Creation of NEMO_VALIDATION tree 
    197197    export LANG=en_US  
    198     REVISION_NB=`svn info ${SETTE_DIR}/.. | grep -i "Last Changed Rev:" | sed -e "s/ //g" | cut -d ":" -f 2` 
     198    REVISION_NB=`svn info ${SETTE_DIR}/../.. | grep -i "Last Changed Rev:" | sed -e "s/ //g" | cut -d ":" -f 2` 
    199199    if [ ${#REVISION_NB} -eq 0 ] 
    200200    then 
  • utils/CI/sette/param.cfg

    r10631 r10632  
    1 WORKDIR=/hpcdata/working/smueller/NEMO_dev/releases/release-4.0 
    2 SCRATCHDIR=/hpcdata/working/smueller/ 
    31#- forcing files storing 
    4 FORCING_DIR=$SCRATCHDIR/FORCING_NEMO_v4.0 
     2FORCING_DIR=$WORKDIR/FORCING 
    53#- input files storing 
    64INPUT_DIR=${CONFIG_DIR}/${NEW_CONF}/EXP00 
     
    86#TMPDIR=${CONFIG_DIR}/${NEW_CONF}/EXP00 
    97#- VALIDATION files storing 
    10 NEMO_VALIDATION_DIR=/hpcdata/working/smueller/NEMO_dev/releases/release-4.0/NEMO_VALIDATION 
     8NEMO_VALIDATION_DIR=$WORKDIR/NEMO_VALIDATION 
  • utils/CI/sette/sette.sh

    r10631 r10632  
    8888# 
    8989# Compiler among those in NEMOGCM/ARCH 
    90 COMPILER=X64_MOBILIS 
    91  
    92 export BATCH_COMMAND_PAR="sbatch" 
    93 export BATCH_COMMAND_SEQ=$BATCH_COMMAND_PAR 
     90COMPILER=X64_ADA 
     91 
     92export BATCH_COMMAND_PAR="llsubmit" 
     93export BATCH_COMMAND_SEQ=$BATCH_COMMAND_PAR  
    9494export INTERACT_FLAG="no" 
    9595export MPIRUN_FLAG="yes" 
     
    105105# Settings which control the use of stand alone servers (only relevant if using xios) 
    106106# 
    107 export USING_MPMD="yes" 
    108 export NUM_XIOSERVERS=1 
    109 export JOB_PREFIX=batch 
     107export USING_MPMD="no" 
     108export NUM_XIOSERVERS=4 
     109export JOB_PREFIX=batch-mpmd 
    110110# 
    111111if [ ${USING_MPMD} == "no" ]  
     
    143143# SPITZ12           :  9      regional configuration including sea-ice and tides (Spitzbergen) 
    144144 
    145 for config in 4 
     145for config in 1 2 3 4 5 6 7 8 9 
    146146do 
    147147 
Note: See TracChangeset for help on using the changeset viewer.