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 1564 – NEMO

Changeset 1564


Ignore:
Timestamp:
2009-07-31T14:31:31+02:00 (15 years ago)
Author:
ctlod
Message:

NVTK: improve it with new functionnality mainly for the developpers,see ticket: #506, #240

Location:
trunk/NVTK
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/NVTK/INSTALL/JOBS/CPU_time_aix6.ksh

    r1301 r1564  
    1212#     - zfile1 : mon run timing input file name 
    1313#     - zfile2 : mpi run timing input file name 
    14 #     - zconf  : configuration name 
    1514#     - zout   : output file name 
    1615#     - ztag   : tag name to which are compared files 
    … …  
    3938function help_CPU_time 
    4039{ 
    41   echo "Usage: $nscript [-r] [-a] [-b] [-c] [-o] [-t] [-x]" 
     40  echo "Usage: $nscript [-r] [-a] [-b] [-o] [-t] [-x]" 
    4241  echo "Options: These are optional argument" 
    4342  echo " -r : run type to treat" 
    4443  echo " -a : current version timing input file name" 
    4544  echo " -b : reference version timing input file name" 
    46   echo " -c : configuration name" 
    4745  echo " -o : output file name" 
    4846  echo " -t : tag name to which are compared files" 
    … …  
    5654zfile1= 
    5755zfile2= 
    58 zconf= 
    5956zout= 
    6057ztag= 
    … …  
    6259 
    6360# Get arguments 
    64 while getopts r:a:b:c:o:t:x: opt 
     61while getopts r:a:b:o:t:x: opt 
    6562do 
    6663  case "$opt" in 
    … …  
    6865    a) zfile1="$OPTARG";; 
    6966    b) zfile2="$OPTARG";; 
    70     c) zconf="$OPTARG";; 
    7167    o) zout="$OPTARG";; 
    7268    t) ztag="$OPTARG";; 

  • trunk/NVTK/INSTALL/JOBS/CPU_time_osxxlf.ksh

    r1301 r1564  
    99# 
    1010# INPUT ARGS: 6 
     11#     - zrunt  : run type to treat 
    1112#     - zfile1 : mon run timing input file name 
    1213#     - zfile2 : mpi run timing input file name 
    13 #     - zconf  : configuration name 
    1414#     - zout   : output file name 
    1515#     - ztag   : tag name to which are compared files 
    … …  
    3838function help_CPU_time 
    3939{ 
    40   echo "Usage: $nscript [-r] [-a] [-b] [-c] [-o] [-t] [-x]" 
     40  echo "Usage: $nscript [-r] [-a] [-b] [-o] [-t] [-x]" 
    4141  echo "Options: These are optional argument" 
    4242  echo " -r : run type to treat" 
    4343  echo " -a : current version timing input file name" 
    4444  echo " -b : reference version timing input file name" 
    45   echo " -c : configuration name" 
    4645  echo " -o : output file name" 
    4746  echo " -t : tag name to which are compared files" 
    … …  
    5554zfile1= 
    5655zfile2= 
    57 zconf= 
    5856zout= 
    5957ztag= 
    … …  
    6159 
    6260# Get arguments 
    63 while getopts r:a:b:c:o:t:x: opt 
     61while getopts r:a:b:o:t:x: opt 
    6462do 
    6563  case "$opt" in 
    … …  
    6765    a) zfile1="$OPTARG";; 
    6866    b) zfile2="$OPTARG";; 
    69     c) zconf="$OPTARG";; 
    7067    o) zout="$OPTARG";; 
    7168    t) ztag="$OPTARG";; 

  • trunk/NVTK/INSTALL/JOBS/CPU_time_sx8brodie.ksh

    r1301 r1564  
    99# 
    1010# INPUT ARGS: 6 
     11#     - zrunt  : run type to treat 
    1112#     - zfile1 : mon run timing input file name 
    1213#     - zfile2 : mpi run timing input file name 
    13 #     - zconf  : configuration name 
    1414#     - zout   : output file name 
    1515#     - ztag   : tag name to which are compared files 
    … …  
    3838function help_CPU_time 
    3939{ 
    40   echo "Usage: $nscript [-r] [-a] [-b] [-c] [-o] [-t] [-x]" 
     40  echo "Usage: $nscript [-r] [-a] [-b] [-o] [-t] [-x]" 
    4141  echo "Options: These are optional argument" 
    4242  echo " -r : run type to treat" 
    4343  echo " -a : current version timing input file name" 
    4444  echo " -b : reference version timing input file name" 
    45   echo " -c : configuration name" 
    4645  echo " -o : output file name" 
    4746  echo " -t : tag name to which are compared files" 
    … …  
    5554zfile1= 
    5655zfile2= 
    57 zconf= 
    5856zout= 
    5957ztag= 
    … …  
    6159 
    6260# Get arguments 
    63 while getopts r:a:b:c:o:t:x: opt 
     61while getopts r:a:b:o:t:x: opt 
    6462do 
    6563  case "$opt" in 
    … …  
    6765    a) zfile1="$OPTARG";; 
    6866    b) zfile2="$OPTARG";; 
    69     c) zconf="$OPTARG";; 
    7067    o) zout="$OPTARG";; 
    7168    t) ztag="$OPTARG";; 

  • trunk/NVTK/INSTALL/JOBS/CPU_time_sx8mercure.ksh

    r1366 r1564  
    99# 
    1010# INPUT ARGS: 6 
     11#     - zrunt  : run type to treat 
    1112#     - zfile1 : mon run timing input file name 
    1213#     - zfile2 : mpi run timing input file name 
    13 #     - zconf  : configuration name 
    1414#     - zout   : output file name 
    1515#     - ztag   : tag name to which are compared files 
    … …  
    3838function help_CPU_time 
    3939{ 
    40   echo "Usage: $nscript [-r] [-a] [-b] [-c] [-o] [-t] [-x]" 
     40  echo "Usage: $nscript [-r] [-a] [-b] [-o] [-t] [-x]" 
    4141  echo "Options: These are optional argument" 
    4242  echo " -r : run type to treat" 
    4343  echo " -a : current version timing input file name" 
    4444  echo " -b : reference version timing input file name" 
    45   echo " -c : configuration name" 
    4645  echo " -o : output file name" 
    4746  echo " -t : tag name to which are compared files" 
    … …  
    5554zfile1= 
    5655zfile2= 
    57 zconf= 
    5856zout= 
    5957ztag= 
    … …  
    6159 
    6260# Get arguments 
    63 while getopts r:a:b:c:o:t:x: opt 
     61while getopts r:a:b:o:t:x: opt 
    6462do 
    6563  case "$opt" in 
    … …  
    6765    a) zfile1="$OPTARG";; 
    6866    b) zfile2="$OPTARG";; 
    69     c) zconf="$OPTARG";; 
    7067    o) zout="$OPTARG";; 
    7168    t) ztag="$OPTARG";; 

  • trunk/NVTK/INSTALL/JOBS/MEM_size_aix6.ksh

    r1301 r1564  
    8080evaltag=$? 
    8181 
    82 zfilecs="mon/LONG/${zexp}/memory_size.txt" ;  zfilers='mon/LONG/REF/memory_size.txt' 
    83 zfilecm="mon/LONG/${zexp}/mon${zconf}_err"  ;  zfilerm="mon/LONG/REF/mon${zconf}_err" 
     82zfilecs="mon/LONG/${zexp}/memory_size.txt" ;  zfilers="mon/LONG/${ztag}/memory_size.txt" 
     83zfilecm="mon/LONG/${zexp}/mon${zconf}_err"  ;  zfilerm="mon/LONG/${ztag}/mon${zconf}_err" 
    8484 
    8585# If reference version files exist 

  • trunk/NVTK/INSTALL/JOBS/MEM_size_osxxlf.ksh

    r1301 r1564  
    8181 
    8282zfilecs='mon/LONG/${zexp}/memory_size.txt' 
    83 zfilers='mon/LONG/REF/memory_size.txt' 
     83zfilers='mon/LONG/${ztag}/memory_size.txt' 
    8484 
    8585# Select only appropriate lines 

  • trunk/NVTK/INSTALL/JOBS/MEM_size_sx8brodie.ksh

    r1301 r1564  
    8080evaltag=$? 
    8181 
    82 zfilecs="mon/LONG/${zexp}/memory_size.txt" ;  zfilers='mon/LONG/REF/memory_size.txt' 
    83 zfilecm="mon/LONG/${zexp}/mon${zconf}_err"  ;  zfilerm="mon/LONG/REF/mon${zconf}_err" 
     82zfilecs="mon/LONG/${zexp}/memory_size.txt" ;  zfilers="mon/LONG/${ztag}/memory_size.txt" 
     83zfilecm="mon/LONG/${zexp}/mon${zconf}_err"  ;  zfilerm="mon/LONG/${ztag}/mon${zconf}_err" 
    8484 
    8585# If reference version files exist 
    … …  
    8888    Mo_stack_ms=$( (awk '/Stack/ {print $NF/(1024*1024) }' ${zfilers} ) ) 
    8989    Mo_stati_ms=$( (awk '/Stati/ {print $NF/(1024*1024) }' ${zfilers} ) ) 
    90     if [ ${zxcm} == 0 ] ; then Mo_max_used=$( (awk '/Memory/ {print $NF}' ${zfilerm} ) ) ; fi 
     90    if [ ${zxcm} == 0 ] ; then Mo_max_used=$( (awk '/Memory Size/ {print $NF}' ${zfilerm} ) ) ; fi 
    9191 
    9292    # Print: Variable long name | current version values | reference version values | variations 
    … …  
    9696    awk ' /Stack/ { val=$NF/(1024*1024) } END {printf("%-9s %-16s %8.1f      |   %8.1f     |    %5.1f %\n ", " ", "Stack     (Mo) :", val, inck, ((val-inck)/inck)*100 ) }' inck=${Mo_stack_ms} ${zfilecs} >> ${zout} 
    9797    awk ' /Stati/ { val=$NF/(1024*1024) } END {printf("%-8s %-16s %8.1f      |   %8.1f     |    %5.1f %\n ", " ", "Static    (Mo) :", val, inti, ((val-inti)/inti)*100 ) }' inti=${Mo_stati_ms} ${zfilecs} >> ${zout} 
    98     if [ ${zxcm} == 0 ] ; then awk ' /Memory/ { val=$NF } END {printf("%-8s %-16s %8.1f      |   %8.1f     |    %5.1f %\n ", " ", "Max. used (Mo) :", val, inus, ((val-inus)/inus)*100 ) }' inus=${Mo_max_used} ${zfilecm} >> ${zout} ; fi 
     98    if [ ${zxcm} == 0 ] ; then awk ' /Memory Size/ { val=$NF } END {printf("%-8s %-16s %8.1f      |   %8.1f     |    %5.1f %\n ", " ", "Max. used (Mo) :", val, inus, ((val-inus)/inus)*100 ) }' inus=${Mo_max_used} ${zfilecm} >> ${zout} ; fi 
    9999else 
    100100    # Print: Variable long name | current version values 

  • trunk/NVTK/INSTALL/JOBS/MEM_size_sx8mercure.ksh

    r1366 r1564  
    8080evaltag=$? 
    8181 
    82 zfilecs="mon/LONG/${zexp}/memory_size.txt" ;  zfilers='mon/LONG/REF/memory_size.txt' 
    83 zfilecm="mon/LONG/${zexp}/mon${zconf}_err"  ;  zfilerm="mon/LONG/REF/mon${zconf}_err" 
     82zfilecs="mon/LONG/${zexp}/memory_size.txt" ;  zfilers="mon/LONG/${ztag}/memory_size.txt" 
     83zfilecm="mon/LONG/${zexp}/mon${zconf}_err"  ;  zfilerm="mon/LONG/${ztag}/mon${zconf}_err" 
    8484 
    8585# If reference version files exist 

  • trunk/NVTK/INSTALL/JOBS/assessment.ksh

    r1365 r1564  
    7777touch endjob.txt 
    7878 
     79if [ ${CONF} == 'ORCA2_LIM' ] ; then 
     80    CONFS=ORCA2 
     81elif [ ${CONF} == 'ORCA2_LIM3' ] ; then 
     82    CONFS=OR2L3 
     83elif [ ${CONF} == 'GYRE' ] ; then 
     84    CONFS=GYREO 
     85elif [ ${CONF} == 'GYRE_LOBSTER' ] ; then 
     86    CONFS=GYREL 
     87elif [ ${CONF} == 'ORCA2_LIM_PISCES' ] ; then 
     88    CONFS=OR2LP 
     89elif [ ${CONF} == 'ORCA2_OFF_PISCES' ] ; then 
     90    CONFS=OR2OP 
     91elif [ ${CONF} == 'ZAGRIF' ] ; then 
     92    CONFS=ZAGRI 
     93else 
     94    CONFS=${CONF} 
     95fi 
     96 
    7997########################################################### 
    8098# checkfile() is a local function to check if a file exist 
    81 # 2 arguments: 
     99# 5 arguments: 
    82100#    - zf2check : file name to check 
    83101#    - zoutfile : output file name to print results 
    … …  
    359377# 0.I LIST OF FILES TESTED, i.e. stored under NVTK/2TEST directory 
    360378# ############################### 
    361 nbfiles=$( (cat f2test.txt | wc -l) ) 
    362379echo " #################################################      " >> endjob.txt 
    363 echo " FILES STORED UNDER NVTK/2TEST DIRECTORY & TESTED       " >> endjob.txt 
     380echo " FILES STORED UNDER NVTK/${EXPER} DIRECTORY & TESTED    " >> endjob.txt 
    364381echo " #################################################      " >> endjob.txt 
    365382echo "                                                        " >> endjob.txt 
    366 echo "   Number of files : ${nbfiles}                         " >> endjob.txt 
    367 echo "                                                        " >> endjob.txt 
    368 cat f2test.txt                                                  >> endjob.txt 
    369 echo "                                                        " >> endjob.txt 
    370  
    371 # ############################### 
    372 # 0.II NEMO SOURCE FILES INFORMATION, i.e. revision & URL downloaded 
     383LSFILES=`head -1 f2test.txt | wc -w` 
     384if [ $LSFILES != 0 ] ; then 
     385    for file in `head -1 f2test.txt` ; do  
     386        echo "   -" $file                                       >> endjob.txt 
     387    done 
     388else 
     389    echo "                                                    " >> endjob.txt 
     390    echo "   ---> NO files tested                             " >> endjob.txt 
     391    echo "                                                    " >> endjob.txt 
     392fi 
     393echo "                                                        " >> endjob.txt 
     394 
     395# ############################### 
     396# 0.II LIST OF CPP KEYS USED 
     397# ############################### 
     398echo " #################################################      " >> endjob.txt 
     399echo " CPP KEYS USED FOR ${EXPER} EXPERIENCE                   " >> endjob.txt 
     400echo " #################################################      " >> endjob.txt 
     401echo "                                                        " >> endjob.txt 
     402for file in `tail -1 f2test.txt` ; do  
     403    echo "   -" $file                                           >> endjob.txt 
     404done 
     405echo "                                                        " >> endjob.txt 
     406 
     407# ############################### 
     408# ############################### 
     409# 0.III NEMO SOURCE FILES INFORMATION, i.e. revision & URL downloaded 
    373410# ############################### 
    374411echo " #############################                          " >> endjob.txt 
    … …  
    379416echo "   NEMO revision : ${REV_USE}                           " >> endjob.txt 
    380417echo "                                                        " >> endjob.txt 
    381 echo "                                                        " >> endjob.txt 
    382418 
    383419 
    384420test -n "${TODO}" 
    385421id2do=$? 
    386 if [ ${id2do} == 0 -a ${TARGET} = 'aix6' ] ; then concat_perf ${CONF} ; fi 
     422if [ ${id2do} == 0 -a ${TARGET} = 'aix6' ] ; then concat_perf ${CONFS} ; fi 
    387423 
    388424#@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 
    … …  
    391427# I. CHECK EXECUTABLE MEMORY SIZE 
    392428# ############################### 
    393 filecs="mon/LONG/${EXPER}/memory_size.txt" ;  filers='mon/LONG/REF/memory_size.txt' 
    394 filecm="mon/LONG/${EXPER}/mon${CONF}_err"  ;  filerm="mon/LONG/REF/mon${CONF}_err" 
     429filecs="mon/LONG/${EXPER}/memory_size.txt" ;  filers="mon/LONG/${REF_TAG}/memory_size.txt" 
     430filecm="mon/LONG/${EXPER}/mon${CONFS}_err"  ;  filerm="mon/LONG/${REF_TAG}/mon${CONFS}_err" 
    395431xfilecs=0  ; xfilecm=0 ; xfilers=0 ; xfilerm=0 
    396432echo " ############################                           " >> endjob.txt 
    … …  
    408444 
    409445    if [ ${REF_TAG} ] ; then  
    410         ./MEM_size_${TARGET}.ksh -a ${xfilecm} -b ${xfilers} -d ${xfilerm} -e ${EXPER} -c ${CONF} -o endjob.txt -t ${REF_TAG}  
     446        ./MEM_size_${TARGET}.ksh -a ${xfilecm} -b ${xfilers} -d ${xfilerm} -e ${EXPER} -c ${CONFS} -o endjob.txt -t ${REF_TAG}  
    411447    else 
    412         ./MEM_size_${TARGET}.ksh -a ${xfilecm} -b ${xfilers} -d ${xfilerm} -e ${EXPER} -c ${CONF} -o endjob.txt 
     448        ./MEM_size_${TARGET}.ksh -a ${xfilecm} -b ${xfilers} -d ${xfilerm} -e ${EXPER} -c ${CONFS} -o endjob.txt 
    413449    fi 
    414450 
    … …  
    443479 
    444480        # Check that timing file for the ${runt} current version exist 
    445         filecv="${runt}/GTIME/${EXPER}/${runt}${CONF}_err"  
     481        filecv="${runt}/GTIME/${EXPER}/${runt}${CONFS}_err"  
    446482        checkfile ${filecv} 'endjob.txt' NORM yes ; xfilecv=$? 
    447483 
    448484        # Check that timing file for the ${runt} reference version exist 
    449         filerv="${runt}/GTIME/REF/${runt}${CONF}_err"  
     485        filerv="${runt}/GTIME/${REF_TAG}/${runt}${CONFS}_err"  
    450486        checkfile ${filerv} 'endjob.txt' NORM no ; xfilerv=$? 
    451487        echo "                                                             " >> endjob.txt 
    … …  
    453489        if [ ${xfilecv} == 0 ] ; then  
    454490            if [ ${REF_TAG} ] ; then  
    455                 ./CPU_time_${TARGET}.ksh -r ${runt} -a ${filecv} -b ${filerv} -c ${CONF} -o endjob.txt -x ${xfilerv} -t ${REF_TAG}  
     491                ./CPU_time_${TARGET}.ksh -r ${runt} -a ${filecv} -b ${filerv} -o endjob.txt -x ${xfilerv} -t ${REF_TAG}  
    456492            else 
    457                 ./CPU_time_${TARGET}.ksh -r ${runt} -a ${filecv} -b ${filerv} -c ${CONF} -o endjob.txt -x ${xfilerv} 
     493                ./CPU_time_${TARGET}.ksh -r ${runt} -a ${filecv} -b ${filerv} -o endjob.txt -x ${xfilerv} 
    458494            fi 
    459495        fi 
    … …  
    614650 
    615651        file1="${runt}/1_SHORT/${EXPER}/solver.stat"          ;  file2="${runt}/2_SHORT/${EXPER}/solver.stat" 
    616         filev1="${runt}/1_SHORT/REF/solver.stat"              ;  filev2="${runt}/2_SHORT/REF/solver.stat" 
     652        filev1="${runt}/1_SHORT/${REF_TAG}/solver.stat"              ;  filev2="${runt}/2_SHORT/${REF_TAG}/solver.stat" 
    617653        file_oc1="${runt}/1_SHORT/${EXPER}/ocean.output"      ;  file_oc2="${runt}/2_SHORT/${EXPER}/ocean.output" 
    618         file_roc1="${runt}/1_SHORT/REF/ocean.output"          ;  file_roc2="${runt}/2_SHORT/REF/ocean.output" 
     654        file_roc1="${runt}/1_SHORT/${REF_TAG}/ocean.output"          ;  file_roc2="${runt}/2_SHORT/${REF_TAG}/ocean.output" 
    619655        xfilev1=0 ; xfilev2=0 ; xfile_oc1=0 ; xfile_oc2=0 
    620656 

  • trunk/NVTK/INSTALL/JOBS/job_GYRE.ksh

    r1402 r1564  
    1616 
    1717# Variables changed by ins_valid.ksh script 
    18 MAINDIR=/workdir/rech/eee/reee534/AUTRE 
    19 WORK=/workdir/rech/eee/reee534/AUTRE/modipsl/config/ 
     18MAINDIR=/workdir/rech/eee/reee831/NVTK 
     19WORK=/workdir/rech/eee/reee831/NVTK/modipsl/config 
    2020REF_OD=/u/rech/eee/reee831/NEMO_VALIDATION 
    2121 
    … …  
    180180#-T- sx8brodie export MPIPROGINF=detail ;; 
    181181#-T- sx8mercure export MPIPROGINF=detail ;; 
    182 #-T- aix6     ;; 
     182#-T- aix6 ;; 
    183183#-T- osxxlf   ;; 
    184184        'omp' )  
    … …  
    187187#-T- sx8mercure export F_PROGINF=detail 
    188188#-T- sx8mercure export OMP_NUM_THREADS=${NB_PROCS} ;; 
    189 #-T- aix6     ;; 
     189#-T- aix6 ;; 
    190190#-T- osxxlf   ;; 
    191191esac 
    … …  
    199199        'mpi' )  
    200200#-T- sx8brodie         ${CPERF} ${LEXE} ./opa_${CONF}_${RUN}_${MYO_EXP} ;; 
    201 #-T- sx8mercure         ${CPERF} ${LEXE} ./opa_${CONF}_${RUN}_${MYO_EXP} ;; 
     201#-T- sx8mercure        ${CPERF} ${LEXE} ./opa_${CONF}_${RUN}_${MYO_EXP} ;; 
    202202#-T- aix6              ${CPERF} ${LEXE} ./opa_${CONF}_${RUN}_${MYO_EXP} ;; 
    203203#-T- osxxlf   mpd& 
    … …  
    245245############################################################## 
    246246############################################################## 
    247 if [ ${REF_TAG} ] 
     247if [ ${REF_TAG} = 'nemo_v2' -o ${REF_TAG} = 'nemo_v2_3' -o ${REF_TAG} = 'nemo_v3' ] 
    248248then 
    249249   STORE_DATA=${REF_OD}/${CONF}/${REF_TAG}/${RUN}/${DIROUT} 
    250250   LFILES="solver.stat memory_size.txt ocean.output ${RUN}${CONF}_err" 
     251   SAV_DIR=${WORK}/NEMO_VALID/W${CONF}/${RUN}/${DIROUT}/${REF_TAG} 
     252   if [ ! -d ${SAV_DIR} ] ;  then 
     253      mkdir ${SAV_DIR} 
     254   fi 
    251255   for ref_file in ${LFILES} 
    252256   do 
    253        ${D_GET} ${STORE_DATA}/${TSYMB}${ref_file} ${WORK}/NEMO_VALID/W${CONF}/${RUN}/${DIROUT}/REF/${ref_file} 
     257       ${D_GET} ${STORE_DATA}/${TSYMB}${ref_file} ${SAV_DIR}/${ref_file} 
    254258   done 
    255259fi 

  • trunk/NVTK/INSTALL/JOBS/job_GYRE_LOBSTER.ksh

    r1544 r1564  
    279279############################################################## 
    280280############################################################## 
    281 if [ ${REF_TAG} ] 
     281if [ ${REF_TAG} = 'nemo_v2' -o ${REF_TAG} = 'nemo_v2_3' -o ${REF_TAG} = 'nemo_v3' ] 
    282282then 
    283283   STORE_DATA=${REF_OD}/${CONF}/${REF_TAG}/${RUN}/${DIROUT} 
    284284   LFILES="solver.stat memory_size.txt ocean.output ${RUN}${CONF}_err" 
     285   SAV_DIR=${WORK}/NEMO_VALID/W${CONF}/${RUN}/${DIROUT}/${REF_TAG} 
     286   if [ ! -d ${SAV_DIR} ] ;  then 
     287      mkdir ${SAV_DIR} 
     288   fi 
    285289   for ref_file in ${LFILES} 
    286290   do 
    287        ${D_GET} ${STORE_DATA}/${TSYMB}${ref_file} ${WORK}/NEMO_VALID/W${CONF}/${RUN}/${DIROUT}/REF/${ref_file} 
     291       ${D_GET} ${STORE_DATA}/${TSYMB}${ref_file} ${SAV_DIR}/${ref_file} 
    288292   done 
    289293fi 

  • trunk/NVTK/INSTALL/JOBS/job_ORCA2_LIM.ksh

    r1421 r1564  
    306306############################################################## 
    307307############################################################## 
    308 if [ ${REF_TAG} ] 
     308if [ ${REF_TAG} = 'nemo_v2' -o ${REF_TAG} = 'nemo_v2_3' -o ${REF_TAG} = 'nemo_v3' ] 
    309309then 
    310310   STORE_DATA=${REF_OD}/${CONF}/${REF_TAG}/${RUN}/${DIROUT} 
    311311   LFILES="solver.stat memory_size.txt ocean.output ${RUN}${CONF}_err" 
     312   SAV_DIR=${WORK}/NEMO_VALID/W${CONF}/${RUN}/${DIROUT}/${REF_TAG} 
     313   if [ ! -d ${SAV_DIR} ] ;  then 
     314      mkdir ${SAV_DIR} 
     315   fi 
    312316   for ref_file in ${LFILES} 
    313317   do 
    314        ${D_GET} ${STORE_DATA}/${TSYMB}${ref_file} ${WORK}/NEMO_VALID/W${CONF}/${RUN}/${DIROUT}/REF/${ref_file} 
     318       ${D_GET} ${STORE_DATA}/${TSYMB}${ref_file} ${SAV_DIR}/${ref_file} 
    315319   done 
    316320fi 

  • trunk/NVTK/INSTALL/JOBS/job_ORCA2_LIM3.ksh

    r1464 r1564  
    306306############################################################## 
    307307############################################################## 
    308 if [ ${REF_TAG} ] 
     308if [ ${REF_TAG} = 'nemo_v2' -o ${REF_TAG} = 'nemo_v2_3' -o ${REF_TAG} = 'nemo_v3' ] 
    309309then 
    310310   STORE_DATA=${REF_OD}/${CONF}/${REF_TAG}/${RUN}/${DIROUT} 
    311311   LFILES="solver.stat memory_size.txt ocean.output ${RUN}${CONF}_err" 
     312   SAV_DIR=${WORK}/NEMO_VALID/W${CONF}/${RUN}/${DIROUT}/${REF_TAG} 
     313   if [ ! -d ${SAV_DIR} ] ;  then 
     314      mkdir ${SAV_DIR} 
     315   fi 
    312316   for ref_file in ${LFILES} 
    313317   do 
    314        ${D_GET} ${STORE_DATA}/${TSYMB}${ref_file} ${WORK}/NEMO_VALID/W${CONF}/${RUN}/${DIROUT}/REF/${ref_file} 
     318       ${D_GET} ${STORE_DATA}/${TSYMB}${ref_file} ${SAV_DIR}/${ref_file} 
    315319   done 
    316320fi 

  • trunk/NVTK/INSTALL/JOBS/job_ORCA2_LIM_PISCES.ksh

    r1544 r1564  
    314314############################################################## 
    315315############################################################## 
    316 if [ ${REF_TAG} ] 
     316if [ ${REF_TAG} = 'nemo_v2' -o ${REF_TAG} = 'nemo_v2_3' -o ${REF_TAG} = 'nemo_v3' ] 
    317317then 
    318318   STORE_DATA=${REF_OD}/${CONF}/${REF_TAG}/${RUN}/${DIROUT} 
    319319   LFILES="solver.stat memory_size.txt ocean.output ${RUN}${CONF}_err" 
     320   SAV_DIR=${WORK}/NEMO_VALID/W${CONF}/${RUN}/${DIROUT}/${REF_TAG} 
     321   if [ ! -d ${SAV_DIR} ] ;  then 
     322      mkdir ${SAV_DIR} 
     323   fi 
    320324   for ref_file in ${LFILES} 
    321325   do 
    322        ${D_GET} ${STORE_DATA}/${TSYMB}${ref_file} ${WORK}/NEMO_VALID/W${CONF}/${RUN}/${DIROUT}/REF/${ref_file} 
     326       ${D_GET} ${STORE_DATA}/${TSYMB}${ref_file} ${SAV_DIR}/${ref_file} 
    323327   done 
    324328fi 

  • trunk/NVTK/INSTALL/JOBS/job_ORCA2_OFF_PISCES.ksh

    r1544 r1564  
    290290############################################################## 
    291291############################################################## 
    292 if [ ${REF_TAG} ] 
     292if [ ${REF_TAG} = 'nemo_v2' -o ${REF_TAG} = 'nemo_v2_3' -o ${REF_TAG} = 'nemo_v3' ] 
    293293then 
    294294   STORE_DATA=${REF_OD}/${CONF}/${REF_TAG}/${RUN}/${DIROUT} 
    295295   LFILES="solver.stat memory_size.txt ocean.output ${RUN}${CONF}_err" 
     296   SAV_DIR=${WORK}/NEMO_VALID/W${CONF}/${RUN}/${DIROUT}/${REF_TAG} 
     297   if [ ! -d ${SAV_DIR} ] ;  then 
     298      mkdir ${SAV_DIR} 
     299   fi 
    296300   for ref_file in ${LFILES} 
    297301   do 
    298        ${D_GET} ${STORE_DATA}/${TSYMB}${ref_file} ${WORK}/NEMO_VALID/W${CONF}/${RUN}/${DIROUT}/REF/${ref_file} 
     302       ${D_GET} ${STORE_DATA}/${TSYMB}${ref_file} ${SAV_DIR}/${ref_file} 
    299303   done 
    300304fi 

  • trunk/NVTK/INSTALL/JOBS/job_ZAGRIF.ksh

    r1403 r1564  
    289289############################################################## 
    290290############################################################## 
    291 if [ ${REF_TAG} ] 
     291if [ ${REF_TAG} = 'nemo_v2' -o ${REF_TAG} = 'nemo_v2_3' -o ${REF_TAG} = 'nemo_v3' ] 
    292292then 
    293293   STORE_DATA=${REF_OD}/${CONF}/${REF_TAG}/${RUN}/${DIROUT} 
    294294   LFILES="solver.stat memory_size.txt ocean.output ${RUN}${CONF}_err" 
     295   SAV_DIR=${WORK}/NEMO_VALID/W${CONF}/${RUN}/${DIROUT}/${REF_TAG} 
     296   if [ ! -d ${SAV_DIR} ] ;  then 
     297      mkdir ${SAV_DIR} 
     298   fi 
    295299   for ref_file in ${LFILES} 
    296300   do 
    297        ${D_GET} ${STORE_DATA}/${TSYMB}${ref_file} ${WORK}/NEMO_VALID/W${CONF}/${RUN}/${DIROUT}/REF/${ref_file} 
     301       ${D_GET} ${STORE_DATA}/${TSYMB}${ref_file} ${SAV_DIR}/${ref_file} 
    298302   done 
    299303fi 

  • trunk/NVTK/INSTALL/ins_nvtk.ksh

    r1464 r1564  
    7777cp ./MODIPSL_FILES/ins_make ../../../util/. 
    7878 
    79 # Set following variable in AA_make.ldef script 
     79# Set following variable in AA_make.ldef script And master Makefile 
    8080# - WWDIR = directory where to store results and jobs 
    8181CAR_WORK_tmp=$( grep 'WWDIR=' ./CONFIG_FILES/AA_make.ldef ) 
    … …  
    8383sed -e "s?${CAR_WORK}?WWDIR=${OUTDIR}?" ./CONFIG_FILES/AA_make.ldef > ./CONFIG_FILES/AA_make.ldef.$$  
    8484mv ./CONFIG_FILES/AA_make.ldef.$$  ./CONFIG_FILES/AA_make.ldef && rm -f ./CONFIG_FILES/AA_make.ldef.$$ 
     85 
     86sed -e "s?DELFIL?${OUTDIR}?" ../Makefile > ../Makefile.$$  
     87mv ../Makefile.$$  ../Makefile && rm -f ../Makefile.$$ 
    8588 
    8689# Get the current target name 
    … …  
    136139           mkdir  NEMO_VALID 
    137140       fi 
    138            cd NEMO_VALID 
    139        if [ ! -d W${CONF[${ind}]} ] ;  then 
    140            mkdir W${CONF[${ind}]} 
    141        fi 
    142        if [ ! -d W${CONF[${ind}]}/mon ] ;  then 
    143            mkdir W${CONF[${ind}]}/mon 
    144        fi 
    145        if [ ! -d W${CONF[${ind}]}/mon/LONG ] ;  then 
    146            mkdir W${CONF[${ind}]}/mon/LONG 
    147            mkdir W${CONF[${ind}]}/mon/LONG/REF 
    148        fi 
    149        if [ ! -d W${CONF[${ind}]}/mon/GTIME ] ;  then 
    150            mkdir W${CONF[${ind}]}/mon/GTIME 
    151            mkdir W${CONF[${ind}]}/mon/GTIME/REF 
    152        fi 
    153        if [ ! -d W${CONF[${ind}]}/mon/1_SHORT ] ;  then 
    154            mkdir W${CONF[${ind}]}/mon/1_SHORT 
    155            mkdir W${CONF[${ind}]}/mon/1_SHORT/REF 
    156        fi 
    157        if [ ! -d W${CONF[${ind}]}/mon/2_SHORT ] ;  then 
    158            mkdir W${CONF[${ind}]}/mon/2_SHORT 
    159            mkdir W${CONF[${ind}]}/mon/2_SHORT/REF 
    160        fi 
    161        if [ ! -d W${CONF[${ind}]}/mpi ] ;  then 
    162            mkdir W${CONF[${ind}]}/mpi 
    163        fi 
    164        if [ ! -d W${CONF[${ind}]}/mpi/LONG ] ;  then 
    165            mkdir W${CONF[${ind}]}/mpi/LONG 
    166            mkdir W${CONF[${ind}]}/mpi/LONG/REF 
    167        fi 
    168        if [ ! -d W${CONF[${ind}]}/mpi/GTIME ] ;  then 
    169            mkdir W${CONF[${ind}]}/mpi/GTIME 
    170            mkdir W${CONF[${ind}]}/mpi/GTIME/REF 
    171        fi 
    172        if [ ! -d W${CONF[${ind}]}/mpi/1_SHORT ] ;  then 
    173            mkdir W${CONF[${ind}]}/mpi/1_SHORT 
    174            mkdir W${CONF[${ind}]}/mpi/1_SHORT/REF 
    175        fi 
    176        if [ ! -d W${CONF[${ind}]}/mpi/2_SHORT ] ;  then 
    177            mkdir W${CONF[${ind}]}/mpi/2_SHORT 
    178            mkdir W${CONF[${ind}]}/mpi/2_SHORT/REF 
    179        fi 
    180        if [ ! -d W${CONF[${ind}]}/omp ] ;  then 
    181            mkdir W${CONF[${ind}]}/omp 
    182        fi 
    183        if [ ! -d W${CONF[${ind}]}/omp/LONG ] ;  then 
    184            mkdir W${CONF[${ind}]}/omp/LONG 
    185            mkdir W${CONF[${ind}]}/omp/LONG/REF 
    186        fi 
    187        if [ ! -d W${CONF[${ind}]}/omp/GTIME ] ;  then 
    188            mkdir W${CONF[${ind}]}/omp/GTIME 
    189            mkdir W${CONF[${ind}]}/omp/GTIME/REF 
    190        fi 
    191        if [ ! -d W${CONF[${ind}]}/omp/1_SHORT ] ;  then 
    192            mkdir W${CONF[${ind}]}/omp/1_SHORT 
    193            mkdir W${CONF[${ind}]}/omp/1_SHORT/REF 
    194        fi 
    195        if [ ! -d W${CONF[${ind}]}/omp/2_SHORT ] ;  then 
    196            mkdir W${CONF[${ind}]}/omp/2_SHORT 
    197            mkdir W${CONF[${ind}]}/omp/2_SHORT/REF 
    198        fi 
     141       cd NEMO_VALID 
     142       mkdir -p W${CONF[${ind}]}/mon/LONG 
     143       mkdir -p W${CONF[${ind}]}/mon/GTIME 
     144       mkdir -p W${CONF[${ind}]}/mon/1_SHORT 
     145       mkdir -p W${CONF[${ind}]}/mon/2_SHORT 
     146       # 
     147       mkdir -p W${CONF[${ind}]}/mpi/LONG 
     148       mkdir -p W${CONF[${ind}]}/mpi/GTIME 
     149       mkdir -p W${CONF[${ind}]}/mpi/1_SHORT 
     150       mkdir -p W${CONF[${ind}]}/mpi/2_SHORT 
     151       # 
     152       mkdir -p W${CONF[${ind}]}/omp/LONG 
     153       mkdir -p W${CONF[${ind}]}/omp/GTIME 
     154       mkdir -p W${CONF[${ind}]}/omp/1_SHORT 
     155       mkdir -p W${CONF[${ind}]}/omp/2_SHORT 
     156       # 
    199157echo '         ' 
    200158echo '        >>>>>>>>   The following sub-directories have been built ' 

  • trunk/NVTK/Makefile

    r1560 r1564  
    44# Contact : nemo_st@locean-ipsl.upmc.fr 
    55# 
    6 # VARS TO SET: 6 + 1 (optional) 
    7 #     - NAM_V      : name of the current test (associated to the same directory name) 
    8 #     - LISTE_CONF : configurations name (ORCA2_LIM, GYRE ...) 
    9 #     - JOBS_2LAUN : jobs to launch (nojob, all, long, short or gtime) 
    10 #     - BUILD_MAKE : run type (mon, mpi ... ) 
    11 #     - MAK_TIME   : to perform a CPU time measure making a one year run 
    12 #                    use key word 'timing' or 'notiming' 
    13 #     - MAK_MEMO   : to perform a memory check  
    14 #                    use key word 'memo' or 'nomemo' 
    15 #     - REF_TAGV   : (optional) reference tag name. If specified,  
    16 #                    current results will be compare to the results  
    17 #                    of this tag (for a given configuration and run type) 
     6# VARS TO SET: 9 + 1 (optional) 
     7#     - NAM_V             : name of the current test (associated to the same directory name) 
     8#     - LISTE_CONF        : configurations name (ORCA2_LIM, GYRE ...) 
     9#     - JOBS_2LAUN        : jobs to launch (nojob, all, long, short or gtime) 
     10#     - BUILD_MAKE        : run type (mon, mpi ... ) 
     11#     - MAK_TIME          : to perform a CPU time check use keyword: 'timing' or 'notiming' 
     12#     - USE_IOMPUT        : use or not the new I/O interface 
     13#     - USE_IOSERVER      : use the I/O interface using the server possibility 
     14#     - NB_PROCS_IOSERVER : number of processors dedicated to the I/O server 
     15#     - MAK_MEMO          : to perform a memory check use keyword: 'memo' or 'nomemo' 
     16#     - REF_TAGV          : (optional) tag/experience name. If specified,  
     17#                           current results will be compare to the results  
     18#                           of this tag/experience (for a given configuration and run type) 
    1819# 
    1920# WORK: Allows to launch all the validation process, i.e.  
    2021#     I.   to build dependencies use: > gmake -s dep 
    2122#     II.  to launch compilation,simulation,final report use: > gmake 
     23#     III. to remove NetCDF output files of the NAM_V experience use: > gmake delf 
    2224# 
    2325##################################################################### 
    … …  
    4446NB_PROCS_IOSERVER = 1 
    4547#- 
    46 #- Proceed to a timing, use key word 'timing' or 'notiming' 
     48#- Proceed to a timing, use keyword: 'timing' or 'notiming' 
    4749MAK_TIME = notiming 
    4850#- 
    49 #- Proceed to a memory check, use key word 'memo' or 'nomemo' 
     51#- Proceed to a memory check, use keyword: 'memo' or 'nomemo' 
    5052MAK_MEMO = memo 
    5153#- 
    52 #- Reference Tag version 
    53 REF_TAGV = nemo_v2_3 
     54#- Experience name or reference Tag name (nemo_v2, nemo_v2_3 or nemo_v3) 
     55REF_TAGV = nemo_v3 
    5456#- 
    5557##################################################################### 
    … …  
    7981   @( cd ${NAM_V} ; LSFILES=`( ls *.[Ffh]90 )` ; if [ -n "$$LSFILES" ] ; \ 
    8082     then echo $$LSFILES > ../../$@/f2test.txt ; else rm -f ../../$@/f2test.txt ; \ 
    81           touch ../../$@/f2test.txt ; fi ; ) 
     83          echo "  " >../../$@/f2test.txt ; fi ; ) 
    8284   @echo  
    8385   @echo '             ----->>>>>>>>>   Links from NVTK/'${NAM_V} ' to '$@/MY_SRC 'done' 
    … …  
    8587   @echo '                              Build the Makefile for' $@ 'configuration' 
    8688   @../../util/ins_make -w $@ 
    87 ifeq ($(USE_IOMPUT),true) 
    88    @../../util/ins_make -w XMLF90 
    89    @../../util/ins_make -w XMLIO_SERVER 
    90 endif 
     89   @( cd ../$@/WORK ; grep P_P Makefile | head -1 > $$ ; LSCPPKEY=`( cut -c,6- $$ )` ; \ 
     90          rm -f $$ ; if [ -n "$$LSCPPKEY" ] ; then echo $$LSCPPKEY >> ../f2test.txt ; fi ; ) 
    9191   @echo 
    9292   @echo 
    … …  
    199199   @echo  
    200200   @clear  
     201 
     202#- Delete NetCDF files for a given experience to save memory  
     203delf:  
     204   @for conf in ${LISTE_CONF}; do \ 
     205       echo ; \ 
     206       echo ; \ 
     207       echo ; \ 
     208       echo '             ----->>>>>>>>> Remove all' $$conf '*.nc output files for the' ${NAM_V} 'experience' ; \ 
     209       echo ; \ 
     210       echo ; \ 
     211       for typer in ${BUILD_MAKE}; do \ 
     212           rm -f DELFIL/NEMO_VALID/W$$conf/$$typer/LONG/${NAM_V}/*.nc     ; \ 
     213           rm -f DELFIL/NEMO_VALID/W$$conf/$$typer/1_SHORT/${NAM_V}/*.nc  ; \ 
     214           rm -f DELFIL/NEMO_VALID/W$$conf/$$typer/2_SHORT/${NAM_V}/*.nc  ; \ 
     215      rm -f DELFIL/NEMO_VALID/W$$conf/$$typer/GTIME/${NAM_V}/*.nc    ; \ 
     216       done ; \ 
     217   done  
Note: See TracChangeset for help on using the changeset viewer.